Revert properly

We'll come back to that

.eslintrc.yml

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

.github/workflows/cla-check.yml

@@ -14,7 +14,7 @@ jobs:
     if: ${{ (github.event.pull_request.user.login != github.repository_owner) }}
     steps:
     - run: |
-        if ! curl -s https://raw.githubusercontent.com/Jermolene/TiddlyWiki5/tiddlywiki-com/licenses/cla-individual.md | grep -o "@$USER,"; then
+        if ! curl -s https://raw.githubusercontent.com/Jermolene/TiddlyWiki5/tiddlywiki-com/licenses/cla-individual.md | grep -io "@$USER,"; then
           echo "CLA not signed"
           gh pr comment "$NUMBER" -b "@$USER It appears that this is your first contribution to the project, welcome.
           

.github/workflows/cla-signed.yml

@@ -23,8 +23,8 @@ jobs:
       pull-requests: write
     steps:
     - run: |
-        if ! $BRANCH == "tiddlywiki-com"; then
-          echo "This CLA signature targets the wrong branch"
+        if [[ "$BRANCH" != "tiddlywiki-com" ]]; then
+          echo "This CLA signature targets the wrong branch: $BRANCH"
           gh pr comment "$NUMBER" -b "@$AUTHOR Signatures to the CLA must target the 'tiddlywiki-com' branch."
         fi
       env:

bin/build-site.sh

@@ -5,7 +5,7 @@
 # Default to the current version number for building the plugin library
 
 if [  -z "$TW5_BUILD_VERSION" ]; then
-    TW5_BUILD_VERSION=v5.3.6
+    TW5_BUILD_VERSION=v5.3.5
 fi
 
 echo "Using TW5_BUILD_VERSION as [$TW5_BUILD_VERSION]"
@@ -164,20 +164,6 @@ node $TW5_BUILD_TIDDLYWIKI \
 	--rendertiddler $:/core/save/all tour.html text/plain \
 	|| exit 1
 
-# /dev/index.html			Developer docs
-# /dev/favicon.ico			Favicon for dev site
-# /dev/static.html			Static rendering of default tiddlers
-# /dev/alltiddlers.html		Static rendering of all tiddlers
-# /dev/static/*				Static single tiddlers
-# /dev/static/static.css	Static stylesheet
-node $TW5_BUILD_TIDDLYWIKI \
-	./editions/dev \
-	--verbose \
-	--load $TW5_BUILD_OUTPUT/build.tid \
-	--output $TW5_BUILD_OUTPUT/dev \
-	--build index favicon static \
-	|| exit 1
-
 # /share.html				Custom edition for sharing via the URL
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/share \

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/bootprefix.js

