Release note update

Fix tests
Enable CamelCase for main documentation wikis
2026-01-22 19:04:38 +00:00 · 2023-06-08 21:44:47 +01:00 · 2023-06-03 11:27:34 +01:00 · 2023-06-03 11:07:28 +01:00 · 2023-06-03 11:03:46 +01:00 · 2023-06-03 11:01:54 +01:00
42 changed files with 124 additions and 758 deletions
--- a/core/acknowledgements.tid
+++ b/core/acknowledgements.tid
@@ -3,7 +3,7 @@ title: $:/Acknowledgements
 TiddlyWiki incorporates code from these fine OpenSource projects:

 * [[The Stanford Javascript Crypto Library|http://bitwiseshiftleft.github.io/sjcl/]]
-* [[The Jasmine JavaScript Test Framework|https://jasmine.github.io/]]
+* [[The Jasmine JavaScript Test Framework|http://pivotal.github.io/jasmine/]]
 * [[Normalize.css by Nicolas Gallagher|http://necolas.github.io/normalize.css/]]

 And media from these projects:
--- a/core/images/network-activity.tid
+++ b/core/images/network-activity.tid
@@ -1,11 +0,0 @@
-title: $:/core/images/network-activity
-tags: $:/tags/Image
-
-<svg width="22pt" height="22pt" class="tc-image-network-activity tc-image-button" viewBox="0 0 128 128"><g class={{{ [{$:/state/http-requests}match[0]then[]else[tc-network-activity-background]] }}}>
-<$list filter="[{$:/state/http-requests}match[0]]" variable="ignore">
-<path d="M64.043 45.153a4.002 4.002 0 0 1 4.367 2.21l.084.188 30.403 73.4a4 4 0 0 1-7.307 3.25l-.084-.188-3.103-7.49-8.898 8.899a3.985 3.985 0 0 1-2.624 1.166l-.205.005a3.987 3.987 0 0 1-2.828-1.171l-9.849-9.848-9.847 9.848a3.985 3.985 0 0 1-2.624 1.166l-.204.005a3.987 3.987 0 0 1-2.829-1.171l-8.899-8.9-3.102 7.491a4 4 0 1 1-7.391-3.062l30.403-73.4a4.001 4.001 0 0 1 4.495-2.39l.042-.008Zm13.636 56.74-8.023 8.024 7.02 7.019 8.023-8.022-7.02-7.02Zm-27.353.008-7.019 7.019 8.016 8.016 7.019-7.02-8.016-8.015Zm13.68-13.68-8.023 8.023 8.016 8.016 8.023-8.023-8.016-8.016Zm-8.971-8.971-4.687 11.315 8.001-8.001-3.314-3.314Zm17.933.009-3.305 3.305 7.979 7.979-4.674-11.284ZM64 57.607l-5.666 13.68c.096.072.188.15.278.232l.133.126 5.261 5.262 5.262-5.262c.128-.127.261-.244.4-.35L64 57.607Zm0-34.69a8 8 0 1 1 0 16 8 8 0 0 1 0-16Z"/>
-</$list>
-<$list filter="[{$:/state/http-requests}!match[0]]" variable="ignore">
-<path d="M109.395.952a4.002 4.002 0 0 1 3.787 2.708C117.529 11.62 120 20.753 120 30.462c0 15.186-6.044 28.96-15.858 39.047a4 4 0 1 1-6.47-4.626l-.12-.094C106.466 56.074 112 43.914 112 30.462c0-8.492-2.205-16.469-6.074-23.39l.054-.036a4 4 0 0 1 3.415-6.084Zm-90.762 0a4 4 0 0 1 3.072 6.562l.093.06A47.786 47.786 0 0 0 16 30.463c0 13.315 5.42 25.363 14.176 34.058l-.01.007a4 4 0 1 1-6.312 4.863l-.063.05C14.017 59.359 8 45.613 8 30.462c0-9.77 2.502-18.956 6.9-26.952A4.002 4.002 0 0 1 18.634.952Z"/><path d="M64.043 44.698a4.002 4.002 0 0 1 4.367 2.21l.084.188 30.403 73.4a4 4 0 0 1-7.307 3.25l-.084-.188-3.103-7.49-8.898 8.9a3.985 3.985 0 0 1-2.624 1.166l-.205.005a3.987 3.987 0 0 1-2.828-1.172l-9.849-9.848-9.847 9.848a3.985 3.985 0 0 1-2.624 1.167l-.204.005a3.987 3.987 0 0 1-2.829-1.172l-8.899-8.899-3.102 7.49a4 4 0 0 1-7.391-3.061l30.403-73.4a4.001 4.001 0 0 1 4.495-2.39l.042-.009ZM77.68 101.44l-8.023 8.023 7.02 7.019 8.023-8.022-7.02-7.02Zm-27.353.007-7.019 7.019 8.016 8.016 7.019-7.019-8.016-8.016Zm13.68-13.68-8.023 8.023 8.016 8.016 8.023-8.023-8.016-8.016Zm-8.971-8.971L50.348 90.11l8.001-8.001-3.314-3.314Zm17.933.009-3.305 3.305 7.979 7.979-4.674-11.284ZM64 57.152l-5.666 13.68c.096.073.188.15.278.232l.133.127 5.261 5.261 5.262-5.261c.128-.128.261-.244.4-.351L64 57.152ZM38.503 1.058a4 4 0 0 1 2.7 6.952l.17-.175C35.582 13.625 32 21.625 32 30.462c0 8.838 3.582 16.838 9.374 22.629a4 4 0 0 1-5.659 5.658l-.01.01C28.473 51.52 24 41.526 24 30.485 24 19.567 28.374 9.67 35.466 2.453a3.995 3.995 0 0 1 3.037-1.395ZM89.369.952c1.14 0 2.17.478 2.899 1.244l.005-.006C99.518 9.43 104 19.434 104 30.485c0 10.826-4.3 20.648-11.287 27.85a4 4 0 1 1-6.054-5.213l-.032-.032C92.418 47.299 96 39.299 96 30.462c0-8.73-3.496-16.643-9.164-22.416A4 4 0 0 1 89.368.952Zm-39.282 11.14a4 4 0 0 1 2.59 7.048l.01.009A15.95 15.95 0 0 0 48 30.462a15.95 15.95 0 0 0 4.687 11.315l-.01.01a4 4 0 1 1-5.82 5.47l.173.177A23.925 23.925 0 0 1 40 30.462a23.925 23.925 0 0 1 7.03-16.97l.01.01a3.991 3.991 0 0 1 3.047-1.41Zm27.895.07a3.99 3.99 0 0 1 2.984 1.336l.006-.005A23.925 23.925 0 0 1 88 30.463a23.92 23.92 0 0 1-6.707 16.642l-.3.305a4 4 0 1 1-5.679-5.632v-.002A15.95 15.95 0 0 0 80 30.462a15.95 15.95 0 0 0-4.685-11.312 4.012 4.012 0 0 1-1.333-2.987 4 4 0 0 1 4-4ZM64 22.463a8 8 0 1 1 0 16 8 8 0 0 1 0-16Z"/>
-</$list>
-</g></svg>
--- a/core/language/en-GB/Buttons.multids
+++ b/core/language/en-GB/Buttons.multids
@@ -67,8 +67,6 @@ More/Caption: more
 More/Hint: More actions
 NewHere/Caption: new here
 NewHere/Hint: Create a new tiddler tagged with this one
-NetworkActivity/Caption: network activity
-NetworkActivity/Hint: Cancel all network activity
 NewJournal/Caption: new journal
 NewJournal/Hint: Create a new journal tiddler
 NewJournalHere/Caption: new journal here
--- a/core/language/en-GB/Misc.multids
+++ b/core/language/en-GB/Misc.multids
@@ -25,8 +25,6 @@ Encryption/RepeatPassword: Repeat password
 Encryption/PasswordNoMatch: Passwords do not match
 Encryption/SetPassword: Set password
 Error/Caption: Error
-Error/DeserializeOperator/MissingOperand: Filter Error: Missing operand for 'deserialize' operator
-Error/DeserializeOperator/UnknownDeserializer: Filter Error: Unknown deserializer provided as operand for the 'deserialize' operator
 Error/Filter: Filter error
 Error/FilterSyntax: Syntax error in filter expression
 Error/FilterRunPrefix: Filter Error: Unknown prefix for filter run
--- a/core/language/en-GB/SiteTitle.tid
+++ b/core/language/en-GB/SiteTitle.tid
@@ -1,3 +1,3 @@
 title: $:/SiteTitle

-My TiddlyWiki
+My ~TiddlyWiki
--- a/core/modules/filters.js
+++ b/core/modules/filters.js
@@ -12,8 +12,6 @@ Adds tiddler filtering methods to the $tw.Wiki object.
 /*global $tw: false */
 "use strict";

-var widgetClass = require("$:/core/modules/widgets/widget.js").widget;
-
 /* Maximum permitted filter recursion depth */
 var MAX_FILTER_DEPTH = 300;

@@ -271,7 +269,7 @@ exports.compileFilter = function(filterString) {
 						operand.value = self.getTextReference(operand.text,"",currTiddlerTitle);
 					} else if(operand.variable) {
 						var varTree = $tw.utils.parseFilterVariable(operand.text);
-						operand.value = widgetClass.evaluateVariable(widget,varTree.name,{params: varTree.params, source: source})[0] || "";
+						operand.value = widget.evaluateVariable(varTree.name,{params: varTree.params, source: source})[0] || "";
 					} else {
 						operand.value = operand.text;
 					}
--- a/core/modules/filters/deserialize.js
+++ b/core/modules/filters/deserialize.js
@@ -1,39 +0,0 @@
-/*\
-title: $:/core/modules/filters/deserialize.js
-type: application/javascript
-module-type: filteroperator
-Filter operator for deserializing string data into JSON representing tiddlers
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-exports["deserialize"] = function(source,operator,options) {
-	var results = [],
-		deserializer;
-	if(operator.operand) {
-		// Get the deserializer identified by the operand
-		deserializer = $tw.Wiki.tiddlerDeserializerModules[operator.operand];
-		if(deserializer) {
-			source(function(tiddler,title) {
-				var tiddlers;
-				try {
-					tiddlers = deserializer(title);
-				} catch(e) {
-					// Return an empty array if we could not extract any tiddlers
-					tiddlers = [];
-				}
-				results.push(JSON.stringify(tiddlers));
-			});
-		} else {
-			return [$tw.language.getString("Error/DeserializeOperator/UnknownDeserializer")];
-		}
-	} else {
-		return [$tw.language.getString("Error/DeserializeOperator/MissingOperand")];
-	}
-	return results;
-}
-
-})();
--- a/core/modules/filters/function.js
+++ b/core/modules/filters/function.js
@@ -17,13 +17,9 @@ Export our filter function
 */
 exports.function = function(source,operator,options) {
 	var functionName = operator.operands[0],
-		params = [];
-	$tw.utils.each(operator.operands.slice(1),function(param) {
-		params.push({value: param});
-	});
-	var variableInfo = options.widget && options.widget.getVariableInfo && options.widget.getVariableInfo(functionName,{params: params, source: source});
+		variableInfo = options.widget && options.widget.getVariableInfo && options.widget.getVariableInfo(functionName);
 	if(variableInfo && variableInfo.srcVariable && variableInfo.srcVariable.isFunctionDefinition) {
-		return variableInfo.resultList ? variableInfo.resultList : [variableInfo.text];
+		return options.widget.evaluateVariable(functionName,{params: operator.operands.slice(1), source: source});
 	}
 	// Return the input list if the function wasn't found
 	var results = [];
--- a/core/modules/filters/unknown.js
+++ b/core/modules/filters/unknown.js
@@ -22,13 +22,9 @@ Export our filter function
 exports["[unknown]"] = function(source,operator,options) {
 	// Check for a user defined filter operator
 	if(operator.operator.indexOf(".") !== -1) {
-		var params = [];
-		$tw.utils.each(operator.operands,function(param) {
-			params.push({value: param});
-		});	
-		var variableInfo = options.widget && options.widget.getVariableInfo && options.widget.getVariableInfo(operator.operator,{params: params, source: source});
-		if(variableInfo && variableInfo.srcVariable) {
-			var list = variableInfo.resultList ? variableInfo.resultList : [variableInfo.text];
+		var variableInfo = options.widget && options.widget.getVariableInfo && options.widget.getVariableInfo(operator.operator);
+		if(variableInfo && variableInfo.srcVariable && variableInfo.srcVariable.isFunctionDefinition) {
+			var list = options.widget.evaluateVariable(operator.operator,{params: operator.operands, source: source});
 			if(operator.prefix === "!") {
 				var results = [];
 				source(function(tiddler,title) {
--- a/core/modules/startup/rootwidget.js
+++ b/core/modules/startup/rootwidget.js
@@ -20,38 +20,6 @@ exports.before = ["story"];
 exports.synchronous = true;

 exports.startup = function() {
-	// Install the HTTP client event handler
-	$tw.httpClient = new $tw.utils.HttpClient();
-	var getPropertiesWithPrefix = function(properties,prefix) {
-		var result = Object.create(null);
-		$tw.utils.each(properties,function(value,name) {
-			if(name.indexOf(prefix) === 0) {
-				result[name.substring(prefix.length)] = properties[name];
-			}
-		});
-		return result;
-	};
-	$tw.rootWidget.addEventListener("tm-http-request",function(event) {
-		var params = event.paramObject || {};
-		$tw.httpClient.initiateHttpRequest({
-			wiki: event.widget.wiki,
-			url: params.url,
-			method: params.method,
-			body: params.body,
-			oncompletion: params.oncompletion,
-			onprogress: params.onprogress,
-			bindStatus: params["bind-status"],
-			bindProgress: params["bind-progress"],
-			variables: getPropertiesWithPrefix(params,"var-"),
-			headers: getPropertiesWithPrefix(params,"header-"),
-			passwordHeaders: getPropertiesWithPrefix(params,"password-header-"),
-			queryStrings: getPropertiesWithPrefix(params,"query-"),
-			passwordQueryStrings: getPropertiesWithPrefix(params,"password-query-")
-		});
-	});
-	$tw.rootWidget.addEventListener("tm-http-cancel-all-requests",function(event) {
-		$tw.httpClient.cancelAllHttpRequests();
-	});
 	// Install the modal message mechanism
 	$tw.modal = new $tw.utils.Modal($tw.wiki);
 	$tw.rootWidget.addEventListener("tm-modal",function(event) {
--- a/core/modules/utils/dom/http.js
+++ b/core/modules/utils/dom/http.js
@@ -3,7 +3,7 @@ title: $:/core/modules/utils/dom/http.js
 type: application/javascript
 module-type: utils

-HTTP support
+Browser HTTP support

 \*/
 (function(){
@@ -13,204 +13,11 @@ HTTP support
 "use strict";

 /*
-Manage tm-http-request events. Options include:
-wiki: Reference to the wiki to be used for state tiddler tracking
-stateTrackerTitle: Title of tiddler to be used for state tiddler tracking
-*/
-function HttpClient(options) {
-	options = options || {};
-	this.nextId = 1;
-	this.wiki = options.wiki || $tw.wiki;
-	this.stateTrackerTitle = options.stateTrackerTitle || "$:/state/http-requests";
-	this.requests = []; // Array of {id: string,request: HttpClientRequest}
-	this.updateRequestTracker();
-}
-
-/*
-Return the index into this.requests[] corresponding to a given ID. Returns null if not found
-*/
-HttpClient.prototype.getRequestIndex = function(targetId) {
-	var targetIndex = null;
-	$tw.utils.each(this.requests,function(requestInfo,index) {
-		if(requestInfo.id === targetId) {
-			targetIndex = index;
-		}
-	});
-	return targetIndex;
-};
-
-/*
-Update the state tiddler that is tracking the outstanding requests
-*/
-HttpClient.prototype.updateRequestTracker = function() {
-	this.wiki.addTiddler({title: this.stateTrackerTitle, text: "" + this.requests.length});
-};
-
-HttpClient.prototype.initiateHttpRequest = function(options) {
-	var self = this,
-		id = this.nextId,
-		request = new HttpClientRequest(options);
-	this.nextId += 1;
-	this.requests.push({id: id, request: request});
-	this.updateRequestTracker();
-	request.send(function(err) {
-		var targetIndex = self.getRequestIndex(id);
-		if(targetIndex !== null) {
-			self.requests.splice(targetIndex,1);
-			self.updateRequestTracker();
-		}
-	});
-	return id;
-};
-
-HttpClient.prototype.cancelAllHttpRequests = function() {
-	var self = this;
-	if(this.requests.length > 0) {
-		for(var t=this.requests.length - 1; t--; t>=0) {
-			var requestInfo = this.requests[t];
-			requestInfo.request.cancel();
-		}	
-	}
-	this.requests = [];
-	this.updateRequestTracker();
-};
-
-HttpClient.prototype.cancelHttpRequest = function(targetId) {
-	var targetIndex = this.getRequestIndex(targetId);
-	if(targetIndex !== null) {
-		this.requests[targetIndex].request.cancel();
-		this.requests.splice(targetIndex,1);
-		this.updateRequestTracker();
-	}
-};
-
-/*
-Initiate an HTTP request. Options:
-wiki: wiki to be used for executing action strings
-url: URL for request
-method: method eg GET, POST
-body: text of request body
-oncompletion: action string to be invoked on completion
-onprogress: action string to be invoked on progress updates
-bindStatus: optional title of tiddler to which status ("pending", "complete", "error") should be written
-bindProgress: optional title of tiddler to which the progress of the request (0 to 100) should be bound
-variables: hashmap of variable name to string value passed to action strings
-headers: hashmap of header name to header value to be sent with the request
-passwordHeaders: hashmap of header name to password store name to be sent with the request
-queryStrings: hashmap of query string parameter name to parameter value to be sent with the request
-passwordQueryStrings: hashmap of query string parameter name to password store name to be sent with the request
-*/
-function HttpClientRequest(options) {
-	var self = this;
-	console.log("Initiating an HTTP request",options)
-	this.wiki = options.wiki;
-	this.completionActions = options.oncompletion;
-	this.progressActions = options.onprogress;
-	this.bindStatus = options["bind-status"];
-	this.bindProgress = options["bind-progress"];
-	this.method = options.method || "GET";
-	this.body = options.body || "";
-	this.variables = options.variables;
-	var url = options.url;
-	$tw.utils.each(options.queryStrings,function(value,name) {
-		url = $tw.utils.setQueryStringParameter(url,name,value);
-	});
-	$tw.utils.each(options.passwordQueryStrings,function(value,name) {
-		url = $tw.utils.setQueryStringParameter(url,name,$tw.utils.getPassword(value) || "");
-	});
-	this.url = url;
-	this.requestHeaders = {};
-	$tw.utils.each(options.headers,function(value,name) {
-		self.requestHeaders[name] = value;
-	});
-	$tw.utils.each(options.passwordHeaders,function(value,name) {
-		self.requestHeaders[name] = $tw.utils.getPassword(value) || "";
-	});
-}
-
-HttpClientRequest.prototype.send = function(callback) {
-	var self = this,
-		setBinding = function(title,text) {
-			if(title) {
-				this.wiki.addTiddler(new $tw.Tiddler({title: title, text: text}));
-			}
-		};
-	if(this.url) {
-		setBinding(this.bindStatus,"pending");
-		setBinding(this.bindProgress,"0");
-		// Set the request tracker tiddler
-		var requestTrackerTitle = this.wiki.generateNewTitle("$:/temp/HttpRequest");
-		this.wiki.addTiddler({
-			title: requestTrackerTitle,
-			tags: "$:/tags/HttpRequest",
-			text: JSON.stringify({
-				url: this.url,
-				type: this.method,
-				status: "inprogress",
-				headers: this.requestHeaders,
-				data: this.body
-			})
-		});
-		this.xhr = $tw.utils.httpRequest({
-			url: this.url,
-			type: this.method,
-			headers: this.requestHeaders,
-			data: this.body,
-			callback: function(err,data,xhr) {
-				var hasSucceeded = xhr.status >= 200 && xhr.status < 300,
-					completionCode = hasSucceeded ? "complete" : "error",
-					headers = {};
-				$tw.utils.each(xhr.getAllResponseHeaders().split("\r\n"),function(line) {
-					var pos = line.indexOf(":");
-					if(pos !== -1) {
-						headers[line.substr(0,pos)] = line.substr(pos + 1).trim();
-					}
-				});
-				setBinding(self.bindStatus,completionCode);
-				setBinding(self.bindProgress,"100");
-				var resultVariables = {
-					status: xhr.status.toString(),
-					statusText: xhr.statusText,
-					error: (err || "").toString(),
-					data: (data || "").toString(),
-					headers: JSON.stringify(headers)
-				};
-				self.wiki.addTiddler(new $tw.Tiddler(self.wiki.getTiddler(requestTrackerTitle),{
-					status: completionCode,
-				}));
-				self.wiki.invokeActionString(self.completionActions,undefined,$tw.utils.extend({},self.variables,resultVariables),{parentWidget: $tw.rootWidget});
-				callback(hasSucceeded ? null : xhr.statusText);
-				// console.log("Back!",err,data,xhr);
-			},
-			progress: function(lengthComputable,loaded,total) {
-				if(lengthComputable) {
-					setBinding(self.bindProgress,"" + Math.floor((loaded/total) * 100))
-				}
-				self.wiki.invokeActionString(self.progressActions,undefined,{
-					lengthComputable: lengthComputable ? "yes" : "no",
-					loaded: loaded,
-					total: total
-				},{parentWidget: $tw.rootWidget});
-			}
-		});
-	}
-};
-
-HttpClientRequest.prototype.cancel = function() {
-	if(this.xhr) {
-		this.xhr.abort();
-	}
-};
-
-exports.HttpClient = HttpClient;
-
-/*
-Make an HTTP request. Options are:
+A quick and dirty HTTP function; to be refactored later. Options are:
 	url: URL to retrieve
 	headers: hashmap of headers to send
 	type: GET, PUT, POST etc
 	callback: function invoked with (err,data,xhr)
-	progress: optional function invoked with (lengthComputable,loaded,total)
 	returnProp: string name of the property to return as first argument of callback
 */
 exports.httpRequest = function(options) {
@@ -276,16 +83,8 @@ exports.httpRequest = function(options) {
 		options.callback($tw.language.getString("Error/XMLHttpRequest") + ": " + this.status,null,this);
 		}
 	};
-	// Handle progress
-	if(options.progress) {
-		request.onprogress = function(event) {
-			console.log("Progress event",event)
-			options.progress(event.lengthComputable,event.loaded,event.total);
-		};
-	}
 	// Make the request
 	request.open(type,url,true);
-	// Headers
 	if(headers) {
 		$tw.utils.each(headers,function(header,headerTitle,object) {
 			request.setRequestHeader(headerTitle,header);
@@ -297,7 +96,6 @@ exports.httpRequest = function(options) {
 	if(!hasHeader("X-Requested-With") && !isSimpleRequest(type,headers)) {
 		request.setRequestHeader("X-Requested-With","TiddlyWiki");
 	}
-	// Send data
 	try {
 		request.send(data);
 	} catch(e) {
@@ -306,19 +104,4 @@ exports.httpRequest = function(options) {
 	return request;
 };

-exports.setQueryStringParameter = function(url,paramName,paramValue) {
-	var URL = $tw.browser ? window.URL : require("url").URL,
-		newUrl;
-	try {
-		newUrl = new URL(url);
-	} catch(e) {
-	}
-	if(newUrl && paramName) {
-		newUrl.searchParams.set(paramName,paramValue || "");
-		return newUrl.toString();
-	} else {
-		return url;
-	}
-};
-
 })();
--- a/core/modules/widgets/transclude.js
+++ b/core/modules/widgets/transclude.js
@@ -179,7 +179,22 @@ TranscludeWidget.prototype.getTransclusionTarget = function() {
 			if(variableInfo.text) {
 				if(srcVariable.isFunctionDefinition) {
 					// Function to return parameters by name or position
-					var result = (variableInfo.resultList ? variableInfo.resultList[0] : variableInfo.text) || "";
+					var fnGetParam = function(name,index) {
+							// Parameter names starting with dollar must be escaped to double dollars
+							if(name.charAt(0) === "$") {
+								name = "$" + name;
+							}
+							// Look for the parameter by name
+							if(self.hasAttribute(name)) {
+								return self.getAttribute(name);
+							// Look for the parameter by index
+							} else if(self.hasAttribute(index + "")) {
+								return self.getAttribute(index + "");
+							} else {
+								return undefined;
+							}
+						},
+						result = this.evaluateVariable(this.transcludeVariable,{params: fnGetParam})[0] || "";
 					parser = {
 						tree: [{
 							type: "text",
--- a/core/modules/widgets/widget.js
+++ b/core/modules/widgets/widget.js
@@ -112,18 +112,14 @@ Get the prevailing value of a context variable
 name: name of variable
 options: see below
 Options include
-
 params: array of {name:, value:} for each parameter
 defaultValue: default value if the variable is not defined
-source: optional source iterator for evaluating function invocations
 allowSelfAssigned: if true, includes the current widget in the context chain instead of just the parent

 Returns an object with the following fields:

-params: array of {name:,value:} or {value:} of parameters to be applied
+params: array of {name:,value:} of parameters passed to wikitext variables
 text: text of variable, with parameters properly substituted
-resultList: result of variable evaluation as an array
-srcVariable: reference to the object defining the variable
 */
 Widget.prototype.getVariableInfo = function(name,options) {
 	options = options || {};
@@ -139,8 +135,7 @@ Widget.prototype.getVariableInfo = function(name,options) {
 	if(variable) {
 		var originalValue = variable.value,
 			value = originalValue,
-			params = [],
-			resultList = [value];
+			params = [];
 		// Only substitute parameter and variable references if this variable was defined with the \define pragma
 		if(variable.isMacroDefinition) {
 			params = self.resolveVariableParameters(variable.params,actualParams);
@@ -149,28 +144,10 @@ Widget.prototype.getVariableInfo = function(name,options) {
 				value = $tw.utils.replaceString(value,new RegExp("\\$" + $tw.utils.escapeRegExp(param.name) + "\\$","mg"),param.value);
 			});
 			value = self.substituteVariableReferences(value,options);
-			resultList = [value];
-		} else if(variable.isFunctionDefinition) {
-			// Function evaluations
-			params = self.resolveVariableParameters(variable.params,actualParams);
-			var variables = Object.create(null);
-			// Apply default parameter values
-			$tw.utils.each(variable.params,function(param,index) {
-				if(param["default"]) {
-					variables[param.name] = param["default"];
-				}
-			});
-			// Parameters are an array of {value:} or {name:, value:} pairs
-			$tw.utils.each(params,function(param) {
-				variables[param.name] = param.value;
-			});
-			resultList = this.wiki.filterTiddlers(value,this.makeFakeWidgetWithVariables(variables),options.source);
-			value = resultList[0] || "";
 		}
 		return {
 			text: value,
 			params: params,
-			resultList: resultList,
 			srcVariable: variable,
 			isCacheable: originalValue === value
 		};
@@ -182,7 +159,6 @@ Widget.prototype.getVariableInfo = function(name,options) {
 	}
 	return {
 		text: text,
-		resultList: [text],
 		srcVariable: {}
 	};
 };
@@ -341,11 +317,62 @@ Widget.prototype.makeFakeWidgetWithVariables = function(variables) {
 			};
 		},
 		makeFakeWidgetWithVariables: self.makeFakeWidgetWithVariables,
+		evaluateVariable: self.evaluateVariable,
 		resolveVariableParameters: self.resolveVariableParameters,
 		wiki: self.wiki
 	};
 };

+/*
+Evaluate a variable and associated actual parameters and return the resulting array.
+The way that the variable is evaluated depends upon its type:
+* Functions are evaluated as parameterised filter strings
+* Macros are returned as plain text with substitution of parameters
+* Procedures and widgets are returned as plain text
+
+Options are:
+params - the actual parameters – may be one of:
+	* an array of values that may be an anonymous string value, or a {name:, value:} pair
+	* a hashmap of {name: value} pairs
+	* a function invoked with parameters (name,index) that returns a parameter value by name or position
+source - iterator for source tiddlers
+*/
+Widget.prototype.evaluateVariable = function(name,options) {
+	options = options || {};
+	var params = options.params || [];
+	// Get the details of the variable (includes processing text substitution for macros
+	var variableInfo = this.getVariableInfo(name,{params: params,defaultValue: ""});
+	// Process function parameters
+	var variables = Object.create(null);
+	if(variableInfo.srcVariable && variableInfo.srcVariable.isFunctionDefinition) {
+		// Apply default parameter values
+		$tw.utils.each(variableInfo.srcVariable.params,function(param,index) {
+			if(param["default"]) {
+				variables[param.name] = param["default"];
+			}
+		});
+		if($tw.utils.isArray(params)) {
+			// Parameters are an array of values or {name:, value:} pairs
+			$tw.utils.each(this.resolveVariableParameters(variableInfo.srcVariable.params,params),function(param) {
+				variables[param.name] = param.value;
+			});
+		} else if(typeof params === "function") {
+			// Parameters are passed via a function
+			$tw.utils.each(variableInfo.srcVariable.params,function(param,index) {
+				variables[param.name] = params(param.name,index) || param["default"] || "";
+			});
+		} else {
+			// Parameters are a hashmap
+			$tw.utils.each(params,function(value,name) {
+				variables[name] = value;
+			});
+		}
+		return this.wiki.filterTiddlers(variableInfo.text,this.makeFakeWidgetWithVariables(variables),options.source);
+	} else {
+		return [variableInfo.text];
+	}
+};
+
 /*
 Compute the current values of the attributes of the widget. Returns a hashmap of the names of the attributes that have changed.
 Options include:
@@ -379,7 +406,13 @@ Widget.prototype.computeAttribute = function(attribute) {
 		value = this.wiki.getTextReference(attribute.textReference,"",this.getVariable("currentTiddler")) || "";
 	} else if(attribute.type === "macro") {
 		var variableInfo = this.getVariableInfo(attribute.value.name,{params: attribute.value.params});
-		value = variableInfo.text;
+		if(variableInfo.srcVariable && variableInfo.srcVariable.isFunctionDefinition) {
+			// It is a function definition. Go through each of the defined parameters, and make a variable with the value of the corresponding provided parameter
+			var paramArray = this.resolveVariableParameters(variableInfo.srcVariable.params,attribute.value.params);
+			value = this.evaluateVariable(attribute.value.name,{params: paramArray})[0] || "";
+		} else {
+			value = variableInfo.text;
+		}
 	} else { // String attribute
 		value = attribute.value;
 	}
@@ -796,20 +829,6 @@ Widget.prototype.allowActionPropagation = function() {
 	return true;
 };

-/*
-Evaluate a variable with parameters. This is a static convenience method that attempts to evaluate a variable as a function, returning an array of strings
-*/
-Widget.evaluateVariable  = function(widget,name,options) {
-	var result;
-	if(widget.getVariableInfo) {
-		var variableInfo = widget.getVariableInfo(name,options);
-		result = variableInfo.resultList || [variableInfo.text];
-	} else {
-		result = [widget.getVariable(name)];
-	}
-	return result;
-};
-
 exports.widget = Widget;

 })();
--- a/core/modules/wiki.js
+++ b/core/modules/wiki.js
@@ -1415,14 +1415,6 @@ exports.checkTiddlerText = function(title,targetText,options) {
 	return text === targetText;
 }

-/*
-Execute an action string without an associated context widget
-*/
-exports.invokeActionString = function(actions,event,variables,options) {
-	var widget = this.makeWidget(null,{parentWidget: options.parentWidget});
-	widget.invokeActionString(actions,null,event,variables);
-};
-
 /*
 Read an array of browser File objects, invoking callback(tiddlerFieldsArray) once they're all read
 */
--- a/core/palettes/Vanilla.tid
+++ b/core/palettes/Vanilla.tid
@@ -54,7 +54,6 @@ modal-footer-background: #f5f5f5
 modal-footer-border: #dddddd
 modal-header-border: #eeeeee
 muted-foreground: #bbb
-network-activity-foreground: #448844
 notification-background: #ffffdd
 notification-border: #999999
 page-background: #f4f4f4
--- a/core/ui/ControlPanel/Settings.tid
+++ b/core/ui/ControlPanel/Settings.tid
@@ -2,6 +2,18 @@ title: $:/core/ui/ControlPanel/Settings
 tags: $:/tags/ControlPanel
 caption: {{$:/language/ControlPanel/Settings/Caption}}

-<div class="tc-control-panel">
-<$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/SettingsTab]!has[draft.of]]" default="$:/core/ui/ControlPanel/Settings/TiddlyWiki" explicitState="$:/state/tab--697582678"/>
-</div>
+\define lingo-base() $:/language/ControlPanel/Settings/
+
+<<lingo Hint>>
+
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Settings]]">
+
+<div style="border-top:1px solid #eee;">
+
+!! <$link><$transclude field="caption"/></$link>
+
+<$transclude/>
+
+</div>
+
+</$list>
--- a/core/ui/EditTemplate/tags.tid
+++ b/core/ui/EditTemplate/tags.tid
@@ -14,8 +14,8 @@ color:$(foregroundColor)$;
 \define tag-body-inner(colour,fallbackTarget,colourA,colourB,icon,tagField:"tags")
 \whitespace trim
 <$vars foregroundColor=<<contrastcolour target:"""$colour$""" fallbackTarget:"""$fallbackTarget$""" colourA:"""$colourA$""" colourB:"""$colourB$""">> backgroundColor="""$colour$""">
-<span style=<<tag-styles>> class="tc-tag-label tc-tag-list-item tc-small-gap-right" data-tag-title=<<currentTiddler>>>
-<$transclude tiddler="""$icon$"""/><$view field="title" format="text"/>
+<span style=<<tag-styles>> class="tc-tag-label tc-tag-list-item tc-small-gap-right">
+<$transclude tiddler="""$icon$"""/><$view field="title" format="text" />
 <$button class="tc-btn-invisible tc-remove-tag-button" style=<<tag-styles>>><$action-listops $tiddler=<<saveTiddler>> $field=<<__tagField__>> $subfilter="-[{!!title}]"/>{{$:/core/images/close-button}}</$button>
 </span>
 </$vars>
--- a/core/ui/PageControls/network-activity.tid
+++ b/core/ui/PageControls/network-activity.tid
@@ -1,16 +0,0 @@
-title: $:/core/ui/Buttons/network-activity
-tags: $:/tags/PageControls
-caption: {{$:/core/images/network-activity}} {{$:/language/Buttons/NetworkActivity/Caption}}
-description: {{$:/language/Buttons/NetworkActivity/Hint}}
-
-\whitespace trim
-<$button message="tm-http-cancel-all-requests" tooltip={{$:/language/Buttons/NetworkActivity/Hint}} aria-label={{$:/language/Buttons/NetworkActivity/Caption}} class=<<tv-config-toolbar-class>>>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
-{{$:/core/images/network-activity}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
-<span class="tc-btn-text">
-<$text text={{$:/language/Buttons/NetworkActivity/Caption}}/>
-</span>
-</$list>
-</$button>
--- a/core/ui/TagPickerTagTemplate.tid
+++ b/core/ui/TagPickerTagTemplate.tid
@@ -15,7 +15,7 @@ title: $:/core/ui/TagPickerTagTemplate
 <<actions>>
 <$set name="backgroundColor" value={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}}>
 <$wikify name="foregroundColor" text="""<$macrocall $name="contrastcolour" target=<<backgroundColor>> fallbackTarget=<<fallbackTarget>> colourA=<<colourA>> colourB=<<colourB>>/>""">
-<span class="tc-tag-label tc-btn-invisible" style=<<tag-pill-styles>> data-tag-title=<<currentTiddler>> >
+<span class="tc-tag-label tc-btn-invisible" style=<<tag-pill-styles>>>
 {{||$:/core/ui/TiddlerIcon}}<$view field="title" format="text"/>
 </span>
 </$wikify>
--- a/core/wiki/config/PageControlButtons.multids
+++ b/core/wiki/config/PageControlButtons.multids
@@ -13,7 +13,6 @@ core/ui/Buttons/language: hide
 core/ui/Buttons/tag-manager: hide
 core/ui/Buttons/manager: hide
 core/ui/Buttons/more-page-actions: hide
-core/ui/Buttons/network-activity: hide
 core/ui/Buttons/new-journal: hide
 core/ui/Buttons/new-image: hide
 core/ui/Buttons/palette: hide
--- a/core/wiki/tags/PageControls.tid
+++ b/core/wiki/tags/PageControls.tid
@@ -1,2 +1,2 @@
 title: $:/tags/PageControls
-list: [[$:/core/ui/Buttons/home]] [[$:/core/ui/Buttons/close-all]] [[$:/core/ui/Buttons/fold-all]] [[$:/core/ui/Buttons/unfold-all]] [[$:/core/ui/Buttons/permaview]] [[$:/core/ui/Buttons/new-tiddler]] [[$:/core/ui/Buttons/new-journal]] [[$:/core/ui/Buttons/new-image]] [[$:/core/ui/Buttons/import]] [[$:/core/ui/Buttons/export-page]] [[$:/core/ui/Buttons/control-panel]] [[$:/core/ui/Buttons/advanced-search]] [[$:/core/ui/Buttons/manager]] [[$:/core/ui/Buttons/tag-manager]] [[$:/core/ui/Buttons/language]] [[$:/core/ui/Buttons/palette]] [[$:/core/ui/Buttons/theme]] [[$:/core/ui/Buttons/layout]] [[$:/core/ui/Buttons/storyview]] [[$:/core/ui/Buttons/encryption]] [[$:/core/ui/Buttons/timestamp]] [[$:/core/ui/Buttons/full-screen]] [[$:/core/ui/Buttons/print]] [[$:/core/ui/Buttons/save-wiki]] [[$:/core/ui/Buttons/refresh]] [[$:/core/ui/Buttons/network-activity]] [[$:/core/ui/Buttons/more-page-actions]]
+list: [[$:/core/ui/Buttons/home]] [[$:/core/ui/Buttons/close-all]] [[$:/core/ui/Buttons/fold-all]] [[$:/core/ui/Buttons/unfold-all]] [[$:/core/ui/Buttons/permaview]] [[$:/core/ui/Buttons/new-tiddler]] [[$:/core/ui/Buttons/new-journal]] [[$:/core/ui/Buttons/new-image]] [[$:/core/ui/Buttons/import]] [[$:/core/ui/Buttons/export-page]] [[$:/core/ui/Buttons/control-panel]] [[$:/core/ui/Buttons/advanced-search]] [[$:/core/ui/Buttons/manager]] [[$:/core/ui/Buttons/tag-manager]] [[$:/core/ui/Buttons/language]] [[$:/core/ui/Buttons/palette]] [[$:/core/ui/Buttons/theme]] [[$:/core/ui/Buttons/layout]] [[$:/core/ui/Buttons/storyview]] [[$:/core/ui/Buttons/encryption]] [[$:/core/ui/Buttons/timestamp]] [[$:/core/ui/Buttons/full-screen]] [[$:/core/ui/Buttons/print]] [[$:/core/ui/Buttons/save-wiki]] [[$:/core/ui/Buttons/refresh]] [[$:/core/ui/Buttons/more-page-actions]]
--- a/tw5.com/mechanisms/TestingMechanism.tid
+++ b/tw5.com/mechanisms/TestingMechanism.tid
@@ -2,7 +2,7 @@ modified: 20141013085608911
 tags: Mechanisms
 title: TestingMechanism

-TiddlyWiki5 incorporates the Jasmine JavaScript testing framework (see https://jasmine.github.io/). It allows the same tests to be run both in the browser and under Node.js.
+TiddlyWiki5 incorporates the Jasmine JavaScript testing framework (see http://pivotal.github.io/jasmine/). It allows the same tests to be run both in the browser and under Node.js.

 ! TiddlyWiki5 Testing Components

--- a/editions/es-ES/tiddlers/$__Acknowledgements.tid
+++ b/editions/es-ES/tiddlers/$__Acknowledgements.tid
@@ -6,7 +6,7 @@ type: text/vnd.tiddlywiki
 TiddlyWiki incorpora código de los siguientes proyectos OpenSource:

 * [[The Stanford Javascript Crypto Library|http://bitwiseshiftleft.github.io/sjcl/]]
-* [[The Jasmine JavaScript Test Framework|https://jasmine.github.io/]]
+* [[The Jasmine JavaScript Test Framework|http://pivotal.github.io/jasmine/]]
 * [[Normalize.css by Nicolas Gallagher|http://necolas.github.io/normalize.css/]]

 ...y materiales de estos otros proyectos:
--- a/editions/fr-FR/tiddlers/$__Acknowledgements.tid
+++ b/editions/fr-FR/tiddlers/$__Acknowledgements.tid
@@ -6,7 +6,7 @@ type: text/vnd.tiddlywiki
 TiddlyWiki intègre du code provenant de ces excellents projets OpenSource<<dp>>

 * [[The Stanford Javascript Crypto Library|http://bitwiseshiftleft.github.io/sjcl/]]
-* [[The Jasmine JavaScript Test Framework|https://jasmine.github.io/]]
+* [[The Jasmine JavaScript Test Framework|http://pivotal.github.io/jasmine/]]
 * [[Normalize.css by Nicolas Gallagher|http://necolas.github.io/normalize.css/]]

 Et des contenus provenenant de ces sources<<dp>>
--- a/editions/prerelease/tiddlers/Release
+++ b/editions/prerelease/tiddlers/Release
@@ -38,7 +38,6 @@ The new transclusion architecture is not by itself sufficient to enable us to fu

 * <<.link-badge-extended "https://github.com/Jermolene/TiddlyWiki5/pull/7260">> Dynannotate pugin to support three additional search modes
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7365">> problem with [[BrowserStorage Plugin]] unnecessarily saving shadow tiddlers
-* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7493">> [[CodeMirror Plugin]] to add an option to make trailing spaces visible

 ! Translation improvement

@@ -60,10 +59,8 @@ Improvements to the following translations:

 ! Filter improvements

-* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7511"> new [[deserialize Operator]] for converting various textual representations of tiddlers into JSON data
 * <<.link-badge-extended "https://github.com/Jermolene/TiddlyWiki5/pull/7292">> [[format Operator]] to support converting Unix timestamps to TiddlyWiki's native date format

-
 ! Hackability Improvements

 * <<.link-badge-extended "https://github.com/Jermolene/TiddlyWiki5/pull/7413">> [[Core Icons]] to allow the size to be controlled with a parameter
@@ -80,10 +77,6 @@ Improvements to the following translations:
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7401">> bug whereby scrolling occurs if the linkcatcher widget triggers an action-navigate and the $scroll attribute is set to "no"
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7409">> problem switching between LTR and RTL text
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7448">> bug when checkbox widget's listField attribute was given the name of a date field (like <<.field created>> or <<.field modified>>)
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/7529">> size of buttons in dropdown for editor "link" toolbar button
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/8e132948b6bec623d81d300fbe6dc3a0307bcc6d">> crash when transcluding a lazily loaded tiddler as an attribute value
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/7462">> DiffTextWidget crash with missing or empty attributes
-* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7448">> CheckboxWidget to avoid writing to date fields

 ! Developer Improvements

@@ -91,9 +84,7 @@ Improvements to the following translations:

 ! Node.js Improvements

-* <<.link-badge-extended "https://github.com/Jermolene/TiddlyWiki5/pull/7471">> [[WebServer Parameter: authenticated-user-header]] to require URI encoding of authenticated username header, permitting non-ASCII characters in usernames
 * <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7253">> support for `filepath` source attribute to [[tiddlywiki.files Files]]
-* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/commit/48b22abdaab62c281c207127c66883b50898f9dd">> a warning message for JSON errors in [[tiddlywiki.info Files]] or [[plugin.info Files|PluginFolders]]

 ! Performance Improvements

@@ -105,22 +96,17 @@ Improvements to the following translations:

 <<.contributors """
 Arlen22
-BramChen
 btheado
 donmor
 flibbles
 GameDungeon
-JoshuaFontany
 kookma
 linonetwo
 Marxsal
-mateuszwilczek
 michsa
 muzimuzhi
 pmario
 rmunn
 saqimtiaz
-tavin
-twMat
 yaisog
 """>>
--- a/editions/test/tiddlers/tests/data/deserializers/case
+++ b/editions/test/tiddlers/tests/data/deserializers/case
@@ -1,8 +0,0 @@
-title: dezerializer test data case 6
-type: application/json
-
-[
-	{"created":"20230601125557184","text":"Before you start storing important information in ~TiddlyWiki it is vital to make sure that you can reliably save changes. See https://tiddlywiki.com/#GettingStarted for details\n\n","title":"GettingStarted","modified":"20230601125601619"},
-    {"created":"20230601125507054","text":"Welcome to \"TiddlyWiki\".\n\nThis is a test tiddler.","tags":"","title":"Hello There \"Welcome\"","modified":"20230601125551144"},
-    {"title":"TiddlyWiki","created":"20130822170700000","modified":"20170127221451610","tags":"Concepts","type":"text/vnd.tiddlywiki","text":"~TiddlyWiki is a rich, interactive tool for manipulating complex data with structure that doesn't easily fit into conventional tools like spreadsheets or wordprocessors.\n\n~TiddlyWiki is designed to fit around your brain, helping you deal with the things that won't fit."}
-]
--- a/editions/test/tiddlers/tests/test-deserialize-operator.js
+++ b/editions/test/tiddlers/tests/test-deserialize-operator.js
@@ -1,44 +0,0 @@
-/*\
-title: test-deserialize-operator.js
-type: application/javascript
-tags: [[$:/tags/test-spec]]
-
-Tests deserialize[] filter operator with various core deserializers
-
-\*/
-(function(){
-
-	/* jslint node: true, browser: true */
-	/* eslint-env node, browser, jasmine */
-	/* eslint no-mixed-spaces-and-tabs: ["error", "smart-tabs"]*/
-	/* global $tw, require */
-	"use strict";
-
-	
-	describe("deserialize operator tests", function() {
-
-		it("should support the deserialize[] operator", function() {
-			//Unknown deserializer as operand
-			expect($tw.wiki.filterTiddlers("[{dezerializer test data case 4}deserialize[unknown/deserializer]]")).toEqual([$tw.language.getString("Error/DeserializeOperator/UnknownDeserializer")]);
-
-			//Missing operand
-			expect($tw.wiki.filterTiddlers("[{dezerializer test data case 4}deserialize[]]")).toEqual([$tw.language.getString("Error/DeserializeOperator/MissingOperand")]);
-
-			//Deserialize TiddlyWiki file
-			expect($tw.wiki.filterTiddlers("[{dezerializer test data case 4}deserialize[text/html]]")).toEqual(['[{"type":"text/vnd.tiddlywiki","text":"Abacus","title":"Hello \\"There\\""},{"title":"Hello \\"There\\"","text":"Calculator"}]']);
-			expect($tw.wiki.filterTiddlers("[{dezerializer test data case 5}deserialize[text/html]]")).toEqual(['[{"type":"text/vnd.tiddlywiki","text":"Abacus","title":"Hello \\"There\\""},{"title":"Hello \\"There\\"","text":"Calculator"},{"title":"Hello \\"There\\"","text":"Protractor"}]']);
-
-			// Deserialize JSON payload containing tiddlers
-			expect($tw.wiki.filterTiddlers("[{dezerializer test data case 6}deserialize[application/json]]")).toEqual( [ `[{"created":"20230601125557184","text":"Before you start storing important information in ~TiddlyWiki it is vital to make sure that you can reliably save changes. See https://tiddlywiki.com/#GettingStarted for details\\n\\n","title":"GettingStarted","modified":"20230601125601619"},{"created":"20230601125507054","text":"Welcome to \\"TiddlyWiki\\".\\n\\nThis is a test tiddler.","tags":"","title":"Hello There \\"Welcome\\"","modified":"20230601125551144"},{"title":"TiddlyWiki","created":"20130822170700000","modified":"20170127221451610","tags":"Concepts","type":"text/vnd.tiddlywiki","text":"~TiddlyWiki is a rich, interactive tool for manipulating complex data with structure that doesn't easily fit into conventional tools like spreadsheets or wordprocessors.\\n\\n~TiddlyWiki is designed to fit around your brain, helping you deal with the things that won't fit."}]` ]);
-			expect($tw.wiki.filterTiddlers("[{dezerializer test data case 6}deserialize[application/json]jsonindexes[]] :map[{dezerializer test data case 6}jsonget<currentTiddler>,[title]]")).toEqual([ 'GettingStarted', 'Hello There "Welcome"', 'TiddlyWiki' ]);
-
-			//Deserialize TiddlyWiki file with an mismatched deserializer
-			expect($tw.wiki.filterTiddlers("[{dezerializer test data case 5}deserialize[application/json]]")).toEqual([jasmine.stringMatching('JSON error')]);
-		});
-	});
-	
-})();
-
-
-
- 
--- a/editions/tw5.com/tiddlers/filters/deserialize
+++ b/editions/tw5.com/tiddlers/filters/deserialize
@@ -1,26 +0,0 @@
-caption: deserialize
-created: 20230601195749377
-from-version: 5.3.0
-modified: 20230602105513132
-op-input: a selection of strings
-op-output: JSON representations of tiddlers extracted from input titles.
-op-parameter: the deserializer module to be used to extract tiddlers from the input
-op-purpose: extract JSON representation of tiddlers from the input strings
-tags: [[Filter Operators]] [[Special Operators]]
-title: deserialize Operator
-type: text/vnd.tiddlywiki
-
-<<.tip "Deserializer modules parse text in various formats into their JSON representation as tiddlers. You can see the deserializers available in a wiki using the [[deserializers operator|deserializers Operator]].">>
-
-|!Deserializer |!Description |
-|(DOM)|Extracts tiddlers from a DOM node, should not be used with the <<.op deserialize[]>> operator |
-|application/javascript|Parses a JavaScript module as a tiddler extracting fields from the header comment|
-|application/json|Parses [[JSON|JSON in TiddlyWiki]] into tiddlers|
-|application/x-tiddler|Parses the [[.tid file format|TiddlerFiles]] as a tiddler|
-|application/x-tiddler-html-div|Parses the [[<DIV>.tiddler file format|TiddlerFiles]] as a tiddler|
-|application/x-tiddlers|Parses the [[MultiTiddlerFile format|MultiTiddlerFiles]] as tiddlers|
-|text/css|Parses CSS as a tiddler extracting fields from the header comment|
-|text/html|Parses an HTML file into tiddlers. Supports ~TiddlyWiki Classic HTML files, ~TiddlyWiki5 HTML files and ordinary HTML files|
-|text/plain|Parses plain text as a tiddler|
-
-<<.operator-examples "deserialize">>
--- a/editions/tw5.com/tiddlers/filters/examples/deserialize
+++ b/editions/tw5.com/tiddlers/filters/examples/deserialize
@@ -1,29 +0,0 @@
-created: 20230601200356736
-modified: 20230602105036887
-tags: [[Operator Examples]] [[deserialize Operator]]
-title: deserialize Operator (Examples)
-type: text/vnd.tiddlywiki
-
-\define html-data()
-<!doctype html>
-<html lang="en">
-<head>
-	<meta charset="utf-8">
-	<title>Test Data</title>
-</head>
-<body>
-
-<!--~~ Ordinary tiddlers ~~-->
-<div id="storeArea" style="display:none;"><div title="Hello &quot;There&quot;" type="text/vnd.tiddlywiki">
-<pre>Abacus</pre>
-</div>
-</div>
-<script class="tiddlywiki-tiddler-store" type="application/json">[{"title":"Hello \"There\"","text":"Calculator"},{"title":"Hello \"There\"","text":"Protractor"}]</script>
-</body>
-</html>
-\end
-
-This example uses the predefined variable `html-data`:
-<$codeblock code=<<html-data>> language="HTML"/>
-
-<<.operator-example 1 "[<html-data>deserialize[text/html]]">>
--- a/editions/tw5.com/tiddlers/howtos/Custom
+++ b/editions/tw5.com/tiddlers/howtos/Custom
@@ -1,32 +0,0 @@
-created: 20230608121519758
-modified: 20230608123444591
-tags: [[How to apply custom styles]]
-title: Custom tag pill styles
-type: text/vnd.tiddlywiki
-
-! Attribute: data-tag-title
-
-<<.from-version "5.2.0">> The attribute <<.attr data-tag-title>> was added to tag pills visible in the tiddler view template. 
-
-<<.from-version "5.3.0">> The attribute was added to every tag pill visible in the standard ~TiddlyWiki UI. Especially the edit template tag list, the tag-picker dropdown,  the Right sidebar -> More -> Tags tab and the $:/TagManager
-
-The <<.attr data-tag-title>> HTML attribute only contains the tag-title visible in the tag pill. It can be used to style the tag-pill. 
-
-If you want to style the whole tiddler have a look at: [[Custom styles by data-tiddler-title]]
-
-!! Examples
-
-If you use the following CSS in a new tiddler tagged: `$:/tags/Stylesheet` every tag that starts with a `#` will have a new border radius. So those tags stand out in contrast to the default tags. 
-
-''You have to define both CSS rules'', due to the existing UI structure to catch all tag-pills in the existing TW UI.
-
-```
-[data-tag-title^="#"] .tc-tag-label,
-[data-tag-title^="#"].tc-tag-label {
-   border-radius: 3px;
-}
-```
-
-!! More Possibilities
-
-{{Attribute Selectors}}
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_
@@ -3,7 +3,6 @@ modified: 20220301180818011
 tags: Messages
 title: WidgetMessage: tm-close-all-windows
 type: text/vnd.tiddlywiki
-caption: tm-close-all-windows

 <<.from-version 5.2.2>>
 The `tm-close-all-windows` [[message|Messages]] closes all additional //browser// window that were opened with [[tm-open-window|WidgetMessage: tm-open-window]]. 
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_
@@ -1,12 +0,0 @@
-caption: tm-http-cancel-all-requests
-created: 20230429161453032
-modified: 20230429161453032
-tags: Messages
-title: WidgetMessage: tm-http-cancel-all-requests
-type: text/vnd.tiddlywiki
-
-The ''tm-http-cancel-all-requests'' message is used to cancel all outstanding HTTP requests initiated with [[WidgetMessage: tm-http-request]].
-
-Note that the state tiddler $:/state/http-requests contains a number representing the number of outstanding HTTP requests in progress.
-
-It does not take any parameters.
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_
@@ -1,115 +0,0 @@
-title: WidgetMessage: tm-http-request Example - Zotero
-tags: $:/tags/Macro
-
-\procedure select-zotero-group()
-Specify the Zotero group ID to import
-<$edit-text tiddler="$:/config/zotero-group" tag="input"/> or 
-<$select tiddler="$:/config/zotero-group">
-<option value="4813312">com216</option>
-<option value="4913310">pos252</option>
-<option value="4747244">idt575</option>
-</$select>
-\end
-
-\procedure zotero-save-item(item)
-<$action-createtiddler
-	$basetitle={{{ =[[_zotero_import ]] =[<item>jsonget[key]] =[[ ]] =[<item>jsonget[title]] +[join[]] }}}
-	text={{{ [<item>jsonget[title]] }}}
-	tags="$:/tags/ZoteroImport"
->
-	<$action-setmultiplefields $tiddler=<<createTiddler-title>> $fields="[<item>jsonindexes[]addprefix[zotero-]]" $values="[<item>jsonindexes[]] :map[<item>jsonget<currentTiddler>else[.XXXXX.]]"/>
-	<$list filter="[<item>jsonindexes[creators]]" variable="creatorIndex">
-		<$action-setmultiplefields $tiddler=<<createTiddler-title>> $fields="[<item>jsonget[creators],<creatorIndex>,[creatorType]addprefix[zotero-]]" $values="[<item>jsonget[creators],<creatorIndex>,[lastName]] [<item>jsonget[creators],<creatorIndex>,[firstName]] +[join[, ]] :else[<item>jsonget[creators],<creatorIndex>,[name]] "/>
-	</$list>
-</$action-createtiddler>
-\end zotero-save-item
-
-\procedure zotero-save-items(data)
-<$list filter="[<data>jsonindexes[]] :map[<data>jsonextract<currentTiddler>,[data]]" variable="item">
-	<$macrocall $name="zotero-save-item" item=<<item>>/>
-</$list>
-\end zotero-save-items
-
-\procedure zotero-get-items(start:"0",limit:"25")
-
-\procedure completion()
-\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
-	<$action-log msg="In completion"/>
-	<$action-log/>
-	<!-- Success -->
-	<$list filter="[<status>compare:number:gteq[200]compare:number:lteq[299]]" variable="ignore">
-		<!-- Import these items -->
-		<$macrocall $name="zotero-save-items" data=<<data>>/>
-		<!-- Check if there are any more items to download -->
-		<$list filter="[<headers>jsonget[total-results]subtract<start>subtract<limit>compare:number:gt[0]]" variable="ignore">
-			<$macrocall $name="zotero-get-items" start={{{ [<start>add<limit>] }}} limit=<<limit>>/>
-		</$list>
-	</$list>
-\end completion
-
-\procedure progress()
-\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
-	<$action-log message="In progress-actions"/>
-\end progress
-
-\procedure request-url()
-\rules only transcludeinline transcludeblock filteredtranscludeinline filteredtranscludeblock
-https://api.zotero.org/groups/{{$:/config/zotero-group}}/items/
-\end request-url
-
-<$wikify name="url" text=<<request-url>>>
-	<$action-sendmessage
-		$message="tm-http-request"
-		url=<<url>>
-		method="GET"
-		query-format="json"
-		query-sort="title"
-		query-start=<<start>>
-		query-limit=<<limit>>
-		header-accept="application/json"
-		bind-status="$:/temp/zotero/status"
-		bind-progress="$:/temp/zotero/progress"
-		oncompletion=<<completion>>
-		onprogress=<<progress>>
-		var-start=<<start>>
-		var-limit=<<limit>>
-	/>
-</$wikify>
-\end
-
-\procedure zotero-actions()
-<$macrocall $name="zotero-get-items" start="0" limit="50"/>
-\end
-
-<<select-zotero-group>>
-
-<$button actions=<<zotero-actions>>>
-Start import from Zotero group
-</$button>
-
-<$button message="tm-http-cancel-all-requests">
-Cancel all HTTP requests
-</$button> Outstanding requests: {{$:/state/http-requests}}
-
-<$list filter="[tag[$:/tags/ZoteroImport]limit[1]]" variable="ignore">
-
-!! Imported Tiddlers
-
-<$button>
-<$action-deletetiddler $filter="[tag[$:/tags/ZoteroImport]]"/>
-Delete these tiddlers
-</$button>
-
-Export: <$macrocall $name="exportButton" exportFilter="[tag[$:/tags/ZoteroImport]]" lingoBase="$:/language/Buttons/ExportTiddlers/"/>
-
-</$list>
-
-<ol>
-<$list filter="[tag[$:/tags/ZoteroImport]]">
-<li>
-<$link>
-<$view field="title"/>
-</$link>
-</li>
-</$list>
-</ol>
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_
@@ -1,51 +0,0 @@
-caption: tm-http-request
-created: 20230429161453032
-modified: 20230429161453032
-tags: Messages
-title: WidgetMessage: tm-http-request
-type: text/vnd.tiddlywiki
-
-The ''tm-http-request'' message is used to make an HTTP request to a server.
-
-It uses the following properties on the `event` object:
-
-|!Name |!Description |
-|param |Not used |
-|paramObject |Hashmap of parameters (see below) |
-
-The following parameters are used:
-
-|!Name |!Description |
-|method |HTTP method (eg "GET", "POST") |
-|body |String data to be sent with the request |
-|query-* |Query string parameters with string values |
-|header-* |Headers with string values |
-|password-header-* |Headers with values taken from the password store |
-|password-query-* |Query string parameters with values taken from the password store |
-|var-* |Variables to be passed to the completion and progress handlers (without the "var-" prefix) |
-|bind-status |Title of tiddler to which the status of the request ("pending", "complete", "error") should be bound |
-|bind-progress |Title of tiddler to which the progress of the request (0 to 100) should be bound |
-|oncompletion |Action strings to be executed when the request completes |
-|onprogress |Action strings to be executed when progress is reported |
-
-The following variables are passed to the completion handler:
-
-|!Name |!Description |
-|status |HTTP result status code (see [[MDN|https://developer.mozilla.org/en-US/docs/Web/HTTP/Status]]) |
-|statusText |HTTP result status text |
-|error |Error string |
-|data |Returned data |
-|headers |Response headers as a JSON object |
-
-The following variables are passed to the progress handler:
-
-|!Name |!Description |
-|lengthComputable |Whether the progress loaded and total figures are valid - "yes" or "no" |
-|loaded |Number of bytes loaded so far |
-|total |Total number bytes to be loaded |
-
-Note that the state tiddler $:/state/http-requests contains a number representing the number of outstanding HTTP requests in progress.
-
-!! Examples
-
-* [[Zotero's|https://www.zotero.org/]] API for retrieving reference items: [[WidgetMessage: tm-http-request Example - Zotero]]
--- a/editions/tw5.com/tiddlers/messages/config-zotero-group.tid
+++ b/editions/tw5.com/tiddlers/messages/config-zotero-group.tid
@@ -1,2 +0,0 @@
-title: $:/config/zotero-group
-text: 4813312
--- a/editions/tw5.com/tiddlers/system/operator-template.tid
+++ b/editions/tw5.com/tiddlers/system/operator-template.tid
@@ -1,6 +1,6 @@
 created: 20150203173506000
 list-before: $:/core/ui/ViewTemplate/body
-modified: 20230602181119360
+modified: 20220316121232243
 tags: $:/tags/ViewTemplate
 title: $:/editions/tw5.com/operator-template

@@ -72,10 +72,10 @@ title: $:/editions/tw5.com/operator-template
 <!-- -->
 </table>

-<p>[[Learn more about how to use Filters|Filters]]</p>
+[[Learn more about how to use Filters|Filters]]

 <$list filter="[all[current]has[from-version]]" variable="listItem">
-<p><$macrocall $name=".from-version" version={{!!from-version}}/></p>
+<$macrocall $name=".from-version" version={{!!from-version}}/>
 </$list>
 </$list>
 </$set>
--- a/languages/zh-Hans/Misc.multids
+++ b/languages/zh-Hans/Misc.multids
@@ -25,8 +25,6 @@ Encryption/RepeatPassword: 重复输入密码
 Encryption/PasswordNoMatch: 密码不匹配
 Encryption/SetPassword: 设定密码
 Error/Caption: 错误
-Error/DeserializeOperator/MissingOperand: 筛选器错误：'deserialize' 运算符缺少运算元
-Error/DeserializeOperator/UnknownDeserializer: 筛选器错误：未知的解串器被提供为 'deserialize' 运算符的操作数
 Error/Filter: 筛选器错误
 Error/FilterRunPrefix: 筛选器错误：筛选器 run 的未知首码
 Error/FilterSyntax: 筛选器运算式中的语法错误
--- a/languages/zh-Hant/Misc.multids
+++ b/languages/zh-Hant/Misc.multids
@@ -25,8 +25,6 @@ Encryption/RepeatPassword: 重複輸入密碼
 Encryption/PasswordNoMatch: 密碼不匹配
 Encryption/SetPassword: 設定密碼
 Error/Caption: 錯誤
-Error/DeserializeOperator/MissingOperand: 篩選器錯誤：'deserialize' 運算子缺少運算元
-Error/DeserializeOperator/UnknownDeserializer: 篩選器錯誤：未知的解串器被提供為 'deserialize' 運算子的運算元
 Error/Filter: 篩選器錯誤
 Error/FilterRunPrefix: 篩選器錯誤：篩選器 run 的未知首碼
 Error/FilterSyntax: 篩選器運算式中的語法錯誤
--- a/plugins/tiddlywiki/browser-storage/icon.tid
+++ b/plugins/tiddlywiki/browser-storage/icon.tid
@@ -1,12 +1,12 @@
 title: $:/plugins/tiddlywiki/browser-storage/icon
 tags: $:/tags/Image

-<svg class="tc-image-browser-storage tc-image-button" viewBox="0 0 128 128" width="22pt" height="22pt">
+<svg class="tc-image-down-arrow tc-image-button" viewBox="0 0 128 128" width="22pt" height="22pt">
    <g stroke="none" stroke-width="1" fill-rule="evenodd">
-        <ellipse cx="64" cy="16" rx="40" ry="16"></ellipse>
-        <path d="M24,96 C24,104.836556 41.90861,112 64,112 C86.09139,112 104,104.836556 104,96 L104,112 C104,120.836556 86.09139,128 64,128 C41.90861,128 24,120.836556 24,112 L24,96 Z"></path>
-        <path d="M24,72 C24,80.836556 41.90861,88 64,88 C86.09139,88 104,80.836556 104,72 L104,88 C104,96.836556 86.09139,104 64,104 C41.90861,104 24,96.836556 24,88 L24,72 Z"></path>
-        <path d="M24,48 C24,56.836556 41.90861,64 64,64 C86.09139,64 104,56.836556 104,48 L104,64 C104,72.836556 86.09139,80 64,80 C41.90861,80 24,72.836556 24,64 L24,48 Z"></path>
-        <path d="M24,24 C24,32.836556 41.90861,40 64,40 C86.09139,40 104,32.836556 104,24 L104,40 C104,48.836556 86.09139,56 64,56 C41.90861,56 24,48.836556 24,40 L24,24 Z"></path>
+        <ellipse id="Oval" cx="64" cy="16" rx="40" ry="16"></ellipse>
+        <path d="M24,96 C24,104.836556 41.90861,112 64,112 C86.09139,112 104,104.836556 104,96 L104,112 C104,120.836556 86.09139,128 64,128 C41.90861,128 24,120.836556 24,112 L24,96 Z" id="Combined-Shape"></path>
+        <path d="M24,72 C24,80.836556 41.90861,88 64,88 C86.09139,88 104,80.836556 104,72 L104,88 C104,96.836556 86.09139,104 64,104 C41.90861,104 24,96.836556 24,88 L24,72 Z" id="Combined-Shape-Copy-16"></path>
+        <path d="M24,48 C24,56.836556 41.90861,64 64,64 C86.09139,64 104,56.836556 104,48 L104,64 C104,72.836556 86.09139,80 64,80 C41.90861,80 24,72.836556 24,64 L24,48 Z" id="Combined-Shape-Copy-17"></path>
+        <path d="M24,24 C24,32.836556 41.90861,40 64,40 C86.09139,40 104,32.836556 104,24 L104,40 C104,48.836556 86.09139,56 64,56 C41.90861,56 24,48.836556 24,40 L24,24 Z" id="Combined-Shape-Copy-18"></path>
    </g>
 </svg>
--- a/plugins/tiddlywiki/codemirror/ui/controlpanel/settings.tid
+++ b/plugins/tiddlywiki/codemirror/ui/controlpanel/settings.tid
@@ -0,0 +1,7 @@
+title: $:/core/ui/ControlPanel/Settings
+tags: $:/tags/ControlPanel
+caption: {{$:/language/ControlPanel/Settings/Caption}}
+
+<div class="tc-control-panel">
+<$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/SettingsTab]!has[draft.of]]" default="$:/core/ui/ControlPanel/Settings/TiddlyWiki" explicitState="$:/state/tab--697582678"/>
+</div>
--- a/plugins/tiddlywiki/codemirror/ui/controlpanel/tiddlywiki.tid
+++ b/plugins/tiddlywiki/codemirror/ui/controlpanel/tiddlywiki.tid
@@ -1,7 +1,6 @@
 title: $:/core/ui/ControlPanel/Settings/TiddlyWiki
 tags: $:/tags/ControlPanel/SettingsTab
 caption: TiddlyWiki
-list-before:

 \define lingo-base() $:/language/ControlPanel/Settings/

--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -1388,11 +1388,6 @@ html body.tc-body.tc-single-tiddler-window {
 	height: 1.2em;
 }

-.tc-editor-toolbar .tc-drop-down a,
-.tc-editor-toolbar .tc-drop-down button {
-	padding: 0;
-}
-
 .tc-editor-toolbar button:hover {
 	background-color: <<colour tiddler-controls-foreground-selected>>;
 	fill: <<colour background>>;
@@ -3185,10 +3180,6 @@ span.tc-translink > a:first-child {
 	fill: <<colour background>>;
 }

-.tc-network-activity-background {
-	fill: <<colour network-activity-foreground>>;
-}
-
 /*
 ** Flexbox utility classes
 */
Author	SHA1	Message	Date
jeremy@jermolene.com	45551d3b0c	Release note update	2023-06-08 21:44:47 +01:00
jeremy@jermolene.com	2f3a461bab	Fix tests	2023-06-03 11:27:34 +01:00
jeremy@jermolene.com	9ad19f872f	Enable CamelCase for main documentation wikis Will take us a bit longer to convert all the links over	2023-06-03 11:07:28 +01:00
jeremy@jermolene.com	e21c39d471	New parse rule for ~CamelCase For backwards compatibility with text that includes ~ to suppress camelcase links	2023-06-03 11:03:46 +01:00
jeremy@jermolene.com	ea831d25fd	Disable camelcase by default	2023-06-03 11:01:54 +01:00