Merge branch 'master' into conditional-shortcut-syntax

Add from-version tag to docs
2026-01-22 19:04:38 +00:00 · 2023-10-14 09:31:31 +01:00 · 2023-10-14 09:21:20 +01:00 · 2023-09-14 19:13:10 +01:00 · 2023-09-14 17:54:59 +01:00 · 2023-09-14 10:05:20 +01:00
166 changed files with 627 additions and 3046 deletions
--- a/.github/workflows/ci.yml
+++ b/.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"
-      - uses: actions/upload-artifact@v3
-        if: always()
-        with:
-          name: playwright-report
-          path: playwright-report/
-          retention-days: 30
+      - run: "./bin/test.sh"
  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
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,4 @@
 tmp/
 output/
 node_modules/
-/test-results/
-/playwright-report/
-/playwright/.cache/
+
--- a/bin/build-site.sh
+++ b/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 \
--- a/bin/ci-test.sh
+++ b/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
--- a/core/language/en-GB/Help/commands.tid
+++ b/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}]"
 ```

 ```
--- a/core/modules/commands/savetiddlers.js
+++ b/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;
 };
--- a/core/modules/filters/encodings.js
+++ b/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;
 };
--- a/core/modules/filters/json-ops.js
+++ b/core/modules/filters/json-ops.js
@@ -68,54 +68,6 @@ exports["jsontype"] = function(source,operator,options) {
 	return results;
 };

-exports["jsonset"] = function(source,operator,options) {
-	var suffixes = operator.suffixes || [],
-		type = suffixes[0] && suffixes[0][0],
-		indexes = operator.operands.slice(0,-1),
-		value = operator.operands[operator.operands.length - 1],
-		results = [];
-	if(operator.operands.length === 1 && operator.operands[0] === "") {
-		value = undefined; // Prevents the value from being assigned
-	}
-	switch(type) {
-		case "string":
-			// Use value unchanged
-			break;
-		case "boolean":
-			value = (value === "true" ? true : (value === "false" ? false : undefined));
-			break;
-		case "number":
-			value = $tw.utils.parseNumber(value);
-			break;
-		case "array":
-			indexes = operator.operands;
-			value = [];
-			break;
-		case "object":
-			indexes = operator.operands;
-			value = {};
-			break;
-		case "null":
-			indexes = operator.operands;
-			value = null;
-			break;
-		case "json":
-			value = $tw.utils.parseJSONSafe(value,function() {return undefined;});
-			break;
-		default:
-			// Use value unchanged
-			break;
-	}
-	source(function(tiddler,title) {
-		var data = $tw.utils.parseJSONSafe(title,title);
-		if(data) {
-			data = setDataItem(data,indexes,value);
-			results.push(JSON.stringify(data));
-		}
-	});
-	return results;
-};
-
 /*
 Given a JSON data structure and an array of index strings, return an array of the string representation of the values at the end of the index chain, or "undefined" if any of the index strings are invalid
 */
@@ -213,18 +165,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 +177,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;
 			}
@@ -246,39 +186,5 @@ function getDataItem(data,indexes) {
 	return item;
 }

-/*
-Given a JSON data structure, an array of index strings and a value, return the data structure with the value added at the end of the index chain. If any of the index strings are invalid then the JSON data structure is returned unmodified. If the root item is targetted then a different data object will be returned
-*/
-function setDataItem(data,indexes,value) {
-	// Ignore attempts to assign undefined
-	if(value === undefined) {
-		return data;
-	}
-	// Check for the root item
-	if(indexes.length === 0 || (indexes.length === 1 && indexes[0] === "")) {
-		return 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]);
-		if(current === undefined) {
-			// 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)) {
-		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;
-}
-
 })();
 	
--- a/core/modules/filters/listops.js
+++ b/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);
 	});
--- a/core/modules/parsers/textparser.js
+++ b/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: {name: "code", type: "string", value: text},
-			language: {name: "language", type: "string", value: type},
-			$remappable: {name: "$remappable", type:"string", value: "no"}
+			code: {type: "string", value: text},
+			language: {type: "string", value: type}
 		}
 	}];
 	this.source = text;
@@ -34,3 +32,4 @@ exports["text/css"] = TextParser;
 exports["application/x-tiddler-dictionary"] = TextParser;

 })();
+
--- a/core/modules/parsers/wikiparser/rules/transcludeblock.js
+++ b/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];
 		}
 	}
--- a/core/modules/parsers/wikiparser/rules/transcludeinline.js
+++ b/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];
 		}
 	}
--- a/core/modules/parsers/wikiparser/wikiparser.js
+++ b/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
--- a/core/modules/savers/github.js
+++ b/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
--- a/core/modules/startup/windows.js
+++ b/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
--- a/core/modules/syncer.js
+++ b/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;
-	function checkIsDirty() {
-		// Check tiddlers that are in the store and included in the filter function
-		var titles = self.getSyncedTiddlers();
-		for(var index=0; index<titles.length; index++) {
-			var title = titles[index],
-				tiddlerInfo = self.tiddlerInfo[title];
-			if(self.wiki.tiddlerExists(title)) {
-				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(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
+	this.logger.log("Checking dirty status");
+	// Check tiddlers that are in the store and included in the filter function
+	var titles = this.getSyncedTiddlers();
+	for(var index=0; index<titles.length; index++) {
+		var title = titles[index],
+			tiddlerInfo = this.tiddlerInfo[title];
+		if(this.wiki.tiddlerExists(title)) {
+			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(this.wiki.getChangeCount(title) > tiddlerInfo.changeCount) {
 					return true;
 				}
-			}
-		}
-		// 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
+			} else {
+				// If the tiddler isn't known on the server then it needs to be saved to the server
 				return true;
 			}
 		}
-		return false;
 	}
-	var dirtyStatus = checkIsDirty();
-	return dirtyStatus;
+	// Check tiddlers that are known from the server but not currently in the store
+	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()) {
-		this.forceSyncFromServer = true;
-		this.processTaskQueue();	
+	var self = this,
+		cancelNextSync = function() {
+			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);
-			} else if(this.canSyncFromServer()) {
-				this.triggerTimeout(this.pollTimerInterval);
+				this.triggerTimeout();				
 			}
 		}
 	} else {
-		this.updateDirtyStatus();
-		this.triggerTimeout(this.taskTimerInterval);
+		this.updateDirtyStatus();		
 	}
 };

 Syncer.prototype.triggerTimeout = function(interval) {
 	var self = this;
-	if(this.taskTimerId) {
-		clearTimeout(this.taskTimerId);
+	if(!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:
-* 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)
+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
 */
 Syncer.prototype.chooseNextTask = function() {
-	var now = new Date(),
-		thresholdLastSaved = now - this.throttleInterval,
+	var thresholdLastSaved = (new Date()) - 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
-	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
+	// Second, 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;

 })();
--- a/core/modules/utils/dom/dom.js
+++ b/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();
--- a/core/modules/utils/dom/http.js
+++ b/core/modules/utils/dom/http.js
@@ -187,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,
--- a/core/modules/utils/fakedom.js
+++ b/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.style = value;
-	} else {
-		this.attributes[name] = value + "";
-	}
+	this.attributes[name] = value + "";
 };

 TW_Element.prototype.setAttributeNS = function(namespace,name,value) {
--- a/core/modules/utils/utils.js
+++ b/core/modules/utils/utils.js
@@ -819,41 +819,18 @@ exports.hashString = function(str) {
 	},0);
 };

-/*
-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) {
-	var encoded = urlsafe ? string64.replace(/_/g,'/').replace(/-/g,'+') : string64;
-	if(binary) return exports.atob(encoded)
-	else return base64utf8.base64.decode.call(base64utf8,encoded);
+exports.base64Decode = function(string64) {
+	return base64utf8.base64.decode.call(base64utf8,string64);
 };

 /*
 Encode a string to base64
 */