@@ -21,7 +21,7 @@ $tw.boot = $tw.boot || Object.create(null);
 
 // Detect platforms
 if(!("browser" in $tw)) {
-	$tw.browser = typeof(window) !== "undefined" && typeof(document) !== "undefined" ? {} : null;
+	$tw.browser = typeof(window) !== "undefined" ? {} : null;
 }
 if(!("node" in $tw)) {
 	$tw.node = typeof(process) === "object" ? {} : null;

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

@@ -1,5 +0,0 @@
-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,7 +80,6 @@ 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

core/language/en-GB/ControlPanel.multids

@@ -198,12 +198,6 @@ 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
@@ -241,7 +235,3 @@ 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/Snippets/FunctionDefinition.tid

@@ -1,7 +0,0 @@
-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

@@ -1,7 +0,0 @@
-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

@@ -0,0 +1,5 @@
+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

@@ -1,5 +0,0 @@
-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,22 +45,17 @@ Render individual tiddlers and save the results to the specified files
 				variableList = variableList.slice(2);
 			}
 		$tw.utils.each(tiddlers,function(title) {
-			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 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 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/config.js

@@ -30,7 +30,7 @@ exports.textPrimitives.wikiLink = exports.textPrimitives.upperLetter + "+" +
 	exports.textPrimitives.upperLetter +
 	exports.textPrimitives.anyLetter + "*";
 
-exports.htmlEntities = {quot:34, dollar:36, amp:38, apos:39, lt:60, gt:62, nbsp:160, iexcl:161, cent:162, pound:163, curren:164, yen:165, brvbar:166, sect:167, uml:168, copy:169, ordf:170, laquo:171, not:172, shy:173, reg:174, macr:175, deg:176, plusmn:177, sup2:178, sup3:179, acute:180, micro:181, para:182, middot:183, cedil:184, sup1:185, ordm:186, raquo:187, frac14:188, frac12:189, frac34:190, iquest:191, Agrave:192, Aacute:193, Acirc:194, Atilde:195, Auml:196, Aring:197, AElig:198, Ccedil:199, Egrave:200, Eacute:201, Ecirc:202, Euml:203, Igrave:204, Iacute:205, Icirc:206, Iuml:207, ETH:208, Ntilde:209, Ograve:210, Oacute:211, Ocirc:212, Otilde:213, Ouml:214, times:215, Oslash:216, Ugrave:217, Uacute:218, Ucirc:219, Uuml:220, Yacute:221, THORN:222, szlig:223, agrave:224, aacute:225, acirc:226, atilde:227, auml:228, aring:229, aelig:230, ccedil:231, egrave:232, eacute:233, ecirc:234, euml:235, igrave:236, iacute:237, icirc:238, iuml:239, eth:240, ntilde:241, ograve:242, oacute:243, ocirc:244, otilde:245, ouml:246, divide:247, oslash:248, ugrave:249, uacute:250, ucirc:251, uuml:252, yacute:253, thorn:254, yuml:255, OElig:338, oelig:339, Scaron:352, scaron:353, Yuml:376, fnof:402, circ:710, tilde:732, Alpha:913, Beta:914, Gamma:915, Delta:916, Epsilon:917, Zeta:918, Eta:919, Theta:920, Iota:921, Kappa:922, Lambda:923, Mu:924, Nu:925, Xi:926, Omicron:927, Pi:928, Rho:929, Sigma:931, Tau:932, Upsilon:933, Phi:934, Chi:935, Psi:936, Omega:937, alpha:945, beta:946, gamma:947, delta:948, epsilon:949, zeta:950, eta:951, theta:952, iota:953, kappa:954, lambda:955, mu:956, nu:957, xi:958, omicron:959, pi:960, rho:961, sigmaf:962, sigma:963, tau:964, upsilon:965, phi:966, chi:967, psi:968, omega:969, thetasym:977, upsih:978, piv:982, ensp:8194, emsp:8195, thinsp:8201, zwnj:8204, zwj:8205, lrm:8206, rlm:8207, ndash:8211, mdash:8212, lsquo:8216, rsquo:8217, sbquo:8218, ldquo:8220, rdquo:8221, bdquo:8222, dagger:8224, Dagger:8225, bull:8226, hellip:8230, permil:8240, prime:8242, Prime:8243, lsaquo:8249, rsaquo:8250, oline:8254, frasl:8260, nobreak:8288, NoBreak:8288, euro:8364, image:8465, weierp:8472, real:8476, trade:8482, alefsym:8501, larr:8592, uarr:8593, rarr:8594, darr:8595, harr:8596, crarr:8629, lArr:8656, uArr:8657, rArr:8658, dArr:8659, hArr:8660, forall:8704, part:8706, exist:8707, empty:8709, nabla:8711, isin:8712, notin:8713, ni:8715, prod:8719, sum:8721, minus:8722, lowast:8727, radic:8730, prop:8733, infin:8734, ang:8736, and:8743, or:8744, cap:8745, cup:8746, int:8747, there4:8756, sim:8764, cong:8773, asymp:8776, ne:8800, equiv:8801, le:8804, ge:8805, sub:8834, sup:8835, nsub:8836, sube:8838, supe:8839, oplus:8853, otimes:8855, perp:8869, sdot:8901, lceil:8968, rceil:8969, lfloor:8970, rfloor:8971, lang:9001, rang:9002, loz:9674, spades:9824, clubs:9827, hearts:9829, diams:9830 };
+exports.htmlEntities = {quot:34, dollar:36, amp:38, apos:39, lt:60, gt:62, nbsp:160, iexcl:161, cent:162, pound:163, curren:164, yen:165, brvbar:166, sect:167, uml:168, copy:169, ordf:170, laquo:171, not:172, shy:173, reg:174, macr:175, deg:176, plusmn:177, sup2:178, sup3:179, acute:180, micro:181, para:182, middot:183, cedil:184, sup1:185, ordm:186, raquo:187, frac14:188, frac12:189, frac34:190, iquest:191, Agrave:192, Aacute:193, Acirc:194, Atilde:195, Auml:196, Aring:197, AElig:198, Ccedil:199, Egrave:200, Eacute:201, Ecirc:202, Euml:203, Igrave:204, Iacute:205, Icirc:206, Iuml:207, ETH:208, Ntilde:209, Ograve:210, Oacute:211, Ocirc:212, Otilde:213, Ouml:214, times:215, Oslash:216, Ugrave:217, Uacute:218, Ucirc:219, Uuml:220, Yacute:221, THORN:222, szlig:223, agrave:224, aacute:225, acirc:226, atilde:227, auml:228, aring:229, aelig:230, ccedil:231, egrave:232, eacute:233, ecirc:234, euml:235, igrave:236, iacute:237, icirc:238, iuml:239, eth:240, ntilde:241, ograve:242, oacute:243, ocirc:244, otilde:245, ouml:246, divide:247, oslash:248, ugrave:249, uacute:250, ucirc:251, uuml:252, yacute:253, thorn:254, yuml:255, OElig:338, oelig:339, Scaron:352, scaron:353, Yuml:376, fnof:402, circ:710, tilde:732, Alpha:913, Beta:914, Gamma:915, Delta:916, Epsilon:917, Zeta:918, Eta:919, Theta:920, Iota:921, Kappa:922, Lambda:923, Mu:924, Nu:925, Xi:926, Omicron:927, Pi:928, Rho:929, Sigma:931, Tau:932, Upsilon:933, Phi:934, Chi:935, Psi:936, Omega:937, alpha:945, beta:946, gamma:947, delta:948, epsilon:949, zeta:950, eta:951, theta:952, iota:953, kappa:954, lambda:955, mu:956, nu:957, xi:958, omicron:959, pi:960, rho:961, sigmaf:962, sigma:963, tau:964, upsilon:965, phi:966, chi:967, psi:968, omega:969, thetasym:977, upsih:978, piv:982, ensp:8194, emsp:8195, thinsp:8201, zwnj:8204, zwj:8205, lrm:8206, rlm:8207, ndash:8211, mdash:8212, lsquo:8216, rsquo:8217, sbquo:8218, ldquo:8220, rdquo:8221, bdquo:8222, dagger:8224, Dagger:8225, bull:8226, hellip:8230, permil:8240, prime:8242, Prime:8243, lsaquo:8249, rsaquo:8250, oline:8254, frasl:8260, euro:8364, image:8465, weierp:8472, real:8476, trade:8482, alefsym:8501, larr:8592, uarr:8593, rarr:8594, darr:8595, harr:8596, crarr:8629, lArr:8656, uArr:8657, rArr:8658, dArr:8659, hArr:8660, forall:8704, part:8706, exist:8707, empty:8709, nabla:8711, isin:8712, notin:8713, ni:8715, prod:8719, sum:8721, minus:8722, lowast:8727, radic:8730, prop:8733, infin:8734, ang:8736, and:8743, or:8744, cap:8745, cup:8746, int:8747, there4:8756, sim:8764, cong:8773, asymp:8776, ne:8800, equiv:8801, le:8804, ge:8805, sub:8834, sup:8835, nsub:8836, sube:8838, supe:8839, oplus:8853, otimes:8855, perp:8869, sdot:8901, lceil:8968, rceil:8969, lfloor:8970, rfloor:8971, lang:9001, rang:9002, loz:9674, spades:9824, clubs:9827, hearts:9829, diams:9830 };
 
 exports.htmlVoidElements = "area,base,br,col,command,embed,hr,img,input,keygen,link,meta,param,source,track,wbr".split(",");
 

core/modules/savers/put.js

@@ -48,7 +48,7 @@ var PutSaver = function(wiki) {
 	var self = this;
 	var uri = this.uri();
 	// Async server probe. Until probe finishes, save will fail fast
-	// See also https://github.com/TiddlyWiki/TiddlyWiki5/issues/2276
+	// See also https://github.com/Jermolene/TiddlyWiki5/issues/2276
 	$tw.utils.httpRequest({
 		url: uri,
 		type: "OPTIONS",

core/modules/storyviews/classic.js

@@ -30,8 +30,12 @@ ClassicStoryView.prototype.navigateTo = function(historyInfo) {
 	if(!targetElement || targetElement.nodeType === Node.TEXT_NODE) {
 		return;
 	}
-	// Scroll the node into view
-	this.listWidget.dispatchEvent({type: "tm-scroll", target: targetElement});
+	if(duration) {
+		// Scroll the node into view
+		this.listWidget.dispatchEvent({type: "tm-scroll", target: targetElement});
+	} else {
+		targetElement.scrollIntoView();
+	}
 };
 
 ClassicStoryView.prototype.insert = function(widget) {
@@ -78,10 +82,6 @@ ClassicStoryView.prototype.remove = function(widget) {
 			removeElement = function() {
 				widget.removeChildDomNodes();
 			};
-		// Blur the focus if it is within the descendents of the node we are removing
-		if($tw.utils.domContains(targetElement,targetElement.ownerDocument.activeElement)) {
-			targetElement.ownerDocument.activeElement.blur();
-		}
 		// Abandon if the list entry isn't a DOM element (it might be a text node)
 		if(!targetElement || targetElement.nodeType === Node.TEXT_NODE) {
 			removeElement();

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", "$:/build"],
+var DONT_IMPORT_LIST = ["$:/Import"],
 	UNSELECT_PREFIX_LIST = ["$:/temp/","$:/state/","$:/StoryList","$:/HistoryList"],
 	WARN_IMPORT_PREFIX_LIST = ["$:/core/modules/"];
 

core/modules/utils/dom/dom.js

@@ -270,7 +270,6 @@ Copy plain text to the clipboard on browsers that support it
 */
 exports.copyToClipboard = function(text,options) {
 	options = options || {};
-	text = text || "";
 	var textArea = document.createElement("textarea");
 	textArea.style.position = "fixed";
 	textArea.style.top = 0;
@@ -290,7 +289,7 @@ exports.copyToClipboard = function(text,options) {
 	var succeeded = false;
 	try {
 		succeeded = document.execCommand("copy");
-	} catch(err) {
+	} catch (err) {
 	}
 	if(!options.doNotNotify) {
 		var successNotification = options.successNotification || "$:/language/Notifications/CopiedToClipboard/Succeeded",
@@ -327,7 +326,7 @@ exports.collectDOMVariables = function(selectedNode,domNode,event) {
 			variables["tv-popup-coords"] = Popup.buildCoordinates(Popup.coordinatePrefix.csOffsetParent,nodeRect);
 
 			var absRect = $tw.utils.extend({}, nodeRect);
-			for(var currentNode = selectedNode.offsetParent; currentNode; currentNode = currentNode.offsetParent) {
+			for (var currentNode = selectedNode.offsetParent; currentNode; currentNode = currentNode.offsetParent) {
 				absRect.left += currentNode.offsetLeft;
 				absRect.top += currentNode.offsetTop;
 			}

core/modules/utils/filesystem.js

@@ -238,7 +238,7 @@ exports.generateTiddlerFileInfo = function(tiddler,options) {
 	} else {
 		// Save as a .tid or a text/binary file plus a .meta file
 		var tiddlerType = tiddler.fields.type || "text/vnd.tiddlywiki";
-		if(tiddlerType === "text/vnd.tiddlywiki" || tiddlerType === "text/vnd.tiddlywiki-multiple" || tiddler.hasField("_canonical_uri")) {
+		if(tiddlerType === "text/vnd.tiddlywiki" || tiddler.hasField("_canonical_uri")) {
 			// Save as a .tid file
 			fileInfo.type = "application/x-tiddler";
 			fileInfo.hasMetaFile = false;

core/modules/widgets/data.js

@@ -75,9 +75,7 @@ DataWidget.prototype.computeDataTiddlerValues = function() {
 		}
 	});
 	// Deal with $tiddler, $filter or $compound-tiddler attributes
-	var tiddlers = [],
-		compoundTiddlers,
-		title;
+	var tiddlers = [],title;
 	if(this.hasAttribute("$tiddler")) {
 		title = this.getAttribute("$tiddler");
 		if(title) {
@@ -105,17 +103,8 @@ 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") && !this.hasAttribute("$compound-filter")) {
+	if(!this.hasAttribute("$tiddler") && !this.hasAttribute("$filter") && !this.hasAttribute("$compound-tiddler")) {
 		if(Object.keys(item).length > 0 && !!item.title) {
 			return [new $tw.Tiddler(item)];
 		} else {

core/modules/wiki.js

@@ -560,22 +560,18 @@ exports.extractTranscludes = function(parseTreeRoot, title) {
 			for(var t=0; t<parseTree.length; t++) {
 				var parseTreeNode = parseTree[t];
 				if(parseTreeNode.type === "transclude") {
-					if(parseTreeNode.attributes.$tiddler) {
-						if(parseTreeNode.attributes.$tiddler.type === "string") {
-							var value;
-							// if it is Transclusion with Templates like `{{Index||$:/core/ui/TagTemplate}}`, the `$tiddler` will point to the template. We need to find the actual target tiddler from parent node
-							if(parentNode && parentNode.type === "tiddler" && parentNode.attributes.tiddler && parentNode.attributes.tiddler.type === "string") {
-								// Empty value (like `{{!!field}}`) means self-referential transclusion.
-								value = parentNode.attributes.tiddler.value || title;
-							} else {
-								value = parseTreeNode.attributes.$tiddler.value;
-							}
-						}
-					} else if(parseTreeNode.attributes.tiddler) {
-						if (parseTreeNode.attributes.tiddler.type === "string") {
-							// Old transclude widget usage
-							value = parseTreeNode.attributes.tiddler.value;
+					if(parseTreeNode.attributes.$tiddler && parseTreeNode.attributes.$tiddler.type === "string") {
+						var value;
+						// if it is Transclusion with Templates like `{{Index||$:/core/ui/TagTemplate}}`, the `$tiddler` will point to the template. We need to find the actual target tiddler from parent node
+						if(parentNode && parentNode.type === "tiddler" && parentNode.attributes.tiddler && parentNode.attributes.tiddler.type === "string") {
+							// Empty value (like `{{!!field}}`) means self-referential transclusion. 
+							value = parentNode.attributes.tiddler.value || title;
+						} else {
+							value = parseTreeNode.attributes.$tiddler.value;
 						}
+					} else if(parseTreeNode.attributes.tiddler && parseTreeNode.attributes.tiddler.type === "string") {
+						// Old transclude widget usage
+						value = parseTreeNode.attributes.tiddler.value;
 					} else if(parseTreeNode.attributes.$field && parseTreeNode.attributes.$field.type === "string") {
 						// Empty value (like `<$transclude $field='created'/>`) means self-referential transclusion. 
 						value = title;

core/templates/social-metadata.tid

@@ -1,38 +0,0 @@
-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" "$:/SitePreviewImageUrl" "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" "$:/SitePreviewImageUrl">>

core/ui/ControlPanel/Cascades/ViewTemplateSubtitle.tid

@@ -1,9 +0,0 @@
-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

@@ -1,9 +0,0 @@
-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/SocialCard.tid

@@ -1,22 +0,0 @@
-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"/> |
-|<$link to="$:/SiteUrl"><<lingo SocialCard/Url/Prompt>></$link> |<$edit-text tiddler="$:/SiteUrl" default="" tag="input"/> |
-|<$link to="$:/SitePreviewUrl"><<lingo SocialCard/PreviewUrl/Prompt>></$link> |<$edit-text tiddler="$:/SitePreviewUrl" default="" tag="input"/> |
-
-<%if [[$:/SitePreviewUrl]get[text]else[]!is[blank]] %>
-<div>
-<div>
-<<lingo SocialCard/PreviewUrl/Preview>>
-</div>
-<img src={{$:/SitePreviewUrl}}/>
-</div>
-<%endif%>

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>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[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>get[type]prefix[text/vnd.tiddlywiki]] +[first[]]
+condition: [<targetTiddler>type[]] [<targetTiddler>type[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>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[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>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[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>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[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>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[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>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[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>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[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>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[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>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[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>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[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>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[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>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[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>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[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>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[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>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[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>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[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>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[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>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[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>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[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>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[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>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
 shortcuts: ((underline))
 
 <$action-sendmessage

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

@@ -1,8 +0,0 @@
-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/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="[subfilter{$:/core/config/TagPillDragFilter}]" tag='span'"""
+		element-attributes="""popup=<<qualify "$:/state/popup/tag">> dragFilter="[all[current]tagging[]]" 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,8 +13,7 @@ title: $:/core/ui/TestCaseTemplate
 		testActions="Actions"
 		testHideIfPass=<<hideIfPass>>
 	>
-		<$data $compound-filter={{!!import-compound}}/>
 		<$data $compound-tiddler=<<currentTiddler>>/>
-		<%if [{!!description}!is[blank]] %><$data title="Description" text={{!!description}}/><%endif%>
+		<$data title="Description" text={{!!description}}/>
 	</$testcase>
 </$let>

core/ui/TestCases/DefaultTemplate.tid

@@ -1,5 +1,4 @@
 title: $:/core/ui/testcases/DefaultTemplate
-code-body: yes
 
 \whitespace trim
 \procedure linkcatcherActions()
@@ -47,7 +46,7 @@ code-body: yes
 								<$list filter="[all[shadows+tiddlers]tag[$:/tags/TestCase/Actions]!has[draft.of]]"
 									variable="listItem"
 								>
-									<$transclude $tiddler=<<listItem>> $mode="inline"/>
+									<$transclude tiddler=<<listItem>> mode="inline"/>
 								</$list>
 							</div>
 						</$reveal>
@@ -57,7 +56,7 @@ code-body: yes
 		</div>
 		<%if [[Narrative]is[tiddler]] %>
 			<div class="tc-test-case-narrative">
-				<$transclude $tiddler="Narrative" $mode="block"/>
+				<$transclude $tiddler="Narrative" mode="block"/>
 			</div>
 		<%endif%>
 		<%if [<testResult>match[fail]] %>

core/ui/ViewTemplate/body/code.tid

@@ -1,4 +1,3 @@
 title: $:/core/ui/ViewTemplate/body/code
 
-<$transclude $variable="copy-to-clipboard-above-right" src={{{ [<currentTiddler>get[text]] }}} />
 <$codeblock code={{{ [<currentTiddler>get[text]] }}} language={{{ [<currentTiddler>get[type]else[text/vnd.tiddlywiki]] }}}/>

core/ui/ViewTemplate/body/import.tid

@@ -6,7 +6,6 @@ title: $:/core/ui/ViewTemplate/body/import
 \whitespace trim
 <$action-confirm $message={{$:/language/Import/Listing/Cancel/Warning}} >
 <$action-deletetiddler $tiddler=<<currentTiddler>>/>
-<$action-deletetiddler $tiddler="$:/state/import/select-all"/>
 <$action-sendmessage $message="tm-close-tiddler" title=<<currentTiddler>>/>
 </$action-confirm>
 \end

core/ui/ViewTemplate/subtitle.tid

@@ -2,4 +2,10 @@ title: $:/core/ui/ViewTemplate/subtitle
 tags: $:/tags/ViewTemplate
 
 \whitespace trim
-<$transclude tiddler={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/ViewTemplateSubtitleFilter]!is[draft]get[text]] :and[!is[blank]else[$:/core/ui/ViewTemplate/subtitle/default]] }}} />
+<$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/subtitle/default.tid

@@ -1,10 +0,0 @@
-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,4 +2,6 @@ title: $:/core/ui/ViewTemplate/tags
 tags: $:/tags/ViewTemplate
 
 \whitespace trim
-<$transclude tiddler={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/ViewTemplateTagsFilter]!is[draft]get[text]] :and[!is[blank]else[$:/core/ui/ViewTemplate/tags/default]] }}} />
+<$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>

core/ui/ViewTemplate/tags/default.tid

@@ -1,11 +0,0 @@
-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/OfficialPluginLibrary.tid

@@ -1,6 +1,6 @@
 title: $:/config/OfficialPluginLibrary
 tags: $:/tags/PluginLibrary
-url: https://tiddlywiki.com/library/v5.3.6/index.html
+url: https://tiddlywiki.com/library/v5.3.5/index.html
 caption: {{$:/language/OfficialPluginLibrary}}
 
 {{$:/language/OfficialPluginLibrary/Hint}}

core/wiki/config/ShortcutInfo.multids

@@ -32,7 +32,6 @@ 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

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

core/wiki/config/ViewTemplateBodyFilters.multids

@@ -4,7 +4,7 @@ tags: $:/tags/ViewTemplateBodyFilter
 testcase: [tag[$:/tags/wiki-test-spec]type[text/vnd.tiddlywiki-multiple]then[$:/core/ui/TestCaseTemplate]] [tag[$:/tags/wiki-test-spec-failing]type[text/vnd.tiddlywiki-multiple]then[$:/core/ui/TestCaseTemplate]]
 stylesheet: [tag[$:/tags/Stylesheet]then[$:/core/ui/ViewTemplate/body/rendered-plain-text]]
 core-ui-tags: [tag[$:/tags/PageTemplate]] [tag[$:/tags/EditTemplate]] [tag[$:/tags/ViewTemplate]] [tag[$:/tags/KeyboardShortcut]] [tag[$:/tags/ImportPreview]] [tag[$:/tags/EditPreview]][tag[$:/tags/EditorToolbar]] [tag[$:/tags/Actions]] :then[[$:/core/ui/ViewTemplate/body/code]]
-system: [prefix[$:/boot/]] [prefix[$:/core/macros]] [prefix[$:/core/save/]] [prefix[$:/core/templates/]]  [prefix[$:/config/]] [prefix[$:/info/]] [prefix[$:/language/]] [prefix[$:/languages/]] [prefix[$:/snippets/]]  [prefix[$:/info/]] [prefix[$:/state/]] [prefix[$:/status/]] [prefix[$:/temp/]] :and[!is[image]]  :then[[$:/core/ui/ViewTemplate/body/code]]
+system: [prefix[$:/boot/]] [prefix[$:/config/]] [prefix[$:/core/macros]] [prefix[$:/core/save/]] [prefix[$:/core/templates/]]  [prefix[$:/info/]] [prefix[$:/language/]] [prefix[$:/languages/]] [prefix[$:/snippets/]] [prefix[$:/state/]] [prefix[$:/status/]] [prefix[$:/info/]] [prefix[$:/temp/]] +[!is[image]limit[1]then[$:/core/ui/ViewTemplate/body/code]]
 code-body: [field:code-body[yes]then[$:/core/ui/ViewTemplate/body/code]]
 import: [field:plugin-type[import]then[$:/core/ui/ViewTemplate/body/import]]
 plugin: [has[plugin-type]then[$:/core/ui/ViewTemplate/body/plugin]]

core/wiki/config/ViewTemplateSubtitleFilters.multids

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

core/wiki/config/ViewTemplateTagsFilters.multids

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

core/wiki/config/shortcuts/shortcuts.multids

@@ -28,7 +28,6 @@ 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/tags/TextEditorSnippet.tid

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

editions/geospatialdemo/tiddlers/Features.tid

@@ -4,17 +4,11 @@ tags: $:/tags/GeospatialDemo
 This is a list of all the tiddlers containing ~GeoJSON feature collections in this wiki (identified by the tag <<tag "$:/tags/GeoFeature">>). A ~GeoJSON feature collection is a list of features, each of which consists of a geometry and associated metadata.
 
 <ul>
-	<$list filter="[all[shadows+tiddlers]tag[$:/tags/GeoFeature]sort[caption]]">
-		<li>
-			<$checkbox
-				tiddler={{{ [[$:/config/GeospatialDemo/FeatureVisibility/]addsuffix<currentTiddler>] }}}
-				field="text" checked="show" unchecked="hide" default="show"
-			>
-				<<lingo Description>>
-			</$checkbox>
-			<$link>
-				<$transclude field="caption"><$view field="title"/></$view>
-			</$link>
-		</li>
-	</$list>
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/GeoFeature]sort[caption]]">
+<li>
+<$link>
+<$transclude field="caption"><$view field="title"/></$view>
+</$link>
+</li>
+</$list>
 </ul>

editions/geospatialdemo/tiddlers/HelloThere.tid

@@ -27,12 +27,11 @@ This demo requires that the API keys needed to access external services be obtai
 		<$geobaselayer title=<<currentTiddler>>/>
 	</$list>
 	<$list filter="[all[tiddlers+shadows]tag[$:/tags/GeoMarker]]">
-		<$geolayer lat={{!!lat}} long={{!!long}} alt={{!!alt}} color={{!!color}} name={{!!caption}} properties={{{ [[{}]jsonset[title],<currentTiddler>] }}} 
-	popupTemplate="ui/PopupTemplate"/>
+		<$geolayer lat={{!!lat}} long={{!!long}} alt={{!!alt}} color={{!!color}} name={{!!caption}}/>
 	</$list>
-	<$list filter="[all[tiddlers+shadows]tag[$:/tags/GeoFeature]] :filter[[$:/config/GeospatialDemo/FeatureVisibility/]addsuffix<currentTiddler>get[text]else[show]match[show]]">
-		<$geolayer json={{!!text}} color={{!!color}} name={{!!caption}} popupTemplate={{!!popup-template}}/>
+	<$list filter="[all[tiddlers+shadows]tag[$:/tags/GeoFeature]]">
+		<$geolayer json={{!!text}} color={{!!color}} name={{!!caption}}/>
 	</$list>
 </$geomap>
 
-<<tabs tabsList:"[all[tiddlers+shadows]tag[$:/tags/GeospatialDemo]]" default:"GeoFeatures">>
+<<tabs tabsList:"[all[tiddlers+shadows]tag[$:/tags/GeospatialDemo]]" default:"GeoMarkers">>

editions/geospatialdemo/tiddlers/cities/LimehouseTownHall-image.jpeg.meta

@@ -1,3 +0,0 @@
-title: cities/LimehouseTownHall/image
-type: image/jpeg
-tags: $:/tags/Demo/Cities

editions/geospatialdemo/tiddlers/cities/LimehouseTownHall.tid

@@ -1,11 +1,9 @@
 title: cities/LimehouseTownHall
-tags: $:/tags/GeoMarker $:/tags/Demo/Cities
+tags: $:/tags/GeoMarker
 caption: Limehouse Town Hall
 lat: 51.51216651476898
 long: -0.03138562132137639
 alt: 0
 
-{{cities/LimehouseTownHall/image}}
-
 This is Limehouse Town Hall!
 

editions/geospatialdemo/tiddlers/cities/Motovun-image.jpeg.meta

@@ -1,3 +0,0 @@
-title: cities/Motovun/image
-type: image/jpeg
-tags: $:/tags/Demo/Cities

editions/geospatialdemo/tiddlers/cities/Motovun.tid

@@ -1,11 +1,9 @@
 title: cities/Motovun
-tags: $:/tags/GeoMarker $:/tags/Demo/Cities
+tags: $:/tags/GeoMarker
 icon: Motovun Jack.svg
 caption: Motovun
 lat: 45.336453407749225
 long: 13.828231379455806
 alt: 0
 
-{{cities/Motovun/image}}
-
 This is Motovun!

editions/geospatialdemo/tiddlers/cities/NewYork-image.jpeg.meta

@@ -1,3 +0,0 @@
-title: cities/NewYork/image
-type: image/jpeg
-tags: $:/tags/Demo/Cities

editions/geospatialdemo/tiddlers/cities/NewYork.tid

@@ -1,10 +1,8 @@
 title: cities/NewYork
-tags: $:/tags/GeoMarker $:/tags/Demo/Cities
+tags: $:/tags/GeoMarker
 caption: New York
 lat: 40.712778
 long: -74.006111
 alt: 0
 
-{{cities/NewYork/image}}
-
 This is New York!

editions/geospatialdemo/tiddlers/cities/Oxford-image.jpeg.meta

@@ -1,3 +0,0 @@
-title: cities/Oxford/image
-type: image/jpeg
-tags: $:/tags/Demo/Cities

editions/geospatialdemo/tiddlers/cities/Oxford.tid

@@ -1,10 +1,8 @@
 title: cities/Oxford
-tags: $:/tags/GeoMarker $:/tags/Demo/Cities
+tags: $:/tags/GeoMarker
 caption: Oxford
 lat: 51.751944
 long: -1.257778
 alt: 0
 
-{{cities/Oxford/image}}
-
 This is Oxford!

editions/geospatialdemo/tiddlers/cities/Toronto-image.jpeg.meta

@@ -1,3 +0,0 @@
-title: cities/Toronto/image
-type: image/jpeg
-tags: $:/tags/Demo/Cities

editions/geospatialdemo/tiddlers/cities/Toronto.tid

@@ -1,10 +1,8 @@
 title: cities/Toronto
-tags: $:/tags/GeoMarker $:/tags/Demo/Cities
+tags: $:/tags/GeoMarker
 caption: Toronto
 lat: 43.651070
 long: -79.347015
 alt: 0
 
-{{cities/Toronto/image}}
-
 This is Toronto!

editions/geospatialdemo/tiddlers/cities/Winchester-image.jpeg.meta

@@ -1,3 +0,0 @@
-title: cities/Winchester/image
-type: image/jpeg
-tags: $:/tags/Demo/Cities

editions/geospatialdemo/tiddlers/cities/Winchester.tid

@@ -1,10 +1,8 @@
 title: cities/Winchester
-tags: $:/tags/GeoMarker $:/tags/Demo/Cities
+tags: $:/tags/GeoMarker
 caption: Winchester
 lat: 51.0632
 long: -1.308
 alt: 0
 
-{{cities/Winchester/image}}
-
 This is Winchester!

editions/geospatialdemo/tiddlers/config/FeatureVisbility.multids

@@ -1,4 +0,0 @@
-title: $:/config/GeospatialDemo/FeatureVisibility/$:/
-
-geospatialdemo/features/harvard-volcanoes-of-the-world: hide
-geospatialdemo/features/natural-earth-countries-low-res: hide

editions/geospatialdemo/tiddlers/features/canada-census-subdivision-millesime-popuptemplate.tid

@@ -1,12 +0,0 @@
-title: $:/geospatialdemo/features/canada-census-subdivision-millesime/popupTemplate
-
-!!! Canadian Census Subdivision Boundary
-
-|!Field |!English |!French |
-|Year |<$text text={{{ [<feature>jsonget[properties],[year]] }}}/> |<|
-|Province Code |<$text text={{{ [<feature>jsonget[properties],[prov_code]join[,]] }}}/> |<|
-|Province Name |<$text text={{{ [<feature>jsonget[properties],[prov_name_en]join[,]] }}}/> |<$text text={{{ [<feature>jsonget[properties],[prov_name_fr]join[,]] }}}/> |
-|Census Division Code |<$text text={{{ [<feature>jsonget[properties],[cd_code]join[,]] }}}/> |<|
-|Census Division Name |<$text text={{{ [<feature>jsonget[properties],[cd_name_en]join[,]] }}}/> |<$text text={{{ [<feature>jsonget[properties],[cd_name_fr]join[,]] }}}/> |
-|Census Subdivision Code |<$text text={{{ [<feature>jsonget[properties],[csd_area_code]join[,]] }}}/> |<|
-|Census Subdivision Name |<$text text={{{ [<feature>jsonget[properties],[csd_name_en]join[,]] }}}/> |<$text text={{{ [<feature>jsonget[properties],[csd_name_fr]join[,]] }}}/> |

editions/geospatialdemo/tiddlers/features/canada-census-subdivision-millesime.geojson.meta

@@ -3,4 +3,3 @@ caption: Canada Census Subdivisions Millesime
 type: application/json
 tags: $:/tags/GeoFeature
 color: #f8f
-popup-template: $:/geospatialdemo/features/canada-census-subdivision-millesime/popupTemplate

editions/geospatialdemo/tiddlers/features/harvard-glb-volc-geojson-popuptemplate.tid

@@ -1,10 +0,0 @@
-title: $:/geospatialdemo/features/harvard-volcanoes-of-the-world/popupTemplate
-
-!!! Harvard Volcanoes of the World
-
-|Number |<$text text={{{ [<feature>jsonget[properties],[NUMBER_]] }}}/> |
-|Name |<$text text={{{ [<feature>jsonget[properties],[NAME_]] }}}/> |
-|Location |<$text text={{{ [<feature>jsonget[properties],[LOCATION]] }}}/> |
-|Type |<$text text={{{ [<feature>jsonget[properties],[TYPE_]] }}}/> |
-|Status |<$text text={{{ [<feature>jsonget[properties],[STATUS]] }}}/> |
-|Time Frame |<$text text={{{ [<feature>jsonget[properties],[TIME_FRAME]] }}}/> |

editions/geospatialdemo/tiddlers/features/harvard-glb-volc-geojson.json.meta

@@ -1,6 +1,5 @@
 title: $:/geospatialdemo/features/harvard-volcanoes-of-the-world
 caption: Harvard Volcanoes of the World
 type: application/json
-tags: $:/tags/GeoFeature
+tags: $:/tags/GeoFeature/Hidden
 color: #f88
-popup-template: $:/geospatialdemo/features/harvard-volcanoes-of-the-world/popupTemplate

editions/geospatialdemo/tiddlers/features/natural-earth-countries-low-res-popuptemplate.tid

@@ -1,32 +0,0 @@
-title: $:/geospatialdemo/features/natural-earth-countries-low-res/popupTemplate
-
-!!! Countries of the World from Natural Earth
-
-''<$text text={{{ [<feature>jsonget[properties],[name_en]] }}}/>'' (<$text text={{{ [<feature>jsonget[properties],[formal_en]] }}}/>)
-
-<div style=`height: 10em; overflow: scroll;`>
-	<table>
-		<thead>
-			<tr>
-				<th>
-					Field
-				</th>
-				<th>
-					Value
-				</th>
-			</tr>
-		</thead>
-		<tbody>
-			<$list filter="[<feature>jsonindexes[properties]]">
-				<tr>
-					<td>
-						<$text text=<<currentTiddler>>/>
-					</td>
-					<td>
-						<$text text={{{ [<feature>jsonget[properties],<currentTiddler>] }}}/>
-					</td>
-				</tr>
-			</$list>
-		</tbody>
-	</table>
-</div>

editions/geospatialdemo/tiddlers/features/natural-earth-countries-low-res.json.meta

@@ -1,6 +0,0 @@
-title: $:/geospatialdemo/features/natural-earth-countries-low-res
-caption: Countries of the World from Natural Earth
-type: application/json
-tags: $:/tags/GeoFeature
-color: #88f
-popup-template: $:/geospatialdemo/features/natural-earth-countries-low-res/popupTemplate

editions/geospatialdemo/tiddlers/features/us-states-popuptemplate.tid

@@ -1,6 +0,0 @@
-title: $:/geospatialdemo/features/us-states/popupTemplate
-
-!!! US State Boundary
-
-|State |<$text text={{{ [<feature>jsonget[properties],[name]] }}}/> |
-|Population Density |<$text text={{{ [<feature>jsonget[properties],[density]] }}}/> |

editions/geospatialdemo/tiddlers/features/us-states.geojson.meta

@@ -3,4 +3,3 @@ caption: US State Boundaries
 type: application/json
 tags: $:/tags/GeoFeature
 color: #88f
-popup-template: $:/geospatialdemo/features/us-states/popupTemplate

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{!!lat},{!!long}]",
-		"census-data": "[<rowTiddler>] :map[geopoint{!!lat},{!!long}geolookup{$:/geospatialdemo/features/canada-census-subdivision-millesime}]"
+		"coords": "[<rowTiddler>] :map[geopoint{!!long},{!!lat}]",
+		"census-data": "[<rowTiddler>] :map[geopoint{!!long},{!!lat}geolookup{$:/geospatialdemo/features/canada-census-subdivision-millesime}]"
 	}
 }