Initial Commit

core/modules/commands/save.js

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

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

@@ -26,27 +26,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

@@ -26,27 +26,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/server/server.js

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

core/modules/startup/render.js

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

core/modules/startup/rootwidget.js

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

core/modules/startup/windows.js

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

core/modules/utils/dom/http.js

@@ -100,6 +100,10 @@ headers: hashmap of header name to header value to be sent with the request
 passwordHeaders: hashmap of header name to password store name to be sent with the request
 queryStrings: hashmap of query string parameter name to parameter value to be sent with the request
 passwordQueryStrings: hashmap of query string parameter name to password store name to be sent with the request
+basicAuthUsername: plain username for basic authentication
+basicAuthUsernameFromStore: name of password store entry containing username
+basicAuthPassword: plain password for basic authentication
+basicAuthPasswordFromStore: name of password store entry containing password
 */
 function HttpClientRequest(options) {
 	var self = this;
@@ -128,6 +132,11 @@ function HttpClientRequest(options) {
 	$tw.utils.each(options.passwordHeaders,function(value,name) {
 		self.requestHeaders[name] = $tw.utils.getPassword(value) || "";
 	});
+	this.basicAuthUsername = options.basicAuthUsername || (options.basicAuthUsernameFromStore && $tw.utils.getPassword(options.basicAuthUsernameFromStore)) || "";
+	this.basicAuthPassword = options.basicAuthPassword || (options.basicAuthPasswordFromStore && $tw.utils.getPassword(options.basicAuthPasswordFromStore)) || "";
+	if(this.basicAuthUsername && this.basicAuthPassword) {
+		this.requestHeaders.Authorization = "Basic " + $tw.utils.base64Encode(this.basicAuthUsername + ":" + this.basicAuthPassword);
+	}
 }
 
 HttpClientRequest.prototype.send = function(callback) {

core/modules/utils/filesystem.js

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

core/modules/widgets/action-deletefield.js

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

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

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

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

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

core/templates/save-all.tid

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

core/templates/save-empty.tid

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

core/templates/save-lazy-all.tid

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

core/templates/save-lazy-images.tid

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

core/ui/KeyboardShortcuts/refresh.tid

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

core/ui/PageControls.tid

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

core/wiki/config/ShortcutInfo.multids

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

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

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

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

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

core/wiki/macros/tag-picker.tid

@@ -1,182 +1,167 @@
 title: $:/core/macros/tag-picker
-tags: tags: $:/tags/Macro $:/tags/Global
-first-search-filter: [subfilter<tagListFilter>!is[system]search:title<userInput>sort[]]
-second-search-filter: [subfilter<tagListFilter>is[system]search:title<userInput>sort[]]
+tags: $:/tags/Macro $:/tags/Global
+first-search-filter: [tags[]!is[system]search:title<userInput>sort[]]
+second-search-filter: [tags[]is[system]search:title<userInput>sort[]]
 
-<!-- first-search-filter and second-search-filter fields are not used here in the code, but they are defined as parameters for keyboard-driven-input macro -->
-
-\whitespace trim
-
-<!-- tf.tagpicker-dropdown-id is needed if several tap-pickers are shown in one tiddler -->
-\function tf.tagpicker-dropdown-id()
-	[<qualify $:/state/popup/tags-auto-complete>]
-	[[$(saveTiddler)$-[$(tagField)$-$(tagListFilter)$]substitute[]sha256[]] +[join[/]]
+\procedure get-tagpicker-focus-selector()
+\function currentTiddlerCSSEscaped() [<saveTiddler>escapecss[]]
+[data-tiddler-title=`$(currentTiddlerCSSEscaped)$`] .tc-add-tag-name input
 \end
 
-\function tf.tagpicker-dropdown-class() [<tf.tagpicker-dropdown-id>sha256[]addprefix[tc-]]
-\function tf.get-tagpicker-focus-selector() [<tf.tagpicker-dropdown-class>addprefix[.]] .tc-popup-handle +[join[ ]]
+\procedure delete-tag-state-tiddlers() <$action-deletetiddler $filter="[<newTagNameTiddler>] [<storeTitle>] [<tagSelectionState>]"/>
 
-<!-- clean up temporary tiddlers, so the next "pick" starts with a clean input -->
-<!-- This could probably be optimized / removed if we would use different temp-tiddlers
-	(future improvement because keeping track is comlex for humans)
--->
-\procedure delete-tag-state-tiddlers()
-<$action-deletetiddler $filter="[<newTagNameTiddler>] [<storeTitle>] [<tagSelectionState>]"/>
-\end
-
-<!-- trigger __toggle tag__ by keyboard -->
 \procedure add-tag-actions()
-<$let tag=<<_tf.getTag>> >
-	<$action-listops $tiddler=<<saveTiddler>> $field=<<tagField>> $subfilter='+[toggle<tag>trim[]]'/>
-	<% if [<tag>] :intersection[<saveTiddler>get<tagField>enlist-input[]] %>
-		<!-- tag has been removed - do nothing -->
-	<% else %>
-		<<actions>>
-	<% endif %>
-	<<delete-tag-state-tiddlers>>
-	<$action-setfield $tiddler=<<refreshTitle>> text="yes"/>
+\whitespace trim
+<$let tag=<<tag>>>
+<$action-listops $tiddler=<<saveTiddler>> $field=<<tagField>> $subfilter='+[toggle<tag>trim[]]'/>
+<$list
+	filter="[<tag>] :intersection[<saveTiddler>get<tagField>enlist-input[]]"
+	variable="ignore"
+	emptyMessage="<<actions>>"
+/>
 </$let>
+<<delete-tag-state-tiddlers>>
+<$action-setfield $tiddler=<<refreshTitle>> text="yes"/>
 \end
-<!-- <$action-log  /> -->
 
-<!-- ESC key removes the text from the input
-The second ESC tries to close the "draft tiddler"
--->
 \procedure clear-tags-actions-inner()
-<% if [<storeTitle>has[text]] ~[<newTagNameTiddler>has[text]] %>
+\whitespace trim
+<$list
+	filter="[<storeTitle>has[text]] ~[<newTagNameTiddler>has[text]]"
+	variable="ignore"
+	emptyMessage="<<cancel-delete-tiddler-actions 'cancel'>>"
+>
 	<<delete-tag-state-tiddlers>>
-<% else %>
-		<<cancel-delete-tiddler-actions "cancel">>
-<% endif %>
+</$list>
 \end
 
-<!-- triggered by keyboard only -->
 \procedure clear-tags-actions()
-<$let userInput=<<_tf.getUserInput>> >
-	<!-- this list __cannot__ be transformed to conditional IF. The list variable is used! -->
-	<$list filter="[<newTagNameTiddler>get[text]!match<userInput>]" >
-		<$list-empty>
-			<<clear-tags-actions-inner>>
-		</$list-empty>
+\whitespace trim
+<$let userInput=<<userInput>>>
+	<$list
+		filter="[<newTagNameTiddler>get[text]!match<userInput>]"
+		emptyMessage="<<clear-tags-actions-inner>>"
+	>
 		<$action-setfield $tiddler=<<newTagNameTiddler>> text=<<userInput>>/>
 		<$action-setfield $tiddler=<<refreshTitle>> text="yes"/>
 	</$list>
 </$let>
 \end
 
-<!-- similar to add-tag-actions __but__ add-only -->
 \procedure add-button-actions()
 <$action-listops $tiddler=<<saveTiddler>> $field=<<tagField>> $subfilter="[<tag>trim[]]"/>
 <<actions>>
 <<delete-tag-state-tiddlers>>
-<$action-sendmessage $message="tm-focus-selector" $param=<<tf.get-tagpicker-focus-selector>>/>
-\end
-<!-- <$action-log /> -->
-
-<!-- create dropdown list -->
-\procedure tag-picker-listTags(filter, suffix)
-<$let userInput=<<_tf.getUserInput>> >
-	<$list filter="[<userInput>minlength{$:/config/Tags/MinLength}limit[1]]"
-		emptyMessage="<div class='tc-search-results'>{{$:/language/Search/Search/TooShort}}</div>" variable="listItem"
-	>
-		<$list filter=<<filter>> variable="tag">
-			<!-- The buttonClasses filter is used to define tc-tag-button-selected state -->
-			<!-- tf.get-tagpicker-focus-selector has to be resolved for $:/core/ui/TagPickerTagTemplate,
-				othwerwise qualify in tf.tagpicker-dropdown-id causes problems -->
-			<$let currentTiddler=<<tag>>
-				button-classes=`tc-btn-invisible ${[<tag>addsuffix<suffix>] -[<tagSelectionState>get[text]] :then[[]] ~tc-tag-button-selected }$`
-				get-tagpicker-focus-selector=`${[<tf.get-tagpicker-focus-selector>]}$`
-			>
-				{{||$:/core/ui/TagPickerTagTemplate}}
-			</$let>
-		</$list>
-	</$list>
-</$let>
+<$action-sendmessage $message="tm-focus-selector" $param=<<get-tagpicker-focus-selector>>/>
 \end
 
-<!-- tag-picker-inner is the main function -->
-\procedure tag-picker-inner()
-<div class={{{ [[tc-edit-add-tag]] [<tf.tagpicker-dropdown-class>] +[join[ ]] }}}>
-	<div class="tc-edit-add-tag-ui">
-		<span class="tc-add-tag-name tc-small-gap-right">
-			<$macrocall	$name="keyboard-driven-input"
-				tiddler=<<newTagNameTiddler>>
-				storeTitle=<<storeTitle>>
-				refreshTitle=<<refreshTitle>>
-				selectionStateTitle=<<tagSelectionState>>
-				inputAcceptActions=<<add-tag-actions>>
-				inputCancelActions=<<clear-tags-actions>>
-				tag="input"
-				placeholder={{$:/language/EditTemplate/Tags/Add/Placeholder}}
-				focusPopup=<<tf.tagpicker-dropdown-id>>
-				class="tc-edit-texteditor tc-popup-handle"
-				tabindex=<<tabIndex>>
-				focus={{{ [{$:/config/AutoFocus}match[tags]then[true]] ~[[false]] }}}
-				filterMinLength={{$:/config/Tags/MinLength}}
-				cancelPopups=<<cancelPopups>>
-				configTiddlerFilter="[[$:/core/macros/tag-picker]]"
-			/>
-		</span>
-		<$button popup=<<tf.tagpicker-dropdown-id>> class="tc-btn-invisible tc-btn-dropdown"
-			tooltip={{$:/language/EditTemplate/Tags/Dropdown/Hint}} aria-label={{$:/language/EditTemplate/Tags/Dropdown/Caption}}
+\procedure list-tags(filter, suffix)
+\whitespace trim
+<$list
+	filter="[<userInput>minlength{$:/config/Tags/MinLength}limit[1]]"
+	emptyMessage="<div class='tc-search-results'>{{$:/language/Search/Search/TooShort}}</div>" variable="listItem"
+>
+	<$list filter=<<filter>> variable="tag">
+		<$let
+			button-classes=`tc-btn-invisible ${ [<tag>addsuffix<suffix>] -[<tagSelectionState>get[text]] :then[[]] ~tc-tag-button-selected }$`
+			currentTiddler=<<tag>>
 		>
-			{{$:/core/images/down-arrow}}
-		</$button>
-		<% if [<storeTitle>has[text]] %>
-			<$button actions=<<delete-tag-state-tiddlers>> class="tc-btn-invisible tc-small-gap tc-btn-dropdown"
-				tooltip={{$:/language/EditTemplate/Tags/ClearInput/Hint}} aria-label={{$:/language/EditTemplate/Tags/ClearInput/Caption}}
-			>
-				{{$:/core/images/close-button}}
-			</$button>
-		<% endif %>
-		<span class="tc-add-tag-button tc-small-gap-left">
-			<$let tag=<<_tf.getTag>>>
-				<$button set=<<newTagNameTiddler>> actions=<<add-button-actions>> >
-					{{$:/language/EditTemplate/Tags/Add/Button}}
-				</$button>
-			</$let>
-		</span>
-	</div>
-	<div class="tc-block-dropdown-wrapper">
-		<% if [<tf.tagpicker-dropdown-id>has[text]] %>
-			<div class="tc-block-dropdown tc-block-tags-dropdown">
-				<$macrocall $name="tag-picker-listTags" filter=<<nonSystemTagsFilter>> suffix="-primaryList" />
-				<hr>
-				<$macrocall $name="tag-picker-listTags" filter=<<systemTagsFilter>> suffix="-secondaryList" />
-			</div>
-		<% endif %>
-	</div>
-</div>
+			{{||$:/core/ui/TagPickerTagTemplate}}
+		</$let>
+	</$list>
+</$list>
 \end
 
-<!-- prepare all variables for tag-picker keyboard handling -->
-\procedure tag-picker(actions, tagField:"tags", tiddler, tagListFilter:"[tags[]]")
-
-\function _tf.getUserInput() [<storeTitle>get[text]]
-\function _tf.getTag() [<newTagNameTiddler>get[text]]
-
-<!-- keep those variables because they may "blead" into macros using old syntax -->
+\procedure tag-picker-inner()
+\whitespace trim
 <$let
-	palette={{$:/palette}}
+	newTagNameInputTiddlerQualified=<<qualify "$:/temp/NewTagName/input">>
+	newTagNameSelectionTiddlerQualified=<<qualify "$:/temp/NewTagName/selected-item">>
+	fallbackTarget={{{ [<palette>getindex[tag-background]] }}}
 	colourA={{{ [<palette>getindex[foreground]] }}}
 	colourB={{{ [<palette>getindex[background]] }}}
-	fallbackTarget={{{ [<palette>getindex[tag-background]] }}}
 
-	saveTiddler={{{ [<tiddler>is[blank]then<currentTiddler>else<tiddler>] }}}
-
-	newTagNameTiddler={{{ [[$:/temp/NewTagName]] [<tagField>!match[tags]] +[join[/]] [<qualify>] +[join[]] }}}
-	storeTitle={{{ [[$:/temp/NewTagName/input]] [<tagField>!match[tags]] +[join[/]] [<qualify>] +[join[]] }}}
-
-	newTagNameSelectionTiddlerQualified=<<qualify "$:/temp/NewTagName/selected-item">>
+	storeTitle={{{ [<newTagNameInputTiddler>!match[]] ~[<newTagNameInputTiddlerQualified>] }}}
 	tagSelectionState={{{ [<newTagNameSelectionTiddler>!match[]] ~[<newTagNameSelectionTiddlerQualified>] }}}
+	tagAutoComplete=<<qualify "$:/state/popup/tags-auto-complete">>
 
-	refreshTitle=<<qualify "$:/temp/NewTagName/refresh">>
-
-	nonSystemTagsFilter="[subfilter<tagListFilter>!is[system]search:title<userInput>sort[]]"
-	systemTagsFilter="[subfilter<tagListFilter>is[system]search:title<userInput>sort[]]"
-
-	cancelPopups="yes"
+	refreshTitle=<<qualify "$:/temp/NewTagName/refresh">> 
+	nonSystemTagsFilter="[tags[]!is[system]search:title<userInput>sort[]]"
+	systemTagsFilter="[tags[]is[system]search:title<userInput>sort[]]"
 >
-	<$macrocall $name="tag-picker-inner"/>
+	<div class="tc-edit-add-tag">
+		<div>
+			<span class="tc-add-tag-name tc-small-gap-right">
+				<$transclude
+					$variable="keyboard-driven-input"
+					tiddler=<<newTagNameTiddler>>
+					storeTitle=<<storeTitle>>
+					refreshTitle=<<refreshTitle>>
+					selectionStateTitle=<<tagSelectionState>>
+					inputAcceptActions=<<add-tag-actions>>
+					inputCancelActions=<<clear-tags-actions>>
+					tag="input"
+					placeholder={{$:/language/EditTemplate/Tags/Add/Placeholder}}
+					focusPopup=<<tagAutoComplete>>
+					class="tc-edit-texteditor tc-popup-handle"
+					tabindex=<<tabIndex>>
+					focus={{{ [{$:/config/AutoFocus}match[tags]then[true]] ~[[false]] }}}
+					filterMinLength={{$:/config/Tags/MinLength}}
+					cancelPopups=<<cancelPopups>>
+					configTiddlerFilter="[[$:/core/macros/tag-picker]]"
+				/>
+			</span>
+			<$button popup=<<tagAutoComplete>> 
+				class="tc-btn-invisible tc-btn-dropdown"
+				tooltip={{$:/language/EditTemplate/Tags/Dropdown/Hint}}
+				aria-label={{$:/language/EditTemplate/Tags/Dropdown/Caption}}
+			>
+				{{$:/core/images/down-arrow}}
+			</$button>
+			<$reveal state=<<storeTitle>> type="nomatch" text="">
+				<$button actions=<<delete-tag-state-tiddlers>>
+					class="tc-btn-invisible tc-small-gap tc-btn-dropdown"
+					tooltip={{$:/language/EditTemplate/Tags/ClearInput/Hint}}
+					aria-label={{$:/language/EditTemplate/Tags/ClearInput/Caption}}
+				>
+					{{$:/core/images/close-button}}
+				</$button>
+			</$reveal>
+			<span class="tc-add-tag-button tc-small-gap-left">
+				<$let tag=<<tag>>>
+					<$button set=<<newTagNameTiddler>> setTo=""
+						actions=<<add-button-actions>>
+					>
+						{{$:/language/EditTemplate/Tags/Add/Button}}
+					</$button>
+				</$let>
+			</span>
+		</div>
+		<div class="tc-block-dropdown-wrapper">
+			<$reveal state=<<tagAutoComplete>> type="nomatch" text="">
+				<div class="tc-block-dropdown tc-block-tags-dropdown">
+					<$let userInput=<<userInput>>>
+						<$transclude $variable="list-tags" filter=<<nonSystemTagsFilter>> suffix="-primaryList" />
+						<hr>
+						<$transclude $variable="list-tags" filter=<<systemTagsFilter>> suffix="-secondaryList" />
+					</$let>
+				</div>
+			</$reveal>
+		</div>
+	</div>
 </$let>
-\end
+\end
+
+\procedure tag-picker(actions, tagField:"tags")
+\function userInput() [<storeTitle>get[text]]
+\function tag() [<newTagNameTiddler>get[text]]
+\whitespace trim
+<$let
+	saveTiddler=<<currentTiddler>>
+	palette={{$:/palette}}
+	qualified=<<qualify "$:/temp/NewTagName">>
+	newTagNameTiddler={{{ [<newTagNameTiddler>!match[]] ~[<qualified>] }}}
+>
+	<$transclude $variable="tag-picker-inner" />
+</$let>
+\end

core/wiki/macros/tag.tid

@@ -21,9 +21,7 @@ color:$(foregroundColor)$;
 >
 	<<__actions__>>
 	<$transclude tiddler=<<__icon__>>/>
-	<span class={{{ [<__tag__>is[missing]then[tc-tag-missing]else[tc-tag-exists]] }}}>
-		<$view tiddler=<<__tag__>> field="title" format="text" />
-	</span>
+	<$view tiddler=<<__tag__>> field="title" format="text" />
 </$element-tag$>
 </$let>
 \end

editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid

@@ -13,5 +13,4 @@ The pre-release is also available as an [[empty wiki|https://tiddlywiki.com/prer
 </div>
 <div class="tc-subtitle">Updated: <$view field="modified" format="date" template={{$:/language/Tiddler/DateFormat}}/></div>
 <$transclude mode="block"/>
-
 </$list>

editions/test/tiddlers/tests/data/macros/unusedtitle/basic-params-draft-exists.tid

@@ -1,27 +0,0 @@
-title: Macros/unusedtitle/basic-draft-exists
-description: test <<unusedtitle>> with basic macro parameters but they are empty
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-title: Draft of 'test'
-draft.of: test
-draft.title: test
-
-+
-title: Draft of 'asdf 0'
-draft.of: asdf 0
-draft.title: asdf 0
-
-+
-title: Output
-
-<!-- hanled in wiki.js -->
-<<unusedtitle baseName:"test">>
-
-<!-- handled in unusedtitle.js -->
-<<unusedtitle baseName:"asdf" separator:" " template:"$basename$$separator$$count:1$">>
-
-+
-title: ExpectedResult
-
-<p>test 1</p><p>asdf 1</p>

editions/test/tiddlers/tests/data/macros/unusedtitle/basic-params-empty-tiddler-exists.tid

@@ -1,23 +0,0 @@
-title: Macros/unusedtitle/basic-params-empty-tiddler-exists
-description: test <<unusedtitle>> with basic macro parameters but they are empty
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-title: New Tiddler
-
-+
-title: Output
-
-<!-- hanled in wiki.js -->
-<<unusedtitle separator:"">>
-
-<!-- handled in unusedtitle.js -->
-<<unusedtitle baseName:"">>
-
-<!-- handled in wiki.js -->
-<<unusedtitle template:"">>
-
-+
-title: ExpectedResult
-
-<p>New Tiddler 1</p><p>New Tiddler 1</p><p>New Tiddler 1</p>

editions/test/tiddlers/tests/data/macros/unusedtitle/basic-params-empty.tid

@@ -1,20 +0,0 @@
-title: Macros/unusedtitle/basic-params-empty
-description: test <<unusedtitle>> with basic macro parameters but they are empty
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-title: Output
-
-<!-- hanled in wiki.js -->
-<<unusedtitle separator:"">>
-
-<!-- handled in unusedtitle.js -->
-<<unusedtitle baseName:"">>
-
-<!-- handled in wiki.js -->
-<<unusedtitle template:"">>
-
-+
-title: ExpectedResult
-
-<p>New Tiddler</p><p>New Tiddler</p><p>New Tiddler</p>

editions/test/tiddlers/tests/data/macros/unusedtitle/basic-params-tiddlers-exist.tid

@@ -1,28 +0,0 @@
-title: Macros/unusedtitle/basic-params-tiddlers-exist
-description: test <<unusedtitle>> with basic macro parameters, where new-name tiddlers already exist
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-title: New Tiddler
-
-+
-title: anotherBase
-
-+
-title: About
-
-+
-title: Output
-
-<<unusedtitle>>
-
-<<unusedtitle separator:"-">>
-
-<<unusedtitle baseName:"anotherBase">>
-
-<<unusedtitle baseName:"About" separator:"-">>
-
-+
-title: ExpectedResult
-
-<p>New Tiddler 1</p><p>New Tiddler-1</p><p>anotherBase 1</p><p>About-1</p>

editions/test/tiddlers/tests/data/macros/unusedtitle/basic-params.tid

@@ -1,20 +0,0 @@
-title: Macros/unusedtitle/basic-params
-description: test <<unusedtitle>> with basic macro parameters
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-title: Output
-
-<<unusedtitle>>
-
-<!-- EDGECASE: separator is ignored if tiddler title does not exist -->
-<<unusedtitle separator:"-">>
-
-<<unusedtitle baseName:"anotherBase">>
-
-<<unusedtitle baseName:"About" separator:"-">>
-
-+
-title: ExpectedResult
-
-<p>New Tiddler</p><p>New Tiddler</p><p>anotherBase</p><p>About</p>

editions/test/tiddlers/tests/data/macros/unusedtitle/template-empty-params-tiddler-exist.tid

@@ -1,50 +0,0 @@
-title: Macros/unusedtitle/template-empty-params-tiddler-exist
-description: test <<unusedtitle>> with templates where parameters are empty
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-title: New Tiddler
-
-+
-title: xxx
-
-+
-title: 00-New Tiddler
-
-+
-title: 0000 asdf
-
-+
-title: 0001 asdf
-
-+
-title: 0000 abc
-
-+
-title: Output
-
-<!-- empty template - no template handling at all -->
-<<unusedtitle template:"">>
-
-<!--
-	uses basename AND separator if tiddler exists
-	because it uses default naming build rules - no template handling
--->
-<<unusedtitle template:"" separator:"-y-" baseName:"xxx">>
-
-<<unusedtitle baseName:"" template:"$count:2$-$basename$">>
-
-<!-- 
-	EDGECASE: if separator is empty it will be initialized with a single space " "
-	to have the same rules for templates and default title creation
--->
-<<unusedtitle baseName:"asdf" separator:"" template:"$count:4$$separator$$basename$">>
-
-<!-- separator = " " -->
-<<unusedtitle baseName:"abc" separator:" " template:"$count:4$$separator$$basename$">>
-
-
-+
-title: ExpectedResult
-
-<p>New Tiddler 1</p><p>xxx-y-1</p><p>01-New Tiddler</p><p>0002 asdf</p><p>0001 abc</p>

editions/test/tiddlers/tests/data/macros/unusedtitle/template-empty-params.tid

@@ -1,24 +0,0 @@
-title: Macros/unusedtitle/template-empty-params
-description: test <<unusedtitle>> with templates where parameters are empty
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-title: Output
-
-<!-- empty template -->
-<<unusedtitle template:"">>
-
-<!--
-	uses basename but ignores separator,
-	because it uses default naming build rules -- no template handling is active
--->
-<<unusedtitle template:"" separator:"-x-" baseName:"xxx">>
-
-<<unusedtitle baseName:"" template:"$count:2$-$basename$">>
-
-<<unusedtitle baseName:"asdf" separator:"" template:"$count:4$$separator$$basename$">>
-
-+
-title: ExpectedResult
-
-<p>New Tiddler</p><p>xxx</p><p>00-New Tiddler</p><p>0000 asdf</p>

editions/test/tiddlers/tests/data/macros/unusedtitle/template.tid

@@ -1,28 +0,0 @@
-title: Macros/unusedtitle/template
-description: test <<unusedtitle>> with templates
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-title: Output
-
-<!-- empty template - standard rules are used -->
-<<unusedtitle template:"">>
-
-<<unusedtitle template:"count-missing">>
-
-<<unusedtitle template:"$count:2$-new">>
-
-<!-- template is handled using $tw.utils.formatTitleString -->
-<<unusedtitle baseName:"base" template:"$count:2$-$basename$">>
-
-<<unusedtitle baseName:"" template:"$count:2$-$basename$">>
-
-<!-- UPPERCASES are intentional in template strings. They should be case-insensistive -->
-<<unusedtitle baseName:"asdf" separator:"-" template:"$coUNT:2$$sepaRATor$$baseName$">>
-
-<<unusedtitle baseName:"asdf" separator:"" template:"$count:2$$separator$$basename$">>
-
-+
-title: ExpectedResult
-
-<p>New Tiddler</p><p>count-missing</p><p>00-new</p><p>00-base</p><p>00-New Tiddler</p><p>00-asdf</p><p>00 asdf</p>

editions/test/tiddlers/tests/test-action-deletefield.js

@@ -1,176 +0,0 @@
-/*\
-title: test-action-deletefield.js
-type: application/javascript
-tags: [[$:/tags/test-spec]]
-
-Tests <$action-deletefield />.
-
-\*/
-(function(){
-
-/* jslint node: true, browser: true */
-/* eslint-env node, browser, jasmine */
-/* eslint no-mixed-spaces-and-tabs: ["error", "smart-tabs"]*/
-/* global $tw, require */
-"use strict";
-
-describe("<$action-deletefield /> tests", function() {
-
-const TEST_TIDDLER_TITLE = "TargetTiddler";
-const TEST_TIDDLER_MODIFIED = "20240313114828368";
-
-function setupWiki(condition, targetField, wikiOptions) {
-	// Create a wiki
-	var wiki = new $tw.Wiki({});
-	var tiddlers = [{
-		title: "Root",
-		text: "Some dummy content"
-	}];
-	var tiddler;
-	if(condition.targetTiddlerExists) {
-		var fields = {
-			title: TEST_TIDDLER_TITLE,
-		};
-		if(condition.modifiedFieldExists) {
-			fields.modified = TEST_TIDDLER_MODIFIED;
-		}
-		if(condition.targetFieldExists) {
-			fields[targetField] = "some text";
-		}
-		var tiddler = new $tw.Tiddler(fields);
-		tiddlers.push(tiddler);
-	}
-	wiki.addTiddlers(tiddlers);
-	wiki.addIndexersToWiki();
-	var widgetNode = wiki.makeTranscludeWidget("Root",{document: $tw.fakeDocument, parseAsInline: true});
-	var container = $tw.fakeDocument.createElement("div");
-	widgetNode.render(container,null);
-	return {
-		wiki: wiki,
-		widgetNode: widgetNode,
-		contaienr: container,
-		tiddler: tiddler,
-	};
-}
-
-function generateTestConditions() {
-	var conditions = [];
-
-	$tw.utils.each([true, false], function(tiddlerArgumentIsPresent) {
-		$tw.utils.each([true, false], function(targetTiddlerExists) {
-			$tw.utils.each([true, false], function(targetFieldExists) {
-				$tw.utils.each([true, false], function(fieldArgumentIsUsed) {
-					$tw.utils.each([true, false], function(modifiedFieldExists) {
-						$tw.utils.each(["", "yes", "no"], function(timestampArgument) {
-							conditions.push({
-								tiddlerArgumentIsPresent: tiddlerArgumentIsPresent,
-								targetTiddlerExists: targetTiddlerExists,
-								targetFieldExists: targetFieldExists,
-								fieldArgumentIsUsed: fieldArgumentIsUsed,
-								modifiedFieldExists: modifiedFieldExists,
-								timestampArgument: timestampArgument,
-							});
-						});
-					});
-				});
-			});
-		});
-	});
-
-	return conditions;
-}
-
-function generateActionWikitext(condition, targetField) {
-	var actionPieces = [
-		"<$action-deletefield",
-		(condition.tiddlerArgumentIsPresent ? "$tiddler='" + TEST_TIDDLER_TITLE + "'" : ""),
-		(condition.fieldArgumentIsUsed ? "$field='" + targetField + "'" : targetField),
-		(condition.timestampArgument !== "" ? "$timestamp='" + condition.timestampArgument + "'" : ""),
-		"/>",
-	];
-
-	return actionPieces.join(" ");
-}
-
-function generateTestContext(action, tiddler) {
-	var expectationContext = "action: " + action + "\ntiddler:\n\n";
-	if(tiddler) {
-		expectationContext += tiddler.getFieldStringBlock({exclude: ["text"]});
-		if(tiddler.text) {
-			expectationContext += "\n\n" + tiddler.text;
-		}
-		expectationContext += "\n\n";
-	} else {
-		expectationContext += "null";
-	}
-
-	return expectationContext;
-}
-
-it("should correctly delete fields", function() {
-	var fields = ['caption', 'description', 'text'];
-
-	var conditions = generateTestConditions();
-
-	$tw.utils.each(conditions, function(condition) {
-		$tw.utils.each(fields, function(field) {
-			var info = setupWiki(condition, field);
-			var originalTiddler = info.tiddler;
-
-			var invokeActions = function(actions) {
-				info.widgetNode.invokeActionString(actions,info.widgetNode,null,{
-					currentTiddler: TEST_TIDDLER_TITLE,
-				});
-			};
-
-			var action = generateActionWikitext(condition,field);
-
-			invokeActions(action);
-
-			var testContext = generateTestContext(action,originalTiddler);
-
-			var tiddler = info.wiki.getTiddler(TEST_TIDDLER_TITLE);
-			if(originalTiddler) {
-				// assert that the tiddler doesn't have the target field anymore
-				expect(tiddler.hasField(field)).withContext(testContext).toBeFalsy();
-
-				var targetFieldWasPresent = originalTiddler.hasField(field);
-				var updateTimestamps = condition.timestampArgument !== "no";
-
-				// "created" should exist if it did beforehand, or if the tiddler changed and we asked the widget to update timestamps
-				var createdFieldShouldExist = originalTiddler.hasField("created") || (targetFieldWasPresent && updateTimestamps);
-
-				// "created" should change only if it didn't exist beforehand and the tiddler changed and we asked the widget to update timestamps
-				var createdFieldShouldChange = !originalTiddler.hasField("created") && (targetFieldWasPresent && updateTimestamps);
-
-				// "modified" should exist if it did beforehand, or if the tiddler changed and we asked the widget to update timestamps
-				var modifiedFieldShouldExist = originalTiddler.hasField("modified") || (targetFieldWasPresent && updateTimestamps);
-
-				// "modified" should change if the tiddler changed and we asked the widget to update timestamps
-				var modifiedFieldShouldChange = targetFieldWasPresent && updateTimestamps;
-
-				expect(tiddler.hasField("created")).withContext(testContext).toBe(createdFieldShouldExist);
-				expect(tiddler.hasField("modified")).withContext(testContext).toBe(modifiedFieldShouldExist);
-
-				if(createdFieldShouldChange) {
-					expect(tiddler.fields.created).withContext(testContext).not.toEqual(originalTiddler.fields.created);
-				} else {
-					expect(tiddler.fields.created).withContext(testContext).toEqual(originalTiddler.fields.created);
-				}
-
-				if(modifiedFieldShouldChange) {
-					expect(tiddler.fields.modified).withContext(testContext).not.toEqual(originalTiddler.fields.modified);
-				} else {
-					expect(tiddler.fields.modified).withContext(testContext).toEqual(originalTiddler.fields.modified);
-				}
-			} else {
-				// assert that the tiddler didn't get created if it didn't exist already
-				expect(tiddler).withContext(testContext).toBeUndefined();
-			}
-		});
-	});
-});
-
-});
-
-})();

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

@@ -1,6 +1,6 @@
 caption: tag
 created: 20141206130540337
-modified: 20240228131301798
+modified: 20230725201240201
 tags: Macros [[Core Macros]]
 title: tag Macro
 type: text/vnd.tiddlywiki
@@ -11,35 +11,7 @@ The <<.def tag>> [[macro|Macros]] generates a tag pill for a specified tag. Clic
 
 !! Parameters
 
-; tag
+;tag
 : The title of the tag, defaulting to the [[current tiddler|Current Tiddler]]
 
-!! CSS classes
-
-<<.from-version "v5.3.4">>
-
-; `tc-tag-missing`
-: This class is defined if a tag does ''not exist'' as a tiddler.
-
-; `tc-tag-exists`
-: This class is defined if a tag does exist as a tiddler
-
-!!! Defining the class
-
-To define the `tc-tag-missing` class a stylesheet tiddler needs to be created. The default font-style for missing tiddler links is //italic//, so it's used for the example code below. Eg:
-
-''title:'' `myTagsStylesheet`<br>
-''tag:'' `$:/tags/Stylesheet`
-
-<<copy-to-clipboard-above-right src:"""
-.tc-tag-missing {
-	font-style: italic;
-}
-""">>
-```
-.tc-tag-missing {
-	font-style: italic;
-}
-```
-
 <<.macro-examples "tag">>

editions/tw5.com/tiddlers/macros/examples/tag.tid

@@ -1,5 +1,5 @@
 created: 20150221211317000
-modified: 20240228131331605
+modified: 20230725203751870
 tags: [[tag Macro]] [[Macro Examples]]
 title: tag Macro (Examples)
 type: text/vnd.tiddlywiki
@@ -7,26 +7,22 @@ type: text/vnd.tiddlywiki
 <$macrocall $name=".example" n="1" eg="""<<tag>>"""/>
 <$macrocall $name=".example" n="2" eg="""<<tag Concepts>>"""/>
 
-The Following tag can be shown with a font-style: //italic// if the corresponding stylesheet exists. See: [[tag Macro]]
-
-<$macrocall $name=".example" n="3" eg="""<<tag "Does not exist">>"""/>
-
 If a [[list widget|ListWidget]] generates multiple tag macros for the same tag, clicking any of them opens dropdowns on all of them, as in the example below. This is usually unwanted.
-<$macrocall $name=".example" n="4" eg="""<$list filter="[tag[HelloThere]]">
+<$macrocall $name=".example" n="3" eg="""<$list filter="[tag[HelloThere]]">
 
 * <$link/> is tagged with: <$list filter="[<currentTiddler>tags[]]"> <<tag>> </$list>
 
 </$list>"""/>
 
 Adding the `counter="transclusion"` attribute to the list widget that generates multiple identical tag macros causes each of them to be identified as a unique one. Clicking on any of them opens only a single dropdown.
-<$macrocall $name=".example" n="5" eg="""<$list filter="[tag[HelloThere]]" counter="transclusion">
+<$macrocall $name=".example" n="4" eg="""<$list filter="[tag[HelloThere]]" counter="transclusion">
 
 * <$link/> is tagged with: <$list filter="[<currentTiddler>tags[]]"> <<tag>> </$list>
 
 </$list>"""/>
 
 A slightly more performant option is to use the `variable="transclusion"` attribute in the list widget. In this case, the variable `<<transclusion>>` has to be used inside the list widget instead of the `<<currentTiddler>>` .
-<$macrocall $name=".example" n="6" eg="""<$list filter="[tag[HelloThere]]" variable="transclusion">
+<$macrocall $name=".example" n="5" eg="""<$list filter="[tag[HelloThere]]" variable="transclusion">
 
 * <$link to=<<transclusion>>/> is tagged with: <$list filter="[<transclusion>tags[]]"> <<tag>> </$list>
 

editions/tw5.com/tiddlers/macros/tag-picker_Macro.tid

@@ -1,6 +1,6 @@
 caption: tag-picker
 created: 20161128191316701
-modified: 20230616114543787
+modified: 20161128191435641
 tags: Macros [[Core Macros]]
 title: tag-picker Macro
 type: text/vnd.tiddlywiki
@@ -9,17 +9,9 @@ The <<.def tag-picker>> [[macro|Macros]] generates a combination of a text box a
 
 !! Parameters
 
-; actions
-: Action widgets to be triggered when the pill is clicked. Within the text, the variable <<.var tag>> contains the title of the selected tag.
-
-; tagField
-: <<.from-version 5.1.23>> The specified ''field'' that gets updated with the selected tag. Defaults to `tags`.
-
-; tiddler
-: <<.from-version 5.3.4>> Defines the target tiddler, which should be manipulated. Defaults to: <<.var currentTiddler>>.
-
-; tagListFilter
-: <<.from-version 5.3.4>> This parameter defaults to: `[tags[]]` which creates a list of all existing tags. If the tag list should come from a different source the filter should look similar to eg: `[<listSource>get[field-name]enlist-input[]]`. 
-
+;actions
+: Action widgets to be triggered when the pill is clicked. Within the text, the variable ''tag'' contains the title of the selected tag.
+;tagField
+: <<.from-version 5.1.23>> The ''field'' that gets updated with the selected tag. Defaults to ''tags''.
 
 <<.macro-examples "tag-picker">>

editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-http-request.tid

@@ -23,6 +23,10 @@ The following parameters are used:
 |header-* |Headers with string values |
 |password-header-* |Headers with values taken from the password store |
 |password-query-* |Query string parameters with values taken from the password store |
+|basic-auth-username |<<.from-version "5.3.4">> Optional username for HTTP basic authentication |
+|basic-auth-username-from-store |<<.from-version "5.3.4">> Optional username for HTTP basic authentication, specified as the name of the entry in the password store containing the username |
+|basic-auth-password |<<.from-version "5.3.4">> Optional password for HTTP basic authentication |
+|basic-auth-password-from-store |<<.from-version "5.3.4">> Optional password for HTTP basic authentication, specified as the name of the entry in the password store containing the password |
 |var-* |Variables to be passed to the completion and progress handlers (without the "var-" prefix) |
 |bind-status |Title of tiddler to which the status of the request ("pending", "complete", "error") should be bound |
 |bind-progress |Title of tiddler to which the progress of the request (0 to 100) should be bound |

editions/tw5.com/tiddlers/system/doc-macros.tid

@@ -1,8 +1,8 @@
-code-body: yes
 created: 20150117152607000
-modified: 20240317091700545
+modified: 20240229155550000
 tags: $:/tags/Macro
 title: $:/editions/tw5.com/doc-macros
+code-body: yes
 type: text/vnd.tiddlywiki
 
 \whitespace trim
@@ -165,7 +165,7 @@ This is an example tiddler. See [[Table-of-Contents Macros (Examples)]].
 				<dd><$button set=<<.state>> setTo="">Hide</$button></dd>
 			</dl>
 			<blockquote class="doc-example-result">
-				<$transclude $variable="eg" $mode="block"/>
+				<<eg>>
 			</blockquote>
 		</$reveal>
 	</$list>

editions/tw5.com/tiddlers/tag-picker Macro (Examples).tid

@@ -1,69 +0,0 @@
-created: 20230616104546608
-modified: 20240214174032498
-tags: [[tag-picker Macro]] [[Macro Examples]]
-title: tag-picker Macro (Examples)
-type: text/vnd.tiddlywiki
-
-<<.warning """The first example will set the tag of the <<.tid currentTiddler>> so you should copy / paste it to a new tiddler for testing. Otherwise you'll change "this tiddler" """>>
-
-<$macrocall $name=".example" n="1"
-eg="""Use all existing tags and set the ''tags'' field here: <<tag-picker>>
-"""/>
-
-----
-
-<$let transclusion=test>
-
-<<.tip """The following examples use a temporary tiddler: $:/temp/test/tag-picker. So this tiddler will not be changed """>>
-
-
-<$macrocall $name=".example" n="2" 
-eg="""$:/temp/test/tag-picker ''tags'': <$text text={{{ [[$:/temp/test/tag-picker]get[tags]enlist-input[]join[, ]else[n/a]] }}}/>
-
-Use all existing tags and set the $:/temp/test/tag-picker ''tags'' field: <<tag-picker tiddler:"$:/temp/test/tag-picker">>
-"""/>
-
-----
-
-<<.tip """Use the following example to populate the $:/temp/test/tag-picker ''foo''-field, which are needed by some examples below """>>
-
-<$macrocall $name=".example" n="3" 
-eg="""$:/temp/test/tag-picker ''foo'': <$text text={{{ [[$:/temp/test/tag-picker]get[foo]enlist-input[]join[, ]else[n/a]] }}}/>
-
-Use all existing tags and set the $:/temp/test/tag-picker ''foo'' field: <<tag-picker tagField:"foo"  tiddler:"$:/temp/test/tag-picker">>
-"""/>
-
-----
-
-<<.tip """The following example expects some values in the "foo" field of the tiddler $:/temp/test/tag-picker, which can be created by the example above.""">>
-
-<$macrocall $name=".example" n="4" eg="""\procedure listSource() $:/temp/test/tag-picker
-
-$:/temp/test/tag-picker foo: <$text text={{{ [[$:/temp/test/tag-picker]get[foo]enlist-input[]join[, ]else[n/a]] }}}/><br>
-$:/temp/test/tag-picker bar: <$text text={{{ [[$:/temp/test/tag-picker]get[bar]enlist-input[]join[, ]else[n/a]] }}}/>
-
-Use $:/temp/test/tag-picker ''foo'' field as source and set ''bar'': <<tag-picker tagField:"bar" tagListFilter:"[<listSource>get[foo]enlist-input[]]" tiddler:"$:/temp/test/tag-picker">>
-"""/>
-
-----
-
-<<.tip """The following example expects some values in the "foo" field of the tiddler $:/temp/test/tag-picker, which can be created by the example above.<br>
-It will also add completely new tags to the bar-field and the source tiddlers foo-field. New tags can be entered by typing into the tag-name input
-""">>
-
-<$macrocall $name=".example" n="5" eg="""
-\procedure listSource() $:/temp/test/tag-picker
-\procedure listSourceField() foo
-
-\procedure addNewTagToSource()
-	<$action-listops $tiddler=<<listSource>> $field=<<listSourceField>> $subfilter='[<listSource>get<listSourceField>enlist-input[]] [<tag>trim[]]'/>
-\end
-
-$:/temp/test/tag-picker foo: <$text text={{{ [[$:/temp/test/tag-picker]get[foo]enlist-input[]join[, ]else[n/a]] }}}/><br>
-$:/temp/test/tag-picker ''bar'': <$text text={{{ [[$:/temp/test/tag-picker]get[bar]enlist-input[]join[, ]else[n/a]] }}}/>
-
-Use $:/temp/test/tag-picker ''foo'' field as source and set ''bar'': <$macrocall $name="tag-picker" tagField="bar" tagListFilter="[<listSource>get<listSourceField>enlist-input[]]" tiddler="$:/temp/test/tag-picker" actions=<<addNewTagToSource>>/>
-
-"""/>
-
-</$let>

editions/tw5.com/tiddlers/widgets/ActionDeleteFieldWidget.tid

@@ -16,7 +16,6 @@ The ''action-deletefield'' widget is invisible. Any content within it is ignored
 |!Attribute |!Description |
 |$tiddler |The title of the tiddler whose fields are to be modified (if not provided defaults to the [[current tiddler|Current Tiddler]]) |
 |$field |Optional name of a field to delete |
-|$timestamp |<<.from-version "5.3.4">> Specifies whether the timestamp(s) of the target tiddler will be updated (''modified'' and ''modifier'', plus ''created'' and ''creator'' for newly created tiddlers). Can be "yes" (the default) or "no" |
 |//{any attributes not starting with $}// |Each attribute name specifies a field to be deleted. The attribute value is ignored and need not be specified |
 
 ! Examples

editions/tw5.com/tiddlers/widgets/Widgets.tid

@@ -1,14 +1,14 @@
 created: 20140908130500000
-modified: 20240326164134356
+modified: 20150219182745000
 tags: Concepts Reference
 title: Widgets
 type: text/vnd.tiddlywiki
 
 ~TiddlyWiki's display is driven by an underlying collection of <<.def widgets>>. These are organised into a tree structure: each widget has a parent widget and zero or more child widgets.
 
-~TiddlyWiki generates this <<.def "widget tree">> by parsing the ~WikiText of tiddlers. Each component of the ~WikiText syntax, including even the trivial case of ordinary text, generates a corresponding widget. The widget tree is an intermediate representation that is subsequently rendered into the actual display.
+~TiddlyWiki generates this <<.def "widget tree">> by parsing the WikiText of tiddlers. Each component of the WikiText syntax, including even the trivial case of ordinary text, generates a corresponding widget. The widget tree is an intermediate representation that is subsequently rendered into the actual display.
 
-Widgets are analogous to elements in an HTML document. Indeed, HTML tags in ~WikiText generate dedicated <<.def "element widgets">>.
+Widgets are analogous to elements in an HTML document. Indeed, HTML tags in WikiText generate dedicated <<.def "element widgets">>.
 
 Each class of widget contributes a specific ability to the overall functionality, such as the ability to <<.wlink2 "display an image" ImageWidget>> or <<.wlink2 "a button" ButtonWidget>>, to <<.wlink2 "call a macro" MacroCallWidget>> or <<.wlink2 "transclude text from elsewhere" TranscludeWidget>>, or to [[mark a piece of text as a heading|HTML in WikiText]].
 
@@ -16,4 +16,4 @@ The more specialised widgets use a general-purpose [[widget syntax|Widgets in Wi
 
 The following classes of widget are built into the core:
 
-<<list-links "[tag[Widgets]]" class:"multi-columns">>
+<<list-links "[tag[Widgets]]">>

licenses/cla-individual.md

@@ -563,5 +563,3 @@ John Long, @drevarr, 2023/12/12
 Ed Holsinger, @eschlon, 2024/02/08
 
 Kim I. McKinley, @PotOfCoffee2Go, 2024/03/16
-
-@Jinix6, 2024/03/31

plugins/tiddlywiki/github-fork-ribbon/readme.tid

@@ -4,6 +4,8 @@ This plugin provides a diagonal ribbon across the corner of the window. It resem
 
 The ribbon can be positioned over any corner, and can incorporate user defined text, colours and a link.
 
-The CSS stylesheet is adapted from work by [[Simon Whitaker|https://github.com/simonwhitaker/github-fork-ribbon-css/]]
+The CSS stylesheet is adapted from work by Simon Whitaker:
 
-[[Plugin source code|https://github.com/Jermolene/TiddlyWiki5/blob/master/plugins/tiddlywiki/github-fork-ribbon]]
+https://github.com/simonwhitaker/github-fork-ribbon-css/
+
+[[Source code|https://github.com/Jermolene/TiddlyWiki5/blob/master/plugins/tiddlywiki/github-fork-ribbon]]

plugins/tiddlywiki/github-fork-ribbon/styles.tid

@@ -1,4 +1,5 @@
 title: $:/plugins/tiddlywiki/github-fork-ribbon/styles
+tags: [[$:/tags/Stylesheet]]
 
 /* Left will inherit from right (so we don't need to duplicate code */
 .github-fork-ribbon {
@@ -9,7 +10,7 @@ title: $:/plugins/tiddlywiki/github-fork-ribbon/styles
   padding: 2px 0;
 
   /* Set the base colour */
-  background-color: <<color>>;
+  background-color: #a00;
 
   /* Set a gradient: transparent black at the top to almost-transparent black at the bottom */
   background-image: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, 0.00)), to(rgba(0, 0, 0, 0.15)));
@@ -24,7 +25,7 @@ title: $:/plugins/tiddlywiki/github-fork-ribbon/styles
   -webkit-box-shadow: 0px 2px 3px 0px rgba(0, 0, 0, 0.5);
   box-shadow: 0px 2px 3px 0px rgba(0, 0, 0, 0.5);
 
-  z-index: 700;
+  z-index: 999;
   pointer-events: auto;
 }
 
@@ -60,8 +61,8 @@ title: $:/plugins/tiddlywiki/github-fork-ribbon/styles
   height: 150px;
   position: absolute;
   overflow: hidden;
-  top: <<top>>;
-  z-index: 700;
+  top: 0;
+  z-index: 999;
   pointer-events: none;
 }
 
@@ -70,25 +71,25 @@ title: $:/plugins/tiddlywiki/github-fork-ribbon/styles
 }
 
 .github-fork-ribbon-wrapper.left {
-  left: <<left>>;
+  left: 0;
 }
 
 .github-fork-ribbon-wrapper.right {
-  right: <<right>>;
+  right: 0;
 }
 
 .github-fork-ribbon-wrapper.left-bottom {
   position: fixed;
   top: inherit;
-  bottom: <<bottom>>;
-  left: <<left>>;
+  bottom: 0;
+  left: 0;
 }
 
 .github-fork-ribbon-wrapper.right-bottom {
   position: fixed;
   top: inherit;
-  bottom: <<bottom>>;
-  right: <<right>>;
+  bottom: 0;
+  right: 0;
 }
 
 .github-fork-ribbon-wrapper.right .github-fork-ribbon {

plugins/tiddlywiki/github-fork-ribbon/template.tid

@@ -1,26 +0,0 @@
-title: $:/plugins/tiddlywiki/github-fork-ribbon/template
-
-<!-- Parameters:
-position: "right", "left", "right-bottom" and "left-bottom" 
-url: link target
-text: ribbon text
-color: defaults to "#aa0000" - dark red
-top: offset from the top in px - eg: "30px"
-bottom: offset from the bottom in px - No ;
-left: offset from left in px - No ;
-right: offset from right in px - No ;
-fixed: "fixed" .. If ribbon is at the top, it can be "fixed". Bottom is always fixed
--->
-\parameters (position:"right", url:"https://github.com/Jermolene/TiddlyWiki5", text:"Fork me on ~GitHub" color:"#aa0000" top:"0" bottom:"0" left:"0" right:"0" fixed:"")
-
-<style>
-{{$:/plugins/tiddlywiki/github-fork-ribbon/styles}}
-</style>
-
-<div class={{{ github-fork-ribbon-wrapper [<position>] [<fixed>] +[join[ ]] }}}>
-	<div class="github-fork-ribbon">
-		<a href=<<url>>>
-			<<text>>
-		</a>
-	</div>
-</div>

plugins/tiddlywiki/github-fork-ribbon/usage.tid

@@ -1,81 +1,26 @@
 title: $:/plugins/tiddlywiki/github-fork-ribbon/usage
 
-\procedure ribbonCode()
-\whitespace trim
-<$transclude $tiddler="$:/plugins/tiddlywiki/github-fork-ribbon/template" top="30px" fixed=fixed color="green"/>
-\end
+Copy appropriate chunks on a new tiddler and tag it `$:/tags/PageControls`. Name of the new tiddler does not matter. Only the tag matters.
 
-\procedure ribbonCreateActions()
-<% if [[$:/github-ribbon]!is[tiddler]] %>
-	<$action-setfield $tiddler="$:/github-ribbon" $field="text" $value=<<ribbonCode>>
-		tags="$:/tags/PageTemplate" 
-		code-body="yes" />
-<% endif %>
-<$action-navigate $to="$:/github-ribbon" />
-\end
+```
+<!-- TOP RIGHT RIBBON: START COPYING HERE -->
+<div class="github-fork-ribbon-wrapper right"><div class="github-fork-ribbon"><a href="https://github.com/simonwhitaker/github-fork-ribbon-css">Fork me on ~GitHub</a></div>
+</div>
+<!-- TOP RIGHT RIBBON: END COPYING HERE -->
 
-\procedure createRibbon()
-<$button actions=<<ribbonCreateActions>> >
-<%if [[$:/github-ribbon]!is[tiddler]] %>
-Create
-<% else %>
-Show
-<% endif %> ~$:/github-ribbon
-</$button>
-\end
-
-\procedure ribbonToggleTagActions()
-<$action-listops $tiddler="$:/github-ribbon" $field="tags" $subfilter="+[toggle[$:/tags/PageTemplate]]" />
-\end
-
-\procedure ribbonToggleTag() <$button actions=<<ribbonToggleTagActions>> >Toggle Tag</$button>
+<!-- TOP LEFT RIBBON: START COPYING HERE -->
+<div class="github-fork-ribbon-wrapper left"><div class="github-fork-ribbon"><a href="https://github.com/simonwhitaker/github-fork-ribbon-css">Fork me on ~GitHub</a></div>
+</div>
+<!-- TOP LEFT RIBBON: END COPYING HERE -->
 
 
-`$:/plugins/tiddlywiki/github-fork-ribbon/template` is a template tiddler, that can be used with a transclusion and parameters.
+<!-- BOTTOM RIGHT RIBBON: START COPYING HERE -->
+<div class="github-fork-ribbon-wrapper right-bottom"><div class="github-fork-ribbon"><a href="https://github.com/simonwhitaker/github-fork-ribbon-css">Fork me on ~GitHub</a></div>
+</div>
+<!-- BOTTOM RIGHT RIBBON: END COPYING HERE -->
 
-!! Usage
-
-* Create a new tiddler eg: $:/github-ribbon
-* Tag it `$:/tags/PageTemplate`
-* Copy the code below
-
-<pre><$text text=<<ribbonCode>>/></pre>
-
-<<createRibbon>> <<ribbonToggleTag>>
-
-!! Parameters
-
-; position
-: "right" (default), "left", "right-bottom" and "left-bottom"
-
-; url
-: Target URL, default: https://github.com/Jermolene/TiddlyWiki5
-
-; text
-: Ribbon text. default: `Fork me on ~GitHub`
-
-; color
-: Ribbon background color: default: `#aa0000`
-
-; top
-: Offset from the top if postion is top. default: `0` eg: `30px`, if the menu-toolbar plugin is installed
-
-; bottom
-: Offset from the bottom in px
-
-; left
-: Offset from the left in px
-
-; right
-: Offset from the right in px
-
-; fixed
-: If position is ''top'', the ribbon will scroll out of the viewport by default
-: If the parameter `fixed="fixed"` it will be fixed
-
-!! Remove the Ribbon
-
-* Disable the plugin
-* ''Remove the tag'' from $:/github-ribbon tiddler
-* Delete the $:/github-ribbon tiddler
-* <<ribbonToggleTag>>
+<!-- BOTTOM LEFT RIBBON: START COPYING HERE -->
+<div class="github-fork-ribbon-wrapper left-bottom"><div class="github-fork-ribbon"><a href="https://github.com/simonwhitaker/github-fork-ribbon-css">Fork me on ~GitHub</a></div>
+</div>
+<!-- BOTTOM LEFT RIBBON: END COPYING HERE -->
+```

themes/tiddlywiki/vanilla/base.tid

@@ -931,7 +931,6 @@ button.tc-btn-invisible.tc-remove-tag-button {
 
 .tc-page-controls {
 	margin-top: 14px;
-	margin-bottom: 14px;
 	font-size: 1.5em;
 }
 
@@ -1336,7 +1335,6 @@ canvas.tc-edit-bitmapeditor  {
 	clear: both;
 }
 
-.tc-single-tiddler-window .tc-tiddler-body,
 .tc-tiddler-frame .tc-tiddler-body {
 	font-size: {{$:/themes/tiddlywiki/vanilla/metrics/bodyfontsize}};
 	line-height: {{$:/themes/tiddlywiki/vanilla/metrics/bodylineheight}};
@@ -1346,11 +1344,6 @@ canvas.tc-edit-bitmapeditor  {
 	overflow: hidden; /* https://github.com/Jermolene/TiddlyWiki5/issues/282 */
 }
 
-/*
-* Tiddler in a new window.
-* Also see: .tc-single-tiddler-window .tc-tiddler-body, above
-*/
-
 html body.tc-body.tc-single-tiddler-window {
 	margin: 1em;
 	background: <<colour tiddler-background>>;

themes/tiddlywiki/vanilla/reset.tid

@@ -1,7 +1,7 @@
 title: $:/themes/tiddlywiki/vanilla/reset
 type: text/css
 
-/*! modern-normalize v2.0.0 | MIT License | https://github.com/sindresorhus/modern-normalize */
+/*! modern-normalize v1.0.0 | MIT License | https://github.com/sindresorhus/modern-normalize */
 
 /*
 Document
@@ -13,26 +13,28 @@ Use a better box model (opinionated).
 */
 
 *,
-::before,
-::after {
-	box-sizing: border-box;
+*::before,
+*::after {
+  box-sizing: border-box;
 }
 
+/**
+Use a more readable tab size (opinionated).
+*/
+
+:root {
+  -moz-tab-size: 4;
+  tab-size: 4;
+}
+
+/**
+1. Correct the line height in all browsers.
+2. Prevent adjustments of font size after orientation changes in iOS.
+*/
+
 html {
-	/* Improve consistency of default fonts in all browsers. (https://github.com/sindresorhus/modern-normalize/issues/3) */
-	font-family:
-		system-ui,
-		'Segoe UI',
-		Roboto,
-		Helvetica,
-		Arial,
-		sans-serif,
-		'Apple Color Emoji',
-		'Segoe UI Emoji';
-	line-height: 1.15; /* 1. Correct the line height in all browsers. */
-	-webkit-text-size-adjust: 100%; /* 2. Prevent adjustments of font size after orientation changes in iOS. */
-	-moz-tab-size: 4; /* 3. Use a more readable tab size (opinionated). */
-	tab-size: 4; /* 3 */
+  line-height: 1.15; /* 1 */
+  -webkit-text-size-adjust: 100%; /* 2 */
 }
 
 /*
@@ -40,8 +42,29 @@ Sections
 ========
 */
 
+/**
+Remove the margin in all browsers.
+*/
+
 body {
-	margin: 0; /* Remove the margin in all browsers. */
+  margin: 0;
+}
+
+/**
+Improve consistency of default fonts in all browsers. (https://github.com/sindresorhus/modern-normalize/issues/3)
+*/
+
+body {
+  font-family:
+    system-ui,
+    -apple-system, /* Firefox supports this but not yet `system-ui` */
+    'Segoe UI',
+    Roboto,
+    Helvetica,
+    Arial,
+    sans-serif,
+    'Apple Color Emoji',
+    'Segoe UI Emoji';
 }
 
 /*
@@ -55,8 +78,8 @@ Grouping content
 */
 
 hr {
-	height: 0; /* 1 */
-	color: inherit; /* 2 */
+  height: 0; /* 1 */
+  color: inherit; /* 2 */
 }
 
 /*
@@ -69,7 +92,7 @@ Add the correct text decoration in Chrome, Edge, and Safari.
 */
 
 abbr[title] {
-	text-decoration: underline dotted;
+  text-decoration: underline dotted;
 }
 
 /**
@@ -78,7 +101,7 @@ Add the correct font weight in Edge and Safari.
 
 b,
 strong {
-	font-weight: bolder;
+  font-weight: bolder;
 }
 
 /**
@@ -90,14 +113,14 @@ code,
 kbd,
 samp,
 pre {
-	font-family:
-		ui-monospace,
-		SFMono-Regular,
-		Consolas,
-		'Liberation Mono',
-		Menlo,
-		monospace; /* 1 */
-	font-size: 1em; /* 2 */
+  font-family:
+    ui-monospace,
+    SFMono-Regular,
+    Consolas,
+    'Liberation Mono',
+    Menlo,
+    monospace; /* 1 */
+  font-size: 1em; /* 2 */
 }
 
 /**
@@ -105,7 +128,7 @@ Add the correct font size in all browsers.
 */
 
 small {
-	font-size: 80%;
+  font-size: 80%;
 }
 
 /**
@@ -114,18 +137,18 @@ Prevent 'sub' and 'sup' elements from affecting the line height in all browsers.
 
 sub,
 sup {
-	font-size: 75%;
-	line-height: 0;
-	position: relative;
-	vertical-align: baseline;
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
 }
 
 sub {
-	bottom: -0.25em;
+  bottom: -0.25em;
 }
 
 sup {
-	top: -0.5em;
+  top: -0.5em;
 }
 
 /*
@@ -135,12 +158,12 @@ Tabular data
 
 /**
 1. Remove text indentation from table contents in Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=999088, https://bugs.webkit.org/show_bug.cgi?id=201297)
-2. Correct table border color inheritance in Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=935729, https://bugs.webkit.org/show_bug.cgi?id=195016)
+2. Correct table border color inheritance in all Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=935729, https://bugs.webkit.org/show_bug.cgi?id=195016)
 */
 
 table {
-	text-indent: 0; /* 1 */
-	border-color: inherit; /* 2 */
+  text-indent: 0; /* 1 */
+  border-color: inherit; /* 2 */
 }
 
 /*
@@ -158,19 +181,20 @@ input,
 optgroup,
 select,
 textarea {
-	font-family: inherit; /* 1 */
-	font-size: 100%; /* 1 */
-	line-height: 1.15; /* 1 */
-	margin: 0; /* 2 */
+  font-family: inherit; /* 1 */
+  font-size: 100%; /* 1 */
+  line-height: 1.15; /* 1 */
+  margin: 0; /* 2 */
 }
 
 /**
 Remove the inheritance of text transform in Edge and Firefox.
+1. Remove the inheritance of text transform in Firefox.
 */
 
 button,
-select {
-	text-transform: none;
+select { /* 1 */
+  text-transform: none;
 }
 
 /**
@@ -181,7 +205,7 @@ button,
 [type='button'],
 [type='reset'],
 [type='submit'] {
-	-webkit-appearance: button;
+  -webkit-appearance: button;
 }
 
 /**
@@ -189,8 +213,8 @@ Remove the inner border and padding in Firefox.
 */
 
 ::-moz-focus-inner {
-	border-style: none;
-	padding: 0;
+  border-style: none;
+  padding: 0;
 }
 
 /**
@@ -198,7 +222,7 @@ Restore the focus styles unset by the previous rule.
 */
 
 :-moz-focusring {
-	outline: 1px dotted ButtonText;
+  outline: 1px dotted ButtonText;
 }
 
 /**
@@ -207,7 +231,7 @@ See: https://github.com/mozilla/gecko-dev/blob/2f9eacd9d3d995c937b4251a5557d95d4
 */
 
 :-moz-ui-invalid {
-	box-shadow: none;
+  box-shadow: none;
 }
 
 /**
@@ -215,7 +239,7 @@ Remove the padding so developers are not caught out when they zero out 'fieldset
 */
 
 legend {
-	padding: 0;
+  padding: 0;
 }
 
 /**
@@ -223,7 +247,7 @@ Add the correct vertical alignment in Chrome and Firefox.
 */
 
 progress {
-	vertical-align: baseline;
+  vertical-align: baseline;
 }
 
 /**
@@ -232,7 +256,7 @@ Correct the cursor style of increment and decrement buttons in Safari.
 
 ::-webkit-inner-spin-button,
 ::-webkit-outer-spin-button {
-	height: auto;
+  height: auto;
 }
 
 /**
@@ -241,8 +265,8 @@ Correct the cursor style of increment and decrement buttons in Safari.
 */
 
 [type='search'] {
-	-webkit-appearance: textfield; /* 1 */
-	outline-offset: -2px; /* 2 */
+  -webkit-appearance: textfield; /* 1 */
+  outline-offset: -2px; /* 2 */
 }
 
 /**
@@ -250,7 +274,7 @@ Remove the inner padding in Chrome and Safari on macOS.
 */
 
 ::-webkit-search-decoration {
-	-webkit-appearance: none;
+  -webkit-appearance: none;
 }
 
 /**
@@ -259,8 +283,8 @@ Remove the inner padding in Chrome and Safari on macOS.
 */
 
 ::-webkit-file-upload-button {
-	-webkit-appearance: button; /* 1 */
-	font: inherit; /* 2 */
+  -webkit-appearance: button; /* 1 */
+  font: inherit; /* 2 */
 }
 
 /*
@@ -273,5 +297,5 @@ Add the correct display in Chrome and Safari.
 */
 
 summary {
-	display: list-item;
+  display: list-item;
 }