Merge branch 'master' into feat-ai-tools

.eslintrc.yml

@@ -231,7 +231,10 @@ rules:
   prefer-spread: 'off'
   prefer-template: 'off'
   quote-props: 'off'
-  quotes: 'off'
+  quotes:
+    - error
+    - double
+    - avoidEscape: true
   radix: 'off'
   require-atomic-updates: error
   require-await: error

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -21,7 +21,7 @@ body:
     attributes:
       label: To Reproduce
       description: "Steps to reproduce the behavior:"
-      value: |
+      placeholder: |
         1. Go to '...'
         2. Click on '....'
         3. Scroll down to '....'
@@ -41,7 +41,7 @@ body:
     attributes:
       label: TiddlyWiki Configuration
       description: please complete the following information
-      value: |
+      placeholder: |
         - Version [e.g. v5.1.24]
         - Saving mechanism [e.g. Node.js, TiddlyDesktop, TiddlyHost etc]
         - Plugins installed [e.g. Freelinks, TiddlyMap]

bin/readme-bld.sh

@@ -15,3 +15,11 @@ node $TW5_BUILD_TIDDLYWIKI \
 	--output . \
 	--build readmes \
 	|| exit 1
+
+# tw.org readmes
+node $TW5_BUILD_TIDDLYWIKI \
+	editions/tw.org \
+	--verbose \
+	--output . \
+	--build readmes \
+	|| exit 1

boot/boot.js

@@ -386,8 +386,8 @@ $tw.utils.parseDate = function(value) {
 				parseInt(value.substr(10,2)||"00",10),
 				parseInt(value.substr(12,2)||"00",10),
 				parseInt(value.substr(14,3)||"000",10)));
