Version number update for 5.2.6

Our code of conduct declares that TiddlyWiki does not espouse any political statements.

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.2.5
+    TW5_BUILD_VERSION=v5.2.6
 fi
 
 echo "Using TW5_BUILD_VERSION as [$TW5_BUILD_VERSION]"
@@ -359,14 +359,14 @@ node $TW5_BUILD_TIDDLYWIKI \
 
 # Delete any existing static content
 
-rm $TW5_BUILD_OUTPUT/languages/de-AT/static/*
-rm $TW5_BUILD_OUTPUT/languages/de-DE/static/*
-rm $TW5_BUILD_OUTPUT/languages/es-ES/static/*
-rm $TW5_BUILD_OUTPUT/languages/fr-FR/static/*
-rm $TW5_BUILD_OUTPUT/languages/ja-JP/static/*
-rm $TW5_BUILD_OUTPUT/languages/ko-KR/static/*
-rm $TW5_BUILD_OUTPUT/languages/zh-Hans/static/*
-rm $TW5_BUILD_OUTPUT/languages/zh-Hant/static/*
+rm -rf $TW5_BUILD_OUTPUT/languages/de-AT/static/*
+rm -rf $TW5_BUILD_OUTPUT/languages/de-DE/static/*
+rm -rf $TW5_BUILD_OUTPUT/languages/es-ES/static/*
+rm -rf $TW5_BUILD_OUTPUT/languages/fr-FR/static/*
+rm -rf $TW5_BUILD_OUTPUT/languages/ja-JP/static/*
+rm -rf $TW5_BUILD_OUTPUT/languages/ko-KR/static/*
+rm -rf $TW5_BUILD_OUTPUT/languages/zh-Hans/static/*
+rm -rf $TW5_BUILD_OUTPUT/languages/zh-Hant/static/*
 
 # /languages/de-AT/index.html		Demo wiki with de-AT language
 # /languages/de-AT/empty.html		Empty wiki with de-AT language

boot/boot.js

@@ -313,7 +313,7 @@ $tw.utils.getLocationHash = function() {
 	var idx = href.indexOf('#');
 	if(idx === -1) {
 		return "#";
-	} else if(idx < href.length-1 && href[idx+1] === '#') {
+	} else if(href.substr(idx + 1,1) === "#" ||  href.substr(idx + 1,3) === "%23") {
 		// Special case: ignore location hash if it itself starts with a #
 		return "#";
 	} else {
@@ -375,7 +375,7 @@ $tw.utils.stringifyList = function(value) {
 		var result = new Array(value.length);
 		for(var t=0, l=value.length; t<l; t++) {
 			var entry = value[t] || "";
-			if(entry.indexOf(" ") !== -1) {
+			if(entry.match(/[^\S\xA0]/mg)) {
 				result[t] = "[[" + entry + "]]";
 			} else {
 				result[t] = entry;
@@ -1881,7 +1881,7 @@ A default set of files for TiddlyWiki to ignore during load.
 This matches what NPM ignores, and adds "*.meta" to ignore tiddler
 metadata files.
 */
