Add support for content type parameters and wikitext variants

See 543f9107b6 (commitcomment-42849656)

.github/workflows/ci.yml

@@ -0,0 +1,74 @@
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - tiddlywiki-com
+env:
+  NODE_VERSION: "12"
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: "${{ env.NODE_VERSION }}"
+      - run: "./bin/test.sh"
+  build-prerelease:
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/master'
+    needs: test
+    env:
+      TW5_BUILD_TIDDLYWIKI: "./tiddlywiki.js"
+      TW5_BUILD_MAIN_EDITION: "./editions/prerelease"
+      TW5_BUILD_OUTPUT: "./output/prerelease"
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: "${{ env.NODE_VERSION }}"
+      - run: "./bin/ci-pre-build.sh"
+      # There's another near-duplicate "Set dynamic environment variables" step in
+      # the `build-tiddlywiki-com` job.
+      # These _could_ be extracted as a script (or moved into `ci-pre-build.sh`) to do away with the
+      # duplication, but, the visibility that comes from having these in the workflow file seems
+      # valuable. Environment variables are global variables and setting them at the top-level
+      # makes sense.
+      # Time to reconsider this decision might be when this setup turns out to be mistake-prone.
+      - name: "Set dynamic environment variables"
+        run: |
+          TW5_BUILD_BRANCH=$(echo $GITHUB_REF | awk 'BEGIN { FS = "/" } ; { print $3 }')
+          echo ::set-env name=TW5_BUILD_BRANCH::${TW5_BUILD_BRANCH}
+          echo ::set-env name=TW5_BUILD_VERSION::$(./bin/get-plugin-library-version-number)
+          echo ::set-env name=TW5_BUILD_DETAILS::Prerelease built from branch \'$TW5_BUILD_BRANCH\' at commit $(git rev-parse HEAD) of $(git remote get-url origin) at $(date +'%F %T %Z')
+      - run: "./bin/build-site.sh"
+      - run: "./bin/ci-push.sh"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUBPUSHTOKEN }}
+  build-tiddlywiki-com:
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/tiddlywiki-com'
+    needs: test
+    env:
+      TW5_BUILD_TIDDLYWIKI: "./node_modules/tiddlywiki/tiddlywiki.js"
+      TW5_BUILD_MAIN_EDITION: "./editions/tw5.com"
+      TW5_BUILD_OUTPUT: "./output"
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: "${{ env.NODE_VERSION }}"
+      - run: "./bin/ci-pre-build.sh"
+      # When making a change here, don't forget to see if it also applies to the step
+      # with the same name in the `build-prerelease` job.
+      - name: "Set dynamic environment variables"
+        run: |
+          TW5_BUILD_BRANCH=$(echo $GITHUB_REF | awk 'BEGIN { FS = "/" } ; { print $3 }')
+          echo ::set-env name=TW5_BUILD_BRANCH::${TW5_BUILD_BRANCH}
+          echo ::set-env name=TW5_BUILD_VERSION::$(./bin/get-plugin-library-version-number)
+          echo ::set-env name=TW5_BUILD_DETAILS::Built from branch \'$TW5_BUILD_BRANCH\' at commit $(git rev-parse HEAD) of $(git remote get-url origin) at $(date +'%F %T %Z')
+      - run: "./bin/build-site.sh"
+      - run: "./bin/ci-push.sh"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUBPUSHTOKEN }}

.travis.yml

@@ -1,35 +0,0 @@
-language: node_js
-node_js:
-  - "12"
-
-stages:
-  - name: test
-  - name: build-prerelease
-    if: branch = "master"
-  - name: build-tiddlywiki-com
-    if: branch = "tiddlywiki-com"
-
-jobs:  
-  include:
-    - stage: test
-      script: ./bin/test.sh
-    - stage: build-prerelease
-      script:
-        - ./bin/travis-pre-build.sh
-        - export TW5_BUILD_TIDDLYWIKI='./tiddlywiki.js'
-        - export TW5_BUILD_VERSION=$(./bin/get-plugin-library-version-number)
-        - export TW5_BUILD_DETAILS="Prerelease built from branch '$TRAVIS_BRANCH' at commit $(git rev-parse HEAD) of $(git remote get-url origin) at $(date +'%F %T %Z')"
-        - export TW5_BUILD_MAIN_EDITION='./editions/prerelease'
-        - export TW5_BUILD_OUTPUT='./output/prerelease'
-        - ./bin/build-site.sh || travis_terminate 1
-        - ./bin/travis-push.sh || travis_terminate 1
-    - stage: build-tiddlywiki-com
-      script:
-        - ./bin/travis-pre-build.sh
-        - export TW5_BUILD_TIDDLYWIKI='./node_modules/tiddlywiki/tiddlywiki.js'
-        - export TW5_BUILD_VERSION=$(./bin/get-plugin-library-version-number)
-        - export TW5_BUILD_DETAILS="Built from branch '$TRAVIS_BRANCH' at commit $(git rev-parse HEAD) of $(git remote get-url origin) at $(date +'%F %T %Z')"
-        - export TW5_BUILD_MAIN_EDITION='./editions/tw5.com'
-        - export TW5_BUILD_OUTPUT='./output'
-        - ./bin/build-site.sh || travis_terminate 1
-        - ./bin/travis-push.sh || travis_terminate 1

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.1.21
+    TW5_BUILD_VERSION=v5.1.23
 fi
 
 echo "Using TW5_BUILD_VERSION as [$TW5_BUILD_VERSION]"

bin/ci-push.sh

@@ -5,13 +5,13 @@
 
 cd output || exit 1
 
-git config --global user.email "travis@travis-ci.org" || exit 1
+git config --global user.email "actions@github.com" || exit 1
 
-git config --global user.name "Travis CI" || exit 1
+git config --global user.name "GitHub Actions" || exit 1
 
 git add -A . || exit 1
 
-git commit --message "Travis build: $TRAVIS_BUILD_NUMBER of $TRAVIS_BRANCH ($(date +'%F %T %Z'))" || exit 1
+git commit --message "GitHub build: $GITHUB_RUN_NUMBER of $TW5_BUILD_BRANCH ($(date +'%F %T %Z'))" || exit 1
 
 git remote add deploy "https://$GH_TOKEN@github.com/Jermolene/jermolene.github.io.git" &>/dev/null || exit 1
 

bin/update-translation-from-html-file.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# Process translation updates made via the translators edition
+
+# ./bin/update-translation-from-html-file.sh <language-code> <path-to-html-file>
+
+# Assign and check parameters 
+
+LANGUAGE_CODE=$1 
+HTML_FILE_PATH=$2
+
+if [ -z "$LANGUAGE_CODE" ]; then
+	echo "Missing parameter: language code"
+	exit 1
+fi
+
+if [ -z "$HTML_FILE_PATH" ]; then
+	echo "Missing parameter: path to HTML file"
+	exit 1
+fi
+
+./tiddlywiki.js editions/translators/ --verbose --unpackplugin $:/languages/$LANGUAGE_CODE --load $HTML_FILE_PATH --build output-files || exit 1
+
+cp -R ./editions/translators/output/language/. ./languages/$LANGUAGE_CODE/ || exit 1
+

boot/boot.js

@@ -479,6 +479,31 @@ $tw.utils.registerFileType = function(type,encoding,extension,options) {
 	$tw.config.contentTypeInfo[type] = {encoding: encoding, extension: extension, flags: options.flags || [], deserializerType: options.deserializerType || type};
 };
 
