Merge branch 'master' into tm-save-dom-to-image

* fix: ensure getting variable info for a function doesnt pollute parent widget

* fix: makeFakeWidget should not pollute upstream

bin/build-site.sh

@@ -120,7 +120,6 @@ node $TW5_BUILD_TIDDLYWIKI \
 	|| exit 1
 
 # /empty.html					Empty
-# /empty.hta					For Internet Explorer
 # /empty-external-core.html		External core empty
 # /tiddlywikicore-<version>.js	Core plugin javascript
 node $TW5_BUILD_TIDDLYWIKI \

boot/boot.js

@@ -613,7 +613,7 @@ $tw.utils.evalGlobal = function(code,context,filename,sandbox,allowGlobals) {
 	// Compile the code into a function
 	var fn;
 	if($tw.browser) {
-		fn = window["eval"](code + "\n\n//# sourceURL=" + filename); // eslint-disable-line no-eval -- See https://github.com/TiddlyWiki/TiddlyWiki5/issues/6839
+		fn = Function("return " + code + "\n\n//# sourceURL=" + filename)(); // See https://github.com/TiddlyWiki/TiddlyWiki5/issues/6839
 	} else {
 		if(sandbox){
 			fn = vm.runInContext(code,sandbox,filename)

core-server/server/routes/get-tiddler-html.js

@@ -33,8 +33,8 @@ exports.handler = function(request,response,state) {
 		}
 		var text = state.wiki.renderTiddler(renderType,renderTemplate,{parseAsInline: true, variables: {currentTiddler: title}});
 
-		// Naughty not to set a content-type, but it's the easiest way to ensure the browser will see HTML pages as HTML, and accept plain text tiddlers as CSS or JS
-		state.sendResponse(200,{},text,"utf8");
+		var headers = {"Content-Type": renderType};
+		state.sendResponse(200,headers,text,"utf8");
 	} else {
 		response.writeHead(404);
 		response.end();

core/language/en-GB/ControlPanel.multids

@@ -6,6 +6,7 @@ Appearance/Caption: Appearance
 Appearance/Hint: Ways to customise the appearance of your TiddlyWiki.
 Basics/AnimDuration/Prompt: Animation duration
 Basics/AutoFocus/Prompt: Default focus field for new tiddlers
+Basics/AutoFocusEdit/Prompt: Default focus field for existing tiddlers
 Basics/Caption: Basics
 Basics/DefaultTiddlers/BottomHint: Use [[double square brackets]] for titles with spaces. Or you can choose to {{retain story ordering||$:/snippets/retain-story-ordering-button}}
 Basics/DefaultTiddlers/Prompt: Default tiddlers

core/language/en-GB/Draft.multids

@@ -0,0 +1,4 @@
+title: $:/language/Draft/
+
+Attribution: Draft of '<<draft-title>>' by {{$:/status/UserName}}
+Title: Draft of '<<draft-title>>'

core/language/en-GB/TiddlerInfo.multids

@@ -9,6 +9,7 @@ Advanced/ShadowInfo/NotShadow/Hint: The tiddler <$link to=<<infoTiddler>>><$text
 Advanced/ShadowInfo/Shadow/Hint: The tiddler <$link to=<<infoTiddler>>><$text text=<<infoTiddler>>/></$link> is a shadow tiddler
 Advanced/ShadowInfo/Shadow/Source: It is defined in the plugin <$link to=<<pluginTiddler>>><$text text=<<pluginTiddler>>/></$link>
 Advanced/ShadowInfo/OverriddenShadow/Hint: It is overridden by an ordinary tiddler
+Advanced/CascadeInfo/Heading: Cascade Details
 Fields/Caption: Fields
 List/Caption: List
 List/Empty: This tiddler does not have a list

core/modules/editor/factory.js

@@ -48,8 +48,8 @@ function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) {
 			this.toolbarNode = this.document.createElement("div");
 			this.toolbarNode.className = "tc-editor-toolbar";
 			parent.insertBefore(this.toolbarNode,nextSibling);
-			this.renderChildren(this.toolbarNode,null);
 			this.domNodes.push(this.toolbarNode);
+			this.renderChildren(this.toolbarNode,null);
 		}
 		// Create our element
 		var editInfo = this.getEditInfo(),

core/modules/filters.js

@@ -88,8 +88,8 @@ function parseFilterOperation(operators,filterString,p) {
 						rexMatch = rex.exec(filterString.substring(p));
 					if(rexMatch) {
 						operator.regexp = new RegExp(rexMatch[1], rexMatch[2]);
-						// DEPRECATION WARNING
-						console.log("WARNING: Filter",operator.operator,"has a deprecated regexp operand",operator.regexp);
+	// DEPRECATION WARNING
+	console.log("WARNING: Filter",operator.operator,"has a deprecated regexp operand",operator.regexp);
 						nextBracketPos = p + rex.lastIndex - 1;
 					}
 					else {
@@ -232,12 +232,7 @@ exports.getFilterRunPrefixes = function() {
 
 exports.filterTiddlers = function(filterString,widget,source) {
 	var fn = this.compileFilter(filterString);
-	try {
-		const fnResult = fn.call(this,source,widget);
-		return fnResult;
-	} catch(e) {
-		return [`${$tw.language.getString("Error/Filter")}: ${e}`];
-	}
+	return fn.call(this,source,widget);
 };
 
 /*
@@ -319,19 +314,19 @@ exports.compileFilter = function(filterString) {
 
 				// Invoke the appropriate filteroperator module
 				results = operatorFunction(accumulator,{
-					operator: operator.operator,
-					operand: operands.length > 0 ? operands[0] : undefined,
-					operands: operands,
-					multiValueOperands: multiValueOperands,
-					isMultiValueOperand: isMultiValueOperand,
-					prefix: operator.prefix,
-					suffix: operator.suffix,
-					suffixes: operator.suffixes,
-					regexp: operator.regexp
-				},{
-					wiki: self,
-					widget: widget
-				});
+							operator: operator.operator,
+							operand: operands.length > 0 ? operands[0] : undefined,
+							operands: operands,
+							multiValueOperands: multiValueOperands,
+							isMultiValueOperand: isMultiValueOperand,
+							prefix: operator.prefix,
+							suffix: operator.suffix,
+							suffixes: operator.suffixes,
+							regexp: operator.regexp
+						},{
+							wiki: self,
+							widget: widget
+						});
 				if($tw.utils.isArray(results)) {
 					accumulator = self.makeTiddlerIterator(results);
 				} else {

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

@@ -23,27 +23,6 @@ exports.init = function(parser) {
 	this.matchRegExp = /\{\{([^\{\}\|]*)(?:\|\|([^\|\{\}]+))?(?:\|([^\{\}]+))?\}\}(?:\r?\n|$)/mg;
 };
 
-/*
-Reject the match if we don't have a template or text reference
-*/
-exports.findNextMatch = function(startPos) {
-	this.matchRegExp.lastIndex = startPos;
-	this.match = this.matchRegExp.exec(this.parser.source);
-	if(this.match) {
-		var template = $tw.utils.trim(this.match[2]),
-			textRef = $tw.utils.trim(this.match[1]);
-		// Bail if we don't have a template or text reference
-		if(!template && !textRef) {
-			return undefined;
-		} else {
-			return this.match.index;
-		}
-	} else {
-		return undefined;
-	}
-	return this.match ? this.match.index : undefined;
-};
-
 exports.parse = function() {
 	// Move past the match
 	this.parser.pos = this.matchRegExp.lastIndex;

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

@@ -23,27 +23,6 @@ exports.init = function(parser) {
 	this.matchRegExp = /\{\{([^\{\}\|]*)(?:\|\|([^\|\{\}]+))?(?:\|([^\{\}]+))?\}\}/mg;
 };
 
-/*
-Reject the match if we don't have a template or text reference
-*/
-exports.findNextMatch = function(startPos) {
-	this.matchRegExp.lastIndex = startPos;
-	this.match = this.matchRegExp.exec(this.parser.source);
-	if(this.match) {
-		var template = $tw.utils.trim(this.match[2]),
-			textRef = $tw.utils.trim(this.match[1]);
-		// Bail if we don't have a template or text reference
-		if(!template && !textRef) {
-			return undefined;
-		} else {
-			return this.match.index;
-		}
-	} else {
-		return undefined;
-	}
-	return this.match ? this.match.index : undefined;
-};
-
 exports.parse = function() {
 	// Move past the match
 	this.parser.pos = this.matchRegExp.lastIndex;

core/modules/savers/postmessage.js

@@ -6,10 +6,7 @@ module-type: saver
 Handles saving changes via window.postMessage() to the window.parent
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -63,4 +60,3 @@ exports.create = function(wiki) {
 	return new PostMessageSaver(wiki);
 };
 
-})();

core/modules/utils/errors.js

@@ -6,6 +6,7 @@ module-type: utils
 Custom errors for TiddlyWiki.
 
 \*/
+
 function TranscludeRecursionError() {
 	Error.apply(this,arguments);
 	this.signatures = Object.create(null);

core/modules/utils/messaging.js

@@ -8,10 +8,7 @@ Messaging utilities for use with window.postMessage() etc.
 This module intentionally has no dependencies so that it can be included in non-TiddlyWiki projects
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var RESPONSE_TIMEOUT = 2 * 1000;
@@ -122,5 +119,3 @@ BrowserMessagingPublisher.prototype.close = function() {
 };
 
 exports.BrowserMessagingPublisher = BrowserMessagingPublisher;
-
-})();

core/modules/utils/utils.js

@@ -242,6 +242,53 @@ exports.slowInSlowOut = function(t) {
 	return (1 - ((Math.cos(t * Math.PI) + 1) / 2));
 };
 
+exports.copyObjectPropertiesSafe = function(object) {
+	const seen = new Set(),
+		isDOMElement = value => value instanceof Node || value instanceof Window;
+
+	function safeCopy(obj) {
+		// skip circular references
+		if(seen.has(obj)) {
+			return undefined;
+		}
+		// primitives and null are safe
+		if(typeof obj !== "object" || obj === null) {
+			return obj;
+		}
+		// skip DOM elements
+		if(isDOMElement(obj)) {
+			return undefined;
+		}
+		// copy arrays, preserving positions
+		if(Array.isArray(obj)) {
+			return obj.map(item => {
+				const value = safeCopy(item);
+				return value === undefined ? null : value;
+			});
+		}
+
+		seen.add(obj);
+		const copy = {};
+		let key,
+			value;
+		for(key in obj) {
+			try {
+				value = safeCopy(obj[key]);
+				if(value !== undefined) {
+					copy[key] = value;
+				}
+			} catch(e) {
+				// silently skip unserializable properties
+			}
+		}
+		return copy;
+	}
+
+	const result = safeCopy(object);
+	seen.clear();
+	return result;
+};
+
 exports.formatTitleString = function(template,options) {
 	var base = options.base || "",
 		separator = options.separator || "",

core/modules/widgets/browse.js

@@ -80,8 +80,8 @@ BrowseWidget.prototype.render = function(parent,nextSibling) {
 	});
 	// Insert element
 	parent.insertBefore(domNode,nextSibling);
-	this.renderChildren(domNode,null);
 	this.domNodes.push(domNode);
+	this.renderChildren(domNode,null);
 };
 
 /*

core/modules/widgets/button.js

@@ -135,8 +135,8 @@ ButtonWidget.prototype.render = function(parent,nextSibling) {
 	}
 	// Insert element
 	parent.insertBefore(domNode,nextSibling);
-	this.renderChildren(domNode,null);
 	this.domNodes.push(domNode);
+	this.renderChildren(domNode,null);
 };
 
 /*

core/modules/widgets/checkbox.js

@@ -64,8 +64,8 @@ CheckboxWidget.prototype.render = function(parent,nextSibling) {
 	]);
 	// Insert the label into the DOM and render any children
 	parent.insertBefore(this.labelDomNode,nextSibling);
-	this.renderChildren(this.spanDomNode,null);
 	this.domNodes.push(this.labelDomNode);
+	this.renderChildren(this.spanDomNode,null);
 };
 
 CheckboxWidget.prototype.getValue = function() {

core/modules/widgets/diff-text.js

@@ -59,6 +59,8 @@ DiffTextWidget.prototype.render = function(parent,nextSibling) {
 	var domContainer = this.document.createElement("div"), 
 		domDiff = this.createDiffDom(diffs);
 	parent.insertBefore(domContainer,nextSibling);
+	// Save our container
+	this.domNodes.push(domContainer);
 	// Set variables
 	this.setVariable("diff-count",diffs.reduce(function(acc,diff) {
 		if(diff[0] !== dmp.DIFF_EQUAL) {
@@ -70,8 +72,6 @@ DiffTextWidget.prototype.render = function(parent,nextSibling) {
 	this.renderChildren(domContainer,null);
 	// Render the diff
 	domContainer.appendChild(domDiff);
-	// Save our container
-	this.domNodes.push(domContainer);
 };
 
 /*

core/modules/widgets/draggable.js

@@ -56,6 +56,7 @@ DraggableWidget.prototype.render = function(parent,nextSibling) {
 	});
 	// Insert the node into the DOM and render any children
 	parent.insertBefore(domNode,nextSibling);
+	this.domNodes.push(domNode);
 	this.renderChildren(domNode,null);
 	// Add event handlers
 	if(this.dragEnable) {
@@ -70,7 +71,6 @@ DraggableWidget.prototype.render = function(parent,nextSibling) {
 			selector: self.dragHandleSelector
 		});
 	}
-	this.domNodes.push(domNode);
 };
 
 /*

core/modules/widgets/droppable.js

@@ -57,8 +57,8 @@ DroppableWidget.prototype.render = function(parent,nextSibling) {
 	}
 	// Insert element
 	parent.insertBefore(domNode,nextSibling);
-	this.renderChildren(domNode,null);
 	this.domNodes.push(domNode);
+	this.renderChildren(domNode,null);
 	// Stack of outstanding enter/leave events
 	this.currentlyEntered = [];
 };

core/modules/widgets/element.js

@@ -77,8 +77,8 @@ ElementWidget.prototype.render = function(parent,nextSibling) {
 	// Allow hooks to manipulate the DOM node. Eg: Add debug info
 	$tw.hooks.invokeHook("th-dom-rendering-element", domNode, this);
 	parent.insertBefore(domNode,nextSibling);
-	this.renderChildren(domNode,null);
 	this.domNodes.push(domNode);
+	this.renderChildren(domNode,null);
 };
 
 /*

core/modules/widgets/eventcatcher.js

@@ -39,75 +39,12 @@ EventWidget.prototype.render = function(parent,nextSibling) {
 	this.domNode = domNode;
 	// Assign classes
 	this.assignDomNodeClasses();
-	// Add our event handler
-	$tw.utils.each(this.types,function(type) {
-		domNode.addEventListener(type,function(event) {
-			var selector = self.getAttribute("selector"),
-				matchSelector = self.getAttribute("matchSelector"),
-				actions = self.getAttribute("$"+type),
-				stopPropagation = self.getAttribute("stopPropagation","onaction"),
-				selectedNode = event.target,
-				selectedNodeRect,
-				catcherNodeRect,
-				variables = {};
-			// Firefox can fire dragover and dragenter events on text nodes instead of their parents
-			if(selectedNode.nodeType === 3) {
-				selectedNode = selectedNode.parentNode;
-			}
-			// Check that the selected node matches any matchSelector
-			if(matchSelector && !$tw.utils.domMatchesSelector(selectedNode,matchSelector)) {
-				return false;
-			}
-			if(selector) {
-				// Search ancestors for a node that matches the selector
-				while(!$tw.utils.domMatchesSelector(selectedNode,selector) && selectedNode !== domNode) {
-					selectedNode = selectedNode.parentNode;
-				}
-				// Exit if we didn't find one
-				if(selectedNode === domNode) {
-					return false;
-				}
-				// Only set up variables if we have actions to invoke
-				if(actions) {
-					variables = $tw.utils.collectDOMVariables(selectedNode,self.domNode,event);
-				}
-			}
-			// Execute our actions with the variables
-			if(actions) {
-				// Add a variable for the modifier key
-				variables.modifier = $tw.keyboardManager.getEventModifierKeyDescriptor(event);
-				// Add a variable for the mouse button
-				if("button" in event) {
-					if(event.button === 0) {
-						variables["event-mousebutton"] = "left";
-					} else if(event.button === 1) {
-						variables["event-mousebutton"] = "middle";
-					} else if(event.button === 2) {
-						variables["event-mousebutton"] = "right";
-					}
-				}
-				variables["event-type"] = event.type.toString();
-				if(typeof event.detail === "object" && !!event.detail) {
-					$tw.utils.each(event.detail,function(detailValue,detail) {
-						variables["event-detail-" + detail] = detailValue.toString();
-					});
-				} else if(!!event.detail) {
-					variables["event-detail"] = event.detail.toString();
-				}
-				self.invokeActionString(actions,self,event,variables);
-			}
-			if((actions && stopPropagation === "onaction") || stopPropagation === "always") {
-				event.preventDefault();
-				event.stopPropagation();
-				return true;
-			}
-			return false;
-		},false);
-	});
+	// Add our event handlers
+	this.toggleListeners();
 	// Insert element
 	parent.insertBefore(domNode,nextSibling);
-	this.renderChildren(domNode,null);
 	this.domNodes.push(domNode);
+	this.renderChildren(domNode,null);
 };
 
 /*
@@ -122,11 +59,232 @@ EventWidget.prototype.execute = function() {
 			self.types.push(key.slice(1));
 		}
 	});
+	this.pointerCaptureMode = this.getAttribute("pointerCapture","no");
 	this.elementTag = this.getAttribute("tag");
 	// Make child widgets
 	this.makeChildWidgets();
 };
 
+/*
+Cache and pre-create all event listeners, called when first needed
+*/
+EventWidget.prototype.cacheEventListeners = function() {
+	if(this._eventListeners) {
+		return;
+	}
+	this._eventListeners = Object.create(null);
+	this._captureActiveListeners = Object.create(null);
+	this._dynamicOnlyEvents = ["pointerup","pointercancel","pointermove"];
+
+	const clearPointerCapture = event => {
+		if(Number.isInteger(this._capturePointerId)) {
+			this.stopPointerCapture(this._capturePointerId);
+		}
+	};
+
+	const attachDynamicOnlyListeners = () => {
+		this._dynamicOnlyEvents.forEach(dt => {
+			const listener = this._eventListeners[dt];
+			if(listener) {
+				this._captureActiveListeners[dt] = listener;
+				this.domNode.addEventListener(dt, listener, false);
+			}
+		});
+	};
+
+	// Dynamic pointer capture listeners
+	if(this.pointerCaptureMode === "dynamic") {
+		["pointerup","pointercancel"].forEach(type => {
+			this._eventListeners[type] = event => {
+				const selectedNode = this.checkEvent(event, type);
+				if(selectedNode) {
+					clearPointerCapture(event);
+				}
+				// Remove dynamic-only listeners
+				this.cleanupDynamicListeners();
+				return this.handleEvent(event, type, selectedNode);
+			};
+		});
+		if(!this.types.includes("pointerdown")) {
+			this.types.push("pointerdown");
+		}
+	}
+
+	// Create any listeners not already defined above
+	this.types.forEach(type => {
+		if(!this._eventListeners[type]) {
+			this._eventListeners[type] = event => {
+				const selectedNode = this.checkEvent(event, type);
+				if(!selectedNode) {
+					return false;
+				}
+				// Handle pointer capture for pointerdown
+				if(type === "pointerdown") {
+					if(this.pointerCaptureMode !== "no") {
+						this.startPointerCapture(event.pointerId, event.target);
+					}
+
+					if(this.pointerCaptureMode === "dynamic") {
+						attachDynamicOnlyListeners();
+					}
+				} else if(type === "pointerup" || type === "pointercancel") {
+					clearPointerCapture(event);
+				}
+				return this.handleEvent(event, type, selectedNode);
+			};
+		}
+	});
+};
+
+/*
+Check if an event qualifies and return the matching selected node
+*/
+EventWidget.prototype.checkEvent = function(event, type) {
+	const domNode = this.domNode;
+	let node = event.target;
+
+	// Use capture target if valid
+	if(this._captureTarget && event.pointerId !== undefined) {
+		if(document.contains(this._captureTarget)) {
+			node = this._captureTarget;
+		} else {
+			// Clear stale reference
+			this.stopPointerCapture(this._capturePointerId);
+			node = event.target;
+		}
+	}
+
+	if(node && node.nodeType === 3) {
+		node = node.parentNode;
+	}
+	if(!node || node.nodeType !== 1) {
+		return null;
+	}
+
+	const selector = this.getAttribute("selector"),
+		matchSelector = this.getAttribute("matchSelector");
+
+	if(matchSelector && !node.matches(matchSelector)) {
+		return null;
+	}
+	if(selector) {
+		const match = node.closest(selector);
+		if(!match || match === domNode || !domNode.contains(match)) {
+			return null;
+		}
+		return match;
+	}
+	return node;
+};
+
+/*
+Handle the event and execute actions
+*/
+EventWidget.prototype.handleEvent = function(event, type, selectedNode) {
+	if(!selectedNode) {
+		return false;
+	}
+	let actions = this.getAttribute("$"+type),
+		stopPropagation = this.getAttribute("stopPropagation","onaction");
+
+	if(actions) {
+		let variables = $tw.utils.extend(
+			{},
+			$tw.utils.collectDOMVariables(selectedNode, this.domNode, event),
+			{
+				"eventJSON": JSON.stringify($tw.utils.copyObjectPropertiesSafe(event)),
+				"modifier": $tw.keyboardManager.getEventModifierKeyDescriptor(event),
+				"event-type": event.type.toString()
+			}
+		);
+
+		if("button" in event) {
+			const mouseButtonMap = {0:"left",1:"middle",2:"right"};
+			variables["event-mousebutton"] = mouseButtonMap[event.button];
+		}
+		this.invokeActionString(actions, this, event, variables);
+	}
+
+	if((actions && stopPropagation === "onaction") || stopPropagation === "always") {
+		event.preventDefault();
+		event.stopPropagation();
+		return true;
+	}
+	return false;
+};
+
+EventWidget.prototype.startPointerCapture = function(pointerId, captureTarget) {
+	// Start capture only if none active; pointerId can be 0 
+	if(!Number.isInteger(this._capturePointerId) && this.domNode && this.domNode.setPointerCapture) {
+		this.domNode.setPointerCapture(pointerId);
+		this._capturePointerId = pointerId;
+		this._captureTarget = captureTarget;
+	}
+};
+
+EventWidget.prototype.stopPointerCapture = function(pointerId) {
+	if(this.domNode && this.domNode.hasPointerCapture && this.domNode.hasPointerCapture(pointerId)) {
+		this.domNode.releasePointerCapture(pointerId);
+	}
+	this._capturePointerId = undefined;
+	this._captureTarget = undefined;
+};
+
+/*
+Attach all relevant listeners
+*/
+EventWidget.prototype.attachListeners = function() {
+	this.cacheEventListeners();
+	const domNode = this.domNode;
+	Object.keys(this._eventListeners).forEach(type => {
+		if(this.pointerCaptureMode === "dynamic" && this._dynamicOnlyEvents.includes(type)) {
+			return; //skip dynamic-only events
+		}
+		domNode.addEventListener(type, this._eventListeners[type], false);
+	});
+};
+
+/*
+Remove dynamic active listeners
+*/
+EventWidget.prototype.cleanupDynamicListeners = function() {
+	const domNode = this.domNode;
+	Object.keys(this._captureActiveListeners || {}).forEach(type => {
+		domNode.removeEventListener(type, this._captureActiveListeners[type], false);
+	});
+	this._captureActiveListeners = Object.create(null);
+};
+
+/*
+Remove all listeners
+*/
+EventWidget.prototype.removeAllListeners = function() {
+	if(Number.isInteger(this._capturePointerId)) {
+		this.stopPointerCapture(this._capturePointerId);
+	}
+	const domNode = this.domNode;
+	Object.keys(this._eventListeners || {}).forEach(type => {
+		domNode.removeEventListener(type, this._eventListeners[type], false);
+	});
+	this.cleanupDynamicListeners();
+	this._captureTarget = null;
+};
+
+/*
+Enable or disable listeners
+*/
+EventWidget.prototype.toggleListeners = function() {
+	let disabled = this.getAttribute("disabled","no") === "yes";
+	if(disabled) {
+		this.removeAllListeners();
+	} else {
+		this.attachListeners();
+	}
+};
+
+/*
+Assign DOM node classes
+*/
 EventWidget.prototype.assignDomNodeClasses = function() {
 	var classes = this.getAttribute("class","").split(" ");
 	classes.push("tc-eventcatcher");
@@ -134,18 +292,23 @@ EventWidget.prototype.assignDomNodeClasses = function() {
 };
 
 /*
-Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
+Refresh widget
 */
 EventWidget.prototype.refresh = function(changedTiddlers) {
-	var changedAttributes = this.computeAttributes(),
-		changedAttributesCount = $tw.utils.count(changedAttributes);
-	if(changedAttributesCount === 1 && changedAttributes["class"]) {
-		this.assignDomNodeClasses();
-	} else if(changedAttributesCount > 0) {
-		this.refreshSelf();
-		return true;
+	const changedAttributes = this.computeAttributes(),
+		changedKeys = Object.keys(changedAttributes),
+		canUpdateAttributes = changedKeys.every(key => key === "class" || key === "disabled");
+	if(canUpdateAttributes) {
+		if(changedAttributes["class"]) {
+			this.assignDomNodeClasses();
+		}
+		if(changedAttributes["disabled"]) {
+			this.toggleListeners();
+		}
+		return this.refreshChildren(changedTiddlers);
 	}
-	return this.refreshChildren(changedTiddlers);
+	this.refreshSelf();
+	return true;
 };
 
 exports.eventcatcher = EventWidget;

core/modules/widgets/image.js

@@ -45,7 +45,7 @@ ImageWidget.prototype.render = function(parent,nextSibling) {
 	this.execute();
 	// Create element
 	// Determine what type of image it is
-	var tag = "img", src = "",
+	var tag = "img", src = "", self = this,
 		tiddler = this.wiki.getTiddler(this.imageSource);
 	if(!tiddler) {
 		// The source isn't the title of a tiddler, so we'll assume it's a URL
@@ -115,11 +115,21 @@ ImageWidget.prototype.render = function(parent,nextSibling) {
 	if(this.lazyLoading && tag === "img") {
 		domNode.setAttribute("loading",this.lazyLoading);
 	}
+	this.assignAttributes(domNode,{
+		sourcePrefix: "data-",
+		destPrefix: "data-"
+	});
 	// Add classes when the image loads or fails
 	$tw.utils.addClass(domNode,"tc-image-loading");
-	domNode.addEventListener("load",function() {
+	domNode.addEventListener("load",function(event) {
 		$tw.utils.removeClass(domNode,"tc-image-loading");
 		$tw.utils.addClass(domNode,"tc-image-loaded");
+		if(self.loadedActions) {
+			var variables = $tw.utils.collectDOMVariables(domNode,null,event);
+			variables["img-natural-width"] = domNode.naturalWidth.toString();
+			variables["img-natural-height"] = domNode.naturalHeight.toString();
+			self.invokeActionString(self.loadedActions,self,event,variables);		
+		}
 	},false);
 	domNode.addEventListener("error",function() {
 		$tw.utils.removeClass(domNode,"tc-image-loading");
@@ -143,17 +153,31 @@ ImageWidget.prototype.execute = function() {
 	this.imageTooltip = this.getAttribute("tooltip");
 	this.imageAlt = this.getAttribute("alt");
 	this.lazyLoading = this.getAttribute("loading");
+	this.loadedActions = this.getAttribute("loadActions");
 };
 
 /*
 Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
 */
 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]) {
+	var changedAttributes = this.computeAttributes(),
+		hasChangedAttributes = $tw.utils.count(changedAttributes) > 0;
+	if(changedAttributes.source || changedAttributes["class"] || changedAttributes.usemap || changedAttributes.tooltip || changedTiddlers[this.imageSource] ||changedAttributes.loadActions) {
 		this.refreshSelf();
 		return true;
-	} else {
+	} else if(hasChangedAttributes) {
+		this.assignAttributes(this.domNodes[0],{
+			sourcePrefix: "data-",
+			destPrefix: "data-"
+		});
+		if(changedAttributes.width) {
+			this.domNodes[0].setAttribute("width",this.getAttribute("width"));
+		}
+		if(changedAttributes.height) {
+			this.domNodes[0].setAttribute("height",this.getAttribute("height"));
+		}
+	}
+	else {
 		return false;
 	}
 };

core/modules/widgets/keyboard.js

@@ -45,8 +45,8 @@ KeyboardWidget.prototype.render = function(parent,nextSibling) {
 	]);
 	// Insert element
 	parent.insertBefore(domNode,nextSibling);
-	this.renderChildren(domNode,null);
 	this.domNodes.push(domNode);
+	this.renderChildren(domNode,null);
 };
 
 KeyboardWidget.prototype.handleChangeEvent = function(event) {

core/modules/widgets/link.js

@@ -50,8 +50,8 @@ LinkWidget.prototype.render = function(parent,nextSibling) {
 			destPrefix: "aria-"
 		});
 		parent.insertBefore(domNode,nextSibling);
-		this.renderChildren(domNode,null);
 		this.domNodes.push(domNode);
+		this.renderChildren(domNode,null);
 	}
 };
 
@@ -157,8 +157,8 @@ LinkWidget.prototype.renderLink = function(parent,nextSibling) {
 	});
 	// Insert the link into the DOM and render any children
 	parent.insertBefore(domNode,nextSibling);
-	this.renderChildren(domNode,null);
 	this.domNodes.push(domNode);
+	this.renderChildren(domNode,null);
 };
 
 LinkWidget.prototype.handleClickEvent = function(event) {

core/modules/widgets/password.js

@@ -42,8 +42,8 @@ PasswordWidget.prototype.render = function(parent,nextSibling) {
 	]);
 	// Insert the label into the DOM and render any children
 	parent.insertBefore(domNode,nextSibling);
-	this.renderChildren(domNode,null);
 	this.domNodes.push(domNode);
+	this.renderChildren(domNode,null);
 };
 
 PasswordWidget.prototype.handleChangeEvent = function(event) {

core/modules/widgets/radio.js

@@ -59,8 +59,8 @@ RadioWidget.prototype.render = function(parent,nextSibling) {
 	]);
 	// Insert the label into the DOM and render any children
 	parent.insertBefore(this.labelDomNode,nextSibling);
-	this.renderChildren(this.spanDomNode,null);
 	this.domNodes.push(this.labelDomNode);
+	this.renderChildren(this.spanDomNode,null);
 };
 
 RadioWidget.prototype.getValue = function() {

core/modules/widgets/reveal.js

@@ -40,6 +40,7 @@ RevealWidget.prototype.render = function(parent,nextSibling) {
 		domNode.setAttribute("style",this.style);
 	}
 	parent.insertBefore(domNode,nextSibling);
+	this.domNodes.push(domNode);
 	this.renderChildren(domNode,null);
 	if(!domNode.isTiddlyWikiFakeDom && this.type === "popup" && this.isOpen) {
 		this.positionPopup(domNode);
@@ -48,7 +49,6 @@ RevealWidget.prototype.render = function(parent,nextSibling) {
 	if(!this.isOpen) {
 		domNode.setAttribute("hidden","true");
 	}
-	this.domNodes.push(domNode);
 };
 
 RevealWidget.prototype.positionPopup = function(domNode) {

core/modules/widgets/scrollable.js

@@ -168,8 +168,8 @@ ScrollableWidget.prototype.render = function(parent,nextSibling) {
 	this.outerDomNode.className = this["class"] || "";
 	// Insert element
 	parent.insertBefore(this.outerDomNode,nextSibling);
-	this.renderChildren(this.innerDomNode,null);
 	this.domNodes.push(this.outerDomNode);
+	this.renderChildren(this.innerDomNode,null);
 	// If the scroll position is bound to a tiddler
 	if(this.scrollableBind) {
 		// After a delay for rendering, scroll to the bound position

core/modules/widgets/select.js

@@ -63,8 +63,8 @@ SelectWidget.prototype.render = function(parent,nextSibling) {
 		domNode.setAttribute("title",this.selectTooltip);
 	}
 	this.parentDomNode.insertBefore(domNode,nextSibling);
-	this.renderChildren(domNode,null);
 	this.domNodes.push(domNode);
+	this.renderChildren(domNode,null);
 	this.setSelectValue();
 	if(this.selectFocus == "yes") {
 		this.getSelectDomNode().focus();

core/modules/widgets/transclude.js

@@ -32,16 +32,26 @@ TranscludeWidget.prototype.render = function(parent,nextSibling) {
 	} catch(error) {
 		if(error instanceof $tw.utils.TranscludeRecursionError) {
 			// We were infinite looping.
-			// We need to try and abort as much of the loop as we can, so we will keep "throwing" upward until we find a transclusion that has a different signature.
-			// Hopefully that will land us just outside where the loop began. That's where we want to issue an error.
-			// Rendering widgets beneath this point may result in a freezing browser if they explode exponentially.
+			// We need to try and abort as much of the loop as we
+			// can, so we will keep "throwing" upward until we find
+			// a transclusion that has a different signature.
+			// Hopefully that will land us just outside where the
+			// loop began. That's where we want to issue an error.
+			// Rendering widgets beneath this point may result in a
+			// freezing browser if they explode exponentially.
 			var transcludeSignature = this.getVariable("transclusion");
 			if(this.getAncestorCount() > $tw.utils.TranscludeRecursionError.MAX_WIDGET_TREE_DEPTH - 50) {
-				// For the first fifty transcludes we climb up, we simply collect signatures.
-				// We're assuming that those first 50 will likely include all transcludes involved in the loop.
+				// For the first fifty transcludes we climb up,
+				// we simply collect signatures.
+				// We're assuming those first 50 will likely
+				// include all transcludes involved in the loop.
 				error.signatures[transcludeSignature] = true;
 			} else if(!error.signatures[transcludeSignature]) {
-				// Now that we're past the first 50, let's look for the first signature that wasn't in the loop. That'll be where we print the error and resume rendering.
+				// Now that we're past the first 50, look for
+				// the first signature that wasn't in that loop.
+				// That's where we print the error and resume
+				// rendering.
+				this.removeChildDomNodes();
 				this.children = [this.makeChildWidget({type: "error", attributes: {
 					"$message": {type: "string", value: $tw.language.getString("Error/RecursiveTransclusion")}
 				}})];

core/modules/widgets/widget.js

@@ -151,7 +151,7 @@ Widget.prototype.getVariableInfo = function(name,options) {
 		} else if(variable.isFunctionDefinition) {
 			// Function evaluations
 			params = self.resolveVariableParameters(variable.params,actualParams);
-			var variables = options.variables || Object.create(null);
+			var variables = $tw.utils.extend({},options.variables);
 			// Apply default parameter values
 			$tw.utils.each(variable.params,function(param,index) {
 				if(param["default"]) {
@@ -160,7 +160,7 @@ Widget.prototype.getVariableInfo = function(name,options) {
 			});
 			// Parameters are an array of {name:, value:, multivalue:} pairs (name and multivalue are optional)
 			$tw.utils.each(params,function(param) {
-				if(param.multiValue) {
+				if(param.multiValue && param.multiValue.length) {
 					variables[param.name] = param.multiValue;
 				} else {
 					variables[param.name] = param.value || "";
@@ -233,8 +233,10 @@ Widget.prototype.resolveVariableParameters = function(formalParams,actualParams)
 			paramMultiValue = typeof param === "string" ? [param] : (param.multiValue || [paramValue]);
 		}
 		// If we've still not got a value, use the default, if any
-		paramValue = paramValue || paramInfo["default"] || "";
-		paramMultiValue = paramMultiValue || [paramValue];
+		if(!paramValue) {
+			paramValue = paramInfo["default"] || "";
+			paramMultiValue = [paramValue];
+		}
 		// Store the parameter name and value
 		results.push({name: paramInfo.name, value: paramValue, multiValue: paramMultiValue});
 	}
@@ -341,7 +343,7 @@ Widget.prototype.makeFakeWidgetWithVariables = function(variables) {
 				}
 			} else {
 				opts = opts || {};
-				opts.variables = variables;
+				opts.variables = $tw.utils.extend({},variables,opts.variables);
 				return self.getVariable(name,opts);
 			};
 		},
@@ -785,9 +787,9 @@ Widget.prototype.findNextSiblingDomNode = function(startIndex) {
 	// Refer to this widget by its index within its parents children
 	var parent = this.parentWidget,
 		index = startIndex !== undefined ? startIndex : parent.children.indexOf(this);
-if(index === -1) {
-	throw "node not found in parents children";
-}
+	if(index === -1) {
+		throw "node not found in parents children";
+	}
 	// Look for a DOM node in the later siblings
 	while(++index < parent.children.length) {
 		var domNode = parent.children[index].findFirstDomNode();
@@ -825,21 +827,60 @@ Widget.prototype.findFirstDomNode = function() {
 };
 
 /*
-Remove any DOM nodes created by this widget or its children
+Entry into destroy procedure
+options include:
+	removeDOMNodes: boolean (default true)
+*/
+Widget.prototype.destroyChildren = function(options) {
+	$tw.utils.each(this.children,function(childWidget) {
+		childWidget.destroy(options);
+	});
+};
+
+/*
+Legacy entry into destroy procedure
 */
 Widget.prototype.removeChildDomNodes = function() {
-	// If this widget has directly created DOM nodes, delete them and exit. This assumes that any child widgets are contained within the created DOM nodes, which would normally be the case
-	if(this.domNodes.length > 0) {
-		$tw.utils.each(this.domNodes,function(domNode) {
-			domNode.parentNode.removeChild(domNode);
-		});
-		this.domNodes = [];
-	} else {
-		// Otherwise, ask the child widgets to delete their DOM nodes
-		$tw.utils.each(this.children,function(childWidget) {
-			childWidget.removeChildDomNodes();
-		});
+	this.destroy({removeDOMNodes: true});
+};
+
+/*
+Default destroy
+options include:
+- removeDOMNodes: boolean (default true)
+*/
+Widget.prototype.destroy = function(options) {
+	const { removeDOMNodes = true } = options || {};
+	let removeChildDOMNodes = removeDOMNodes;
+	if(removeDOMNodes && this.domNodes.length > 0) {
+		// If this widget will remove its own DOM nodes, children should not remove theirs
+		removeChildDOMNodes = false;
 	}
+	// Destroy children first
+	this.destroyChildren({removeDOMNodes: removeChildDOMNodes});
+	this.children = [];
+	
+	// Call custom cleanup method if implemented
+	if(typeof this.onDestroy === "function") {
+		this.onDestroy();
+	}
+	
+	// Remove our DOM nodes if needed
+	if(removeDOMNodes) {
+		this.removeLocalDomNodes();	
+	}
+};
+
+/*
+Remove any DOM nodes created by this widget 
+*/
+Widget.prototype.removeLocalDomNodes = function() {
+	for(const domNode of this.domNodes) {
+		if(domNode.parentNode) {
+			domNode.parentNode.removeChild(domNode);
+		}
+	}
+	this.domNodes = [];
 };
 
 /*

core/modules/wiki.js

@@ -1122,15 +1122,16 @@ Parse a block of text of a specified MIME type
 Options include:
 	substitutions: an optional array of substitutions
 */
-exports.getSubstitutedText = function(text,widget,options) {
+exports.getSubstitutedText = function(text,thisWidget,options) {
 	options = options || {};
 	text = text || "";
 	var self = this,
+		widgetClass = widget.widget,
 		substitutions = options.substitutions || [],
 		output;
 	// Evaluate embedded filters and substitute with first result
 	output = text.replace(/\$\{([\S\s]+?)\}\$/g, function(match,filter) {
-		return self.filterTiddlers(filter,widget)[0] || "";
+		return self.filterTiddlers(filter,thisWidget)[0] || "";
 	});
 	// Process any substitutions provided in options
 	$tw.utils.each(substitutions,function(substitute) {
@@ -1138,7 +1139,7 @@ exports.getSubstitutedText = function(text,widget,options) {
 	});
 	// Substitute any variable references with their values
 	return output.replace(/\$\((.+?)\)\$/g, function(match,varname) {
-		return widget.getVariable(varname,{defaultValue: ""});
+		return widgetClass.evaluateVariable(thisWidget,varname, {defaultValue: ""})[0];
 	});
 };
 
@@ -1663,12 +1664,14 @@ exports.addToStory = function(title,fromTitle,storyTitle,options) {
 Generate a title for the draft of a given tiddler
 */
 exports.generateDraftTitle = function(title) {
-	var c = 0,
-		draftTitle,
-		username = this.getTiddlerText("$:/status/UserName"),
-		attribution = username ? " by " + username : "";
+	let c = 0,
+		draftTitle;
+	const username = this.getTiddlerText("$:/status/UserName");
 	do {
-		draftTitle = "Draft " + (c ? (c + 1) + " " : "") + "of '" + title + "'" + attribution;
+		draftTitle = username ? $tw.language.getString("Draft/Attribution", {variables: {"draft-title": title}}) : $tw.language.getString("Draft/Title", {variables: {"draft-title": title}});
+		if(c) {
+			draftTitle = draftTitle.concat(" ", (c + 1).toString());
+		}
 		c++;
 	} while(this.tiddlerExists(draftTitle));
 	return draftTitle;

core/stylesheets/custom-properties.tid

@@ -0,0 +1,30 @@
+title: $:/core/stylesheets/custom-properties
+
+\rules only transcludeinline macrocallinline html transcludeblock
+
+/* Tiddlywiki's CSS properties */
+
+:root {
+	<$list filter="[[$:/palettes/Vanilla]indexes[]]">
+	--tpc-<<currentTiddler>>: <$transclude $variable="colour" $mode="inline" name=<<currentTiddler>>/>;
+	</$list>
+
+	/* CSS settings */
+	--tp-code-wrapping: {{$:/themes/tiddlywiki/vanilla/options/codewrapping}};
+	--tp-font-family: {{$:/themes/tiddlywiki/vanilla/settings/fontfamily}};
+	--tp-code-font-family: {{$:/themes/tiddlywiki/vanilla/settings/codefontfamily}};
+	--tp-editor-font-family: {{$:/themes/tiddlywiki/vanilla/settings/editorfontfamily}};
+	--tp-font-size: {{$:/themes/tiddlywiki/vanilla/metrics/fontsize}};
+	--tp-line-height: {{$:/themes/tiddlywiki/vanilla/metrics/lineheight}};
+	--tp-body-font-size: {{$:/themes/tiddlywiki/vanilla/metrics/bodyfontsize}};
+	--tp-body-line-height: {{$:/themes/tiddlywiki/vanilla/metrics/bodylineheight}};
+	--tp-story-left: {{$:/themes/tiddlywiki/vanilla/metrics/storyleft}};
+	--tp-story-top: {{$:/themes/tiddlywiki/vanilla/metrics/storytop}};
+	--tp-story-right: {{$:/themes/tiddlywiki/vanilla/metrics/storyright}};
+	--tp-story-width: {{$:/themes/tiddlywiki/vanilla/metrics/storyrwidth}};
+	--tp-tiddler-width: {{$:/themes/tiddlywiki/vanilla/metrics/tiddlerwidth}};
+	--tp-sidebar-breakpoint: {{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}};
+	--tp-sidebar-width: {{$:/themes/tiddlywiki/vanilla/metrics/sidebarwidth}};
+
+	--tp-animation-duration: {{{ [{$:/config/AnimationDuration}addsuffix[ms]] }}};
+}

core/ui/ControlPanel/Basics.tid

@@ -18,6 +18,7 @@ caption: {{$:/language/ControlPanel/Basics/Caption}}
 |<$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}} |
+|<$link to="$:/config/AutoFocusEdit"><<lingo AutoFocusEdit/Prompt>></$link> |{{$:/snippets/minifocuseditswitcher}} |
 |<<lingo Language/Prompt>> |{{$:/snippets/minilanguageswitcher}} |
 |<<lingo Tiddlers/Prompt>> |<<show-filter-count "[!is[system]sort[title]]">> |
 |<<lingo Tags/Prompt>> |<<show-filter-count "[tags[]sort[title]]">> |

core/ui/EditTemplate/body-editor.tid

@@ -8,7 +8,7 @@ title: $:/core/ui/EditTemplate/body/editor
   class="tc-edit-texteditor tc-edit-texteditor-body"
   placeholder={{$:/language/EditTemplate/Body/Placeholder}}
   tabindex={{$:/config/EditTabIndex}}
-  focus={{{ [{$:/config/AutoFocus}match[text]then[true]] ~[[false]] }}}
+  focus={{{ [{!!draft.of}is[tiddler]then{$:/config/AutoFocusEdit}match[text]then[true]] ~[{$:/config/AutoFocus}match[text]then[true]] ~[[false]] }}}
   cancelPopups="yes"
   fileDrop={{{ [{$:/config/DragAndDrop/Enable}match[no]] :else[subfilter{$:/config/Editor/EnableImportFilter}then[yes]else[no]] }}}
 

core/ui/EditTemplate/fields.tid

@@ -1,157 +1,181 @@
 title: $:/core/ui/EditTemplate/fields
 tags: $:/tags/EditTemplate
 
-\procedure lingo-base() $:/language/EditTemplate/
-\function tf.config-title() [[$:/config/EditTemplateFields/Visibility/]addsuffix[$(currentField)$]substitute[]get[text]]
-
-\function tf.config-filter() [[hide]] :except[title<tf.config-title>]
-
-<!-- Beware this is duplicated from EditTemplate.tid. For details see bug #7054 -->
-\procedure get-field-value-tiddler-filter() [subfilter<get-field-editor-filter>sha256[16]addprefix[/]addprefix<newFieldValueTiddlerPrefix>]
-\procedure get-field-editor-filter() [<newFieldNameTiddler>get[text]else[]] :cascade[all[shadows+tiddlers]tag[$:/tags/FieldEditorFilter]!is[draft]get[text]] :and[!is[blank]else{$:/core/ui/EditTemplate/fieldEditor/default}]
-
-\procedure prefix.bracket() [
-\procedure suffix.bracket() ]
-
-\function tf.current-tiddler-new-field-selector() [[data-tiddler-title=]addprefix[$(prefix.bracket)$]substitute[]addsuffix<currentTiddlerCSSescaped>addsuffix[$(suffix.bracket)$]substitute[]] .tc-edit-field-add-name-wrapper input :and[join[ ]]
-
-\procedure new-field-actions()
 \whitespace trim
-<$action-sendmessage $message="tm-add-field" $name={{{ [<newFieldNameTiddler>get[text]] }}} $value={{{ [<newFieldNameTiddler>get[text]] :map[subfilter<get-field-value-tiddler-filter>get[text]] }}}/>
-<$set name="safeNewFieldValueTiddlerPrefix" value=<<newFieldValueTiddlerPrefix>> emptyValue=<<qualify "$:/temp/NewFieldValue">> >
-	<$action-deletetiddler $filter="[<newFieldNameTiddler>] [prefix[$:/temp/NewFieldValue]prefix<safeNewFieldValueTiddlerPrefix>] [<storeTitle>] [<searchListState>]"/>
-</$set>
-<$action-sendmessage $message="tm-focus-selector" $param=<<tf.current-tiddler-new-field-selector>>/>
-\end
+
+\procedure lingo-base() $:/language/EditTemplate/
 
 \procedure delete-state-tiddlers() <$action-deletetiddler $filter="[<newFieldNameTiddler>] [<storeTitle>] [<searchListState>]"/>
 
-\procedure cancel-search-actions-inner()
-\whitespace trim
-<$list
-	filter="[<storeTitle>has[text]] [<newFieldNameTiddler>has[text]]"
-	variable="ignore"
-	emptyMessage="<<cancel-delete-tiddler-actions 'cancel'>>">
-<<delete-state-tiddlers>>
-</$list>
+\procedure focus-new-field-input() <$action-sendmessage $message="tm-focus-selector" $param=`[data-tiddler-title="$(storyTiddler)$"] .tc-edit-field-add-name-wrapper input` />
+
+\procedure new-field-actions()
+	<$action-setfield $tiddler=<<storyTiddler>> $field={{{ [<newFieldNameTiddler>get[text]] }}} $value={{{ [<newFieldValueTiddler>get[text]] }}} />
+	<$action-deletetiddler $filter="[prefix[$:/temp/NewFieldValue]prefix<newFieldValueTiddlerPrefix>]"/>
+	<<delete-state-tiddlers>>
+	<<focus-new-field-input>>
+\end
+
+\procedure delete-field-actions()
+	<$action-deletefield $field=<<currentField>>/>
+	<<focus-new-field-input>>
 \end
 
 \procedure cancel-search-actions()
-\whitespace trim
-<$set name="userInput" value={{{ [<storeTitle>get[text]] }}}>
-<$list
-	filter="[<newFieldNameTiddler>get[text]!match<userInput>]"
-	emptyMessage="<<cancel-search-actions-inner>>">
-<$action-setfield $tiddler=<<newFieldNameTiddler>> text=<<userInput>>/><$action-setfield $tiddler=<<refreshTitle>> text="yes"/>
-</$list>
-</$set>
+	<$let userInput={{{ [<storeTitle>get[text]] }}}>
+		<%if [<newFieldNameTiddler>get[text]!match<userInput>] %>
+			<$action-setfield $tiddler=<<newFieldNameTiddler>> text=<<userInput>>/>
+			<$action-setfield $tiddler=<<refreshTitle>> text="yes"/>
+		<%else%>
+			<%if [<storeTitle>has[text]] [<newFieldNameTiddler>has[text]] %>
+				<<delete-state-tiddlers>>	
+			<%else%>
+				<<cancel-delete-tiddler-actions 'cancel'>>
+			<%endif%>
+		<%endif%>
+	</$let>
 \end
 
 \procedure new-field()
-\whitespace trim
-<$vars name={{{ [<newFieldNameTiddler>get[text]] }}}>
-<$reveal type="nomatch" text="" default=<<name>>>
-<$button tooltip={{$:/language/EditTemplate/Fields/Add/Button/Hint}}>
-<$action-sendmessage $message="tm-add-field"
-$name=<<name>>
-$value={{{ [subfilter<get-field-value-tiddler-filter>get[text]] }}}/>
-<$set name="safeNewFieldValueTiddlerPrefix" value=<<newFieldValueTiddlerPrefix>> emptyValue=<<qualify "$:/temp/NewFieldValue">> >
-	<$action-deletetiddler $filter="[<newFieldNameTiddler>] [prefix[$:/temp/NewFieldValue]prefix<safeNewFieldValueTiddlerPrefix>] [<storeTitle>] [<searchListState>]"/>
-</$set>
-<<lingo Fields/Add/Button>>
-</$button>
-</$reveal>
-<$reveal type="match" text="" default=<<name>>>
-<$button>
-<<lingo Fields/Add/Button>>
-</$button>
-</$reveal>
-</$vars>
+	<%if [<newFieldNameTiddler>get[text]!is[blank]] %>
+		<$button actions="<<new-field-actions>>" tooltip={{$:/language/EditTemplate/Fields/Add/Button/Hint}}>
+			<<lingo Fields/Add/Button>>
+		</$button>	
+	<%else%>
+		<$button>	
+			<<lingo Fields/Add/Button>>
+		</$button>	
+	<%endif%>
 \end
-\whitespace trim
 
-<$set name="newFieldValueTiddlerPrefix" value=<<newFieldValueTiddlerPrefix>> emptyValue=<<qualify "$:/temp/NewFieldValue">> >
-<div class="tc-edit-fields">
-<table class={{{ [all[current]fields[]] :filter[lookup[$:/config/EditTemplateFields/Visibility/]!match[hide]] :and[count[]!match[0]] :and[then[tc-edit-fields]] :else[[tc-edit-fields tc-edit-fields-small]] }}}>
-<tbody>
-<$list filter="[all[current]fields[]] :and[sort[title]]" variable="currentField" storyview="pop">
-<$list filter=<<tf.config-filter>> variable="temp">
-<tr class="tc-edit-field">
-<td class="tc-edit-field-name">
-<$text text=<<currentField>>/>:</td>
-<td class="tc-edit-field-value">
-<$keyboard key="((delete-field))" actions="""<$action-deletefield $field=<<currentField>>/><$set name="currentTiddlerCSSescaped" value={{{ [<currentTiddler>escapecss[]] }}}><$action-sendmessage $message="tm-focus-selector" $param=<<tf.current-tiddler-new-field-selector>>/></$set>""">
-<$transclude tiddler={{{ [<currentField>] :cascade[all[shadows+tiddlers]tag[$:/tags/FieldEditorFilter]!is[draft]get[text]] :and[!is[blank]else{$:/core/ui/EditTemplate/fieldEditor/default}] }}} />
-</$keyboard>
-</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>>/>
-{{$:/core/images/delete-button}}
-</$button>
-</td>
-</tr>
-</$list>
-</$list>
-</tbody>
-</table>
-</div>
+\function tf.config-filter() [lookup:show[$:/config/EditTemplateFields/Visibility/]!match[hide]]
 
-<$fieldmangler>
-<div class="tc-edit-field-add">
-<em class="tc-edit tc-small-gap-right">
-<<lingo Fields/Add/Prompt>>
-</em>
-<$vars refreshTitle=<<qualify "$:/temp/fieldname/refresh">> storeTitle=<<newFieldNameInputTiddler>> searchListState=<<newFieldNameSelectionTiddler>>>
-<div class="tc-edit-field-add-name-wrapper">
-<$transclude $variable="keyboard-driven-input" tiddler=<<newFieldNameTiddler>> storeTitle=<<storeTitle>> refreshTitle=<<refreshTitle>>
-		selectionStateTitle=<<searchListState>> tag="input" default="" placeholder={{$:/language/EditTemplate/Fields/Add/Name/Placeholder}}
-		focusPopup=<<qualify "$:/state/popup/field-dropdown">> class="tc-edit-texteditor tc-popup-handle" tabindex={{$:/config/EditTabIndex}}
-		focus={{{ [{$:/config/AutoFocus}match[fields]then[true]] :else[[false]] }}} cancelPopups="yes"
-		configTiddlerFilter="[[$:/config/EditMode/fieldname-filter]]" inputCancelActions=<<cancel-search-actions>> />
-<$button popup=<<qualify "$:/state/popup/field-dropdown">> class="tc-btn-invisible tc-btn-dropdown tc-small-gap" tooltip={{$:/language/EditTemplate/Field/Dropdown/Hint}} aria-label={{$:/language/EditTemplate/Field/Dropdown/Caption}}>{{$:/core/images/down-arrow}}</$button>
-<$reveal state=<<qualify "$:/state/popup/field-dropdown">> type="nomatch" text="" default="">
-<div class="tc-block-dropdown tc-edit-type-dropdown">
-<$set name="tv-show-missing-links" value="yes">
-<$linkcatcher to=<<newFieldNameTiddler>>>
-<div class="tc-dropdown-item">
-<<lingo Fields/Add/Dropdown/User>>
-</div>
-<$set name="newFieldName" value={{{ [<storeTitle>get[text]] }}}>
-<$list filter="[!is[shadow]!is[system]fields[]search:title<newFieldName>sort[]] :except[[created]] :except[[creator]] :except[[draft.of]] :except[[draft.title]] :except[[modified]] :except[[modifier]] :except[[tags]] :except[[text]] :except[[title]] :except[[type]]"  variable="currentField">
-<$list filter="[<currentField>addsuffix[-primaryList]] :except[<searchListState>get[text]]" emptyMessage="""<$link to=<<currentField>> class="tc-list-item-selected"><$text text=<<currentField>>/></$link>""">
-<$link to=<<currentField>>>
-<$text text=<<currentField>>/>
-</$link>
-</$list>
-</$list>
-<div class="tc-dropdown-item">
-<<lingo Fields/Add/Dropdown/System>>
-</div>
-<$list filter="[fields[]search:title<newFieldName>sort[]] :except[!is[shadow]!is[system]fields[]]" variable="currentField">
-<$list filter="[<currentField>addsuffix[-secondaryList]] :except[<searchListState>get[text]]" emptyMessage="""<$link to=<<currentField>> class="tc-list-item-selected"><$text text=<<currentField>>/></$link>""">
-<$link to=<<currentField>>>
-<$text text=<<currentField>>/>
-</$link>
-</$list>
-</$list>
-</$set>
-</$linkcatcher>
-</$set>
-</div>
-</$reveal>
-</div>
-<$let currentTiddlerCSSescaped={{{ [<currentTiddler>escapecss[]] }}} currentTiddler={{{ [subfilter<get-field-value-tiddler-filter>] }}} currentField="text" currentFieldName={{{ [<newFieldNameTiddler>get[text]] }}}>
-<span class="tc-edit-field-add-value tc-small-gap-right">
-<$keyboard key="((add-field))" actions=<<new-field-actions>>>
-<$transclude tiddler={{{ [subfilter<get-field-editor-filter>] }}} />
-</$keyboard>
-</span>
-<span class="tc-edit-field-add-button">
-<$transclude $variable="new-field"/>
-</span>
-</$let>
-</$vars>
-</div>
-</$fieldmangler>
-</$set>
+\function tf.field-cascade()
+	[<currentField>]
+	:cascade[all[shadows+tiddlers]tag[$:/tags/FieldEditorFilter]!is[draft]get[text]]
+	:and[!is[blank]else{$:/core/ui/EditTemplate/fieldEditor/default}]
+\end
+
+\function tf.get-field-editor()
+	[<newFieldNameTiddler>get[text]else[]]
+	:cascade[all[shadows+tiddlers]tag[$:/tags/FieldEditorFilter]!is[draft]get[text]]
+	:and[!is[blank]else{$:/core/ui/EditTemplate/fieldEditor/default}]
+\end
+
+\function tf.primary-list-exceptions() created creator draft.of draft.title modified modifier tags text title type
+
+\function tf.list-selection-class(listSuffix) [<searchListState>get[text]removesuffix<listSuffix>match<currentField>then[tc-list-item-selected]]
+
+
+<$let newFieldValueTiddlerPrefix={{{ [<newFieldValueTiddlerPrefix>!is[blank]else<qualify "$:/temp/NewFieldValue">] }}} >
+	<div class="tc-edit-fields">
+		<!-- table of user fields of the current tiddler -->
+		<table class=`tc-edit-fields ${ [all[current]fields[]] :filter[tf.config-filter[]] :and[count[]match[0]then[tc-edit-fields-small]] }$`>
+			<tbody>
+				<$list filter="[all[current]fields[]] :and[sort[title]]" variable="currentField" storyview="pop">
+					<%if [<currentField>tf.config-filter[]] %>
+						<tr class="tc-edit-field">
+							<td class="tc-edit-field-name">
+								<$text text=<<currentField>>/>:
+							</td>
+							<td class="tc-edit-field-value">
+								<$keyboard key="((delete-field))" actions="<<delete-field-actions>>">
+									<$transclude tiddler=<<tf.field-cascade>> />
+								</$keyboard>
+							</td>
+							<td class="tc-edit-field-remove">
+								<$button actions="<<delete-field-actions>>"
+									aria-label={{$:/language/EditTemplate/Field/Remove/Caption}}
+									class="tc-btn-invisible"
+									tooltip={{$:/language/EditTemplate/Field/Remove/Hint}}
+								>
+									{{$:/core/images/delete-button}}
+								</$button>
+							</td>
+						</tr>
+					<%endif%>
+				</$list>
+			</tbody>
+		</table>
+	</div>
+	
+	<!-- input control for new field name with selection dropdown -->
+	<div class="tc-edit-field-add">
+		<em class="tc-edit tc-small-gap-right">
+			<<lingo Fields/Add/Prompt>>
+		</em>
+		<$let refreshTitle=<<qualify "$:/temp/fieldname/refresh">>
+			storeTitle=<<newFieldNameInputTiddler>>
+			searchListState=<<newFieldNameSelectionTiddler>>
+		>
+			<div class="tc-edit-field-add-name-wrapper">
+				<$transclude $variable="keyboard-driven-input"
+					cancelPopups="yes"
+					class=`tc-edit-texteditor tc-popup-handle ${ [<newFieldNameTiddler>get[text]] :intersection[<storyTiddler>fields[]] :then[[tc-edit-field-exists]] }$`
+					configTiddlerFilter="[[$:/config/EditMode/fieldname-filter]]"
+					default=""
+					focus={{{ [{!!draft.of}is[tiddler]then{$:/config/AutoFocusEdit}match[fields]then[true]] :else[{$:/config/AutoFocus}match[fields]then[true]] :else[[false]] }}}
+					focusPopup=<<qualify "$:/state/popup/field-dropdown">>
+					inputAcceptVariantActions=<<save-tiddler-actions>>
+					inputCancelActions=<<cancel-search-actions>>
+					placeholder={{$:/language/EditTemplate/Fields/Add/Name/Placeholder}}
+					refreshTitle=<<refreshTitle>>
+					selectionStateTitle=<<searchListState>>
+					storeTitle=<<storeTitle>>
+					tag="input"
+					tabindex={{$:/config/EditTabIndex}}
+					tiddler=<<newFieldNameTiddler>>
+				/>
+				<$button aria-label={{$:/language/EditTemplate/Field/Dropdown/Caption}}
+					class="tc-btn-invisible tc-btn-dropdown tc-small-gap"
+					popup=<<qualify "$:/state/popup/field-dropdown">>
+					tooltip={{$:/language/EditTemplate/Field/Dropdown/Hint}}
+				>
+					{{$:/core/images/down-arrow}}
+				</$button>
+				<$reveal state=<<qualify "$:/state/popup/field-dropdown">> type="nomatch" text="" default="" tag="div" class="tc-block-dropdown tc-edit-type-dropdown">
+					<$let tv-show-missing-links="yes">
+						<$linkcatcher to=<<newFieldNameTiddler>>>
+							<div class="tc-dropdown-item">
+								<<lingo Fields/Add/Dropdown/User>>
+							</div>
+							<$let newFieldName={{{ [<storeTitle>get[text]] }}}
+								primaryListFields={{{ [!is[shadow]!is[system]fields[]format:titlelist[]join[ ]] }}}
+							>
+								<$list filter="[enlist<primaryListFields>search:title<newFieldName>sort[]] :except[tf.primary-list-exceptions[]]" variable="currentField">
+									<$link to=<<currentField>> class=<<tf.list-selection-class "-primaryList">> >
+										<$text text=<<currentField>>/>
+									</$link>
+								</$list>
+								<div class="tc-dropdown-item">
+									<<lingo Fields/Add/Dropdown/System>>
+								</div>
+								<$list filter="[fields[]search:title<newFieldName>!enlist<primaryListFields>sort[]]" variable="currentField">
+									<$link to=<<currentField>> class=<<tf.list-selection-class "-secondaryList">>>
+										<$text text=<<currentField>>/>
+									</$link>
+								</$list>
+							</$let>
+						</$linkcatcher>
+					</$let>
+				</$reveal>
+			</div>
+
+			<!-- input control for new field content -->
+			<$let currentFieldName={{{ [<newFieldNameTiddler>get[text]] }}}
+				fieldEditor=<<tf.get-field-editor>>
+				newFieldValueTiddler={{{ [<newFieldValueTiddlerPrefix>] [[/]] [<fieldEditor>sha256[16]] :and[join[]] }}}
+				currentTiddler=<<newFieldValueTiddler>>
+			>
+				<span class="tc-edit-field-add-value tc-small-gap-right">
+					<$keyboard key="((add-field))" actions="<<new-field-actions>>">
+						<$transclude $tiddler=<<fieldEditor>> />
+					</$keyboard>
+				</span>
+				<span class="tc-edit-field-add-button">
+					<$transclude $variable="new-field"/>
+				</span>
+			</$let>
+		</$let>
+	</div>
+</$let>

core/ui/EditTemplate/tags.tid

@@ -17,7 +17,7 @@ tags: $:/tags/EditTemplate
 	<$let backgroundColor=<<colour>> >
 		<span class="tc-tag-label tc-tag-list-item tc-small-gap-right"
 			data-tag-title=<<currentTiddler>>
-			style=`color:$(foregroundColor)$; background-color:$(backgroundColor)$;`
+			style=`color:$(foregroundColor)$; background-color:$(backgroundColor)$; --tp-remove-tag-button-color:$(foregroundColor)$`
 		>
 			<$transclude tiddler=<<icon>>/>
 			<$view field="title" format="text"/>

core/ui/EditTemplate/title.tid

@@ -2,7 +2,11 @@ title: $:/core/ui/EditTemplate/title
 tags: $:/tags/EditTemplate
 
 \whitespace trim
-<$edit-text field="draft.title" class="tc-titlebar tc-edit-texteditor" focus={{{ [{$:/config/AutoFocus}match[title]then[true]] ~[[false]] }}} tabindex={{$:/config/EditTabIndex}} cancelPopups="yes"/>
+<$edit-text field="draft.title" class="tc-titlebar tc-edit-texteditor"
+	focus={{{ [{!!draft.of}is[tiddler]then{$:/config/AutoFocusEdit}match[title]then[true]] ~[{$:/config/AutoFocus}match[title]then[true]] ~[[false]] }}}
+	tabindex={{$:/config/EditTabIndex}}
+	cancelPopups="yes"
+/>
 
 <$vars pattern="""[\|\[\]{}]""" bad-chars="""`| [ ] { }`""">
 

core/ui/EditTemplate/type.tid

@@ -4,13 +4,28 @@ first-search-filter: [all[shadows+tiddlers]prefix[$:/language/Docs/Types/]sort[d
 
 \procedure lingo-base() $:/language/EditTemplate/
 \procedure input-cancel-actions() <$list filter="[<storeTitle>get[text]] [<currentTiddler>get[type]] :and[limit[1]]" emptyMessage="""<<cancel-delete-tiddler-actions "cancel">>"""><$action-sendmessage $message="tm-remove-field" $param="type"/><$action-deletetiddler $filter="[<typeInputTiddler>] [<refreshTitle>] [<typeSelectionTiddler>]"/></$list>
+
 \whitespace trim
 <$set name="refreshTitle" value=<<qualify "$:/temp/type-search/refresh">>>
 <div class="tc-edit-type-selector-wrapper">
 <em class="tc-edit tc-small-gap-right"><<lingo Type/Prompt>></em>
 <div class="tc-type-selector-dropdown-wrapper">
-<div class="tc-type-selector"><$fieldmangler>
-<$transclude $variable="keyboard-driven-input" tiddler=<<currentTiddler>> storeTitle=<<typeInputTiddler>> refreshTitle=<<refreshTitle>> selectionStateTitle=<<typeSelectionTiddler>> field="type" tag="input" default="" placeholder={{$:/language/EditTemplate/Type/Placeholder}} focusPopup=<<qualify "$:/state/popup/type-dropdown">> class="tc-edit-typeeditor tc-edit-texteditor tc-popup-handle tc-keep-focus" tabindex={{$:/config/EditTabIndex}} focus={{{ [{$:/config/AutoFocus}match[type]then[true]] :else[[false]] }}} cancelPopups="yes" configTiddlerFilter="[[$:/core/ui/EditTemplate/type]]" inputCancelActions=<<input-cancel-actions>>/><$button popup=<<qualify "$:/state/popup/type-dropdown">> class="tc-btn-invisible tc-btn-dropdown tc-small-gap" tooltip={{$:/language/EditTemplate/Type/Dropdown/Hint}} aria-label={{$:/language/EditTemplate/Type/Dropdown/Caption}}>{{$:/core/images/down-arrow}}</$button><$button message="tm-remove-field" param="type" class="tc-btn-invisible tc-btn-icon" tooltip={{$:/language/EditTemplate/Type/Delete/Hint}} aria-label={{$:/language/EditTemplate/Type/Delete/Caption}}>{{$:/core/images/delete-button}}<$action-deletetiddler $filter="[<typeInputTiddler>] [<storeTitle>] [<refreshTitle>] [<selectionStateTitle>]"/></$button>
+<div class="tc-type-selector">
+<$fieldmangler>
+<$transclude $variable="keyboard-driven-input" tiddler=<<currentTiddler>> storeTitle=<<typeInputTiddler>> refreshTitle=<<refreshTitle>>
+	selectionStateTitle=<<typeSelectionTiddler>> field="type" tag="input" default="" placeholder={{$:/language/EditTemplate/Type/Placeholder}}
+	focusPopup=<<qualify "$:/state/popup/type-dropdown">> class="tc-edit-typeeditor tc-edit-texteditor tc-popup-handle tc-keep-focus"
+	tabindex={{$:/config/EditTabIndex}}
+	focus={{{ [{!!draft.of}is[tiddler]then{$:/config/AutoFocusEdit}match[type]then[true]] :else[{$:/config/AutoFocus}match[type]then[true]] :else[[false]] }}}
+	cancelPopups="yes" configTiddlerFilter="[[$:/core/ui/EditTemplate/type]]"
+	inputCancelActions=<<input-cancel-actions>>
+/>
+	<$button popup=<<qualify "$:/state/popup/type-dropdown">> class="tc-btn-invisible tc-btn-dropdown tc-small-gap" tooltip={{$:/language/EditTemplate/Type/Dropdown/Hint}} aria-label={{$:/language/EditTemplate/Type/Dropdown/Caption}}>
+		{{$:/core/images/down-arrow}}
+	</$button>
+	<$button message="tm-remove-field" param="type" class="tc-btn-invisible tc-btn-icon" tooltip={{$:/language/EditTemplate/Type/Delete/Hint}} aria-label={{$:/language/EditTemplate/Type/Delete/Caption}}>
+		{{$:/core/images/delete-button}}<$action-deletetiddler $filter="[<typeInputTiddler>] [<storeTitle>] [<refreshTitle>] [<selectionStateTitle>]"/>
+	</$button>
 </$fieldmangler></div>
 
 <div class="tc-block-dropdown-wrapper">

core/ui/PageStylesheet.tid

@@ -8,6 +8,8 @@ code-body: yes
 
 <$set name="languageTitle" value={{!!name}}>
 
+<$transclude $tiddler="$:/core/stylesheets/custom-properties" $mode="block"/>
+
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/Stylesheet]!has[draft.of]]">
 <$transclude mode="block"/>
 </$list>

core/ui/TiddlerInfo/Advanced/CascadeInfo.tid

@@ -0,0 +1,38 @@
+title: $:/core/ui/TiddlerInfo/Advanced/CascadeInfo
+tags: $:/tags/TiddlerInfo/Advanced
+
+\define lingo-base() $:/language/TiddlerInfo/Advanced/CascadeInfo/
+<$let infoTiddler=<<currentTiddler>>>
+
+''<<lingo Heading>>''
+
+<table class="tc-max-width">
+<thead>
+<$list filter="[[View]] [[Active Cascade Filter]] [[Template]]" variable="heading">
+<th><<heading>></th>
+</$list>
+</thead>
+<$list filter="[[$:/tags/ViewTemplate]tagging[]]" variable="ViewTemplate">
+<tr>
+<$let
+view={{{ [<ViewTemplate>]+[split[/]last[]] }}}
+tagFilter=`$:/tags/ViewTemplate${ [<view>titlecase[]] }$Filter`
+activeCascadeFilterTiddler={{{ [all[shadows+tiddlers]tag<tagFilter>!is[draft]]:filter[<storyTiddler>subfilter{!!text}]+[first[]] }}}
+activeCascadeFilter={{{ [<activeCascadeFilterTiddler>get[text]] }}}
+activeTemplateTiddler={{{ [<currentTiddler>]:cascade[all[shadows+tiddlers]tag<tagFilter>!is[draft]get[text]] }}}
+>
+<%if [<activeCascadeFilterTiddler>!is[blank]]%>
+<td>
+<$link to=<<ViewTemplate>> ><<view>></$link>
+</td>
+<td>
+<$link to=<<activeCascadeFilterTiddler>> />
+</td>
+<td style="text-align:center;">
+<$link class="tc-btn-invisible" to=<<activeTemplateTiddler>>><$button class="tc-btn-invisible">{{$:/core/images/file}}</$button></$link>
+</td>
+<%endif%>
+</$let>
+</tr>
+</$list>
+</table>

core/wiki/macros/tag-picker.tid

@@ -118,7 +118,7 @@ The second ESC tries to close the "draft tiddler"
 				focusPopup=<<tf.tagpicker-dropdown-id>>
 				class="tc-edit-texteditor tc-popup-handle"
 				tabindex=<<tabIndex>>
-				focus={{{ [{$:/config/AutoFocus}match[tags]then[true]] :else[[false]] }}}
+				focus={{{ [{!!draft.of}is[tiddler]then{$:/config/AutoFocusEdit}match[tags]then[true]] :else[{$:/config/AutoFocus}match[tags]then[true]] :else[[false]] }}}
 				filterMinLength={{$:/config/Tags/MinLength}}
 				cancelPopups=<<cancelPopups>>
 				configTiddlerFilter="[[$:/core/macros/tag-picker]]"

core/wiki/macros/toc.tid

@@ -15,7 +15,18 @@ tags: $:/tags/Macro
 </span>
 \end
 
-\define toc-body(tag,sort:"",itemClassFilter,exclude,path)
+\define toc-level-indicator()
+\whitespace trim
+<%if [<__level__>compare:number:gt[0]]%>
+  <%if [<currentTiddler>tagging[]] %>
+    <span class="tc-tiny-gap-left">{{$:/core/images/new-button}}</span>
+  <%else%>
+    <span class="tc-tiny-gap-left">{{$:/core/images/blank}}</span>
+  <%endif%>
+<% endif %>
+\end
+
+\define toc-body(tag,sort:"",itemClassFilter,exclude,path,level)
 \whitespace trim
 <ol class="tc-toc">
   <$list filter="""[all[shadows+tiddlers]tag<__tag__>!has[draft.of]$sort$] -[<__tag__>] -[subfilter<__exclude__>]""">
@@ -23,10 +34,26 @@ tags: $:/tags/Macro
       <$set name="excluded" filter="[subfilter<__exclude__>] [<__tag__>]">
         <$set name="toc-item-class" filter=<<__itemClassFilter__>> emptyValue="toc-item-selected" value="toc-item">
           <li class=<<toc-item-class>>>
-            <$list filter="[all[current]toc-link[no]]" emptyMessage="<$link to={{{ [<currentTiddler>get[target]else<currentTiddler>] }}}><<toc-caption>></$link>">
+            <$list filter="[all[current]toc-link[no]]" >
+              <$list-empty>
+                <!-- link to target-field or currentTiddler -->
+                <$link to={{{ [<currentTiddler>get[target]else<currentTiddler>] }}}>
+                  <<toc-level-indicator>>
+                  <<toc-caption>>
+                </$link>
+              </$list-empty>
+              <!-- toc-link = no -->
+              <<toc-level-indicator>>
               <<toc-caption>>
             </$list>
-            <$macrocall $name="toc-body" tag=<<item>> sort=<<__sort__>> itemClassFilter=<<__itemClassFilter__>> exclude=<<excluded>> path=<<path>>/>
+            <$let _level={{{ [<__level__>subtract[1]] }}}>
+              <%if [<_level>compare:number:gt[0]]%>
+                <$macrocall $name="toc-body" tag=<<item>> sort=<<__sort__>> itemClassFilter=<<__itemClassFilter__>> exclude=<<excluded>> path=<<path>> level=<<_level>>/>
+              <%elseif [<_level>match[-1]]%>
+                <!-- show full toc, no level defined -->
+                <$macrocall $name="toc-body" tag=<<item>> sort=<<__sort__>> itemClassFilter=<<__itemClassFilter__>> exclude=<<excluded>> path=<<path>>/>
+              <%endif%>
+            </$let>
           </li>
         </$set>
       </$set>
@@ -35,10 +62,10 @@ tags: $:/tags/Macro
 </ol>
 \end
 
-\define toc(tag,sort:"",itemClassFilter:"", exclude)
+\define toc(tag,sort:"",itemClassFilter:"",exclude,level)
 \whitespace trim
 <$let __tag__={{{ [<__tag__>is[blank]then<currentTiddler>else<__tag__>] }}} >
-  <$macrocall $name="toc-body"  tag=<<__tag__>> sort=<<__sort__>> itemClassFilter=<<__itemClassFilter__>> exclude=<<__exclude__>>/>
+  <$macrocall $name="toc-body"  tag=<<__tag__>> sort=<<__sort__>> itemClassFilter=<<__itemClassFilter__>> exclude=<<__exclude__>> level=<<__level__>>/>
 </$let>
 \end
 

core/wiki/minifocuseditswitcher.tid

@@ -0,0 +1,8 @@
+title: $:/snippets/minifocuseditswitcher
+
+\whitespace trim
+<$select tiddler="$:/config/AutoFocusEdit" default={{$:/config/AutoFocus}}>
+<$list filter="title tags text">
+<option><<currentTiddler>></option>
+</$list>
+</$select>

core/wiki/tags/TiddlerInfoAdvanced.tid

@@ -1,2 +1,2 @@
 title: $:/tags/TiddlerInfo/Advanced
-list: [[$:/core/ui/TiddlerInfo/Advanced/ShadowInfo]] [[$:/core/ui/TiddlerInfo/Advanced/PluginInfo]] 
+list: [[$:/core/ui/TiddlerInfo/Advanced/ShadowInfo]] [[$:/core/ui/TiddlerInfo/Advanced/PluginInfo]] [[$:/core/ui/TiddlerInfo/Advanced/CascadeInfo]]

editions/de-AT/tiddlywiki.info

@@ -20,8 +20,7 @@
 		"index": [
 			"--rendertiddler","$:/core/save/all","index.html","text/plain"],
 		"empty": [
-			"--rendertiddler","$:/editions/de-AT-DE/download-empty","empty.html","text/plain",
-			"--rendertiddler","$:/editions/de-AT-DE/download-empty","empty.hta","text/plain"],
+			"--rendertiddler","$:/editions/de-AT-DE/download-empty","empty.html","text/plain"],
 		"favicon": [
 			"--savetiddler","$:/favicon.ico","favicon.ico"],
 		"static": [

editions/de-DE/tiddlywiki.info

@@ -24,8 +24,7 @@
 		"index": [
 			"--rendertiddler","$:/core/save/all","index.html","text/plain"],
 		"empty": [
-			"--rendertiddler","$:/editions/de-AT-DE/download-empty","empty.html","text/plain",
-			"--rendertiddler","$:/editions/de-AT-DE/download-empty","empty.hta","text/plain"],
+			"--rendertiddler","$:/editions/de-AT-DE/download-empty","empty.html","text/plain"],
 		"favicon": [
 			"--savetiddler","$:/favicon.ico","favicon.ico"],
 		"static": [

editions/empty/tiddlywiki.info

@@ -10,8 +10,7 @@
 		"index": [
 			"--render","$:/core/save/all","index.html","text/plain"],
 		"empty": [
-			"--render","$:/core/save/all","empty.html","text/plain",
-			"--render","$:/core/save/all","empty.hta","text/plain"],
+			"--render","$:/core/save/all","empty.html","text/plain"],
 		"emptyexternalcore": [
 			"--render","$:/core/save/offline-external-js","empty-external-core.html","text/plain",
 			"--render","$:/core/templates/tiddlywiki5.js","[[tiddlywikicore-]addsuffix<version>addsuffix[.js]]","text/plain"],

editions/es-ES/tiddlywiki.info

@@ -27,8 +27,7 @@
 			"--setfield","[tag[external-image]] [tag[external-text]]","text","","text/plain",
 			"--rendertiddler","$:/core/save/all","index.html","text/plain"],
 		"empty": [
-			"--rendertiddler","$:/editions/es-ES/download-empty","empty.html","text/plain",
-			"--rendertiddler","$:/editions/es-ES/download-empty","empty.hta","text/plain"],
+			"--rendertiddler","$:/editions/es-ES/download-empty","empty.html","text/plain"],
 		"favicon": [
 			"--savetiddler","$:/favicon.ico","favicon.ico",
 			"--savetiddler","$:/green_favicon.ico","static/favicon.ico"],

editions/fr-FR/tiddlywiki.info

@@ -27,8 +27,7 @@
 			"--setfield","[tag[external-image]] [tag[external-text]]","text","","text/plain",
 			"--rendertiddler","$:/core/save/all","index.html","text/plain"],
 		"empty": [
-			"--rendertiddler","$:/editions/fr-FR/download-empty","empty.html","text/plain",
-			"--rendertiddler","$:/editions/fr-FR/download-empty","empty.hta","text/plain"],
+			"--rendertiddler","$:/editions/fr-FR/download-empty","empty.html","text/plain"],
 		"favicon": [
 			"--savetiddler","$:/favicon.ico","favicon.ico",
 			"--savetiddler","$:/green_favicon.ico","static/favicon.ico"],

editions/ja-JP/tiddlywiki.info

@@ -27,8 +27,7 @@
 			"--setfield","[tag[external-image]] [tag[external-text]]","text","","text/plain",
 			"--rendertiddler","$:/core/save/all","index.html","text/plain"],
 		"empty": [
-			"--rendertiddler","$:/editions/ja-JP/download-empty","empty.html","text/plain",
-			"--rendertiddler","$:/editions/ja-JP/download-empty","empty.hta","text/plain"],
+			"--rendertiddler","$:/editions/ja-JP/download-empty","empty.html","text/plain"],
 		"favicon": [
 			"--savetiddler","$:/favicon.ico","favicon.ico",
 			"--savetiddler","$:/green_favicon.ico","static/favicon.ico"],

editions/ko-KR/tiddlywiki.info

@@ -27,8 +27,7 @@
 			"--setfield","[tag[external-image]] [tag[external-text]]","text","","text/plain",
 			"--rendertiddler","$:/core/save/all","index.html","text/plain"],
 		"empty": [
-			"--rendertiddler","$:/editions/ko-KR/download-empty","empty.html","text/plain",
-			"--rendertiddler","$:/editions/ko-KR/download-empty","empty.hta","text/plain"],
+			"--rendertiddler","$:/editions/ko-KR/download-empty","empty.html","text/plain"],
 		"favicon": [
 			"--savetiddler","$:/favicon.ico","favicon.ico",
 			"--savetiddler","$:/green_favicon.ico","static/favicon.ico"],

editions/test/tiddlers/tests/data/functions/FunctionDefaultValues.tid

@@ -0,0 +1,16 @@
+title: Functions/FunctionDefaultValues
+description: Use defaults for missing parameters in functions in filters
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+
+\whitespace trim
+\function .test(prefix:Default) [[ Content]addprefix<prefix>]
+
+<$text text={{{ [.test[Special]] }}}/>,<$text text={{{ [.test[]] }}}/>
+
++
+title: ExpectedResult
+
+<p>Special Content,Default Content</p>

editions/test/tiddlers/tests/data/functions/FunctionSubstituteResolution.tid

@@ -0,0 +1,38 @@
+title: Functions/FunctionResolutionInSubstitute
+description: Functions should resolve correctly in the substitute operator
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+
+\whitespace trim
+
+\function getIndex() [<index>add[1]] 
+
+\procedure template-with-var() $(getIndex)$
+
+\procedure template-with-filteredexpression() ${ [<getIndex>] }$
+
+\function test-with-substitute-variable()
+[[abc]split[]] :map[<template-with-var>substitute[]] :and[join[ / ]]
+\end
+
+\function test-with-substitute-filteredexpression()
+[[abc]split[]] :map[<template-with-filteredexpression>substitute[]] :and[join[ / ]]
+\end
+
+\function test-with-function()
+[[abc]split[]] :map[function[getIndex]substitute[]] :and[join[ / ]]
+\end
+
+
+
+<<test-with-substitute-variable>>|
+<<test-with-substitute-filteredexpression>>|
+<<test-with-function>>
+
+
++
+title: ExpectedResult
+
+<p>1 / 2 / 3|1 / 2 / 3|1 / 2 / 3</p>

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

@@ -177,6 +177,32 @@ describe("Widget module", function() {
 		expect(wrapper.innerHTML).toBe("<span class=\"tc-error\">Recursive transclusion error in transclude widget</span> <span class=\"tc-error\">Recursive transclusion error in transclude widget</span>");
 	});
 
+	// Do NOT use a for-of or for-in here. Each jasmine test must be
+	// defined in its own function context, or the `tag` variable will
+	// end up being the same value for all iterations of the test. 
+	$tw.utils.each(["div","$button","$checkbox","$diff-text","$draggable","$droppable","dropzone","$eventcatcher","$keyboard","$link","$list filter=x variable=x","$radio","$reveal type=nomatch","$scrollable","$select","$view field=x"],function(tag) {
+		it(`${tag} cleans itself up if children rendering fails`, function() {
+			var wiki = new $tw.Wiki();
+			wiki.addTiddler({title: "TiddlerOne", text: `<$tiddler tiddler='TiddlerOne'><${tag}><$transclude />`});
+			var parseTreeNode = {type: "widget", children: [
+				{type: "transclude", attributes: {
+					"tiddler": {type: "string", value: "TiddlerOne"}
+				}}
+			]};
+			// Construct the widget node
+			var widgetNode = createWidgetNode(parseTreeNode,wiki);
+			// Render the widget node to the DOM
+			var wrapper = renderWidgetNode(widgetNode);
+			// We don't actually care exactly what the HTML contains,
+			// only that it's reasonably sized. If it's super large,
+			// that means the widget containing the bad transclusion
+			// didn't figure out how to clean itself up, and it cloned a bunch.
+			var html = wrapper.innerHTML;
+			expect(html).toContain("Recursive transclusion error in transclude widget");
+			expect(html.length).toBeLessThan(256, "CONTENTS: " + html);
+		});
+	});
+
 	it("should handle many-tiddler recursion with branching nodes", function() {
 		var wiki = new $tw.Wiki();
 		// Add a tiddler

editions/translators/tiddlers/Instructions for Translators.tid

@@ -48,6 +48,7 @@ Prioritise the groups to translate first. A translation can be useful without be
 * Buttons
 * Control Panel
 * Date
+* Draft
 * Edit Template
 * Getting Started
 * Import

editions/translators/tiddlers/system/$__status_UserName.tid

@@ -0,0 +1,3 @@
+title: $:/status/UserName
+
+Jermolene

editions/translators/tiddlywiki.info

@@ -51,6 +51,7 @@
 			"--render","$:/plugins/tiddlywiki/translators/templates/ControlPanel.multids","language/ControlPanel.multids","text/plain",
 			"--render","$:/plugins/tiddlywiki/translators/templates/CoreReadMe.tid","language/CoreReadMe.tid","text/plain",
 			"--render","$:/plugins/tiddlywiki/translators/templates/Dates.multids","language/Dates.multids","text/plain",
+			"--render","$:/plugins/tiddlywiki/translators/templates/Draft.multids","language/Draft.multids","text/plain",
 			"--render","$:/plugins/tiddlywiki/translators/templates/EditTemplate.multids","language/EditTemplate.multids","text/plain",
 			"--render","$:/plugins/tiddlywiki/translators/templates/Exporters.multids","language/Exporters.multids","text/plain",
 			"--render","$:/plugins/tiddlywiki/translators/templates/Fields.multids","language/Fields.multids","text/plain",

editions/tw5.com/tiddlers/Core CSS Variables.tid

@@ -0,0 +1,11 @@
+created: 20251108075028089
+modified: 20260130070027124
+tags: Reference
+title: Core CSS Variables
+type: text/vnd.tiddlywiki
+
+<<.from-version 5.4.0>> Tiddlywiki CSS variable definitions starts with `--tp-*` and `--tpc-*`. They are mainly used to [[Write stylesheets in vanilla CSS|Writing stylesheets in vanilla CSS]]. These prefixes ''are reserved'' for Tiddlywiki, so it should not be used for user defined CSS variables. It is also not recommended to override these core CSS variables.
+
+Core CSS variables are defined in [[$:/core/stylesheets/custom-properties]].
+
+<<list-links "[tag[Core CSS Variables]]" class:"multi-columns">>

editions/tw5.com/tiddlers/Writing stylesheets in vanilla CSS.tid

@@ -0,0 +1,69 @@
+created: 20251108075645447
+modified: 20260201043953311
+title: Writing stylesheets in vanilla CSS
+type: text/vnd.tiddlywiki
+
+<<.from-version 5.4.0>> Before v5.4.0, theme developers have to mix wikitext syntax with CSS syntax when writing stylesheets to intergrate Tiddlywiki color palettes and theme settings. With the introduction of [[Core CSS Variables]] in v5.4.0, theme developers can intergrate most Tiddlywiki palettes with vanilla CSS.
+
+! Getting Tiddlywiki palette colors
+Tiddlywiki's custom properties for colors are prefixed `--tpc-`. Before v5.4.0, theme developers have to use the following wikitext to get a color value of a palette:
+
+```
+.tag {
+	background: <<colour tag-background>>;
+}
+```
+
+Since v5.4.0, theme developers can use the following CSS to get the palette color:
+
+```css
+.tag {
+	background: var(--tp-color-tag-background);
+}
+```
+
+! Getting and processing Tiddlywiki CSS settings
+See [[Core CSS Variables]] for the available CSS variables. Before v5.4.0, theme developers have to use macros with filters to get and process theme settings:
+
+```
+.tc-sidebar-header {
+	padding: 14px;
+	min-height: 32px;
+	margin-top: {{$:/themes/tiddlywiki/vanilla/metrics/storytop}};
+	transition:  min-height {{$:/config/AnimationDuration}}ms ease-in-out, padding-top {{$:/config/AnimationDuration}}ms ease-in-out, padding-bottom {{$:/config/AnimationDuration}}ms ease-in-out;
+}
+```
+
+Since v5.4.0, the theme settings are also available as the CSS variables, so theme developers can use the following code:
+
+```css
+.tc-sidebar-header {
+	padding: 14px;
+	min-height: 32px;
+	margin-top: var(--tp-story-top);
+	transition: min-height var(--tp-animation-duration) ease-in-out, padding-top var(--tp-animation-duration) ease-in-out, padding-bottom var(--tp-animation-duration) ease-in-out;
+}
+```
+
+! Limits
+CSS variables can only be used in rules, while wikitext can be used everywhere. See this example:
+
+Old way of using wikitext in media query definitions:
+
+```
+\define sidebarbreakpoint()
+<$text text={{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}}/>
+\end
+
+@media (min-width: <<sidebarbreakpoint>>) {
+	/* CSS rules */
+}
+```
+
+While using CSS variables in media quert definitions doesn't work at all:
+
+```css
+@media (min-width: var(--tp-sidebar-breakpoint)) {
+	/* Doesn't work */
+}
+```

editions/tw5.com/tiddlers/_tw_shared/doc-utilities/doc-styles.tid

@@ -193,11 +193,11 @@ tr.doc-table-subheading {
 }
 
 .doc-block-icon .tc-image-tip {
-	fill: <<colour primary>>;
+	color: <<colour primary>>;
 }
 
 .doc-block-icon .tc-image-warning {
-	fill: <<colour alert-highlight>>;
+	color: <<colour alert-highlight>>;
 }
 
 a.doc-from-version {
@@ -215,7 +215,6 @@ a.doc-from-version.doc-from-version-new {
 }
 
 a.doc-from-version svg {
-    fill: currentColor;
     vertical-align: sub;
 }
 
@@ -224,7 +223,6 @@ a.doc-deprecated-version.tc-tiddlylink {
     border-radius: 1em;
 	background: red;
 	color: <<colour background>>;
-	fill: <<colour background>>;
     padding: 0 0.4em;
     font-size: 0.7em;
     text-transform: uppercase;

editions/tw5.com/tiddlers/cards/card-styles.tid

@@ -36,7 +36,6 @@ type: text/vnd.tiddlywiki
 	border-radius: 6px;
 	padding: 0.5em;
 	color: <<colour background>>;
-	fill: <<colour background>>;
 }
 
 .tc-cards.tc-action-card .tc-card-button svg {

editions/tw5.com/tiddlers/css-variables/--tp-animation-duration CSS Variable.tid

@@ -0,0 +1,8 @@
+caption: --tp-animation-duration
+created: 20260130075755351
+modified: 20260130075855780
+tags: [[Core CSS Variables]]
+title: --tp-animation-duration CSS Variable
+type: text/vnd.tiddlywiki
+
+The `--tp-animation-duration` CSS variable represents the "Animation duration" setting in the control panel. The `ms` suffix is added.

editions/tw5.com/tiddlers/css-variables/--tp-body-font-size Variable.tid

@@ -0,0 +1,8 @@
+caption: --tp-body-font-size
+created: 20260122111308483
+modified: 20260130045633904
+tags: [[Core CSS Variables]]
+title: --tp-body-font-size CSS Variable
+type: text/vnd.tiddlywiki
+
+The `--tp-body-font-size` CSS variable represents the "Font size for tiddler body" setting in Theme Tweaks.

editions/tw5.com/tiddlers/css-variables/--tp-body-line-height Variable.tid

@@ -0,0 +1,8 @@
+caption: --tp-body-line-height
+created: 20260122111249446
+modified: 20260130045720240
+tags: [[Core CSS Variables]]
+title: --tp-body-line-height CSS Variable
+type: text/vnd.tiddlywiki
+
+The `--tp-body-line-height` CSS variable represents the "Line height for tiddler body" setting in Theme Tweaks.

editions/tw5.com/tiddlers/css-variables/--tp-code-font-family Variable.tid

@@ -0,0 +1,8 @@
+caption: --tp-code-font-family
+created: 20260122110850673
+modified: 20260130045333134
+tags: [[Core CSS Variables]]
+title: --tp-code-font-family CSS Variable
+type: text/vnd.tiddlywiki
+
+The `--tp-code-font-family` CSS variable represents the "Code font family" setting in Theme Tweaks.

editions/tw5.com/tiddlers/css-variables/--tp-code-wrapping Variable.tid

@@ -0,0 +1,8 @@
+caption: --tp-code-wrapping
+created: 20260122110618231
+modified: 20260130045345387
+tags: [[Core CSS Variables]]
+title: --tp-code-wrapping CSS Variable
+type: text/vnd.tiddlywiki
+
+The `--tp-code-wrapping` CSS variable represents the "Wrap long lines in code blocks" setting in Theme Tweaks. Its value is `pre` when the setting is set to "No", and `pre-wrap` when set to "Yes".

editions/tw5.com/tiddlers/css-variables/--tp-editor-font-family Variable.tid

@@ -0,0 +1,8 @@
+caption: --tp-editor-font-family
+created: 20260122110858791
+modified: 20260130045422071
+tags: [[Core CSS Variables]]
+title: --tp-editor-font-family CSS Variable
+type: text/vnd.tiddlywiki
+
+The `--tp-editor-font-family` CSS variable represents the "Editor font family" setting in Theme Tweaks.

editions/tw5.com/tiddlers/css-variables/--tp-font-family Variable.tid

@@ -0,0 +1,8 @@
+caption: --tp-font-family
+created: 20260122110741282
+modified: 20260130045301357
+tags: [[Core CSS Variables]]
+title: --tp-font-family CSS Variable
+type: text/vnd.tiddlywiki
+
+The `--tp-font-family` CSS variable represents the "Font family" setting in Theme Tweaks.

editions/tw5.com/tiddlers/css-variables/--tp-font-size Variable.tid

@@ -0,0 +1,8 @@
+caption: --tp-font-size
+created: 20260122110956954
+modified: 20260130045455466
+tags: [[Core CSS Variables]]
+title: --tp-font-size CSS Variable
+type: text/vnd.tiddlywiki
+
+The `--tp-font-size` CSS variable represents the "Font size" setting in Theme Tweaks.

editions/tw5.com/tiddlers/css-variables/--tp-line-height Variable.tid

@@ -0,0 +1,8 @@
+caption: --tp-line-height
+created: 20260122111115266
+modified: 20260130045757204
+tags: [[Core CSS Variables]]
+title: --tp-line-height CSS Variable
+type: text/vnd.tiddlywiki
+
+The `--tp-line-height` CSS variable represents the "Line height" setting in Theme Tweaks.

editions/tw5.com/tiddlers/css-variables/--tp-sidebar-breakpoint CSS Variable.tid

@@ -0,0 +1,8 @@
+caption: --tp-sidebar-breakpoint
+created: 20260130065756457
+modified: 20260130065841355
+tags: [[Core CSS Variables]]
+title: --tp-sidebar-breakpoint CSS Variable
+type: text/vnd.tiddlywiki
+
+The `--tp-sidebar-breakpoint` CSS variable represents the minimum page width at which the story river and sidebar will appear side by side.

editions/tw5.com/tiddlers/css-variables/--tp-sidebar-width CSS Variable.tid

@@ -0,0 +1,8 @@
+caption: --tp-sidebar-width
+created: 20260130065850825
+modified: 20260130065925595
+tags: [[Core CSS Variables]]
+title: --tp-sidebar-width CSS Variable
+type: text/vnd.tiddlywiki
+
+The `--tp-sidebar-width` CSS variable represents the width of the sidebar in fluid-fixed layout.

editions/tw5.com/tiddlers/css-variables/--tp-story-left CSS Variable.tid

@@ -0,0 +1,8 @@
+caption: --tp-story-left
+created: 20260130065252380
+modified: 20260130065342364
+tags: [[Core CSS Variables]]
+title: --tp-story-left CSS Variable
+type: text/vnd.tiddlywiki
+
+The `--tp-story-left` CSS variable represents how far the left margin of the story river (tiddler area) is from the left of the page.

editions/tw5.com/tiddlers/css-variables/--tp-story-right CSS Variable.tid

@@ -0,0 +1,8 @@
+caption: --tp-story-right
+created: 20260130065417448
+modified: 20260130065457358
+tags: [[Core CSS Variables]]
+title: --tp-story-right CSS Variable
+type: text/vnd.tiddlywiki
+
+The `--tp-story-right` CSS variable represents how far the left margin of the sidebar is from the left of the page.

editions/tw5.com/tiddlers/css-variables/--tp-story-top CSS Variable.tid

@@ -0,0 +1,8 @@
+caption: --tp-story-top
+created: 20260130065351753
+modified: 20260130065451132
+tags: [[Core CSS Variables]]
+title: --tp-story-top CSS Variable
+type: text/vnd.tiddlywiki
+
+The `--tp-story-top` CSS variable represents how far the top margin of the story river is from the top of the page.

editions/tw5.com/tiddlers/css-variables/--tp-story-width CSS Variable.tid

@@ -0,0 +1,8 @@
+caption: --tp-story-width
+created: 20260130065510314
+modified: 20260130065552027
+tags: [[Core CSS Variables]]
+title: --tp-story-width CSS Variable
+type: text/vnd.tiddlywiki
+
+The `--tp-story-width` CSS variable represents the overall width of the story river.

editions/tw5.com/tiddlers/css-variables/--tp-tiddler-width CSS Variable.tid

@@ -0,0 +1,8 @@
+caption: --tp-tiddler-width
+created: 20260130065558913
+modified: 20260130065746707
+tags: [[Core CSS Variables]]
+title: --tp-tiddler-width CSS Variable
+type: text/vnd.tiddlywiki
+
+The `--tp-tiddler-width` CSS variable represents the tiddler width within the story river.

editions/tw5.com/tiddlers/css-variables/--tpc-_ variables.tid

@@ -0,0 +1,16 @@
+caption: --tpc-*
+created: 20260122104142525
+modified: 20260122104847331
+tags: [[Core CSS Variables]]
+title: --tpc-* CSS Variables
+type: text/vnd.tiddlywiki
+
+`--tpc-*` variables are CSS variables of palette colors. They can be accessed via appending the palette color names to the bottom. For example:
+
+```css
+.code {
+	background-color: var(--tpc-code-background);
+	color: var(--tpc-code-foreground);
+}
+```
+

editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Simple Example.tid

@@ -1,11 +1,43 @@
-created: 20150221201838000
-modified: 20150221203742000
-title: Example Table of Contents: Simple
 caption: Simple
-tags: table-of-contents-example
+created: 20150221201838000
+modified: 20260124125915331
 order: 1
+tags: table-of-contents-example
+title: Example Table of Contents: Simple
+type: text/vnd.tiddlywiki
 
 <$macrocall $name=".example" n="1"
 eg="""<div class="tc-table-of-contents">
 <<toc "Contents">>
 </div>"""/>
+
+---
+
+<<.tip"""If you use several parameters in a macro call, it is advised to use ''named parameters'' for all of them""">>
+
+<$macrocall $name=".example" n="2"
+eg="""<div class="tc-table-of-contents">
+<<toc tag:"Contents" level:"1">>
+</div>"""/>
+
+<$macrocall $name=".example" n="3"
+eg="""<div class="tc-table-of-contents">
+<<toc tag:"Contents" level:"2">>
+</div>"""/>
+
+<$macrocall $name=".example" n="4"
+eg="""<div class="tc-table-of-contents">
+<<toc tag:"Contents" level:"4">>
+</div>"""/>
+
+* If you want to ''change'' or ''remove'' the indicator, you can locally overwrite the `toc-level-indicator` macro. 
+* It is globally defined at: $:/core/macros/toc tiddler. Eg:
+
+<$macrocall $name=".example" n="5"
+eg="""\define toc-level-indicator()
+<!-- remove the indicator --> 
+\end
+
+<div class="tc-table-of-contents">
+<<toc tag:"Contents" level:"1">>
+</div>"""/>

editions/tw5.com/tiddlers/features/Core Icons.tid

@@ -37,5 +37,5 @@ Some icons take further parameters to customise how they are rendered. For examp
 
 The core icons are implemented as embedded [[SVG elements|Using SVG]], and not as full-blown SVG images. This means that they can be styled using CSS. For example, the CSS property `fill` can be used to change the colour of the icons. For example:
 
-<<wikitext-example-without-html """<span style="fill: red;">{{$:/core/images/opacity}}</span>
+<<wikitext-example-without-html """<span style="color: red;">{{$:/core/images/opacity}}</span>
 """>>

editions/tw5.com/tiddlers/hire-jeremy/HireJeremyStyles.tid

@@ -81,7 +81,7 @@ type: text/vnd.tiddlywiki
 }
 
 [data-tiddler-title="Hire the founder of TiddlyWiki"] .tc-btn-big-green svg {
-	fill: #cece86;
+	color: #cece86;
 }
 
 .yellow-note-sidebar-wrapper {

editions/tw5.com/tiddlers/macros/TableOfContentsMacro.tid

@@ -1,5 +1,5 @@
 created: 20140919155729620
-modified: 20240624102502089
+modified: 20260124130054271
 tags: Macros [[Core Macros]]
 title: Table-of-Contents Macros
 type: text/vnd.tiddlywiki
@@ -74,6 +74,9 @@ These two parameters are combined into a single [[filter expression|Filter Expre
 ; exclude <<.from-version "5.3.0">>
 : This optional parameter can be used to exclude tiddlers from the TOC list. It allows a [[Title List]] or a <<.olink subfilter>>. Eg: `exclude:"HelloThere [[Title with spaces]]"` or `exclude:"[has[excludeTOC]]"`. Where the former will exclude two tiddlers and the later would exclude every tiddler that has a field <<.field excludeTOC>> independent of its value.<br>''Be aware'' that eg: `[prefix[H]]` is a shortcut for `[all[tiddlers]prefix[H]]`, which can have a performance impact, if used carelessly. So use $:/AdvancedSearch -> ''Filters'' tab to test the <<.param exclude>> parameter
 
+; level <<.from-version "5.4.0">>
+: This optional parameter can be used to define how many toc levels are shown by the toc-macro. By default all levels are shown. 
+
 !! Custom Icons
 
 <<.from-version "5.2.4">>

editions/tw5.com/tiddlers/macros/list-links-draggable Macro.tid

@@ -32,7 +32,7 @@ The <<.def list-links-draggable>> [[macro|Macros]] renders the ListField of a ti
 : Optional title of a tiddler to use as the template for rendering list items
 
 ;displayField  
-: Optional name of the field to display when the list is rendered. Defaults to the "caption" field; if "caption" is not present, the "title" field is used instead
+: <<.from-version 5.4.0>> Optional name of the field to display when the list is rendered. Defaults to the "caption" field; if "caption" is not present, the "title" field is used instead
 
 
 If the `itemTemplate` parameter is not provided then the list items are rendered as simple links. Within the `itemTemplate`, the [[currentTiddler Variable]] refers to the current list item.

editions/tw5.com/tiddlers/macros/list-tagged-draggable Macro.tid

@@ -17,9 +17,9 @@ The <<.def list-tagged-draggable>> [[macro|Macros]] renders the tiddlers with a
 : Optional title of a tiddler to use as the template for rendering list items
 ;emptyMessage
 : Optional wikitext to display if there are no tiddlers with the specified tag
-Here’s a corrected and polished version of your sentence in clear, standard English:
+
 ;displayField  
-: Optional name of the field to display when the list is rendered. Defaults to `title` field.
+: <<.from-version 5.4.0>> Optional name of the field to display when the list is rendered. Defaults to `title` field.
 
 Note that the [[ordering|Order of Tagged Tiddlers]] is accomplished by assigning a new list to the `list` field of the tag tiddler. Any `list-before` or `list-after` fields on any of the other tiddlers carrying the tag are also removed to ensure the `list` field is respected.
 

editions/tw5.com/tiddlers/releasenotes/5.4.0/#8810.tid

@@ -0,0 +1,12 @@
+title: $:/changenotes/5.4.0/#8810
+description: New plugin for saving DOM nodes as an image
+tags: $:/tags/ChangeNote
+release: 5.4.0
+change-type: enhancement
+change-category: plugin
+github-links: https://github.com/TiddlyWiki/TiddlyWiki5/pull/8810
+github-contributors: Jermolene
+
+The new "dom-to-image" plugin enables almost anything that can be rendered in a web browser to be saved as an image. The motivation is to be able to save maps generated by Leaflet.js as PNG, JPEG or SVG images, which is not natively supported by Leaflet. This plugin uses the library https://github.com/1904labs/dom-to-image-more to provide the underlying functionality.
+
+Install the plugin from the plugin library in the usual way.

editions/tw5.com/tiddlers/releasenotes/5.4.0/#8972.tid

@@ -4,8 +4,8 @@ release: 5.4.0
 tags: $:/tags/ChangeNote
 change-type: enhancement
 change-category: hackability
-github-links: https://github.com/TiddlyWiki/TiddlyWiki5/pull/8972
-github-contributors: Jermolene
+github-links: https://github.com/TiddlyWiki/TiddlyWiki5/pull/8972 https://github.com/TiddlyWiki/TiddlyWiki5/pull/9614
+github-contributors: Jermolene saqimtiaz
 
 This PR introduces a new filter run prefix `:let` that assigns the result of the filter run to a variable that is made available for the remaining filter runs of the filter expression. It solves the problem that previously it was impossible to compute values for filter operator parameters; parameters could only be a literal string, text reference or variable reference.
 

editions/tw5.com/tiddlers/releasenotes/5.4.0/#9050.tid

@@ -0,0 +1,13 @@
+change-category: widget
+change-type: enhancement
+created: 20260126112805413
+description: Allow actions to be invoked when an image is loaded
+github-contributors: saqimtiaz
+github-links: https://github.com/TiddlyWiki/TiddlyWiki5/pull/9050
+modified: 20260126113146914
+release: 5.4.0
+tags: $:/tags/ChangeNote
+title: $:/changenotes/5.4.0/#9050
+type: text/vnd.tiddlywiki
+
+Adds support to the image widget for optional actions that are invoked when an image has completed loading.

editions/tw5.com/tiddlers/releasenotes/5.4.0/#9097.tid

@@ -0,0 +1,13 @@
+change-category: internal
+change-type: enhancement
+created: 20260120153052332
+description: Adds a destroy method for widgets allowing for clean up of resources when a widget is removed.
+github-contributors: saqimtiaz
+github-links: https://github.com/TiddlyWiki/TiddlyWiki5/pull/9097
+modified: 20260125212701672
+release: 5.4.0
+tags: $:/tags/ChangeNote
+title: $:/changenotes/5.4.0/#9097
+type: text/vnd.tiddlywiki
+
+Adds a destroy method for widgets allowing for clean up of resources when a widget is removed.

editions/tw5.com/tiddlers/releasenotes/5.4.0/#9203.tid

@@ -0,0 +1,10 @@
+title: $:/changenotes/5.4.0/#9203
+description: Fix not provide content-type header in GET routes
+release: 5.4.0
+tags: $:/tags/ChangeNote
+change-type: bugfix
+change-category: nodejs
+github-links: https://github.com/TiddlyWiki/TiddlyWiki5/pull/9203
+github-contributors: linonetwo
+
+Fixed an issue which prevented plugins like the sitemap plugin from setting the correct MIME types (e.g., application/xml).

editions/tw5.com/tiddlers/releasenotes/5.4.0/#9214 - configure-edit-focus.tid

@@ -0,0 +1,12 @@
+change-category: usability
+change-type: bugfix
+created: 20260125065754439
+description: Allow title, tags, text as initial focus for editing existing tiddlers
+github-contributors: pmario
+github-links: https://github.com/TiddlyWiki/TiddlyWiki5/pull/9214
+modified: 20260125065921915
+release: 5.4.0
+tags: $:/tags/ChangeNote
+title: $:/changenotes/5.4.0/#9214
+type: text/vnd.tiddlywiki
+

editions/tw5.com/tiddlers/releasenotes/5.4.0/#9243.tid

@@ -4,5 +4,5 @@ release: 5.4.0
 tags: $:/tags/ChangeNote
 change-type: enhancement
 change-category: theme
-github-links: https://github.com/TiddlyWiki/TiddlyWiki5/pull/9243
+github-links: https://github.com/TiddlyWiki/TiddlyWiki5/pull/9243 https://github.com/TiddlyWiki/TiddlyWiki5/pull/9625
 github-contributors: Leilei332

editions/tw5.com/tiddlers/releasenotes/5.4.0/#9316.tid

@@ -4,7 +4,7 @@ release: 5.4.0
 tags: $:/tags/ChangeNote
 change-type: enhancement
 change-category: theme
-github-links: https://github.com/TiddlyWiki/TiddlyWiki5/pull/9316
+github-links: https://github.com/TiddlyWiki/TiddlyWiki5/pull/9316 https://github.com/TiddlyWiki/TiddlyWiki5/pull/9568
 github-contributors: Leilei332
 
 Replaces hardcoded `fill` attributes with one `fill: currentColor` rule to solve the compatibility issues of migrating to lucide icons.

editions/tw5.com/tiddlers/releasenotes/5.4.0/#9333.tid

@@ -0,0 +1,49 @@
+title: $:/changenotes/5.4.0/#9333
+description: Intergrate Tiddlywiki palette colors and settings to custom CSS properties
+release: 5.4.0
+tags: $:/tags/ChangeNote
+change-type: feature
+change-category: developer
+github-links: https://github.com/TiddlyWiki/TiddlyWiki5/pull/9333
+github-contributors: Leilei332
+
+Adds `--tpc-*` (for palettes colors) and `--tp-*` (for CSS settings) [[custom CSS properties|https://developer.mozilla.org/en-US/docs/Web/CSS/Reference/Properties/--*]] to allow writing stylesheets with vanilla CSS, for example:
+
+```
+/* Old way to get a palette color, which requires using wikitext */
+.tag {
+	background: <<colour tag-background>>;
+}
+```
+
+```css
+/* New way to get a palette color without wikitext */
+.tag {
+	background: var(--tp-color-tag-background);
+}
+```
+
+```
+/* Old way to get CSS settings with transclusion */
+.tc-sidebar-header {
+	padding: 14px;
+	min-height: 32px;
+	margin-top: {{$:/themes/tiddlywiki/vanilla/metrics/storytop}};
+	transition:  min-height {{$:/config/AnimationDuration}}ms ease-in-out, padding-top {{$:/config/AnimationDuration}}ms ease-in-out, padding-bottom {{$:/config/AnimationDuration}}ms ease-in-out;
+}
+```
+
+```css
+/* New way to get CSS settings */
+.tc-sidebar-header {
+	padding: 14px;
+	min-height: 32px;
+	margin-top: var(--tp-story-top);
+	transition: min-height var(--tp-animation-duration) ease-in-out, padding-top var(--tp-animation-duration) ease-in-out, padding-bottom var(--tp-animation-duration) ease-in-out;
+}
+```
+
+See:  
+
+* [[Writing stylesheets in vanilla CSS]] and [[Core CSS Variables]] for details.  
+* https://developer.mozilla.org/en-US/docs/Web/CSS/Reference/Values/var  

editions/tw5.com/tiddlers/releasenotes/5.4.0/#9548.tid

@@ -0,0 +1,10 @@
+title: $:/changenotes/5.4.0/#9548
+description: Better infinite transclude recursion handling
+release: 5.4.0
+tags: $:/tags/ChangeNote
+change-type: bugfix
+change-category: widget
+github-links: https://github.com/TiddlyWiki/TiddlyWiki5/pull/9458
+github-contributors: Flibbles
+
+Fixed issue where exceptions occurring during widget rendering could result in junk DOM nodes remaining in widget tree. This was very obvious when max recursion depth exceptions occurred.

editions/tw5.com/tiddlers/releasenotes/5.4.0/#9582.tid

@@ -0,0 +1,10 @@
+title: $:/changenotes/5.4.0/#9582
+description: Refactor code for EditTemplate fields
+release: 5.4.0
+tags: $:/tags/ChangeNote
+change-type: enhancement
+change-category: internal
+github-links: https://github.com/TiddlyWiki/TiddlyWiki5/pull/9582
+github-contributors: yaisog
+
+Refactored the EditTemplate fields.tid template to improve code maintainability and readability

editions/tw5.com/tiddlers/releasenotes/5.4.0/#9598.tid

@@ -0,0 +1,11 @@
+change-category: filters
+change-type: bugfix
+created: 20260120145005984
+description: Fixes a bug with the resolution of functions within the substitute operator, where the function did not have access to variables set in the filter run.
+github-contributors: saqimtiaz
+github-links: https://github.com/TiddlyWiki/TiddlyWiki5/pull/9598
+modified: 20260120145321774
+release: 5.4.0
+tags: 
+title: $:/changenotes/5.4.0/#9598
+type: text/vnd.tiddlywiki

editions/tw5.com/tiddlers/releasenotes/5.4.0/#9609.tid

@@ -0,0 +1,24 @@
+change-category: widget
+change-type: enhancement
+created: 20260125124838970
+description: adds support for pointer capture and enabling/disabling the widget
+github-contributors: saqimtiaz
+github-links: https://github.com/TiddlyWiki/TiddlyWiki5/pull/9609
+modified: 20260125202924515
+release: 5.4.0
+tags: $:/tags/ChangeNote
+title: $:/changenotes/5.4.0/#9609
+type: text/vnd.tiddlywiki
+
+The [[EventCatcher|EventCatcherWidget]] widget has been updated to provide:
+
+1. ''Optional Pointer Capture Support'' 
+   Adds native pointer capture handling to improve pointer event reliability and tracking outside the widget DOM nodes boundaries. When enabled, pointer events such as `pointermove`, `pointerup`, and `pointercancel` are correctly captured and routed to the widget, even if the pointer moves off-screen or outside the element.  
+   The pointer capture logic supports two modes of event listener attachment for better performance and control.
+
+2. ''Widget Enable/Disable Control''
+   Adds a new attribute to enable or disable the ~EventCatcher widget at runtime. This allows users to temporarily deactivate event handling without removing the widget or disrupting the DOM structure, enhancing flexibility for dynamic UIs.
+
+3. Access to event properties via the variable `eventJSON` in actions. 
+
+4. Deprecation of the error-prone event-detail* variables in favour of using the new `eventJSON` variable.

editions/tw5.com/tiddlers/releasenotes/5.4.0/#9609_impacts_event detail variables in eventcatcher.json

@@ -0,0 +1,13 @@
+[
+    {
+        "created": "20260125202948362",
+        "text": "",
+        "title": "$:/changenotes/5.4.0/#9609/impacts/event detail variables in eventcatcher",
+        "modified": "20260125203132149",
+        "tags": "$:/tags/ImpactNote",
+        "type": "text/vnd.tiddlywiki",
+        "changenote": "$:/changenotes/5.4.0/#9609",
+        "description": "`event-detail*` variables have been removed in favour of the new `eventJSON` variable",
+        "impact-type": "compatibility-break "
+    }
+]