-$tw.boot.excludeRegExp = /^\.DS_Store$|^.*\.meta$|^\..*\.swp$|^\._.*$|^\.git$|^\.hg$|^\.lock-wscript$|^\.svn$|^\.wafpickle-.*$|^CVS$|^npm-debug\.log$/;
+$tw.boot.excludeRegExp = /^\.DS_Store$|^.*\.meta$|^\..*\.swp$|^\._.*$|^\.git$|^\.github$|^\.vscode$|^\.hg$|^\.lock-wscript$|^\.svn$|^\.wafpickle-.*$|^CVS$|^npm-debug\.log$/;
 
 /*
 Load all the tiddlers recursively from a directory, including honouring `tiddlywiki.files` files for drawing in external files. Returns an array of {filepath:,type:,tiddlers: [{..fields...}],hasMetaFile:}. Note that no file information is returned for externally loaded tiddlers, just the `tiddlers` property.
@@ -2408,6 +2408,7 @@ $tw.boot.initStartup = function(options) {
 	$tw.utils.registerFileType("video/webm","base64",".webm");
 	$tw.utils.registerFileType("video/mp4","base64",".mp4");
 	$tw.utils.registerFileType("audio/mp3","base64",".mp3");
+	$tw.utils.registerFileType("audio/mpeg","base64");
 	$tw.utils.registerFileType("text/markdown","utf8",[".md",".markdown"],{deserializerType:"text/x-markdown"});
 	$tw.utils.registerFileType("text/x-markdown","utf8",[".md",".markdown"]);
 	$tw.utils.registerFileType("application/enex+xml","utf8",".enex");

core/copyright.tid

@@ -4,7 +4,7 @@ type: text/plain
 TiddlyWiki created by Jeremy Ruston, (jeremy [at] jermolene [dot] com)
 
 Copyright (c) 2004-2007, Jeremy Ruston
-Copyright (c) 2007-2022, UnaMesa Association
+Copyright (c) 2007-2023, UnaMesa Association
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

core/images/save-button-dynamic.tid

@@ -0,0 +1,12 @@
+title: $:/core/images/save-button-dynamic
+tags: $:/tags/Image
+
+<svg width="22pt" height="22pt" class="tc-image-save-button-dynamic tc-image-button" viewBox="0 0 128 128">
+<g class="tc-image-save-button-dynamic-clean">
+<path fill-rule="evenodd" d="M120.783 34.33c4.641 8.862 7.266 18.948 7.266 29.646 0 35.347-28.653 64-64 64-35.346 0-64-28.653-64-64 0-35.346 28.654-64 64-64 18.808 0 35.72 8.113 47.43 21.03l2.68-2.68c3.13-3.13 8.197-3.132 11.321-.008 3.118 3.118 3.121 8.193-.007 11.32l-4.69 4.691zm-12.058 12.058a47.876 47.876 0 013.324 17.588c0 26.51-21.49 48-48 48s-48-21.49-48-48 21.49-48 48-48c14.39 0 27.3 6.332 36.098 16.362L58.941 73.544 41.976 56.578c-3.127-3.127-8.201-3.123-11.32-.005-3.123 3.124-3.119 8.194.006 11.319l22.617 22.617a7.992 7.992 0 005.659 2.347c2.05 0 4.101-.783 5.667-2.349l44.12-44.12z"/>
+</g>
+<g class="tc-image-save-button-dynamic-dirty">
+<path d="M64.856912,0 C100.203136,0 128.856912,28.653776 128.856912,64 C128.856912,99.346224 100.203136,128 64.856912,128 C29.510688,128 0.856911958,99.346224 0.856911958,64 C0.856911958,28.653776 29.510688,0 64.856912,0 Z M64.856912,16 C38.347244,16 16.856912,37.490332 16.856912,64 C16.856912,90.509668 38.347244,112 64.856912,112 C91.3665799,112 112.856912,90.509668 112.856912,64 C112.856912,37.490332 91.3665799,16 64.856912,16 Z"></path>
+<circle cx="65" cy="64" r="32"></circle>
+</g>
+</svg>

core/language/en-GB/Fields.multids

@@ -1,11 +1,13 @@
 title: $:/language/Docs/Fields/
 
 _canonical_uri: The full URI of an external image tiddler
+author: Name of the author of a plugin
 bag: The name of the bag from which a tiddler came
 caption: The text to be displayed on a tab or button
 code-body: The view template will display the tiddler as code if set to ''yes''
 color: The CSS color value associated with a tiddler
 component: The name of the component responsible for an [[alert tiddler|AlertMechanism]]
+core-version: For a plugin, indicates what version of TiddlyWiki with which it is compatible
 current-tiddler: Used to cache the top tiddler in a [[history list|HistoryMechanism]]
 created: The date a tiddler was created
 creator: The name of the person who created a tiddler
@@ -22,7 +24,9 @@ list-before: If set, the title of a tiddler before which this tiddler should be
 list-after: If set, the title of the tiddler after which this tiddler should be added to the ordered list of tiddler titles, or at the end of the list if this field is present but empty
 modified: The date and time at which a tiddler was last modified
 modifier: The tiddler title associated with the person who last modified a tiddler
+module-type: For javascript tiddlers, specifies what kind of module it is
 name: The human readable name associated with a plugin tiddler
+parent-plugin: For a plugin, specifies which plugin of which it is a sub-plugin
 plugin-priority: A numerical value indicating the priority of a plugin tiddler
 plugin-type: The type of plugin in a plugin tiddler
 revision: The revision of the tiddler held at the server

core/language/en-GB/Misc.multids

@@ -40,6 +40,7 @@ Error/RetrievingSkinny: Error retrieving skinny tiddler list
 Error/SavingToTWEdit: Error saving to TWEdit
 Error/WhileSaving: Error while saving
 Error/XMLHttpRequest: XMLHttpRequest error code
+Error/ZoominTextNode: Story View Error: It appears you tried to interact with a tiddler that displays in a custom container. This is most likely caused by using `$:/tags/StoryTiddlerTemplateFilter` with a template that contains text or whitespace at the start. Please use the pragma `\whitespace trim` and ensure the whole contents of the tiddler is wrapped in a single HTML element. The text that caused this issue:
 InternalJavaScriptError/Title: Internal JavaScript Error
 InternalJavaScriptError/Hint: Well, this is embarrassing. It is recommended that you restart TiddlyWiki by refreshing your browser
 LayoutSwitcher/Description: Open the layout switcher

core/language/en-GB/Modals/SaveInstructions.tid

@@ -1,21 +0,0 @@
-title: $:/language/Modals/SaveInstructions
-subtitle: Save your work
-footer: <$button message="tm-close-tiddler">Close</$button>
-help: https://tiddlywiki.com/static/SavingChanges.html
-
-Your changes to this wiki need to be saved as a ~TiddlyWiki HTML file.
-
-!!! Desktop browsers
-
-# Select ''Save As'' from the ''File'' menu
-# Choose a filename and location
-#* Some browsers also require you to explicitly specify the file saving format as ''Webpage, HTML only'' or similar
-# Close this tab
-
-!!! Smartphone browsers
-
-# Create a bookmark to this page
-#* If you've got iCloud or Google Sync set up then the bookmark will automatically sync to your desktop where you can open it and save it as above
-# Close this tab
-
-//If you open the bookmark again in Mobile Safari you will see this message again. If you want to go ahead and use the file, just click the ''close'' button below//

core/modules/commands/rendertiddlers.js

@@ -57,7 +57,7 @@ Command.prototype.execute = function() {
 				exportPath = path.resolve(outputPath,macroPath + extension);
 			}
 		}
-		var finalPath = exportPath || path.resolve(pathname,encodeURIComponent(title) + extension);
+		var finalPath = exportPath || path.resolve(pathname,$tw.utils.encodeURIComponentExtended(title) + extension);
 		$tw.utils.createFileDirectories(finalPath);
 		fs.writeFileSync(finalPath,text,"utf8");
 	});

core/modules/commands/savelibrarytiddlers.js

@@ -65,7 +65,7 @@ Command.prototype.execute = function() {
 	$tw.utils.each(filteredPluginList,function(title) {
 		var tiddler = containerData.tiddlers[title];
 		// Save each JSON file and collect the skinny data
-		var pathname = path.resolve(self.commander.outputPath,basepath + encodeURIComponent(title) + ".json");
+		var pathname = path.resolve(self.commander.outputPath,basepath + $tw.utils.encodeURIComponentExtended(title) + ".json");
 		$tw.utils.createFileDirectories(pathname);
 		fs.writeFileSync(pathname,JSON.stringify(tiddler),"utf8");
 		// Collect the skinny list data

core/modules/commands/savetiddlers.js

@@ -45,7 +45,7 @@ Command.prototype.execute = function() {
 		var tiddler = self.commander.wiki.getTiddler(title),
 			type = tiddler.fields.type || "text/vnd.tiddlywiki",
 			contentTypeInfo = $tw.config.contentTypeInfo[type] || {encoding: "utf8"},
-			filename = path.resolve(pathname,encodeURIComponent(title));
+			filename = path.resolve(pathname,$tw.utils.encodeURIComponentExtended(title));
 		fs.writeFileSync(filename,tiddler.fields.text,contentTypeInfo.encoding);
 	});
 	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, 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.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/editor/engines/framed.js

@@ -177,9 +177,11 @@ FramedEngine.prototype.fixHeight = function() {
 Focus the engine node
 */
 FramedEngine.prototype.focus  = function() {
-	if(this.domNode.focus && this.domNode.select) {
+	if(this.domNode.focus) {
 		this.domNode.focus();
-		this.domNode.select();
+	}
+	if(this.domNode.select) {
+		$tw.utils.setSelectionByPosition(this.domNode,this.widget.editFocusSelectFromStart,this.widget.editFocusSelectFromEnd);
 	}
 };
 

core/modules/editor/engines/simple.js

@@ -119,10 +119,12 @@ SimpleEngine.prototype.fixHeight = function() {
 /*
 Focus the engine node
 */
-SimpleEngine.prototype.focus  = function() {
-	if(this.domNode.focus && this.domNode.select) {
+SimpleEngine.prototype.focus = function() {
+	if(this.domNode.focus) {
 		this.domNode.focus();
-		this.domNode.select();
+	}
+	if(this.domNode.select) {
+		$tw.utils.setSelectionByPosition(this.domNode,this.widget.editFocusSelectFromStart,this.widget.editFocusSelectFromEnd);
 	}
 };
 

core/modules/editor/factory.js

@@ -180,6 +180,8 @@ function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) {
 		this.editMinHeight = this.getAttribute("minHeight",DEFAULT_MIN_TEXT_AREA_HEIGHT);
 		this.editFocusPopup = this.getAttribute("focusPopup");
 		this.editFocus = this.getAttribute("focus");
+		this.editFocusSelectFromStart = $tw.utils.parseNumber(this.getAttribute("focusSelectFromStart","0"));
+		this.editFocusSelectFromEnd = $tw.utils.parseNumber(this.getAttribute("focusSelectFromEnd","0"));
 		this.editTabIndex = this.getAttribute("tabindex");
 		this.editCancelPopups = this.getAttribute("cancelPopups","") === "yes";
 		this.editInputActions = this.getAttribute("inputActions");
@@ -218,7 +220,7 @@ function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) {
 	EditTextWidget.prototype.refresh = function(changedTiddlers) {
 		var changedAttributes = this.computeAttributes();
 		// Completely rerender if any of our attributes have changed
-		if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes["default"] || changedAttributes["class"] || changedAttributes.placeholder || changedAttributes.size || changedAttributes.autoHeight || changedAttributes.minHeight || changedAttributes.focusPopup ||  changedAttributes.rows || changedAttributes.tabindex || changedAttributes.cancelPopups || changedAttributes.inputActions || changedAttributes.refreshTitle || changedAttributes.autocomplete || changedTiddlers[HEIGHT_MODE_TITLE] || changedTiddlers[ENABLE_TOOLBAR_TITLE] || changedAttributes.disabled || changedAttributes.fileDrop) {
+		if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes["default"] || changedAttributes["class"] || changedAttributes.placeholder || changedAttributes.size || changedAttributes.autoHeight || changedAttributes.minHeight || changedAttributes.focusPopup ||  changedAttributes.rows || changedAttributes.tabindex || changedAttributes.cancelPopups || changedAttributes.inputActions || changedAttributes.refreshTitle || changedAttributes.autocomplete || changedTiddlers[HEIGHT_MODE_TITLE] || changedTiddlers[ENABLE_TOOLBAR_TITLE] || changedTiddlers["$:/palette"] || changedAttributes.disabled || changedAttributes.fileDrop) {
 			this.refreshSelf();
 			return true;
 		} else if (changedTiddlers[this.editRefreshTitle]) {

core/modules/filters/encodings.js

@@ -16,6 +16,22 @@ Filter operator for applying decodeURIComponent() to each item.
 Export our filter functions
 */
 
+exports.decodebase64 = function(source,operator,options) {
+	var results = [];
+	source(function(tiddler,title) {
+		results.push($tw.utils.base64Decode(title));
+	});
+	return results;
+};
+
+exports.encodebase64 = function(source,operator,options) {
+	var results = [];
+	source(function(tiddler,title) {
+		results.push($tw.utils.base64Encode(title));
+	});
+	return results;
+};
+
 exports.decodeuricomponent = function(source,operator,options) {
 	var results = [];
 	source(function(tiddler,title) {
@@ -27,7 +43,7 @@ exports.decodeuricomponent = function(source,operator,options) {
 exports.encodeuricomponent = function(source,operator,options) {
 	var results = [];
 	source(function(tiddler,title) {
-		results.push(encodeURIComponent(title));
+		results.push($tw.utils.encodeURIComponentExtended(title));
 	});
 	return results;
 };

core/modules/filters/filter.js

@@ -21,14 +21,15 @@ exports.filter = function(source,operator,options) {
 		target = operator.prefix !== "!";
 	source(function(tiddler,title) {
 		var list = filterFn.call(options.wiki,options.wiki.makeTiddlerIterator([title]),{
-				getVariable: function(name) {
+				getVariable: function(name,opts) {
+					opts = opts || {};
 					switch(name) {
 						case "currentTiddler":
 							return "" + title;
 						case "..currentTiddler":
 							return options.widget.getVariable("currentTiddler");
 						default:
-							return options.widget.getVariable(name);
+							return options.widget.getVariable(name,opts);
 					}
 				}
 			});

core/modules/filters/json-ops.js

@@ -176,7 +176,11 @@ function getDataItem(data,indexes) {
 	var item = data;
 	for(var i=0; i<indexes.length; i++) {
 		if(item !== undefined) {
-			item = item[indexes[i]];
+			if(item !== null && ["number","string","boolean"].indexOf(typeof item) === -1) {
+				item = item[indexes[i]];
+			} else {
+				item = undefined;
+			}
 		}
 	}
 	return item;

core/modules/filters/reduce.js

@@ -27,7 +27,8 @@ exports.reduce = function(source,operator,options) {
 	for(var index=0; index<results.length; index++) {
 		var title = results[index],
 			list = filterFn.call(options.wiki,options.wiki.makeTiddlerIterator([title]),{
-				getVariable: function(name) {
+				getVariable: function(name,opts) {
+					opts = opts || {};
 					switch(name) {
 						case "currentTiddler":
 							return "" + title;
@@ -42,7 +43,7 @@ exports.reduce = function(source,operator,options) {
 						case "length":
 							return "" + results.length;
 						default:
-							return options.widget.getVariable(name);
+							return options.widget.getVariable(name,opts);
 					}
 				}
 			});

core/modules/filters/sortsub.js

@@ -26,14 +26,15 @@ exports.sortsub = function(source,operator,options) {
 		var r = filterFn.call(options.wiki,function(iterator) {
 			iterator(options.wiki.getTiddler(title),title);
 		},{
-			getVariable: function(name) {
+			getVariable: function(name,opts) {
+				opts = opts || {};
 				switch(name) {
 					case "currentTiddler":
 						return "" + title;
 					case "..currentTiddler":
 						return options.widget.getVariable("currentTiddler");
 					default:
-						return options.widget.getVariable(name);
+						return options.widget.getVariable(name,opts);
 				}
 			}
 		});

core/modules/filters/strings.js

@@ -74,6 +74,113 @@ exports.join = makeStringReducingOperator(
 	},null
 );
 
+var dmp = require("$:/core/modules/utils/diff-match-patch/diff_match_patch.js");
+
+exports.levenshtein = makeStringBinaryOperator(
+	function(a,b) {
+		var dmpObject = new dmp.diff_match_patch(),
+			diffs = dmpObject.diff_main(a,b);
+		return [dmpObject.diff_levenshtein(diffs) + ""];
+	}
+);
+
+// these two functions are adapted from https://github.com/google/diff-match-patch/wiki/Line-or-Word-Diffs
+function diffLineWordMode(text1,text2,mode) {
+	var dmpObject = new dmp.diff_match_patch();
+	var a = diffPartsToChars(text1,text2,mode);
+	var lineText1 = a.chars1;
+	var lineText2 = a.chars2;
+	var lineArray = a.lineArray;
+	var diffs = dmpObject.diff_main(lineText1,lineText2,false);
+	dmpObject.diff_charsToLines_(diffs,lineArray);
+	return diffs;
+}
+
+function diffPartsToChars(text1,text2,mode) {
+	var lineArray = [];
+	var lineHash = {};
+	lineArray[0] = '';
+
+    function diff_linesToPartsMunge_(text,mode) {
+        var chars = '';
+        var lineStart = 0;
+        var lineEnd = -1;
+        var lineArrayLength = lineArray.length,
+            regexpResult;
+        var searchRegexp = /\W+/g;
+        while(lineEnd < text.length - 1) {
+	        if(mode === "words") {
+                regexpResult = searchRegexp.exec(text);
+                lineEnd = searchRegexp.lastIndex;
+                if(regexpResult === null) {
+                lineEnd = text.length;
+                }
+                lineEnd = --lineEnd;
+            } else {
+                lineEnd = text.indexOf('\n', lineStart);
+                if(lineEnd == -1) {
+                    lineEnd = text.length - 1;
+                }
+            }
+            var line = text.substring(lineStart, lineEnd + 1);
+
+            if(lineHash.hasOwnProperty ? lineHash.hasOwnProperty(line) : (lineHash[line] !== undefined)) {
+				chars += String.fromCharCode(lineHash[line]);
+            } else {
+                if (lineArrayLength == maxLines) {
+                  line = text.substring(lineStart);
+                  lineEnd = text.length;
+                }
+                chars += String.fromCharCode(lineArrayLength);
+                lineHash[line] = lineArrayLength;
+                lineArray[lineArrayLength++] = line;
+            }
+            lineStart = lineEnd + 1;
+        }
+        return chars;
+    }
+    var maxLines = 40000;
+    var chars1 = diff_linesToPartsMunge_(text1,mode);
+    maxLines = 65535;
+    var chars2 = diff_linesToPartsMunge_(text2,mode);
+    return {chars1: chars1, chars2: chars2, lineArray: lineArray};
+};
+
+exports.makepatches = function(source,operator,options) {
+	var dmpObject = new dmp.diff_match_patch(),
+		suffix = operator.suffix || "",
+		result = [];
+		
+		source(function(tiddler,title) {
+			var diffs, patches;
+			if(suffix === "lines" || suffix === "words") {
+				diffs = diffLineWordMode(title,operator.operand,suffix);
+				patches = dmpObject.patch_make(title,diffs);
+			} else {
+				patches = dmpObject.patch_make(title,operator.operand);
+			}
+			Array.prototype.push.apply(result,[dmpObject.patch_toText(patches)]);
+		});
+
+	return result;
+};
+
+exports.applypatches = makeStringBinaryOperator(
+	function(a,b) {
+		var dmpObject = new dmp.diff_match_patch(),
+			patches;
+		try {
+			patches = dmpObject.patch_fromText(b);
+		} catch(e) {
+		}
+		if(patches) {
+			return [dmpObject.patch_apply(patches,a)[0]];
+		} else {
+			return [a];
+		}
+	}
+);
+
 function makeStringBinaryOperator(fnCalc) {
 	return function(source,operator,options) {
 		var result = [];
@@ -184,4 +291,4 @@ exports.charcode = function(source,operator,options) {
 	return [chars.join("")];
 };
 
-})();
+})();

core/modules/indexers/field-indexer.js

@@ -32,18 +32,18 @@ FieldIndexer.prototype.setMaxIndexedValueLength = function(length) {
 
 FieldIndexer.prototype.addIndexMethods = function() {
 	var self = this;
+	// get all tiddlers, including those overwrite shadow tiddlers
 	this.wiki.each.byField = function(name,value) {
-		var titles = self.wiki.allTitles(),
-			lookup = self.lookup(name,value);
+		var lookup = self.lookup(name,value);
 		return lookup && lookup.filter(function(title) {
-			return titles.indexOf(title) !== -1;
+			return self.wiki.tiddlerExists(title)
 		});
 	};
+	// get shadow tiddlers, including shadow tiddlers that is overwritten
 	this.wiki.eachShadow.byField = function(name,value) {
-		var titles = self.wiki.allShadowTitles(),
-			lookup = self.lookup(name,value);
+		var lookup = self.lookup(name,value);
 		return lookup && lookup.filter(function(title) {
-			return titles.indexOf(title) !== -1;
+			return self.wiki.isShadowTiddler(title)
 		});
 	};
 	this.wiki.eachTiddlerPlusShadows.byField = function(name,value) {

core/modules/parsers/pdfparser.js

@@ -15,7 +15,7 @@ The PDF parser embeds a PDF viewer
 var ImageParser = function(type,text,options) {
 	var element = {
 			type: "element",
-			tag: "embed",
+			tag: "iframe",
 			attributes: {}
 		},
 		src;

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

@@ -25,7 +25,7 @@ Instantiate parse rule
 exports.init = function(parser) {
 	this.parser = parser;
 	// Regexp to match
-	this.matchRegExp = /^\\import[^\S\n]/mg;
+	this.matchRegExp = /\\import[^\S\n]/mg;
 };
 
 /*

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

@@ -27,7 +27,7 @@ Instantiate parse rule
 exports.init = function(parser) {
 	this.parser = parser;
 	// Regexp to match
-	this.matchRegExp = /^\\define\s+([^(\s]+)\(\s*([^)]*)\)(\s*\r?\n)?/mg;
+	this.matchRegExp = /\\define\s+([^(\s]+)\(\s*([^)]*)\)(\s*\r?\n)?/mg;
 };
 
 /*
@@ -58,7 +58,7 @@ exports.parse = function() {
 	var reEnd;
 	if(this.match[3]) {
 		// If so, the end of the body is marked with \end
-		reEnd = new RegExp("(\\r?\\n\\\\end[^\\S\\n\\r]*(?:" + $tw.utils.escapeRegExp(this.match[1]) + ")?(?:$|\\r?\\n))","mg");
+		reEnd = new RegExp("(\\r?\\n\\s*\\\\end[^\\S\\n\\r]*(?:" + $tw.utils.escapeRegExp(this.match[1]) + ")?(?:$|\\r?\\n))","mg");
 	} else {
 		// Otherwise, the end of the definition is marked by the end of the line
 		reEnd = /($|\r?\n)/mg;

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

@@ -26,7 +26,7 @@ Instantiate parse rule
 exports.init = function(parser) {
 	this.parser = parser;
 	// Regexp to match
-	this.matchRegExp = /^\\parsermode[^\S\n]/mg;
+	this.matchRegExp = /\\parsermode[^\S\n]/mg;
 };
 
 /*

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

@@ -26,7 +26,7 @@ Instantiate parse rule
 exports.init = function(parser) {
 	this.parser = parser;
 	// Regexp to match
-	this.matchRegExp = /^\\rules[^\S\n]/mg;
+	this.matchRegExp = /\\rules[^\S\n]/mg;
 };
 
 /*

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

@@ -26,7 +26,7 @@ Instantiate parse rule
 exports.init = function(parser) {
 	this.parser = parser;
 	// Regexp to match
-	this.matchRegExp = /^\\whitespace[^\S\n]/mg;
+	this.matchRegExp = /\\whitespace[^\S\n]/mg;
 };
 
 /*

core/modules/savers/beaker.js

@@ -1,64 +0,0 @@
-/*\
-title: $:/core/modules/savers/beaker.js
-type: application/javascript
-module-type: saver
-
-Saves files using the Beaker browser's (https://beakerbrowser.com) Dat protocol (https://datproject.org/)
-Compatible with beaker >= V0.7.2
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-/*
-Set up the saver
-*/
-var BeakerSaver = function(wiki) {
-	this.wiki = wiki;
-};
-
-BeakerSaver.prototype.save = function(text,method,callback) {
-	var dat = new DatArchive("" + window.location),
-		pathname = ("" + window.location.pathname).split("#")[0];
-	dat.stat(pathname).then(function(value) {
-		if(value.isDirectory()) {
-			pathname = pathname + "/index.html";
-		}
-		dat.writeFile(pathname,text,"utf8").then(function(value) {
-			callback(null);
-		},function(reason) {
-			callback("Beaker Saver Write Error: " + reason);
-		});
-	},function(reason) {
-		callback("Beaker Saver Stat Error: " + reason);
-	});
-	return true;
-};
-
-/*
-Information about this saver
-*/
-BeakerSaver.prototype.info = {
-	name: "beaker",
-	priority: 3000,
-	capabilities: ["save", "autosave"]
-};
-
-/*
-Static method that returns true if this saver is capable of working
-*/
-exports.canSave = function(wiki) {
-	return !!window.DatArchive && location.protocol==="dat:";
-};
-
-/*
-Create an instance of this saver
-*/
-exports.create = function(wiki) {
-	return new BeakerSaver(wiki);
-};
-
-})();

core/modules/savers/hyperdrive.js

@@ -1,64 +0,0 @@
-/*\
-title: $:/core/modules/savers/hyperdrive.js
-type: application/javascript
-module-type: saver
-
-Saves files using the Hyperdrive Protocol (https://hypercore-protocol.org/#hyperdrive) Beaker browser beta-1.0 and later (https://beakerbrowser.com)
-Compatible with beaker >= V1.0.0
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-/*
-Set up the saver
-*/
-var HyperdriveSaver = function(wiki) {
-	this.wiki = wiki;
-};
-
-HyperdriveSaver.prototype.save = function(text,method,callback) {
-	var dat = beaker.hyperdrive.drive("" + window.location),
-		pathname = ("" + window.location.pathname).split("#")[0];
-	dat.stat(pathname).then(function(value) {
-		if(value.isDirectory()) {
-			pathname = pathname + "/index.html";
-		}
-		dat.writeFile(pathname,text,"utf8").then(function(value) {
-			callback(null);
-		},function(reason) {
-			callback("Hyperdrive Saver Write Error: " + reason);
-		});
-	},function(reason) {
-		callback("Hyperdrive Saver Stat Error: " + reason);
-	});
-	return true;
-};
-
-/*
-Information about this saver
-*/
-HyperdriveSaver.prototype.info = {
-	name: "beaker-1.x",
-	priority: 3000,
-	capabilities: ["save", "autosave"]
-};
-
-/*
-Static method that returns true if this saver is capable of working
-*/
-exports.canSave = function(wiki) {
-	return !!window.beaker && !!beaker.hyperdrive && location.protocol==="hyper:";
-};
-
-/*
-Create an instance of this saver
-*/
-exports.create = function(wiki) {
-	return new HyperdriveSaver(wiki);
-};
-
-})();

core/modules/server/routes/get-status.js

@@ -21,6 +21,7 @@ exports.handler = function(request,response,state) {
 		username: state.authenticatedUsername || state.server.get("anon-username") || "",
 		anonymous: !state.authenticatedUsername,
 		read_only: !state.server.isAuthorized("writers",state.authenticatedUsername),
+		logout_is_available: false,
 		space: {
 			recipe: "default"
 		},

core/modules/startup/rootwidget.js

@@ -87,13 +87,6 @@ exports.startup = function() {
 			}
 		});
 	}
-	// If we're being viewed on a data: URI then give instructions for how to save
-	if(document.location.protocol === "data:") {
-		$tw.rootWidget.dispatchEvent({
-			type: "tm-modal",
-			param: "$:/language/Modals/SaveInstructions"
-		});
-	}
 };
 
 })();

core/modules/storyviews/zoomin.js

@@ -17,6 +17,10 @@ var easing = "cubic-bezier(0.645, 0.045, 0.355, 1)"; // From http://easings.net/
 var ZoominListView = function(listWidget) {
 	var self = this;
 	this.listWidget = listWidget;
+	this.textNodeLogger = new $tw.utils.Logger("zoomin story river view", {
+		enable: true,
+		colour: 'red'
+	});
 	// Get the index of the tiddler that is at the top of the history
 	var history = this.listWidget.wiki.getTiddlerDataCached(this.listWidget.historyTitle,[]),
 		targetTiddler;
@@ -48,7 +52,10 @@ ZoominListView.prototype.navigateTo = function(historyInfo) {
 	var listItemWidget = this.listWidget.children[listElementIndex],
 		targetElement = listItemWidget.findFirstDomNode();
 	// Abandon if the list entry isn't a DOM element (it might be a text node)
-	if(!targetElement || targetElement.nodeType === Node.TEXT_NODE) {
+	if(!targetElement) {
+		return;
+	} else if (targetElement.nodeType === Node.TEXT_NODE) {
+		this.logTextNodeRoot(targetElement);
 		return;
 	}
 	// Make the new tiddler be position absolute and visible so that we can measure it
@@ -130,7 +137,10 @@ function findTitleDomNode(widget,targetClass) {
 ZoominListView.prototype.insert = function(widget) {
 	var targetElement = widget.findFirstDomNode();
 	// Abandon if the list entry isn't a DOM element (it might be a text node)
-	if(!targetElement || targetElement.nodeType === Node.TEXT_NODE) {
+	if(!targetElement) {
+		return;
+	} else if (targetElement.nodeType === Node.TEXT_NODE) {
+		this.logTextNodeRoot(targetElement);
 		return;
 	}
 	// Make the newly inserted node position absolute and hidden
@@ -173,16 +183,21 @@ ZoominListView.prototype.remove = function(widget) {
 	var toWidgetDomNode = toWidget && toWidget.findFirstDomNode();
 	// Set up the tiddler we're moving back in
 	if(toWidgetDomNode) {
-		$tw.utils.addClass(toWidgetDomNode,"tc-storyview-zoomin-tiddler");
-		$tw.utils.setStyle(toWidgetDomNode,[
-			{display: "block"},
-			{transformOrigin: "50% 50%"},
-			{transform: "translateX(0px) translateY(0px) scale(10)"},
-			{transition: $tw.utils.roundTripPropertyName("transform") + " " + duration + "ms " + easing + ", opacity " + duration + "ms " + easing},
-			{opacity: "0"},
-			{zIndex: "500"}
-		]);
-		this.currentTiddlerDomNode = toWidgetDomNode;
+		if (toWidgetDomNode.nodeType === Node.TEXT_NODE) {
+			this.logTextNodeRoot(toWidgetDomNode);
+			toWidgetDomNode = null;
+		} else {
+			$tw.utils.addClass(toWidgetDomNode,"tc-storyview-zoomin-tiddler");
+			$tw.utils.setStyle(toWidgetDomNode,[
+				{display: "block"},
+				{transformOrigin: "50% 50%"},
+				{transform: "translateX(0px) translateY(0px) scale(10)"},
+				{transition: $tw.utils.roundTripPropertyName("transform") + " " + duration + "ms " + easing + ", opacity " + duration + "ms " + easing},
+				{opacity: "0"},
+				{zIndex: "500"}
+			]);
+			this.currentTiddlerDomNode = toWidgetDomNode;
+		}
 	}
 	// Animate them both
 	// Force layout
@@ -206,6 +221,10 @@ ZoominListView.prototype.remove = function(widget) {
 	return true; // Indicate that we'll delete the DOM node
 };
 
+ZoominListView.prototype.logTextNodeRoot = function(node) {
+	this.textNodeLogger.log($tw.language.getString("Error/ZoominTextNode") + " " + node.textContent);
+};
+
 exports.zoomin = ZoominListView;
 
 })();

core/modules/syncer.js

@@ -402,6 +402,7 @@ Syncer.prototype.handleLazyLoadEvent = function(title) {
 			// Mark the tiddler as needing loading, and having already been lazily loaded
 			this.titlesToBeLoaded[title] = true;
 			this.titlesHaveBeenLazyLoaded[title] = true;
+			this.processTaskQueue();
 		}
 	}
 };

core/modules/utils/dom/dom.js

@@ -28,6 +28,24 @@ exports.domMatchesSelector = function(node,selector) {
 	return node.matches ? node.matches(selector) : node.msMatchesSelector(selector);
 };
 
+/*
+Select text in a an input or textarea (setSelectionRange crashes on certain input types)
+*/
+exports.setSelectionRangeSafe = function(node,start,end,direction) {
+	try {
+		node.setSelectionRange(start,end,direction);
+	} catch(e) {
+		node.select();
+	}
+};
+
+/*
+Select the text in an input or textarea by position
+*/
+exports.setSelectionByPosition = function(node,selectFromStart,selectFromEnd) {
+	$tw.utils.setSelectionRangeSafe(node,selectFromStart,node.value.length - selectFromEnd);
+};
+
 exports.removeChildren = function(node) {
 	while(node.hasChildNodes()) {
 		node.removeChild(node.firstChild);

core/modules/utils/filesystem.js

@@ -228,7 +228,7 @@ exports.generateTiddlerFileInfo = function(tiddler,options) {
 			hasUnsafeFields = hasUnsafeFields || /[\x00-\x1F]/mg.test(value);
 			hasUnsafeFields = hasUnsafeFields || ($tw.utils.trim(value) !== value);
 		}
-		hasUnsafeFields = hasUnsafeFields || /:/mg.test(fieldName);
+		hasUnsafeFields = hasUnsafeFields || /:|#/mg.test(fieldName);
 	});
 	// Check for field values 
 	if(hasUnsafeFields) {
@@ -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") {
+		if(tiddlerType === "text/vnd.tiddlywiki" || tiddler.hasField("_canonical_uri")) {
 			// Save as a .tid file
 			fileInfo.type = "application/x-tiddler";
 			fileInfo.hasMetaFile = false;
@@ -393,7 +393,7 @@ exports.generateTiddlerFilepath = function(title,options) {
 	} while(fs.existsSync(fullPath));
 	// If the last write failed with an error, or if path does not start with:
 	//	the resolved options.directory, the resolved wikiPath directory, the wikiTiddlersPath directory, 
-	//	or the 'originalpath' directory, then encodeURIComponent() and resolve to tiddler directory.
+	//	or the 'originalpath' directory, then $tw.utils.encodeURIComponentExtended() and resolve to tiddler directory.
 	var writePath = $tw.hooks.invokeHook("th-make-tiddler-path",fullPath,fullPath),
 		encode = (options.fileInfo || {writeError: false}).writeError == true;
 	if(!encode) {
@@ -403,7 +403,7 @@ exports.generateTiddlerFilepath = function(title,options) {
 			writePath.indexOf(path.resolve($tw.boot.wikiTiddlersPath,originalpath)) == 0 );
 		}
 	if(encode) {
-		writePath = path.resolve(directory,encodeURIComponent(fullPath));
+		writePath = path.resolve(directory,$tw.utils.encodeURIComponentExtended(fullPath));
 	}
 	// Return the full path to the file
 	return writePath;

core/modules/utils/utils.js

@@ -685,9 +685,19 @@ exports.escapeRegExp = function(s) {
     return s.replace(/[\-\/\\\^\$\*\+\?\.\(\)\|\[\]\{\}]/g, '\\$&');
 };
 
+/*
+Extended version of encodeURIComponent that encodes additional characters including
+those that are illegal within filepaths on various platforms including Windows
+*/
+exports.encodeURIComponentExtended = function(s) {
+	return encodeURIComponent(s).replace(/[!'()*]/g,function(c) {
+		return "%" + c.charCodeAt(0).toString(16).toUpperCase();
+	});
+};
+
 // Checks whether a link target is external, i.e. not a tiddler title
 exports.isLinkExternal = function(to) {
-	var externalRegExp = /^(?:file|http|https|mailto|ftp|irc|news|data|skype):[^\s<>{}\[\]`|"\\^]+(?:\/|\b)/i;
+	var externalRegExp = /^(?:file|http|https|mailto|ftp|irc|news|obsidian|data|skype):[^\s<>{}\[\]`|"\\^]+(?:\/|\b)/i;
 	return externalRegExp.test(to);
 };
 

core/modules/widgets/dropzone.js

@@ -232,12 +232,34 @@ DropZoneWidget.prototype.handleDropEvent  = function(event) {
 };
 
 DropZoneWidget.prototype.handlePasteEvent  = function(event) {
-	var self = this,
-		readFileCallback = function(tiddlerFieldsArray) {
+	var self = this;
+	var	readFileCallback = function(tiddlerFieldsArray) {
 			self.readFileCallback(tiddlerFieldsArray);
 		};
+	var getItem = function(type) {
+			type = type || "text/plain";
+			return function(str) {
+				// Use the deserializer specified if any
+				if(self.dropzoneDeserializer) {
+					tiddlerFields = self.wiki.deserializeTiddlers(null,str,{title: self.wiki.generateNewTitle("Untitled " + type)},{deserializer:self.dropzoneDeserializer});
+					if(tiddlerFields && tiddlerFields.length) {
+						readFileCallback(tiddlerFields);
+					}
+				} else {
+					tiddlerFields = {
+						title: self.wiki.generateNewTitle("Untitled " + type),
+						text: str,
+						type: type
+					};
+					if($tw.log.IMPORT) {
+						console.log("Importing string '" + str + "', type: '" + type + "'");
+					}
+					readFileCallback([tiddlerFields]);
+				}
+			}
+		};
 	// Let the browser handle it if we're in a textarea or input box
-	if(["TEXTAREA","INPUT"].indexOf(event.target.tagName) == -1 && !event.target.isContentEditable) {
+	if(["TEXTAREA","INPUT"].indexOf(event.target.tagName) == -1 && !event.target.isContentEditable && !event.twEditor) {
 		var self = this,
 			items = event.clipboardData.items;
 		// Enumerate the clipboard items
@@ -251,27 +273,10 @@ DropZoneWidget.prototype.handlePasteEvent  = function(event) {
 				});
 			} else if(item.kind === "string") {
 				// Create tiddlers from string items
-				var tiddlerFields,
-					type = item.type;
-				item.getAsString(function(str) {
-					// Use the deserializer specified if any
-					if(self.dropzoneDeserializer) {
-						tiddlerFields = self.wiki.deserializeTiddlers(null,str,{title: self.wiki.generateNewTitle("Untitled")},{deserializer:self.dropzoneDeserializer});
-						if(tiddlerFields && tiddlerFields.length) {
-							readFileCallback(tiddlerFields);
-						}
-					} else {
-						tiddlerFields = {
-							title: self.wiki.generateNewTitle("Untitled"),
-							text: str,
-							type: type
-						};
-						if($tw.log.IMPORT) {
-							console.log("Importing string '" + str + "', type: '" + type + "'");
-						}
-						readFileCallback([tiddlerFields]);
-					}
-				});
+				var tiddlerFields;
+				// It's important to give getAsString a closure with the right type
+				// So it can be added to the import queue
+				item.getAsString(getItem(item.type));
 			}
 		}
 		// Tell the browser that we've handled the paste

core/modules/widgets/element.js

@@ -34,6 +34,10 @@ ElementWidget.prototype.render = function(parent,nextSibling) {
 	if($tw.config.htmlUnsafeElements.indexOf(this.tag) !== -1) {
 		this.tag = "safe-" + this.tag;
 	}
+	// Restrict tag name to digits, letts and dashes
+	this.tag = this.tag.replace(/[^0-9a-zA-Z\-]/mg,"");
+	// Default to a span
+	this.tag = this.tag || "span";
 	// Adjust headings by the current base level
 	var headingLevel = ["h1","h2","h3","h4","h5","h6"].indexOf(this.tag);
 	if(headingLevel !== -1) {

core/modules/widgets/genesis.js

@@ -42,10 +42,16 @@ Compute the internal state of the widget
 GenesisWidget.prototype.execute = function() {
 	var self = this;
 	// Collect attributes
-	this.genesisType = this.getAttribute("$type","element");
+	this.genesisType = this.getAttribute("$type");
 	this.genesisRemappable = this.getAttribute("$remappable","yes") === "yes";
 	this.genesisNames = this.getAttribute("$names","");
 	this.genesisValues = this.getAttribute("$values","");
+	this.genesisIsBlock = this.getAttribute("$mode",this.parseTreeNode.isBlock && "block") === "block";
+	// Do not create a child widget if the $type attribute is missing or blank
+	if(!this.genesisType) {
+		this.makeChildWidgets(this.parseTreeNode.children);
+		return;
+	}
 	// Construct parse tree
 	var isElementWidget = this.genesisType.charAt(0) !== "$",
 		nodeType = isElementWidget ? "element" : this.genesisType.substr(1),
@@ -55,6 +61,7 @@ GenesisWidget.prototype.execute = function() {
 		tag: nodeTag,
 		attributes: {},
 		orderedAttributes: [],
+		isBlock: this.genesisIsBlock,
 		children: this.parseTreeNode.children || [],
 		isNotRemappable: !this.genesisRemappable
 	}];

core/modules/widgets/let.js

@@ -53,7 +53,9 @@ LetWidget.prototype.computeAttributes = function() {
 			name = attribute.name;
 		// Now that it's prepped, we're allowed to look this variable up
 		// when defining later variables
-		self.currentValueFor[name] = value;
+		if(value !== undefined) {
+			self.currentValueFor[name] = value;
+		}
 	});
 	// Run through again, setting variables and looking for differences
 	$tw.utils.each(this.currentValueFor,function(value,name) {

core/modules/widgets/link.js

@@ -97,8 +97,8 @@ LinkWidget.prototype.renderLink = function(parent,nextSibling) {
 		// Expand the tv-wikilink-template variable to construct the href
 		var wikiLinkTemplateMacro = this.getVariable("tv-wikilink-template"),
 			wikiLinkTemplate = wikiLinkTemplateMacro ? wikiLinkTemplateMacro.trim() : "#$uri_encoded$";
-		wikiLinkText = $tw.utils.replaceString(wikiLinkTemplate,"$uri_encoded$",encodeURIComponent(this.to));
-		wikiLinkText = $tw.utils.replaceString(wikiLinkText,"$uri_doubleencoded$",encodeURIComponent(encodeURIComponent(this.to)));
+		wikiLinkText = $tw.utils.replaceString(wikiLinkTemplate,"$uri_encoded$",$tw.utils.encodeURIComponentExtended(this.to));
+		wikiLinkText = $tw.utils.replaceString(wikiLinkText,"$uri_doubleencoded$",$tw.utils.encodeURIComponentExtended($tw.utils.encodeURIComponentExtended(this.to)));
 	}
 	// Override with the value of tv-get-export-link if defined
 	wikiLinkText = this.getVariable("tv-get-export-link",{params: [{name: "to",value: this.to}],defaultValue: wikiLinkText});

core/modules/widgets/messagecatcher.js

@@ -82,7 +82,7 @@ MessageCatcherWidget.prototype.render = function(parent,nextSibling) {
 		}
 	});
 	// Render children
-	this.renderChildren(parent,null);
+	this.renderChildren(parent,nextSibling);
 };
 
 /*

core/modules/widgets/navigator.js

@@ -227,10 +227,7 @@ NavigatorWidget.prototype.handleDeleteTiddlerEvent = function(event) {
 		originalTitle = tiddler ? tiddler.fields["draft.of"] : "",
 		originalTiddler = originalTitle ? this.wiki.getTiddler(originalTitle) : undefined,
 		confirmationTitle,
-	    	win = event.event && event.event.view ? event.event.view : window;
-	if(!tiddler) {
-		return false;
-	}
+		win = event.event && event.event.view ? event.event.view : window;
 	// Check if the tiddler we're deleting is in draft mode
 	if(originalTitle) {
 		// If so, we'll prompt for confirmation referencing the original tiddler
@@ -240,7 +237,7 @@ NavigatorWidget.prototype.handleDeleteTiddlerEvent = function(event) {
 		confirmationTitle = title;
 	}
 	// Seek confirmation
-	if((this.wiki.getTiddler(originalTitle) || (tiddler.fields.text || "") !== "") && !win.confirm($tw.language.getString(
+	if(((originalTitle && this.wiki.getTiddler(originalTitle)) || (tiddler && ((tiddler.fields.text || "") !== ""))) && !win.confirm($tw.language.getString(
 				"ConfirmDeleteTiddler",
 				{variables:
 					{title: confirmationTitle}
@@ -257,8 +254,10 @@ NavigatorWidget.prototype.handleDeleteTiddlerEvent = function(event) {
 		this.removeTitleFromStory(storyList,originalTitle);
 	}
 	// Invoke the hook function and delete this tiddler
-	$tw.hooks.invokeHook("th-deleting-tiddler",tiddler);
-	this.wiki.deleteTiddler(title);
+	if(tiddler) {
+		$tw.hooks.invokeHook("th-deleting-tiddler",tiddler);
+		this.wiki.deleteTiddler(title);	
+	}
 	// Remove the closed tiddler from the story
 	this.removeTitleFromStory(storyList,title);
 	this.saveStoryList(storyList);
@@ -500,7 +499,8 @@ NavigatorWidget.prototype.handleImportTiddlersEvent = function(event) {
 	// Get the tiddlers
 	var tiddlers = $tw.utils.parseJSONSafe(event.param,[]);
 	// Get the current $:/Import tiddler
-	var importTitle = event.importTitle ? event.importTitle : IMPORT_TITLE,
+	var paramObject = event.paramObject || {},
+		importTitle = event.importTitle || paramObject.importTitle || IMPORT_TITLE,
 		importTiddler = this.wiki.getTiddler(importTitle),
 		importData = this.wiki.getTiddlerData(importTitle,{}),
 		newFields = new Object({
@@ -541,7 +541,7 @@ NavigatorWidget.prototype.handleImportTiddlersEvent = function(event) {
 	newFields.text = JSON.stringify(importData,null,$tw.config.preferences.jsonSpaces);
 	this.wiki.addTiddler(new $tw.Tiddler(importTiddler,newFields));
 	// Update the story and history details
-	var autoOpenOnImport = event.autoOpenOnImport ? event.autoOpenOnImport : this.getVariable("tv-auto-open-on-import");  
+	var autoOpenOnImport = event.autoOpenOnImport || paramObject.autoOpenOnImport || this.getVariable("tv-auto-open-on-import");
 	if(autoOpenOnImport !== "no") {
 		var storyList = this.getStoryList(),
 			history = [];

core/modules/widgets/view.js

@@ -168,11 +168,11 @@ ViewWidget.prototype.getValueAsHtmlTextEncoded = function() {
 };
 
 ViewWidget.prototype.getValueAsUrlEncoded = function() {
-	return encodeURIComponent(this.getValueAsText());
+	return $tw.utils.encodeURIComponentExtended(this.getValueAsText());
 };
 
 ViewWidget.prototype.getValueAsDoubleUrlEncoded = function() {
-	return encodeURIComponent(encodeURIComponent(this.getValueAsText()));
+	return $tw.utils.encodeURIComponentExtended($tw.utils.encodeURIComponentExtended(this.getValueAsText()));
 };
 
 ViewWidget.prototype.getValueAsDate = function(format) {

core/templates/exporters/StaticRiver.tid

@@ -14,6 +14,7 @@ extension: .html
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="generator" content="TiddlyWiki" />
 <meta name="tiddlywiki-version" content="{{$:/core/templates/version}}" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 <meta name="format-detection" content="telephone=no">
 <link id="faviconLink" rel="shortcut icon" href="favicon.ico">
 <title>{{$:/core/wiki/title}}</title>

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

@@ -1,5 +1,6 @@
 title: $:/core/save/all-external-js
 
+\whitespace trim
 \import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
 \define saveTiddlerFilter()
 [is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/core]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]] $(publishFilter)$

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

@@ -1,5 +1,6 @@
 title: $:/core/save/offline-external-js
 
+\whitespace trim
 \import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
 \define saveTiddlerFilter()
 [is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/core]] -[[$:/plugins/tiddlywiki/filesystem]] -[[$:/plugins/tiddlywiki/tiddlyweb]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]] $(publishFilter)$

core/templates/external-js/tiddlywiki.js.load.tid

@@ -0,0 +1,3 @@
+title: $:/core/templates/tiddlywiki.js/load-tiddler
+
+_load(window,<$macrocall $name="jsontiddler" $output="text/raw"/>);

core/templates/external-js/tiddlywiki.js.tid

@@ -1,15 +1,48 @@
+
 title: $:/core/templates/tiddlywiki5.js
 
 \rules only filteredtranscludeinline transcludeinline codeinline
 
-/*
-{{ $:/core/copyright.txt ||$:/core/templates/plain-text-tiddler}}
-`*/
-`<!--~~ Library modules ~~-->
-{{{ [is[system]type[application/javascript]library[yes]] ||$:/core/templates/plain-text-tiddler}}}
-<!--~~ Boot prefix ~~-->
-{{ $:/boot/bootprefix.js ||$:/core/templates/plain-text-tiddler}}
-<!--~~ Core plugin ~~-->
-{{$:/core/templates/tiddlywiki5.js/tiddlers}}
-<!--~~ Boot kernel ~~-->
-{{ $:/boot/boot.js ||$:/core/templates/plain-text-tiddler}}
+`/*
+`{{ $:/core/copyright.txt ||$:/core/templates/plain-text-tiddler}}`
+*/
+
+$tw = (typeof $tw === 'undefined') ? Object.create(null) : $tw;
+
+$tw.preloadTiddlers = $tw.preloadTiddlers || [];
+
+_load = function(window,tiddler) {
+	"use strict";
+	var f;
+	$tw.preloadTiddlers.push(tiddler);
+	if(tiddler.library === "yes") {
+		var module = { exports:{} };
+		var moduleName = function moduleName(path) {
+			var word = path.split("/").pop();
+			word = word.substring(0,word.indexOf(".")) || word;
+			return word;
+		}
+		f = new Function("module",tiddler.text);
+		f(module);
+		window[moduleName(tiddler.title)] = module.exports;
+	} else {
+		f = new Function("window",tiddler.text);
+		f(window);
+	}
+}
+
+/* ~~ Library modules ~~ */
+
+`{{{ [is[system]type[application/javascript]library[yes]] ||$:/core/templates/tiddlywiki.js/load-tiddler}}}`
+
+/* ~~ Boot kernel prologue ~~ */
+
+`{{ $:/boot/bootprefix.js ||$:/core/templates/tiddlywiki.js/load-tiddler}}`
+
+/* ~~ Core tiddlers ~~ */
+
+`{{$:/core/templates/tiddlywiki5.js/tiddlers}}`
+
+/* ~~ Boot kernel ~~ */
+
+`{{ $:/boot/boot.js ||$:/core/templates/tiddlywiki.js/load-tiddler}}`

core/templates/external-js/tiddlywiki5-external-js.html.tid

@@ -1,48 +1,50 @@
 title: $:/core/templates/tiddlywiki5-external-js.html
 
-\rules only filteredtranscludeinline transcludeinline
-<!doctype html>
-{{$:/core/templates/MOTW.html}}<html lang="{{{ [{$:/language}get[name]] }}}">
+<$set name="saveTiddlerAndShadowsFilter" filter="[subfilter<saveTiddlerFilter>] [subfilter<saveTiddlerFilter>plugintiddlers[]]">
+`<!doctype html>
+`{{$:/core/templates/MOTW.html}}`<html lang="`<$text text={{{ [{$:/language}get[name]] }}}/>`">
 <head>
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <!--~~ Raw markup for the top of the head section ~~-->
-{{{ [all[shadows+tiddlers]tag[$:/tags/RawMarkupWikified/TopHead]] ||$:/core/templates/raw-static-tiddler}}}
+`{{{ [enlist<saveTiddlerAndShadowsFilter>tag[$:/tags/RawMarkupWikified/TopHead]] ||$:/core/templates/raw-static-tiddler}}}`
 <meta http-equiv="X-UA-Compatible" content="IE=Edge"/>
 <meta name="application-name" content="TiddlyWiki" />
 <meta name="generator" content="TiddlyWiki" />
-<meta name="tiddlywiki-version" content="{{$:/core/templates/version}}" />
+<meta name="tiddlywiki-version" content="`{{$:/core/templates/version}}`" />
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 <meta name="apple-mobile-web-app-capable" content="yes" />
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
 <meta name="mobile-web-app-capable" content="yes"/>
 <meta name="format-detection" content="telephone=no" />
-<meta name="copyright" content="{{$:/core/copyright.txt}}" />
+<meta name="copyright" content="`{{$:/core/copyright.txt}}`" />
 <link id="faviconLink" rel="shortcut icon" href="favicon.ico">
-<title>{{$:/core/wiki/title}}</title>
+<title>`{{$:/core/wiki/title}}`</title>
 <!--~~ This is a Tiddlywiki file. The points of interest in the file are marked with this pattern ~~-->
 
 <!--~~ Raw markup ~~-->
-{{{ [all[shadows+tiddlers]tag[$:/core/wiki/rawmarkup]] [all[shadows+tiddlers]tag[$:/tags/RawMarkup]] ||$:/core/templates/plain-text-tiddler}}}
-{{{ [all[shadows+tiddlers]tag[$:/tags/RawMarkupWikified]] ||$:/core/templates/raw-static-tiddler}}}
+`{{{ [enlist<saveTiddlerAndShadowsFilter>tag[$:/core/wiki/rawmarkup]] ||$:/core/templates/plain-text-tiddler}}}`
+`{{{ [enlist<saveTiddlerAndShadowsFilter>tag[$:/tags/RawMarkup]] ||$:/core/templates/plain-text-tiddler}}}`
+`{{{ [enlist<saveTiddlerAndShadowsFilter>tag[$:/tags/RawMarkupWikified]] ||$:/core/templates/raw-static-tiddler}}}`
 </head>
 <body class="tc-body">
 <!--~~ Raw markup for the top of the body section ~~-->
-{{{ [all[shadows+tiddlers]tag[$:/tags/RawMarkupWikified/TopBody]] ||$:/core/templates/raw-static-tiddler}}}
+`{{{ [enlist<saveTiddlerAndShadowsFilter>tag[$:/tags/RawMarkupWikified/TopBody]] ||$:/core/templates/raw-static-tiddler}}}`
 <!--~~ Static styles ~~-->
 <div id="styleArea">
-{{$:/boot/boot.css||$:/core/templates/css-tiddler}}
+`{{$:/boot/boot.css||$:/core/templates/css-tiddler}}`
 </div>
 <!--~~ Static content for Google and browsers without JavaScript ~~-->
 <noscript>
 <div id="splashArea">
-{{$:/core/templates/static.area}}
+`{{$:/core/templates/static.area}}`
 </div>
 </noscript>
 <!--~~ Ordinary tiddlers ~~-->
-{{$:/core/templates/store.area.template.html}}
+`{{$:/core/templates/store.area.template.html}}`
 <!--~~ Raw markup for the bottom of the body section ~~-->
-{{{ [all[shadows+tiddlers]tag[$:/tags/RawMarkupWikified/BottomBody]] ||$:/core/templates/raw-static-tiddler}}}
+`{{{ [enlist<saveTiddlerAndShadowsFilter>tag[$:/tags/RawMarkupWikified/BottomBody]] ||$:/core/templates/raw-static-tiddler}}}`
+<!--~~ Load external JavaScripts ~~-->
+<script src="`{{{ [<coreURL>] }}}`" onerror="alert('Error: Cannot load `{{{ [<coreURL>] }}}`');"></script>
 </body>
-<!--~~ Load external JS ~~-->
-<script src="{{{ [<coreURL>] }}}" onerror="alert('Error: Cannot load {{{ [<coreURL>] }}}');"></script>
-</html>
+</html>`
+</$set>

core/ui/ControlPanel/Parsing.tid

@@ -12,7 +12,7 @@ field="text"
 checked="enable"
 unchecked="disable"
 default="enable">
-<<rule>>
+<span class="tc-small-gap-left"><<rule>></span>
 </$checkbox>
 \end
 

core/ui/DownloadFullWiki.tid

@@ -0,0 +1,18 @@
+title: $:/core/ui/DownloadFullWiki
+
+\whitespace trim
+\rules except wikilink
+
+To download the standard single-file version of your wiki:
+
+<$wikify name="site-title" text={{$:/config/SaveWikiButton/Filename}}>
+<$let publishFilter="""-[[$:/config/SaveWikiButton/Template]] -[[$:/plugins/tiddlywiki/filesystem]] -[[$:/plugins/tiddlywiki/tiddlyweb]]""">
+<$button tooltip="Download fully standalone wiki" aria-label="download full wiki" class="tc-btn-big-green">
+<$action-sendmessage $message="tm-download-file" $param="$:/core/save/all" publishFilter=<<publishFilter>> filename=<<site-title>>/>
+{{$:/core/images/download-button}}
+<span class="tc-tiny-gap-left">
+Download full wiki
+</span>
+</$button>
+</$let>
+</$wikify>

core/ui/EditTemplate.tid

@@ -46,9 +46,7 @@ title: $:/core/ui/EditTemplate
 <$keyboard key="((cancel-edit-tiddler))" actions=<<cancel-delete-tiddler-actions "cancel">> tag="div">
 <$keyboard key="((save-tiddler))" actions=<<save-tiddler-actions>> tag="div">
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/EditTemplate]!has[draft.of]]" variable="listItem">
-<$set name="tv-config-toolbar-class" filter="[<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]]">
 <$transclude tiddler=<<listItem>>/>
-</$set>
 </$list>
 </$keyboard>
 </$keyboard>

core/ui/EditTemplate/controls.tid

@@ -7,6 +7,6 @@ $:/config/EditToolbarButtons/Visibility/$(listItem)$
 \whitespace trim
 <div class="tc-tiddler-title tc-tiddler-edit-title">
 <$view field="title"/>
-<span class="tc-tiddler-controls tc-titlebar"><$list filter="[all[shadows+tiddlers]tag[$:/tags/EditToolbar]!has[draft.of]]" variable="listItem"><$reveal type="nomatch" state=<<config-title>> text="hide"><$transclude tiddler=<<listItem>>/></$reveal></$list></span>
+<span class="tc-tiddler-controls tc-titlebar"><$list filter="[all[shadows+tiddlers]tag[$:/tags/EditToolbar]!has[draft.of]]" variable="listItem"><$let tv-config-toolbar-class={{{ [enlist<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]] +[join[ ]]}}}><$reveal type="nomatch" state=<<config-title>> text="hide"><$transclude tiddler=<<listItem>>/></$reveal></$let></$list></span>
 <div style="clear: both;"></div>
 </div>

core/ui/EditToolbar/save.tid

@@ -3,16 +3,23 @@ tags: $:/tags/EditToolbar
 caption: {{$:/core/images/done-button}} {{$:/language/Buttons/Save/Caption}}
 description: {{$:/language/Buttons/Save/Hint}}
 
+\whitespace trim
 \define save-tiddler-button()
 \whitespace trim
-<$fieldmangler><$button tooltip={{$:/language/Buttons/Save/Hint}} aria-label={{$:/language/Buttons/Save/Caption}} class=<<tv-config-toolbar-class>>>
-<<save-tiddler-actions>>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
-{{$:/core/images/done-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
-<span class="tc-btn-text"><$text text={{$:/language/Buttons/Save/Caption}}/></span>
-</$list>
-</$button></$fieldmangler>
+<$fieldmangler>
+	<$button
+		tooltip={{$:/language/Buttons/Save/Hint}}
+		aria-label={{$:/language/Buttons/Save/Caption}}
+		class=<<tv-config-toolbar-class>>
+	>
+		<<save-tiddler-actions>>
+		<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+			{{$:/core/images/done-button}}
+		</$list>
+		<$list filter="[<tv-config-toolbar-text>match[yes]]">
+			<span class="tc-btn-text"><$text text={{$:/language/Buttons/Save/Caption}}/></span>
+		</$list>
+	</$button>
+</$fieldmangler>
 \end
 <<save-tiddler-button>>

core/ui/ExportTiddlyWikiCore.tid

@@ -1,11 +1,6 @@
 title: $:/core/ui/ExportTiddlyWikiCore
 
 \define jsFileName() tiddlywikicore-$(version)$.js
-\define noExportMsg()
-It appears that you have a wiki with an external ~TiddlyWiki core. The export action cannot be performed.
-<p>You will need to view the page source in your browser. Then go to the very bottom the the source, find the last `<script>`
-element, and right-click its `src` URI. Save the link as ''$(jsFileName)$''</p>
-\end
 \rules except wikilink
 \whitespace trim
 
@@ -17,16 +12,11 @@ Export the TiddlyWiki core JavaScript code for running with external JavaScript:
 	tooltip="Export the TiddlyWiki core code for running with external JavaScript"
 	aria-label="export TiddlyWiki core"
 	class="tc-btn-big-green">
-<$list
-	filter="[[$:/boot/boot.js]is[missing]]"
-	variable="ignore"
-	emptyMessage="<$action-sendmessage $message='tm-download-file' $param='$:/core/templates/tiddlywiki5.js' filename=<<jsFileName>>/>" >
-<$action-setfield $tiddler=<<qualify "$:/temp/alert">> text=<<noExportMsg>> subtitle="Export ~TiddllyWiki Core"/>
-<$action-sendmessage $message="tm-modal" $param=<<qualify "$:/temp/alert">>/>
-</$list>
+<$action-sendmessage $message='tm-download-file' $param='$:/core/templates/tiddlywiki5.js' filename=<<jsFileName>>/>
 {{$:/core/images/download-button}}
-&#32;
+<span class="tc-tiny-gap-left">
 Download TiddlyWiki core
+</span>
 </$button>
 
 [[Further information|https://tiddlywiki.com/#Using%20the%20external%20JavaScript%20template]]

core/ui/LayoutSwitcher.tid

@@ -13,13 +13,13 @@ caption: {{$:/language/ControlPanel/LayoutSwitcher/Caption}}
 		<$set name="cls" filter="[all[current]field:title{$:/layout}]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item">
 		<div class=<<cls>>>
 		<$link to={{!!title}}>
-		''<$transclude field="name"/>''&#32;-&#32;<$transclude field="description"/>
+		''<$transclude tiddler={{{ [<currentTiddler>get[icon]] }}}/><$transclude field="name"/>''&#32;-&#32;<$transclude field="description"/>
 		</$link></div></$set>
 """>
 <$set name="cls" filter="[all[current]field:title[$:/core/ui/PageTemplate]]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item">
 <div class=<<cls>>>
 <$link to={{!!title}}>
-''<$transclude field="name"/>''&#32;-&#32;<$transclude field="description"/>
+''<$transclude tiddler={{{ [<currentTiddler>get[icon]] }}}/><$transclude field="name"/>''&#32;-&#32;<$transclude field="description"/>
 </$link>
 </div>
 </$set>

core/ui/MoreSideBar/Tags.tid

@@ -2,26 +2,17 @@ title: $:/core/ui/MoreSideBar/Tags
 tags: $:/tags/MoreSideBar
 caption: {{$:/language/SideBar/Tags/Caption}}
 
-<$set name="tv-config-toolbar-icons" value="yes">
-
-<$set name="tv-config-toolbar-text" value="yes">
-
-<$set name="tv-config-toolbar-class" value="">
-
-{{$:/core/ui/Buttons/tag-manager}}
-
-</$set>
-
-</$set>
-
-</$set>
+\whitespace trim
 
+<$let tv-config-toolbar-icons="yes" tv-config-toolbar-text="yes" tv-config-toolbar-class="">
+	<div class="tc-tiny-v-gap-bottom">
+    	{{$:/core/ui/Buttons/tag-manager}}
+	</div>
+</$let>
 <$list filter={{$:/core/Filters/AllTags!!filter}}>
-
-<$transclude tiddler="$:/core/ui/TagTemplate"/>
-
+	<div class="tc-tiny-v-gap-bottom">
+    	<$transclude tiddler="$:/core/ui/TagTemplate"/>
+	</div>
 </$list>
-
 <hr class="tc-untagged-separator">
-
 {{$:/core/ui/UntaggedTemplate}}

core/ui/PageControls/savewiki.tid

@@ -1,6 +1,6 @@
 title: $:/core/ui/Buttons/save-wiki
 tags: $:/tags/PageControls
-caption: {{$:/core/images/save-button}} {{$:/language/Buttons/SaveWiki/Caption}}
+caption: {{$:/core/images/save-button-dynamic}} {{$:/language/Buttons/SaveWiki/Caption}}
 description: {{$:/language/Buttons/SaveWiki/Hint}}
 
 \whitespace trim
@@ -10,7 +10,7 @@ description: {{$:/language/Buttons/SaveWiki/Hint}}
 </$wikify>
 <span class="tc-dirty-indicator">
 <$list filter="[<tv-config-toolbar-icons>match[yes]]">
-{{$:/core/images/save-button}}
+{{$:/core/images/save-button-dynamic}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>match[yes]]">
 <span class="tc-btn-text">

core/ui/PageTemplate.tid

@@ -1,6 +1,7 @@
 title: $:/core/ui/PageTemplate
 name: {{$:/language/PageTemplate/Name}}
 description: {{$:/language/PageTemplate/Description}}
+icon: $:/core/images/layout-button
 
 \whitespace trim
 \import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]

core/ui/UntaggedTemplate.tid

@@ -3,10 +3,8 @@ title: $:/core/ui/UntaggedTemplate
 \define lingo-base() $:/language/SideBar/
 \whitespace trim
 <$button popup=<<qualify "$:/state/popup/tag">> class="tc-btn-invisible tc-untagged-label tc-tag-label">
-<<lingo Tags/Untagged/Caption>>
+	<<lingo Tags/Untagged/Caption>>
 </$button>
-<$reveal state=<<qualify "$:/state/popup/tag">> type="popup" position="below">
-<div class="tc-drop-down">
-<$list filter="[untagged[]!is[system]] -[tags[]] +[sort[title]]" template="$:/core/ui/ListItemTemplate"/>
-</div>
+<$reveal class="tc-drop-down" tag="div" state=<<qualify "$:/state/popup/tag">> type="popup" position="below">
+	<$list filter="[untagged[]!is[system]] -[tags[]] +[sort[title]]" template="$:/core/ui/ListItemTemplate"/>
 </$reveal>

core/ui/ViewToolbar/new-here.tid

@@ -6,7 +6,7 @@ description: {{$:/language/Buttons/NewHere/Hint}}
 \whitespace trim
 \define newHereActions()
 \whitespace trim
-<$set name="tags" filter="[<currentTiddler>] [{$:/config/NewTiddler/Tags}]">
+<$set name="tags" filter="[<currentTiddler>] [enlist{$:/config/NewTiddler/Tags}]">
 <$action-sendmessage $message="tm-new-tiddler" tags=<<tags>>/>
 </$set>
 \end

core/wiki/config/OfficialPluginLibrary.tid

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

core/wiki/download-wiki-button.tid

@@ -4,5 +4,5 @@ title: $:/snippets/download-wiki-button
 \whitespace trim
 <$button class="tc-btn-big-green">
 <$action-sendmessage $message="tm-download-file" $param="$:/core/save/all" filename="index.html"/>
-<<lingo Full/Caption>>&#32;{{$:/core/images/save-button}}
+<<lingo Full/Caption>>&#32;{{$:/core/images/save-button-dynamic}}
 </$button>

core/wiki/macros/keyboard-driven-input.tid

@@ -4,76 +4,85 @@ tags: $:/tags/Macro
 \define change-input-tab(stateTitle,tag,beforeafter,defaultState,actions)
 \whitespace trim
 <$set name="tabsList" filter="[all[shadows+tiddlers]tag<__tag__>!has[draft.of]]">
-<$let
-	currentState={{{ [<__stateTitle__>!is[missing]get[text]] ~[<__defaultState__>] }}}
-	firstTab={{{ [enlist<tabsList>nth[1]] }}}
-	lastTab={{{ [enlist<tabsList>last[]] }}}
-	nextTab={{{ [all[shadows+tiddlers]tag<__tag__>!has[draft.of]$beforeafter$<currentState>] ~[[$beforeafter$]removeprefix[after]suffix[]addprefix<firstTab>] ~[[$beforeafter$]removeprefix[before]suffix[]addprefix<lastTab>] }}}>
-<$action-setfield $tiddler=<<__stateTitle__>> text=<<nextTab>>/>
-$actions$
-</$let>
+	<$let
+		currentState={{{ [<__stateTitle__>!is[missing]get[text]] ~[<__defaultState__>] }}}
+		firstTab={{{ [enlist<tabsList>nth[1]] }}}
+		lastTab={{{ [enlist<tabsList>last[]] }}}
+		nextTab={{{ [all[shadows+tiddlers]tag<__tag__>!has[draft.of]$beforeafter$<currentState>] ~[[$beforeafter$]removeprefix[after]suffix[]addprefix<firstTab>] ~[[$beforeafter$]removeprefix[before]suffix[]addprefix<lastTab>] }}}
+	>
+		<$action-setfield $tiddler=<<__stateTitle__>> text=<<nextTab>>/>
+		$actions$
+	</$let>
 </$set>
 \end
 
 \define keyboard-input-actions()
 \whitespace trim
 <$list filter="[<__index__>match[]]">
-<$action-setfield $tiddler=<<__storeTitle__>> text={{{ [<__tiddler__>get<__field__>] }}}/>
+	<$action-setfield $tiddler=<<__storeTitle__>> text={{{ [<__tiddler__>get<__field__>] }}}/>
 </$list>
 <$list filter="[<__index__>!match[]]">
-<$action-setfield $tiddler=<<__storeTitle__>> text={{{ [<__tiddler__>getindex<__index__>] }}}/>
+	<$action-setfield $tiddler=<<__storeTitle__>> text={{{ [<__tiddler__>getindex<__index__>] }}}/>
 </$list>
 \end
 
 \define input-next-actions-inner()
 \whitespace trim
 <$list filter="[<nextItem>minlength[1]]" variable="ignore">
-<$action-setfield $tiddler=<<__selectionStateTitle__>> text=<<nextItem>>/>
-<$list filter="[<__index__>match[]]">
-<$action-setfield $tiddler=<<__tiddler__>> $field=<<__field__>> $value={{{ [<nextItem>] +[splitregexp[(?:.(?!-))+$]] }}}/>
-</$list>
-<$list filter="[<__index__>!match[]]">
-<$action-setfield $tiddler=<<__tiddler__>> $index=<<__index__>> $value={{{ [<nextItem>] +[splitregexp[(?:.(?!-))+$]] }}}/>
-</$list>
-<$action-setfield $tiddler=<<__refreshTitle__>> text="yes"/>
+	<$action-setfield $tiddler=<<__selectionStateTitle__>> text=<<nextItem>>/>
+	<$list filter="[<__index__>match[]]">
+		<$action-setfield $tiddler=<<__tiddler__>> $field=<<__field__>> $value={{{ [<nextItem>] +[splitregexp[(?:.(?!-))+$]] }}}/>
+	</$list>
+	<$list filter="[<__index__>!match[]]">
+		<$action-setfield $tiddler=<<__tiddler__>> $index=<<__index__>> $value={{{ [<nextItem>] +[splitregexp[(?:.(?!-))+$]] }}}/>
+	</$list>
+	<$action-setfield $tiddler=<<__refreshTitle__>> text="yes"/>
 </$list>
 \end
 
 \define input-next-actions(afterOrBefore:"after",reverse:"")
 \whitespace trim
-<$list filter="[<__storeTitle__>get[text]minlength<__filterMinLength__>] [<__filterMinLength__>match[0]] +[limit[1]]" variable="ignore">
-<$let
-	userInput={{{ [<__storeTitle__>get[text]] }}}
-	selectedItem={{{ [<__selectionStateTitle__>get[text]] }}}
-	configTiddler={{{ [subfilter<__configTiddlerFilter__>] }}}
-	primaryListFilter={{{ [<configTiddler>get<__firstSearchFilterField__>] }}}
-	secondaryListFilter={{{ [<configTiddler>get<__secondSearchFilterField__>] }}}>
-<$set name="filteredList" filter="[subfilter<primaryListFilter>addsuffix[-primaryList]] =[subfilter<secondaryListFilter>addsuffix[-secondaryList]]">
-<$let
-	nextItem={{{ [enlist<filteredList>$afterOrBefore$<selectedItem>] ~[enlist<filteredList>$reverse$nth[1]] }}}
-	firstItem={{{ [enlist<filteredList>nth[1]] }}}
-	lastItem={{{ [enlist<filteredList>last[]] }}}>
-<$list filter="[<selectedItem>match<firstItem>!match<lastItem>]" variable="ignore">
-<$set name="nextItem" value={{{ [[$afterOrBefore$]match[before]then<userInput>addsuffix[-userInput]] ~[<nextItem>] }}}>
-<<input-next-actions-inner>>
-</$set>
-</$list>
-<$list filter="[<selectedItem>match<lastItem>!match<firstItem>]" variable="ignore">
-<$set name="nextItem" value={{{ [[$afterOrBefore$]match[after]then<userInput>addsuffix[-userInput]] ~[<nextItem>] }}}>
-<<input-next-actions-inner>>
-</$set>
-</$list>
-<$list filter="[<selectedItem>match<firstItem>match<lastItem>]" variable="ignore">
-<$set name="nextItem" value={{{ [<userInput>addsuffix[-userInput]] }}}>
-<<input-next-actions-inner>>
-</$set>
-</$list>
-<$list filter="[<selectedItem>!match<firstItem>!match<lastItem>]" variable="ignore">
-<<input-next-actions-inner>>
-</$list>
-</$let>
-</$set>
-</$let>
+<$list
+	filter="[<__storeTitle__>get[text]minlength<__filterMinLength__>] [<__filterMinLength__>match[0]] +[limit[1]]"
+	variable="ignore"
+>
+	<$let
+		userInput={{{ [<__storeTitle__>get[text]] }}}
+		selectedItem={{{ [<__selectionStateTitle__>get[text]] }}}
+		configTiddler={{{ [subfilter<__configTiddlerFilter__>] }}}
+		primaryListFilter={{{ [<configTiddler>get<__firstSearchFilterField__>] }}}
+		secondaryListFilter={{{ [<configTiddler>get<__secondSearchFilterField__>] }}}
+	>
+		<$set
+			name="filteredList"
+			filter="[subfilter<primaryListFilter>addsuffix[-primaryList]] =[subfilter<secondaryListFilter>addsuffix[-secondaryList]]"
+		>
+			<$let
+				nextItem={{{ [enlist<filteredList>$afterOrBefore$<selectedItem>] ~[enlist<filteredList>$reverse$nth[1]] }}}
+				firstItem={{{ [enlist<filteredList>nth[1]] }}}
+				lastItem={{{ [enlist<filteredList>last[]] }}}
+			>
+				<$list filter="[<selectedItem>match<firstItem>!match<lastItem>]" variable="ignore">
+					<$set name="nextItem" value={{{ [[$afterOrBefore$]match[before]then<userInput>addsuffix[-userInput]] ~[<nextItem>] }}}>
+						<<input-next-actions-inner>>
+					</$set>
+				</$list>
+				<$list filter="[<selectedItem>match<lastItem>!match<firstItem>]" variable="ignore">
+					<$set name="nextItem" value={{{ [[$afterOrBefore$]match[after]then<userInput>addsuffix[-userInput]] ~[<nextItem>] }}}>
+						<<input-next-actions-inner>>
+					</$set>
+				</$list>
+				<$list filter="[<selectedItem>match<firstItem>match<lastItem>]" variable="ignore">
+					<$set name="nextItem" value={{{ [<userInput>addsuffix[-userInput]] }}}>
+						<<input-next-actions-inner>>
+					</$set>
+				</$list>
+				<$list filter="[<selectedItem>!match<firstItem>!match<lastItem>]" variable="ignore">
+					<<input-next-actions-inner>>
+				</$list>
+			</$let>
+		</$set>
+	</$let>
 </$list>
 \end
 
@@ -84,12 +93,14 @@ $actions$
 <$keyboard key="((input-up))" actions=<<input-next-actions "before" "reverse[]">>>
 <$keyboard key="((input-down))" actions=<<input-next-actions>>>
 <$keyboard key="((input-cancel))" actions=<<__inputCancelActions__>>>
-<$edit-text tiddler=<<__tiddler__>> field=<<__field__>> index=<<__index__>> 
-		inputActions=<<keyboard-input-actions>> tag=<<__tag__>> class=<<__class__>> 
-		placeholder=<<__placeholder__>> default=<<__default__>> focusPopup=<<__focusPopup__>> 
-		focus=<<__focus__>> type=<<__type__>> rows=<<__rows__>> minHeight=<<__minHeight__>> 
-		tabindex=<<__tabindex__>> size=<<__size__>> autoHeight=<<__autoHeight__>> 
-		refreshTitle=<<__refreshTitle__>> cancelPopups=<<__cancelPopups__>>/>
+	<$edit-text
+		tiddler=<<__tiddler__>> field=<<__field__>> index=<<__index__>>
+		inputActions=<<keyboard-input-actions>> tag=<<__tag__>> class=<<__class__>>
+		placeholder=<<__placeholder__>> default=<<__default__>> focusPopup=<<__focusPopup__>>
+		focus=<<__focus__>> type=<<__type__>> rows=<<__rows__>> minHeight=<<__minHeight__>>
+		tabindex=<<__tabindex__>> size=<<__size__>> autoHeight=<<__autoHeight__>>
+		refreshTitle=<<__refreshTitle__>> cancelPopups=<<__cancelPopups__>>
+	/>
 </$keyboard>
 </$keyboard>
 </$keyboard>

core/wiki/macros/list.tid

@@ -26,7 +26,7 @@ tags: $:/tags/Macro
 \whitespace trim
 <span class="tc-links-draggable-list">
 <$vars targetTiddler="""$tiddler$""" targetField="""$field$""">
-<$type$ class="$class$">
+<$genesis $type=<<__type__>> class="$class$">
 <$list filter="[list[$tiddler$!!$field$]]" emptyMessage=<<__emptyMessage__>>>
 <$droppable actions=<<list-links-draggable-drop-actions>> tag="""$subtype$""" enable=<<tv-enable-drag-and-drop>>>
 <div class="tc-droppable-placeholder"/>
@@ -51,7 +51,7 @@ tags: $:/tags/Macro
 <div style="height:0.5em;"/>
 </$droppable>
 </$tiddler>
-</$type$>
+</$genesis>
 </$vars>
 </span>
 \end
@@ -84,24 +84,24 @@ tags: $:/tags/Macro
 <span class="tc-tagged-draggable-list">
 <$set name="tag" value=<<__tag__>>>
 <$list filter="[<__tag__>tagging[]$subFilter$]" emptyMessage=<<__emptyMessage__>> storyview=<<__storyview__>>>
-<$elementTag$ class="tc-menu-list-item">
+<$genesis $type=<<__elementTag__>> class="tc-menu-list-item">
 <$droppable actions="""<$macrocall $name="list-tagged-draggable-drop-actions" tag=<<__tag__>>/>""" enable=<<tv-enable-drag-and-drop>>>
-<$elementTag$ class="tc-droppable-placeholder"/>
-<$elementTag$>
+<$genesis $type=<<__elementTag__>> class="tc-droppable-placeholder"/>
+<$genesis $type=<<__elementTag__>>>
 <$transclude tiddler="""$itemTemplate$""">
 <$link to={{!!title}}>
 <$view field="title"/>
 </$link>
 </$transclude>
-</$elementTag$>
+</$genesis>
 </$droppable>
-</$elementTag$>
+</$genesis>
 </$list>
 <$tiddler tiddler="">
 <$droppable actions="""<$macrocall $name="list-tagged-draggable-drop-actions" tag=<<__tag__>>/>""" enable=<<tv-enable-drag-and-drop>>>
-<$elementTag$ class="tc-droppable-placeholder"/>
-<$elementTag$ style="height:0.5em;">
-</$elementTag$>
+<$genesis $type=<<__elementTag__>> class="tc-droppable-placeholder"/>
+<$genesis $type=<<__elementTag__>> style="height:0.5em;">
+</$genesis>
 </$droppable>
 </$tiddler>
 </$set>

core/wiki/macros/tag-picker.tid

@@ -10,10 +10,14 @@ second-search-filter: [tags[]is[system]search:title<userInput>sort[]]
 \define add-tag-actions(actions,tagField:"tags")
 \whitespace trim
 <$set name="tag" value={{{ [<__tiddler__>get[text]] }}}>
-<$list filter="[<saveTiddler>!contains:$tagField$<tag>!match[]]" variable="ignore" emptyMessage="<$action-listops $tiddler=<<saveTiddler>> $field=<<__tagField__>> $subfilter='-[<tag>]'/>">
-<$action-listops $tiddler=<<saveTiddler>> $field=<<__tagField__>> $subfilter="[<tag>trim[]]"/>
-$actions$
-</$list>
+	<$list
+		filter="[<saveTiddler>!contains:$tagField$<tag>!match[]]"
+		variable="ignore"
+		emptyMessage="<$action-listops $tiddler=<<saveTiddler>> $field=<<__tagField__>> $subfilter='-[<tag>]'/>"
+	>
+		<$action-listops $tiddler=<<saveTiddler>> $field=<<__tagField__>> $subfilter="[<tag>trim[]]"/>
+		$actions$
+	</$list>
 </$set>
 <<delete-tag-state-tiddlers>>
 <$action-setfield $tiddler=<<refreshTitle>> text="yes"/>
@@ -21,80 +25,153 @@ $actions$
 
 \define clear-tags-actions-inner()
 \whitespace trim
-<$list filter="[<storeTitle>has[text]] [<newTagNameTiddler>has[text]]" variable="ignore" emptyMessage="<<cancel-delete-tiddler-actions 'cancel'>>">
-<<delete-tag-state-tiddlers>>
+<$list
+	filter="[<storeTitle>has[text]] [<newTagNameTiddler>has[text]]"
+	variable="ignore"
+	emptyMessage="<<cancel-delete-tiddler-actions 'cancel'>>"
+>
+	<<delete-tag-state-tiddlers>>
 </$list>
 \end
 
 \define clear-tags-actions()
 \whitespace trim
 <$set name="userInput" value={{{ [<storeTitle>get[text]] }}}>
-<$list filter="[<newTagNameTiddler>get[text]!match<userInput>]" emptyMessage="<<clear-tags-actions-inner>>">
-<$action-setfield $tiddler=<<newTagNameTiddler>> text=<<userInput>>/><$action-setfield $tiddler=<<refreshTitle>> text="yes"/>
-</$list>
+	<$list filter="[<newTagNameTiddler>get[text]!match<userInput>]" emptyMessage="<<clear-tags-actions-inner>>">
+		<$action-setfield $tiddler=<<newTagNameTiddler>> text=<<userInput>>/><$action-setfield $tiddler=<<refreshTitle>> text="yes"/>
+	</$list>
 </$set>
 \end
 
 \define tag-picker-inner(actions,tagField:"tags")
 \whitespace trim
-<$vars newTagNameInputTiddlerQualified=<<qualify "$:/temp/NewTagName/input">> newTagNameSelectionTiddlerQualified=<<qualify "$:/temp/NewTagName/selected-item">> fallbackTarget={{$(palette)$##tag-background}} colourA={{$(palette)$##foreground}} colourB={{$(palette)$##background}}>
-<$vars storeTitle={{{ [<newTagNameInputTiddler>!match[]] ~[<newTagNameInputTiddlerQualified>] }}} tagSelectionState={{{ [<newTagNameSelectionTiddler>!match[]] ~[<newTagNameSelectionTiddlerQualified>] }}}>
-<$vars refreshTitle=<<qualify "$:/temp/NewTagName/refresh">> nonSystemTagsFilter="[tags[]!is[system]search:title<userInput>sort[]]" systemTagsFilter="[tags[]is[system]search:title<userInput>sort[]]">
-<div class="tc-edit-add-tag">
-<div>
-<span class="tc-add-tag-name tc-small-gap-right">
-<$macrocall $name="keyboard-driven-input" tiddler=<<newTagNameTiddler>> storeTitle=<<storeTitle>> refreshTitle=<<refreshTitle>>
-		selectionStateTitle=<<tagSelectionState>> inputAcceptActions="<$macrocall $name='add-tag-actions' actions=<<__actions__>> tagField=<<__tagField__>>/>"
-		inputCancelActions=<<clear-tags-actions>> tag="input" placeholder={{$:/language/EditTemplate/Tags/Add/Placeholder}}
-		focusPopup=<<qualify "$:/state/popup/tags-auto-complete">> class="tc-edit-texteditor tc-popup-handle" tabindex=<<tabIndex>> 
-		focus={{{ [{$:/config/AutoFocus}match[tags]then[true]] ~[[false]] }}} filterMinLength={{$:/config/Tags/MinLength}} 
-		cancelPopups=<<cancelPopups>> configTiddlerFilter="[[$:/core/macros/tag-picker]]"/>
-</span><$button popup=<<qualify "$:/state/popup/tags-auto-complete">> class="tc-btn-invisible tc-btn-dropdown" tooltip={{$:/language/EditTemplate/Tags/Dropdown/Hint}} aria-label={{$:/language/EditTemplate/Tags/Dropdown/Caption}}>{{$:/core/images/down-arrow}}</$button><$reveal state=<<storeTitle>> type="nomatch" text=""><$button class="tc-btn-invisible tc-small-gap tc-btn-dropdown" tooltip={{$:/language/EditTemplate/Tags/ClearInput/Hint}} aria-label={{$:/language/EditTemplate/Tags/ClearInput/Caption}}>{{$:/core/images/close-button}}<<delete-tag-state-tiddlers>></$button></$reveal><span class="tc-add-tag-button tc-small-gap-left">
-<$set name="tag" value={{{ [<newTagNameTiddler>get[text]] }}}>
-<$button set=<<newTagNameTiddler>> setTo="" class="">
-<$action-listops $tiddler=<<saveTiddler>> $field=<<__tagField__>> $subfilter="[<tag>trim[]]"/>
-$actions$
-<$set name="currentTiddlerCSSEscaped" value={{{ [<saveTiddler>escapecss[]] }}}>
-<<delete-tag-state-tiddlers>><$action-sendmessage $message="tm-focus-selector" $param=<<get-tagpicker-focus-selector>>/>
-</$set>
-{{$:/language/EditTemplate/Tags/Add/Button}}
-</$button>
-</$set>
-</span>
-</div>
-<div class="tc-block-dropdown-wrapper">
-<$reveal state=<<qualify "$:/state/popup/tags-auto-complete">> type="nomatch" text="" default="">
-<div class="tc-block-dropdown tc-block-tags-dropdown">
-<$set name="userInput" value={{{ [<storeTitle>get[text]] }}}>
-<$list filter="[<userInput>minlength{$:/config/Tags/MinLength}limit[1]]" emptyMessage="<div class='tc-search-results'>{{$:/language/Search/Search/TooShort}}</div>" variable="listItem">
-<$list filter=<<nonSystemTagsFilter>> variable="tag">
-<$list filter="[<tag>addsuffix[-primaryList]] -[<tagSelectionState>get[text]]" emptyMessage="<$vars button-classes='tc-btn-invisible tc-tag-button-selected' actions=<<__actions__>> tagField=<<__tagField__>> currentTiddler=<<tag>>>{{||$:/core/ui/TagPickerTagTemplate}}</$vars>">
-<$vars button-classes="tc-btn-invisible" actions=<<__actions__>> tagField=<<__tagField__>> currentTiddler=<<tag>>>{{||$:/core/ui/TagPickerTagTemplate}}</$vars>
-</$list>
-</$list></$list>
-<hr>
-<$list filter="[<userInput>minlength{$:/config/Tags/MinLength}limit[1]]" emptyMessage="<div class='tc-search-results'>{{$:/language/Search/Search/TooShort}}</div>" variable="listItem">
-<$list filter=<<systemTagsFilter>> variable="tag">
-<$list filter="[<tag>addsuffix[-secondaryList]] -[<tagSelectionState>get[text]]" emptyMessage="<$vars button-classes='tc-btn-invisible tc-tag-button-selected' actions=<<__actions__>> tagField=<<__tagField__>> currentTiddler=<<tag>>>{{||$:/core/ui/TagPickerTagTemplate}}</$vars>">
-<$vars button-classes="tc-btn-invisible" actions=<<__actions__>> tagField=<<__tagField__>> currentTiddler=<<tag>>>{{||$:/core/ui/TagPickerTagTemplate}}</$vars>
-</$list>
-</$list></$list>
-</$set>
-</div>
-</$reveal>
-</div>
-</div>
-</$vars>
-</$vars>
+<$vars
+	newTagNameInputTiddlerQualified=<<qualify "$:/temp/NewTagName/input">>
+	newTagNameSelectionTiddlerQualified=<<qualify "$:/temp/NewTagName/selected-item">>
+	fallbackTarget={{$(palette)$##tag-background}}
+	colourA={{$(palette)$##foreground}}
+	colourB={{$(palette)$##background}}
+>
+	<$vars
+		storeTitle={{{ [<newTagNameInputTiddler>!match[]] ~[<newTagNameInputTiddlerQualified>] }}}
+		tagSelectionState={{{ [<newTagNameSelectionTiddler>!match[]] ~[<newTagNameSelectionTiddlerQualified>] }}}
+	>
+		<$vars
+			refreshTitle=<<qualify "$:/temp/NewTagName/refresh">> 
+			nonSystemTagsFilter="[tags[]!is[system]search:title<userInput>sort[]]"
+			systemTagsFilter="[tags[]is[system]search:title<userInput>sort[]]"
+		>
+			<div class="tc-edit-add-tag">
+				<div>
+					<span class="tc-add-tag-name tc-small-gap-right">
+						<$macrocall
+							$name="keyboard-driven-input"
+							tiddler=<<newTagNameTiddler>>
+							storeTitle=<<storeTitle>>
+							refreshTitle=<<refreshTitle>>
+							selectionStateTitle=<<tagSelectionState>>
+							inputAcceptActions="<$macrocall $name='add-tag-actions' actions=<<__actions__>> tagField=<<__tagField__>>/>"
+							inputCancelActions=<<clear-tags-actions>>
+							tag="input"
+							placeholder={{$:/language/EditTemplate/Tags/Add/Placeholder}}
+							focusPopup=<<qualify "$:/state/popup/tags-auto-complete">>
+							class="tc-edit-texteditor tc-popup-handle"
+							tabindex=<<tabIndex>>
+							focus={{{ [{$:/config/AutoFocus}match[tags]then[true]] ~[[false]] }}}
+							filterMinLength={{$:/config/Tags/MinLength}}
+							cancelPopups=<<cancelPopups>>
+							configTiddlerFilter="[[$:/core/macros/tag-picker]]"
+						/>
+					</span>
+					<$button popup=<<qualify "$:/state/popup/tags-auto-complete">> 
+						class="tc-btn-invisible tc-btn-dropdown"
+						tooltip={{$:/language/EditTemplate/Tags/Dropdown/Hint}}
+						aria-label={{$:/language/EditTemplate/Tags/Dropdown/Caption}}
+					>
+						{{$:/core/images/down-arrow}}
+					</$button>
+					<$reveal state=<<storeTitle>> type="nomatch" text="">
+						<$button class="tc-btn-invisible tc-small-gap tc-btn-dropdown"
+							tooltip={{$:/language/EditTemplate/Tags/ClearInput/Hint}}
+							aria-label={{$:/language/EditTemplate/Tags/ClearInput/Caption}}
+						>
+							{{$:/core/images/close-button}}<<delete-tag-state-tiddlers>>
+						</$button>
+					</$reveal>
+					<span class="tc-add-tag-button tc-small-gap-left">
+						<$set name="tag" value={{{ [<newTagNameTiddler>get[text]] }}}>
+							<$button set=<<newTagNameTiddler>> setTo="" class="">
+								<$action-listops $tiddler=<<saveTiddler>> $field=<<__tagField__>> $subfilter="[<tag>trim[]]"/>
+									$actions$
+								<$set name="currentTiddlerCSSEscaped" value={{{ [<saveTiddler>escapecss[]] }}}>
+									<<delete-tag-state-tiddlers>><$action-sendmessage $message="tm-focus-selector" $param=<<get-tagpicker-focus-selector>>/>
+								</$set>
+								{{$:/language/EditTemplate/Tags/Add/Button}}
+							</$button>
+						</$set>
+					</span>
+				</div>
+				<div class="tc-block-dropdown-wrapper">
+					<$reveal state=<<qualify "$:/state/popup/tags-auto-complete">> type="nomatch" text="" default="">
+						<div class="tc-block-dropdown tc-block-tags-dropdown">
+							<$set name="userInput" value={{{ [<storeTitle>get[text]] }}}>
+								<$list
+									filter="[<userInput>minlength{$:/config/Tags/MinLength}limit[1]]"
+									emptyMessage="<div class='tc-search-results'
+								>
+									{{$:/language/Search/Search/TooShort}}</div>" variable="listItem">
+									<$list filter=<<nonSystemTagsFilter>> variable="tag">
+										<$list
+											filter="[<tag>addsuffix[-primaryList]] -[<tagSelectionState>get[text]]" 
+											emptyMessage="<$vars button-classes='tc-btn-invisible tc-tag-button-selected' actions=<<__actions__>> tagField=<<__tagField__>> currentTiddler=<<tag>>>{{||$:/core/ui/TagPickerTagTemplate}}</$vars>"
+										>
+											<$vars button-classes="tc-btn-invisible"
+												actions=<<__actions__>> 
+												tagField=<<__tagField__>>
+												currentTiddler=<<tag>>
+											>
+												{{||$:/core/ui/TagPickerTagTemplate}}
+											</$vars>
+										</$list>
+									</$list>
+								</$list>
+								<hr>
+								<$list filter="[<userInput>minlength{$:/config/Tags/MinLength}limit[1]]" emptyMessage="<div class='tc-search-results'>
+									{{$:/language/Search/Search/TooShort}}</div>" variable="listItem">
+									<$list filter=<<systemTagsFilter>> variable="tag">
+										<$list filter="[<tag>addsuffix[-secondaryList]] -[<tagSelectionState>get[text]]"
+											emptyMessage="<$vars button-classes='tc-btn-invisible tc-tag-button-selected' actions=<<__actions__>> tagField=<<__tagField__>> currentTiddler=<<tag>>>{{||$:/core/ui/TagPickerTagTemplate}}</$vars>"
+										>
+											<$vars button-classes="tc-btn-invisible"
+												actions=<<__actions__>>
+												tagField=<<__tagField__>>
+												currentTiddler=<<tag>>
+											>
+												{{||$:/core/ui/TagPickerTagTemplate}}
+											</$vars>
+										</$list>
+									</$list>
+								</$list>
+							</$set>
+						</div>
+					</$reveal>
+				</div>
+			</div>
+		</$vars>
+	</$vars>
 </$vars>
 \end
+
 \define tag-picker(actions,tagField:"tags")
 \whitespace trim
 <$vars saveTiddler=<<currentTiddler>> palette={{$:/palette}}>
-<$list filter="[<newTagNameTiddler>match[]]" emptyMessage="<$macrocall $name='tag-picker-inner' actions=<<__actions__>> tagField=<<__tagField__>>/>">
-<$set name="newTagNameTiddler" value=<<qualify "$:/temp/NewTagName">>>
-<$macrocall $name="tag-picker-inner" actions=<<__actions__>> tagField=<<__tagField__>>/>
-</$set>
-</$list>
+	<$list
+		filter="[<newTagNameTiddler>match[]]"
+		emptyMessage="<$macrocall $name='tag-picker-inner' actions=<<__actions__>> tagField=<<__tagField__>>/>"
+	>
+		<$set name="newTagNameTiddler" value=<<qualify "$:/temp/NewTagName">>>
+			<$macrocall $name="tag-picker-inner" actions=<<__actions__>> tagField=<<__tagField__>>/>
+		</$set>
+	</$list>
 </$vars>
 \end

core/wiki/macros/toc.tid

@@ -7,7 +7,7 @@ tags: $:/tags/Macro
 
 \define toc-caption()
 \whitespace trim
-<span class="tc-toc-caption tc-tiny-gap-left">
+<span class="tc-toc-caption">
 <$set name="tv-wikilinks" value="no">
   <$transclude field="caption">
     <$view field="title"/>
@@ -24,7 +24,7 @@ tags: $:/tags/Macro
       <$set name="excluded" filter="""[enlist<__exclude__>] [<__tag__>]""">
         <$set name="toc-item-class" filter=<<__itemClassFilter__>> emptyValue="toc-item-selected" value="toc-item">
           <li class=<<toc-item-class>>>
-            <$list filter="[all[current]toc-link[no]]" emptyMessage="<$link to={{{ [<currentTiddler>get[target]else<currentTiddler>] }}}><$view field='caption'><$view field='title'/></$view></$link>">
+            <$list filter="[all[current]toc-link[no]]" emptyMessage="<$link to={{{ [<currentTiddler>get[target]else<currentTiddler>] }}}><<toc-caption>></$link>">
               <<toc-caption>>
             </$list>
             <$macrocall $name="toc-body" tag=<<item>> sort=<<__sort__>> itemClassFilter=<<__itemClassFilter__>> exclude=<<excluded>> path=<<path>>/>

editions/d3demo/tiddlers/HelloThere.tid

@@ -1,6 +1,6 @@
 title: HelloThere
 
-This is a demo of TiddlyWiki5 incorporating a plugin for the [[D3.js]] visualization library.
+This is a demo of TiddlyWiki5 incorporating a plugin for the [[D3.js]] visualisation library.
 
 ! Word Cloud
 

editions/de-AT/tiddlers/beispiele/TaskManagement.tid

@@ -1,11 +1,11 @@
 created: 20140923173639039
 creator: pmario
-modified: 20140924155046340
+modified: 20230307080008193
 modifier: pmario
 title: TaskManagement
 type: text/vnd.tiddlywiki
 
-In dieser Edition sind folgende Task Management Varianten beschreiben:
+In dieser Edition sind folgende Task Management Varianten beschrieben:
 
 <<list-links filter:"[tag[TaskManagement]]">>
 

editions/de-AT/tiddlers/beispiele/done.tid

@@ -2,7 +2,7 @@ color: #37d011
 created: 20140923104300415
 creator: pmario
 icon: $:/core/images/done-button
-modified: 20140923105208878
+modified: 20230307080039831
 modifier: ChrisK
 tags: done
 title: done
@@ -12,5 +12,5 @@ Diese Tag wird verwendet um "Tasks" als erledigt zu markieren.
 
 Siehe auch:
 
-* [[Task Management]] .. Beispiel
+* [[Task Management|TaskManagement]] .. Beispiel
 * [[Tag Manager|$:/TagManager]] .. Zuweisung der Farben und Symbole

editions/de-AT/tiddlers/howto/Importieren von Tiddlern.tid

@@ -0,0 +1,6 @@
+created: 20230307080413903
+modified: 20230307080417122
+title: Importieren von Tiddlern
+type: text/vnd.tiddlywiki
+
+https://tiddlywiki.com/#Importing%20Tiddlers

editions/de-AT/tiddlers/howto/Liste aller HowTo's.tid

@@ -1,11 +1,11 @@
 created: 20140918094051245
 creator: pmario
-modified: 20140918094948642
+modified: 20230307080301079
 modifier: pmario
 tags: Referenz
 title: Liste aller HowTo's
 type: text/vnd.tiddlywiki
 
-Hier finden Sie eine Auflistung aller HowTo's
+Hier finden Sie eine Auflistung aller ~HowTo's
 
 <<list-links "[tag[howto]]">>

editions/de-AT/tiddlers/konzept/Tagging.tid

@@ -0,0 +1,6 @@
+created: 20230307081437974
+modified: 20230307081439303
+title: Tagging
+type: text/vnd.tiddlywiki
+
+https://tiddlywiki.com/#Tagging

editions/de-AT/tiddlers/system/$__themes_tiddlywiki_vanilla_options_sidebarlayout.tid

@@ -0,0 +1,6 @@
+created: 20230307080103029
+modified: 20230307080103029
+title: $:/themes/tiddlywiki/vanilla/options/sidebarlayout
+type: text/vnd.tiddlywiki
+
+fluid-fixed

editions/de-AT/tiddlers/widgets/ListWidget.tid

@@ -0,0 +1,7 @@
+created: 20230307081923415
+modified: 20230307081953759
+tags: Widgets
+title: ListWidget
+type: text/vnd.tiddlywiki
+
+https://tiddlywiki.com/#ListWidget

editions/de-AT/tiddlers/widgets/TranscludeWidget.tid

@@ -0,0 +1,7 @@
+created: 20230307082002353
+modified: 20230307082023207
+tags: Widgets
+title: TranscludeWidget
+type: text/vnd.tiddlywiki
+
+https://tiddlywiki.com/#TranscludeWidget

editions/de-AT/tiddlers/wikitext/Bilder in WikiText.tid

@@ -1,7 +1,7 @@
 caption: Bilder
 created: 20131205160221762
 creator: pmario
-modified: 20140921170652909
+modified: 20230307081713229
 modifier: pmario
 tags: WikiText
 title: Bilder in WikiText
@@ -25,7 +25,7 @@ oder
 
 Wenn die Bildquelle der Titel eines existierenden Tiddlers ist, dann wird dieser direkt angezeigt. Ansonsten wird die Quelle als URL angesehen und ein HTML `<img>` Element wird erzeugt. Das `src` Attribut wird auf die [[URL]] gesetzt. 
 
-Ein [[Tooltip]] kann ebenfalls angegeben werden:
+Ein Tooltip kann ebenfalls angegeben werden:
 
 ```
 [img[Ich bin der Tooltip text|Motovun Jack.jpg]]
@@ -33,7 +33,7 @@ Ein [[Tooltip]] kann ebenfalls angegeben werden:
 
 [img width=100 [Ich bin der Tooltip text|Motovun Jack.jpg]]
 
-Attribute wie zB: CSS Klassen oder die Höhe und Breite können ebenfalls angegeben werden. 
+Attribute wie z.B: CSS Klassen oder die Höhe und Breite können ebenfalls angegeben werden. 
 
 ```
 [img width=64 [Motovun Jack.jpg]]

editions/de-AT/tiddlers/wikitext/Makros in WikiText.tid

@@ -1,7 +1,7 @@
 caption: Makros
 created: 20131205160746466
 creator: pmario
-modified: 20140922124415476
+modified: 20230307080132949
 modifier: ChrisK
 tags: WikiText
 title: Makros in WikiText
@@ -15,7 +15,7 @@ Hallo, Ich bin $name$ und lebe in $adresse$
 Hallo, Ich bin $name$ und würde gerne mal wieder nach $adresse$ fahren:)
 \end
 
-!! Makros Definieren
+!! Makros definieren
 
 !!! Für die Ungeduldigen
 
@@ -76,7 +76,7 @@ Für einzeilige Makros kann die `\end` Markierung entfallen!
 
 * Makros können mit dem ImportVariablesWidget importiert werden. (Für geübte Anwender)
 
-!! Makros Verwenden
+!! Makros verwenden
 
 ```
 <<meinErstesMakro>>

editions/de-AT/tiddlers/wikitext/Transclusion in WikiText.tid

@@ -0,0 +1,7 @@
+created: 20230307081757660
+modified: 20230307081814992
+tags: WikiText
+title: Transclusion in WikiText
+type: text/vnd.tiddlywiki
+
+https://tiddlywiki.com/#Transclusion%20in%20WikiText

editions/de-DE/tiddlywiki.info

@@ -1,7 +1,9 @@
 {
 	"description": "Deutsche Basis Edition",
 	"plugins": [
-		"tiddlywiki/browser-sniff"],
+		"tiddlywiki/browser-sniff",
+		"tiddlywiki/internals"
+	],
 	"themes": [
 		"tiddlywiki/vanilla",
 		"tiddlywiki/snowwhite",
@@ -9,8 +11,7 @@
 		"tiddlywiki/seamless",
 		"tiddlywiki/centralised",
 		"tiddlywiki/tight",
-		"tiddlywiki/readonly",
-		"tiddlywiki/internals"
+		"tiddlywiki/readonly"
 	],
 	"languages": [
 		"de-AT",

editions/dev/tiddlers/from Heigele and Jurke/Microkernel Architecture.tid

@@ -5,7 +5,7 @@ sectionnumber: 2
 tags: section doc
 title: Microkernel Architecture
 
-This section describes the architecture of the ~TiddlyWiki-kernel. ~TiddlyWiki is based on a micro-kernel which provides only a small stack of functions. This design decision was made to introduce a cleaner mechanism for customization of ~TiddlyWiki. This section also describes the data-model of ~TiddlyWiki called tiddler. And it gives a overview to the modul system which developers can use to extend the functionality of the ~TiddlyWiki application.
+This section describes the architecture of the ~TiddlyWiki-kernel. ~TiddlyWiki is based on a micro-kernel which provides only a small stack of functions. This design decision was made to introduce a cleaner mechanism for customisation of ~TiddlyWiki. This section also describes the data-model of ~TiddlyWiki called tiddler. And it gives a overview to the module system which developers can use to extend the functionality of the ~TiddlyWiki application.
 
 <$list filter="[!has[draft.of]has[chapter.of]chapter.of[Microkernel Architecture]tag[doc]sort[sub.num]]">
 

editions/dev/tiddlers/from Heigele and Jurke/Syncadaptor.tid

@@ -5,6 +5,6 @@ sub.num: 3
 tags: doc
 title: Syncadaptor
 
-A module with ``module-type: syncadaptor`` provides functionality to get a list of tiddlers (this list is provided as ~SkinnyTiddlers, which are normal tiddlers without the text field) and to load, save and delete single tiddlers. A syncadaptor can also provide functions to login and logout so that syncadaptor modules can be used to synchronize tiddlers with a remote server.
+A module with ``module-type: syncadaptor`` provides functionality to get a list of tiddlers (this list is provided as ~SkinnyTiddlers, which are normal tiddlers without the text field) and to load, save and delete single tiddlers. A syncadaptor can also provide functions to login and logout so that syncadaptor modules can be used to synchronise tiddlers with a remote server.
 
 The syncer module only uses one syncadaptor and honours a special [[system tiddler|System Tiddlers]] [[$:/config/SyncFilter]] containing a [[filter string|Tags and Filter Mechanism]]. Tiddlers matching this filter string are saved to the server with a syncadapter. It uses the [[WebServer API|https://tiddlywiki.com/#WebServer%20API%3A%20Get%20All%20Tiddlers]] to load modified tiddlers from the server, which returns only non-system tiddlers.

editions/dev/tiddlers/from Heigele and Jurke/Tiddler as Basic Element.tid

@@ -27,10 +27,10 @@ On a different level, a tiddler is also the basic unit of work for the wiki user
 This makes sense for multiple reasons:
 Because the UI of TiddlyWiki is build from tiddlers, the wiki user is able to edit the interface of his own TiddlyWiki just by editing a wiki page.
 For example to add a list of tiddler links to the sidebar, the user just needs to create a new tiddler, put the links into this tiddler and tag this tiddler with ``$:/tags/SideBar``.
-This way the user can customize his work environment just by using mechanisms he already uses to manage his wiki pages.
+This way the user can customise his work environment just by using mechanisms he already uses to manage his wiki pages.
 Tiddlers consist of fields. When using a tiddler as wiki page, the user can use these fields to store meta information, like tags.
 
-Because fields for metadata and especially tags are an easy way for the user to organize his wiki pages, TiddlyWiki provides a special filter mechanism to choose tiddlers using their metadata.
+Because fields for metadata and especially tags are an easy way for the user to organise his wiki pages, TiddlyWiki provides a special filter mechanism to choose tiddlers using their metadata.
 A filter string like ``[tag[learncard]topic[math]!tag[successful]]`` would filter all tiddlers tagged with "learncard", with the value "math" in the topic-field and are not tagged with "successful".
 A user could use this filter together with the ``<$list>`` widget to display a list of all math learncards which are not yet answered successfully in a wiki page.
 

editions/dev/tiddlers/from tw5.com/Developing plugins using Node.js and GitHub.tid

@@ -10,7 +10,7 @@ The most practical way to develop plugins is to use Node.js with the tiddlywiki5
 
 !! 1. Installation
 
-First read  https://tiddlywiki.com/static/PluginMechanism.html.
+First read https://tiddlywiki.com/static/PluginMechanism.html.
 
 Install Git from http://git-scm.com/downloads
 
@@ -85,7 +85,7 @@ For example files see the plugins in the ~TiddlyWiki5 repository i.e. those loca
 
 !!5. Build your files into a ~TiddlyWiki
 
-Modify `editions/tw5.com/tiddlywiki.info` to include a reference to your plugin directory,  i.e. find `"plugins": [ ` and add `"yourname/pluginname"`.
+Modify `editions/tw5.com/tiddlywiki.info` to include a reference to your plugin directory, i.e. find `"plugins": [ ` and add `"yourname/pluginname"`.
 
 From the TW5 directory issue the command
 

editions/dev/tiddlers/from tw5.com/mechanisms/BootMechanism.tid

@@ -23,7 +23,7 @@ The boot kernel includes:
 * Several short shared utility functions
 * A handful of methods implementing the module mechanism
 * The `$tw.Tiddler` class (and field definition plugins)
-* The `$tw.Wiki` class (and tiddler deserialization methods)
+* The `$tw.Wiki` class (and tiddler deserialisation methods)
 * Code for the browser to load tiddlers from the HTML DOM
 * Code for the server to load tiddlers from the file system
 

editions/empty/tiddlywiki.info

@@ -8,19 +8,19 @@
 	],
 	"build": {
 		"index": [
-			"--rendertiddler","$:/core/save/all","index.html","text/plain"],
+			"--render","$:/core/save/all","index.html","text/plain"],
 		"empty": [
-			"--rendertiddler","$:/core/save/all","empty.html","text/plain",
-			"--rendertiddler","$:/core/save/all","empty.hta","text/plain"],
+			"--render","$:/core/save/all","empty.html","text/plain",
+			"--render","$:/core/save/all","empty.hta","text/plain"],
 		"externalimages": [
 			"--savetiddlers","[is[image]]","images",
 			"--setfield","[is[image]]","_canonical_uri","$:/core/templates/canonical-uri-external-image","text/plain",
 			"--setfield","[is[image]]","text","","text/plain",
-			"--rendertiddler","$:/core/save/all","externalimages.html","text/plain"],
+			"--render","$:/core/save/all","externalimages.html","text/plain"],
 		"static": [
-			"--rendertiddler","$:/core/templates/static.template.html","static.html","text/plain",
-			"--rendertiddler","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
-			"--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain",
-			"--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain"]
+			"--render","$:/core/templates/static.template.html","static.html","text/plain",
+			"--render","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
+			"--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain",			
+			"--render","$:/core/templates/static.template.css","static/static.css","text/plain"]
 	}
 }

editions/es-ES/tiddlywiki.info

@@ -1,6 +1,7 @@
 {
 	"description": "Spanish (Spain) edition",
 	"plugins": [
+		"tiddlywiki/internals"
 	],
 	"themes": [
 		"tiddlywiki/vanilla",
@@ -9,8 +10,7 @@
 		"tiddlywiki/seamless",
 		"tiddlywiki/centralised",
 		"tiddlywiki/tight",
-		"tiddlywiki/readonly",
-		"tiddlywiki/internals"
+		"tiddlywiki/readonly"
 	],
 	"languages": [
 		"es-ES"

editions/fr-FR/tiddlers/saving/Saving on Beaker Browser.tid

@@ -1,35 +0,0 @@
-caption: Beaker Browser
-color: #FF8A65
-created: 20161229121316912
-delivery: App
-description: Nouveau navigateur puissant pour Mac, Windows et Linux
-fr-title: Enregistrer avec Beaker Browser
-method: save
-modified: 20220402105820520
-tags: Saving Windows Linux Mac
-title: Saving on Beaker Browser
-type: text/vnd.tiddlywiki
-
-<<.from-version "5.1.14">> <<tw>> intègre un module qui lui permet d'enregistrer les modifications directement avec [[Beaker Browser]], un navigateur internet en peer-to-peer expérimental.
-
-! Instructions
-
-# Téléchargez et installez Beaker Browser depuis https://beakerbrowser.com/
-# Lancez Beaker et si nécessaire ouvrez un onglet vers l'adresse `beaker:start`
-# Cliquez sur le bouton <<gf "New site">> en haut à gauche de la page
-# Saisissez les détails sur votre site
-# Cliquez sur le lien <<gf "Add files">> et sélectionnez le fichier `index.html` de votre <<tw>>
-# Naviguez sur votre site en cliquant sur le lien vers `index.html`<<;>> il devrait s'ouvrir dans un nouvel onglet
-# Essayez de créer des tiddlers et d'enregistrer les modifications
-
-Jusque là, le wiki est entièrement privé et les autres utilisateurs ne peuvent pas en voir le contenu, même en connaissant l'URL. Pour le partager avec d'autres utilisateurs<<:>>
-
-# Publiez vos modifications
-## Visitez la page <<gf Library>> à l'aide du menu <<gf System>> de Beaker Browser
-## Sélectionnez votre site dans la liste
-## Recherchez un encart <<gf "Unpublished changes">>. S'il n'est pas présent, passez au point suivant
-## Cliquez sur le bouton <<gf "Review changes">>
-## Cliquez sur le bouton <<gf "Publish">>
-# Partagez l'URL `dat:`
-## Copiez l'URL de votre site à partir de la barre d'adresse et partagez-la avec d'autres utilisateurs
-## Les autres utilisateurs devraient pouvoir accéder à votre site mais ils ne pourront pas le modifier avant d'en avoir fait leur propre clone

editions/fr-FR/tiddlywiki.info

@@ -1,6 +1,7 @@
 {
 	"description": "French (France) edition",
 	"plugins": [
+		"tiddlywiki/internals"
 	],
 	"themes": [
 		"tiddlywiki/vanilla",
@@ -9,8 +10,7 @@
 		"tiddlywiki/seamless",
 		"tiddlywiki/centralised",
 		"tiddlywiki/tight",
-		"tiddlywiki/readonly",
-		"tiddlywiki/internals"
+		"tiddlywiki/readonly"
 	],
 	"languages": [
 		"fr-FR"

editions/highlightdemo/tiddlywiki.info

@@ -11,11 +11,11 @@
 	],
 	"build": {
 		"index": [
-			"--rendertiddler","$:/core/save/all","highlightdemo.html","text/plain"],
+			"--render","$:/core/save/all","highlightdemo.html","text/plain"],
 		"static": [
-			"--rendertiddler","$:/core/templates/static.template.html","static.html","text/plain",
-			"--rendertiddler","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
-			"--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain",
-			"--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain"]
+			"--render","$:/core/templates/static.template.html","static.html","text/plain",
+			"--render","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
+			"--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain",
+			"--render","$:/core/templates/static.template.css","static/static.css","text/plain"]
 	}
 }

editions/introduction/tiddlywiki.info

@@ -49,9 +49,6 @@
 	],
 	"build": {
 		"index": [
-			"--savetiddlers","[tag[external-image]]","images",
-			"--setfield","[tag[external-image]]","_canonical_uri","$:/core/templates/canonical-uri-external-image","text/plain",
-			"--setfield","[tag[external-image]]","text","","text/plain",
 			"--rendertiddler","$:/core/save/all","index.html","text/plain"],
 		"favicon": [
 			"--savetiddler","$:/favicon.ico","favicon.ico",

editions/ja-JP/tiddlywiki.info

@@ -1,6 +1,7 @@
 {
 	"description": "Japanese (Japan) edition",
 	"plugins": [
+		"tiddlywiki/internals"
 	],
 	"themes": [
 		"tiddlywiki/vanilla",
@@ -9,8 +10,7 @@
 		"tiddlywiki/seamless",
 		"tiddlywiki/centralised",
 		"tiddlywiki/tight",
-		"tiddlywiki/readonly",
-		"tiddlywiki/internals"
+		"tiddlywiki/readonly"
 	],
 	"languages": [
 		"ja-JP"

editions/katexdemo/tiddlywiki.info

@@ -11,11 +11,11 @@
 	],
 	"build": {
 		"index": [
-			"--rendertiddler","$:/core/save/all","katexdemo.html","text/plain"],
+			"--render","$:/core/save/all","katexdemo.html","text/plain"],
 		"static": [
-			"--rendertiddler","$:/core/templates/static.template.html","static.html","text/plain",
-			"--rendertiddler","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
-			"--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain",
-			"--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain"]
+			"--render","$:/core/templates/static.template.html","static.html","text/plain",
+			"--render","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
+			"--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain",
+			"--render","$:/core/templates/static.template.css","static/static.css","text/plain"]
 	}
 }

editions/markdowndemo/tiddlers/DefaultTiddlers.tid

@@ -1,4 +1,7 @@
 title: $:/DefaultTiddlers
 
 [[HelloThere]]
-[[MarkdownExample]]
+$:/plugins/tiddlywiki/markdown
+[[MarkdownTutorial]]
+[[QuickDemo]]
+[[QuickDemo Source]]

editions/markdowndemo/tiddlers/HelloThere.tid

@@ -1,11 +1,9 @@
 title: HelloThere
 
-This is a demo of TiddlyWiki5 incorporating a plugin for parsing tiddlers written in the Markdown language. The plugin uses the [[Remarkable|https://github.com/jonschlinkert/remarkable]] Markdown parser internally. The MarkdownExample tiddler below is written in Markdown.
+This is a demo of TiddlyWiki5 incorporating a plugin for parsing tiddlers written in the Markdown language. The plugin uses the [[markdown-it|https://github.com/markdown-it/markdown-it]] Markdown parser internally. The MarkdownTutorial tiddler below is written in Markdown.
 
 ! Installation
 
 To add the plugin to your own TiddlyWiki5, just drag this link to the browser window:
 
-[[$:/plugins/tiddlywiki/markdown]]
-
-{{$:/plugins/tiddlywiki/markdown/usage}}
+[[$:/plugins/tiddlywiki/markdown]]

editions/markdowndemo/tiddlers/MarkdownTutorial.tid

@@ -1,4 +1,4 @@
-title: MarkdownExample
+title: MarkdownTutorial
 type: text/x-markdown
 
 Markdown: Basics
@@ -8,13 +8,13 @@ Getting the Gist of Markdown's Formatting Syntax
 ------------------------------------------------
 
 This page offers a brief overview of what it's like to use Markdown.
-The [syntax page] [s] provides complete, detailed documentation for
+The [syntax page][s] provides complete, detailed documentation for
 every feature, but Markdown should be very easy to pick up simply by
 looking at a few examples of it in action. The examples on this page
 are written in a before/after style, showing example syntax and the
 HTML output produced by Markdown.
 
-It's also helpful to simply try Markdown out; the [Dingus] [d] is a
+It's also helpful to simply try Markdown out; the [Dingus][d] is a
 web application that allows you type your own Markdown-formatted text
 and translate it to XHTML.
 
@@ -117,7 +117,7 @@ Output:
 
 Unordered (bulleted) lists use asterisks, pluses, and hyphens (`*`,
 `+`, and `-`) as list markers. These three markers are
-interchangable; this:
+interchangeable; this:
 
     *   Candy.
     *   Gum.
@@ -264,7 +264,7 @@ it easy to use Markdown to write about HTML example code:
     I strongly recommend against using any `<blink>` tags.
 
     I wish SmartyPants used named entities like `&mdash;`
-    instead of decimal-encoded entites like `&#8212;`.
+    instead of decimal-encoded entities like `&#8212;`.
 
 Output:
 
@@ -273,7 +273,7 @@ Output:
 
     <p>I wish SmartyPants used named entities like
     <code>&amp;mdash;</code> instead of decimal-encoded
-    entites like <code>&amp;#8212;</code>.</p>
+    entities like <code>&amp;#8212;</code>.</p>
 
 
 To specify an entire block of pre-formatted code, indent every line of

editions/markdowndemo/tiddlers/QuickDemo.tid

@@ -0,0 +1,220 @@
+title: QuickDemo
+type: text/markdown
+
+<style>
+.tc-image-loaded {
+  width: 35%;
+}
+</style>
+# h1 Heading
+## h2 Heading
+### h3 Heading
+#### h4 Heading
+##### h5 Heading
+###### h6 Heading
+
+
+## Horizontal Rules
+
+____
+
+---
+
+****
+
+
+## Emphasis
+
+
+**This is bold text**
+
+__This is bold text__
+
+*This is italic text*
+
+_This is italic text_
+
+~~Strikethrough~~
+
+
+## Blockquotes
+
+
+> Blockquotes can also be nested...
+>> ...by using additional greater-than signs right next to each other...
+> > > ...or with spaces between arrows.
+
+
+## Unordered List
+
+
++ Create a list by starting a line with `+`, `-`, or `*`
++ Sub-lists are made by indenting 2 spaces:
+  - Marker character change forces new list start:
+    * Ac tristique libero volutpat at
+    + Facilisis in pretium nisl aliquet
+    - Nulla volutpat aliquam velit
++ Very easy!
+
+
+## Ordered List
+
+
+1. Lorem ipsum dolor sit amet
+2. Consectetur adipiscing elit
+3. Integer molestie lorem at massa
+
+
+1. You can use sequential numbers...
+1. ...or keep all the numbers as `1.`
+
+Start numbering with offset:
+
+57. foo
+1. bar
+
+
+## Code
+
+
+Inline `code`
+
+Indented code
+
+    // Some comments
+    line 1 of code
+    line 2 of code
+    line 3 of code
+
+Block code "fences"
+
+```
+Sample text here...
+```
+
+
+## Syntax highlighting
+
+``` js
+var foo = function (bar) {
+  return bar++;
+};
+
+console.log(foo(5));
+```
+
+
+## ~KaTeX
+
+
+Equation $c = \pm\sqrt{a^2 + b^2}$ is typeset in inline mode.
+
+Display style: $$c = \pm\sqrt{a^2 + b^2}$$
+
+
+## Tables
+
+
+| Attribute | Description |
+| --------- | ----------- |
+| multiple  | select multiple files to download |
+| param     | parameter to be passed with the message |
+| tooltip   | optional tooltip text |
+
+Aligning columns:
+
+| Column A | Column B | Column C |
+| :----    | :----:   | ----:    |
+| is   | is     | is    |
+| left | nicely | right |
+| aligned | centered | aligned |
+
+
+## Links
+
+
+[link text](http://google.com)
+
+[link with title](http://nodeca.github.io/pica/demo/ "title text!")
+
+link to tiddler [QuickDemo Source](#QuickDemo%20Source)
+
+URL can contain spaces if enclosed in brackets `<>`: [QuickDemo Source](<#QuickDemo Source>)
+
+
+## Images
+
+
+![Minion](https://octodex.github.com/images/minion.png)
+![Stormtroopocat](https://octodex.github.com/images/stormtroopocat.jpg "The Stormtroopocat")
+
+Like links, images also have a reference style syntax
+
+![Alt text][id]
+
+with a link reference defined later in the document.
+
+[id]: https://octodex.github.com/images/dojocat.jpg  "The Dojocat"
+
+
+## Subscript & Superscript
+
+
+- 19^th^
+- H~2~O
+
+
+## \<ins\>
+
+
+++Inserted text++
+
+
+## \<mark\>
+
+
+==Marked text==
+
+
+## Footnotes
+
+
+Footnote 1 link[^first].
+
+Footnote 2 link[^second].
+
+Inline footnote^[Text of inline footnote] definition.
+
+Duplicated footnote reference[^second].
+
+[^first]: Footnote **can have markup**
+
+    and multiple paragraphs.
+
+[^second]: Footnote text.
+
+
+## Definition Lists
+
+
+Term 1
+
+: Definition 1
+with lazy continuation.
+
+Term 2 with *inline markup*
+
+: Definition 2
+
+        { some code, part of Definition 2 }
+
+    Third paragraph of definition 2.
+
+_Compact style:_
+
+Term 1
+  ~ Definition 1
+
+Term 2
+  ~ Definition 2a
+  ~ Definition 2b

editions/markdowndemo/tiddlers/QuickDemoSource.tid

@@ -0,0 +1,5 @@
+title: QuickDemo Source
+
+<$let tiddler="QuickDemo">
+<$codeblock code={{{ [<tiddler>get[text]] }}} language={{{ [<tiddler>get[type]else[text/vnd.tiddlywiki]] }}}/>
+</$let>

editions/markdowndemo/tiddlywiki.info

@@ -1,7 +1,9 @@
 {
 	"description": "Demo of the Markdown plugin",
 	"plugins": [
-		"tiddlywiki/markdown"
+		"tiddlywiki/markdown",
+		"tiddlywiki/highlight",
+		"tiddlywiki/katex"
 	],
 	"themes": [
 		"tiddlywiki/vanilla",