+/*
+Parses a content type of the form "type/subtype; attribute=value", as per https://www.w3.org/Protocols/rfc1341/4_Content-Type.html
+Returns an array of [type/subtype,attribute,value], with the last two entries being optional
+*/
+$tw.utils.parseContentType = function(contentType) {
+	contentType = contentType || "";
+	var parts = contentType.split(";"),
+		results = [(parts[0] || "").trim()];
+	if(parts[1]) {
+		parts = parts[1].split("=");
+		if(parts[0]) {
+			results[1] = (parts[0] || "").trim();
+			results[2] = (parts[1] || "").trim();
+		}
+	}
+	return results;
+};
+
+/*
+Returns the contentTypeInfo for a type
+*/
+$tw.utils.getContentTypeInfo = function(contentType) {
+	return $tw.config.contentTypeInfo[$tw.utils.parseContentType(contentType)[0]] || null;
+};
+
 /*
 Given an extension, always access the $tw.config.fileExtensionInfo
 using a lowercase extension only.
@@ -1463,6 +1488,7 @@ $tw.Wiki.prototype.processSafeMode = function() {
 Extracts tiddlers from a typed block of text, specifying default field values
 */
 $tw.Wiki.prototype.deserializeTiddlers = function(type,text,srcFields,options) {
+	type = $tw.utils.parseContentType(type)[0];
 	srcFields = srcFields || Object.create(null);
 	options = options || {};
 	var deserializer = $tw.Wiki.tiddlerDeserializerModules[options.deserializer],
@@ -2172,8 +2198,7 @@ $tw.loadTiddlersNode = function() {
 /*
 Startup TiddlyWiki
 */
-$tw.boot.startup = function(options) {
-	options = options || {};
+$tw.boot.initStartup = function(options) {
 	// Get the URL hash and check for safe mode
 	$tw.locationHash = "#";
 	if($tw.browser && !$tw.node) {
@@ -2306,6 +2331,9 @@ $tw.boot.startup = function(options) {
 			return result;
 		}
 	}
+};
+$tw.boot.loadStartup = function(options){
+
 	// Load tiddlers
 	if($tw.boot.tasks.readBrowserTiddlers) {
 		$tw.loadTiddlersBrowser();
@@ -2318,6 +2346,8 @@ $tw.boot.startup = function(options) {
 	}
 	// Give hooks a chance to modify the store
 	$tw.hooks.invokeHook("th-boot-tiddlers-loaded");
+}
+$tw.boot.execStartup = function(options){
 	// Unpack plugin tiddlers
 	$tw.wiki.readPluginInfo();
 	$tw.wiki.registerPluginTiddlers("plugin",$tw.safeMode ? ["$:/core"] : undefined);
@@ -2346,6 +2376,16 @@ $tw.boot.startup = function(options) {
 	$tw.boot.disabledStartupModules = $tw.boot.disabledStartupModules || [];
 	// Repeatedly execute the next eligible task
 	$tw.boot.executeNextStartupTask(options.callback);
+}
+/*
+Startup TiddlyWiki
+*/
+$tw.boot.startup = function(options) {
+	options = options || {};
+	// Get the URL hash and check for safe mode
+	$tw.boot.initStartup(options);
+	$tw.boot.loadStartup(options);
+	$tw.boot.execStartup(options);
 };
 
 /*

core/language/en-GB/ControlPanel.multids

@@ -117,6 +117,7 @@ Saving/GitService/Gitea/Caption: Gitea Saver
 Saving/GitService/Gitea/Password: Personal access token for API (via Gitea’s web interface: `Settings | Applications | Generate New Token`)
 Saving/TiddlySpot/Advanced/Heading: Advanced Settings
 Saving/TiddlySpot/BackupDir: Backup Directory
+Saving/TiddlySpot/ControlPanel: ~TiddlySpot Control Panel
 Saving/TiddlySpot/Backups: Backups
 Saving/TiddlySpot/Caption: ~TiddlySpot Saver
 Saving/TiddlySpot/Description: These settings are only used when saving to http://tiddlyspot.com or a compatible remote server

core/language/en-GB/Help/rendertiddlers.tid

@@ -6,13 +6,13 @@ description: Render tiddlers matching a filter to a specified ContentType
 Render a set of tiddlers matching a filter to separate files of a specified ContentType (defaults to `text/html`) and extension (defaults to `.html`).
 
 ```
---rendertiddlers <filter> <template> <pathname> [<type>] [<extension>] ["noclean"]
+--rendertiddlers '<filter>' <template> <pathname> [<type>] [<extension>] ["noclean"]
 ```
 
 For example:
 
 ```
---rendertiddlers [!is[system]] $:/core/templates/static.tiddler.html ./static text/plain
+--rendertiddlers '[!is[system]]' $:/core/templates/static.tiddler.html ./static text/plain
 ```
 
 By default, the pathname is resolved relative to the `output` subdirectory of the edition directory. The `--output` command can be used to direct output to a different directory.

core/language/en-GB/Misc.multids

@@ -27,6 +27,7 @@ Error/EditConflict: File changed on server
 Error/Filter: Filter error
 Error/FilterSyntax: Syntax error in filter expression
 Error/IsFilterOperator: Filter Error: Unknown operand for the 'is' filter operator
+Error/FormatFilterOperator: Filter Error: Unknown suffix for the 'format' filter operator
 Error/LoadingPluginLibrary: Error loading plugin library
 Error/NetworkErrorAlert: `<h2>''Network Error''</h2>It looks like the connection to the server has been lost. This may indicate a problem with your network connection. Please attempt to restore network connectivity before continuing.<br><br>''Any unsaved changes will be automatically synchronised when connectivity is restored''.`
 Error/RecursiveTransclusion: Recursive transclusion error in transclude widget
@@ -62,6 +63,11 @@ OfficialPluginLibrary: Official ~TiddlyWiki Plugin Library
 OfficialPluginLibrary/Hint: The official ~TiddlyWiki plugin library at tiddlywiki.com. Plugins, themes and language packs are maintained by the core team.
 PluginReloadWarning: Please save {{$:/core/ui/Buttons/save-wiki}} and reload {{$:/core/ui/Buttons/refresh}} to allow changes to ~JavaScript plugins to take effect
 RecentChanges/DateFormat: DDth MMM YYYY
+Shortcuts/Input/Accept/Hint: Accept the selected item
+Shortcuts/Input/AcceptVariant/Hint: Accept the selected item (variant)
+Shortcuts/Input/Cancel/Hint: Clear the input field
+Shortcuts/Input/Down/Hint: Select the next item
+Shortcuts/Input/Up/Hint: Select the previous item
 SystemTiddler/Tooltip: This is a system tiddler
 SystemTiddlers/Include/Prompt: Include system tiddlers
 TagManager/Colour/Heading: Colour

core/language/en-GB/NewJournalTags.tid

@@ -1,2 +1,3 @@
 title: $:/config/NewJournal/Tags
-tags: Journal
+
+Journal

core/modules/commands/fetch.js

@@ -71,7 +71,7 @@ Command.prototype.fetchFiles = function(options) {
 	if(options.url) {
 		urls = [options.url]
 	} else if(options.urlFilter) {
-		urls = $tw.wiki.filterTiddlers(options.urlFilter);
+		urls = this.commander.wiki.filterTiddlers(options.urlFilter);
 	} else {
 		return "Missing URL";
 	}
@@ -132,7 +132,7 @@ Command.prototype.processBody = function(body,type,options,url) {
 	// Collect the tiddlers in a wiki
 	var incomingWiki = new $tw.Wiki();
 	if(options.raw) {
-		var typeInfo = type ? $tw.config.contentTypeInfo[type] : null,
+		var typeInfo = type ? $tw.utils.getContentTypeInfo(type) : null,
 			encoding = typeInfo ? typeInfo.encoding : "utf8";
 		incomingWiki.addTiddler(new $tw.Tiddler({
 			title: url,

core/modules/commands/makelibrary.js

@@ -33,7 +33,7 @@ Command.prototype.execute = function() {
 		tiddlers = {};
 	// Collect up the library plugins
 	var collectPlugins = function(folder) {
-			var pluginFolders = fs.readdirSync(folder);
+			var pluginFolders = $tw.utils.getSubdirectories(folder) || [];
 			for(var p=0; p<pluginFolders.length; p++) {
 				if(!$tw.boot.excludeRegExp.test(pluginFolders[p])) {
 					pluginFields = $tw.loadPluginFolder(path.resolve(folder,"./" + pluginFolders[p]));
@@ -44,7 +44,7 @@ Command.prototype.execute = function() {
 			}
 		},
 		collectPublisherPlugins = function(folder) {
-			var publisherFolders = fs.readdirSync(folder);
+			var publisherFolders = $tw.utils.getSubdirectories(folder) || [];
 			for(var t=0; t<publisherFolders.length; t++) {
 				if(!$tw.boot.excludeRegExp.test(publisherFolders[t])) {
 					collectPlugins(path.resolve(folder,"./" + publisherFolders[t]));

core/modules/commands/save.js

@@ -37,7 +37,7 @@ Command.prototype.execute = function() {
 	$tw.utils.each(tiddlers,function(title) {
 		var tiddler = self.commander.wiki.getTiddler(title),
 			type = tiddler.fields.type || "text/vnd.tiddlywiki",
-			contentTypeInfo = $tw.config.contentTypeInfo[type] || {encoding: "utf8"},
+			contentTypeInfo = $tw.utils.getContentTypeInfo(type) || {encoding: "utf8"},
 			filepath = path.resolve(self.commander.outputPath,wiki.filterTiddlers(filenameFilter,$tw.rootWidget,wiki.makeTiddlerIterator([title]))[0]);
 		if(self.commander.verbose) {
 			console.log("Saving \"" + title + "\" to \"" + filepath + "\"");

core/modules/commands/savelibrarytiddlers.js

@@ -5,10 +5,12 @@ module-type: command
 
 Command to save the subtiddlers of a bundle tiddler as a series of JSON files
 
---savelibrarytiddlers <tiddler> <pathname> <skinnylisting>
+--savelibrarytiddlers <tiddler> <tiddler-filter> <pathname> <skinnylisting>
 
 The tiddler identifies the bundle tiddler that contains the subtiddlers.
 
+The tiddler filter specifies the plugins to be included.
+
 The pathname specifies the pathname to the folder in which the JSON files should be saved. The filename is the URL encoded title of the subtiddler.
 
 The skinnylisting specifies the title of the tiddler to which a JSON catalogue of the subtiddlers will be saved. The JSON file contains the same data as the bundle tiddler but with the `text` field removed.
@@ -69,7 +71,7 @@ Command.prototype.execute = function() {
 		// Collect the skinny list data
 		var pluginTiddlers = JSON.parse(tiddler.text),
 			readmeContent = (pluginTiddlers.tiddlers[title + "/readme"] || {}).text,
-			doesRequireReload = !!$tw.wiki.doesPluginInfoRequireReload(pluginTiddlers),
+			doesRequireReload = !!self.commander.wiki.doesPluginInfoRequireReload(pluginTiddlers),
 			iconTiddler = pluginTiddlers.tiddlers[title + "/icon"] || {},
 			iconType = iconTiddler.type,
 			iconText = iconTiddler.text,

core/modules/commands/savetiddler.js

@@ -35,7 +35,7 @@ Command.prototype.execute = function() {
 		tiddler = this.commander.wiki.getTiddler(title);
 	if(tiddler) {
 		var type = tiddler.fields.type || "text/vnd.tiddlywiki",
-			contentTypeInfo = $tw.config.contentTypeInfo[type] || {encoding: "utf8"};
+			contentTypeInfo = $tw.utils.getContentTypeInfo(type) || {encoding: "utf8"};
 		$tw.utils.createFileDirectories(filename);
 		fs.writeFile(filename,tiddler.fields.text,contentTypeInfo.encoding,function(err) {
 			self.callback(err);

core/modules/commands/savetiddlers.js

@@ -44,7 +44,7 @@ Command.prototype.execute = function() {
 	$tw.utils.each(tiddlers,function(title) {
 		var tiddler = self.commander.wiki.getTiddler(title),
 			type = tiddler.fields.type || "text/vnd.tiddlywiki",
-			contentTypeInfo = $tw.config.contentTypeInfo[type] || {encoding: "utf8"},
+			contentTypeInfo = $tw.utils.getContentTypeInfo(type) || {encoding: "utf8"},
 			filename = path.resolve(pathname,encodeURIComponent(title));
 		fs.writeFileSync(filename,tiddler.fields.text,contentTypeInfo.encoding);
 	});

core/modules/editor/engines/framed.js

@@ -80,7 +80,8 @@ function FramedEngine(options) {
 	$tw.utils.addEventListeners(this.domNode,[
 		{name: "click",handlerObject: this,handlerMethod: "handleClickEvent"},
 		{name: "input",handlerObject: this,handlerMethod: "handleInputEvent"},
-		{name: "keydown",handlerObject: this.widget,handlerMethod: "handleKeydownEvent"}
+		{name: "keydown",handlerObject: this.widget,handlerMethod: "handleKeydownEvent"},
+		{name: "focus",handlerObject: this,handlerMethod: "handleFocusEvent"}
 	]);
 	// Insert the element into the DOM
 	this.iframeDoc.body.appendChild(this.domNode);
@@ -107,13 +108,20 @@ Set the text of the engine if it doesn't currently have focus
 FramedEngine.prototype.setText = function(text,type) {
 	if(!this.domNode.isTiddlyWikiFakeDom) {
 		if(this.domNode.ownerDocument.activeElement !== this.domNode) {
-			this.domNode.value = text;
+			this.updateDomNodeText(text);
 		}
 		// Fix the height if needed
 		this.fixHeight();
 	}
 };
 
+/*
+Update the DomNode with the new text
+*/
+FramedEngine.prototype.updateDomNodeText = function(text) {
+	this.domNode.value = text;
+};
+
 /*
 Get the text of the engine
 */
@@ -153,6 +161,15 @@ FramedEngine.prototype.focus  = function() {
 	}
 };
 
+/*
+Handle a focus event
+*/
+FramedEngine.prototype.handleFocusEvent = function(event) {
+	if(this.widget.editCancelPopups) {
+		$tw.popup.cancel(0);	
+	}
+};
+
 /*
 Handle a click
 */
@@ -167,6 +184,9 @@ Handle a dom "input" event which occurs when the text has changed
 FramedEngine.prototype.handleInputEvent = function(event) {
 	this.widget.saveChanges(this.getText());
 	this.fixHeight();
+	if(this.widget.editInputActions) {
+		this.widget.invokeActionString(this.widget.editInputActions);
+	}
 	return true;
 };
 

core/modules/editor/engines/simple.js

@@ -68,13 +68,20 @@ Set the text of the engine if it doesn't currently have focus
 SimpleEngine.prototype.setText = function(text,type) {
 	if(!this.domNode.isTiddlyWikiFakeDom) {
 		if(this.domNode.ownerDocument.activeElement !== this.domNode || text === "") {
-			this.domNode.value = text;
+			this.updateDomNodeText(text);
 		}
 		// Fix the height if needed
 		this.fixHeight();
 	}
 };
 
+/*
+Update the DomNode with the new text
+*/
+SimpleEngine.prototype.updateDomNodeText = function(text) {
+	this.domNode.value = text;
+};
+
 /*
 Get the text of the engine
 */
@@ -115,6 +122,9 @@ Handle a dom "input" event which occurs when the text has changed
 SimpleEngine.prototype.handleInputEvent = function(event) {
 	this.widget.saveChanges(this.getText());
 	this.fixHeight();
+	if(this.widget.editInputActions) {
+		this.widget.invokeActionString(this.widget.editInputActions);
+	}
 	return true;
 };
 
@@ -122,6 +132,9 @@ SimpleEngine.prototype.handleInputEvent = function(event) {
 Handle a dom "focus" event
 */
 SimpleEngine.prototype.handleFocusEvent = function(event) {
+	if(this.widget.editCancelPopups) {
+		$tw.popup.cancel(0);
+	}
 	if(this.widget.editFocusPopup) {
 		$tw.popup.triggerPopup({
 			domNode: this.domNode,

core/modules/editor/factory.js

@@ -177,6 +177,9 @@ function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) {
 		this.editFocusPopup = this.getAttribute("focusPopup");
 		this.editFocus = this.getAttribute("focus");
 		this.editTabIndex = this.getAttribute("tabindex");
+		this.editCancelPopups = this.getAttribute("cancelPopups","") === "yes";
+		this.editInputActions = this.getAttribute("inputActions");
+		this.editRefreshTitle = this.getAttribute("refreshTitle");
 		// Get the default editor element tag and type
 		var tag,type;
 		if(this.editField === "text") {
@@ -208,9 +211,11 @@ 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 || changedTiddlers[HEIGHT_MODE_TITLE] || changedTiddlers[ENABLE_TOOLBAR_TITLE]) {
+		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 || changedTiddlers[HEIGHT_MODE_TITLE] || changedTiddlers[ENABLE_TOOLBAR_TITLE]) {
 			this.refreshSelf();
 			return true;
+		} else if (changedTiddlers[this.editRefreshTitle]) {
+			this.engine.updateDomNodeText(this.getEditInfo().value);
 		} else if(changedTiddlers[this.editTitle]) {
 			var editInfo = this.getEditInfo();
 			this.updateEditor(editInfo.value,editInfo.type);

core/modules/filters/compare.js

@@ -16,7 +16,7 @@ exports.compare = function(source,operator,options) {
 	var suffixes = operator.suffixes || [],
 		type = (suffixes[0] || [])[0],
 		mode = (suffixes[1] || [])[0],
-		typeFn = types[type] || types.number,
+		typeFn = $tw.utils.makeCompareFunction(type,{defaultType: "number"}),
 		modeFn = modes[mode] || modes.eq,
 		invert = operator.prefix === "!",
 		results = [];
@@ -28,42 +28,6 @@ exports.compare = function(source,operator,options) {
 	return results;
 };
 
-var types = {
-	"number": function(a,b) {
-		return compare($tw.utils.parseNumber(a),$tw.utils.parseNumber(b));
-	},
-	"integer": function(a,b) {
-		return compare($tw.utils.parseInt(a),$tw.utils.parseInt(b));
-	},
-	"string": function(a,b) {
-		return compare("" + a,"" +b);
-	},
-	"date": function(a,b) {
-		var dateA = $tw.utils.parseDate(a),
-			dateB = $tw.utils.parseDate(b);
-		if(!isFinite(dateA)) {
-			dateA = new Date(0);
-		}
-		if(!isFinite(dateB)) {
-			dateB = new Date(0);
-		}
-		return compare(dateA,dateB);
-	},
-	"version": function(a,b) {
-		return $tw.utils.compareVersions(a,b);
-	}
-};
-
-function compare(a,b) {
-	if(a > b) {
-		return +1;
-	} else if(a < b) {
-		return -1;
-	} else {
-		return 0;
-	}
-};
-
 var modes = {
 	"eq": function(value) {return value === 0;},
 	"ne": function(value) {return value !== 0;},

core/modules/filters/duplicateslugs.js

@@ -0,0 +1,36 @@
+/*\
+title: $:/core/modules/filters/duplicateslugs.js
+type: application/javascript
+module-type: filteroperator
+
+Filter function for [duplicateslugs[]]
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+/*
+Export our filter function
+*/
+exports.duplicateslugs = function(source,operator,options) {
+	var slugs = Object.create(null), // Hashmap by slug of title, replaced with "true" if the duplicate title has already been output
+		results = [];
+	source(function(tiddler,title) {
+		var slug = options.wiki.slugify(title);
+		if(slug in slugs) {
+			if(slugs[slug] !== true) {
+				results.push(slugs[slug]);
+				slugs[slug] = true;
+			}
+			results.push(title);
+		} else {
+			slugs[slug] = title;
+		}
+	});
+	return results;
+};
+
+})();

core/modules/filters/filter.js

@@ -0,0 +1,31 @@
+/*\
+title: $:/core/modules/filters/filter.js
+type: application/javascript
+module-type: filteroperator
+
+Filter operator returning those input titles that pass a subfilter
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+/*
+Export our filter function
+*/
+exports.filter = function(source,operator,options) {
+	var filterFn = options.wiki.compileFilter(operator.operand),
+		results = [],
+		target = operator.prefix !== "!";
+	source(function(tiddler,title) {
+		var list = filterFn.call(options.wiki,options.wiki.makeTiddlerIterator([title]));
+		if((list.length > 0) === target) {
+			results.push(title);
+		}
+	});
+	return results;
+};
+
+})();

core/modules/filters/format.js

@@ -0,0 +1,46 @@
+/*\
+title: $:/core/modules/filters/format.js
+type: application/javascript
+module-type: filteroperator
+Filter operator for formatting strings
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+var formatFilterOperators;
+
+function getFormatFilterOperators() {
+	if(!formatFilterOperators) {
+		formatFilterOperators = {};
+		$tw.modules.applyMethods("formatfilteroperator",formatFilterOperators);
+	}
+	return formatFilterOperators;
+}
+
+/*
+Export our filter function
+*/
+exports.format = function(source,operator,options) {
+	// Dispatch to the correct formatfilteroperator
+	var formatFilterOperators = getFormatFilterOperators();
+	if(operator.suffix) {
+		var formatFilterOperator = formatFilterOperators[operator.suffix];
+		if(formatFilterOperator) {
+			return formatFilterOperator(source,operator.operand,options);
+		} else {
+			return [$tw.language.getString("Error/FormatFilterOperator")];
+		}
+	} else {
+		// Return all unchanged if the suffix is missing
+		var results = [];
+		source(function(tiddler,title) {
+			results.push(title);
+		});
+		return results;
+	}
+};
+
+})();

core/modules/filters/format/date.js

@@ -0,0 +1,26 @@
+/*\
+title: $:/core/modules/filters/format/date.js
+type: application/javascript
+module-type: formatfilteroperator
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+/*
+Export our filter function
+*/
+exports.date = function(source,operand,options) {
+	var results = [];	
+	source(function(tiddler,title) {
+		var value = $tw.utils.parseDate(title);
+		if(value && $tw.utils.isDate(value) && value.toString() !== "Invalid Date") {
+			results.push($tw.utils.formatDateString(value,operand || "YYYY MM DD 0hh:0mm"));
+		}
+	});	
+	return results;
+};
+
+})();

core/modules/filters/format/relativedate.js

@@ -0,0 +1,26 @@
+/*\
+title: $:/core/modules/filters/format/relativedate.js
+type: application/javascript
+module-type: formatfilteroperator
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+/*
+Export our filter function
+*/
+exports.relativedate = function(source,operand,options) {
+	var results = [];	
+	source(function(tiddler,title) {
+		var value = $tw.utils.parseDate(title);
+		if(value && $tw.utils.isDate(value) && value.toString() !== "Invalid Date") {
+			results.push($tw.utils.getRelativeDate((new Date()) - (new Date(value))).description);
+		}
+	});	
+	return results;
+};
+
+})();

core/modules/filters/has.js

@@ -37,13 +37,13 @@ exports.has = function(source,operator,options) {
 	else if(operator.suffix === "index") {
 		if(invert) {
 			source(function(tiddler,title) {
-				if(!tiddler || (tiddler && (!$tw.utils.hop($tw.wiki.getTiddlerDataCached(tiddler,Object.create(null)),operator.operand)))) {
+				if(!tiddler || (tiddler && (!$tw.utils.hop(options.wiki.getTiddlerDataCached(tiddler,Object.create(null)),operator.operand)))) {
 					results.push(title);
 				}
 			});
 		} else {
 			source(function(tiddler,title) {
-				if(tiddler && $tw.utils.hop($tw.wiki.getTiddlerDataCached(tiddler,Object.create(null)),operator.operand)) {
+				if(tiddler && $tw.utils.hop(options.wiki.getTiddlerDataCached(tiddler,Object.create(null)),operator.operand)) {
 					results.push(title);
 				}
 			});
@@ -52,13 +52,13 @@ exports.has = function(source,operator,options) {
 	else {
 		if(invert) {
 			source(function(tiddler,title) {
-				if(!tiddler || !$tw.utils.hop(tiddler.fields,operator.operand) || (tiddler.fields[operator.operand] === "")) {
+				if(!tiddler || !$tw.utils.hop(tiddler.fields,operator.operand) || (tiddler.fields[operator.operand].length === 0)) {
 					results.push(title);
 				}
 			});
 		} else {
 			source(function(tiddler,title) {
-				if(tiddler && $tw.utils.hop(tiddler.fields,operator.operand) && !(tiddler.fields[operator.operand] === "" || tiddler.fields[operator.operand].length === 0)) {
+				if(tiddler && $tw.utils.hop(tiddler.fields,operator.operand) && (tiddler.fields[operator.operand].length !== 0)) {
 					results.push(title);
 				}
 			});				

core/modules/filters/reduce.js

@@ -0,0 +1,54 @@
+/*\
+title: $:/core/modules/filters/reduce.js
+type: application/javascript
+module-type: filteroperator
+
+Filter operator evaluats a subfilter for each item, making the running total available in the variable `accumulator`, and the current index available in the variable `index`
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+/*
+Export our filter function
+*/
+exports.reduce = function(source,operator,options) {
+	// Accumulate the list
+	var results = [];
+	source(function(tiddler,title) {
+		results.push(title);
+	});
+	// Run the filter over each item
+	var filterFn = options.wiki.compileFilter(operator.operand),
+		accumulator = operator.suffix || "";
+	for(var index=0; index<results.length; index++) {
+		var title = results[index],
+			list = filterFn.call(options.wiki,options.wiki.makeTiddlerIterator([title]),{
+				getVariable: function(name) {
+					switch(name) {
+						case "currentTiddler":
+							return "" + title;
+						case "accumulator":
+							return "" + accumulator;
+						case "index":
+							return "" + index;
+						case "revIndex":
+							return "" + (results.length - 1 - index);
+						case "length":
+							return "" + results.length;
+						default:
+							return options.widget.getVariable(name);
+					}
+				}
+			});
+		if(list.length > 0) {
+			accumulator = "" +  list[0];
+		}
+	}
+	return [accumulator];
+};
+
+})();

core/modules/filters/slugify.js

@@ -0,0 +1,23 @@
+/*\
+title: $:/core/modules/filters/slugify.js
+type: application/javascript
+module-type: filteroperator
+
+Filter operator for slugifying a tiddler title
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+exports.slugify = function(source,operator,options) {
+	var results = [];
+	source(function(tiddler,title) {
+		results.push(options.wiki.slugify(title));
+	});
+	return results;
+};
+
+})();

core/modules/filters/sortsub.js

@@ -0,0 +1,57 @@
+/*\
+title: $:/core/modules/filters/sortsub.js
+type: application/javascript
+module-type: filteroperator
+
+Filter operator for sorting by a subfilter
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+/*
+Export our filter function
+*/
+exports.sortsub = function(source,operator,options) {
+	// Compile the subfilter
+	var filterFn = options.wiki.compileFilter(operator.operand);
+	// Collect the input titles and the corresponding sort keys
+	var inputTitles = [],
+		sortKeys = [];
+	source(function(tiddler,title) {
+		inputTitles.push(title);
+		var r = filterFn.call(options.wiki,function(iterator) {
+			iterator(options.wiki.getTiddler(title),title);
+		},{
+			getVariable: function(name) {
+				if(name === "currentTiddler") {
+					return title;
+				} else {
+					return options.widget.getVariable(name);
+				}
+			}
+		});
+		sortKeys.push(r[0] || "");
+	});
+	// Rather than sorting the titles array, we'll sort the indexes so that we can consult both arrays
+	var indexes = new Array(inputTitles.length);
+	for(var t=0; t<inputTitles.length; t++) {
+		indexes[t] = t;
+	}
+	// Sort the indexes
+	var compareFn = $tw.utils.makeCompareFunction(operator.suffix,{defaultType: "string",invert: operator.prefix === "!"});
+	indexes = indexes.sort(function(a,b) {
+		return compareFn(sortKeys[a],sortKeys[b]);
+	});
+	// Make the results array in order
+	var results = [];
+	$tw.utils.each(indexes,function(index) {
+		results.push(inputTitles[index]);
+	});
+	return results;
+};
+
+})();

core/modules/filters/strings.js

@@ -34,9 +34,31 @@ exports.titlecase = makeStringBinaryOperator(
 	function(a) {return [$tw.utils.toTitleCase(a)];}
 );
 
-exports.trim = makeStringBinaryOperator(
-	function(a) {return [$tw.utils.trim(a)];}
-);
+exports.trim = function(source,operator,options) {
+	var result = [],
+		suffix = operator.suffix || "",
+		operand = (operator.operand || ""),
+		fnCalc;
+	if(suffix === "prefix") {
+		fnCalc = function(a,b) {return [$tw.utils.trimPrefix(a,b)];}
+	} else if(suffix === "suffix") {
+		fnCalc = function(a,b) {return [$tw.utils.trimSuffix(a,b)];}
+	} else {
+		if(operand === "") {
+			fnCalc = function(a) {return [$tw.utils.trim(a)];}
+		} else {
+			fnCalc = function(a,b) {return [$tw.utils.trimSuffix($tw.utils.trimPrefix(a,b),b)];}
+		}
+	}
+	source(function(tiddler,title) {
+		Array.prototype.push.apply(result,fnCalc(title,operand));
+	});
+	return result;
+};
+
+// makeStringBinaryOperator(
+// 	function(a) {return [$tw.utils.trim(a)];}
+// );
 
 exports.split = makeStringBinaryOperator(
 	function(a,b) {return ("" + a).split(b);}
@@ -68,6 +90,9 @@ function makeStringReducingOperator(fnCalc,initialValue) {
 		source(function(tiddler,title) {
 			result.push(title);
 		});
+		if(result.length === 0) {
+			return [];
+		}
 		return [result.reduce(function(accumulator,currentValue) {
 			return fnCalc(accumulator,currentValue,operator.operand || "");
 		},initialValue) || ""];

core/modules/info/platform.js

@@ -18,6 +18,7 @@ exports.getInfoTiddlerFields = function() {
 	// Basics
 	infoTiddlerFields.push({title: "$:/info/browser", text: mapBoolean(!!$tw.browser)});
 	infoTiddlerFields.push({title: "$:/info/node", text: mapBoolean(!!$tw.node)});
+	infoTiddlerFields.push({title: "$:/info/startup-timestamp", text: $tw.utils.stringifyDate(new Date())});
 	if($tw.browser) {
 		// Document location
 		var setLocationProperty = function(name,value) {

core/modules/keyboard.js

@@ -284,6 +284,16 @@ KeyboardManager.prototype.checkKeyDescriptors = function(event,keyInfoArray) {
 	return false;
 };
 
+KeyboardManager.prototype.getEventModifierKeyDescriptor = function(event) {
+	return event.ctrlKey && !event.shiftKey && !event.altKey ? "ctrl" : 
+		event.shiftKey && !event.ctrlKey && !event.altKey? "shift" : 
+		event.ctrlKey && event.shiftKey && !event.altKey ? "ctrl-shift" : 
+		event.altKey && !event.shiftKey && !event.ctrlKey ? "alt" : 
+		event.altKey && event.shiftKey && !event.ctrlKey ? "alt-shift" : 
+		event.altKey && event.ctrlKey && !event.shiftKey ? "ctrl-alt" : 
+		event.altKey && event.shiftKey && event.ctrlKey ? "ctrl-alt-shift" : "normal";
+};
+
 KeyboardManager.prototype.getShortcutTiddlerList = function() {
 	return $tw.wiki.getTiddlersWithTag("$:/tags/KeyboardShortcut");
 };

core/modules/parsers/htmlfragmentparser.js

@@ -0,0 +1,28 @@
+/*\
+title: $:/core/modules/parsers/htmlfragmentparser.js
+type: application/javascript
+module-type: parser
+
+Inherits from the base wikitext parser but is forced into inline mode
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+var WikiParser = require("$:/core/modules/parsers/wikiparser/wikiparser.js")["text/vnd.tiddlywiki"];
+
+var PRAGMAS = "\\rules only html entity\n";
+
+var HtmlFragmentWikiParser = function(type,text,options) {
+	var parser = new WikiParser(type,PRAGMAS + text,$tw.utils.extend({},options,{parseAsInline: true}));
+	this.tree = parser.tree;
+	this.prototype = parser.prototype;
+};
+
+exports["text/html+fragment"] = HtmlFragmentWikiParser;
+
+})();
+

core/modules/parsers/wikiparser/wikiparser.js

@@ -48,6 +48,10 @@ var WikiParser = function(type,text,options) {
 	}
 	// Save the parse text
 	this.type = type || "text/vnd.tiddlywiki";
+	this.variant = null;
+	if(options.paramName === "variant" && options.paramValue) {
+		this.variant = options.paramValue;
+	}
 	this.source = text || "";
 	this.sourceLength = this.source.length;
 	// Flag for ignoring whitespace
@@ -59,6 +63,29 @@ var WikiParser = function(type,text,options) {
 	// Instantiate the parser block and inline rules
 	this.blockRules = this.instantiateRules(this.blockRuleClasses,"block",0);
 	this.inlineRules = this.instantiateRules(this.inlineRuleClasses,"inline",0);
+	// Setup the selected variant
+	if(this.variant) {
+		var variantData = this.wiki.getTiddlerDataCached("$:/config/WikiParserVariant/" + this.variant);
+		if(variantData) {
+			// Whitespace setting
+			switch(variantData.whitespace) {
+				case "notrim":
+					this.configTrimWhiteSpace = false;
+					break;
+				case "trim":
+					// Intentional fallthrough
+				default:
+					this.configTrimWhiteSpace = false;
+					break;
+			}
+			// Setup rules
+			if(variantData.rules && variantData.rules.only) {
+				this.amendRules("only",variantData.rules.only);
+			} else if(variantData.rules && variantData.rules.except) {
+				this.amendRules("except",variantData.rules.except);
+			}
+		}
+	}
 	// Parse any pragmas
 	this.tree = [];
 	var topBranch = this.parsePragmas();
@@ -386,22 +413,18 @@ Amend the rules used by this instance of the parser
 WikiParser.prototype.amendRules = function(type,names) {
 	names = names || [];
 	// Define the filter function
-	var keepFilter;
+	var target;
 	if(type === "only") {
-		keepFilter = function(name) {
-			return names.indexOf(name) !== -1;
-		};
+		target = true;
 	} else if(type === "except") {
-		keepFilter = function(name) {
-			return names.indexOf(name) === -1;
-		};
+		target = false;
 	} else {
 		return;
 	}
 	// Define a function to process each of our rule arrays
 	var processRuleArray = function(ruleArray) {
 		for(var t=ruleArray.length-1; t>=0; t--) {
-			if(!keepFilter(ruleArray[t].rule.name)) {
+			if((names.indexOf(ruleArray[t].rule.name) === -1) === target) {
 				ruleArray.splice(t,1);
 			}
 		}

core/modules/savers/gitea.js

@@ -31,10 +31,10 @@ GiteaSaver.prototype.save = function(text,method,callback) {
 		headers = {
 			"Accept": "application/json",
 			"Content-Type": "application/json;charset=UTF-8",
-			"Authorization": "Basic " + window.btoa(username + ":" + password)
+			"Authorization": "token " + password
 		};
 	// Bail if we don't have everything we need
-	if(!username || !password || !repo || !path || !filename) {
+	if(!username || !password || !repo || !filename) {
 		return false;
 	}
 	// Make sure the path start and ends with a slash

core/modules/savers/github.js

@@ -34,7 +34,7 @@ GitHubSaver.prototype.save = function(text,method,callback) {
 			"Authorization": "Basic " + window.btoa(username + ":" + password)
 		};
 	// Bail if we don't have everything we need
-	if(!username || !password || !repo || !path || !filename) {
+	if(!username || !password || !repo || !filename) {
 		return false;
 	}
 	// Make sure the path start and ends with a slash

core/modules/savers/gitlab.js

@@ -34,7 +34,7 @@ GitLabSaver.prototype.save = function(text,method,callback) {
 			"Private-Token": password
 		};
 	// Bail if we don't have everything we need
-	if(!username || !password || !repo || !path || !filename) {
+	if(!username || !password || !repo || !filename) {
 		return false;
 	}
 	// Make sure the path start and ends with a slash

core/modules/savers/hyperdrive.js

@@ -0,0 +1,64 @@
+/*\
+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/authenticators/basic.js

@@ -31,7 +31,7 @@ BasicAuthenticator.prototype.init = function() {
 	// Read the credentials data
 	this.credentialsFilepath = this.server.get("credentials");
 	if(this.credentialsFilepath) {
-		var resolveCredentialsFilepath = path.resolve($tw.boot.wikiPath,this.credentialsFilepath);
+		var resolveCredentialsFilepath = path.resolve(this.server.boot.wikiPath,this.credentialsFilepath);
 		if(fs.existsSync(resolveCredentialsFilepath) && !fs.statSync(resolveCredentialsFilepath).isDirectory()) {
 			var credentialsText = fs.readFileSync(resolveCredentialsFilepath,"utf8"),
 				credentialsData = $tw.utils.parseCsvStringWithHeader(credentialsText);

core/modules/server/authenticators/header.js

@@ -14,7 +14,7 @@ Authenticator for trusted header authentication
 
 function HeaderAuthenticator(server) {
 	this.server = server;
-	this.header = server.get("authenticated-user-header");
+	this.header = server.get("authenticated-user-header") ? server.get("authenticated-user-header").toLowerCase() : undefined;
 }
 
 /*

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

@@ -21,7 +21,7 @@ exports.handler = function(request,response,state) {
 		fs = require("fs"),
 		util = require("util"),
 		suppliedFilename = decodeURIComponent(state.params[0]),
-		filename = path.resolve($tw.boot.wikiPath,"files",suppliedFilename),
+		filename = path.resolve(state.boot.wikiPath,"files",suppliedFilename),
 		extension = path.extname(filename);
 	fs.readFile(filename,function(err,content) {
 		var status,content,type = "text/plain";

core/modules/server/routes/get-tiddlers-json.js

@@ -3,7 +3,7 @@ title: $:/core/modules/server/routes/get-tiddlers-json.js
 type: application/javascript
 module-type: route
 
-GET /recipes/default/tiddlers/tiddlers.json?filter=<filter>
+GET /recipes/default/tiddlers.json?filter=<filter>
 
 \*/
 (function() {
@@ -20,9 +20,9 @@ exports.path = /^\/recipes\/default\/tiddlers.json$/;
 
 exports.handler = function(request,response,state) {
 	var filter = state.queryParameters.filter || DEFAULT_FILTER;
-	if($tw.wiki.getTiddlerText("$:/config/Server/AllowAllExternalFilters") !== "yes") {
-		if($tw.wiki.getTiddlerText("$:/config/Server/ExternalFilters/" + filter) !== "yes") {
-			console.log("Blocked attempt to GET /recipes/default/tiddlers/tiddlers.json with filter: " + filter);
+	if(state.wiki.getTiddlerText("$:/config/Server/AllowAllExternalFilters") !== "yes") {
+		if(state.wiki.getTiddlerText("$:/config/Server/ExternalFilters/" + filter) !== "yes") {
+			console.log("Blocked attempt to GET /recipes/default/tiddlers.json with filter: " + filter);
 			response.writeHead(403);
 			response.end();
 			return;

core/modules/server/server.js

@@ -31,6 +31,7 @@ function Server(options) {
 	this.routes = options.routes || [];
 	this.authenticators = options.authenticators || [];
 	this.wiki = options.wiki;
+	this.boot = options.boot || $tw.boot;
 	this.servername = $tw.utils.transliterateToSafeASCII(this.wiki.getTiddlerText("$:/SiteTitle") || "TiddlyWiki5");
 	// Initialise the variables
 	this.variables = $tw.utils.extend({},this.defaultVariables);
@@ -69,8 +70,8 @@ function Server(options) {
 		tlsCertFilepath = this.get("tls-cert");
 	if(tlsCertFilepath && tlsKeyFilepath) {
 		this.listenOptions = {
-			key: fs.readFileSync(path.resolve($tw.boot.wikiPath,tlsKeyFilepath),"utf8"),
-			cert: fs.readFileSync(path.resolve($tw.boot.wikiPath,tlsCertFilepath),"utf8")
+			key: fs.readFileSync(path.resolve(this.boot.wikiPath,tlsKeyFilepath),"utf8"),
+			cert: fs.readFileSync(path.resolve(this.boot.wikiPath,tlsCertFilepath),"utf8")
 		};
 		this.protocol = "https";
 	}
@@ -112,15 +113,14 @@ Server.prototype.addAuthenticator = function(AuthenticatorClass) {
 };
 
 Server.prototype.findMatchingRoute = function(request,state) {
-	var pathprefix = this.get("path-prefix") || "";
 	for(var t=0; t<this.routes.length; t++) {
 		var potentialRoute = this.routes[t],
 			pathRegExp = potentialRoute.path,
 			pathname = state.urlInfo.pathname,
 			match;
-		if(pathprefix) {
-			if(pathname.substr(0,pathprefix.length) === pathprefix) {
-				pathname = pathname.substr(pathprefix.length) || "/";
+		if(state.pathPrefix) {
+			if(pathname.substr(0,state.pathPrefix.length) === state.pathPrefix) {
+				pathname = pathname.substr(state.pathPrefix.length) || "/";
 				match = potentialRoute.path.exec(pathname);
 			} else {
 				match = false;
@@ -156,14 +156,17 @@ Server.prototype.isAuthorized = function(authorizationType,username) {
 	return principals.indexOf("(anon)") !== -1 || (username && (principals.indexOf("(authenticated)") !== -1 || principals.indexOf(username) !== -1));
 }
 
-Server.prototype.requestHandler = function(request,response) {
+Server.prototype.requestHandler = function(request,response,options) {
+	options = options || {};
 	// Compose the state object
 	var self = this;
 	var state = {};
-	state.wiki = self.wiki;
+	state.wiki = options.wiki || self.wiki;
+	state.boot = options.boot || self.boot;
 	state.server = self;
 	state.urlInfo = url.parse(request.url);
 	state.queryParameters = querystring.parse(state.urlInfo.query);
+	state.pathPrefix = options.pathPrefix || this.get("path-prefix") || "";
 	// Get the principals authorized to access this resource
 	var authorizationType = this.methodMappings[request.method] || "readers";
 	// Check for the CSRF header if this is a write
@@ -248,7 +251,7 @@ Server.prototype.listen = function(port,host,prefix) {
 		port = process.env[port] || 8080;
 	}
 	// Warn if required plugins are missing
-	if(!$tw.wiki.getTiddler("$:/plugins/tiddlywiki/tiddlyweb") || !$tw.wiki.getTiddler("$:/plugins/tiddlywiki/filesystem")) {
+	if(!this.wiki.getTiddler("$:/plugins/tiddlywiki/tiddlyweb") || !this.wiki.getTiddler("$:/plugins/tiddlywiki/filesystem")) {
 		$tw.utils.warning("Warning: Plugins required for client-server operation (\"tiddlywiki/filesystem\" and \"tiddlywiki/tiddlyweb\") are missing from tiddlywiki.info file");
 	}
 	// Create the server

core/modules/startup/favicon.js

@@ -36,7 +36,7 @@ function setFavicon() {
 	var tiddler = $tw.wiki.getTiddler(FAVICON_TITLE);
 	if(tiddler) {
 		var faviconLink = document.getElementById("faviconLink");
-		faviconLink.setAttribute("href","data:" + tiddler.fields.type + ";base64," + tiddler.fields.text);
+		faviconLink.setAttribute("href",$tw.utils.makeDataUri(tiddler.fields.text,tiddler.fields.type,tiddler.fields._canonical_uri));
 	}
 }
 

core/modules/syncer.js

@@ -127,7 +127,7 @@ function Syncer(options) {
 		});
 	}
 	// Listen out for lazyLoad events
-	if(!this.disableUI && $tw.wiki.getTiddlerText(this.titleSyncDisableLazyLoading) !== "yes") {
+	if(!this.disableUI && this.wiki.getTiddlerText(this.titleSyncDisableLazyLoading) !== "yes") {
 		this.wiki.addEventListener("lazyLoad",function(title) {
 			self.handleLazyLoadEvent(title);
 		});		
@@ -180,12 +180,14 @@ Syncer.prototype.readTiddlerInfo = function() {
 	var self = this,
 		tiddlers = this.getSyncedTiddlers();
 	$tw.utils.each(tiddlers,function(title) {
-		var tiddler = self.wiki.tiddlerExists(title) && self.wiki.getTiddler(title);
-		self.tiddlerInfo[title] = {
-			revision: self.getTiddlerRevision(title),
-			adaptorInfo: self.syncadaptor && self.syncadaptor.getTiddlerInfo(tiddler),
-			changeCount: self.wiki.getChangeCount(title)
-		};
+		var tiddler = self.wiki.getTiddler(title);
+		if(tiddler) {
+			self.tiddlerInfo[title] = {
+				revision: self.getTiddlerRevision(title),
+				adaptorInfo: self.syncadaptor && self.syncadaptor.getTiddlerInfo(tiddler),
+				changeCount: self.wiki.getChangeCount(title)
+			};
+		}
 	});
 };
 
@@ -202,7 +204,7 @@ Syncer.prototype.isDirty = function() {
 		if(this.wiki.tiddlerExists(title)) {
 			if(tiddlerInfo) {
 				// If the tiddler is known on the server and has been modified locally then it needs to be saved to the server
-				if($tw.wiki.getChangeCount(title) > tiddlerInfo.changeCount) {
+				if(this.wiki.getChangeCount(title) > tiddlerInfo.changeCount) {
 					return true;
 				}
 			} else {
@@ -524,7 +526,7 @@ Syncer.prototype.chooseNextTask = function() {
 			tiddlerInfo = this.tiddlerInfo[title];
 		if(tiddler) {
 			// If the tiddler is not known on the server, or has been modified locally no more recently than the threshold then it needs to be saved to the server
-			var hasChanged = !tiddlerInfo || $tw.wiki.getChangeCount(title) > tiddlerInfo.changeCount,
+			var hasChanged = !tiddlerInfo || this.wiki.getChangeCount(title) > tiddlerInfo.changeCount,
 				isReadyToSave = !tiddlerInfo || !tiddlerInfo.timestampLastSaved || tiddlerInfo.timestampLastSaved < thresholdLastSaved;
 			if(hasChanged) {
 				if(isReadyToSave) {
@@ -581,6 +583,8 @@ SaveTiddlerTask.prototype.run = function(callback) {
 			};
 			// Invoke the callback
 			callback(null);
+		},{
+			tiddlerInfo: self.syncer.tiddlerInfo[self.title]
 		});
 	} else {
 		this.syncer.logger.log(" Not Dispatching 'save' task:",this.title,"tiddler does not exist");

core/modules/upgraders/plugins.js

@@ -41,7 +41,7 @@ exports.upgrade = function(wiki,titles,tiddlers) {
 		// Check if we're dealing with a plugin
 		if(incomingTiddler && incomingTiddler["plugin-type"]) {
 			// Check whether the plugin contains JS modules
-			var requiresReload = $tw.wiki.doesPluginInfoRequireReload(JSON.parse(incomingTiddler.text)) ? ($tw.wiki.getTiddlerText("$:/language/ControlPanel/Plugins/PluginWillRequireReload") + " ") : "";
+			var requiresReload = wiki.doesPluginInfoRequireReload(JSON.parse(incomingTiddler.text)) ? (wiki.getTiddlerText("$:/language/ControlPanel/Plugins/PluginWillRequireReload") + " ") : "";
 			messages[title] = requiresReload;
 			if(incomingTiddler.version) {
 				// Upgrade the incoming plugin if it is in the upgrade library

core/modules/utils/base64-utf8/base64-utf8.module.js

@@ -20,15 +20,27 @@
       for (i; i < string.length; i++) {
         charCode = string.charCodeAt(i);
 
-        if (charCode < 128)
+        if (charCode < 128) {
           output += String.fromCharCode(charCode);
-        else if ((charCode > 127) && (charCode < 2048))
-          output += String.fromCharCode((charCode >> 6) | 192),
+        } else if ((charCode > 127) && (charCode < 2048)) {
+          output += String.fromCharCode((charCode >> 6) | 192);
           output += String.fromCharCode((charCode & 63) | 128);
-        else
-          output += String.fromCharCode((charCode >> 12) | 224),
-          output += String.fromCharCode(((charCode >> 6) & 63) | 128),
+        } else if ((charCode > 55295) && (charCode < 57344) && string.length > i+1) {
+          // Surrogate pair
+          var hiSurrogate = charCode;
+          var loSurrogate = string.charCodeAt(i+1);
+          i++;  // Skip the low surrogate on the next loop pass
+          var codePoint = (((hiSurrogate - 55296) << 10) | (loSurrogate - 56320)) + 65536;
+          output += String.fromCharCode((codePoint >> 18) | 240);
+          output += String.fromCharCode(((codePoint >> 12) & 63) | 128);
+          output += String.fromCharCode(((codePoint >> 6) & 63) | 128);
+          output += String.fromCharCode((codePoint & 63) | 128);
+        } else {
+          // Not a surrogate pair, or a dangling surrogate without its partner that we'll just encode as-is
+          output += String.fromCharCode((charCode >> 12) | 224);
+          output += String.fromCharCode(((charCode >> 6) & 63) | 128);
           output += String.fromCharCode((charCode & 63) | 128);
+        }
       }
 
       return output;
@@ -41,15 +53,21 @@
       while (i < string.length) {
         charCode = string.charCodeAt(i);
 
-        if (charCode < 128)
+        if (charCode < 128) {
           output += String.fromCharCode(charCode),
           i++;
-        else if ((charCode > 191) && (charCode < 224))
-          output += String.fromCharCode(((charCode & 31) << 6) | (string.charCodeAt(i + 1) & 63)),
+        } else if ((charCode > 191) && (charCode < 224)) {
+          output += String.fromCharCode(((charCode & 31) << 6) | (string.charCodeAt(i + 1) & 63));
           i += 2;
-        else
-          output += String.fromCharCode(((charCode & 15) << 12) | ((string.charCodeAt(i + 1) & 63) << 6) | (string.charCodeAt(i + 2) & 63)),
+        } else if ((charCode > 223) && (charCode < 240)) {
+          output += String.fromCharCode(((charCode & 15) << 12) | ((string.charCodeAt(i + 1) & 63) << 6) | (string.charCodeAt(i + 2) & 63));
           i += 3;
+        } else {
+          var codePoint = ((charCode & 7) << 18) | ((string.charCodeAt(i + 1) & 63) << 12) | ((string.charCodeAt(i + 2) & 63) << 6) | (string.charCodeAt(i + 3) & 63);
+          // output += String.fromCodePoint(codePoint);  // Can't do this because Internet Explorer doesn't have String.fromCodePoint
+          output += String.fromCharCode(((codePoint - 65536) >> 10) + 55296) + String.fromCharCode(((codePoint - 65536) & 1023) + 56320);  // So we do this instead
+          i += 4;
+        }
       }
 
       return output;

core/modules/utils/base64-utf8/base64-utf8.module.min.js

@@ -6,4 +6,4 @@
 //
 // copyright: MIT
 // author: Nijiko Yonskai, @nijikokun, nijikokun@gmail.com
-!function(r,e,o,t){void 0!==o.module&&o.module.exports?o.module.exports=e.apply(o):void 0!==o.define&&"function"===o.define&&o.define.amd?define("utf8",[],e):o.utf8=e.apply(o)}(0,function(){return{encode:function(r){if("string"!=typeof r)return r;r=r.replace(/\r\n/g,"\n");for(var e,o="",t=0;t<r.length;t++)(e=r.charCodeAt(t))<128?o+=String.fromCharCode(e):e>127&&e<2048?(o+=String.fromCharCode(e>>6|192),o+=String.fromCharCode(63&e|128)):(o+=String.fromCharCode(e>>12|224),o+=String.fromCharCode(e>>6&63|128),o+=String.fromCharCode(63&e|128));return o},decode:function(r){if("string"!=typeof r)return r;for(var e="",o=0,t=0;o<r.length;)(t=r.charCodeAt(o))<128?(e+=String.fromCharCode(t),o++):t>191&&t<224?(e+=String.fromCharCode((31&t)<<6|63&r.charCodeAt(o+1)),o+=2):(e+=String.fromCharCode((15&t)<<12|(63&r.charCodeAt(o+1))<<6|63&r.charCodeAt(o+2)),o+=3);return e}}},this),function(r,e,o,t){if(void 0!==o.module&&o.module.exports){if(t&&o.require)for(var n=0;n<t.length;n++)o[t[n]]=o.require(t[n]);o.module.exports=e.apply(o)}else void 0!==o.define&&"function"===o.define&&o.define.amd?define("base64",t||[],e):o.base64=e.apply(o)}(0,function(r){var e=r||this.utf8,o="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";return{encode:function(r){if(void 0===e)throw{error:"MissingMethod",message:"UTF8 Module is missing."};if("string"!=typeof r)return r;r=e.encode(r);for(var t,n,i,d,f,a,h,c="",u=0;u<r.length;)d=(t=r.charCodeAt(u++))>>2,f=(3&t)<<4|(n=r.charCodeAt(u++))>>4,a=(15&n)<<2|(i=r.charCodeAt(u++))>>6,h=63&i,isNaN(n)?a=h=64:isNaN(i)&&(h=64),c+=o.charAt(d)+o.charAt(f)+o.charAt(a)+o.charAt(h);return c},decode:function(r){if(void 0===e)throw{error:"MissingMethod",message:"UTF8 Module is missing."};if("string"!=typeof r)return r;r=r.replace(/[^A-Za-z0-9\+\/\=]/g,"");for(var t,n,i,d,f,a,h="",c=0;c<r.length;)t=o.indexOf(r.charAt(c++))<<2|(d=o.indexOf(r.charAt(c++)))>>4,n=(15&d)<<4|(f=o.indexOf(r.charAt(c++)))>>2,i=(3&f)<<6|(a=o.indexOf(r.charAt(c++))),h+=String.fromCharCode(t),64!=f&&(h+=String.fromCharCode(n)),64!=a&&(h+=String.fromCharCode(i));return e.decode(h)}}},this,["utf8"]);
+!function(r,e,o,t){void 0!==o.module&&o.module.exports?o.module.exports=e.apply(o):void 0!==o.define&&"function"===o.define&&o.define.amd?define("utf8",[],e):o.utf8=e.apply(o)}(0,function(){return{encode:function(r){if("string"!=typeof r)return r;r=r.replace(/\r\n/g,"\n");for(var e,o="",t=0;t<r.length;t++)if((e=r.charCodeAt(t))<128)o+=String.fromCharCode(e);else if(e>127&&e<2048)o+=String.fromCharCode(e>>6|192),o+=String.fromCharCode(63&e|128);else if(e>55295&&e<57344&&r.length>t+1){var i=e,n=r.charCodeAt(t+1);t++;var d=65536+(i-55296<<10|n-56320);o+=String.fromCharCode(d>>18|240),o+=String.fromCharCode(d>>12&63|128),o+=String.fromCharCode(d>>6&63|128),o+=String.fromCharCode(63&d|128)}else o+=String.fromCharCode(e>>12|224),o+=String.fromCharCode(e>>6&63|128),o+=String.fromCharCode(63&e|128);return o},decode:function(r){if("string"!=typeof r)return r;for(var e="",o=0,t=0;o<r.length;)if((t=r.charCodeAt(o))<128)e+=String.fromCharCode(t),o++;else if(t>191&&t<224)e+=String.fromCharCode((31&t)<<6|63&r.charCodeAt(o+1)),o+=2;else if(t>223&&t<240)e+=String.fromCharCode((15&t)<<12|(63&r.charCodeAt(o+1))<<6|63&r.charCodeAt(o+2)),o+=3;else{var i=(7&t)<<18|(63&r.charCodeAt(o+1))<<12|(63&r.charCodeAt(o+2))<<6|63&r.charCodeAt(o+3);e+=String.fromCharCode(55296+(i-65536>>10))+String.fromCharCode(56320+(i-65536&1023)),o+=4}return e}}},this),function(r,e,o,t){if(void 0!==o.module&&o.module.exports){if(t&&o.require)for(var i=0;i<t.length;i++)o[t[i]]=o.require(t[i]);o.module.exports=e.apply(o)}else void 0!==o.define&&"function"===o.define&&o.define.amd?define("base64",t||[],e):o.base64=e.apply(o)}(0,function(r){var e=r||this.utf8,o="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";return{encode:function(r){if(void 0===e)throw{error:"MissingMethod",message:"UTF8 Module is missing."};if("string"!=typeof r)return r;r=e.encode(r);for(var t,i,n,d,f,a,h,C="",c=0;c<r.length;)d=(t=r.charCodeAt(c++))>>2,f=(3&t)<<4|(i=r.charCodeAt(c++))>>4,a=(15&i)<<2|(n=r.charCodeAt(c++))>>6,h=63&n,isNaN(i)?a=h=64:isNaN(n)&&(h=64),C+=o.charAt(d)+o.charAt(f)+o.charAt(a)+o.charAt(h);return C},decode:function(r){if(void 0===e)throw{error:"MissingMethod",message:"UTF8 Module is missing."};if("string"!=typeof r)return r;r=r.replace(/[^A-Za-z0-9\+\/\=]/g,"");for(var t,i,n,d,f,a,h="",C=0;C<r.length;)t=o.indexOf(r.charAt(C++))<<2|(d=o.indexOf(r.charAt(C++)))>>4,i=(15&d)<<4|(f=o.indexOf(r.charAt(C++)))>>2,n=(3&f)<<6|(a=o.indexOf(r.charAt(C++))),h+=String.fromCharCode(t),64!=f&&(h+=String.fromCharCode(i)),64!=a&&(h+=String.fromCharCode(n));return e.decode(h)}}},this,["utf8"]);

core/modules/utils/dom/dom.js

@@ -29,23 +29,23 @@ exports.removeChildren = function(node) {
 };
 
 exports.hasClass = function(el,className) {
-	return el && el.className && el.className.toString().split(" ").indexOf(className) !== -1;
+	return el && el.hasAttribute && el.hasAttribute("class") && el.getAttribute("class").split(" ").indexOf(className) !== -1;
 };
 
 exports.addClass = function(el,className) {
-	var c = el.className.split(" ");
+	var c = (el.getAttribute("class") || "").split(" ");
 	if(c.indexOf(className) === -1) {
 		c.push(className);
-		el.className = c.join(" ");
+		el.setAttribute("class",c.join(" "));
 	}
 };
 
 exports.removeClass = function(el,className) {
-	var c = el.className.split(" "),
+	var c = (el.getAttribute("class") || "").split(" "),
 		p = c.indexOf(className);
 	if(p !== -1) {
 		c.splice(p,1);
-		el.className = c.join(" ");
+		el.setAttribute("class",c.join(" "));
 	}
 };
 

core/modules/utils/dom/http.js

@@ -24,6 +24,16 @@ exports.httpRequest = function(options) {
 	var type = options.type || "GET",
 		url = options.url,
 		headers = options.headers || {accept: "application/json"},
+		hasHeader = function(targetHeader) {
+			targetHeader = targetHeader.toLowerCase();
+			var result = false;
+			$tw.utils.each(headers,function(header,headerTitle,object) {
+				if(headerTitle.toLowerCase() === targetHeader) {
+					result = true;
+				}
+			});
+			return result;
+		},
 		returnProp = options.returnProp || "responseText",
 		request = new XMLHttpRequest(),
 		data = "",
@@ -63,10 +73,10 @@ exports.httpRequest = function(options) {
 			request.setRequestHeader(headerTitle,header);
 		});
 	}
-	if(data && !$tw.utils.hop(headers,"Content-type")) {
-		request.setRequestHeader("Content-type","application/x-www-form-urlencoded; charset=UTF-8");
+	if(data && !hasHeader("Content-Type")) {
+		request.setRequestHeader("Content-Type","application/x-www-form-urlencoded; charset=UTF-8");
 	}
-	if(!$tw.utils.hop(headers,"X-Requested-With")) {
+	if(!hasHeader("X-Requested-With")) {
 		request.setRequestHeader("X-Requested-With","TiddlyWiki");
 	}
 	try {

core/modules/utils/fakedom.js

@@ -21,14 +21,32 @@ var bumpSequenceNumber = function(object) {
 	}
 };
 
+var TW_Node = function (){
+	throw TypeError("Illegal constructor");
+};
+
+Object.defineProperty(TW_Node.prototype, 'ELEMENT_NODE', {
+	get: function() {
+		return 1;
+	}
+});
+
+Object.defineProperty(TW_Node.prototype, 'TEXT_NODE', {
+	get: function() {
+		return 3;
+	}
+});
+
 var TW_TextNode = function(text) {
 	bumpSequenceNumber(this);
 	this.textContent = text + "";
 };
 
+TW_TextNode.prototype = Object.create(TW_Node.prototype);
+
 Object.defineProperty(TW_TextNode.prototype, "nodeType", {
 	get: function() {
-		return 3;
+		return this.TEXT_NODE;
 	}
 });
 
@@ -49,6 +67,8 @@ var TW_Element = function(tag,namespace) {
 	this.namespaceURI = namespace || "http://www.w3.org/1999/xhtml";
 };
 
+TW_Element.prototype = Object.create(TW_Node.prototype);
+
 Object.defineProperty(TW_Element.prototype, "style", {
 	get: function() {
 		return this._style;
@@ -69,7 +89,7 @@ Object.defineProperty(TW_Element.prototype, "style", {
 
 Object.defineProperty(TW_Element.prototype, "nodeType", {
 	get: function() {
-		return 1;
+		return this.ELEMENT_NODE;
 	}
 });
 

core/modules/utils/filesystem.js

@@ -15,13 +15,33 @@ File system utilities
 var fs = require("fs"),
 	path = require("path");
 
+/*
+Return the subdirectories of a path
+*/
+exports.getSubdirectories = function(dirPath) {
+	if(!$tw.utils.isDirectory(dirPath)) {
+		return null;
+	}
+	var subdirs = [];
+	$tw.utils.each(fs.readdirSync(dirPath),function(item) {
+		if($tw.utils.isDirectory(path.resolve(dirPath,item))) {
+			subdirs.push(item);
+		}
+	});
+	return subdirs;
+}
+
 /*
 Recursively (and synchronously) copy a directory and all its content
 */
 exports.copyDirectory = function(srcPath,dstPath) {
 	// Remove any trailing path separators
-	srcPath = $tw.utils.removeTrailingSeparator(srcPath);
-	dstPath = $tw.utils.removeTrailingSeparator(dstPath);
+	srcPath = path.resolve($tw.utils.removeTrailingSeparator(srcPath));
+	dstPath = path.resolve($tw.utils.removeTrailingSeparator(dstPath));
+	// Check that neither director is within the other
+	if(srcPath.substring(0,dstPath.length) === dstPath || dstPath.substring(0,srcPath.length) === srcPath) {
+		return "Cannot copy nested directories";
+	}
 	// Create the destination directory
 	var err = $tw.utils.createDirectory(dstPath);
 	if(err) {
@@ -220,7 +240,7 @@ exports.generateTiddlerFileInfo = function(tiddler,options) {
 		}
 	}
 	// Take the file extension from the tiddler content type
-	var contentTypeInfo = $tw.config.contentTypeInfo[fileInfo.type] || {extension: ""};
+	var contentTypeInfo = $tw.utils.getContentTypeInfo(fileInfo.type) || {extension: ""};
 	// Generate the filepath
 	fileInfo.filepath = $tw.utils.generateTiddlerFilepath(tiddler.fields.title,{
 		extension: contentTypeInfo.extension,
@@ -306,7 +326,7 @@ exports.saveTiddlerToFile = function(tiddler,fileInfo,callback) {
 	$tw.utils.createDirectory(path.dirname(fileInfo.filepath));
 	if(fileInfo.hasMetaFile) {
 		// Save the tiddler as a separate body and meta file
-		var typeInfo = $tw.config.contentTypeInfo[tiddler.fields.type || "text/plain"] || {encoding: "utf8"};
+		var typeInfo = $tw.utils.getContentTypeInfo(tiddler.fields.type || "text/plain") || {encoding: "utf8"};
 		fs.writeFile(fileInfo.filepath,tiddler.fields.text,typeInfo.encoding,function(err) {
 			if(err) {
 				return callback(err);
@@ -333,7 +353,7 @@ exports.saveTiddlerToFileSync = function(tiddler,fileInfo) {
 	$tw.utils.createDirectory(path.dirname(fileInfo.filepath));
 	if(fileInfo.hasMetaFile) {
 		// Save the tiddler as a separate body and meta file
-		var typeInfo = $tw.config.contentTypeInfo[tiddler.fields.type || "text/plain"] || {encoding: "utf8"};
+		var typeInfo = $tw.utils.getContentTypeInfo(tiddler.fields.type || "text/plain") || {encoding: "utf8"};
 		fs.writeFileSync(fileInfo.filepath,tiddler.fields.text,typeInfo.encoding);
 		fs.writeFileSync(fileInfo.filepath + ".meta",tiddler.getFieldStringBlock({exclude: ["text","bag"]}),"utf8");
 	} else {

core/modules/utils/utils.js

@@ -94,6 +94,36 @@ exports.trim = function(str) {
 	}
 };
 
+exports.trimPrefix = function(str,unwanted) {
+	if(typeof str === "string" && typeof unwanted === "string") {
+		if(unwanted === "") {
+			return str.replace(/^\s\s*/, '');
+		} else {
+			// Safely regexp-escape the unwanted text
+			unwanted = unwanted.replace(/[\\^$*+?.()|[\]{}]/g, '\\$&');
+			var regex = new RegExp('^(' + unwanted + ')+');
+			return str.replace(regex, '');
+		}
+	} else {
+		return str;
+	}
+};
+
+exports.trimSuffix = function(str,unwanted) {
+	if(typeof str === "string" && typeof unwanted === "string") {
+		if(unwanted === "") {
+			return str.replace(/\s\s*$/, '');
+		} else {
+			// Safely regexp-escape the unwanted text
+			unwanted = unwanted.replace(/[\\^$*+?.()|[\]{}]/g, '\\$&');
+			var regex = new RegExp('(' + unwanted + ')+$');
+			return str.replace(regex, '');
+		}
+	} else {
+		return str;
+	}
+};
+
 /*
 Convert a string to sentence case (ie capitalise first letter)
 */
@@ -730,7 +760,7 @@ Convert text and content type to a data URI
 */
 exports.makeDataUri = function(text,type,_canonical_uri) {
 	type = type || "text/vnd.tiddlywiki";
-	var typeInfo = $tw.config.contentTypeInfo[type] || $tw.config.contentTypeInfo["text/plain"],
+	var typeInfo = $tw.utils.getContentTypeInfo(type) || $tw.utils.getContentTypeInfo("text/plain"),
 		isBase64 = typeInfo.encoding === "base64",
 		parts = [];
 	if(_canonical_uri) {
@@ -813,4 +843,45 @@ exports.stringifyNumber = function(num) {
 	return num + "";
 };
 
+exports.makeCompareFunction = function(type,options) {
+	options = options || {};
+	var gt = options.invert ? -1 : +1,
+		lt = options.invert ? +1 : -1,
+		compare = function(a,b) {
+			if(a > b) {
+				return gt ;
+			} else if(a < b) {
+				return lt;
+			} else {
+				return 0;
+			}
+		},
+		types = {
+			"number": function(a,b) {
+				return compare($tw.utils.parseNumber(a),$tw.utils.parseNumber(b));
+			},
+			"integer": function(a,b) {
+				return compare($tw.utils.parseInt(a),$tw.utils.parseInt(b));
+			},
+			"string": function(a,b) {
+				return compare("" + a,"" +b);
+			},
+			"date": function(a,b) {
+				var dateA = $tw.utils.parseDate(a),
+					dateB = $tw.utils.parseDate(b);
+				if(!isFinite(dateA)) {
+					dateA = new Date(0);
+				}
+				if(!isFinite(dateB)) {
+					dateB = new Date(0);
+				}
+				return compare(dateA,dateB);
+			},
+			"version": function(a,b) {
+				return $tw.utils.compareVersions(a,b);
+			}
+		};
+	return (types[type] || types[options.defaultType] || types.number);
+};
+
 })();

core/modules/widgets/action-popup.js

@@ -57,7 +57,7 @@ Invoke the action associated with this widget
 ActionPopupWidget.prototype.invokeAction = function(triggeringWidget,event) {
 	// Trigger the popup
 	var popupLocationRegExp = /^\((-?[0-9\.E]+),(-?[0-9\.E]+),(-?[0-9\.E]+),(-?[0-9\.E]+)\)$/,
-		match = popupLocationRegExp.exec(this.actionCoords);
+		match = popupLocationRegExp.exec(this.actionCoords || "");
 	if(match) {
 		$tw.popup.triggerPopup({
 			domNode: null,
@@ -70,6 +70,8 @@ ActionPopupWidget.prototype.invokeAction = function(triggeringWidget,event) {
 			title: this.actionState,
 			wiki: this.wiki
 		});
+	} else {
+		$tw.popup.cancel(0);
 	}
 	return true; // Action was invoked
 };

core/modules/widgets/browse.js

@@ -46,6 +46,9 @@ BrowseWidget.prototype.render = function(parent,nextSibling) {
 	if(this.nwsaveas) {
 		domNode.setAttribute("nwsaveas",this.nwsaveas);
 	}
+	if(this.accept) {
+		domNode.setAttribute("accept",this.accept);
+	}
 	// Nw.js supports "webkitdirectory" and "nwdirectory" to allow a directory to be selected
 	if(this.webkitdirectory) {
 		domNode.setAttribute("webkitdirectory",this.webkitdirectory);
@@ -83,6 +86,7 @@ BrowseWidget.prototype.execute = function() {
 	this.param = this.getAttribute("param");
 	this.tooltip = this.getAttribute("tooltip");
 	this.nwsaveas = this.getAttribute("nwsaveas");
+	this.accept = this.getAttribute("accept");
 	this.webkitdirectory = this.getAttribute("webkitdirectory");
 	this.nwdirectory = this.getAttribute("nwdirectory");
 };

core/modules/widgets/button.js

@@ -91,7 +91,8 @@ ButtonWidget.prototype.render = function(parent,nextSibling) {
 			handled = true;
 		}
 		if(self.actions) {
-			self.invokeActionString(self.actions,self,event);
+			var modifierKey = $tw.keyboardManager.getEventModifierKeyDescriptor(event);
+			self.invokeActionString(self.actions,self,event,{modifier: modifierKey});
 		}
 		if(handled) {
 			event.preventDefault();

core/modules/widgets/droppable.js

@@ -39,7 +39,7 @@ DroppableWidget.prototype.render = function(parent,nextSibling) {
 	}
 	// Create element and assign classes
 	var domNode = this.document.createElement(tag),
-		classes = (this["class"] || "").split(" ");
+		classes = (this.droppableClass || "").split(" ");
 	classes.push("tc-droppable");
 	domNode.className = classes.join(" ");
 	// Add event handlers
@@ -75,7 +75,9 @@ DroppableWidget.prototype.leaveDrag = function(event) {
 	// Remove highlighting if we're leaving externally. The hacky second condition is to resolve a problem with Firefox whereby there is an erroneous dragenter event if the node being dragged is within the dropzone
 	if(this.currentlyEntered.length === 0 || (this.currentlyEntered.length === 1 && this.currentlyEntered[0] === $tw.dragInProgress)) {
 		this.currentlyEntered = [];
-		$tw.utils.removeClass(this.domNodes[0],"tc-dragover");
+		if(this.domNodes[0]) {
+			$tw.utils.removeClass(this.domNodes[0],"tc-dragover");
+		}
 	}
 };
 
@@ -130,8 +132,7 @@ DroppableWidget.prototype.handleDropEvent  = function(event) {
 
 DroppableWidget.prototype.performActions = function(title,event) {
 	if(this.droppableActions) {
-		var modifierKey = event.ctrlKey && ! event.shiftKey ? "ctrl" : event.shiftKey && !event.ctrlKey ? "shift" : 
-				event.ctrlKey && event.shiftKey ? "ctrl-shift" : "normal" ;
+		var modifierKey = $tw.keyboardManager.getEventModifierKeyDescriptor(event);
 		this.invokeActionString(this.droppableActions,this,event,{actionTiddler: title, modifier: modifierKey});
 	}
 };

core/modules/widgets/dropzone.js

@@ -113,7 +113,7 @@ DropZoneWidget.prototype.handleDragEndEvent = function(event) {
 DropZoneWidget.prototype.handleDropEvent  = function(event) {
 	var self = this,
 		readFileCallback = function(tiddlerFieldsArray) {
-			self.dispatchEvent({type: "tm-import-tiddlers", param: JSON.stringify(tiddlerFieldsArray)});
+			self.dispatchEvent({type: "tm-import-tiddlers", param: JSON.stringify(tiddlerFieldsArray), autoOpenOnImport: self.autoOpenOnImport, importTitle: self.importTitle});
 		};
 	this.leaveDrag(event);
 	// Check for being over a TEXTAREA or INPUT
@@ -149,7 +149,7 @@ DropZoneWidget.prototype.handleDropEvent  = function(event) {
 DropZoneWidget.prototype.handlePasteEvent  = function(event) {
 	var self = this,
 		readFileCallback = function(tiddlerFieldsArray) {
-			self.dispatchEvent({type: "tm-import-tiddlers", param: JSON.stringify(tiddlerFieldsArray)});
+			self.dispatchEvent({type: "tm-import-tiddlers", param: JSON.stringify(tiddlerFieldsArray), autoOpenOnImport: self.autoOpenOnImport, importTitle: self.importTitle});
 		};
 	// 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) {
@@ -176,7 +176,7 @@ DropZoneWidget.prototype.handlePasteEvent  = function(event) {
 					if($tw.log.IMPORT) {
 						console.log("Importing string '" + str + "', type: '" + type + "'");
 					}
-					self.dispatchEvent({type: "tm-import-tiddlers", param: JSON.stringify([tiddlerFields])});
+					self.dispatchEvent({type: "tm-import-tiddlers", param: JSON.stringify([tiddlerFields]), autoOpenOnImport: self.autoOpenOnImport, importTitle: self.importTitle});
 				});
 			}
 		}
@@ -193,6 +193,8 @@ DropZoneWidget.prototype.execute = function() {
 	this.dropzoneClass = this.getAttribute("class");
 	this.dropzoneDeserializer = this.getAttribute("deserializer");
 	this.dropzoneEnable = (this.getAttribute("enable") || "yes") === "yes";
+	this.autoOpenOnImport = this.getAttribute("autoOpenOnImport");
+	this.importTitle = this.getAttribute("importTitle");
 	// Make child widgets
 	this.makeChildWidgets();
 };
@@ -202,7 +204,7 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
 */
 DropZoneWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
-	if(changedAttributes.enable) {
+	if(changedAttributes.enable || changedAttributes.autoOpenOnImport || changedAttributes.importTitle || changedAttributes.deserializer || changedAttributes.class) {
 		this.refreshSelf();
 		return true;
 	}

core/modules/widgets/edit.js

@@ -48,20 +48,15 @@ EditWidget.prototype.execute = function() {
 	this.editPlaceholder = this.getAttribute("placeholder");
 	this.editTabIndex = this.getAttribute("tabindex");
 	this.editFocus = this.getAttribute("focus","");
+	this.editCancelPopups = this.getAttribute("cancelPopups","");
+	this.editInputActions = this.getAttribute("inputActions");
+	this.editRefreshTitle = this.getAttribute("refreshTitle");
 	// Choose the appropriate edit widget
 	this.editorType = this.getEditorType();
 	// Make the child widgets
 	this.makeChildWidgets([{
 		type: "edit-" + this.editorType,
-		attributes: {
-			tiddler: {type: "string", value: this.editTitle},
-			field: {type: "string", value: this.editField},
-			index: {type: "string", value: this.editIndex},
-			"class": {type: "string", value: this.editClass},
-			"placeholder": {type: "string", value: this.editPlaceholder},
-			"tabindex": {type: "string", value: this.editTabIndex},
-			"focus": {type: "string", value: this.editFocus}
-		},
+		attributes: this.parseTreeNode.attributes,
 		children: this.parseTreeNode.children
 	}]);
 };
@@ -75,10 +70,10 @@ EditWidget.prototype.getEditorType = function() {
 			type = tiddler.fields.type;
 		}
 	}
-	type = type || "text/vnd.tiddlywiki";
+	type = $tw.utils.parseContentType(type || "text/vnd.tiddlywiki")[0];
 	var editorType = this.wiki.getTiddlerText(EDITOR_MAPPING_PREFIX + type);
 	if(!editorType) {
-		var typeInfo = $tw.config.contentTypeInfo[type];
+		var typeInfo = $tw.utils.getContentTypeInfo(type);
 		if(typeInfo && typeInfo.encoding === "base64") {
 			editorType = "binary";
 		} else {
@@ -94,7 +89,7 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
 EditWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
 	// Refresh if an attribute has changed, or the type associated with the target tiddler has changed
-	if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes.tabindex || (changedTiddlers[this.editTitle] && this.getEditorType() !== this.editorType)) {
+	if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes.tabindex || changedAttributes.cancelPopups || changedAttributes.inputActions || changedAttributes.refreshTitle || (changedTiddlers[this.editTitle] && this.getEditorType() !== this.editorType)) {
 		this.refreshSelf();
 		return true;
 	} else {

core/modules/widgets/element.js

@@ -29,45 +29,47 @@ Render this widget into the DOM
 ElementWidget.prototype.render = function(parent,nextSibling) {
 	this.parentDomNode = parent;
 	this.computeAttributes();
-	this.execute();
 	// Neuter blacklisted elements
-	var tag = this.parseTreeNode.tag;
-	if($tw.config.htmlUnsafeElements.indexOf(tag) !== -1) {
-		tag = "safe-" + tag;
+	this.tag = this.parseTreeNode.tag;
+	if($tw.config.htmlUnsafeElements.indexOf(this.tag) !== -1) {
+		this.tag = "safe-" + this.tag;
 	}
 	// Adjust headings by the current base level
-	var headingLevel = ["h1","h2","h3","h4","h5","h6"].indexOf(tag);
+	var headingLevel = ["h1","h2","h3","h4","h5","h6"].indexOf(this.tag);
 	if(headingLevel !== -1) {
 		var baseLevel = parseInt(this.getVariable("tv-adjust-heading-level","0"),10) || 0;
 		headingLevel = Math.min(Math.max(headingLevel + 1 + baseLevel,1),6);
-		tag = "h" + headingLevel;
+		this.tag = "h" + headingLevel;
 	}
-	// Create the DOM node
-	var domNode = this.document.createElementNS(this.namespace,tag);
-	this.assignAttributes(domNode,{excludeEventAttributes: true});
-	parent.insertBefore(domNode,nextSibling);
-	this.renderChildren(domNode,null);
-	this.domNodes.push(domNode);
-};
-
-/*
-Compute the internal state of the widget
-*/
-ElementWidget.prototype.execute = function() {
 	// Select the namespace for the tag
 	var tagNamespaces = {
 			svg: "http://www.w3.org/2000/svg",
 			math: "http://www.w3.org/1998/Math/MathML",
 			body: "http://www.w3.org/1999/xhtml"
 		};
-	this.namespace = tagNamespaces[this.parseTreeNode.tag];
+	this.namespace = tagNamespaces[this.tag];
 	if(this.namespace) {
 		this.setVariable("namespace",this.namespace);
 	} else {
 		this.namespace = this.getVariable("namespace",{defaultValue: "http://www.w3.org/1999/xhtml"});
 	}
+	// Invoke the th-rendering-element hook
+	var parseTreeNodes = $tw.hooks.invokeHook("th-rendering-element",null,this);
+	this.isReplaced = !!parseTreeNodes;
+	if(parseTreeNodes) {
+		// Use the parse tree nodes provided by the hook
+		this.makeChildWidgets(parseTreeNodes);
+		this.renderChildren(this.parentDomNode,null);
+		return;
+	}
 	// Make the child widgets
 	this.makeChildWidgets();
+	// Create the DOM node and render children
+	var domNode = this.document.createElementNS(this.namespace,this.tag);
+	this.assignAttributes(domNode,{excludeEventAttributes: true});
+	parent.insertBefore(domNode,nextSibling);
+	this.renderChildren(domNode,null);
+	this.domNodes.push(domNode);
 };
 
 /*
@@ -77,8 +79,13 @@ ElementWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes(),
 		hasChangedAttributes = $tw.utils.count(changedAttributes) > 0;
 	if(hasChangedAttributes) {
-		// Update our attributes
-		this.assignAttributes(this.domNodes[0],{excludeEventAttributes: true});
+		if(!this.isReplaced) {
+			// Update our attributes
+			this.assignAttributes(this.domNodes[0],{excludeEventAttributes: true});			
+		} else {
+			// If we were replaced then completely refresh ourselves
+			return this.refreshSelf();
+		}
 	}
 	return this.refreshChildren(changedTiddlers) || hasChangedAttributes;
 };

core/modules/widgets/entity.js

@@ -28,6 +28,7 @@ Render this widget into the DOM
 */
 EntityWidget.prototype.render = function(parent,nextSibling) {
 	this.parentDomNode = parent;
+	this.computeAttributes();
 	this.execute();
 	var entityString = this.getAttribute("entity",this.parseTreeNode.entity || ""),
 		textNode = this.document.createTextNode($tw.utils.entityDecode(entityString));

core/modules/widgets/importvariables.js

@@ -38,6 +38,8 @@ Compute the internal state of the widget
 */
 ImportVariablesWidget.prototype.execute = function(tiddlerList) {
 	var widgetPointer = this;
+	// Got to flush all the accumulated variables
+	this.variables = new this.variablesConstructor();
 	// Get our parameters
 	this.filter = this.getAttribute("filter");
 	// Compute the filter
@@ -70,7 +72,14 @@ ImportVariablesWidget.prototype.execute = function(tiddlerList) {
 						widgetPointer.variables[key] = widget.variables[key];
 					});
 				} else {
-					widgetPointer.makeChildWidgets([node]);
+					widgetPointer.children = [widgetPointer.makeChildWidget(node)];
+					// No more regenerating children for
+					// this widget. If it needs to refresh,
+					// it'll do so along with the the whole
+					// importvariable tree.
+					if (widgetPointer != this) {
+						widgetPointer.makeChildWidgets = function(){};
+					}
 					widgetPointer = widgetPointer.children[0];
 				}
 				parseTreeNode = parseTreeNode.children && parseTreeNode.children[0];

core/modules/widgets/link.js

@@ -60,7 +60,8 @@ LinkWidget.prototype.renderLink = function(parent,nextSibling) {
 		tag = "a";
 	}
 	// Create our element
-	var domNode = this.document.createElement(tag);
+	var namespace = this.getVariable("namespace",{defaultValue: "http://www.w3.org/1999/xhtml"}),
+		domNode = this.document.createElementNS(namespace,tag);
 	// Assign classes
 	var classes = [];
 	if(this.overrideClasses === undefined) {
@@ -102,7 +103,8 @@ LinkWidget.prototype.renderLink = function(parent,nextSibling) {
 	// 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});
 	if(tag === "a") {
-		domNode.setAttribute("href",wikiLinkText);
+		var namespaceHref = (namespace === "http://www.w3.org/2000/svg") ? "http://www.w3.org/1999/xlink" : undefined;
+		domNode.setAttributeNS(namespaceHref,"href",wikiLinkText);
 	}
 	// Set the tabindex
 	if(this.tabIndex) {
@@ -156,7 +158,8 @@ LinkWidget.prototype.handleClickEvent = function(event) {
 		metaKey: event.metaKey,
 		ctrlKey: event.ctrlKey,
 		altKey: event.altKey,
-		shiftKey: event.shiftKey
+		shiftKey: event.shiftKey,
+		event: event
 	});
 	if(this.domNodes[0].hasAttribute("href")) {
 		event.preventDefault();

core/modules/widgets/linkcatcher.js

@@ -87,7 +87,8 @@ LinkCatcherWidget.prototype.handleNavigateEvent = function(event) {
 		}
 		if(this.catchActions) {
 			this.executingActions = true;
-			this.invokeActionString(this.catchActions,this,event,{navigateTo: event.navigateTo});
+			var modifierKey = $tw.keyboardManager.getEventModifierKeyDescriptor(event);
+			this.invokeActionString(this.catchActions,this,event,{navigateTo: event.navigateTo, modifier: modifierKey});
 			this.executingActions = false;
 		}
 	} else {

core/modules/widgets/macrocall.js

@@ -73,6 +73,8 @@ MacroCallWidget.prototype.execute = function() {
 			attributes: attributes,
 			children: parseTreeNodes
 		}];
+	} else if(this.renderOutput === "text/raw") {
+		parseTreeNodes = [{type: "text", text: text}];
 	} else {
 		// Otherwise, we'll render the text
 		var plainText = this.wiki.renderText("text/plain",this.parseType,text,{parentWidget: this});

core/modules/widgets/navigator.js

@@ -273,7 +273,9 @@ NavigatorWidget.prototype.makeDraftTiddler = function(targetTitle) {
 	var tiddler = this.wiki.getTiddler(targetTitle);
 	// Save the initial value of the draft tiddler
 	draftTitle = this.generateDraftTitle(targetTitle);
-	var draftTiddler = new $tw.Tiddler(
+	var draftTiddler = new $tw.Tiddler({
+				text: "",
+			},
 			tiddler,
 			{
 				title: draftTitle,
@@ -320,12 +322,11 @@ NavigatorWidget.prototype.handleSaveTiddlerEvent = function(event) {
 					"draft.title": undefined,
 					"draft.of": undefined
 				},this.wiki.getModificationFields());
-				newTiddler = $tw.hooks.invokeHook("th-saving-tiddler",newTiddler);
+				newTiddler = $tw.hooks.invokeHook("th-saving-tiddler",newTiddler,tiddler);
 				this.wiki.addTiddler(newTiddler);
 				// If enabled, relink references to renamed tiddler
 				var shouldRelink = this.getAttribute("relinkOnRename","no").toLowerCase().trim() === "yes";
 				if(isRename && shouldRelink && this.wiki.tiddlerExists(draftOf)) {
-console.log("Relinking '" + draftOf + "' to '" + draftTitle + "'");
 					this.wiki.relinkTiddler(draftOf,draftTitle);
 				}
 				// Remove the draft tiddler
@@ -494,10 +495,11 @@ NavigatorWidget.prototype.handleImportTiddlersEvent = function(event) {
 	} catch(e) {
 	}
 	// Get the current $:/Import tiddler
-	var importTiddler = this.wiki.getTiddler(IMPORT_TITLE),
-		importData = this.wiki.getTiddlerData(IMPORT_TITLE,{}),
+	var importTitle = event.importTitle ? event.importTitle : IMPORT_TITLE,
+		importTiddler = this.wiki.getTiddler(importTitle),
+		importData = this.wiki.getTiddlerData(importTitle,{}),
 		newFields = new Object({
-			title: IMPORT_TITLE,
+			title: importTitle,
 			type: "application/json",
 			"plugin-type": "import",
 			"status": "pending"
@@ -528,15 +530,16 @@ 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
-	if(this.getVariable("tv-auto-open-on-import") !== "no") {
+	var autoOpenOnImport = event.autoOpenOnImport ? event.autoOpenOnImport : this.getVariable("tv-auto-open-on-import");  
+	if(autoOpenOnImport !== "no") {
 		var storyList = this.getStoryList(),
 			history = [];
 		// Add it to the story
-		if(storyList && storyList.indexOf(IMPORT_TITLE) === -1) {
-			storyList.unshift(IMPORT_TITLE);
+		if(storyList && storyList.indexOf(importTitle) === -1) {
+			storyList.unshift(importTitle);
 		}
 		// And to history
-		history.push(IMPORT_TITLE);
+		history.push(importTitle);
 		// Save the updated story and history
 		this.saveStoryList(storyList);
 		this.addToHistory(history);
@@ -609,10 +612,13 @@ NavigatorWidget.prototype.handleUnfoldAllTiddlersEvent = function(event) {
 };
 
 NavigatorWidget.prototype.handleRenameTiddlerEvent = function(event) {
-	var paramObject = event.paramObject || {},
+	var options = {},
+		paramObject = event.paramObject || {},
 		from = paramObject.from || event.tiddlerTitle,
 		to = paramObject.to;
-	this.wiki.renameTiddler(from,to);
+	options.dontRenameInTags = (paramObject.renameInTags === "false" || paramObject.renameInTags === "no") ? true : false;
+	options.dontRenameInLists = (paramObject.renameInLists === "false" || paramObject.renameInLists === "no") ? true : false;
+	this.wiki.renameTiddler(from,to,options);
 };
 
 exports.navigator = NavigatorWidget;

core/modules/widgets/scrollable.js

@@ -66,7 +66,8 @@ ScrollableWidget.prototype.handleScrollEvent = function(event) {
 Scroll an element into view
 */
 ScrollableWidget.prototype.scrollIntoView = function(element) {
-	var duration = $tw.utils.getAnimationDuration();
+	var duration = $tw.utils.getAnimationDuration(),
+	srcWindow = element ? element.ownerDocument.defaultView : window;
 	this.cancelScroll();
 	this.startTime = Date.now();
 	var scrollPosition = {
@@ -122,7 +123,7 @@ ScrollableWidget.prototype.scrollIntoView = function(element) {
 			self.outerDomNode.scrollLeft = scrollPosition.x + (endX - scrollPosition.x) * t;
 			self.outerDomNode.scrollTop = scrollPosition.y + (endY - scrollPosition.y) * t;
 			if(t < 1) {
-				self.idRequestFrame = self.requestAnimationFrame.call(window,drawFrame);
+				self.idRequestFrame = self.requestAnimationFrame.call(srcWindow,drawFrame);
 			}
 		};
 		drawFrame();

core/modules/widgets/widget.js

@@ -421,6 +421,7 @@ Widget.prototype.addEventListener = function(type,handler) {
 Dispatch an event to a widget. If the widget doesn't handle the event then it is also dispatched to the parent widget
 */
 Widget.prototype.dispatchEvent = function(event) {
+	event.widget = event.widget || this;
 	// Dispatch the event if this widget handles it
 	var listener = this.eventListeners[event.type];
 	if(listener) {

core/modules/wiki.js

@@ -214,7 +214,7 @@ exports.isTemporaryTiddler = function(title) {
 exports.isImageTiddler = function(title) {
 	var tiddler = this.getTiddler(title);
 	if(tiddler) {		
-		var contentTypeInfo = $tw.config.contentTypeInfo[tiddler.fields.type || "text/vnd.tiddlywiki"];
+		var contentTypeInfo = $tw.utils.getContentTypeInfo(tiddler.fields.type || "text/vnd.tiddlywiki");
 		return !!contentTypeInfo && contentTypeInfo.flags.indexOf("image") !== -1;
 	} else {
 		return null;
@@ -224,7 +224,7 @@ exports.isImageTiddler = function(title) {
 exports.isBinaryTiddler = function(title) {
 	var tiddler = this.getTiddler(title);
 	if(tiddler) {		
-		var contentTypeInfo = $tw.config.contentTypeInfo[tiddler.fields.type || "text/vnd.tiddlywiki"];
+		var contentTypeInfo = $tw.utils.getContentTypeInfo(tiddler.fields.type || "text/vnd.tiddlywiki");
 		return !!contentTypeInfo && contentTypeInfo.encoding === "base64";
 	} else {
 		return null;
@@ -877,14 +877,17 @@ exports.initParsers = function(moduleType) {
 
 /*
 Parse a block of text of a specified MIME type
-	type: content type of text to be parsed
+	contentType: content type of text to be parsed
 	text: text
 	options: see below
 Options include:
 	parseAsInline: if true, the text of the tiddler will be parsed as an inline run
 	_canonical_uri: optional string of the canonical URI of this content
 */
-exports.parseText = function(type,text,options) {
+exports.parseText = function(contentType,text,options) {
+	// Parse the parameteter from the content type
+	var parsedContentType = $tw.utils.parseContentType(contentType),
+		type = parsedContentType[0];
 	text = text || "";
 	options = options || {};
 	// Select a parser
@@ -902,7 +905,9 @@ exports.parseText = function(type,text,options) {
 	return new Parser(type,text,{
 		parseAsInline: options.parseAsInline,
 		wiki: this,
-		_canonical_uri: options._canonical_uri
+		_canonical_uri: options._canonical_uri,
+		paramName: parsedContentType[1],
+		paramValue: parsedContentType[2]
 	});
 };
 
@@ -1052,7 +1057,7 @@ exports.makeTranscludeWidget = function(title,options) {
 	if(options.children) {
 		parseTreeTransclude.children = options.children;
 	}
-	return $tw.wiki.makeWidget(parseTreeDiv,options);
+	return this.makeWidget(parseTreeDiv,options);
 };
 
 /*
@@ -1181,7 +1186,7 @@ exports.search = function(text,options) {
 		if(!tiddler) {
 			tiddler = new $tw.Tiddler({title: title, text: "", type: "text/vnd.tiddlywiki"});
 		}
-		var contentTypeInfo = $tw.config.contentTypeInfo[tiddler.fields.type] || $tw.config.contentTypeInfo["text/vnd.tiddlywiki"],
+		var contentTypeInfo = $tw.utils.getContentTypeInfo(tiddler.fields.type) || $tw.utils.getContentTypeInfo("text/vnd.tiddlywiki"),
 			searchFields;
 		// Get the list of fields we're searching
 		if(options.excludeField) {
@@ -1335,7 +1340,7 @@ exports.readFile = function(file,options) {
 		}
 	}
 	// Figure out if we're reading a binary file
-	var contentTypeInfo = $tw.config.contentTypeInfo[type],
+	var contentTypeInfo = $tw.utils.getContentTypeInfo(type),
 		isBinary = contentTypeInfo ? contentTypeInfo.encoding === "base64" : false;
 	// Log some debugging information
 	if($tw.log.IMPORT) {
@@ -1503,5 +1508,30 @@ exports.doesPluginInfoRequireReload = function(pluginInfo) {
 	}
 };
 
+exports.slugify = function(title,options) {
+	var tiddler = this.getTiddler(title),
+		slug;
+	if(tiddler && tiddler.fields.slug) {
+		slug = tiddler.fields.slug;
+	} else {
+		slug = $tw.utils.transliterate(title.toString().toLowerCase()) // Replace diacritics with basic lowercase ASCII
+			.replace(/\s+/g,"-")                                       // Replace spaces with -
+			.replace(/[^\w\-\.]+/g,"")                                 // Remove all non-word chars except dash and dot
+			.replace(/\-\-+/g,"-")                                     // Replace multiple - with single -
+			.replace(/^-+/,"")                                         // Trim - from start of text
+			.replace(/-+$/,"");                                        // Trim - from end of text
+	}
+	// If the resulting slug is blank (eg because the title is just punctuation characters)
+	if(!slug) {
+		// ...then just use the character codes of the title
+		var result = [];
+		$tw.utils.each(title.split(""),function(char) {
+			result.push(char.charCodeAt(0).toString());
+		});
+		slug = result.join("-");
+	}
+	return slug;
+};
+
 })();
 

core/palettes/GruvBoxDark.tid

@@ -95,7 +95,7 @@ tag-foreground: #282828
 tiddler-background: <<colour background>>
 tiddler-border: <<colour background>>
 tiddler-controls-foreground-hover: #7c6f64
-tiddler-controls-foreground-selected: #7c6f64
+tiddler-controls-foreground-selected: <<colour primary>>
 tiddler-controls-foreground: #665c54
 tiddler-editor-background: #282828
 tiddler-editor-border-image: #282828
@@ -135,4 +135,4 @@ wikilist-button-remove: <<colour dirty-indicator>>
 wikilist-button-remove-hover: <<colour alert-background>>
 wikilist-droplink-dragover: <<colour dropzone-background>>
 wikilist-button-reveal: <<colour sidebar-tiddler-link-foreground-hover>>
-wikilist-button-reveal-hover: <<colour message-background>>
+wikilist-button-reveal-hover: <<colour message-background>>

core/palettes/SolarizedDark.tid

@@ -0,0 +1,112 @@
+title: $:/palettes/SolarizedDark
+tags: $:/tags/Palette
+type: application/x-tiddler-dictionary
+description: Precision dark colors for machines and people
+license: MIT, Ethan Schoonover, https://github.com/altercation/solarized/blob/master/LICENSE
+name: SolarizedDark
+
+alert-background: #073642
+alert-border: #93a1a1
+alert-highlight: #d33682
+alert-muted-foreground: #d33682
+background: #073642
+blockquote-bar: #d33682
+button-background: #073642
+button-border: #586e75
+button-foreground: #93a1a1
+code-background: #073642
+code-border: #586e75
+code-foreground: #93a1a1
+dirty-indicator: inherit
+download-background: #859900
+download-foreground: #073642
+dragger-background: #073642
+dragger-foreground: #839496
+dropdown-background: #073642
+dropdown-border: #93a1a1
+dropdown-tab-background: #002b36
+dropdown-tab-background-selected: #073642
+dropzone-background: #859900
+external-link-background: inherit
+external-link-background-hover: inherit
+external-link-background-visited: inherit
+external-link-foreground: #268bd2
+external-link-foreground-hover:
+external-link-foreground-visited: #268bd2
+foreground: #839496
+message-background: #002b36
+message-border: #586e75
+message-foreground: #839496
+modal-backdrop: #657b83
+modal-background: #002b36
+modal-border: #586e75
+modal-footer-background: #073642
+modal-footer-border: #586e75
+modal-header-border: #586e75
+muted-foreground: #93a1a1
+notification-background: #002b36
+notification-border: #586e75
+page-background: #073642
+pre-background: inherit
+pre-border: #657b83
+primary: #859900
+select-tag-background: #002b36
+select-tag-foreground: #839496
+sidebar-button-foreground: #93a1a1
+sidebar-controls-foreground: #93a1a1
+sidebar-controls-foreground-hover: #eee8d5
+sidebar-foreground: #93a1a1
+sidebar-foreground-shadow: transparent
+sidebar-muted-foreground: #839496
+sidebar-muted-foreground-hover: #93a1a1
+sidebar-tab-background: #002b36
+sidebar-tab-background-selected: #073642
+sidebar-tab-border: #073642
+sidebar-tab-border-selected: #839496
+sidebar-tab-divider: #002b36
+sidebar-tab-foreground: #657b83
+sidebar-tab-foreground-selected: #93a1a1
+sidebar-tiddler-link-foreground: #2aa198
+sidebar-tiddler-link-foreground-hover: #eee8d5
+site-title-foreground: #d33682
+static-alert-foreground: #93a1a1
+tab-background: #073642
+tab-background-selected: #002b36
+tab-border: #586e75
+tab-border-selected: #93a1a1
+tab-divider: #93a1a1
+tab-foreground: #839496
+tab-foreground-selected: #93a1a1
+table-border: #586e75
+table-footer-background: #073642
+table-header-background: #073642
+tag-background: #b58900
+tag-foreground: #002b36
+tiddler-background: #002b36
+tiddler-border: #586e75
+tiddler-controls-foreground: inherit
+tiddler-controls-foreground-hover: #d33682
+tiddler-controls-foreground-selected: #2aa198
+tiddler-editor-background: #002b36
+tiddler-editor-border: #073642
+tiddler-editor-border-image: #002b36
+tiddler-editor-fields-even: #002b36
+tiddler-editor-fields-odd: #073642
+tiddler-info-background: #073642
+tiddler-info-border: #657b83
+tiddler-info-tab-background: #002b36
+tiddler-link-background: #002b36
+tiddler-link-foreground: #2aa198
+tiddler-subtitle-foreground: #839496
+tiddler-title-foreground: #d33682
+toolbar-cancel-button: #839496
+toolbar-close-button: #839496
+toolbar-delete-button: #dc322f
+toolbar-done-button: #839496
+toolbar-edit-button: #839496
+toolbar-info-button: #839496
+toolbar-new-button: #839496
+toolbar-options-button: #839496
+toolbar-save-button: inherit
+untagged-background: #586e75
+very-muted-foreground: #586e75

core/palettes/SolarizedLight.tid

@@ -6,115 +6,107 @@ license: MIT, Ethan Schoonover, https://github.com/altercation/solarized/blob/ma
 name: SolarizedLight
 
 alert-background: #eee8d5
-alert-border: #073642
-alert-highlight: #cb4b16
-alert-muted-foreground: #586e75
-background: #fdf6e3
-blockquote-bar: <<colour muted-foreground>>
-button-background: #cb4b16
-button-foreground: #fdf6e3
-button-border: transparent
+alert-border: #586e75
+alert-highlight: #d33682
+alert-muted-foreground: #d33682
+background: #eee8d5
+blockquote-bar: #d33682
+button-background: #eee8d5
+button-border: #93a1a1
+button-foreground: #586e75
 code-background: #eee8d5
 code-border: #93a1a1
-code-foreground: #d33682
-diff-delete-background: #BF616A
-diff-delete-foreground: <<colour foreground>>
-diff-equal-background: 
-diff-equal-foreground: <<colour foreground>>
-diff-insert-background: #859900
-diff-insert-foreground: <<colour foreground>>
-diff-invisible-background: 
-diff-invisible-foreground: <<colour muted-foreground>>
-dirty-indicator: #D08770
+code-foreground: #586e75
+dirty-indicator: inherit
 download-background: #859900
-download-foreground: <<colour background>>
-dragger-background: <<colour foreground>>
-dragger-foreground: <<colour background>>
-dropdown-background: <<colour background>>
-dropdown-border: <<colour background>>
-dropdown-tab-background-selected: #fdf6e3
-dropdown-tab-background: #93a1a1
+download-foreground: #eee8d5
+dragger-background: #eee8d5
+dragger-foreground: #657b83
+dropdown-background: #eee8d5
+dropdown-border: #586e75
+dropdown-tab-background: #fdf6e3
+dropdown-tab-background-selected: #eee8d5
 dropzone-background: #859900
+external-link-background: inherit
 external-link-background-hover: inherit
 external-link-background-visited: inherit
-external-link-background: inherit
-external-link-foreground-hover: #d33682
-external-link-foreground-visited: #b58900
-external-link-foreground: #cb4b16
-foreground: #839496
-message-background: #586e75
-message-border: #586e75
-message-foreground: #eee8d5
-modal-backdrop: <<colour foreground>>
-modal-background: <<colour background>>
-modal-border: #eee8d5
+external-link-foreground: #268bd2
+external-link-foreground-hover: inherit
+external-link-foreground-visited: #268bd2
+foreground: #657b83
+message-background: #fdf6e3
+message-border: #93a1a1
+message-foreground: #657b83
+modal-backdrop: #839496
+modal-background: #fdf6e3
+modal-border: #93a1a1
 modal-footer-background: #eee8d5
-modal-footer-border: #eee8d5
-modal-header-border: #eee8d5
-muted-foreground: #93a1a1
-notification-background: #EBCB8B
-notification-border: #D08770
+modal-footer-border: #93a1a1
+modal-header-border: #93a1a1
+muted-foreground: #586e75
+notification-background: #fdf6e3
+notification-border: #93a1a1
 page-background: #eee8d5
 pre-background: #eee8d5
-pre-border: #93a1a1
-primary: #2aa198
-select-tag-background: #eee8d5
-select-tag-foreground: <<colour foreground>>
-sidebar-button-foreground: #eee8d5
-sidebar-controls-foreground-hover: #268bd2
+pre-border: #839496
+primary: #859900
+select-tag-background: #fdf6e3
+select-tag-foreground: #657b83
+sidebar-button-foreground: #586e75
 sidebar-controls-foreground: #586e75
+sidebar-controls-foreground-hover: #d33682
+sidebar-foreground: #586e75
 sidebar-foreground-shadow: transparent
-sidebar-foreground: #839496
-sidebar-muted-foreground-hover: #657b83
-sidebar-muted-foreground: #93a1a1
+sidebar-muted-foreground: #657b83
+sidebar-muted-foreground-hover: #586e75
+sidebar-tab-background: #fdf6e3
 sidebar-tab-background-selected: #eee8d5
-sidebar-tab-background: #839496
-sidebar-tab-border-selected: <<colour tab-border-selected>>
-sidebar-tab-border: #657b83
-sidebar-tab-divider: <<colour page-background>>
-sidebar-tab-foreground-selected: #839496
-sidebar-tab-foreground: <<colour tab-foreground>>
-sidebar-tiddler-link-foreground-hover: #859900
-sidebar-tiddler-link-foreground: #268bd2
-site-title-foreground: <<colour tiddler-title-foreground>>
-static-alert-foreground: #dc322f
+sidebar-tab-border: #eee8d5
+sidebar-tab-border-selected: #657b83
+sidebar-tab-divider: #fdf6e3
+sidebar-tab-foreground: #839496
+sidebar-tab-foreground-selected: #586e75
+sidebar-tiddler-link-foreground: #2aa198
+sidebar-tiddler-link-foreground-hover: #002b36
+site-title-foreground: #d33682
+static-alert-foreground: #586e75
+tab-background: #eee8d5
 tab-background-selected: #fdf6e3
-tab-background: #839496
-tab-border-selected: #93a1a1
 tab-border: #93a1a1
-tab-divider: #fdf6e3
-tab-foreground-selected: #839496
-tab-foreground: #eee8d5
-table-border: #657b83
-table-footer-background: #657b83
-table-header-background: #93a1a1
-tag-background: #6c71c4
-tag-foreground: #eee8d5
-tiddler-background: <<colour background>>
-tiddler-border: <<colour background>>
-tiddler-controls-foreground-hover: #b58900
-tiddler-controls-foreground-selected: #b58900
-tiddler-controls-foreground: #073642
-tiddler-editor-background: #eee8d5
-tiddler-editor-border-image: #eee8d5
+tab-border-selected: #586e75
+tab-divider: #586e75
+tab-foreground: #657b83
+tab-foreground-selected: #586e75
+table-border: #93a1a1
+table-footer-background: #eee8d5
+table-header-background: #eee8d5
+tag-background: #b58900
+tag-foreground: #fdf6e3
+tiddler-background: #fdf6e3
+tiddler-border: #93a1a1
+tiddler-controls-foreground: inherit
+tiddler-controls-foreground-hover: #d33682
+tiddler-controls-foreground-selected: #2aa198
+tiddler-editor-background: #fdf6e3
 tiddler-editor-border: #eee8d5
-tiddler-editor-fields-even: #eee8d5
-tiddler-editor-fields-odd: #fdf6e3
+tiddler-editor-border-image: #fdf6e3
+tiddler-editor-fields-even: #fdf6e3
+tiddler-editor-fields-odd: #eee8d5
 tiddler-info-background: #eee8d5
-tiddler-info-border: #eee8d5
-tiddler-info-tab-background: #586e75
-tiddler-link-background: <<colour background>>
-tiddler-link-foreground: <<colour primary>>
-tiddler-subtitle-foreground: #586e75
-tiddler-title-foreground: #073642
-toolbar-new-button: 
-toolbar-options-button: 
-toolbar-save-button: 
-toolbar-info-button: 
-toolbar-edit-button: 
-toolbar-close-button: 
-toolbar-delete-button: 
-toolbar-cancel-button: 
-toolbar-done-button: 
-untagged-background: #839496
+tiddler-info-border: #839496
+tiddler-info-tab-background: #fdf6e3
+tiddler-link-background: #fdf6e3
+tiddler-link-foreground: #2aa198
+tiddler-subtitle-foreground: #657b83
+tiddler-title-foreground: #d33682
+toolbar-cancel-button: #657b83
+toolbar-close-button: #657b83
+toolbar-delete-button: #dc322f
+toolbar-done-button: #657b83
+toolbar-edit-button: #657b83
+toolbar-info-button: #657b83
+toolbar-new-button: #657b83
+toolbar-options-button: #657b83
+toolbar-save-button: inherit
+untagged-background: #586e75
 very-muted-foreground: #93a1a1

core/palettes/Vanilla.tid

@@ -57,6 +57,8 @@ page-background: #f4f4f4
 pre-background: #f5f5f5
 pre-border: #cccccc
 primary: #5778d8
+selection-background:
+selection-foreground:
 select-tag-background:
 select-tag-foreground:
 sidebar-button-foreground: <<colour foreground>>

core/templates/exporters/CsvFile.tid

@@ -3,7 +3,4 @@ tags: $:/tags/Exporter
 description: {{$:/language/Exporters/CsvFile}}
 extension: .csv
 
-\define renderContent()
-<$text text=<<csvtiddlers filter:"""$(exportFilter)$""" format:"quoted-comma-sep">>/>
-\end
-<<renderContent>>
+<$macrocall $name="csvtiddlers" filter=<<exportFilter>> format="quoted-comma-sep" $output="text/raw"/>

core/templates/exporters/JsonFile.tid

@@ -3,7 +3,4 @@ tags: $:/tags/Exporter
 description: {{$:/language/Exporters/JsonFile}}
 extension: .json
 
-\define renderContent()
-<$text text=<<jsontiddlers filter:"""$(exportFilter)$""">>/>
-\end
-<<renderContent>>
+<$macrocall $name="jsontiddlers" filter=<<exportFilter>> $output="text/raw"/>

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

@@ -2,8 +2,4 @@ title: $:/core/templates/tiddlywiki5.js/tiddlers
 
 `
 $tw.preloadTiddlerArray(`<$text text=<<jsontiddlers "[[$:/core]]">>/>`);
-$tw.preloadTiddlerArray([{
-	title: "$:/config/SaveWikiButton/Template",
-	text: "$:/core/save/all-external-js"
-}]);
 `

core/templates/single.tiddler.window.tid

@@ -6,17 +6,13 @@ tc-page-container tc-page-view-$(storyviewTitle)$ tc-language-$(languageTitle)$
 \end
 \import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
 
-<$set name="tv-config-toolbar-icons" value={{$:/config/Toolbar/Icons}}>
-
-<$set name="tv-config-toolbar-text" value={{$:/config/Toolbar/Text}}>
-
-<$set name="tv-config-toolbar-class" value={{$:/config/Toolbar/ButtonClass}}>
-
-<$set name="tv-show-missing-links" value={{$:/config/MissingLinks}}>
-
-<$set name="storyviewTitle" value={{$:/view}}>
-
-<$set name="languageTitle" value={{{ [{$:/language}get[name]] }}}>
+<$vars
+	tv-config-toolbar-icons={{$:/config/Toolbar/Icons}}
+	tv-config-toolbar-text={{$:/config/Toolbar/Text}}
+	tv-config-toolbar-class={{$:/config/Toolbar/ButtonClass}}
+	tv-show-missing-links={{$:/config/MissingLinks}}
+	storyviewTitle={{$:/view}}
+	languageTitle={{{ [{$:/language}get[name]] }}}>
 
 <div class=<<containerClasses>>>
 
@@ -28,14 +24,4 @@ tc-page-container tc-page-view-$(storyviewTitle)$ tc-language-$(languageTitle)$
 
 </div>
 
-</$set>
-
-</$set>
-
-</$set>
-
-</$set>
-
-</$set>
-
-</$set>
+</$vars>

core/ui/Actions/new-image.tid

@@ -6,5 +6,5 @@ description: create a new image tiddler
 image/$(imageType)$
 \end
 <$vars imageType={{$:/config/NewImageType}}>
-<$action-sendmessage $message="tm-new-tiddler" type=<<get-type>> tags={{$:/config/NewTiddler/Tags!!tags}}/>
+<$action-sendmessage $message="tm-new-tiddler" type=<<get-type>> tags={{$:/config/NewTiddler/Tags}}/>
 </$vars>

core/ui/Actions/new-journal.tid

@@ -2,7 +2,7 @@ title: $:/core/ui/Actions/new-journal
 tags: $:/tags/Actions
 description: create a new journal tiddler
 
-<$vars journalTitleTemplate={{$:/config/NewJournal/Title}} journalTags={{$:/config/NewJournal/Tags!!tags}} journalText={{$:/config/NewJournal/Text}}>
+<$vars journalTitleTemplate={{$:/config/NewJournal/Title}} journalTags={{$:/config/NewJournal/Tags}} journalText={{$:/config/NewJournal/Text}}>
 <$wikify name="journalTitle" text="""<$macrocall $name="now" format=<<journalTitleTemplate>>/>""">
 <$reveal type="nomatch" state=<<journalTitle>> text="">
 <$action-sendmessage $message="tm-new-tiddler" title=<<journalTitle>> tags=<<journalTags>> text={{{ [<journalTitle>get[]] }}}/>

core/ui/Actions/new-tiddler.tid

@@ -2,4 +2,4 @@ title: $:/core/ui/Actions/new-tiddler
 tags: $:/tags/Actions
 description: create a new empty tiddler
 
-<$action-sendmessage $message="tm-new-tiddler" tags={{$:/config/NewTiddler/Tags!!tags}}/>
+<$action-sendmessage $message="tm-new-tiddler" tags={{$:/config/NewTiddler/Tags}}/>

core/ui/ControlPanel/Basics.tid

@@ -23,8 +23,8 @@ caption: {{$:/language/ControlPanel/Basics/Caption}}
 |<$link to="$:/language/DefaultNewTiddlerTitle"><<lingo NewTiddler/Title/Prompt>></$link> |<$edit-text tiddler="$:/language/DefaultNewTiddlerTitle" default="" tag="input"/> |
 |<$link to="$:/config/NewJournal/Title"><<lingo NewJournal/Title/Prompt>></$link> |<$edit-text tiddler="$:/config/NewJournal/Title" default="" tag="input"/> |
 |<$link to="$:/config/NewJournal/Text"><<lingo NewJournal/Text/Prompt>></$link> |<$edit tiddler="$:/config/NewJournal/Text" tag="textarea" class="tc-edit-texteditor" default=""/> |
-|<$link to="$:/config/NewTiddler/Tags"><<lingo NewTiddler/Tags/Prompt>></$link> |<$list filter="[[$:/config/NewTiddler/Tags]]" template="$:/core/ui/EditTemplate/tags"/> |
-|<$link to="$:/config/NewJournal/Tags"><<lingo NewJournal/Tags/Prompt>></$link> |<$list filter="[[$:/config/NewJournal/Tags]]" template="$:/core/ui/EditTemplate/tags"/> |
+|<$link to="$:/config/NewTiddler/Tags"><<lingo NewTiddler/Tags/Prompt>></$link> |<$edit-text tiddler="$:/config/NewTiddler/Tags" tag="input" default=""/> |
+|<$link to="$:/config/NewJournal/Tags"><<lingo NewJournal/Tags/Prompt>></$link> |<$edit-text tiddler="$:/config/NewJournal/Tags" tag="input" default=""/> |
 |<$link to="$:/config/AutoFocus"><<lingo AutoFocus/Prompt>></$link> |{{$:/snippets/minifocusswitcher}} |
 |<<lingo Language/Prompt>> |{{$:/snippets/minilanguageswitcher}} |
 |<<lingo Tiddlers/Prompt>> |<<show-filter-count "[!is[system]sort[title]]">> |

core/ui/ControlPanel/Modals/AddPlugins.tid

@@ -118,10 +118,12 @@ $:/state/add-plugin-info/$(connectionTiddler)$/$(assetInfo)$
 \end
 
 \define load-plugin-library-button()
+<$list filter="[<currentTiddler>get[enabled]else[yes]match[yes]]" variable="ignore">
 <$button class="tc-btn-big-green">
 <$action-sendmessage $message="tm-load-plugin-library" url={{!!url}} infoTitlePrefix="$:/temp/RemoteAssetInfo/"/>
 {{$:/core/images/chevron-right}} {{$:/language/ControlPanel/Plugins/OpenPluginLibrary}}
 </$button>
+</$list>
 \end
 
 \define display-server-assets(type)

core/ui/ControlPanel/Saving/TiddlySpot.tid

@@ -4,14 +4,14 @@ caption: {{$:/language/ControlPanel/Saving/TiddlySpot/Caption}}
 
 \define lingo-base() $:/language/ControlPanel/Saving/TiddlySpot/
 
-\define backupURL()
-http://$(userName)$.tiddlyspot.com/backup/
+\define siteURL(path)
+http://$(userName)$.tiddlyspot.com/$path$/
 \end
-\define backupLink()
+\define siteLink(path)
 <$reveal type="nomatch" state="$:/UploadName" text="">
 <$set name="userName" value={{$:/UploadName}}>
 <$reveal type="match" state="$:/UploadURL" text="">
-<<backupURL>>
+<<siteURL $path$>>
 </$reveal>
 <$reveal type="nomatch" state="$:/UploadURL" text="">
 <$macrocall $name=resolvePath source={{$:/UploadBackupDir}} root={{$:/UploadURL}}>>
@@ -24,7 +24,8 @@ http://$(userName)$.tiddlyspot.com/backup/
 
 |<<lingo UserName>> |<$edit-text tiddler="$:/UploadName" default="" tag="input"/> |
 |<<lingo Password>> |<$password name="upload"/> |
-|<<lingo Backups>> |<<backupLink>> |
+|<<lingo Backups>> |<<siteLink backup>> |
+|<<lingo ControlPanel>> |<<siteLink controlpanel>> |
 
 ''<<lingo Advanced/Heading>>''
 

core/ui/DefaultSearchResultList.tid

@@ -5,11 +5,19 @@ caption: {{$:/language/Search/DefaultResults/Caption}}
 \define searchResultList()
 //<small>{{$:/language/Search/Matches/Title}}</small>//
 
-<$list filter="[!is[system]search:title{$(searchTiddler)$}sort[title]limit[250]]" template="$:/core/ui/ListItemTemplate"/>
+<$list filter="[!is[system]search:title{$(searchTiddler)$}sort[title]limit[250]]">
+<span class={{{[<currentTiddler>addsuffix[-primaryList]] -[<searchListState>get[text]] +[then[]else[tc-list-item-selected]] }}}>
+<$transclude tiddler="$:/core/ui/ListItemTemplate"/>
+</span>
+</$list>
 
 //<small>{{$:/language/Search/Matches/All}}</small>//
 
-<$list filter="[!is[system]search{$(searchTiddler)$}sort[title]limit[250]]" template="$:/core/ui/ListItemTemplate"/>
+<$list filter="[!is[system]search{$(searchTiddler)$}sort[title]limit[250]]">
+<span class={{{[<currentTiddler>addsuffix[-secondaryList]] -[<searchListState>get[text]] +[then[]else[tc-list-item-selected]] }}}>
+<$transclude tiddler="$:/core/ui/ListItemTemplate"/>
+</span>
+</$list>
 
 \end
 <<searchResultList>>

core/ui/EditTemplate/body-editor.tid

@@ -7,6 +7,7 @@ title: $:/core/ui/EditTemplate/body/editor
   placeholder={{$:/language/EditTemplate/Body/Placeholder}}
   tabindex={{$:/config/EditTabIndex}}
   focus={{{ [{$:/config/AutoFocus}match[text]then[true]] ~[[false]] }}}
+  cancelPopups="yes"
 
 ><$set
 

core/ui/EditTemplate/body.tid

@@ -13,7 +13,7 @@ $:/config/EditorToolbarButtons/Visibility/$(currentTiddler)$
 
 <a href={{!!_canonical_uri}}><$text text={{!!_canonical_uri}}/></a>
 
-<$edit-text field="_canonical_uri" class="tc-edit-fields" tabindex={{$:/config/EditTabIndex}}></$edit-text>
+<$edit-text field="_canonical_uri" class="tc-edit-fields" tabindex={{$:/config/EditTabIndex}} cancelPopups="yes"></$edit-text>
 
 </div>
 

core/ui/EditTemplate/fields.tid

@@ -11,7 +11,7 @@ $:/config/EditTemplateFields/Visibility/$(currentField)$
 \end
 
 \define current-tiddler-new-field-selector()
-[data-tiddler-title="$(currentTiddlerCSSescaped)$"] .tc-edit-field-add-name input
+[data-tiddler-title="$(currentTiddlerCSSescaped)$"] .tc-edit-field-add-name-wrapper input
 \end
 
 \define new-field-actions()
@@ -51,7 +51,7 @@ $value={{{ [<newFieldValueTiddler>get[text]] }}}/>
 <td class="tc-edit-field-name">
 <$text text=<<currentField>>/>:</td>
 <td class="tc-edit-field-value">
-<$edit-text tiddler=<<currentTiddler>> field=<<currentField>> placeholder={{$:/language/EditTemplate/Fields/Add/Value/Placeholder}} tabindex={{$:/config/EditTabIndex}}/>
+<$edit-text tiddler=<<currentTiddler>> field=<<currentField>> placeholder={{$:/language/EditTemplate/Fields/Add/Value/Placeholder}} tabindex={{$:/config/EditTabIndex}} cancelPopups="yes"/>
 </td>
 <td class="tc-edit-field-remove">
 <$button class="tc-btn-invisible" tooltip={{$:/language/EditTemplate/Field/Remove/Hint}} aria-label={{$:/language/EditTemplate/Field/Remove/Caption}}>
@@ -71,9 +71,9 @@ $value={{{ [<newFieldValueTiddler>get[text]] }}}/>
 <em class="tc-edit">
 <<lingo Fields/Add/Prompt>>&nbsp;&nbsp;
 </em>
-<span class="tc-edit-field-add-name">
-<$edit-text tiddler=<<newFieldNameTiddler>> tag="input" default="" placeholder={{$:/language/EditTemplate/Fields/Add/Name/Placeholder}} focusPopup=<<qualify "$:/state/popup/field-dropdown">> class="tc-edit-texteditor tc-popup-handle" tabindex={{$:/config/EditTabIndex}} focus={{{ [{$:/config/AutoFocus}match[fields]then[true]] ~[[false]] }}}/>
-</span>&nbsp;
+<div class="tc-edit-field-add-name-wrapper">
+<$edit-text tiddler=<<newFieldNameTiddler>> tag="input" default="" placeholder={{$:/language/EditTemplate/Fields/Add/Name/Placeholder}} focusPopup=<<qualify "$:/state/popup/field-dropdown">> class="tc-edit-texteditor tc-popup-handle" tabindex={{$:/config/EditTabIndex}} focus={{{ [{$:/config/AutoFocus}match[fields]then[true]] ~[[false]] }}} cancelPopups="yes"/>
+&nbsp;
 <$button popup=<<qualify "$:/state/popup/field-dropdown">> class="tc-btn-invisible tc-btn-dropdown" tooltip={{$:/language/EditTemplate/Field/Dropdown/Hint}} aria-label={{$:/language/EditTemplate/Field/Dropdown/Caption}}>{{$:/core/images/down-arrow}}</$button>&nbsp;
 <$reveal state=<<qualify "$:/state/popup/field-dropdown">> type="nomatch" text="" default="">
 <div class="tc-block-dropdown tc-edit-type-dropdown">
@@ -101,10 +101,11 @@ $value={{{ [<newFieldValueTiddler>get[text]] }}}/>
 </$set>
 </div>
 </$reveal>
+</div>
 <span class="tc-edit-field-add-value">
 <$set name="currentTiddlerCSSescaped" value={{{ [<currentTiddler>escapecss[]] }}}>
 <$keyboard key="((add-field))" actions=<<new-field-actions>>>
-<$edit-text tiddler=<<newFieldValueTiddler>> tag="input" default="" placeholder={{$:/language/EditTemplate/Fields/Add/Value/Placeholder}} class="tc-edit-texteditor" tabindex={{$:/config/EditTabIndex}}/>
+<$edit-text tiddler=<<newFieldValueTiddler>> tag="input" default="" placeholder={{$:/language/EditTemplate/Fields/Add/Value/Placeholder}} class="tc-edit-texteditor" tabindex={{$:/config/EditTabIndex}} cancelPopups="yes"/>
 </$keyboard>
 </$set>
 </span>&nbsp;

core/ui/EditTemplate/tags.tid

@@ -30,8 +30,8 @@ color:$(foregroundColor)$;
 <$list filter="[all[current]tags[]sort[title]]" storyview="pop">
 <$macrocall $name="tag-body" colour={{!!color}} palette={{$:/palette}} icon={{!!icon}}/>
 </$list>
-<$set name="tabIndex" value={{$:/config/EditTabIndex}}>
+<$vars tabIndex={{$:/config/EditTabIndex}} cancelPopups="yes">
 <$macrocall $name="tag-picker"/>
-</$set>
+</$vars>
 </$fieldmangler>
 </div>

core/ui/EditTemplate/title.tid

@@ -1,7 +1,7 @@
 title: $:/core/ui/EditTemplate/title
 tags: $:/tags/EditTemplate
 
-<$edit-text field="draft.title" class="tc-titlebar tc-edit-texteditor" focus={{{ [{$:/config/AutoFocus}match[title]then[true]] ~[[false]] }}} tabindex={{$:/config/EditTabIndex}}/>
+<$edit-text field="draft.title" class="tc-titlebar tc-edit-texteditor" focus={{{ [{$:/config/AutoFocus}match[title]then[true]] ~[[false]] }}} tabindex={{$:/config/EditTabIndex}} cancelPopups="yes"/>
 
 <$vars pattern="""[\|\[\]{}]""" bad-chars="""`| [ ] { }`""">
 

core/ui/EditTemplate/type.tid

@@ -3,8 +3,11 @@ tags: $:/tags/EditTemplate
 
 \define lingo-base() $:/language/EditTemplate/
 \whitespace trim
+<div class="tc-edit-type-selector-wrapper">
+<em class="tc-edit"><<lingo Type/Prompt>></em>&nbsp;&nbsp;
+<div class="tc-type-selector-dropdown-wrapper">
 <div class="tc-type-selector"><$fieldmangler>
-<em class="tc-edit"><<lingo Type/Prompt>></em>&nbsp;&nbsp;<$edit-text field="type" tag="input" default="" placeholder={{$:/language/EditTemplate/Type/Placeholder}} focusPopup=<<qualify "$:/state/popup/type-dropdown">> class="tc-edit-typeeditor tc-edit-texteditor tc-popup-handle" tabindex={{$:/config/EditTabIndex}} focus={{{ [{$:/config/AutoFocus}match[type]then[true]] ~[[false]] }}}/>&nbsp;<$button popup=<<qualify "$:/state/popup/type-dropdown">> class="tc-btn-invisible tc-btn-dropdown" tooltip={{$:/language/EditTemplate/Type/Dropdown/Hint}} aria-label={{$:/language/EditTemplate/Type/Dropdown/Caption}}>{{$:/core/images/down-arrow}}</$button>&nbsp;<$button message="tm-remove-field" param="type" class="tc-btn-invisible tc-btn-icon" tooltip={{$:/language/EditTemplate/Type/Delete/Hint}} aria-label={{$:/language/EditTemplate/Type/Delete/Caption}}>{{$:/core/images/delete-button}}</$button>
+<$edit-text field="type" tag="input" default="" placeholder={{$:/language/EditTemplate/Type/Placeholder}} focusPopup=<<qualify "$:/state/popup/type-dropdown">> class="tc-edit-typeeditor tc-edit-texteditor tc-popup-handle" tabindex={{$:/config/EditTabIndex}} focus={{{ [{$:/config/AutoFocus}match[type]then[true]] ~[[false]] }}} cancelPopups="yes"/>&nbsp;<$button popup=<<qualify "$:/state/popup/type-dropdown">> class="tc-btn-invisible tc-btn-dropdown" tooltip={{$:/language/EditTemplate/Type/Dropdown/Hint}} aria-label={{$:/language/EditTemplate/Type/Dropdown/Caption}}>{{$:/core/images/down-arrow}}</$button>&nbsp;<$button message="tm-remove-field" param="type" class="tc-btn-invisible tc-btn-icon" tooltip={{$:/language/EditTemplate/Type/Delete/Hint}} aria-label={{$:/language/EditTemplate/Type/Delete/Caption}}>{{$:/core/images/delete-button}}</$button>
 </$fieldmangler></div>
 
 <div class="tc-block-dropdown-wrapper">
@@ -24,3 +27,5 @@ tags: $:/tags/EditTemplate
 </$reveal>
 </$set>
 </div>
+</div>
+</div>

core/ui/ImportListing.tid

@@ -41,13 +41,13 @@ $(currentTiddler)$!!popup-$(payloadTiddler)$
 <$checkbox field=<<selectionField>> checked="checked" unchecked="unchecked" default="checked"/>
 </td>
 <td>
-<$reveal type="nomatch" stateTitle=<<previewPopupState>> text="yes" tag="div">
-<$button class="tc-btn-invisible tc-btn-dropdown" setTitle=<<previewPopupState>> setTo="yes">
+<$reveal type="nomatch" state=<<previewPopupState>> text="yes" tag="div">
+<$button class="tc-btn-invisible tc-btn-dropdown" set=<<previewPopupState>> setTo="yes">
 {{$:/core/images/right-arrow}}&nbsp;<$text text=<<payloadTiddler>>/>
 </$button>
 </$reveal>
-<$reveal type="match" stateTitle=<<previewPopupState>> text="yes" tag="div">
-<$button class="tc-btn-invisible tc-btn-dropdown" setTitle=<<previewPopupState>> setTo="no">
+<$reveal type="match" state=<<previewPopupState>> text="yes" tag="div">
+<$button class="tc-btn-invisible tc-btn-dropdown" set=<<previewPopupState>> setTo="no">
 {{$:/core/images/down-arrow}}&nbsp;<$text text=<<payloadTiddler>>/>
 </$button>
 </$reveal>
@@ -58,7 +58,7 @@ $(currentTiddler)$!!popup-$(payloadTiddler)$
 </tr>
 <tr>
 <td colspan="3">
-<$reveal type="match" text="yes" stateTitle=<<previewPopupState>> tag="div">
+<$reveal type="match" text="yes" state=<<previewPopupState>> tag="div">
 <$list filter="[{$:/state/importpreviewtype}has[text]]" variable="listItem" emptyMessage={{$:/core/ui/ImportPreviews/Text}}>
 <$transclude tiddler={{$:/state/importpreviewtype}}/>
 </$list>

core/ui/Manager/ItemSidebarTags.tid

@@ -11,11 +11,6 @@ caption: {{$:/language/Manager/Item/Tags}}
 
 \define tag-picker-actions()
 <<tag-checkbox-actions>>
-<$action-listops
-	$tiddler=<<currentTiddler>>
-	$field="tags"
-	$subfilter="[<tag>] [all[current]tags[]]"
-/>
 \end
 
 <p>
@@ -28,5 +23,7 @@ caption: {{$:/language/Manager/Item/Tags}}
 </$list>
 </p>
 <p>
+<$fieldmangler>
 <$macrocall $name="tag-picker" actions=<<tag-picker-actions>>/>
+</$fieldmangler>
 </p>

core/ui/PageTemplate.tid

@@ -6,19 +6,14 @@ tc-page-container tc-page-view-$(storyviewTitle)$ tc-language-$(languageTitle)$
 \end
 \import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
 
-<$set name="tv-config-toolbar-icons" value={{$:/config/Toolbar/Icons}}>
-
-<$set name="tv-config-toolbar-text" value={{$:/config/Toolbar/Text}}>
-
-<$set name="tv-config-toolbar-class" value={{$:/config/Toolbar/ButtonClass}}>
-
-<$set name="tv-enable-drag-and-drop" value={{$:/config/DragAndDrop/Enable}}>
-
-<$set name="tv-show-missing-links" value={{$:/config/MissingLinks}}>
-
-<$set name="storyviewTitle" value={{$:/view}}>
-
-<$set name="languageTitle" value={{{ [{$:/language}get[name]] }}}>
+<$vars
+	tv-config-toolbar-icons={{$:/config/Toolbar/Icons}}
+	tv-config-toolbar-text={{$:/config/Toolbar/Text}}
+	tv-config-toolbar-class={{$:/config/Toolbar/ButtonClass}}
+	tv-enable-drag-and-drop={{$:/config/DragAndDrop/Enable}}
+	tv-show-missing-links={{$:/config/MissingLinks}}
+	storyviewTitle={{$:/view}}
+	languageTitle={{{ [{$:/language}get[name]] }}}>
 
 <div class=<<containerClasses>>>
 
@@ -38,16 +33,4 @@ tc-page-container tc-page-view-$(storyviewTitle)$ tc-language-$(languageTitle)$
 
 </div>
 
-</$set>
-
-</$set>
-
-</$set>
-
-</$set>
-
-</$set>
-
-</$set>
-
-</$set>
+</$vars>

core/ui/PaletteManager.tid

@@ -46,7 +46,7 @@ title: $:/PaletteManager
 <tr>
 <td>
 <span style="float:right;">
-<$button tooltip=<<lingo Delete/Hint>> aria-label=<<lingo Delete/Hint>> class="tc-btn-invisible" actions=<<delete-colour-index-actions>>>
+<$button tooltip={{$:/language/ControlPanel/Palette/Editor/Delete/Hint}} aria-label=<<lingo Delete/Hint>> class="tc-btn-invisible" actions=<<delete-colour-index-actions>>>
 {{$:/core/images/delete-button}}</$button>
 </span>
 ''<$macrocall $name="describePaletteColour" colour=<<colourName>>/>''<br/>

core/ui/SideBarSegments/search.tid

@@ -2,25 +2,12 @@ title: $:/core/ui/SideBarSegments/search
 tags: $:/tags/SideBarSegment
 
 \whitespace trim
-<div class="tc-sidebar-lists tc-sidebar-search">
 
-<$set name="searchTiddler" value="$:/temp/search">
-<div class="tc-search">
-<$edit-text tiddler="$:/temp/search" type="search" tag="input" focus={{$:/config/Search/AutoFocus}} focusPopup=<<qualify "$:/state/popup/search-dropdown">> class="tc-popup-handle"/>
-<$reveal state="$:/temp/search" type="nomatch" text="">
-<$button tooltip={{$:/language/Buttons/AdvancedSearch/Hint}} aria-label={{$:/language/Buttons/AdvancedSearch/Caption}} class="tc-btn-invisible">
-<$action-setfield $tiddler="$:/temp/advancedsearch" text={{$:/temp/search}}/>
-<$action-setfield $tiddler="$:/temp/search" text=""/>
-<$action-navigate $to="$:/AdvancedSearch"/>
-{{$:/core/images/advanced-search-button}}
-</$button>
-<$button class="tc-btn-invisible">
-<$action-setfield $tiddler="$:/temp/search" text="" />
-{{$:/core/images/close-button}}
-</$button>
+\define count-popup-button()
+\whitespace trim
 <$button popup=<<qualify "$:/state/popup/search-dropdown">> class="tc-btn-invisible">
 {{$:/core/images/down-arrow}}
-<$list filter="[{$:/temp/search}minlength{$:/config/Search/MinLength}limit[1]]" variable="listItem">
+<$list filter="[{$(searchTiddler)$}minlength{$:/config/Search/MinLength}limit[1]]" variable="listItem">
 <$set name="searchTerm" value={{{ [<searchTiddler>get[text]] }}}>
 <$set name="resultCount" value="""<$count filter="[!is[system]search<searchTerm>]"/>""">
 {{$:/language/Search/Matches}}
@@ -28,28 +15,65 @@ tags: $:/tags/SideBarSegment
 </$set>
 </$list>
 </$button>
+\end
+
+\define search-results-list()
+\whitespace trim
+<$list filter="[{$(searchTiddler)$}minlength{$:/config/Search/MinLength}limit[1]]" emptyMessage="""<div class="tc-search-results">{{$:/language/Search/Search/TooShort}}</div>""" variable="listItem">
+
+{{$:/core/ui/SearchResults}}
+
+</$list>
+\end
+
+\define delete-state-tiddlers() <$action-deletetiddler $filter="[[$:/temp/search]] [<searchTiddler>] [<searchListState>]"/>
+
+\define cancel-search-actions() <$action-deletetiddler $filter="[<__storeTitle__>] [<__tiddler__>] [<__selectionStateTitle__>]"/>
+
+\define input-accept-actions() <$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/>
+
+\define input-accept-variant-actions() <$action-sendmessage $message="tm-edit-tiddler" $param={{{  [<__tiddler__>get[text]] }}}/>
+
+<div class="tc-sidebar-lists tc-sidebar-search">
+
+<$vars searchTiddler="$:/temp/search/input" searchListState=<<qualify "$:/state/search-list/selected-item">> titleSearchFilter="[!is[system]search:title<userInput>sort[title]limit[250]]" allSearchFilter="[!is[system]search<userInput>sort[title]limit[250]]">
+<div class="tc-search">
+<$macrocall $name="keyboard-driven-input" tiddler="$:/temp/search" storeTitle=<<searchTiddler>> 
+		selectionStateTitle=<<searchListState>> refreshTitle="$:/temp/search/refresh" type="search" 
+		tag="input" focus={{$:/config/Search/AutoFocus}} focusPopup=<<qualify "$:/state/popup/search-dropdown">> 
+		class="tc-popup-handle" primaryListFilter=<<titleSearchFilter>> secondaryListFilter=<<allSearchFilter>> 
+		filterMinLength={{$:/config/Search/MinLength}} inputCancelActions=<<cancel-search-actions>> 
+		inputAcceptActions=<<input-accept-actions>> inputAcceptVariantActions=<<input-accept-variant-actions>> cancelPopups="yes" />
+<$reveal state=<<searchTiddler>> type="nomatch" text="">
+<$button tooltip={{$:/language/Buttons/AdvancedSearch/Hint}} aria-label={{$:/language/Buttons/AdvancedSearch/Caption}} class="tc-btn-invisible">
+<$action-setfield $tiddler="$:/temp/advancedsearch" text={{$:/temp/search}}/>
+<<delete-state-tiddlers>>
+<$action-navigate $to="$:/AdvancedSearch"/>
+{{$:/core/images/advanced-search-button}}
+</$button>
+<$button class="tc-btn-invisible">
+<<delete-state-tiddlers>>
+{{$:/core/images/close-button}}
+</$button>
+<<count-popup-button>>
 </$reveal>
-<$reveal state="$:/temp/search" type="match" text="">
+<$reveal state=<<searchTiddler>> type="match" text="">
 <$button to="$:/AdvancedSearch" tooltip={{$:/language/Buttons/AdvancedSearch/Hint}} aria-label={{$:/language/Buttons/AdvancedSearch/Caption}} class="tc-btn-invisible">
 {{$:/core/images/advanced-search-button}}
 </$button>
 </$reveal>
 </div>
 
-<$reveal tag="div" class="tc-block-dropdown-wrapper" state="$:/temp/search" type="nomatch" text="">
+<$reveal tag="div" class="tc-block-dropdown-wrapper" state=<<searchTiddler>> type="nomatch" text="">
 
 <$reveal tag="div" class="tc-block-dropdown tc-search-drop-down tc-popup-handle" state=<<qualify "$:/state/popup/search-dropdown">> type="nomatch" text="" default="">
 
-<$list filter="[{$:/temp/search}minlength{$:/config/Search/MinLength}limit[1]]" emptyMessage="""<div class="tc-search-results">{{$:/language/Search/Search/TooShort}}</div>""" variable="listItem">
-
-{{$:/core/ui/SearchResults}}
-
-</$list>
+<<search-results-list>>
 
 </$reveal>
 
 </$reveal>
 
-</$set>
+</$vars>
 
 </div>

core/ui/ViewToolbar/new-here.tid

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

core/ui/ViewToolbar/new-journal-here.tid

@@ -23,7 +23,7 @@ description: {{$:/language/Buttons/NewJournalHere/Hint}}
 </$button>
 \end
 <$set name="journalTitleTemplate" value={{$:/config/NewJournal/Title}}>
-<$set name="journalTags" value={{$:/config/NewJournal/Tags!!tags}}>
+<$set name="journalTags" value={{$:/config/NewJournal/Tags}}>
 <$set name="currentTiddlerTag" value=<<currentTiddler>>>
 <<journalButton>>
 </$set>

core/wiki/config/EditTabIndex.tid

@@ -0,0 +1,3 @@
+title: $:/config/EditTabIndex
+
+1

core/wiki/config/OfficialPluginLibrary.tid

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