tiddlywiki 5.3.7 → 5.4.0

package/core/modules/wiki.js

@@ -200,7 +200,7 @@ exports.generateNewTitle = function(baseTitle,options) {
 		c = (parseInt(options.startCount,10) > 0) ? parseInt(options.startCount,10) : 0,
 		prefix = (typeof(options.prefix) === "string") ? options.prefix : " ";
 
-	if (template) {
+	if(template) {
 		// "count" is important to avoid an endless loop in while(...)!!
 		template = (/\$count:?(\d+)?\$/i.test(template)) ? template : template + "$count$";
 		// .formatTitleString() expects strings as input
@@ -209,7 +209,7 @@ exports.generateNewTitle = function(baseTitle,options) {
 			title = $tw.utils.formatTitleString(template,{"base":baseTitle,"separator":prefix,"counter":(++c)+""});
 		}
 	} else {
-		if (c > 0) {
+		if(c > 0) {
 			title = baseTitle + prefix + c;
 		}
 		while(this.tiddlerExists(title) || this.isShadowTiddler(title) || this.findDraft(title)) {
@@ -532,7 +532,7 @@ exports.getTiddlerLinks = function(title) {
 			return self.extractLinks(parser.tree);
 		}
 		return [];
-	});
+	}).slice(0);
 };
 
 /*
@@ -551,8 +551,9 @@ exports.getTiddlerBacklinks = function(targetTitle) {
 				backlinks.push(title);
 			}
 		});
+		return backlinks;
 	}
-	return backlinks;
+	return backlinks.slice(0);
 };
 
 
@@ -578,7 +579,7 @@ exports.extractTranscludes = function(parseTreeRoot, title) {
 							}
 						}
 					} else if(parseTreeNode.attributes.tiddler) {
-						if (parseTreeNode.attributes.tiddler.type === "string") {
+						if(parseTreeNode.attributes.tiddler.type === "string") {
 							// Old transclude widget usage
 							value = parseTreeNode.attributes.tiddler.value;
 						}
@@ -618,21 +619,20 @@ exports.getTiddlerTranscludes = function(title) {
 			return self.extractTranscludes(parser.tree,title);
 		}
 		return [];
-	});
+	}).slice(0);
 };
 
 /*
 Return an array of tiddler titles that transclude to the specified tiddler
 */
 exports.getTiddlerBacktranscludes = function(targetTitle) {
-	var self = this,
-		backIndexer = this.getIndexer("BackIndexer"),
+	var backIndexer = this.getIndexer("BackIndexer"),
 		backtranscludes = backIndexer && backIndexer.subIndexers.transclude.lookup(targetTitle);
 
 	if(!backtranscludes) {
-		backtranscludes = [];
+		return [];
 	}
-	return backtranscludes;
+	return backtranscludes.slice(0);
 };
 
 /*
@@ -641,7 +641,7 @@ Return a hashmap of tiddler titles that are referenced but not defined. Each val
 exports.getMissingTitles = function() {
 	var self = this,
 		missing = [];
-// We should cache the missing tiddler list, even if we recreate it every time any tiddler is modified
+	// We should cache the missing tiddler list, even if we recreate it every time any tiddler is modified
 	this.forEachTiddler(function(title,tiddler) {
 		var links = self.getTiddlerLinks(title);
 		$tw.utils.each(links,function(link) {
@@ -683,7 +683,7 @@ exports.getTiddlersWithTag = function(tag) {
 			return self.sortByList(tagmap[tag],tag);
 		});
 	}
-	return results;
+	return results.slice(0);
 };
 
 /*
@@ -704,8 +704,7 @@ exports.getTagMap = function() {
 						}
 					}
 				}
-			},
-			title, tiddler;
+			};
 		// Collect up all the tags
 		self.eachShadow(function(tiddler,title) {
 			if(!self.tiddlerExists(title)) {
@@ -734,7 +733,7 @@ exports.findListingsOfTiddler = function(targetTitle,fieldName) {
 				for(var i = 0; i < list.length; i++) {
 					var listItem = list[i],
 						listing = listings[listItem] || [];
-					if (listing.indexOf(title) === -1) {
+					if(listing.indexOf(title) === -1) {
 						listing.push(title);
 					}
 					listings[listItem] = listing;
@@ -743,7 +742,7 @@ exports.findListingsOfTiddler = function(targetTitle,fieldName) {
 		});
 		return listings;
 	});
-	return listings[targetTitle] || [];
+	return (listings[targetTitle] || []).slice(0);
 };
 
 /*
@@ -782,7 +781,7 @@ exports.sortByList = function(array,listTitle) {
 					}
 				}
 				// If a new position is specified, let's move it
-				if (newPos !== -1) {
+				if(newPos !== -1) {
 					// get its current Pos, and make sure
 					// sure that it's _actually_ in the list
 					// and that it would _actually_ move
@@ -910,8 +909,7 @@ exports.getTiddlerDataCached = function(titleOrTiddler,defaultData) {
 Alternative, uncached version of getTiddlerDataCached(). The return value can be mutated freely and reused
 */
 exports.getTiddlerData = function(titleOrTiddler,defaultData) {
-	var tiddler = titleOrTiddler,
-		data;
+	var tiddler = titleOrTiddler;
 	if(!(tiddler instanceof $tw.Tiddler)) {
 		tiddler = this.getTiddler(tiddler);
 	}
@@ -1029,7 +1027,6 @@ exports.clearCache = function(title) {
 exports.initParsers = function(moduleType) {
 	// Install the parser modules
 	$tw.Wiki.parsers = {};
-	var self = this;
 	$tw.modules.forEachModuleOfType("parser",function(title,module) {
 		for(var f in module) {
 			if($tw.utils.hop(module,f)) {
@@ -1059,17 +1056,7 @@ Options include:
 exports.parseText = function(type,text,options) {
 	text = text || "";
 	options = options || {};
-	// Select a parser
-	var Parser = $tw.Wiki.parsers[type];
-	if(!Parser && $tw.utils.getFileExtensionInfo(type)) {
-		Parser = $tw.Wiki.parsers[$tw.utils.getFileExtensionInfo(type).type];
-	}
-	if(!Parser) {
-		Parser = $tw.Wiki.parsers[options.defaultType || "text/vnd.tiddlywiki"];
-	}
-	if(!Parser) {
-		return null;
-	}
+	var Parser = $tw.utils.getParser(type,options);
 	// Return the parser instance
 	return new Parser(type,text,{
 		parseAsInline: options.parseAsInline,
@@ -1083,24 +1070,21 @@ exports.parseText = function(type,text,options) {
 Parse a tiddler according to its MIME type
 */
 exports.parseTiddler = function(title,options) {
-	options = $tw.utils.extend({},options);
+	options = options || {};
 	var cacheType = options.parseAsInline ? "inlineParseTree" : "blockParseTree",
 		tiddler = this.getTiddler(title),
 		self = this;
 	return tiddler ? this.getCacheForTiddler(title,cacheType,function() {
-			if(tiddler.hasField("_canonical_uri")) {
-				options._canonical_uri = tiddler.fields._canonical_uri;
-			}
-			return self.parseText(tiddler.fields.type,tiddler.fields.text,options);
-		}) : null;
+		if(tiddler.hasField("_canonical_uri")) {
+			options._canonical_uri = tiddler.fields._canonical_uri;
+		}
+		return self.parseText(tiddler.fields.type,tiddler.fields.text,options);
+	}) : null;
 };
 
 exports.parseTextReference = function(title,field,index,options) {
-	var tiddler,
-		text,
-		parserInfo;
+	var parserInfo;
 	if(!options.subTiddler) {
-		tiddler = this.getTiddler(title);
 		if(field === "text" || (!field && !index)) {
 			this.getTiddlerText(title); // Force the tiddler to be lazily loaded
 			return this.parseTiddler(title,options);
@@ -1148,7 +1132,7 @@ exports.getTextReferenceParserInfo = function(title,field,index,options) {
 		parserInfo.parserType = null;
 	}
 	return parserInfo;
-}
+};
 
 /*
 Parse a block of text of a specified MIME type
@@ -1158,15 +1142,16 @@ Parse a block of text of a specified MIME type
 Options include:
 	substitutions: an optional array of substitutions
 */
-exports.getSubstitutedText = function(text,widget,options) {
+exports.getSubstitutedText = function(text,thisWidget,options) {
 	options = options || {};
 	text = text || "";
 	var self = this,
+		widgetClass = widget.widget,
 		substitutions = options.substitutions || [],
 		output;
 	// Evaluate embedded filters and substitute with first result
 	output = text.replace(/\$\{([\S\s]+?)\}\$/g, function(match,filter) {
-		return self.filterTiddlers(filter,widget)[0] || "";
+		return self.filterTiddlers(filter,thisWidget)[0] || "";
 	});
 	// Process any substitutions provided in options
 	$tw.utils.each(substitutions,function(substitute) {
@@ -1174,7 +1159,7 @@ exports.getSubstitutedText = function(text,widget,options) {
 	});
 	// Substitute any variable references with their values
 	return output.replace(/\$\((.+?)\)\$/g, function(match,varname) {
-		return widget.getVariable(varname,{defaultValue: ""})
+		return widgetClass.evaluateVariable(thisWidget,varname, {defaultValue: ""})[0];
 	});
 };
 
@@ -1252,7 +1237,7 @@ exports.makeTranscludeWidget = function(title,options) {
 					name: "recursionMarker",
 					type: "string",
 					value: options.recursionMarker || "yes"
-					},
+				},
 				tiddler: {
 					name: "tiddler",
 					type: "string",
@@ -1395,7 +1380,7 @@ exports.search = function(text,options) {
 			}
 		}
 	}
-// Accumulate the array of fields to be searched or excluded from the search
+	// Accumulate the array of fields to be searched or excluded from the search
 	var fields = [];
 	if(options.field) {
 		if($tw.utils.isArray(options.field)) {
@@ -1443,7 +1428,7 @@ exports.search = function(text,options) {
 			// Don't search the text field if the content type is binary
 			var fieldName = searchFields[fieldIndex];
 			if(fieldName === "text" && contentTypeInfo.encoding !== "utf8") {
-				break;
+				continue;
 			}
 			var str = tiddler.fields[fieldName],
 				t;
@@ -1528,7 +1513,7 @@ exports.checkTiddlerText = function(title,targetText,options) {
 		targetText = targetText.toLowerCase();
 	}
 	return text === targetText;
-}
+};
 
 /*
 Execute an action string without an associated context widget
@@ -1575,8 +1560,7 @@ exports.readFile = function(file,options) {
 		callback = options.callback;
 	}
 	// Get the type, falling back to the filename extension
-	var self = this,
-		type = file.type;
+	var type = file.type;
 	if(type === "" || !type) {
 		var dotPos = file.name.lastIndexOf(".");
 		if(dotPos !== -1) {
@@ -1652,7 +1636,7 @@ exports.findDraft = function(targetTitle) {
 		}
 	});
 	return draftTitle;
-}
+};
 
 /*
 Check whether the specified draft tiddler has been modified.
@@ -1679,7 +1663,7 @@ historyTitle: title of history tiddler (defaults to $:/HistoryList)
 exports.addToHistory = function(title,fromPageRect,historyTitle) {
 	var story = new $tw.Story({wiki: this, historyTitle: historyTitle});
 	story.addToHistory(title,fromPageRect);
-	console.log("$tw.wiki.addToHistory() is deprecated since V5.1.23! Use the this.story.addToHistory() from the story-object!")
+	console.log("$tw.wiki.addToHistory() is deprecated since V5.1.23! Use the this.story.addToHistory() from the story-object!");
 };
 
 /*
@@ -1692,19 +1676,21 @@ options: see story.js
 exports.addToStory = function(title,fromTitle,storyTitle,options) {
 	var story = new $tw.Story({wiki: this, storyTitle: storyTitle});
 	story.addToStory(title,fromTitle,options);
-	console.log("$tw.wiki.addToStory() is deprecated since V5.1.23! Use the this.story.addToStory() from the story-object!")
+	console.log("$tw.wiki.addToStory() is deprecated since V5.1.23! Use the this.story.addToStory() from the story-object!");
 };
 
 /*
 Generate a title for the draft of a given tiddler
 */
 exports.generateDraftTitle = function(title) {
-	var c = 0,
-		draftTitle,
-		username = this.getTiddlerText("$:/status/UserName"),
-		attribution = username ? " by " + username : "";
+	let c = 0,
+		draftTitle;
+	const username = this.getTiddlerText("$:/status/UserName");
 	do {
-		draftTitle = "Draft " + (c ? (c + 1) + " " : "") + "of '" + title + "'" + attribution;
+		draftTitle = username ? $tw.language.getString("Draft/Attribution", {variables: {"draft-title": title}}) : $tw.language.getString("Draft/Title", {variables: {"draft-title": title}});
+		if(c) {
+			draftTitle = draftTitle.concat(" ", (c + 1).toString());
+		}
 		c++;
 	} while(this.tiddlerExists(draftTitle));
 	return draftTitle;

package/core/palettes/BrightMute.tid

@@ -47,6 +47,7 @@ modal-footer-background: #f5f5f5
 modal-footer-border: #dddddd
 modal-header-border: #eeeeee
 muted-foreground: #bbb
+network-activity-foreground: <<colour primary>>
 notification-background: #ffffdd
 notification-border: #999999
 page-background: #6f6f70
@@ -56,22 +57,26 @@ primary: #29a6ee
 select-tag-background:
 select-tag-foreground:
 sidebar-button-foreground: <<colour foreground>>
-sidebar-controls-foreground-hover: #000000
+sidebar-controls-foreground-hover: #222222
 sidebar-controls-foreground: #c2c1c2
-sidebar-foreground-shadow: rgba(255,255,255,0)
+sidebar-foreground-shadow: transparent
 sidebar-foreground: #d3d2d4
-sidebar-muted-foreground-hover: #444444
+sidebar-muted-foreground-hover: #333333
 sidebar-muted-foreground: #c0c0c0
 sidebar-tab-background-selected: #6f6f70
 sidebar-tab-background: #666667
 sidebar-tab-border-selected: #999
 sidebar-tab-border: #515151
 sidebar-tab-divider: #999
-sidebar-tab-foreground-selected: 
-sidebar-tab-foreground: #999
+sidebar-tab-foreground-selected: #bfbfbf
+sidebar-tab-foreground: #b0b0b0
 sidebar-tiddler-link-foreground-hover: #444444
-sidebar-tiddler-link-foreground: #d1d0d2
+sidebar-tiddler-link-foreground: #aaaaaa
 site-title-foreground: <<colour tiddler-title-foreground>>
+stability-deprecated: #bf616a
+stability-experimental: #d08770
+stability-legacy: #88c0d0
+stability-stable: #a3be8c
 static-alert-foreground: #aaaaaa
 tab-background-selected: #ffffff
 tab-background: #d8d8d8

package/core/palettes/FlexokiDark.tid

@@ -70,7 +70,7 @@ alert-border: <<colour flexoki-ye>>
 alert-highlight: <<colour flexoki-re>>
 alert-muted-foreground: <<colour flexoki-ye>>
 background: #100F0F
-blockquote-bar: <<colour flexoki-ma-2>>
+blockquote-bar: <<colour flexoki-ma>>
 button-background: <<colour flexoki-bg-2>>
 button-foreground: <<colour flexoki-paper>>
 button-border: <<colour flexoki-600>>
@@ -106,7 +106,7 @@ foreground: #CECDC3
 highlight-background: <<colour flexoki-yellow-900>>
 highlight-foreground: inherit
 menubar-background: <<colour primary>>
-menubar-foreground: <<colour flexoki-paper>>
+menubar-foreground: <<colour flexoki-999>>
 message-background: <<colour background>>
 message-border: <<colour foreground>>
 message-foreground: <<colour foreground>>

package/core/stylesheets/custom-properties.tid

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

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

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

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

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

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

@@ -1,12 +1,13 @@
 title: $:/core/templates/tiddlywiki5-external-js.html
 
 <$set name="saveTiddlerAndShadowsFilter" filter="[subfilter<saveTiddlerFilter>] [subfilter<saveTiddlerFilter>plugintiddlers[]]">
+<$set name="rawMarkupFilter" filter="[enlist<saveTiddlerAndShadowsFilter>] [[$:/core]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 ~~-->
-`{{{ [enlist<saveTiddlerAndShadowsFilter>tag[$:/tags/RawMarkupWikified/TopHead]] ||$:/core/templates/raw-static-tiddler}}}`
+`{{{ [enlist<rawMarkupFilter>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" />
@@ -22,13 +23,13 @@ title: $:/core/templates/tiddlywiki5-external-js.html
 <!--~~ This is a Tiddlywiki file. The points of interest in the file are marked with this pattern ~~-->
 
 <!--~~ Raw markup ~~-->
-`{{{ [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}}}`
+`{{{ [enlist<rawMarkupFilter>tag[$:/core/wiki/rawmarkup]] ||$:/core/templates/plain-text-tiddler}}}`
+`{{{ [enlist<rawMarkupFilter>tag[$:/tags/RawMarkup]] ||$:/core/templates/plain-text-tiddler}}}`
+`{{{ [enlist<rawMarkupFilter>tag[$:/tags/RawMarkupWikified]] ||$:/core/templates/raw-static-tiddler}}}`
 </head>
 <body class="tc-body">
 <!--~~ Raw markup for the top of the body section ~~-->
-`{{{ [enlist<saveTiddlerAndShadowsFilter>tag[$:/tags/RawMarkupWikified/TopBody]] ||$:/core/templates/raw-static-tiddler}}}`
+`{{{ [enlist<rawMarkupFilter>tag[$:/tags/RawMarkupWikified/TopBody]] ||$:/core/templates/raw-static-tiddler}}}`
 <!--~~ Static styles ~~-->
 <div id="styleArea">
 `{{$:/boot/boot.css||$:/core/templates/css-tiddler}}`
@@ -42,9 +43,10 @@ title: $:/core/templates/tiddlywiki5-external-js.html
 <!--~~ Ordinary tiddlers ~~-->
 `{{$:/core/templates/store.area.template.html}}`
 <!--~~ Raw markup for the bottom of the body section ~~-->
-`{{{ [enlist<saveTiddlerAndShadowsFilter>tag[$:/tags/RawMarkupWikified/BottomBody]] ||$:/core/templates/raw-static-tiddler}}}`
+`{{{ [enlist<rawMarkupFilter>tag[$:/tags/RawMarkupWikified/BottomBody]] ||$:/core/templates/raw-static-tiddler}}}`
 <!--~~ Load external JavaScripts ~~-->
 <script src="`{{{ [<coreURL>] }}}`" onerror="alert('Error: Cannot load `{{{ [<coreURL>] }}}`');"></script>
 </body>
 </html>`
+</$set>
 </$set>

package/core/templates/save-all.tid

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

package/core/templates/save-empty.tid

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

package/core/templates/save-lazy-all.tid

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

package/core/templates/save-lazy-images.tid

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

package/core/ui/AdvancedSearch/Filter.tid

@@ -62,28 +62,34 @@ caption: {{$:/language/Search/Filter/Caption}}
 </$list>
 \end
 
+\procedure input-actions()
+<%if [<event-key-descriptor>match[((input-tab-right))]] %>
+<<set-next-input-tab>>
+<%elseif [<event-key-descriptor>match[((input-tab-left))]] %>
+<<set-previous-input-tab>>
+<%endif%>
+\end
+
 \whitespace trim
 
 <<lingo Filter/Hint>>
 
 <div class="tc-search tc-advanced-search">
-	<$keyboard key="((input-tab-right))" actions=<<set-next-input-tab>> class="tc-small-gap-right">
-		<$keyboard key="((input-tab-left))" actions=<<set-previous-input-tab>>>
-			<$transclude $variable="keyboard-driven-input"
-				tiddler="$:/temp/advancedsearch/input"
-				storeTitle="$:/temp/advancedsearch"
-				refreshTitle="$:/temp/advancedsearch/refresh"
-				selectionStateTitle="$:/temp/advancedsearch/selected-item"
-				type="search"
-				tag="input"
-				focus={{$:/config/Search/AutoFocus}}
-				configTiddlerFilter="[[$:/temp/advancedsearch]]"
-				firstSearchFilterField="text"
-				inputAcceptActions=<<input-accept-actions>>
-				inputAcceptVariantActions=<<input-accept-variant-actions>>
-				inputCancelActions=<<cancel-search-actions>>
-			/>
-		</$keyboard>
+	<$keyboard key="((input-tab-right)) ((input-tab-left))" actions=<<input-actions>> class="tc-small-gap-right">
+		<$transclude $variable="keyboard-driven-input"
+			tiddler="$:/temp/advancedsearch/input"
+			storeTitle="$:/temp/advancedsearch"
+			refreshTitle="$:/temp/advancedsearch/refresh"
+			selectionStateTitle="$:/temp/advancedsearch/selected-item"
+			type="search"
+			tag="input"
+			focus={{$:/config/Search/AutoFocus}}
+			configTiddlerFilter="[[$:/temp/advancedsearch]]"
+			firstSearchFilterField="text"
+			inputAcceptActions=<<input-accept-actions>>
+			inputAcceptVariantActions=<<input-accept-variant-actions>>
+			inputCancelActions=<<cancel-search-actions>>
+		/>
 	</$keyboard>
 	<$list filter="[all[shadows+tiddlers]tag[$:/tags/AdvancedSearch/FilterButton]!has[draft.of]]">
 		<$transclude/>

package/core/ui/AdvancedSearch/Shadows.tid

@@ -53,13 +53,20 @@ first-search-filter: [all[shadows]search<userInput>sort[title]limit[250]] -[[$:/
 </$list></$list>
 \end
 
+\procedure input-actions()
+<%if [<event-key-descriptor>match[((input-tab-right))]] %>
+<<set-next-input-tab>>
+<%elseif [<event-key-descriptor>match[((input-tab-left))]] %>
+<<set-previous-input-tab>>
+<%endif%>
+\end
+
 \whitespace trim
 
 <<lingo Shadows/Hint>>
 
 <div class="tc-search">
-<$keyboard key="((input-tab-right))" actions=<<set-next-input-tab>>>
-<$keyboard key="((input-tab-left))" actions=<<set-previous-input-tab>>>
+<$keyboard key="((input-tab-right)) ((input-tab-left))" actions=<<input-actions>>>
 <$transclude $variable="keyboard-driven-input"
 	tiddler="$:/temp/advancedsearch/input"
 	storeTitle="$:/temp/advancedsearch"
@@ -74,7 +81,6 @@ first-search-filter: [all[shadows]search<userInput>sort[title]limit[250]] -[[$:/
 	inputAcceptVariantActions=<<input-accept-variant-actions>>
 	filterMinLength={{$:/config/Search/MinLength}}/>
 </$keyboard>
-</$keyboard>
 &#32;
 <$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
 <$button class="tc-btn-invisible">

package/core/ui/AdvancedSearch/Standard.tid

@@ -17,15 +17,24 @@ caption: {{$:/language/Search/Standard/Caption}}
 
 \procedure input-accept-variant-actions() <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]" emptyMessage="<$list filter='[<tiddler>get[text]!is[missing]] :else[<tiddler>get[text]is[shadow]]'><$list filter='[<tiddler>get[text]minlength[1]]'><$action-sendmessage $message='tm-edit-tiddler' $param={{{  [<tiddler>get[text]] }}}/></$list></$list>"><$list filter="[<tiddler>get[text]minlength[1]]"><$action-sendmessage $message="tm-edit-tiddler" $param={{{  [<tiddler>get[text]] }}}/></$list></$list>
 
+\procedure input-actions()
+<%if [<event-code>match[ArrowRight]] :and[<modifier>match[alt-shift]] %>
+<<next-search-tab>>
+<%elseif [<event-code>match[ArrowLeft]] :and[<modifier>match[alt-shift]] %>
+<<previous-search-tab>>
+<%elseif [<event-key-descriptor>match[((input-tab-right))]] %>
+<<set-next-input-tab>>
+<%elseif [<event-key-descriptor>match[((input-tab-left))]] %>
+<<set-previous-input-tab>>
+<%endif%>
+\end
+
 \whitespace trim
 
 <<lingo Standard/Hint>>
 
 <div class="tc-search">
-<$keyboard key="((input-tab-right))" actions=<<set-next-input-tab>>>
-<$keyboard key="((input-tab-left))" actions=<<set-previous-input-tab>>>
-<$keyboard key="shift-alt-Right" actions=<<next-search-tab>>>
-<$keyboard key="shift-alt-Left" actions=<<previous-search-tab>>>
+<$keyboard key="((input-tab-right)) ((input-tab-left)) shift-alt-Right shift-alt-Left" actions=<<input-actions>>>
 <$transclude $variable="keyboard-driven-input"
 	tiddler="$:/temp/advancedsearch/input"
 	storeTitle="$:/temp/advancedsearch"
@@ -40,9 +49,6 @@ caption: {{$:/language/Search/Standard/Caption}}
 	configTiddlerFilter="[[$:/state/advancedsearch/standard/currentTab]!is[missing]get[text]] :else[{$:/config/SearchResults/Default}]"
 	filterMinLength={{$:/config/Search/MinLength}}/>
 </$keyboard>
-</$keyboard>
-</$keyboard>
-</$keyboard>
 &#32;
 <$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
 <$button class="tc-btn-invisible">