-		  d.setUTCFullYear(year); // See https://stackoverflow.com/a/5870822
-		  return d;
+		d.setUTCFullYear(year); // See https://stackoverflow.com/a/5870822
+		return d;
 	} else if($tw.utils.isDate(value)) {
 		return value;
 	} else {

code-of-conduct.md

@@ -0,0 +1 @@
+<p>This community exists because TiddlyWiki is more useful when people share and work together.</p><p>This community is a beautiful but fragile thing: a collection of diverse people from all over the planet, united in their interest in the project, and their commitment to helping one another achieve and learn more.</p><p>We try to make the community as broad and welcoming as possible by remembering some basic principles of culture and behaviour.</p><p>These principles guide technical and non-technical decisions, and help contributors and leaders support our project and community.</p><ul><li>We are optimistic and hopeful</li><li>We aim to foster a learning environment that is collaborative and safe for everyone</li><li>We recognise that the motivation for sharing and helping is usually for appreciation, and not financial gain, and so we take care to acknowledge and <strong>thank the people who enrich the community by sharing what they have created</strong></li><li>While we are united in our interest in TiddlyWiki, we differ in every other conceivable way. We choose to focus on what unites us, and <strong>avoid unnecessarily mixing contentious topics like religion and politics</strong></li><li>We treat each other with respect, and start with the assumption that <strong>others are acting in good faith</strong></li><li>We avoid discriminatory language</li><li>We try to use our strength as a community to help others</li><li>We avoid responding when angry or upset because we try to de-escalate conflict</li><li>We make sure we critique ideas, not people</li><li>When we disagree with others we do so graciously, and treat others with dignity and respoect</li><li>We do not tolerate intolerance towards others</li><li>We seek first to understand others, and then to be understood</li><li>We have fun</li></ul><p>Our discussions are in English. It is not the first language of many people in the community, nor do we all share the same cultural background and reference points. So we take care to use language that is clear and unambigous, and avoid cultural references or jokes that will not be widely understood.</p><p>It is not acceptable to make jokes or other comments that discriminate by race, gender, sexuality, or other protected characteristic.</p><p>As an inclusive community, we are committed to making sure that TiddlyWiki is an accessible tool that understands the needs of people with disabilities.</p>

core/images/discord.tid

@@ -0,0 +1,5 @@
+title: $:/core/images/discord
+tags: $:/tags/Image
+
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-discord tc-image-button" viewBox="0 -28.5 256 256"><path d="M216.856 16.597A208.502 208.502 0 0 0 164.042 0c-2.275 4.113-4.933 9.645-6.766 14.046-19.692-2.961-39.203-2.961-58.533 0-1.832-4.4-4.55-9.933-6.846-14.046a207.809 207.809 0 0 0-52.855 16.638C5.618 67.147-3.443 116.4 1.087 164.956c22.169 16.555 43.653 26.612 64.775 33.193A161.094 161.094 0 0 0 79.735 175.3a136.413 136.413 0 0 1-21.846-10.632 108.636 108.636 0 0 0 5.356-4.237c42.122 19.702 87.89 19.702 129.51 0a131.66 131.66 0 0 0 5.355 4.237 136.07 136.07 0 0 1-21.886 10.653c4.006 8.02 8.638 15.67 13.873 22.848 21.142-6.58 42.646-16.637 64.815-33.213 5.316-56.288-9.08-105.09-38.056-148.36ZM85.474 135.095c-12.645 0-23.015-11.805-23.015-26.18s10.149-26.2 23.015-26.2c12.867 0 23.236 11.804 23.015 26.2.02 14.375-10.148 26.18-23.015 26.18Zm85.051 0c-12.645 0-23.014-11.805-23.014-26.18s10.148-26.2 23.014-26.2c12.867 0 23.236 11.804 23.015 26.2 0 14.375-10.148 26.18-23.015 26.18Z"/></svg>

core/language/en-GB/Buttons.multids

@@ -80,6 +80,7 @@ NewMarkdown/Caption: new Markdown tiddler
 NewMarkdown/Hint: Create a new Markdown tiddler
 NewTiddler/Caption: new tiddler
 NewTiddler/Hint: Create a new tiddler
+OpenControlPanel/Hint: Open control panel
 OpenWindow/Caption: open in new window
 OpenWindow/Hint: Open tiddler in new window
 Palette/Caption: palette
@@ -132,6 +133,7 @@ Excise/Caption/Replace/Link: link
 Excise/Caption/Replace/Transclusion: transclusion
 Excise/Caption/Tag: Tag new tiddler with the title of this tiddler
 Excise/Caption/TiddlerExists: Warning: tiddler already exists
+Excise/DefaultTitle: New Excision
 Excise/Hint: Excise the selected text into a new tiddler
 Heading1/Caption: heading 1
 Heading1/Hint: Apply heading level 1 formatting to lines containing selection

core/language/en-GB/ControlPanel.multids

@@ -198,6 +198,12 @@ Settings/TitleLinks/Yes/Description: Display tiddler titles as links
 Settings/MissingLinks/Caption: Wiki Links
 Settings/MissingLinks/Hint: Choose whether to link to tiddlers that do not exist yet
 Settings/MissingLinks/Description: Enable links to missing tiddlers
+SocialCard/Caption: Social Media Card
+SocialCard/Domain/Prompt: Domain name to display for the link (for example, ''tiddlywiki.com'')
+SocialCard/Hint: This information is used by social and messaging services to display a preview card for links to this TiddlyWiki when hosted online
+SocialCard/PreviewUrl/Prompt: Full URL to preview image for this TiddlyWiki
+SocialCard/PreviewUrl/Preview: Preview image:
+SocialCard/Url/Prompt: Full URL of this TiddlyWiki
 StoryTiddler/Caption: Story Tiddler
 StoryTiddler/Hint: This rule cascade is used to dynamically choose the template for displaying a tiddler in the story river.
 StoryView/Caption: Story View
@@ -235,3 +241,7 @@ ViewTemplateBody/Caption: View Template Body
 ViewTemplateBody/Hint: This rule cascade is used by the default view template to dynamically choose the template for displaying the body of a tiddler.
 ViewTemplateTitle/Caption: View Template Title
 ViewTemplateTitle/Hint: This rule cascade is used by the default view template to dynamically choose the template for displaying the title of a tiddler.
+ViewTemplateSubtitle/Caption: View Template Subtitle
+ViewTemplateSubtitle/Hint: This rule cascade is used by the default view template to dynamically choose the template for displaying the subtitle of a tiddler.
+ViewTemplateTags/Caption: View Template Tags
+ViewTemplateTags/Hint: This rule cascade is used by the default view template to dynamically choose the template for displaying the tags area of a tiddler.

core/language/en-GB/EditTemplate.multids

@@ -26,6 +26,7 @@ Tags/ClearInput/Caption: clear input
 Tags/ClearInput/Hint: Clear tag input
 Tags/Dropdown/Caption: tag list
 Tags/Dropdown/Hint: Show tag list
+Tags/EmptyMessage: (no search result)
 Title/BadCharacterWarning: Warning: avoid using any of the characters <<bad-chars>> in tiddler titles
 Title/Exists/Prompt: Target tiddler already exists
 Title/Relink/Prompt: Update ''<$text text=<<fromTitle>>/>'' to ''<$text text=<<toTitle>>/>'' in the //tags// and //list// fields of other tiddlers

core/language/en-GB/Search.multids

@@ -6,6 +6,8 @@ Filter/Hint: Search via a [[filter expression|https://tiddlywiki.com/static/Filt
 Filter/Matches: //<small><<resultCount>> matches</small>//
 Matches: //<small><<resultCount>> matches</small>//
 Matches/All: All matches:
+Matches/NoMatch: //No match//
+Matches/NoResult: //No search result//
 Matches/Title: Title matches:
 Search: Search
 Search/TooShort: Search text too short

core/language/en-GB/Snippets/FunctionDefinition.tid

@@ -0,0 +1,7 @@
+title: $:/language/Snippets/FunctionDefinition
+tags: $:/tags/TextEditor/Snippet
+caption: Function definition
+
+\function f.name(param1,param2:"default value") [<param1>!is[blank]else<param2>]
+
+<<f.name>>

core/language/en-GB/Snippets/ProcedureDefinition.tid

@@ -0,0 +1,7 @@
+title: $:/language/Snippets/ProcedureDefinition
+tags: $:/tags/TextEditor/Snippet
+caption: Procedure definition
+
+\procedure procName(param1:"default value",param2)
+Your text comes here.
+\end

core/language/en-GB/Types/image_x-icon.tid

@@ -1,5 +0,0 @@
-title: $:/language/Docs/Types/image/x-icon
-description: ICO icon
-name: image/x-icon
-group: Image
-group-sort: 1

core/language/en-GB/Types/text_vnd.tiddlywiki_multiple.tid

@@ -0,0 +1,5 @@
+title: $:/language/Docs/Types/text/vnd.tiddlywiki-multiple
+description: Compound tiddler
+name: text/vnd.tiddlywiki-multiple
+group: Developer
+group-sort: 2

core/modules/commands/render.js

@@ -45,17 +45,22 @@ Render individual tiddlers and save the results to the specified files
 				variableList = variableList.slice(2);
 			}
 		$tw.utils.each(tiddlers,function(title) {
-			var filepath = path.resolve(self.commander.outputPath,wiki.filterTiddlers(filenameFilter,$tw.rootWidget,wiki.makeTiddlerIterator([title]))[0]);
-			if(self.commander.verbose) {
-				console.log("Rendering \"" + title + "\" to \"" + filepath + "\"");
+			var filenameResults = wiki.filterTiddlers(filenameFilter,$tw.rootWidget,wiki.makeTiddlerIterator([title]));
+			if(filenameResults.length > 0) {
+				var filepath = path.resolve(self.commander.outputPath,filenameResults[0]);
+				if(self.commander.verbose) {
+					console.log("Rendering \"" + title + "\" to \"" + filepath + "\"");
+				}
+				var parser = wiki.parseTiddler(template || title),
+					widgetNode = wiki.makeWidget(parser,{variables: $tw.utils.extend({},variables,{currentTiddler: title,storyTiddler: title})}),
+					container = $tw.fakeDocument.createElement("div");
+				widgetNode.render(container,null);
+				var text = type === "text/html" ? container.innerHTML : container.textContent;
+				$tw.utils.createFileDirectories(filepath);
+				fs.writeFileSync(filepath,text,"utf8");
+			} else {
+				console.log("Not rendering \"" + title + "\" because the filename filter returned an empty result");
 			}
-			var parser = wiki.parseTiddler(template || title),
-				widgetNode = wiki.makeWidget(parser,{variables: $tw.utils.extend({},variables,{currentTiddler: title,storyTiddler: title})}),
-				container = $tw.fakeDocument.createElement("div");
-			widgetNode.render(container,null);
-			var text = type === "text/html" ? container.innerHTML : container.textContent;
-			$tw.utils.createFileDirectories(filepath);
-			fs.writeFileSync(filepath,text,"utf8");
 		});
 		return null;
 	};

core/modules/editor/operations/text/excise.js

@@ -14,11 +14,12 @@ Text editor operation to excise the selection to a new tiddler
 
 exports["excise"] = function(event,operation) {
 	var editTiddler = this.wiki.getTiddler(this.editTitle),
-		editTiddlerTitle = this.editTitle;
+		editTiddlerTitle = this.editTitle,
+		excisionBaseTitle = $tw.language.getString("Buttons/Excise/DefaultTitle");
 	if(editTiddler && editTiddler.fields["draft.of"]) {
 		editTiddlerTitle = editTiddler.fields["draft.of"];
 	}
-	var excisionTitle = event.paramObject.title || this.wiki.generateNewTitle("New Excision");
+	var excisionTitle = event.paramObject.title || this.wiki.generateNewTitle(excisionBaseTitle);
 	this.wiki.addTiddler(new $tw.Tiddler(
 		this.wiki.getCreationFields(),
 		this.wiki.getModificationFields(),

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

@@ -93,11 +93,12 @@ var processRow = function(prevColumns) {
 			}
 			// Check whether this is a heading cell
 			var cell;
+			var start = this.parser.pos;
 			if(chr === "!") {
 				this.parser.pos++;
-				cell = {type: "element", tag: "th", children: []};
+				cell = {type: "element", tag: "th", start: start, children: []};
 			} else {
-				cell = {type: "element", tag: "td", children: []};
+				cell = {type: "element", tag: "td", start: start, children: []};
 			}
 			tree.push(cell);
 			// Record information about this cell
@@ -121,6 +122,7 @@ var processRow = function(prevColumns) {
 			}
 			// Move back to the closing `|`
 			this.parser.pos--;
+			cell.end = this.parser.pos;
 		}
 		col++;
 		cellRegExp.lastIndex = this.parser.pos;
@@ -169,12 +171,13 @@ exports.parse = function() {
 				rowContainer.children = this.parser.parseInlineRun(rowTermRegExp,{eatTerminator: true});
 			} else {
 				// Create the row
-				var theRow = {type: "element", tag: "tr", children: []};
+				var theRow = {type: "element", tag: "tr", children: [], start: rowMatch.index};
 				$tw.utils.addClassToParseTreeNode(theRow,rowCount%2 ? "oddRow" : "evenRow");
 				rowContainer.children.push(theRow);
 				// Process the row
 				theRow.children = processRow.call(this,prevColumns);
 				this.parser.pos = rowMatch.index + rowMatch[0].length;
+				theRow.end = this.parser.pos;
 				// Increment the row count
 				rowCount++;
 			}

core/modules/savers/put.js

@@ -55,7 +55,7 @@ var PutSaver = function(wiki) {
 		callback: function(err,data,xhr) {
 			// Check DAV header http://www.webdav.org/specs/rfc2518.html#rfc.section.9.1
 			if(!err) {
-				self.serverAcceptsPuts = xhr.status === 200 && !!xhr.getResponseHeader("dav");
+				self.serverAcceptsPuts = xhr.status >= 200 && xhr.status < 300 && !!xhr.getResponseHeader("dav");
 			}
 		}
 	});

core/modules/storyviews/classic.js

@@ -30,12 +30,8 @@ ClassicStoryView.prototype.navigateTo = function(historyInfo) {
 	if(!targetElement || targetElement.nodeType === Node.TEXT_NODE) {
 		return;
 	}
-	if(duration) {
-		// Scroll the node into view
-		this.listWidget.dispatchEvent({type: "tm-scroll", target: targetElement});
-	} else {
-		targetElement.scrollIntoView();
-	}
+	// Scroll the node into view
+	this.listWidget.dispatchEvent({type: "tm-scroll", target: targetElement});
 };
 
 ClassicStoryView.prototype.insert = function(widget) {

core/modules/upgraders/system.js

@@ -12,7 +12,7 @@ Upgrader module that suppresses certain system tiddlers that shouldn't be import
 /*global $tw: false */
 "use strict";
 
-var DONT_IMPORT_LIST = ["$:/Import"],
+var DONT_IMPORT_LIST = ["$:/Import", "$:/build"],
 	UNSELECT_PREFIX_LIST = ["$:/temp/","$:/state/","$:/StoryList","$:/HistoryList"],
 	WARN_IMPORT_PREFIX_LIST = ["$:/core/modules/"];
 

core/modules/utils/edition-info.js

@@ -29,10 +29,14 @@ exports.getEditionInfo = function() {
 			for(var entryIndex=0; entryIndex<entries.length; entryIndex++) {
 				var entry = entries[entryIndex];
 				// Check if directories have a valid tiddlywiki.info
-				if(!editionInfo[entry] && $tw.utils.isDirectory(path.resolve(editionPath,entry))) {
-					var info = $tw.utils.parseJSONSafe(fs.readFileSync(path.resolve(editionPath,entry,"tiddlywiki.info"),"utf8"),null);
-					if(info) {
-						editionInfo[entry] = info;
+				// Check if the entry is a hidden directory
+				if((entry.charAt(0) !== ".") && !editionInfo[entry] && $tw.utils.isDirectory(path.resolve(editionPath,entry))) {
+					var file=path.resolve(editionPath,entry,"tiddlywiki.info");
+					if(fs.existsSync(file)) {
+						var info = $tw.utils.parseJSONSafe(fs.readFileSync(file,"utf8"),null);
+						if(info) {
+							editionInfo[entry] = info;
+						}
 					}
 				}
 			}
@@ -41,4 +45,4 @@ exports.getEditionInfo = function() {
 	return editionInfo;
 };
 
-})();
+})();

core/modules/utils/transliterate.js

@@ -924,7 +924,7 @@ exports.transliterate = function(str) {
 };
 
 exports.transliterateToSafeASCII = function(str) {
-	return str.replace(/[^\x00-\x7F]/g,function(ch) {
+	return str.replace(/[^\x20-\x7F]/g,function(ch) {
 		return exports.transliterationPairs[ch] || ""
 	});
 };

core/modules/widgets/data.js

@@ -75,7 +75,9 @@ DataWidget.prototype.computeDataTiddlerValues = function() {
 		}
 	});
 	// Deal with $tiddler, $filter or $compound-tiddler attributes
-	var tiddlers = [],title;
+	var tiddlers = [],
+		compoundTiddlers,
+		title;
 	if(this.hasAttribute("$tiddler")) {
 		title = this.getAttribute("$tiddler");
 		if(title) {
@@ -103,8 +105,17 @@ DataWidget.prototype.computeDataTiddlerValues = function() {
 			tiddlers.push.apply(tiddlers,this.extractCompoundTiddler(title));
 		}
 	}
+	if(this.hasAttribute("$compound-filter")) {
+		filter = this.getAttribute("$compound-filter");
+		if(filter) {
+			compoundTiddlers = this.wiki.filterTiddlers(filter);
+			$tw.utils.each(compoundTiddlers, function(title){
+				tiddlers.push.apply(tiddlers,self.extractCompoundTiddler(title));
+			});
+		}
+	}
 	// Return the literal item if none of the special attributes were used
-	if(!this.hasAttribute("$tiddler") && !this.hasAttribute("$filter") && !this.hasAttribute("$compound-tiddler")) {
+	if(!this.hasAttribute("$tiddler") && !this.hasAttribute("$filter") && !this.hasAttribute("$compound-tiddler") && !this.hasAttribute("$compound-filter")) {
 		if(Object.keys(item).length > 0 && !!item.title) {
 			return [new $tw.Tiddler(item)];
 		} else {
@@ -112,7 +123,6 @@ DataWidget.prototype.computeDataTiddlerValues = function() {
 		}
 	} else {
 		// Apply the item fields to each of the tiddlers
-		delete item.title; // Do not overwrite the title
 		if(Object.keys(item).length > 0) {
 			$tw.utils.each(tiddlers,function(tiddler,index) {
 				tiddlers[index] = new $tw.Tiddler(tiddler,item);

core/modules/widgets/keyboard.js

@@ -96,13 +96,15 @@ KeyboardWidget.prototype.execute = function() {
 	this.param = this.getAttribute("param","");
 	this.key = this.getAttribute("key","");
 	this.tag = this.getAttribute("tag","");
-	this.keyInfoArray = $tw.keyboardManager.parseKeyDescriptors(this.key);
-	if(this.key.substr(0,2) === "((" && this.key.substr(-2,2) === "))") {
-		this.shortcutTiddlers = [];
-		var name = this.key.substring(2,this.key.length -2);
-		$tw.utils.each($tw.keyboardManager.lookupNames,function(platformDescriptor) {
-			self.shortcutTiddlers.push("$:/config/" + platformDescriptor + "/" + name);
-		});
+	if($tw.keyboardManager) {
+		this.keyInfoArray = $tw.keyboardManager.parseKeyDescriptors(this.key);
+		if(this.key.substr(0,2) === "((" && this.key.substr(-2,2) === "))") {
+			this.shortcutTiddlers = [];
+			var name = this.key.substring(2,this.key.length -2);
+			$tw.utils.each($tw.keyboardManager.lookupNames,function(platformDescriptor) {
+				self.shortcutTiddlers.push("$:/config/" + platformDescriptor + "/" + name);
+			});
+		}	
 	}
 	// Make child widgets
 	this.makeChildWidgets();
@@ -126,7 +128,7 @@ KeyboardWidget.prototype.refresh = function(changedTiddlers) {
 		this.assignDomNodeClasses();
 	}
 	// Update the keyInfoArray if one of its shortcut-config-tiddlers has changed
-	if(this.shortcutTiddlers && $tw.utils.hopArray(changedTiddlers,this.shortcutTiddlers)) {
+	if(this.shortcutTiddlers && $tw.utils.hopArray(changedTiddlers,this.shortcutTiddlers) && $tw.keyboardManager) {
 		this.keyInfoArray = $tw.keyboardManager.parseKeyDescriptors(this.key);
 	}
 	return this.refreshChildren(changedTiddlers);

core/palettes/Blanca.tid

@@ -33,6 +33,7 @@ external-link-background: inherit
 external-link-foreground-hover: inherit
 external-link-foreground-visited: #0000aa
 external-link-foreground: #0000ee
+footnote-target-background: #ecf2ff
 foreground: #333333
 highlight-background: #ffff00
 highlight-foreground: #000000

core/palettes/Blue.tid

@@ -33,6 +33,7 @@ external-link-background: inherit
 external-link-foreground-hover: inherit
 external-link-foreground-visited: #0000aa
 external-link-foreground: #0000ee
+footnote-target-background: #ecf2ff
 foreground: #333353
 highlight-background: #ffff00
 highlight-foreground: #000000

core/palettes/BrightMute.tid

@@ -33,6 +33,7 @@ external-link-background: inherit
 external-link-foreground-hover: inherit
 external-link-foreground-visited: #0000aa
 external-link-foreground: #0000ee
+footnote-target-background: #ecf2ff
 foreground: #333333
 highlight-background: #ffff00
 highlight-foreground: #000000

core/palettes/ContrastDark.tid

@@ -1,7 +1,7 @@
-title: $:/palettes/ContrastLight
-name: Contrast (Light)
-color-scheme: light
-description: High contrast and unambiguous (light version)
+title: $:/palettes/ContrastDark
+name: Contrast (Dark)
+color-scheme: dark
+description: High contrast and unambiguous (dark version)
 tags: $:/tags/Palette
 type: application/x-tiddler-dictionary
 
@@ -9,7 +9,7 @@ alert-background: #f00
 alert-border: <<colour background>>
 alert-highlight: <<colour foreground>>
 alert-muted-foreground: #800
-background: #fff
+background: #000
 blockquote-bar: <<colour muted-foreground>>
 button-background: <<colour background>>
 button-foreground: <<colour foreground>>
@@ -33,7 +33,8 @@ external-link-background: inherit
 external-link-foreground-hover: inherit
 external-link-foreground-visited: #00a
 external-link-foreground: #00e
-foreground: #000
+footnote-target-background: #4c4c4c
+foreground: #fff
 highlight-background: #ffff00
 highlight-foreground: #000000
 message-background: <<colour foreground>>
@@ -82,8 +83,8 @@ tab-foreground: <<colour background>>
 table-border: #dddddd
 table-footer-background: #a8a8a8
 table-header-background: #f0f0f0
-tag-background: #000
-tag-foreground: #fff
+tag-background: #fff
+tag-foreground: #000
 tiddler-background: <<colour background>>
 tiddler-border: <<colour foreground>>
 tiddler-controls-foreground-hover: #ddd

core/palettes/ContrastLight.tid

@@ -1,7 +1,7 @@
-title: $:/palettes/ContrastDark
-name: Contrast (Dark)
-color-scheme: dark
-description: High contrast and unambiguous (dark version)
+title: $:/palettes/ContrastLight
+name: Contrast (Light)
+color-scheme: light
+description: High contrast and unambiguous (light version)
 tags: $:/tags/Palette
 type: application/x-tiddler-dictionary
 
@@ -9,7 +9,7 @@ alert-background: #f00
 alert-border: <<colour background>>
 alert-highlight: <<colour foreground>>
 alert-muted-foreground: #800
-background: #000
+background: #fff
 blockquote-bar: <<colour muted-foreground>>
 button-background: <<colour background>>
 button-foreground: <<colour foreground>>
@@ -33,7 +33,8 @@ external-link-background: inherit
 external-link-foreground-hover: inherit
 external-link-foreground-visited: #00a
 external-link-foreground: #00e
-foreground: #fff
+footnote-target-background: #e5e5e5
+foreground: #000
 highlight-background: #ffff00
 highlight-foreground: #000000
 message-background: <<colour foreground>>
@@ -82,8 +83,8 @@ tab-foreground: <<colour background>>
 table-border: #dddddd
 table-footer-background: #a8a8a8
 table-header-background: #f0f0f0
-tag-background: #fff
-tag-foreground: #000
+tag-background: #000
+tag-foreground: #fff
 tiddler-background: <<colour background>>
 tiddler-border: <<colour foreground>>
 tiddler-controls-foreground-hover: #ddd

core/palettes/CupertinoDark.tid

@@ -31,6 +31,7 @@ external-link-background: transparent
 external-link-foreground-hover: 
 external-link-foreground-visited: #BF5AF2
 external-link-foreground: #32D74B
+footnote-target-background: #747474
 foreground: #FFFFFF
 highlight-background: #ffff78
 highlight-foreground: #000000

core/palettes/DarkPhotos.tid

@@ -35,6 +35,7 @@ external-link-background: inherit
 external-link-foreground-hover: inherit
 external-link-foreground-visited: #0000aa
 external-link-foreground: #0000ee
+footnote-target-background: #ecf2ff
 foreground: #333333
 highlight-background: #ffff00
 highlight-foreground: #000000

core/palettes/DesertSand.tid

@@ -39,6 +39,7 @@ external-link-background: inherit
 external-link-foreground-hover: inherit
 external-link-foreground-visited: #313163
 external-link-foreground: #555592
+footnote-target-background: #fff7d9
 foreground: #2D2A23
 highlight-background: #ffff00
 highlight-foreground: #000000

core/palettes/GruvBoxDark.tid

@@ -40,6 +40,7 @@ external-link-background: inherit
 external-link-foreground-hover: inherit
 external-link-foreground-visited: #d3869b
 external-link-foreground: #8ec07c
+footnote-target-background: #665c54
 foreground: #fbf1c7
 highlight-background: #ffff79
 highlight-foreground: #000000

core/palettes/Nord.tid

@@ -40,6 +40,7 @@ external-link-background: inherit
 external-link-foreground-hover: inherit
 external-link-foreground-visited: #5E81AC
 external-link-foreground: #8FBCBB
+footnote-target-background: #2E3440
 foreground: #d8dee9
 highlight-background: #ffff78
 highlight-foreground: #000000

core/palettes/Rocker.tid

@@ -33,6 +33,7 @@ external-link-background: inherit
 external-link-foreground-hover: inherit
 external-link-foreground-visited: #0000aa
 external-link-foreground: #0000ee
+footnote-target-background: #ecf2ff
 foreground: #333333
 highlight-background: #ffff00
 highlight-foreground: #000000

core/palettes/SolarFlare.tid

@@ -131,6 +131,7 @@ external-link-background-hover: inherit
 external-link-background-visited: inherit
 external-link-background: inherit
 external-link-foreground-hover: inherit
+footnote-target-background: #ded8c5
 highlight-background: #ffff00
 highlight-foreground: #000000
 message-border: #cfd6e6
@@ -141,6 +142,10 @@ sidebar-controls-foreground-hover:
 sidebar-muted-foreground-hover:
 sidebar-tab-background: #ded8c5
 sidebar-tiddler-link-foreground-hover:
+stability-deprecated: <<colour red>>
+stability-experimental: <<colour yellow>>
+stability-legacy: <<colour blue>>
+stability-stable: <<colour green>>
 static-alert-foreground: #aaaaaa
 tab-border: #cccccc
     modal-footer-border: <<colour tab-border>>

core/palettes/SolarizedDark.tid

@@ -34,6 +34,7 @@ external-link-background-visited: inherit
 external-link-foreground: #268bd2
 external-link-foreground-hover:
 external-link-foreground-visited: #268bd2
+footnote-target-background: #073642
 foreground: #839496
 highlight-background: #ffff78
 highlight-foreground: #000000

core/palettes/SolarizedLight.tid

@@ -34,6 +34,7 @@ external-link-background-visited: inherit
 external-link-foreground: #268bd2
 external-link-foreground-hover: inherit
 external-link-foreground-visited: #268bd2
+footnote-target-background: #eee8d5
 foreground: #657b83
 highlight-background: #ffff00
 highlight-foreground: #000000

core/palettes/SpartanDay.tid

@@ -33,6 +33,7 @@ external-link-background: transparent
 external-link-foreground-hover: 
 external-link-foreground-visited: 
 external-link-foreground: 
+footnote-target-background: #ececec
 foreground: rgba(0, 0, 0, 0.87)
 highlight-background: #ffff00
 highlight-foreground: #000000

core/palettes/SpartanNight.tid

@@ -33,6 +33,7 @@ external-link-background: transparent
 external-link-foreground-hover: 
 external-link-foreground-visited: #7c318c
 external-link-foreground: #9e3eb3
+footnote-target-background: #494949
 foreground: rgba(255, 255, 255, 0.7)
 highlight-background: #ffff78
 highlight-foreground: #000000

core/palettes/Twilight.tid

@@ -42,6 +42,7 @@ external-link-background-visited: inherit
 external-link-foreground: rgb(179, 179, 255)
 external-link-foreground-hover: inherit
 external-link-foreground-visited: rgb(153, 153, 255)
+footnote-target-background: <<colour tag-foreground>>
 foreground: rgb(179, 179, 179)
 highlight-background: #ffff78
 highlight-foreground: #000000

core/palettes/Vanilla.tid

@@ -41,6 +41,7 @@ external-link-background: inherit
 external-link-foreground-hover: inherit
 external-link-foreground-visited: #0000aa
 external-link-foreground: #0000ee
+footnote-target-background: #ecf2ff
 foreground: #333333
 highlight-background: #ffff00
 highlight-foreground: #000000

core/templates/social-metadata.tid

@@ -0,0 +1,38 @@
+title: $:/core/templates/social-metadata
+tags: $:/tags/RawMarkupWikified
+
+\procedure meta-plain(name,source,name-attribute:"name")
+\whitespace trim
+<%if [<source>has[text]] %>
+	&lt;meta <$text text=<<name-attribute>>/>="<$text text=<<name>>/>" content="<$text text={{{ [<source>get[text]encodehtml[]] }}}/>"&gt;
+	<$text text={{{ [charcode[10]] }}}/>
+<%endif%>
+\end meta-plain
+
+\procedure meta-wikified(name,source,name-attribute:"name")
+\whitespace trim
+<%if [<source>has[text]] %>
+	<$wikify name="html" text={{{ [<source>get[text]] }}} output="text">
+		&lt;meta <$text text=<<name-attribute>>/>="<$text text=<<name>>/>" content="<$text text={{{ [<html>encodehtml[]] }}}/>"&gt;
+		<$text text={{{ [charcode[10]] }}}/>
+	</$wikify>
+<%endif%>
+\end meta-wikified
+
+\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline macrocallblock conditional commentinline commentblock
+<<meta-wikified "description" "$:/SiteSubtitle">>
+
+<!-- Facebook Meta Tags -->
+<<meta-plain "og:url" "$:/SiteUrl" "property">>
+<<meta-plain "og:type" "website" "property">>
+<<meta-wikified "og:title" "$:/SiteTitle" "property">>
+<<meta-wikified "og:description" "$:/SiteSubtitle" "property">>
+<<meta-plain "og:image" "$:/SitePreviewUrl" "property">>
+
+<!-- Twitter Meta Tags -->
+<<meta-plain "twitter:card" "summary_large_image">>
+<<meta-plain "twitter:domain" "$:/SiteDomain" "property">>
+<<meta-plain "twitter:url" "$:/SiteUrl" "property">>
+<<meta-wikified "twitter:title" "$:/SiteTitle">>
+<<meta-wikified "twitter:description" "$:/SiteSubtitle">>
+<<meta-plain "twitter:image" "$:/SitePreviewUrl">>

core/ui/AdvancedSearch/Shadows.tid

@@ -79,11 +79,15 @@ first-search-filter: [all[shadows]search<userInput>sort[title]limit[250]] -[[$:/
 
 <$list filter="[{$:/temp/advancedsearch}minlength{$:/config/Search/MinLength}limit[1]]" emptyMessage="<div class='tc-search-results'>{{$:/language/Search/Search/TooShort}}</div>" variable="listItem">
 
-<$set name="resultCount" value="<$count filter='[all[shadows]search{$:/temp/advancedsearch}] -[[$:/temp/advancedsearch]] -[[$:/temp/advancedsearch/input]]'/>">
+<$set name="resultCount" value={{{ [all[shadows]search{$:/temp/advancedsearch}] -[[$:/temp/advancedsearch]] -[[$:/temp/advancedsearch/input]] +[count[]]}}}>
 
 <div class="tc-search-results">
 
-<<lingo Shadows/Matches>>
+<% if [<resultCount>match[0]] %>
+	{{$:/language/Search/Matches/NoMatch}}
+<% else %>
+	<<lingo Shadows/Matches>>
+<% endif %>
 
 <$list filter="[all[shadows]search{$:/temp/advancedsearch}sort[title]limit[250]] -[[$:/temp/advancedsearch]] -[[$:/temp/advancedsearch/input]]">
 <span class={{{[<currentTiddler>addsuffix[-primaryList]] -[[$:/temp/advancedsearch/selected-item]get[text]] +[then[]else[tc-list-item-selected]] }}}>

core/ui/AdvancedSearch/Standard.tid

@@ -39,6 +39,7 @@ caption: {{$:/language/Search/Standard/Caption}}
 </$keyboard>
 </$keyboard>
 </$keyboard>
+&#32;
 <$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
 <$button class="tc-btn-invisible">
 <<cancel-search-actions>>
@@ -57,15 +58,15 @@ caption: {{$:/language/Search/Standard/Caption}}
 	configTiddler={{{ [[$:/state/advancedsearch/standard/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}] }}}
 	searchListState="$:/temp/advancedsearch/selected-item">
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]butfirst[]limit[1]]">
+<$list-empty>
+<$list filter='[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]]'><$transclude mode="block"/></$list>
+</$list-empty>
 <$macrocall $name="tabs"
 	tabsList="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]]"
 	default={{$:/config/SearchResults/Default}}
 	actions="<$action-setfield $tiddler='$:/state/advancedsearch/standard/currentTab' text=<<currentTab>>/>"
 	explicitState="$:/state/tab/search-results/advancedsearch" />
 </$list>
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]butfirst[]limit[1]]  :else[[]]">
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]]"><$transclude mode="block"/></$list>
-</$list>
 </$vars>
 </$list>
 </$reveal>

core/ui/AdvancedSearch/System.tid

@@ -78,11 +78,15 @@ first-search-filter: [is[system]search<userInput>sort[title]limit[250]] -[[$:/te
 
 <$list filter="[{$:/temp/advancedsearch}minlength{$:/config/Search/MinLength}limit[1]]" emptyMessage="<div class='tc-search-results'>{{$:/language/Search/Search/TooShort}}</div>" variable="listItem">
 
-<$set name="resultCount" value="<$count filter='[is[system]search{$:/temp/advancedsearch}] -[[$:/temp/advancedsearch]] -[[$:/temp/advancedsearch/input]] -[[$:/temp/advancedsearch/selected-item]]'/>">
+<$set name="resultCount" value={{{ [is[system]search{$:/temp/advancedsearch}] -[[$:/temp/advancedsearch]] -[[$:/temp/advancedsearch/input]] -[[$:/temp/advancedsearch/selected-item]] +[count[]] }}}>
 
 <div class="tc-search-results">
 
-<<lingo System/Matches>>
+<% if [<resultCount>match[0]] %>
+	{{$:/language/Search/Matches/NoMatch}}
+<% else %>
+	<<lingo System/Matches>>
+<% endif %>
 
 <$list filter="[is[system]search{$:/temp/advancedsearch}sort[title]limit[250]] -[[$:/temp/advancedsearch]] -[[$:/temp/advancedsearch/input]] -[[$:/temp/advancedsearch/selected-item]]">
 <span class={{{[<currentTiddler>addsuffix[-primaryList]] -[[$:/temp/advancedsearch/selected-item]get[text]] +[then[]else[tc-list-item-selected]] }}}>

core/ui/ControlPanel/Basics.tid

@@ -25,7 +25,7 @@ caption: {{$:/language/ControlPanel/Basics/Caption}}
 |<$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
 |<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
 |<$link to="$:/status/UserName"><<lingo Username/Prompt>></$link> |<$edit-text tiddler="$:/status/UserName" default="" tag="input"/> |
-|<$link to="$:/config/AnimationDuration"><<lingo AnimDuration/Prompt>></$link> |<$edit-text tiddler="$:/config/AnimationDuration" default="" tag="input"/> |
+|<$link to="$:/config/AnimationDuration"><<lingo AnimDuration/Prompt>></$link> |<$edit-text tiddler="$:/config/AnimationDuration" default="" tag="input" type="number"/> |
 |<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit class="tc-edit-texteditor" tiddler="$:/DefaultTiddlers" autoHeight="yes"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
 |<$link to="$:/language/DefaultNewTiddlerTitle"><<lingo NewTiddler/Title/Prompt>></$link> |<$edit-text tiddler="$:/language/DefaultNewTiddlerTitle" default="" tag="input"/> |
 |<$link to="$:/config/NewJournal/Title"><<lingo NewJournal/Title/Prompt>></$link> |<$edit-text tiddler="$:/config/NewJournal/Title" default="" tag="input"/> |

core/ui/ControlPanel/Cascades/ViewTemplateSubtitle.tid

@@ -0,0 +1,9 @@
+title: $:/core/ui/ControlPanel/ViewTemplateSubtitle
+tags: $:/tags/ControlPanel/Cascades
+caption: {{$:/language/ControlPanel/ViewTemplateSubtitle/Caption}}
+
+\define lingo-base() $:/language/ControlPanel/ViewTemplateSubtitle/
+
+<<lingo Hint>>
+
+{{$:/tags/ViewTemplateSubtitleFilter||$:/snippets/ListTaggedCascade}}

core/ui/ControlPanel/Cascades/ViewTemplateTags.tid

@@ -0,0 +1,9 @@
+title: $:/core/ui/ControlPanel/ViewTemplateTags
+tags: $:/tags/ControlPanel/Cascades
+caption: {{$:/language/ControlPanel/ViewTemplateTags/Caption}}
+
+\define lingo-base() $:/language/ControlPanel/ViewTemplateTags/
+
+<<lingo Hint>>
+
+{{$:/tags/ViewTemplateTagsFilter||$:/snippets/ListTaggedCascade}}

core/ui/ControlPanel/Saving/GitHub.tid

@@ -13,4 +13,4 @@ caption: {{$:/language/ControlPanel/Saving/GitService/GitHub/Caption}}
 |<<lingo Branch>> |<$edit-text tiddler="$:/GitHub/Branch" default="main" tag="input"/> |
 |<<lingo Path>> |<$edit-text tiddler="$:/GitHub/Path" default="" tag="input"/> |
 |<<lingo Filename>> |<$edit-text tiddler="$:/GitHub/Filename" default="" tag="input"/> |
-|<<lingo ServerURL>> |<$edit-text tiddler="$:/GitHub/ServerURL" default="https://api.github.com" tag="input"/> |
+|<<lingo ServerURL>> |<$edit-text tiddler="$:/GitHub/ServerURL" default="https://api.github.com" tag="input" type="url"/> |

core/ui/ControlPanel/Saving/GitLab.tid

@@ -13,4 +13,4 @@ caption: {{$:/language/ControlPanel/Saving/GitService/GitLab/Caption}}
 |<<lingo Branch>> |<$edit-text tiddler="$:/GitLab/Branch" default="master" tag="input"/> |
 |<<lingo Path>> |<$edit-text tiddler="$:/GitLab/Path" default="" tag="input"/> |
 |<<lingo Filename>> |<$edit-text tiddler="$:/GitLab/Filename" default="" tag="input"/> |
-|<<lingo ServerURL>> |<$edit-text tiddler="$:/GitLab/ServerURL" default="https://gitlab.com/api/v4" tag="input"/> |
+|<<lingo ServerURL>> |<$edit-text tiddler="$:/GitLab/ServerURL" default="https://gitlab.com/api/v4" tag="input" type="url"/> |

core/ui/ControlPanel/Saving/TiddlySpot.tid

@@ -34,7 +34,7 @@ http://$(userName)$.tiddlyspot.com/$path$/
 
 ''<<lingo Advanced/Heading>>''
 
-|<<lingo ServerURL>>  |<$edit-text tiddler="$:/UploadURL" default="" tag="input"/> |
+|<<lingo ServerURL>>  |<$edit-text tiddler="$:/UploadURL" default="" tag="input" type="url"/> |
 |<<lingo Filename>> |<$edit-text tiddler="$:/UploadFilename" default="index.html" tag="input"/> |
 |<<lingo UploadDir>> |<$edit-text tiddler="$:/UploadDir" default="." tag="input"/> |
 |<<lingo BackupDir>> |<$edit-text tiddler="$:/UploadBackupDir" default="." tag="input"/> |

core/ui/ControlPanel/Saving/gitea.tid

@@ -13,4 +13,4 @@ caption: {{$:/language/ControlPanel/Saving/GitService/Gitea/Caption}}
 |<<lingo Branch>> |<$edit-text tiddler="$:/Gitea/Branch" default="master" tag="input"/> |
 |<<lingo Path>> |<$edit-text tiddler="$:/Gitea/Path" default="" tag="input"/> |
 |<<lingo Filename>> |<$edit-text tiddler="$:/Gitea/Filename" default="" tag="input"/> |
-|<<lingo ServerURL>> |<$edit-text tiddler="$:/Gitea/ServerURL" default="https://gitea/api/v1" tag="input"/> |
+|<<lingo ServerURL>> |<$edit-text tiddler="$:/Gitea/ServerURL" default="https://gitea/api/v1" tag="input" type="url"/> |

core/ui/ControlPanel/SocialCard.tid

@@ -0,0 +1,22 @@
+title: $:/core/ui/ControlPanel/SocialCard
+tags: $:/tags/ControlPanel/Advanced
+caption: {{$:/language/ControlPanel/SocialCard/Caption}}
+
+\define lingo-base() $:/language/ControlPanel/
+
+<<lingo SocialCard/Hint>>
+
+|<$link to="$:/SiteTitle"><<lingo Basics/Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
+|<$link to="$:/SiteSubtitle"><<lingo Basics/Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
+|<$link to="$:/SiteDomain"><<lingo SocialCard/Domain/Prompt>></$link> |<$edit-text tiddler="$:/SiteDomain" default="" tag="input" type="url"/> |
+|<$link to="$:/SiteUrl"><<lingo SocialCard/Url/Prompt>></$link> |<$edit-text tiddler="$:/SiteUrl" default="" tag="input" type="url"/> |
+|<$link to="$:/SitePreviewUrl"><<lingo SocialCard/PreviewUrl/Prompt>></$link> |<$edit-text tiddler="$:/SitePreviewUrl" default="" tag="input" type="url"/> |
+
+<%if [[$:/SitePreviewUrl]get[text]else[]!is[blank]] %>
+<div>
+<div>
+<<lingo SocialCard/PreviewUrl/Preview>>
+</div>
+<img src={{$:/SitePreviewUrl}}/>
+</div>
+<%endif%>

core/ui/DefaultSearchResultList.tid

@@ -9,7 +9,7 @@ second-search-filter: [!is[system]search<userInput>sort[title]limit[250]]
 //<small>{{$:/language/Search/Matches/Title}}</small>//
 
 <$list filter="[<userInput>minlength[1]]" variable="ignore">
-<$list filter={{{ [<configTiddler>get[first-search-filter]] }}}>
+<$list filter={{{ [<configTiddler>get[first-search-filter]] }}} emptyMessage={{$:/language/Search/Matches/NoResult}}>
 <span class={{{[<currentTiddler>addsuffix[-primaryList]] -[<searchListState>get[text]] +[then[]else[tc-list-item-selected]] }}}>
 <$transclude tiddler="$:/core/ui/ListItemTemplate"/>
 </span>
@@ -19,7 +19,7 @@ second-search-filter: [!is[system]search<userInput>sort[title]limit[250]]
 //<small>{{$:/language/Search/Matches/All}}</small>//
 
 <$list filter="[<userInput>minlength[1]]" variable="ignore">
-<$list filter={{{ [<configTiddler>get[second-search-filter]] }}}>
+<$list filter={{{ [<configTiddler>get[second-search-filter]] }}} emptyMessage={{$:/language/Search/Matches/NoResult}}>
 <span class={{{[<currentTiddler>addsuffix[-secondaryList]] -[<searchListState>get[text]] +[then[]else[tc-list-item-selected]] }}}>
 <$transclude tiddler="$:/core/ui/ListItemTemplate"/>
 </span>

core/ui/EditorToolbar/bold.tid

@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/bold
 caption: {{$:/language/Buttons/Bold/Caption}}
 description: {{$:/language/Buttons/Bold/Hint}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
 shortcuts: ((bold))
 
 <$action-sendmessage

core/ui/EditorToolbar/excise.tid

@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/excise
 caption: {{$:/language/Buttons/Excise/Caption}}
 description: {{$:/language/Buttons/Excise/Hint}}
-condition: [<targetTiddler>type[]] [<targetTiddler>type[text/vnd.tiddlywiki]] +[first[]]
+condition: [<targetTiddler>type[]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]] +[first[]]
 shortcuts: ((excise))
 dropdown: $:/core/ui/EditorToolbar/excise-dropdown
 

core/ui/EditorToolbar/heading-1.tid

@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/heading-1
 caption: {{$:/language/Buttons/Heading1/Caption}}
 description: {{$:/language/Buttons/Heading1/Hint}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
 button-classes: tc-text-editor-toolbar-item-start-group
 shortcuts: ((heading-1))
 

core/ui/EditorToolbar/heading-2.tid

@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/heading-2
 caption: {{$:/language/Buttons/Heading2/Caption}}
 description: {{$:/language/Buttons/Heading2/Hint}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
 shortcuts: ((heading-2))
 
 <$action-sendmessage

core/ui/EditorToolbar/heading-3.tid

@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/heading-3
 caption: {{$:/language/Buttons/Heading3/Caption}}
 description: {{$:/language/Buttons/Heading3/Hint}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
 shortcuts: ((heading-3))
 
 <$action-sendmessage

core/ui/EditorToolbar/heading-4.tid

@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/heading-4
 caption: {{$:/language/Buttons/Heading4/Caption}}
 description: {{$:/language/Buttons/Heading4/Hint}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
 shortcuts: ((heading-4))
 
 <$action-sendmessage

core/ui/EditorToolbar/heading-5.tid

@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/heading-5
 caption: {{$:/language/Buttons/Heading5/Caption}}
 description: {{$:/language/Buttons/Heading5/Hint}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
 shortcuts: ((heading-5))
 
 <$action-sendmessage

core/ui/EditorToolbar/heading-6.tid

@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/heading-6
 caption: {{$:/language/Buttons/Heading6/Caption}}
 description: {{$:/language/Buttons/Heading6/Hint}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
 shortcuts: ((heading-6))
 
 <$action-sendmessage

core/ui/EditorToolbar/italic.tid

@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/italic
 caption: {{$:/language/Buttons/Italic/Caption}}
 description: {{$:/language/Buttons/Italic/Hint}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
 shortcuts: ((italic))
 
 <$action-sendmessage

core/ui/EditorToolbar/link.tid

@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/link
 caption: {{$:/language/Buttons/Link/Caption}}
 description: {{$:/language/Buttons/Link/Hint}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
 button-classes: tc-text-editor-toolbar-item-start-group
 shortcuts: ((link))
 dropdown: $:/core/ui/EditorToolbar/link-dropdown

core/ui/EditorToolbar/linkify.tid

@@ -1,5 +1,5 @@
 caption: {{$:/language/Buttons/Linkify/Caption}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
 description: {{$:/language/Buttons/Linkify/Hint}}
 icon: $:/core/images/linkify
 list-before: $:/core/ui/EditorToolbar/mono-block

core/ui/EditorToolbar/list-bullet.tid

@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/list-bullet
 caption: {{$:/language/Buttons/ListBullet/Caption}}
 description: {{$:/language/Buttons/ListBullet/Hint}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
 shortcuts: ((list-bullet))
 
 <$action-sendmessage

core/ui/EditorToolbar/list-number.tid

@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/list-number
 caption: {{$:/language/Buttons/ListNumber/Caption}}
 description: {{$:/language/Buttons/ListNumber/Hint}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
 shortcuts: ((list-number))
 
 <$action-sendmessage

core/ui/EditorToolbar/mono-block.tid

@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/mono-block
 caption: {{$:/language/Buttons/MonoBlock/Caption}}
 description: {{$:/language/Buttons/MonoBlock/Hint}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
 button-classes: tc-text-editor-toolbar-item-start-group
 shortcuts: ((mono-block))
 

core/ui/EditorToolbar/mono-line.tid

@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/mono-line
 caption: {{$:/language/Buttons/MonoLine/Caption}}
 description: {{$:/language/Buttons/MonoLine/Hint}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
 shortcuts: ((mono-line))
 
 <$action-sendmessage

core/ui/EditorToolbar/picture.tid

@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/picture
 caption: {{$:/language/Buttons/Picture/Caption}}
 description: {{$:/language/Buttons/Picture/Hint}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
 shortcuts: ((picture))
 dropdown: $:/core/ui/EditorToolbar/picture-dropdown
 

core/ui/EditorToolbar/quote.tid

@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/quote
 caption: {{$:/language/Buttons/Quote/Caption}}
 description: {{$:/language/Buttons/Quote/Hint}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
 shortcuts: ((quote))
 
 <$action-sendmessage

core/ui/EditorToolbar/strikethrough.tid

@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/strikethrough
 caption: {{$:/language/Buttons/Strikethrough/Caption}}
 description: {{$:/language/Buttons/Strikethrough/Hint}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
 shortcuts: ((strikethrough))
 
 <$action-sendmessage

core/ui/EditorToolbar/subscript.tid

@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/subscript
 caption: {{$:/language/Buttons/Subscript/Caption}}
 description: {{$:/language/Buttons/Subscript/Hint}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
 shortcuts: ((subscript))
 
 <$action-sendmessage

core/ui/EditorToolbar/superscript.tid

@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/superscript
 caption: {{$:/language/Buttons/Superscript/Caption}}
 description: {{$:/language/Buttons/Superscript/Hint}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
 shortcuts: ((superscript))
 
 <$action-sendmessage

core/ui/EditorToolbar/transcludify.tid

@@ -1,5 +1,5 @@
 caption: {{$:/language/Buttons/Transcludify/Caption}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
 description: {{$:/language/Buttons/Transcludify/Hint}}
 icon: $:/core/images/transcludify
 list-before: $:/core/ui/EditorToolbar/mono-block

core/ui/EditorToolbar/underline.tid

@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/underline
 caption: {{$:/language/Buttons/Underline/Caption}}
 description: {{$:/language/Buttons/Underline/Hint}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
 shortcuts: ((underline))
 
 <$action-sendmessage

core/ui/KeyboardShortcuts/open-control-panel.tid

@@ -0,0 +1,8 @@
+title: $:/core/ui/KeyboardShortcuts/open-control-panel
+tags: $:/tags/KeyboardShortcut
+key: ((open-control-panel))
+
+\whitespace trim
+<$navigator story="$:/StoryList" history="$:/HistoryList">
+<$action-navigate $to="$:/ControlPanel" $scroll="yes"/>
+</$navigator>

core/ui/SideBarSegments/search.tid

@@ -55,7 +55,7 @@ tags: $:/tags/SideBarSegment
 <$macrocall $name="keyboard-driven-input" tiddler=<<editTiddler>> storeTitle=<<searchTiddler>> 
 		selectionStateTitle=<<searchListState>> refreshTitle="$:/temp/search/refresh" type="search" 
 		tag="input" focus={{$:/config/Search/AutoFocus}} focusPopup=<<qualify "$:/state/popup/search-dropdown">> 
-		class="tc-popup-handle" filterMinLength={{$:/config/Search/MinLength}} inputCancelActions=<<cancel-search-actions>> 
+		class="tc-tiny-gap-right tc-popup-handle" filterMinLength={{$:/config/Search/MinLength}} inputCancelActions=<<cancel-search-actions>> 
 		inputAcceptActions=<<input-accept-actions>> inputAcceptVariantActions=<<input-accept-variant-actions>> cancelPopups="yes" 
 		configTiddlerFilter="[[$:/state/search/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}]"/>
 </form>

core/ui/TagTemplate.tid

@@ -9,7 +9,7 @@ title: $:/core/ui/TagTemplate
 		colour={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}}
 		palette={{$:/palette}}
 		element-tag="$button"
-		element-attributes="""popup=<<qualify "$:/state/popup/tag">> dragFilter="[all[current]tagging[]]" tag='span'"""
+		element-attributes="""popup=<<qualify "$:/state/popup/tag">> dragFilter="[subfilter{$:/core/config/TagPillDragFilter}]" tag='span'"""
 	/>
 	<$reveal state=<<qualify "$:/state/popup/tag">> type="popup" position="below" animate="yes" class="tc-drop-down">
 		<$set name="tv-show-missing-links" value="yes">

core/ui/TestCaseTemplate.tid

@@ -13,7 +13,8 @@ title: $:/core/ui/TestCaseTemplate
 		testActions="Actions"
 		testHideIfPass=<<hideIfPass>>
 	>
+		<$data $compound-filter={{!!import-compound}}/>
 		<$data $compound-tiddler=<<currentTiddler>>/>
-		<$data title="Description" text={{!!description}}/>
+		<%if [{!!description}!is[blank]] %><$data title="Description" text={{!!description}}/><%endif%>
 	</$testcase>
 </$let>

core/ui/TestCases/DefaultTemplate.tid

@@ -2,91 +2,148 @@ title: $:/core/ui/testcases/DefaultTemplate
 code-body: yes
 
 \whitespace trim
+
+\function tf.state() "$:/state/testcase"
+
 \procedure linkcatcherActions()
 <%if [<navigateTo>has[title]] %>
-	<$qualify title=<<state>> name="qualifiedState">
-		<$action-setfield $tiddler=<<qualifiedState>> text=<<navigateTo>>/>
-	</$qualify>
+	<$action-setfield $tiddler=<<tf.state>> text=<<navigateTo>>/>
 <%endif%>
 \end
 
-<$let
-	state={{{ [<qualify "$:/state/testcase">] }}}
->
-	<div class="tc-test-case-wrapper">
-		<div class="tc-test-case-header">
-			<h2>
-				<$genesis $type={{{ [<linkTarget>!match[]then[$link]else[span]] }}} to=<<testcaseTiddler>>>
-					<%if [<testResult>!match[]] %>
-						<span class={{{ tc-test-case-result-icon [<testResult>!match[fail]then[tc-test-case-result-icon-pass]] [<testResult>match[fail]then[tc-test-case-result-icon-fail]] +[join[ ]] }}}>
-							<%if [<testResult>!match[fail]] %>
-								{{$:/core/images/done-button}}
-							<%else%>
-								{{$:/core/images/close-button}}
-							<%endif%>
-						</span>
+\procedure testcase-header()
+<div class="tc-test-case-header">
+	<h2>
+		<$genesis $type={{{ [<linkTarget>!match[]then[$link]else[span]] }}} to=<<testcaseTiddler>>>
+			<%if [<testResult>!match[]] %>
+				<span class={{{ tc-test-case-result-icon
+					[<testResult>!match[fail]then[tc-test-case-result-icon-pass]]
+					[<testResult>match[fail]then[tc-test-case-result-icon-fail]]
+					+[join[ ]] }}}
+				>
+					<%if [<testResult>!match[fail]] %>
+						{{$:/core/images/done-button}}
+					<%else%>
+						{{$:/core/images/close-button}}
 					<%endif%>
-					<$view tiddler="Description" mode="inline"/>
-				</$genesis>
-				<span class="tc-test-case-toolbar">
-					<$button popup=`$(state)$-more`
-						tooltip={{$:/language/Buttons/More/Hint}}
-						aria-label={{$:/language/Buttons/More/Caption}}
-						class="tc-btn-invisible"
-						selectedClass="tc-selected"
-					>
-						{{$:/core/images/down-arrow}}
-					</$button>
-					<$let 
-						tv-config-toolbar-icons="yes"
-						tv-config-toolbar-text="yes"
-						tv-config-toolbar-class="tc-btn-invisible"
-					>
-						<$reveal state=`$(state)$-more` type="popup" position="belowleft" animate="yes">
-							<div class="tc-drop-down">
-								<$list filter="[all[shadows+tiddlers]tag[$:/tags/TestCase/Actions]!has[draft.of]]"
-									variable="listItem"
-								>
-									<$transclude $tiddler=<<listItem>> $mode="inline"/>
-								</$list>
-							</div>
-						</$reveal>
-					</$let>
 				</span>
-			</h2>
+			<%endif%>
+			<$view tiddler="Description" mode="inline"/>
+		</$genesis>
+		<span class="tc-test-case-toolbar">
+			<<testcase-toolbar>>
+		</span>
+	</h2>
+</div>
+\end
+
+\procedure testcase-toolbar()
+<$button popup=`$(tf.state)$-more`
+	tooltip={{$:/language/Buttons/More/Hint}}
+	aria-label={{$:/language/Buttons/More/Caption}}
+	class="tc-btn-invisible"
+	selectedClass="tc-selected"
+>
+	{{$:/core/images/down-arrow}}
+</$button>
+<$let
+	tv-config-toolbar-icons="yes"
+	tv-config-toolbar-text="yes"
+	tv-config-toolbar-class="tc-btn-invisible"
+>
+	<$reveal state=`$(tf.state)$-more` type="popup" position="belowleft" animate="yes">
+		<div class="tc-drop-down">
+			<$list filter="[all[shadows+tiddlers]tag[$:/tags/TestCase/Actions]!has[draft.of]]"
+				variable="listItem"
+			>
+				<$transclude $tiddler=<<listItem>> $mode="inline"/>
+			</$list>
 		</div>
-		<%if [[Narrative]is[tiddler]] %>
-			<div class="tc-test-case-narrative">
-				<$transclude $tiddler="Narrative" $mode="block"/>
-			</div>
-		<%endif%>
-		<%if [<testResult>match[fail]] %>
-			<div class="tc-test-case-result-fail">
-				<div class="tc-test-case-result-fail-header">
-					TEST FAILED
-				</div>
-				<div class="tc-test-case-result-fail-body">
-					<$diff-text source=<<expectedHTML>> dest=<<outputHTML>>/>
-				</div>
-			</div>
-		<%endif%>
-		<div class="tc-test-case-panes">
-			<div class="tc-test-case-source">
-				<$macrocall $name="tabs" tabsList="[all[tiddlers]sort[]] -[prefix<state>] -Description -Narrative -Output Output +[putfirst[]] -[has[plugin-type]]" state=<<state>> default="Output" template="$:/core/ui/testcases/DefaultTemplate/SourceTabs"/>
-			</div>
-			<div class="tc-test-case-divider">
-			</div>
-			<div class="tc-test-case-output">
-				<%if [<displayFormat>!match[]else[wikitext]match[plaintext]] %>
-					<pre><$view tiddler="Output" format="plainwikified" mode="block"/></pre>
-				<%else%>
-					<$linkcatcher actions=<<linkcatcherActions>>>
-						<$tiddler tiddler="Output">
-							<$transclude $tiddler="Output" $mode="block"/>
-						</$tiddler>
-					</$linkcatcher>
-				<%endif%>
-			</div>
-		</div>
-	</div>
+	</$reveal>
 </$let>
+\end
+
+\procedure testcase-narrative()
+<div class="tc-test-case-narrative">
+	<$transclude $tiddler="Narrative" $mode="block"/>
+</div>
+\end
+
+\procedure testcase-fail()
+<div class="tc-test-case-result-fail">
+	<div class="tc-test-case-result-fail-header">
+		TEST FAILED
+	</div>
+	<div class="tc-test-case-result-fail-body">
+		<$diff-text source=<<expectedHTML>> dest=<<outputHTML>>/>
+	</div>
+</div>
+\end
+
+\procedure testcase-output-wikified()
+<$linkcatcher actions=<<linkcatcherActions>>>
+	<$tiddler tiddler="Output">
+		<$transclude $tiddler="Output" $mode="block"/>
+	</$tiddler>
+</$linkcatcher>
+\end
+
+\procedure testcase-output()
+<div class="tc-test-case-output">
+	<%if [<displayFormat>!match[]else[wikitext]match[plaintext]] %>
+		<pre><$view tiddler="Output" format="plainwikified" mode="block"/></pre>
+	<%else%>
+		<<testcase-output-wikified>>
+	<%endif%>
+</div>
+\end
+
+\procedure testcase-tabsList()
+[all[tiddlers]sort[]] Output +[putfirst[]]
+-Description
+-Narrative
+-[[$:/temp/testcase/draft-title]]
+-[has[plugin-type]]
+-[prefix<tf.state>]
+-[prefix[$:/state/popup/export]]
+-[prefix[$:/HistoryList]]
+-[prefix[$:/StoryList]]
+\end
+
+\procedure testcase-source()
+<div class="tc-test-case-source">
+	<$macrocall $name="tabs"
+		tabsList=<<testcase-tabsList>>
+		explicitState=<<tf.state>>
+		default="Output"
+		template="$:/core/ui/testcases/DefaultTemplate/SourceTabs"
+	/>
+</div>
+\end
+
+\procedure testcase-panes()
+<div class="tc-test-case-panes">
+	<<testcase-source>>
+	<div class="tc-test-case-divider"></div>
+	<<testcase-output>>
+</div>
+\end
+
+\procedure testcase-body()
+<div class="tc-test-case-wrapper">
+	<<testcase-header>>
+	<$let testcase-source-state = <<tf.state>>>
+		<$navigator story="$:/StoryList" history="$:/HistoryList">
+			<%if [[Narrative]is[tiddler]] %>
+				<<testcase-narrative>>
+			<%endif%>
+			<%if [<testResult>match[fail]] %>
+				<<testcase-fail>>
+			<%endif%>
+			<<testcase-panes>>
+		</$navigator>
+	</$let>
+</div>
+\end
+
+<<testcase-body>>

core/ui/TestCases/DefaultTemplateSourceTabs.tid

@@ -1,6 +1,22 @@
 title: $:/core/ui/testcases/DefaultTemplate/SourceTabs
 
 \whitespace trim
+
+\procedure testcaseNewTitle() $:/temp/testcase/draft-title
+
+\procedure saveActions()
+<$action-setfield $tiddler=<<currentTab>> $field="draft.title" $value=<<newTitle>>/>
+<$action-sendmessage $message="tm-save-tiddler" $param=<<title>> />
+<$action-setfield $tiddler=<<testcase-source-state>> text=<<newTitle>>/>
+<$action-deletetiddler $tiddler=<<testcaseNewTitle>>/>
+\end
+
+\procedure saveButton(title, newTitle)
+<$button class="tc-btn-invisible tc-test-case-save-button tc-small-gap-left" actions=<<saveActions>> disabled={{{ [<testcaseNewTitle>!has[text]then[yes]] }}}>
+{{$:/core/images/done-button}}
+</$button>
+\end
+
 \procedure body()
 <$list filter="[<currentTab>fields[]] -text +[limit[1]]" variable="ignore">
 	<table class="tc-field-table">
@@ -11,7 +27,12 @@ title: $:/core/ui/testcases/DefaultTemplate/SourceTabs
 						<$text text=<<fieldName>>/>
 					</td>
 					<td>
-						<$view tiddler=<<currentTab>> field=<<fieldName>>/>
+						<%if [<fieldName>match[draft.title]]  %>
+							<$edit-text class="tc-edit-texteditor tc-max-width-80" tiddler=<<testcaseNewTitle>> focus="yes" tag="input"/>
+							<$macrocall $name="saveButton" newTitle={{{ [<testcaseNewTitle>get[text]] }}} title=<<currentTab>>/>
+						<%else%>
+							<$view tiddler=<<currentTab>> field=<<fieldName>>/>
+						<%endif%>
 					</td>
 				</tr>
 			</$list>

core/ui/TestCases/actions/Export.tid

@@ -1,4 +1,4 @@
 title: $:/core/ui/testcases/actions/Export
 tags: $:/tags/TestCase/Actions
 
-<$macrocall $name="exportButton" exportFilter="[all[tiddlers]sort[]] -[prefix[$:/state/]] -Description -Narrative -ExpectedResult -Output Output +[putfirst[]] -[has[plugin-type]]" lingoBase="$:/language/Buttons/ExportTiddlers/"/>
+<$macrocall $name="exportButton" exportFilter="[all[tiddlers]sort[]] -[prefix[$:/state/]] -Description -Narrative -ExpectedResult -[has[plugin-type]]" lingoBase="$:/language/Buttons/ExportTiddlers/"/>

core/ui/ViewTemplate/subtitle.tid

@@ -2,10 +2,4 @@ title: $:/core/ui/ViewTemplate/subtitle
 tags: $:/tags/ViewTemplate
 
 \whitespace trim
-<$reveal type="nomatch" stateTitle=<<folded-state>> text="hide" tag="div" retain="yes" animate="yes">
-<div class="tc-subtitle">
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewTemplate/Subtitle]!has[draft.of]]" variable="subtitleTiddler">
-<$transclude tiddler=<<subtitleTiddler>> mode="inline"/><$list-join>&nbsp;</$list-join>
-</$list>
-</div>
-</$reveal>
+<$transclude tiddler={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/ViewTemplateSubtitleFilter]!is[draft]get[text]] :and[!is[blank]else[$:/core/ui/ViewTemplate/subtitle/default]] }}} />

core/ui/ViewTemplate/subtitle/default.tid

@@ -0,0 +1,10 @@
+title: $:/core/ui/ViewTemplate/subtitle/default
+
+\whitespace trim
+<$reveal type="nomatch" stateTitle=<<folded-state>> text="hide" tag="div" retain="yes" animate="yes">
+<div class="tc-subtitle">
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewTemplate/Subtitle]!has[draft.of]]" variable="subtitleTiddler">
+<$transclude tiddler=<<subtitleTiddler>> mode="inline"/><$list-join>&nbsp;</$list-join>
+</$list>
+</div>
+</$reveal>

core/ui/ViewTemplate/tags.tid

@@ -2,6 +2,4 @@ title: $:/core/ui/ViewTemplate/tags
 tags: $:/tags/ViewTemplate
 
 \whitespace trim
-<$reveal type="nomatch" stateTitle=<<folded-state>> text="hide" tag="div" retain="yes" animate="yes">
-<div class="tc-tags-wrapper"><$list filter="[all[current]tags[]sort[title]]" template="$:/core/ui/TagTemplate" storyview="pop"/></div>
-</$reveal>
+<$transclude tiddler={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/ViewTemplateTagsFilter]!is[draft]get[text]] :and[!is[blank]else[$:/core/ui/ViewTemplate/tags/default]] }}} />

core/ui/ViewTemplate/tags/default.tid

@@ -0,0 +1,11 @@
+title: $:/core/ui/ViewTemplate/tags/default
+
+\whitespace trim
+<$reveal type="nomatch" stateTitle=<<folded-state>> text="hide" tag="div" retain="yes" animate="yes">
+  <div class="tc-tags-wrapper">
+    <$list filter="[all[current]tags[]sort[title]]" template="$:/core/ui/TagTemplate" storyview="pop"/>
+    <$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewTemplate/Tags]!has[draft.of]]">
+      <$transclude mode="inline"/>
+    </$list>
+  </div>
+</$reveal>

core/wiki/config/ShortcutInfo.multids

@@ -32,6 +32,7 @@ mono-line: {{$:/language/Buttons/MonoLine/Hint}}
 new-image: {{$:/language/Buttons/NewImage/Hint}}
 new-journal: {{$:/language/Buttons/NewJournal/Hint}}
 new-tiddler: {{$:/language/Buttons/NewTiddler/Hint}}
+open-control-panel: {{$:/language/Buttons/OpenControlPanel/Hint}}
 picture: {{$:/language/Buttons/Picture/Hint}}
 preview: {{$:/language/Buttons/Preview/Hint}}
 quote: {{$:/language/Buttons/Quote/Hint}}

core/wiki/config/TagPillDragFilter.tid

@@ -0,0 +1,2 @@
+title: $:/core/config/TagPillDragFilter
+text: [all[current]tagging[]] +[!is[draft]]

core/wiki/config/ViewTemplateSubtitleFilters.multids

@@ -0,0 +1,4 @@
+title: $:/config/ViewTemplateSubtitleFilters/
+tags: $:/tags/ViewTemplateSubtitleFilter
+
+default: [[$:/core/ui/ViewTemplate/subtitle/default]]

core/wiki/config/ViewTemplateTagsFilters.multids

@@ -0,0 +1,4 @@
+title: $:/config/ViewTemplateTagsFilters/
+tags: $:/tags/ViewTemplateTagsFilter
+
+default: [[$:/core/ui/ViewTemplate/tags/default]]

core/wiki/config/shortcuts/shortcuts.multids

@@ -28,6 +28,7 @@ list-bullet: ctrl-shift-L
 list-number: ctrl-shift-N
 mono-block: ctrl-shift-M
 mono-line: ctrl-M
+open-control-panel: ctrl-alt-C
 picture: ctrl-shift-I
 preview: alt-P
 quote: ctrl-Q

core/wiki/macros/tag-picker.tid

@@ -83,6 +83,9 @@ The second ESC tries to close the "draft tiddler"
 		emptyMessage="<div class='tc-search-results'>{{$:/language/Search/Search/TooShort}}</div>" variable="listItem"
 	>
 		<$list filter=<<filter>> variable="tag">
+			<$list-empty>
+				<span class="tc-small-gap-left">{{$:/language/EditTemplate/Tags/EmptyMessage}}</span>
+			</$list-empty>
 			<!-- 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 -->

core/wiki/tags/TextEditorSnippet.tid

@@ -0,0 +1,2 @@
+title: $:/tags/TextEditor/Snippet
+list: $:/language/Snippets/ProcedureDefinition $:/language/Snippets/FunctionDefinition $:/language/Snippets/ListByTag $:/language/Snippets/Table4x3 $:/language/Snippets/TableOfContents $:/language/Snippets/MacroDefinition

core/wiki/tags/ViewTemplateBodyFilter.tid

@@ -1,2 +1,2 @@
 title: $:/tags/ViewTemplateBodyFilter
-list: $:/config/ViewTemplateBodyFilters/testcase $:/config/ViewTemplateBodyFilters/hide-body $:/config/ViewTemplateBodyFilters/code-body $:/config/ViewTemplateBodyFilters/stylesheet $:/config/ViewTemplateBodyFilters/core-ui-advanced-search $:/config/ViewTemplateBodyFilters/core-ui-tags $:/config/ViewTemplateBodyFilters/system $:/config/ViewTemplateBodyFilters/import $:/config/ViewTemplateBodyFilters/plugin $:/config/ViewTemplateBodyFilters/default
+list: $:/config/ViewTemplateBodyFilters/testcase $:/config/ViewTemplateBodyFilters/hide-body $:/config/ViewTemplateBodyFilters/code-body $:/config/ViewTemplateBodyFilters/stylesheet $:/config/ViewTemplateBodyFilters/core-ui-advanced-search $:/config/ViewTemplateBodyFilters/core-ui-tags $:/config/ViewTemplateBodyFilters/import $:/config/ViewTemplateBodyFilters/plugin $:/config/ViewTemplateBodyFilters/system $:/config/ViewTemplateBodyFilters/default

editions/dev/tiddlers/system/version-macros.tid

@@ -9,6 +9,6 @@ type: text/vnd.tiddlywiki
 <$link to={{{ [<__version__>addprefix[Release ]] }}} class="doc-from-version">{{$:/core/images/warning}} New in: <$text text=<<__version__>>/></$link>
 \end
 
-\define .deprecated-since(version, superseded:"TODO-Link")
-<$link to="Deprecated - What does it mean" class="doc-deprecated-version tc-btn-invisible">{{$:/core/images/warning}} Deprecated since: <$text text=<<__version__>>/></$link> (see <$link to=<<__superseded__>>><$text text=<<__superseded__>>/></$link>)
+\define .deprecated-since(version, superseded:"")
+<$link to="Deprecated - What does it mean" class="doc-deprecated-version tc-btn-invisible">{{$:/core/images/warning}} Deprecated from v<$text text=<<__version__>>/></$link> <%if [<__superseded__>else[]!match[]] %>(see <$link to=<<__superseded__>>><$text text=<<__superseded__>>/></$link>)<%endif%>
 \end

editions/fr-FR/tiddlers/$__editions_tw5.com_version-macros.tid

@@ -9,7 +9,7 @@ type: text/vnd.tiddlywiki
 \end
 
 \define .deprecated-since(version, superseded:"TODO-Link")
-<$button to="Deprecated - What does it mean" class="doc-deprecated-version tc-btn-invisible">{{$:/core/images/warning}} Obsolète depuis<<:>> $version$ </$button>. Utilisez [[$superseded$]] à la place
+<$button to="Deprecated - What does it mean" class="doc-deprecated-version tc-btn-invisible">{{$:/core/images/warning}} Obsolète depuis<<:>> $version$ </$button>. <%if [<__superseded__>else[]!match[]] %>Utilisez [[$superseded$]] à la place<%endif%>
 \end
 
 <pre><$view field="text"/></pre>

editions/full/tiddlywiki.info

@@ -57,7 +57,8 @@
 		"sl-SI",
 		"sv-SE",
 		"zh-Hans",
-		"zh-Hant"
+		"zh-Hant",
+		"zh-HK"
 	],
 	"themes": [
 		"tiddlywiki/centralised",

editions/geospatialdemo/tiddlers/real-estate-demo/schema.json

@@ -16,7 +16,7 @@
 		{"name": "nearest-volcano", "caption": "Nearest Volcano", "type": "string", "display": "[{$:/geospatialdemo/features/harvard-volcanoes-of-the-world}geonearestpoint<coords>]"}
 	],
 	"variables": {
-		"coords": "[<rowTiddler>] :map[geopoint{!!long},{!!lat}]",
-		"census-data": "[<rowTiddler>] :map[geopoint{!!long},{!!lat}geolookup{$:/geospatialdemo/features/canada-census-subdivision-millesime}]"
+		"coords": "[<rowTiddler>] :map[geopoint{!!lat},{!!long}]",
+		"census-data": "[<rowTiddler>] :map[geopoint{!!lat},{!!long}geolookup{$:/geospatialdemo/features/canada-census-subdivision-millesime}]"
 	}
 }