-exports.base64Encode = function(string64,binary,urlsafe) {
-	var encoded;
-	if(binary) encoded = exports.btoa(string64);
-	else encoded = base64utf8.base64.encode.call(base64utf8,string64);
-	if(urlsafe) {
-		encoded = encoded.replace(/\+/g,'-').replace(/\//g,'_');
-	}
-	return encoded;
+exports.base64Encode = function(string64) {
+	return base64utf8.base64.encode.call(base64utf8,string64);
 };

 /*
--- a/core/modules/widgets/browse.js
+++ b/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;
 };

--- a/core/modules/widgets/button.js
+++ b/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 {
-		if(changedAttributes["class"]) {
-			this.updateDomNodeClasses();
-		}
-		this.assignAttributes(this.domNodes[0],{
-			changedAttributes: changedAttributes,
-			sourcePrefix: "data-",
-			destPrefix: "data-"
-		});
+	} else if(changedAttributes["class"]) {
+		this.updateDomNodeClasses();
 	}
 	return this.refreshChildren(changedTiddlers);
 };
--- a/core/modules/widgets/checkbox.js
+++ b/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;

 })();
-	
--- a/core/modules/widgets/draggable.js
+++ b/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,19 +108,13 @@ 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();
-	if(changedAttributes.tag || changedAttributes.selector || changedAttributes.dragimagetype || changedAttributes.enable || changedAttributes.startactions || changedAttributes.endactions) {
+	var changedAttributes = this.computeAttributes(),
+		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.assignDomNodeClasses();
-		}
-		this.assignAttributes(this.domNodes[0],{
-			changedAttributes: changedAttributes,
-			sourcePrefix: "data-",
-			destPrefix: "data-"
-		});
 	}
 	return this.refreshChildren(changedTiddlers);
 };
--- a/core/modules/widgets/droppable.js
+++ b/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 {
-		if(changedAttributes["class"]) {
-			this.assignDomNodeClasses();
-		}
-		this.assignAttributes(this.domNodes[0],{
-			changedAttributes: changedAttributes,
-			sourcePrefix: "data-",
-			destPrefix: "data-"
-		});
+	} else if(changedAttributes["class"]) {
+		this.assignDomNodeClasses();
 	}
 	return this.refreshChildren(changedTiddlers);
 };
--- a/core/modules/widgets/image.js
+++ b/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,
-				typeInfo = $tw.config.contentTypeInfo[type] || {},
-				deserializerType = typeInfo.deserializerType || type;
+				_canonical_uri = tiddler.fields._canonical_uri;
 			// 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
-				var encoding = typeInfo.encoding || "utf8";
-				if (encoding === "base64") {
-					// .pdf .png .jpg etc.
-					src = "data:" + deserializerType + ";base64," + text;
-					if (deserializerType === "application/pdf") {
+				// Render the appropriate element for the image type
+				switch(type) {
+					case "application/pdf":
 						tag = "embed";
-					}
-				} else {
-					// .svg .tid .xml etc.
-					src = "data:" + deserializerType + "," + encodeURIComponent(text);
+						src = "data:application/pdf;base64," + text;
+						break;
+					case "image/svg+xml":
+						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 {
--- a/core/modules/widgets/link.js
+++ b/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) {
+	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;

 })();
-	
--- a/core/modules/widgets/list.js
+++ b/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.execute(changedAttributes);
+	this.computeAttributes();
+	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
-	if(this.join === undefined || (changedAttributes && changedAttributes.join)) {
-		this.join = this.makeJoinTemplate();
-	}
+	// Look for <$list-template> and <$list-empty> widgets as immediate child widgets
+	this.findExplicitTemplates();
 	// 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};
-	parseTreeNode.isLast = index === this.list.length - 1;
+	var parseTreeNode = {type: "listitem", itemTitle: title, variableName: this.variableName, children: templateTree};
 	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
-					if(mustRecreateLastItem && (isLast || wasLast)) {
-						this.removeListItem(t);
-						this.insertListItem(t,this.list[t]);
-						hasRefreshed = true;
-					} else {
-						var refreshed = this.children[t].refresh(changedTiddlers);
-						hasRefreshed = hasRefreshed || refreshed;
-					}
+					// Refresh the item we're reusing
+					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;
-
 })();
--- a/core/modules/widgets/radio.js
+++ b/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;
 	}
--- a/core/modules/widgets/range.js
+++ b/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"},
--- a/core/modules/widgets/scrollable.js
+++ b/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
-	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;
+	return this.refreshChildren(changedTiddlers);
 };

 exports.scrollable = ScrollableWidget;
--- a/core/modules/widgets/select.js
+++ b/core/modules/widgets/select.js
@@ -40,31 +40,7 @@ SelectWidget.prototype.render = function(parent,nextSibling) {
 	this.parentDomNode = parent;
 	this.computeAttributes();
 	this.execute();
-	//Create element
-	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.renderChildren(domNode,nextSibling);
-	this.parentDomNode.insertBefore(domNode,nextSibling);
-	this.domNodes.push(domNode);
+	this.renderChildren(parent,nextSibling);
 	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();
 		} 
--- a/core/modules/widgets/transclude.js
+++ b/core/modules/widgets/transclude.js
@@ -109,7 +109,6 @@ TranscludeWidget.prototype.collectAttributes = function() {
 		this.recursionMarker = this.getAttribute("recursionMarker","yes");
 	} else {
 		this.transcludeVariable = this.getAttribute("$variable");
-		this.transcludeVariableIsFunction = false;
 		this.transcludeType = this.getAttribute("$type");
 		this.transcludeOutput = this.getAttribute("$output","text/html");
 		this.transcludeTitle = this.getAttribute("$tiddler",this.getVariable("currentTiddler"));
@@ -185,9 +184,7 @@ TranscludeWidget.prototype.getTransclusionTarget = function() {
 		if(this.transcludeVariable) {
 			// Transcluding a variable
 			var variableInfo = this.getVariableInfo(this.transcludeVariable,{params: this.getOrderedTransclusionParameters()});
-			this.transcludeVariableIsFunction = variableInfo.srcVariable && variableInfo.srcVariable.isFunctionDefinition;
 			text = variableInfo.text;
-			this.transcludeFunctionResult = text;
 			return {
 				text: variableInfo.text,
 				type: this.transcludeType
@@ -222,24 +219,21 @@ TranscludeWidget.prototype.parseTransclusionTarget = function(parseAsInline) {
 			// Transcluding a variable
 			var variableInfo = this.getVariableInfo(this.transcludeVariable,{params: this.getOrderedTransclusionParameters()}),
 				srcVariable = variableInfo && variableInfo.srcVariable;
-			if(srcVariable && srcVariable.isFunctionDefinition) {
-				this.transcludeVariableIsFunction = true;
-				this.transcludeFunctionResult = (variableInfo.resultList ? variableInfo.resultList[0] : variableInfo.text) || "";
-			}
 			if(variableInfo.text) {
 				if(srcVariable && srcVariable.isFunctionDefinition) {
+					var result = (variableInfo.resultList ? variableInfo.resultList[0] : variableInfo.text) || "";
 					parser = {
 						tree: [{
 							type: "text",
-							text: this.transcludeFunctionResult
+							text: result
 						}],
-						source: this.transcludeFunctionResult,
+						source: result,
 						type: "text/vnd.tiddlywiki"
 					};
 					if(parseAsInline) {
 						parser.tree[0] = {
 							type: "text",
-							text: this.transcludeFunctionResult
+							text: result
 						};
 					} else {
 						parser.tree[0] = {
@@ -247,7 +241,7 @@ TranscludeWidget.prototype.parseTransclusionTarget = function(parseAsInline) {
 							tag: "p",
 							children: [{
 								type: "text",
-								text: this.transcludeFunctionResult
+								text: result
 							}]
 						}
 					}
@@ -436,19 +430,12 @@ TranscludeWidget.prototype.parserNeedsRefresh = function() {
 	return (this.sourceText === undefined || parserInfo.sourceText !== this.sourceText || parserInfo.parserType !== this.parserType)
 };

-TranscludeWidget.prototype.functionNeedsRefresh = function() {
-	var oldResult = this.transcludeFunctionResult;
-	var variableInfo = this.getVariableInfo(this.transcludeVariable,{params: this.getOrderedTransclusionParameters()});
-	var newResult = (variableInfo.resultList ? variableInfo.resultList[0] : variableInfo.text) || "";
-	return oldResult !== newResult;
-}
-
 /*
 Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
 */
 TranscludeWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
-	if(($tw.utils.count(changedAttributes) > 0) || (this.transcludeVariableIsFunction && this.functionNeedsRefresh()) || (!this.transcludeVariable && changedTiddlers[this.transcludeTitle] && this.parserNeedsRefresh())) {
+	if(($tw.utils.count(changedAttributes) > 0) || (!this.transcludeVariable && changedTiddlers[this.transcludeTitle] && this.parserNeedsRefresh())) {
 		this.refreshSelf();
 		return true;
 	} else {
--- a/core/modules/widgets/widget.js
+++ b/core/modules/widgets/widget.js
@@ -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)
-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"
+excludeEventAttributes: ignores attributes whose name begins with "on"
 */
 Widget.prototype.assignAttributes = function(domNode,options) {
 	options = options || {};
-	var self = this,
-		changedAttributes = options.changedAttributes || this.attributes,
-		sourcePrefix = options.sourcePrefix || "",
-		destPrefix = options.destPrefix || "",
-		EVENT_ATTRIBUTE_PREFIX = "on";
+	var self = this;
 	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)
-			try {
-				domNode.setAttributeNS(namespace,name,value);
-			} catch(e) {
+			// Handle styles
+			if(name.substr(0,6) === "style." && name.length > 6) {
+				domNode.style[$tw.utils.unHyphenateCss(name.substr(6))] = value;
+			} 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.getAttribute(attribute.name));
-			}
-		});
-	// Otherwise update each changed attribute irrespective of order
+			assignAttribute(attribute.name,self.attributes[attribute.name]);
+		});	
 	} else {
-		$tw.utils.each(changedAttributes,function(value,name) {
-			assignAttribute(name,self.getAttribute(name));
+		$tw.utils.each(Object.keys(self.attributes).sort(),function(name) {
+			assignAttribute(name,self.attributes[name]);
 		});	
 	}
 };
--- a/core/modules/wiki.js
+++ b/core/modules/wiki.js
@@ -1287,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 {
@@ -1298,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 {
--- a/core/templates/html-json-skinny-tiddler.tid
+++ b/core/templates/html-json-skinny-tiddler.tid
@@ -1,3 +1,4 @@
 title: $:/core/templates/html-json-skinny-tiddler

+<$list filter="[<numTiddlers>compare:number:gteq[1]] ~[<counter>!match[1]]">`,`<$text text=<<newline>>/></$list>
 <$jsontiddler tiddler=<<currentTiddler>> exclude="text" escapeUnsafeScriptChars="yes"/>
--- a/core/templates/html-json-tiddler.tid
+++ b/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"/>
--- a/core/templates/store.area.template.html.tid
+++ b/core/templates/store.area.template.html.tid
@@ -6,14 +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"/>
                <$vars numTiddlers={{{ [subfilter<saveTiddlerFilter>count[]] }}}>
-                    <$list filter={{{ [<skinnySaveTiddlerFilter>] }}} join=<<join>> template="$:/core/templates/html-json-skinny-tiddler"/>
+                    <$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>`
--- a/core/ui/ControlPanel/Basics.tid
+++ b/core/ui/ControlPanel/Basics.tid
@@ -26,10 +26,10 @@ caption: {{$:/language/ControlPanel/Basics/Caption}}
 |<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
 |<$link to="$:/status/UserName"><<lingo Username/Prompt>></$link> |<$edit-text tiddler="$:/status/UserName" default="" tag="input"/> |
 |<$link to="$:/config/AnimationDuration"><<lingo AnimDuration/Prompt>></$link> |<$edit-text tiddler="$:/config/AnimationDuration" default="" tag="input"/> |
-|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit class="tc-edit-texteditor" tiddler="$:/DefaultTiddlers" autoHeight="yes"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
+|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit class="tc-edit-texteditor" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
 |<$link to="$:/language/DefaultNewTiddlerTitle"><<lingo NewTiddler/Title/Prompt>></$link> |<$edit-text tiddler="$:/language/DefaultNewTiddlerTitle" default="" tag="input"/> |
 |<$link to="$:/config/NewJournal/Title"><<lingo NewJournal/Title/Prompt>></$link> |<$edit-text tiddler="$:/config/NewJournal/Title" default="" tag="input"/> |
-|<$link to="$:/config/NewJournal/Text"><<lingo NewJournal/Text/Prompt>></$link> |<$edit tiddler="$:/config/NewJournal/Text" class="tc-edit-texteditor" default="" autoHeight="yes"/> |
+|<$link to="$:/config/NewJournal/Text"><<lingo NewJournal/Text/Prompt>></$link> |<$edit tiddler="$:/config/NewJournal/Text" class="tc-edit-texteditor" default=""/> |
 |<$link to="$:/config/NewTiddler/Tags"><<lingo NewTiddler/Tags/Prompt>></$link> |<$vars currentTiddler="$:/config/NewTiddler/Tags" tagField="text">{{||$:/core/ui/EditTemplate/tags}}<$list filter="[<currentTiddler>tags[]] +[limit[1]]" variable="ignore"><$button tooltip={{$:/language/ControlPanel/Basics/RemoveTags/Hint}}><<lingo RemoveTags>><$action-listops $tiddler=<<currentTiddler>> $field="text" $subfilter={{{ [<currentTiddler>get[tags]] }}}/><$action-setfield $tiddler=<<currentTiddler>> tags=""/></$button></$list></$vars> |
 |<$link to="$:/config/NewJournal/Tags"><<lingo NewJournal/Tags/Prompt>></$link> |<$vars currentTiddler="$:/config/NewJournal/Tags" tagField="text">{{||$:/core/ui/EditTemplate/tags}}<$list filter="[<currentTiddler>tags[]] +[limit[1]]" variable="ignore"><$button tooltip={{$:/language/ControlPanel/Basics/RemoveTags/Hint}}><<lingo RemoveTags>><$action-listops $tiddler=<<currentTiddler>> $field="text" $subfilter={{{ [<currentTiddler>get[tags]] }}}/><$action-setfield $tiddler=<<currentTiddler>> tags=""/></$button></$list></$vars> |
 |<$link to="$:/config/AutoFocus"><<lingo AutoFocus/Prompt>></$link> |{{$:/snippets/minifocusswitcher}} |
--- a/core/ui/EditTemplate/body/default.tid
+++ b/core/ui/EditTemplate/body/default.tid
@@ -18,7 +18,7 @@ $:/config/EditorToolbarButtons/Visibility/$(currentTiddler)$
 	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={{{ [function[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"/>

--- a/core/ui/EditTemplate/fields.tid
+++ b/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>
--- a/core/ui/ViewTemplate/subtitle.tid
+++ b/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">
-<$transclude tiddler=<<subtitleTiddler>> mode="inline"/><$list-join>&nbsp;</$list-join>
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewTemplate/Subtitle]!has[draft.of]]" variable="subtitleTiddler" counter="indexSubtitleTiddler">
+<$list filter="[<indexSubtitleTiddler-first>match[no]]" variable="ignore">
+&nbsp;
+</$list>
+<$transclude tiddler=<<subtitleTiddler>> mode="inline"/>
 </$list>
 </div>
 </$reveal>
--- a/core/wiki/config/OfficialPluginLibrary.tid
+++ b/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}}
--- a/core/wiki/macros/colour-picker.tid
+++ b/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>
--- a/core/wiki/macros/image-picker.tid
+++ b/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
--- a/core/wiki/macros/list.tid
+++ b/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__>>>
-		<$genesis $type=<<__subtype__>>>
-			<$link to={{!!title}}>
-				<$let tv-wikilinks="no">
-					<$transclude field=<<__field__>>>
-						<$view field="title"/>
-					</$transclude>
-				</$let>
-			</$link>
-		</$genesis>
-	</$list>
+<$list filter=<<__filter__>> emptyMessage=<<__emptyMessage__>>>
+<$genesis $type=<<__subtype__>>>
+<$link to={{!!title}}>
+<$let tv-wikilinks="no">
+<$transclude field=<<__field__>>>
+<$view field="title"/>
+</$transclude>
+</$let>
+</$link>
+</$genesis>
+</$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$""">
-		<$genesis $type=<<__type__>> class="$class$">
-			<$list filter="[list[$tiddler$!!$field$]]" emptyMessage=<<__emptyMessage__>>>
-				<$droppable
-					actions=<<list-links-draggable-drop-actions>>
-					tag="""$subtype$"""
-					enable=<<tv-enable-drag-and-drop>>
-				>
-					<div class="tc-droppable-placeholder"/>
-					<div>
-						<$transclude tiddler="""$itemTemplate$""">
-							<$link to={{!!title}}>
-								<$let tv-wikilinks="no">
-									<$transclude field="caption">
-										<$view field="title"/>
-									</$transclude>
-								</$let>
-							</$link>
-						</$transclude>
-					</div>
-				</$droppable>
-			</$list>
-			<$tiddler tiddler="">
-				<$droppable
-					actions=<<list-links-draggable-drop-actions>> 
-					tag="div"
-					enable=<<tv-enable-drag-and-drop>>
-				>
-					<div class="tc-droppable-placeholder">
-						{{$:/core/images/blank}}
-					</div>
-					<div style="height:0.5em;"/>
-				</$droppable>
-			</$tiddler>
-		</$genesis>
-	</$vars>
+<$vars targetTiddler="""$tiddler$""" targetField="""$field$""">
+<$genesis $type=<<__type__>> class="$class$">
+<$list filter="[list[$tiddler$!!$field$]]" emptyMessage=<<__emptyMessage__>>>
+<$droppable actions=<<list-links-draggable-drop-actions>> tag="""$subtype$""" enable=<<tv-enable-drag-and-drop>>>
+<div class="tc-droppable-placeholder"/>
+<div>
+<$transclude tiddler="""$itemTemplate$""">
+<$link to={{!!title}}>
+<$let tv-wikilinks="no">
+<$transclude field="caption">
+<$view field="title"/>
+</$transclude>
+</$let>
+</$link>
+</$transclude>
+</div>
+</$droppable>
+</$list>
+<$tiddler tiddler="">
+<$droppable actions=<<list-links-draggable-drop-actions>> tag="div" enable=<<tv-enable-drag-and-drop>>>
+<div class="tc-droppable-placeholder">
+{{$:/core/images/blank}}
+</div>
+<div style="height:0.5em;"/>
+</$droppable>
+</$tiddler>
+</$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 -->
-	<$list filter="[<__tag__>tagging[]]">
-		<$action-deletefield $field="list-before"/>
-		<$action-deletefield $field="list-after"/>
-	</$list>
-	<!-- Save the new order to the Tag Tiddler -->
-	<$action-listops $tiddler=<<__tag__>> $field="list" $filter="+[enlist<order>] +[insertbefore<actionTiddler>,<currentTiddler>]"/>
-	<!-- Make sure the newly added item has the right tag -->
-	<!-- Removing this line makes dragging tags within the dropdown work as intended -->
-	<!--<$action-listops $tiddler=<<actionTiddler>> $tags=<<__tag__>>/>-->
-	<!-- Using the following 5 lines as replacement makes dragging titles from outside into the dropdown apply the tag -->
-	<$list filter="[<actionTiddler>!contains:tags<__tag__>]">
-		<$fieldmangler tiddler=<<actionTiddler>>>
-			<$action-sendmessage $message="tm-add-tag" $param=<<__tag__>>/>
-		</$fieldmangler>
-	</$list>
+<!-- Remove any list-after or list-before fields from the tiddlers with this tag -->
+<$list filter="[<__tag__>tagging[]]">
+<$action-deletefield $field="list-before"/>
+<$action-deletefield $field="list-after"/>
+</$list>
+<!-- Save the new order to the Tag Tiddler -->
+<$action-listops $tiddler=<<__tag__>> $field="list" $filter="+[enlist<order>] +[insertbefore<actionTiddler>,<currentTiddler>]"/>
+<!-- Make sure the newly added item has the right tag -->
+<!-- Removing this line makes dragging tags within the dropdown work as intended -->
+<!--<$action-listops $tiddler=<<actionTiddler>> $tags=<<__tag__>>/>-->
+<!-- Using the following 5 lines as replacement makes dragging titles from outside into the dropdown apply the tag -->
+<$list filter="[<actionTiddler>!contains:tags<__tag__>]">
+<$fieldmangler tiddler=<<actionTiddler>>>
+<$action-sendmessage $message="tm-add-tag" $param=<<__tag__>>/>
+</$fieldmangler>
+</$list>
 </$set>
 \end

 \define list-tagged-draggable(tag,subFilter,emptyMessage,itemTemplate,elementTag:"div",storyview:"")
 \whitespace trim
 <span class="tc-tagged-draggable-list">
-	<$set name="tag" value=<<__tag__>>>
-		<$list
-			filter="[<__tag__>tagging[]$subFilter$]"
-			emptyMessage=<<__emptyMessage__>>
-			storyview=<<__storyview__>>
-		>
-			<$genesis $type=<<__elementTag__>> class="tc-menu-list-item">
-				<$droppable
-					actions="""<$macrocall $name="list-tagged-draggable-drop-actions" tag=<<__tag__>>/>"""
-					enable=<<tv-enable-drag-and-drop>>
-				>
-					<$genesis $type=<<__elementTag__>> class="tc-droppable-placeholder"/>
-					<$genesis $type=<<__elementTag__>>>
-						<$transclude tiddler="""$itemTemplate$""">
-							<$link to={{!!title}}>
-								<$view field="title"/>
-							</$link>
-						</$transclude>
-					</$genesis>
-				</$droppable>
-			</$genesis>
-		</$list>
-		<$tiddler tiddler="">
-			<$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>
+<$set name="tag" value=<<__tag__>>>
+<$list filter="[<__tag__>tagging[]$subFilter$]" emptyMessage=<<__emptyMessage__>> storyview=<<__storyview__>>>
+<$genesis $type=<<__elementTag__>> class="tc-menu-list-item">
+<$droppable actions="""<$macrocall $name="list-tagged-draggable-drop-actions" tag=<<__tag__>>/>""" enable=<<tv-enable-drag-and-drop>>>
+<$genesis $type=<<__elementTag__>> class="tc-droppable-placeholder"/>
+<$genesis $type=<<__elementTag__>>>
+<$transclude tiddler="""$itemTemplate$""">
+<$link to={{!!title}}>
+<$view field="title"/>
+</$link>
+</$transclude>
+</$genesis>
+</$droppable>
+</$genesis>
+</$list>
+<$tiddler tiddler="">
+<$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;">
+</$genesis>
+</$droppable>
+</$tiddler>
+</$set>
 </span>
 \end
--- a/core/wiki/macros/tabs.tid
+++ b/core/wiki/macros/tabs.tid
@@ -4,15 +4,7 @@ code-body: yes

 \define tabs-button()
 \whitespace trim
-<$button
-	set=<<tabsState>>
-	setTo=<<currentTab>>
-	default=<<__default__>>
-	selectedClass="tc-tab-selected"
-	tooltip={{!!tooltip}}
-	role="switch"
-	data-tab-title=<<currentTab>>
->
+<$button set=<<tabsState>> setTo=<<currentTab>> default=<<__default__>> selectedClass="tc-tab-selected" tooltip={{!!tooltip}} role="switch">
 	<$tiddler tiddler=<<save-currentTiddler>>>
 		<$set name="tv-wikilinks" value="no">
 			<$transclude tiddler=<<__buttonTemplate__>> mode="inline">
--- a/core/wiki/macros/tag-picker.tid
+++ b/core/wiki/macros/tag-picker.tid
@@ -16,7 +16,7 @@ second-search-filter: [tags[]is[system]search:title<userInput>sort[]]
 		emptyMessage="<$action-listops $tiddler=<<saveTiddler>> $field=<<__tagField__>> $subfilter='-[<tag>]'/>"
 	>
 		<$action-listops $tiddler=<<saveTiddler>> $field=<<__tagField__>> $subfilter="[<tag>trim[]]"/>
-		<$transclude $variable="__actions__"/>
+		$actions$
 	</$list>
 </$set>
 <<delete-tag-state-tiddlers>>
@@ -102,7 +102,7 @@ second-search-filter: [tags[]is[system]search:title<userInput>sort[]]
 						<$set name="tag" value={{{ [<newTagNameTiddler>get[text]] }}}>
 							<$button set=<<newTagNameTiddler>> setTo="" class="">
 								<$action-listops $tiddler=<<saveTiddler>> $field=<<__tagField__>> $subfilter="[<tag>trim[]]"/>
-								<$transclude $variable="__actions__"/>
+									$actions$
 								<$set name="currentTiddlerCSSEscaped" value={{{ [<saveTiddler>escapecss[]] }}}>
 									<<delete-tag-state-tiddlers>><$action-sendmessage $message="tm-focus-selector" $param=<<get-tagpicker-focus-selector>>/>
 								</$set>
--- a/core/wiki/macros/toc.tid
+++ b/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>> />
--- a/editions/de-AT/tiddlers/HelloThere.tid
+++ b/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">
-{{$:/core/images/help}} ~TiddlyWiki Forum
+<a href="http://groups.google.com/group/TiddlyWiki" class="tc-btn-big-green" style="background-color:#FF8C19;" target="_blank">
+{{$:/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
--- a/editions/de-AT/tiddlers/community/Fur_Entwickler.tid
+++ b/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. 
--- a/editions/es-ES/tiddlers/Forums.tid
+++ b/editions/es-ES/tiddlers/Forums.tid
@@ -12,9 +12,7 @@ Son listas de correo en las que hablamos de ~TiddlyWiki: pedimos ayuda, anunciam

 Puedes participar a través de la página web asociada, o suscribirte via mail.

-!! Usuarios
-
-[[Foro oficial de TiddlyWiki| https://talk.tiddlywiki.org/]]
+!!Usuarios

 [[Grupo principal de TiddlyWiki| http://groups.google.com/group/TiddlyWiki]]

@@ -27,7 +25,10 @@ o síguenos [[en Twitter|http://twitter.com/TiddlyWiki]] si quieres recibir las

 !! Desarrolladores

-[[Foro de desarrollo de TiddlyWiki|https://talk.tiddlywiki.org/c/devs]]
+[[Grupo de desarrollo de TiddlyWiki|http://groups.google.com/group/TiddlyWikiDev]]
+
+>No necesitas tener cuenta en Google para acceder al grupo. Suscríbete igualmente enviando un mail a:
+*mailto:tiddlywikidev+subscribe@googlegroups.com.

 Accede a nuestra [[página de desarrollo|https://github.com/Jermolene/TiddlyWiki5]] en GitHub y haz tu contribución.

--- a/editions/es-ES/tiddlers/HelloThere.tid
+++ b/editions/es-ES/tiddlers/HelloThere.tid
@@ -20,8 +20,8 @@ BIenvenido a TiddlyWiki, un bloc de notas [[no lineal|Philosophy of Tiddlers]]
 Al revés que los servicios online convencionales, TiddlyWiki te deja escoger dónde quieres guardar tus datos, garantizándote que, por más que pase el tiempo, podrás seguir usando en el futuro las notas que tomes hoy.

 <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" rel="noopener noreferrer">
-{{$:/core/images/mail}} Foro oficial de ~TiddlyWiki
+<a href="http://groups.google.com/group/TiddlyWiki" class="tc-btn-big-green" style="background-color:#FF8C19;" target="_blank" rel="noopener noreferrer">
+{{$:/core/images/mail}} ~TiddlyWiki en Google Groups
 </a>
 <a href="https://www.youtube.com/c/JeremyRuston" class="tc-btn-big-green" style="background-color:#e52d27;" target="_blank" rel="noopener noreferrer">
 {{$:/core/images/video}} ~TiddlyWiki en ~YouTube
--- a/editions/es-ES/tiddlers/Typography.tid
+++ b/editions/es-ES/tiddlers/Typography.tid
@@ -8,7 +8,7 @@ type: text/vnd.tiddlywiki

 Se recomienda el uso de las [[macros de documentación|Documentation Macros]] para facilitar las futuras tareas de mantenimiento del texto frente a nuevos cambios y actualizaciones. 

-Se recomienda precaución en el uso arbitrario de estilos directos de formato (''negrita'', //cursiva// ...etc). Si se puede usar una macro, conviene usarla. Si no existe la macro adecuada, se puede crear o, si no se sabe cómo, pedir su creación en el [[Foro de TiddlyWiki|https://talk.tiddlywiki.org/]].
+Se recomienda precaución en el uso arbitrario de estilos directos de formato (''negrita'', //cursiva// ...etc). Si se puede usar una macro, conviene usarla. Si no existe la macro adecuada, se puede crear o, si no se sabe cómo, pedir su creación en el [[Grupo de Google|http://groups.google.com/group/TiddlyWiki]].

 Por el mismo motivo, se aconseja el uso de acentos graves <code>&#96;...&#96;</code> para transcribir fragmentos de código y ~WikiText, pero no para nombres de cosas tales como campos, operadores, variables o widgets. Estas tienen su macro correspondiente.

--- a/editions/prerelease/tiddlers/Release
+++ b/editions/prerelease/tiddlers/Release
@@ -0,0 +1,78 @@
+caption: 5.3.2
+created: 20230820114855583
+modified: 20230820114855583
+tags: ReleaseNotes
+title: Release 5.3.2
+type: text/vnd.tiddlywiki
+description: Under development
+
+//[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.3.1...master]]//
+
+! Translation improvement
+
+Improvements to the following translations:
+
+* Chinese
+* Polish
+* Spanish
+
+! Plugin Improvements
+
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/1be8f0a9336952d4745d2bd4f2327e353580a272">> comments plugin to use predefined palette colours
+
+! Widget Improvements
+
+* 
+
+! Usability Improvements
+
+* <<.link-badge-updated "https://github.com/Jermolene/TiddlyWiki5/pull/7747">> editor preview button to automatically focus the editor
+* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7764">> file type names in the export menu
+
+! Hackability Improvements
+
+* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7737">> an automatic build of the external core TiddlyWiki at https://tiddlywiki.com/empty-external-core.html
+* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7690">> the default page layout to better support CSS grid and flexbox layouts
+
+! Bug Fixes
+
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/7665">> `{{}}` generating a recursion error
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7758">> ordering of Vanilla stylesheets
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/fa9bfa07a095548eb2f8339b0b1b816d2e6794ef">> missing closing tag in tag-pill-inner macro
+* <<.link-badge-removed "https://github.com/Jermolene/TiddlyWiki5/issues/7732">> invalid "type" attribute from textarea elements generated by the EditTextWidget
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7749">> editor "type" dropdown state tiddlers
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7712">> handling of "counter-last" variable when appending items with the ListWidget
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/6088">> upgrade download link in Firefox
+
+! Node.js Improvements
+
+* 
+
+! Performance Improvements
+
+* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7702">> performance of predefined patterns with [[all Operator]]
+* <<.link-badge-updated "https://github.com/Jermolene/TiddlyWiki5/issues/7671">> favicon format to PNG
+
+! Developer Improvements
+
+* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7751">> global hook handling to support removing hooks
+
+! Acknowledgements
+
+[[@Jermolene|https://github.com/Jermolene]] would like to thank the contributors to this release who have generously given their time to help improve TiddlyWiki:
+
+<<.contributors """
+AnthonyMuscio
+BramChen
+BuckarooBanzay
+BurningTreeC
+EvidentlyCube
+joebordes
+kookma
+linonetwo
+mateuszwilczek
+pmario
+rmunn
+simonbaird
+T1mL3arn
+""">>
--- a/editions/prerelease/tiddlers/Release
+++ b/editions/prerelease/tiddlers/Release
@@ -1,58 +0,0 @@
-caption: 5.3.3
-created: 20231213080754563
-modified: 20231213080754563
-tags: ReleaseNotes
-title: Release 5.3.3
-type: text/vnd.tiddlywiki
-description: Under development
-
-//[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.3.2...master]]//
-
-! Translation improvements
-
-Improvements to the following translations:
-
-* 
-
-! Plugin Improvements
-
-* 
-
-! Widget Improvements
-
-* 
-
-! Usability Improvements
-
-* 
-
-! Hackability Improvements
-
-* 
-
-! Bug Fixes
-
-* 
-
-! Node.js Improvements
-
-* 
-
-! Performance Improvements
-
-* 
-
-! Developer Improvements
-
-* 
-
-! Infrastructure Improvements
-
-* 
-
-! Acknowledgements
-
-[[@Jermolene|https://github.com/Jermolene]] would like to thank the contributors to this release who have generously given their time to help improve TiddlyWiki:
-
-<<.contributors """
-""">>
--- a/editions/prerelease/tiddlers/system/PrereleaseOfficialPluginLibrary.tid
+++ b/editions/prerelease/tiddlers/system/PrereleaseOfficialPluginLibrary.tid
@@ -1,6 +1,6 @@
 title: $:/config/OfficialPluginLibrary
 tags: $:/tags/PluginLibrary
-url: https://tiddlywiki.com/prerelease/library/v5.3.3/index.html
+url: https://tiddlywiki.com/prerelease/library/v5.3.2/index.html
 caption: {{$:/language/OfficialPluginLibrary}} (Prerelease)

 The prerelease version of the official ~TiddlyWiki plugin library at tiddlywiki.com. Plugins, themes and language packs are maintained by the core team.
--- a/editions/prerelease/tiddlers/system/temp-my-scroll-position.tid
+++ b/editions/prerelease/tiddlers/system/temp-my-scroll-position.tid
@@ -1,3 +0,0 @@
-title: $:/my-scroll-position
-scroll-left: 0
-scroll-top: 100
--- a/editions/test/playwright.spec.js
+++ b/editions/test/playwright.spec.js
@@ -1,25 +0,0 @@
-const { test, expect } = require('@playwright/test');
-const {resolve} = require('path');
-
-const indexPath = resolve(__dirname, 'output', 'test.html');
-const crossPlatformIndexPath = indexPath.replace(/^\/+/, '');
-
-
-test('get started link', async ({ page }) => {
-    // The tests can take a while to run
-    const timeout = 1000 * 30;
-    test.setTimeout(timeout);
-
-    // Load the generated test TW html
-    await page.goto(`file:///${crossPlatformIndexPath}`);
-
-    // Sanity check
-    await expect(page.locator('.tc-site-title'), "Expected correct page title to verify the test page was loaded").toHaveText('TiddlyWiki5');
-
-    // Wait for jasmine results bar to appear
-    await expect(page.locator('.jasmine-overall-result'), "Expected jasmine test results bar to be present").toBeVisible({timeout});
-
-    // Assert the tests have passed
-    await expect(page.locator('.jasmine-overall-result.jasmine-failed'), "Expected jasmine tests to not have failed").not.toBeVisible();
-    await expect(page.locator('.jasmine-overall-result.jasmine-passed'), "Expected jasmine tests to have passed").toBeVisible();
-});
--- a/editions/test/tiddlers/tests/data/list-widget/WithEmptyParagraphTemplate.tid
+++ b/editions/test/tiddlers/tests/data/list-widget/WithEmptyParagraphTemplate.tid
@@ -1,13 +0,0 @@
-title: ListWidget/WithEmptyParagraphTemplate
-description: List widget with an empty paragraph as inline template
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-+
-title: Output
-
-<$list filter="1"><p/></$list>
-+
-title: ExpectedResult
-
-<p><p></p></p>
--- a/editions/test/tiddlers/tests/data/list-widget/WithJoinTemplate.tid
+++ b/editions/test/tiddlers/tests/data/list-widget/WithJoinTemplate.tid
@@ -1,30 +0,0 @@
-title: ListWidget/WithJoinTemplate
-description: List widget with join template and $list-empty
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-+
-title: Output
-
-\whitespace trim
-
-\procedure test(filter)
-<$list filter=<<filter>>>
-	Item:<<currentTiddler>>
-
-	<$list-empty>
-		None!
-	</$list-empty>
-
-	<$list-join>,</$list-join>
-</$list>
-\end
-
-<<test "1 2 3">>
-
-<<test "">>
-
-+
-title: ExpectedResult
-
-<p>Item:1,Item:2,Item:3</p><p>None!</p>
--- a/editions/test/tiddlers/tests/data/list-widget/WithJoinTemplateInBlockMode.tid
+++ b/editions/test/tiddlers/tests/data/list-widget/WithJoinTemplateInBlockMode.tid
@@ -1,32 +0,0 @@
-title: ListWidget/WithJoinTemplateInBlockMode
-description: List widget with join template and $list-empty in block mode
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-+
-title: Output
-
-\whitespace trim
-
-\procedure test(filter)
-<$list filter=<<filter>>>
-
-	Item:<<currentTiddler>>
-
-	<$list-empty>
-		None!
-	</$list-empty>
-
-	<$list-join><br></$list-join>
-</$list>
-\end
-
-<<test "1 2 3">>
-
-<<test "">>
-
-+
-title: ExpectedResult
-comment: I wish there was a good way to get rid of these extraneous paragraph elements
-
-<p>Item:1</p><p></p><p></p><br><p>Item:2</p><p></p><p></p><br><p>Item:3</p><p></p><p></p>None!
--- a/editions/test/tiddlers/tests/data/transclude/CustomWidget-CodeblockOverride-TextParser.tid
+++ b/editions/test/tiddlers/tests/data/transclude/CustomWidget-CodeblockOverride-TextParser.tid
@@ -1,20 +0,0 @@
-title: Transclude/CustomWidget/CodeblockOverride-TextParser
-description: Test that overriding codeblock widget does not impact text parser
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-title: Output
-
-\whitespace trim
-\widget $codeblock(code)
-<$transclude $variable="copy-to-clipboard" src=<<code>>/>
-<$genesis $type="$codeblock" $remappable="no" code=<<code>>/>
-\end
-
-\procedure myvariable() hello
-
-<$transclude $variable="myvariable" $type="text/plain" $output="text/plain"/>
-+
-title: ExpectedResult
-
-<p>hello</p>
--- a/editions/test/tiddlers/tests/data/transclude/Variable-Refreshing.tid
+++ b/editions/test/tiddlers/tests/data/transclude/Variable-Refreshing.tid
@@ -1,27 +0,0 @@
-title: Transclude/Variable/Refreshing
-description: Transcluding and refreshing a function
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-title: Output
-
-\function list-join(filter, sep:", ") [subfilter<filter>join<sep>]
-
-<$tiddler tiddler="TestData">
-
-<<list-join "[enlist{!!items}]">>
-
-</$tiddler>
-
-+
-title: TestData
-
-
-+
-title: Actions
-
-<$action-setfield $tiddler="TestData" items={{{ [range[10]join[ ]] }}}/>
-+
-title: ExpectedResult
-
-<p>1, 2, 3, 4, 5, 6, 7, 8, 9, 10</p>
--- a/editions/test/tiddlers/tests/data/transclude/Variable-Static.tid
+++ b/editions/test/tiddlers/tests/data/transclude/Variable-Static.tid
@@ -1,15 +0,0 @@
-title: Transclude/Variable/Static
-description: Transcluding a function
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-title: Output
-items: 1 2 3 4 5 6 7 8 9 10
-
-\function list-join(filter, sep:", ") [subfilter<filter>join<sep>]
-
-<<list-join "[enlist{!!items}]">>
-+
-title: ExpectedResult
-
-<p>1, 2, 3, 4, 5, 6, 7, 8, 9, 10</p>
--- a/editions/test/tiddlers/tests/data/widgets/DataAttributes/ButtonWidget-DataAttributes.tid
+++ b/editions/test/tiddlers/tests/data/widgets/DataAttributes/ButtonWidget-DataAttributes.tid
@@ -1,27 +0,0 @@
-title: Widgets/DataAttributes/ButtonWidget
-description: Data Attributes for ButtonWidget
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-title: Output
-
-\whitespace trim
-<$button tag="div" class="myclass" data-title="mytiddler" style.color="red" onclick="clicked">
-my tiddler
-</$button>
-<$button tag="div" class="myclass" data-title={{Temp}} style.color={{{ [[Temp]get[color]] }}}>
-hello
-</$button>
-+
-title: Actions
-
-<$action-setfield $tiddler="Temp" $field="text" $value="Title2" color="red"/>
-+
-title: Temp
-color: black
-
-Title1
-+
-title: ExpectedResult
-
-<p><div class="myclass" data-title="mytiddler" style="color:red;">my tiddler</div><div class="myclass" data-title="Title2" style="color:red;">hello</div></p>
--- a/editions/test/tiddlers/tests/data/widgets/DataAttributes/CheckboxWidget-DataAttributes.tid
+++ b/editions/test/tiddlers/tests/data/widgets/DataAttributes/CheckboxWidget-DataAttributes.tid
@@ -1,22 +0,0 @@
-title: Widgets/DataAttributes/CheckboxWidget
-description: Data Attributes for CheckboxWidget
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-title: Output
-
-\whitespace trim
-<$checkbox tag="done" data-title={{Temp}} style.color={{{ [[Temp]get[color]] }}} onclick="clicked"> Is it done?</$checkbox>
-+
-title: Actions
-
-<$action-setfield $tiddler="Temp" $field="text" $value="Title2" color="red"/>
-+
-title: Temp
-color: black
-
-Title1
-+
-title: ExpectedResult
-
-<p><label class="tc-checkbox "><input data-title="Title2" type="checkbox" style="color:red;"><span>Is it done?</span></label></p>
--- a/editions/test/tiddlers/tests/data/widgets/DataAttributes/DraggableWidget-DataAttributes.tid
+++ b/editions/test/tiddlers/tests/data/widgets/DataAttributes/DraggableWidget-DataAttributes.tid
@@ -1,27 +0,0 @@
-title: Widgets/DataAttributes/DraggableWidget
-description: Data Attributes for DraggableWidget
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-title: Output
-
-\whitespace trim
-<$draggable tag="div" class="myclass" data-title="mytiddler" style.color="red" onclick="clicked">
-my tiddler
-</$draggable>
-<$draggable tag="div" class="myclass" data-title={{Temp}} style.color={{{ [[Temp]get[color]] }}}>
-hello
-</$draggable>
-+
-title: Actions
-
-<$action-setfield $tiddler="Temp" $field="text" $value="Title2" color="red"/>
-+
-title: Temp
-color: black
-
-Title1
-+
-title: ExpectedResult
-
-<p><div class="myclass tc-draggable" data-title="mytiddler" draggable="true" style="color:red;">my tiddler</div><div class="myclass tc-draggable" data-title="Title2" draggable="true" style="color:red;">hello</div></p>
--- a/editions/test/tiddlers/tests/data/widgets/DataAttributes/DroppableWidget-DataAttributes.tid
+++ b/editions/test/tiddlers/tests/data/widgets/DataAttributes/DroppableWidget-DataAttributes.tid
@@ -1,27 +0,0 @@
-title: Widgets/DataAttributes/DroppableWidget
-description: Data Attributes for DroppableWidget
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-title: Output
-
-\whitespace trim
-<$droppable tag="div" class="myclass" data-title="mytiddler" style.color="red" onclick="clicked">
-my tiddler
-</$droppable>
-<$droppable tag="div" class="myclass" data-title={{Temp}} style.color={{{ [[Temp]get[color]] }}}>
-hello
-</$droppable>
-+
-title: Actions
-
-<$action-setfield $tiddler="Temp" $field="text" $value="Title2" color="red"/>
-+
-title: Temp
-color: black
-
-Title1
-+
-title: ExpectedResult
-
-<p><div class="myclass tc-droppable" data-title="mytiddler" style="color:red;">my tiddler</div><div class="myclass tc-droppable" data-title="Title2" style="color:red;">hello</div></p>
--- a/editions/test/tiddlers/tests/data/widgets/DataAttributes/LinkWidget-DataAttributes.tid
+++ b/editions/test/tiddlers/tests/data/widgets/DataAttributes/LinkWidget-DataAttributes.tid
@@ -1,27 +0,0 @@
-title: Widgets/DataAttributes/LinkWidget
-description: Data Attributes for LinkWidget
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-title: Output
-
-\whitespace trim
-<$link data-id="mytiddler" style.color="red" to="Temp" onclick="clicked">
-link to Temp
-</$link>
-<$link tag="button" data-id={{Temp}} style.color={{{ [[Temp]get[color]] }}} to="SomeTiddler">
-some tiddler
-</$link>
-+
-title: Actions
-
-<$action-setfield $tiddler="Temp" $field="text" $value="Title2" color="red"/>
-+
-title: Temp
-color: black
-
-Title1
-+
-title: ExpectedResult
-
-<p><a class="tc-tiddlylink tc-tiddlylink-resolves" data-id="mytiddler" href="#Temp" style="color:red;">link to Temp</a><button class="tc-tiddlylink tc-tiddlylink-missing" data-id="Title2" draggable="true" style="color:red;">some tiddler</button></p>
--- a/editions/test/tiddlers/tests/data/widgets/DataAttributes/OrderedStyleAttributes.tid
+++ b/editions/test/tiddlers/tests/data/widgets/DataAttributes/OrderedStyleAttributes.tid
@@ -1,15 +0,0 @@
-title: Widgets/DataAttributes/OrderedStyleAttributes
-description: Ordered style attributes
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-title: Output
-
-\whitespace trim
-<div style="background:red;color:blue;" style.background="green">
-hello
-</div>
-+
-title: ExpectedResult
-
-<p><div style="background:green;color:blue;">hello</div></p>
--- a/editions/test/tiddlers/tests/data/widgets/DataAttributes/SelectWidget-DataAttributes.tid
+++ b/editions/test/tiddlers/tests/data/widgets/DataAttributes/SelectWidget-DataAttributes.tid
@@ -1,27 +0,0 @@
-title: Widgets/DataAttributes/SelectWidget
-description: Data Attributes for SelectWidget
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-title: Output
-
-\whitespace trim
-<$select tiddler='New Tiddler' field='text' default='Choose a new text' data-title={{Temp}} style.color={{{ [[Temp]get[color]] }}} onclick="clicked">
-<option disabled>Choose a new text</option>
-<option>A Tale of Two Cities</option>
-<option>A New Kind of Science</option>
-<option>The Dice Man</option>
-</$select>
-+
-title: Actions
-
-<$action-setfield $tiddler="Temp" $field="text" $value="Title2" color="red"/>
-+
-title: Temp
-color: black
-
-Title1
-+
-title: ExpectedResult
-
-<p><select data-title="Title2" value="Choose a new text" style="color:red;"><option disabled="true">Choose a new text</option><option>A Tale of Two Cities</option><option>A New Kind of Science</option><option>The Dice Man</option></select></p>
--- a/editions/test/tiddlers/tests/data/widgets/ElementWidgetEventAttributes.tid
+++ b/editions/test/tiddlers/tests/data/widgets/ElementWidgetEventAttributes.tid
@@ -1,15 +0,0 @@
-title: Widgets/ElementWidgetEventAttributes
-description: Element widget should not support event attributes starting with "on"
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-title: Output
-
-\whitespace trim
-<div class="hello" onclick="clicked">
-TiddlyWiki
-</div>
-+
-title: ExpectedResult
-
-<p><div class="hello">TiddlyWiki</div></p>
--- a/editions/test/tiddlers/tests/data/widgets/ElementWidgetStyleAttributes.tid
+++ b/editions/test/tiddlers/tests/data/widgets/ElementWidgetStyleAttributes.tid
@@ -1,15 +0,0 @@
-title: Widgets/ElementWidgetStyleAttributes
-description: Element widget should support style.* attributes
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-title: Output
-
-\whitespace trim
-<div class="hello" onclick="clicked" style.color="blue" style.color="red" style.background="yellow">
-TiddlyWiki
-</div>
-+
-title: ExpectedResult
-
-<p><div class="hello" style="color:red;background:yellow;">TiddlyWiki</div></p>
--- a/editions/test/tiddlers/tests/test-filters.js
+++ b/editions/test/tiddlers/tests/test-filters.js
@@ -365,7 +365,6 @@ Tests the filtering mechanism.
 			expect(wiki.filterTiddlers("[sort[title]first[8]]").join(",")).toBe("$:/ShadowPlugin,$:/TiddlerTwo,a fourth tiddler,filter regexp test,has filter,hasList,one,Tiddler Three");
 			expect(wiki.filterTiddlers("[sort[title]first[x]]").join(",")).toBe("$:/ShadowPlugin");
 			expect(wiki.filterTiddlers("[sort[title]last[]]").join(",")).toBe("TiddlerOne");
-			expect(wiki.filterTiddlers("[sort[title]last[0]]").join(",")).toBe("");
 			expect(wiki.filterTiddlers("[sort[title]last[2]]").join(",")).toBe("Tiddler Three,TiddlerOne");
 			expect(wiki.filterTiddlers("[sort[title]last[8]]").join(",")).toBe("$:/TiddlerTwo,a fourth tiddler,filter regexp test,has filter,hasList,one,Tiddler Three,TiddlerOne");
 			expect(wiki.filterTiddlers("[sort[title]last[x]]").join(",")).toBe("TiddlerOne");
--- a/editions/test/tiddlers/tests/test-json-filters.js
+++ b/editions/test/tiddlers/tests/test-json-filters.js
@@ -53,11 +53,6 @@ describe("json filter tests", function() {
 		expect(wiki.filterTiddlers("[{First}jsonget[d],[f],[2]]")).toEqual(["true"]);
 		expect(wiki.filterTiddlers("[{First}jsonget[d],[f],[3]]")).toEqual(["false"]);
 		expect(wiki.filterTiddlers("[{First}jsonget[d],[f],[4]]")).toEqual(["null"]);
-		expect(wiki.filterTiddlers("[{First}jsonget[d],[f],[-5]]")).toEqual(["five"]);
-		expect(wiki.filterTiddlers("[{First}jsonget[d],[f],[-4]]")).toEqual(["six"]);
-		expect(wiki.filterTiddlers("[{First}jsonget[d],[f],[-3]]")).toEqual(["true"]);
-		expect(wiki.filterTiddlers("[{First}jsonget[d],[f],[-2]]")).toEqual(["false"]);
-		expect(wiki.filterTiddlers("[{First}jsonget[d],[f],[-1]]")).toEqual(["null"]);
 	});

 	it("should support the jsonextract operator", function() {
@@ -75,11 +70,6 @@ describe("json filter tests", function() {
 		expect(wiki.filterTiddlers("[{First}jsonextract[d],[f],[2]]")).toEqual(["true"]);
 		expect(wiki.filterTiddlers("[{First}jsonextract[d],[f],[3]]")).toEqual(["false"]);
 		expect(wiki.filterTiddlers("[{First}jsonextract[d],[f],[4]]")).toEqual(["null"]);
-		expect(wiki.filterTiddlers("[{First}jsonextract[d],[f],[-5]]")).toEqual(['"five"']);
-		expect(wiki.filterTiddlers("[{First}jsonextract[d],[f],[-4]]")).toEqual(['"six"']);
-		expect(wiki.filterTiddlers("[{First}jsonextract[d],[f],[-3]]")).toEqual(["true"]);
-		expect(wiki.filterTiddlers("[{First}jsonextract[d],[f],[-2]]")).toEqual(["false"]);
-		expect(wiki.filterTiddlers("[{First}jsonextract[d],[f],[-1]]")).toEqual(["null"]);
 	});

 	it("should support the jsonindexes operator", function() {
@@ -95,11 +85,6 @@ describe("json filter tests", function() {
 		expect(wiki.filterTiddlers("[{First}jsonindexes[d],[f],[2]]")).toEqual([]);
 		expect(wiki.filterTiddlers("[{First}jsonindexes[d],[f],[3]]")).toEqual([]);
 		expect(wiki.filterTiddlers("[{First}jsonindexes[d],[f],[4]]")).toEqual([]);
-		expect(wiki.filterTiddlers("[{First}jsonindexes[d],[f],[-5]]")).toEqual([]);
-		expect(wiki.filterTiddlers("[{First}jsonindexes[d],[f],[-4]]")).toEqual([]);
-		expect(wiki.filterTiddlers("[{First}jsonindexes[d],[f],[-3]]")).toEqual([]);
-		expect(wiki.filterTiddlers("[{First}jsonindexes[d],[f],[-2]]")).toEqual([]);
-		expect(wiki.filterTiddlers("[{First}jsonindexes[d],[f],[-1]]")).toEqual([]);
 	});

 	it("should support the jsontype operator", function() {
@@ -116,31 +101,6 @@ describe("json filter tests", function() {
 		expect(wiki.filterTiddlers("[{First}jsontype[d],[f],[2]]")).toEqual(["boolean"]);
 		expect(wiki.filterTiddlers("[{First}jsontype[d],[f],[3]]")).toEqual(["boolean"]);
 		expect(wiki.filterTiddlers("[{First}jsontype[d],[f],[4]]")).toEqual(["null"]);
-		expect(wiki.filterTiddlers("[{First}jsontype[d],[f],[-5]]")).toEqual(["string"]);
-		expect(wiki.filterTiddlers("[{First}jsontype[d],[f],[-4]]")).toEqual(["string"]);
-		expect(wiki.filterTiddlers("[{First}jsontype[d],[f],[-3]]")).toEqual(["boolean"]);
-		expect(wiki.filterTiddlers("[{First}jsontype[d],[f],[-2]]")).toEqual(["boolean"]);
-		expect(wiki.filterTiddlers("[{First}jsontype[d],[f],[-1]]")).toEqual(["null"]);
-	});
-
-	it("should support the jsonset operator", function() {
-		expect(wiki.filterTiddlers("[jsonset[a],[aa]]")).toEqual(['"First"','"Second"','"Third"']);
-		expect(wiki.filterTiddlers("[{First}jsonset[]]")).toEqual(['{"a":"one","b":"","c":1.618,"d":{"e":"four","f":["five","six",true,false,null]}}']);
-		expect(wiki.filterTiddlers("[{First}jsonset[],[Antelope]]")).toEqual(['"Antelope"']);
-		expect(wiki.filterTiddlers("[{First}jsonset:number[],[not a number]]")).toEqual(['0']);
-		expect(wiki.filterTiddlers("[{First}jsonset[id],[Antelope]]")).toEqual(['{"a":"one","b":"","c":1.618,"d":{"e":"four","f":["five","six",true,false,null]},"id":"Antelope"}']);
-		expect(wiki.filterTiddlers("[{First}jsonset:notatype[id],[Antelope]]")).toEqual(['{"a":"one","b":"","c":1.618,"d":{"e":"four","f":["five","six",true,false,null]},"id":"Antelope"}']);
-		expect(wiki.filterTiddlers("[{First}jsonset:boolean[id],[false]]")).toEqual(['{"a":"one","b":"","c":1.618,"d":{"e":"four","f":["five","six",true,false,null]},"id":false}']);
-		expect(wiki.filterTiddlers("[{First}jsonset:boolean[id],[Antelope]]")).toEqual(['{"a":"one","b":"","c":1.618,"d":{"e":"four","f":["five","six",true,false,null]}}']);
-		expect(wiki.filterTiddlers("[{First}jsonset:number[id],[42]]")).toEqual(['{"a":"one","b":"","c":1.618,"d":{"e":"four","f":["five","six",true,false,null]},"id":42}']);
-		expect(wiki.filterTiddlers("[{First}jsonset:null[id]]")).toEqual(['{"a":"one","b":"","c":1.618,"d":{"e":"four","f":["five","six",true,false,null]},"id":null}']);
-		expect(wiki.filterTiddlers("[{First}jsonset:array[d],[f],[5]]")).toEqual(['{"a":"one","b":"","c":1.618,"d":{"e":"four","f":["five","six",true,false,null,[]]}}']);
-		expect(wiki.filterTiddlers("[{First}jsonset:object[d],[f],[5]]")).toEqual(['{"a":"one","b":"","c":1.618,"d":{"e":"four","f":["five","six",true,false,null,{}]}}']);
-		expect(wiki.filterTiddlers("[{First}jsonset:number[d],[f],[-1],[42]]")).toEqual(['{"a":"one","b":"","c":1.618,"d":{"e":"four","f":["five","six",true,false,42]}}']);
-		expect(wiki.filterTiddlers("[{First}jsonset[missing],[id],[Antelope]]")).toEqual(['{"a":"one","b":"","c":1.618,"d":{"e":"four","f":["five","six",true,false,null]}}']);
-		expect(wiki.filterTiddlers("[{First}jsonset:json[\"Antelope\"]]")).toEqual(['"Antelope"']);
-		expect(wiki.filterTiddlers("[{First}jsonset:json[id],[{\"a\":313}]]")).toEqual(['{"a":"one","b":"","c":1.618,"d":{"e":"four","f":["five","six",true,false,null]},"id":{"a":313}}']);
-		expect(wiki.filterTiddlers("[{First}jsonset:json[notjson]]")).toEqual(['{"a":"one","b":"","c":1.618,"d":{"e":"four","f":["five","six",true,false,null]}}']);
 	});

 	it("should support the format:json operator", function() {
--- a/editions/test/tiddlers/tests/test-utils.js
+++ b/editions/test/tiddlers/tests/test-utils.js
@@ -48,29 +48,6 @@ describe("Utility tests", function() {
 		expect($tw.utils.base64Decode($tw.utils.base64Encode(booksEmoji))).toBe(booksEmoji, "should round-trip correctly");
 	});

-	it("should handle base64 encoding emojis in URL-safe variant", function() {
-		var booksEmoji = "📚";
-		expect($tw.utils.base64Encode(booksEmoji, false, true)).toBe("8J-Tmg==", "if surrogate pairs are correctly treated as a single code unit then base64 should be 8J+Tmg==");
-		expect($tw.utils.base64Decode("8J-Tmg==", false, true)).toBe(booksEmoji);
-		expect($tw.utils.base64Decode($tw.utils.base64Encode(booksEmoji, false, true), false, true)).toBe(booksEmoji, "should round-trip correctly");
-	});
-
-	it("should handle base64 encoding binary data", function() {
-		var binaryData = "\xff\xfe\xfe\xff";
-		var encoded = $tw.utils.base64Encode(binaryData,true);
-		expect(encoded).toBe("//7+/w==");
-		var decoded = $tw.utils.base64Decode(encoded,true);
-		expect(decoded).toBe(binaryData, "Binary data did not round-trip correctly");
-	});
-
-	it("should handle base64 encoding binary data in URL-safe variant", function() {
-		var binaryData = "\xff\xfe\xfe\xff";
-		var encoded = $tw.utils.base64Encode(binaryData,true,true);
-		expect(encoded).toBe("__7-_w==");
-		var decoded = $tw.utils.base64Decode(encoded,true,true);
-		expect(decoded).toBe(binaryData, "Binary data did not round-trip correctly");
-	});
-
 	it("should handle stringifying a string array", function() {
 		var str = $tw.utils.stringifyList;
 		expect(str([])).toEqual("");
--- a/editions/test/tiddlers/tests/test-widget.js
+++ b/editions/test/tiddlers/tests/test-widget.js
@@ -527,45 +527,6 @@ describe("Widget module", function() {
 		expect(wrapper.children[0].children[15].sequenceNumber).toBe(53);
 	});

-	var testListJoin = function(oldList, newList) {
-		return function() {
-			var wiki = new $tw.Wiki();
-			// Add some tiddlers
-			wiki.addTiddler({title: "Numbers", text: "", list: oldList});
-			var text = "<$list filter='[list[Numbers]]' variable='item' join=', '><<item>></$list>";
-			var widgetNode = createWidgetNode(parseText(text,wiki),wiki);
-			// Render the widget node to the DOM
-			var wrapper = renderWidgetNode(widgetNode);
-			// Test the rendering
-			expect(wrapper.innerHTML).toBe("<p>" + oldList.split(' ').join(', ') + "</p>");
-			// Change the list and ensure new rendering is still right
-			wiki.addTiddler({title: "Numbers", text: "", list: newList});
-			refreshWidgetNode(widgetNode,wrapper,["Numbers"]);
-			expect(wrapper.innerHTML).toBe("<p>" + newList.split(' ').join(', ') + "</p>");
-		}
-	}
-
-	it("the list widget with join should update correctly when empty list gets one item", testListJoin("", "1"));
-	it("the list widget with join should update correctly when empty list gets two items", testListJoin("", "1 2"));
-	it("the list widget with join should update correctly when single-item list is appended to", testListJoin("1", "1 2"));
-	it("the list widget with join should update correctly when single-item list is prepended to", testListJoin("1", "2 1"));
-	it("the list widget with join should update correctly when list is appended", testListJoin("1 2 3 4", "1 2 3 4 5"));
-	it("the list widget with join should update correctly when last item is removed", testListJoin("1 2 3 4", "1 2 3"));
-	it("the list widget with join should update correctly when first item is inserted", testListJoin("1 2 3 4", "0 1 2 3 4"));
-	it("the list widget with join should update correctly when first item is removed", testListJoin("1 2 3 4", "2 3 4"));
-	it("the list widget with join should update correctly when first two items are swapped", testListJoin("1 2 3 4", "2 1 3 4"));
-	it("the list widget with join should update correctly when last two items are swapped", testListJoin("1 2 3 4", "1 2 4 3"));
-	it("the list widget with join should update correctly when last item is moved to the front", testListJoin("1 2 3 4", "4 1 2 3"));
-	it("the list widget with join should update correctly when last item is moved to the middle", testListJoin("1 2 3 4", "1 4 2 3"));
-	it("the list widget with join should update correctly when first item is moved to the back", testListJoin("1 2 3 4", "2 3 4 1"));
-	it("the list widget with join should update correctly when middle item is moved to the back", testListJoin("1 2 3 4", "1 3 4 2"));
-	it("the list widget with join should update correctly when the last item disappears at the same time as other edits 1", testListJoin("1 3 4", "1 2 3"));
-	it("the list widget with join should update correctly when the last item disappears at the same time as other edits 2", testListJoin("1 3 4", "1 3 2"));
-	it("the list widget with join should update correctly when the last item disappears at the same time as other edits 3", testListJoin("1 3 4", "2 1 3"));
-	it("the list widget with join should update correctly when the last item disappears at the same time as other edits 4", testListJoin("1 3 4", "2 3 1"));
-	it("the list widget with join should update correctly when the last item disappears at the same time as other edits 5", testListJoin("1 3 4", "3 1 2"));
-	it("the list widget with join should update correctly when the last item disappears at the same time as other edits 6", testListJoin("1 3 4", "3 2 1"));
-
 	var testCounterLast = function(oldList, newList) {
 		return function() {
 			var wiki = new $tw.Wiki();
--- a/editions/tw5.com/tiddlers/community/Chinese
+++ b/editions/tw5.com/tiddlers/community/Chinese
@@ -1,20 +0,0 @@
-title: 中文社区 - Chinese Community
-tags: Community
-
-# A Chinese community tutorial program that people can edit together:
-#* Main site: [ext[https://tw-cn.netlify.app/]]
-#* Accelerated access: [ext[https://tw-cn.cpolar.top/]]
-#* Alternate: [ext[https://tiddly-wiki-chinese-tutorial.vercel.app]]
-# Tiddlywiki Chinese Chat Forum: [ext[https://talk.tidgi.fun/topic/6]]
-# Chinese translation of Tiddlywiki official website [ext[https://bramchen.github.io/tw5-docs/zh-Hans/]]
-# The best Chinese introductory tutorial for newbies [ext[https://keatonlao.github.io/tiddlywiki-xp/]]
-
---
-
-# 大家可以一起编辑的中文社区教程项目：
-#* 主站：[ext[https://tw-cn.netlify.app/]]
-#* 加速访问：[ext[https://tw-cn.cpolar.top/]]
-#* 备用：[ext[https://tiddly-wiki-chinese-tutorial.vercel.app]]
-# 太微中文交流论坛：[ext[https://talk.tidgi.fun/topic/6]]
-# 太微官网汉化版：[ext[https://bramchen.github.io/tw5-docs/zh-Hans/]]
-# 最适合新手的中文入门教程：[ext[https://keatonlao.github.io/tiddlywiki-xp/]]
--- a/editions/tw5.com/tiddlers/community/editions/TiddlyMemo
+++ b/editions/tw5.com/tiddlers/community/editions/TiddlyMemo
@@ -0,0 +1,16 @@
+created: 20220417010615742
+modified: 20220417011547812
+tags: [[Community Plugins]] [[Community Editions]] Resources
+title: TiddlyMemo by oflg
+type: text/vnd.tiddlywiki
+url: https://tiddlymemo.org/
+
+Lifelong knowledge, deep in the Sea of Mind.
+
+{{!!url}}
+
+~TiddlyMemo uses advanced [[Incremental Learning|https://help.supermemo.org/wiki/Incremental_learning]] concepts to make it your powerful second brain for acquiring lifelong knowledge.
+
+* [[Read Articles|https://tiddlymemo.org/#Read%20Articles]] like ~SuperMemo
+* [[Learn languages|https://tiddlymemo.org/#Learn%20languages]] like ~LingQ
+* [[Memory Notes|https://tiddlymemo.org/#Memory%20Notes]] like Anki
--- a/editions/tw5.com/tiddlers/community/editions/Tidme
+++ b/editions/tw5.com/tiddlers/community/editions/Tidme
@@ -1,16 +0,0 @@
-created: 20220417010615742
-modified: 20231005060241771
-tags: [[Community Editions]]
-title: Tidme by oflg
-type: text/vnd.tiddlywiki
-url: https://github.com/oflg/Tidme
-
-Lifelong knowledge, deep in Mind.
-
-{{!!url}}
-
-Tidme uses advanced [[Incremental Learning|https://help.supermemo.org/wiki/Incremental_learning]] concepts to make it your powerful second brain for acquiring lifelong knowledge.
-
-* Read Articles like SuperMemo
-* Learn languages like LingQ
-* Memory Notes like Anki
--- a/editions/tw5.com/tiddlers/community/plugins/FSRS4TW
+++ b/editions/tw5.com/tiddlers/community/plugins/FSRS4TW
@@ -1,10 +0,0 @@
-created: 20220417010615742
-modified: 20231005060241771
-tags: [[Community Plugins]]
-title: Free Spaced Repetition Scheduler for TiddlyWiki by oflg
-type: text/vnd.tiddlywiki
-url: https://github.com/open-spaced-repetition/fsrs4tw
-
-TiddlyWiki-based memory programme using advanced FSRS algorithm
-
-{{!!url}}
--- a/editions/tw5.com/tiddlers/concepts/Macros.tid
+++ b/editions/tw5.com/tiddlers/concepts/Macros.tid
@@ -1,15 +1,9 @@
 created: 20140211171341271
-modified: 20230922094937115
+modified: 20230419103154328
 tags: Concepts Reference
 title: Macros
 type: text/vnd.tiddlywiki

-!! Important
-
-<<.from-version "5.3.0">> Macros have been [[superseded|Macro Pitfalls]] by [[Procedures]], [[Functions]] and [[Custom Widgets]] which together provide more robust and flexible ways to encapsulate and re-use code. 
-
-For text substitutions it is now recommended to use: [[Substituted Attribute Values]], [[substitute Operator]] and [[Transclusion and Substitution]]
-
 !! Introduction

 A <<.def macro>> is a named snippet of text. They are typically defined with the [[Pragma: \define]]:
@@ -32,6 +26,8 @@ The parameters that are specified in the macro call are substituted for special
 *  `$parameter-name$` is replaced with the value of the named parameter
 * `$(variable-name)$` is replaced with the value of the named [[variable|Variables]]).

+<<.from-version "5.3.0">> Macros have been [[superseded|Macro Pitfalls]] by [[Procedures]], [[Custom Widgets]] and [[Functions]] which together provide more robust and flexible ways to encapsulate and re-use code. It is now recommended to only use macros when textual substitution is specifically required.
+
 !! How Macros Work

 Macros are implemented as a special kind of [[variable|Variables]]. The only thing that distinguishes them from ordinary variables is the way that the parameters are handled.
--- a/editions/tw5.com/tiddlers/concepts/Title
+++ b/editions/tw5.com/tiddlers/concepts/Title
@@ -1,5 +1,5 @@
 created: 20150117152418000
-modified: 20231019155036098
+modified: 20220523075540462
 tags: Concepts
 title: Title List
 type: text/vnd.tiddlywiki
@@ -15,7 +15,3 @@ Title lists are used in various places, including PermaLinks and the ListField.
 They are in fact the simplest case of a [[filter|Filters]], and are thus a way of expressing a [[selection of titles|Title Selection]].

 <<.warning """The [[Title List]] format cannot reliably represent items that contain certain specific character sequences such as `]] `. Thus it should not be used where there is a possibility of such sequences occurring.""">>
-
-See also:
-
-* The [[format Operator]] with the 'titlelist' suffix conditionally wraps double square brackets around a string if it contains whitespace
--- a/editions/tw5.com/tiddlers/filters/decodebase64
+++ b/editions/tw5.com/tiddlers/filters/decodebase64
@@ -1,7 +1,6 @@
 caption: decodebase64
 op-input: a [[selection of titles|Title Selection]]
 op-output: the input with base 64 decoding applied
-op-suffix: optional: `binary` to produce binary output, `urlsafe` for URL-safe input
 op-parameter: 
 op-parameter-name: 
 op-purpose: apply base 64 decoding to a string
@@ -12,10 +11,6 @@ from-version: 5.2.6

 See Mozilla Developer Network for details of [[base 64 encoding|https://developer.mozilla.org/en-US/docs/Glossary/Base64]]. TiddlyWiki uses [[library code from @nijikokun|https://gist.github.com/Nijikokun/5192472]] to handle the conversion.

-The input strings must be base64 encoded. The output strings are the text (or binary data) decoded from base64 format.
-
-The optional `binary` suffix, if present, changes how the input is processed. The input is normally assumed to be [[UTF-8|https://developer.mozilla.org/en-US/docs/Glossary/UTF-8]] text encoded in base64 form (such as what the <<.op "encodebase64">> operator produces), so only certain byte sequences in the input are valid. If the input is binary data encoded in base64 format (such as an image, audio file, video file, etc.), then use the optional `binary` suffix, which will allow all byte sequences. Note that the output will then be binary, ''not'' text, and should probably not be passed into further filter operators.
-
-The optional `urlsafe` suffix, if present, causes the decoder to assume that the base64 input uses `-` and `_` instead of `+` and `/` for the 62nd and 63rd characters of the base64 "alphabet", which is usually referred to as "URL-safe base64" or "bae64url".
+The input strings must be base64 encoded. The output strings are binary data.

 <<.operator-examples "decodebase64">>
--- a/editions/tw5.com/tiddlers/filters/encodebase64
+++ b/editions/tw5.com/tiddlers/filters/encodebase64
@@ -1,7 +1,6 @@
 caption: encodebase64
 op-input: a [[selection of titles|Title Selection]]
 op-output: the input with base 64 encoding applied
-op-suffix: optional: `binary` to treat input as binary data, `urlsafe` for URL-safe output
 op-parameter: 
 op-parameter-name: 
 op-purpose: apply base 64 encoding to a string
@@ -12,10 +11,6 @@ from-version: 5.2.6

 See Mozilla Developer Network for details of [[base 64 encoding|https://developer.mozilla.org/en-US/docs/Glossary/Base64]]. TiddlyWiki uses [[library code from @nijikokun|https://gist.github.com/Nijikokun/5192472]] to handle the conversion.

-The input strings are interpreted as [[UTF-8 encoded|https://developer.mozilla.org/en-US/docs/Glossary/UTF-8]] text (or binary data instead if the `binary` suffix is present). The output strings are base64 encoded.
-
-The optional `binary` suffix, if present, causes the input string to be interpreted as binary data instead of text. Normally, an extra UTF-8 encoding step will be added before the base64 output is produced, so that emojis and other Unicode characters will be encoded correctly. If the input is binary data, such as an image, audio file, video, etc., then the UTF-8 encoding step would produce incorrect results, so using the `binary` suffix causes the UTF-8 encoding step to be skipped.
-
-The optional `urlsafe` suffix, if present, will use the alternate "URL-safe" base64 encoding, where `-` and `_` are used instead of `+` and `/` respectively, allowing the result to be used in URL query parameters or filenames.
+The input strings are interpreted as binary data. The output strings are base64 encoded.

 <<.operator-examples "encodebase64">>
--- a/editions/tw5.com/tiddlers/filters/examples/jsonset.tid
+++ b/editions/tw5.com/tiddlers/filters/examples/jsonset.tid
@@ -1,59 +0,0 @@
-created: 20231204112944341
-modified: 20231204115056732
-tags: [[Operator Examples]] [[jsonset Operator]]
-title: jsonset Operator (Examples)
-
-<$let object-a="""{
-    "a": "one",
-    "b": "",
-    "c": "three",
-    "d": {
-        "e": "four",
-        "f": [
-            "five",
-            "six",
-            true,
-            false,
-            null
-        ],
-        "g": {
-            "x": "max",
-            "y": "may",
-            "z": "maize"
-        }
-    }
-}
-"""
-object-b="""{"a":"one","b":"","c":1.618,"d":{"e":"four","f":["five","six",true,false,null]}}""">
-
-The examples below assume the following JSON object is contained in the variable `object-a`:
-
-<pre><<object-a>></pre>
-
-<<.operator-example 1 "[<object-a>jsonset[d],[Jaguar]]">>
-<<.operator-example 2 "[<object-a>jsonset[d],[f],[Panther]]">>
-<<.operator-example 3 "[<object-a>jsonset[d],[f],[-1],[Elephant]]">>
-<<.operator-example 4 "[<object-a>jsonset[d],[f],[-2],[Elephant]]">>
-<<.operator-example 5 "[<object-a>jsonset[d],[f],[-4],[Elephant]]">>
-<<.operator-example 6 "[<object-a>jsonset[Panther]]" "If only a single parameter is specified, it replaces the entire JSON object">>
-<<.operator-example 7 "[<object-a>jsonset[]]" "If only a single blank parameter is specified, no changes are made to the JSON object">>
-
-
-The examples below assume the following JSON object is contained in the variable `object-b`:
-
-<pre><<object-b>></pre>
-
-<<.operator-example 8 "[<object-b>jsonset[]]" "If only a single blank parameter is specified, no changes are made to the JSON object">>
-<<.operator-example 9 "[<object-b>jsonset[],[Antelope]]" "If the property to be set is blank, the entire JSON object is replaced">>
-<<.operator-example 10 "[<object-b>jsonset:number[],[not a number]]" "invalid numbers are interpreted as zero">>
-<<.operator-example 11 "[<object-b>jsonset[id],[Antelope]]" "nonexistent top level properties are added to the object">>
-<<.operator-example 19 "[<object-b>jsonset[missing],[id],[Antelope]]" "nonexistent nested properties are are ignored">>
-<<.operator-example 12 "[<object-b>jsonset:notatype[id],[Antelope]]" "invalid type suffix is interpreted as the default string type">>
-<<.operator-example 13 "[<object-b>jsonset:boolean[id],[false]]">>
-<<.operator-example 14 "[<object-b>jsonset:boolean[id],[Antelope]]" "invalid boolean value causes no assignment to be made">>
-<<.operator-example 15 "[<object-b>jsonset:number[id],[42]]">>
-<<.operator-example 16 "[<object-b>jsonset:null[id]]">>
-<<.operator-example 17 "[<object-b>jsonset:array[d],[f],[5]]">>
-<<.operator-example 18 "[<object-b>jsonset:object[d],[f],[5]]">>
-
-<<.operator-example 20 "[<object-a>] [<object-b>] :and[jsonset[b],[two]]" "If the input consists of multiple JSON objects with matching properties, the value is set for all of them">>
--- a/editions/tw5.com/tiddlers/filters/examples/jsonstringify
+++ b/editions/tw5.com/tiddlers/filters/examples/jsonstringify
@@ -1,11 +0,0 @@
-created: 20230922121858167
-modified: 20230922122333325
-tags: [[Operator Examples]] [[jsonstringify Operator]]
-title: jsonstringify Operator (Examples)
-type: text/vnd.tiddlywiki
-
-Compare the encoding of quotes and control characters in the first example with the analogue [[example for the stringify operator|stringify Operator (Examples)]].
-<<.operator-example 1 """[[Backslash \, double quote ", single quote ', tab 	, line feed
-]] +[jsonstringify[]]""">>
-<<.operator-example 2 """[[Accents and emojis -> äñøßπ ⌛🎄🍪🍓 without suffix]] +[jsonstringify[]]""">>
-<<.operator-example 3 """[[Accents and emojis -> äñøßπ ⌛🎄🍪🍓 with rawunicode suffix]] +[jsonstringify:rawunicode[]]""">>
--- a/editions/tw5.com/tiddlers/filters/examples/stringify_Operator_(Examples).tid
+++ b/editions/tw5.com/tiddlers/filters/examples/stringify_Operator_(Examples).tid
@@ -1,11 +1,9 @@
 created: 20161017154944352
-modified: 20230922122319674
+modified: 20230919124059118
 tags: [[Operator Examples]] [[stringify Operator]]
 title: stringify Operator (Examples)
 type: text/vnd.tiddlywiki

-Compare the encoding of quotes and control characters in the first example with the analogue [[example for the jsonstringify operator|jsonstringify Operator (Examples)]].
-<<.operator-example 1 """[[Backslash \, double quote ", single quote ', tab 	, line feed
-]] +[stringify[]]""">>
+<<.operator-example 1 """[[Title with "double quotes" and single ' and \backslash]] +[stringify[]]""">>
 <<.operator-example 2 """[[Accents and emojis -> äñøßπ ⌛🎄🍪🍓 without suffix]] +[stringify[]]""">>
 <<.operator-example 3 """[[Accents and emojis -> äñøßπ ⌛🎄🍪🍓 with rawunicode suffix]] +[stringify:rawunicode[]]""">>
--- a/editions/tw5.com/tiddlers/filters/jsonextract.tid
+++ b/editions/tw5.com/tiddlers/filters/jsonextract.tid
@@ -53,14 +53,6 @@ The <<.op jsonextract>> operator uses multiple operands to specify the indexes o
 [<jsondata>jsonextract[d],[g]] --> {"x":"max","y":"may","z":"maize"}
 ```

-<<.from-version "5.3.2">> Negative indexes into an array are counted from the end, so -1 means the last item, -2 the next-to-last item, and so on:
-
-```
-[<jsondata>jsonextract[d],[f],[-1]] --> null
-[<jsondata>jsonextract[d],[f],[-2]] --> false
-[<jsondata>jsonextract[d],[f],[-4]] --> "six"
-```
-
 Indexes can be dynamically composed from variables and transclusions:

 ```
--- a/editions/tw5.com/tiddlers/filters/jsonget.tid
+++ b/editions/tw5.com/tiddlers/filters/jsonget.tid
@@ -51,14 +51,6 @@ The <<.op jsonget>> operator uses multiple operands to specify the indexes of th
 [<jsondata>jsonget[d],[f],[0]] --> "five"
 ```

-<<.from-version "5.3.2">> Negative indexes into an array are counted from the end, so -1 means the last item, -2 the next-to-last item, and so on:
-
-```
-[<jsondata>jsonget[d],[f],[-1]] --> null
-[<jsondata>jsonget[d],[f],[-2]] --> false
-[<jsondata>jsonget[d],[f],[-4]] --> "six"
-```
-
 Indexes can be dynamically composed from variables and transclusions:

 ```
--- a/editions/tw5.com/tiddlers/filters/jsonset.tid
+++ b/editions/tw5.com/tiddlers/filters/jsonset.tid
@@ -1,64 +0,0 @@
-caption: jsonset
-created: 20230915121010948
-modified: 20231204115203428
-op-input: a selection of JSON objects
-op-output: the JSON objects with the specified value assigned to the specified property
-op-parameter: one or more indexes of the property to modify, if applicable followed by the value to be assigned
-op-purpose: set the value of a property in JSON objects
-op-suffix: data type of the value to be assigned to the property
-tags: [[Filter Operators]] [[JSON Operators]]
-title: jsonset Operator
-
-<<.from-version "5.3.2">> The <<.op jsonset>> operator is used to set a property value in JSON strings. See [[JSON in TiddlyWiki]] for background. See also the following related operators:
-
-* <<.olink jsonget>> to retrieve the values of a property in JSON data
-* <<.olink jsontype>> to retrieve the type of a JSON value
-* <<.olink jsonindexes>> to retrieve the names of the fields of a JSON object, or the indexes of a JSON array
-* <<.olink jsonextract>> to retrieve a JSON value as a string of JSON
-
-The type of the value to be assigned to the property can be optionally specified with a suffix:
-
-* ''string'': default, the string is specified as the final operand
-* ''boolean'': the boolean value is true if the final operand is the string "true" and false if the final operand is the string "false", any other value for the final string results prevents the property from being assigned
-* ''number'': the numeric value is taken from the final operand, invalid numbers are interpreted as zero
-* ''json'': the JSON string value is taken from the final operand, invalid JSON prevents the property from being assigned
-* ''object'': an empty object is assigned to the property, the final operand is ignored
-* ''array'': an empty array is assigned to the property, the final operand is ignored
-* ''null'': the special value null is assigned to the property, the final operand is ignored
-
-Properties within a JSON object are identified by a sequence of indexes. In the following example, the value at `[a]` is `one`, and the value at `[d][f][0]` is `five`.
-
-```
-{
-    "a": "one",
-    "b": "",
-    "c": "three",
-    "d": {
-        "e": "four",
-        "f": [
-            "five",
-            "six",
-            true,
-            false,
-            null
-        ],
-        "g": {
-            "x": "max",
-            "y": "may",
-            "z": "maize"
-        }
-    }
-}
-```
-
-The <<.op jsonset>> operator uses multiple parameters to specify the indexes of the property to set. When used to assign strings (default behaviour if no suffix is specified) the final operand is interpreted as the value to assign.
-
-Negative indexes are counted from the end, so -1 means the last item, -2 the next-to-last item, and so on.
-
-Indexes can be dynamically composed from variables and transclusions, e.g. `[<jsondata>jsonset<variable>,{!!field},[0],{CurrentResult}]`.
-
-In the special case where only a single parameter is defined, the operator replaces the entire input object with the the value of that parameter. If the single parameter is blank, the operation is ignored and no assignment takes place.
-
-If the input consists of multiple JSON objects with matching properties, the value is set for all of them.
-
-<<.operator-examples "jsonset">>
--- a/editions/tw5.com/tiddlers/filters/jsonstringify
+++ b/editions/tw5.com/tiddlers/filters/jsonstringify
@@ -1,35 +1,12 @@
 caption: jsonstringify
 created: 20171029155051467
 from-version: 5.1.14
-modified: 20230922121404577
-op-input: a [[selection of titles|Title Selection]]
-op-output: the input with JSON string encodings applied
+modified: 20230919124826880
 op-parameter: 
 op-parameter-name: 
-op-purpose: apply JSON string encoding to a string, see also the similar <<.olink stringify>>
-op-suffix: <<.from-version "5.1.23">> optionally, the keyword `rawunicode`
+op-purpose: deprecated, use <<.olink stringify>> instead
 op-suffix-name: R
 tags: [[Filter Operators]] [[String Operators]]
 title: jsonstringify Operator
 type: text/vnd.tiddlywiki

-The following substitutions are made:
-
-|!Character |!Replacement |!Condition |
-|`\` |`\\` |Always |
-|`"` |`\"` |Always |
-|Carriage return (0x0d) |`\r` |Always |
-|Line feed (0x0a) |`\n` |Always |
-|Backspace (0x08) |`\b` |Always |
-|Form field (0x0c) |`\f` |Always |
-|Tab (0x09) |`\t` |Always|
-|Characters from 0x00 to 0x1f, except listed above |`\u####` where #### is four hex digits |Always |
-|Characters from from 0x80 to 0xffff|`\u####` where #### is four hex digits |If `rawunicode` suffix is not present (default) |
-|Characters from 0x80 to 0xffff|<<.from-version "5.1.23">> Unchanged |If `rawunicode` suffix is present |
-
-<<.from-version "5.1.23">> If the suffix `rawunicode` is present, Unicode characters above 0x80 (such as ß, ä, ñ or 🎄) will be passed through unchanged. Without the suffix, they will be substituted with `\u` codes, which was the default behavior before 5.1.23. Characters outside the Basic Multilingual Plane, such as 🎄 and other emojis, will be encoded as a UTF-16 surrogate pair, i.e. with two `\u` sequences.
-
-<<.note """Mind the differences compared to <<.olink stringify>> in encoding of single quotes and control characters (0x00 to 0x1f).
-""">>
-
-<<.operator-examples "jsonstringify">>
--- a/editions/tw5.com/tiddlers/filters/jsontype.tid
+++ b/editions/tw5.com/tiddlers/filters/jsontype.tid
@@ -61,14 +61,6 @@ The <<.op jsontype>> operator uses multiple operands to specify the indexes of t
 [<jsondata>jsontype[d],[f],[2]] --> "boolean"
 ```

-<<.from-version "5.3.2">> Negative indexes into an array are counted from the end, so -1 means the last item, -2 the next-to-last item, and so on:
-
-```
-[<jsondata>jsontype[d],[f],[-1]] --> "null"
-[<jsondata>jsontype[d],[f],[-2]] --> "boolean"
-[<jsondata>jsontype[d],[f],[-4]] --> "string"
-```
-
 Indexes can be dynamically composed from variables and transclusions:

 ```
--- a/editions/tw5.com/tiddlers/filters/stringify_Operator.tid
+++ b/editions/tw5.com/tiddlers/filters/stringify_Operator.tid
@@ -1,12 +1,12 @@
 caption: stringify
 created: 20161017153038029
 from-version: 5.1.14
-modified: 20230922121406947
+modified: 20230919130847809
 op-input: a [[selection of titles|Title Selection]]
 op-output: the input with ~JavaScript string encodings applied
 op-parameter: 
 op-parameter-name: 
-op-purpose: apply ~JavaScript string encoding to a string, see also the similar <<.olink jsonstringify>>
+op-purpose: apply ~JavaScript string encoding to a string
 op-suffix: <<.from-version "5.1.23">> optionally, the keyword `rawunicode`
 op-suffix-name: R
 tags: [[Filter Operators]] [[String Operators]]
@@ -18,16 +18,19 @@ The following substitutions are made:
 |!Character |!Replacement |!Condition |
 |`\` |`\\` |Always |
 |`"` |`\"` |Always |
-|`'` |`\'` |Always |
-|Line feed (0x0a) |`\n` |Always |
 |Carriage return (0x0d) |`\r` |Always |
-|Characters from 0x00 to 0x1f, except listed above |`\x##` where ## is two hex digits |Always |
+|Line feed (0x0a) |`\n` |Always |
+|Backspace (0x08) |`\b` |Always |
+|Form field (0x0c) |`\f` |Always |
+|Tab (0x09) |`\t` |Always |
+|Characters from 0x00 to 0x1f |`\x##` where ## is two hex digits |Always |
 |Characters from 0x80 to 0xffff|`\u####` where #### is four hex digits |If `rawunicode` suffix is not present (default) |
 |Characters from 0x80 to 0xffff|<<.from-version "5.1.23">> Unchanged |If `rawunicode` suffix is present |

-<<.from-version "5.1.23">> If the suffix `rawunicode` is present, Unicode characters above 0x80 (such as ß, ä, ñ or 🎄) will be passed through unchanged. Without the suffix, they will be substituted with `\u` codes, which was the default behavior before 5.1.23. Characters outside the Basic Multilingual Plane, such as 🎄 and other emojis, will be encoded as a UTF-16 surrogate pair, i.e. with two `\u` sequences.
+<<.from-version "5.1.23">> If the suffix `rawunicode` is present, Unicode characters above 0x80 (such as ß, ä, ñ or 🎄) will be passed through unchanged. Without the suffix, they will be substituted with `\u` codes, which was the default behavior before 5.1.23.

-<<.note """Mind the differences compared to <<.olink jsonstringify>> in encoding of single quotes and control characters (0x00 to 0x1f).
-""">>
+<<.note """Characters outside the Basic Multilingual Plane, such as 🎄 and other emojis, will be encoded as a UTF-16 surrogate pair, i.e. with two `\u` sequences.""">>
+
+<<.olink jsonstringify>> is considered deprecated, as it duplicates the functionality of <<.op stringify>>.

 <<.operator-examples "stringify">>
--- a/editions/tw5.com/tiddlers/hellothere/HelloThere.tid
+++ b/editions/tw5.com/tiddlers/hellothere/HelloThere.tid
@@ -1,6 +1,6 @@
 created: 20130822170200000
 list: [[A Gentle Guide to TiddlyWiki]] [[Discover TiddlyWiki]] [[Some of the things you can do with TiddlyWiki]] [[Ten reasons to switch to TiddlyWiki]] Examples [[What happened to the original TiddlyWiki?]]
-modified: 20231213080637781
+modified: 20230820112855583
 tags: TableOfContents
 title: HelloThere
 type: text/vnd.tiddlywiki
@@ -18,11 +18,6 @@ TiddlyWiki lets you choose where to keep your data, guaranteeing that in the dec
 <$macrocall $name="flex-card" bordercolor={{!!color}} textcolor={{!!text-color}} backgroundcolor={{!!background-color}} captionField="caption" descriptionField="text"/>
 </$list>
 </div>
-<div class="tc-cards tc-small">
-<$link to="中文社区 - Chinese Community" class="tc-btn-big-green tc-card">
-中文社区<br/>Chinese Community
-</$link>
-</div>

 !! ''Find Out More''

--- a/editions/tw5.com/tiddlers/howtos/Constructing
+++ b/editions/tw5.com/tiddlers/howtos/Constructing
@@ -1,5 +1,5 @@
 created: 20220427174702859
-modified: 20230922122551197
+modified: 20230809113620964
 tags: [[JSON in TiddlyWiki]] Learning
 title: Constructing JSON tiddlers

@@ -13,4 +13,4 @@ At a high level, we have several ways to generate JSON data in TiddlyWiki's own
 * [[jsontiddler Macro]]
 * [[jsontiddlers Macro]]

-When constructing JSON data manually, the [[jsonstringify Operator]] is needed to ensure that any special characters are properly escaped.
+When constructing JSON data manually, the [[stringify Operator]] is needed to ensure that any special characters are properly escaped.
--- a/editions/tw5.com/tiddlers/images/New
+++ b/editions/tw5.com/tiddlers/images/New
--- a/editions/tw5.com/tiddlers/macros/CoreMacros.tid
+++ b/editions/tw5.com/tiddlers/macros/CoreMacros.tid
@@ -5,4 +5,4 @@ type: text/vnd.tiddlywiki

 The following [[macros|Macros]] are built into ~TiddlyWiki's core:

-<<list-links "[tag[Core Macros]]" class:"multi-columns">>
+<<list-links "[tag[Core Macros]]">>
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_
@@ -11,6 +11,4 @@ The `tm-delete-tiddler` message deletes the specified tiddler and removes it fro
 |param |Title of the tiddler that is to be deleted |
 |tiddlerTitle |Fallback title that is used if ''param'' isn't specified (automatically set by the ButtonWidget)  |

-The delete tiddler message is usually generated with the ButtonWidget and is handled by the NavigatorWidget.
-
-Use the [[ActionDeleteTiddlerWidget]] to delete a named tiddler without getting the "Do you wish to delete the tiddler" prompt.
+The delete tiddler message is usually generated with the ButtonWidget and is handled by the NavigatorWidget.
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jeremy Ruston	faa8ddcf53	Merge branch 'master' into conditional-shortcut-syntax	2023-10-14 09:31:31 +01:00
Jeremy Ruston	c689b8e812	Merge branch 'master' into conditional-shortcut-syntax	2023-10-14 09:21:20 +01:00
Jeremy Ruston	14056143de	Add from-version tag to docs	2023-09-14 19:13:10 +01:00
Jeremy Ruston	c392020152	Update docs	2023-09-14 17:54:59 +01:00
Jeremy Ruston	4a2a04f4c7	Allow block mode content within an if/then/else clause	2023-09-14 10:05:20 +01:00
Jeremy Ruston	775860110c	List widget should search recursively for list-template and list-empty	2023-09-13 20:09:59 +01:00
Jeremy Ruston	a1acef7324	Don't use the widget body as the template if a list-empty widget is present See discussion here - https://github.com/Jermolene/TiddlyWiki5/pull/7710#issuecomment-1717193296	2023-09-13 19:53:43 +01:00
Jeremy Ruston	3f16e52b82	Merge branch 'master' into conditional-shortcut-syntax	2023-09-11 18:57:17 +01:00
Jeremy Ruston	2411ebc1ca	Change from `{%if%}` to `<%if%>` See discussion here - https://talk.tiddlywiki.org/t/proposed-if-widget/7882/64	2023-09-06 15:45:51 +01:00
Jeremy Ruston	f0b4f3b2ee	WIP	2023-09-06 12:32:33 +01:00
Jeremy Ruston	9d25b31974	Another test	2023-09-05 21:58:24 +01:00
Jeremy Ruston	981f905830	Add support for elseif blocks	2023-09-03 22:39:18 +01:00
Jeremy Ruston	bd1bad68d8	Update docs	2023-09-01 14:41:39 +01:00
Jeremy Ruston	c1a9215677	Initial Commit	2023-09-01 14:33:56 +01:00