Version number update for 5.1.11

Fixes #2227

(Note I fixed this by editing the filename in the github.com online editor. It's happened before; I've raised #2261 to address the root cause)

.gitignore

@@ -2,3 +2,4 @@
 .c9/
 tmp/
 output/
+node_modules/

.jshintignore

@@ -5,3 +5,4 @@ plugins/tiddlywiki/highlight/files/
 plugins/tiddlywiki/jasmine/files/
 plugins/tiddlywiki/markdown/files/
 plugins/tiddlywiki/markdown/files/
+node_modules/

.npmignore

@@ -0,0 +1,5 @@
+.DS_Store
+.c9/
+tmp/
+output/
+node_modules/

bin/clean.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# Remove any output files
+
+find . -regex "^./editions/[a-z0-9\.-]*/output/.*" -delete

bin/readme.md

@@ -1,3 +1,3 @@
-<h1 class=''>Script Files</h1><p>The <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWiki5.html'>TiddlyWiki5</a> repository contains several scripts in the <code>bin</code> folder that you can use to automate common tasks, or as a useful starting point for your own scripts. See <a class='tc-tiddlylink tc-tiddlylink-missing' href='http://tiddlywiki.com/static/Scripts%2520for%2520building%2520tiddlywiki.com.html'>Scripts for building tiddlywiki.com</a> for details of the scripts used to build and release <a class='tc-tiddlylink-external' href='http://tiddlywiki.com/' target='_blank'>http://tiddlywiki.com/</a>.</p><p>All the scripts expect to be run from the root folder of the repository.</p><h2 class=''><code>serve</code>: serves tw5.com</h2><pre><code>./bin/serve.sh -h
+<h1 class="">Script Files</h1><p>The <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki5.html">TiddlyWiki5</a> repository contains several scripts in the <code>bin</code> folder that you can use to automate common tasks, or as a useful starting point for your own scripts. See <a class="tc-tiddlylink tc-tiddlylink-missing" href="http://tiddlywiki.com/static/Scripts%2520for%2520building%2520tiddlywiki.com.html">Scripts for building tiddlywiki.com</a> for details of the scripts used to build and release <a class="tc-tiddlylink-external" href="http://tiddlywiki.com/" target="_blank">http://tiddlywiki.com/</a>.</p><p>All the scripts expect to be run from the root folder of the repository.</p><h2 class=""><code>serve</code>: serves tw5.com</h2><pre><code>./bin/serve.sh -h
 ./bin/serve.sh [edition dir] [username] [password] [host] [port]</code></pre><p>Or:</p><pre><code>./bin/serve.cmd -h
-./bin/serve.cmd [edition dir] [username] [password] [host] [port]</code></pre><p>This script starts <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWiki5.html'>TiddlyWiki5</a> running as an HTTP server, defaulting to the content from the <code>tw5.com-server</code> edition. By default, the Node.js serves on port 8080. If the optional <code>username</code> parameter is provided, it is used for signing edits. If the <code>password</code> is provided then HTTP basic authentication is used. Run the script with the <code>-h</code> parameter to see online help.</p><p>To experiment with this configuration, run the script and then visit <code>http://127.0.0.1:8080</code> in a browser.</p><p>Changes made in the browser propagate to the server over HTTP (use the browser developer console to see these requests). The server then syncs changes to the file system (and logs each change to the screen).</p><h2 class=''><code>test</code>: build and run tests</h2><p>This script runs the <code>test</code> edition of <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWiki.html'>TiddlyWiki</a> on the server to perform the server-side tests and to build <code>test.html</code> for running the tests in the browser.</p><h2 class=''><code>lazy</code>: serves tw5.com with lazily loaded images</h2><pre><code>./bin/lazy.sh &lt;username&gt; [&lt;password&gt;]</code></pre><p>Or:</p><pre><code>./bin/lazy.cmd &lt;username&gt; [&lt;password&gt;]</code></pre><p>This script serves the <code>tw5.com-server</code> edition content with <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/LazyLoading.html'>LazyLoading</a> applied to images.</p><h2 class=''><code>2bld</code>: builds <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWiki.html'>TiddlyWiki</a> 2.6.5</h2><p>This script builds <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWiki.html'>TiddlyWiki</a> 2.6.5 from the original source and then displays the differences between them (<code>diff</code> is used for *nix, <code>fc</code> for Windows).</p>
+./bin/serve.cmd [edition dir] [username] [password] [host] [port]</code></pre><p>This script starts <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki5.html">TiddlyWiki5</a> running as an HTTP server, defaulting to the content from the <code>tw5.com-server</code> edition. By default, the Node.js serves on port 8080. If the optional <code>username</code> parameter is provided, it is used for signing edits. If the <code>password</code> is provided then HTTP basic authentication is used. Run the script with the <code>-h</code> parameter to see online help.</p><p>To experiment with this configuration, run the script and then visit <code>http://127.0.0.1:8080</code> in a browser.</p><p>Changes made in the browser propagate to the server over HTTP (use the browser developer console to see these requests). The server then syncs changes to the file system (and logs each change to the screen).</p><h2 class=""><code>test</code>: build and run tests</h2><p>This script runs the <code>test</code> edition of <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> on the server to perform the server-side tests and to build <code>test.html</code> for running the tests in the browser.</p><h2 class=""><code>lazy</code>: serves tw5.com with lazily loaded images</h2><pre><code>./bin/lazy.sh &lt;username&gt; [&lt;password&gt;]</code></pre><p>Or:</p><pre><code>./bin/lazy.cmd &lt;username&gt; [&lt;password&gt;]</code></pre><p>This script serves the <code>tw5.com-server</code> edition content with <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/LazyLoading.html">LazyLoading</a> applied to images.</p><h2 class=""><code>2bld</code>: builds <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> 2.6.5</h2><p>This script builds <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> 2.6.5 from the original source and then displays the differences between them (<code>diff</code> is used for *nix, <code>fc</code> for Windows).</p>

boot/boot.js

@@ -62,22 +62,22 @@ $tw.utils.isDate = function(value) {
 Iterate through all the own properties of an object or array. Callback is invoked with (element,title,object)
 */
 $tw.utils.each = function(object,callback) {
-	var next,f;
+	var next,f,length;
 	if(object) {
 		if(Object.prototype.toString.call(object) == "[object Array]") {
-			for (f=0; f<object.length; f++) {
+			for (f=0, length=object.length; f<length; f++) {
 				next = callback(object[f],f,object);
 				if(next === false) {
 					break;
 				}
 		    }
 		} else {
-			for(f in object) {
-				if(Object.prototype.hasOwnProperty.call(object,f)) {
-					next = callback(object[f],f,object);
-					if(next === false) {
-						break;
-					}
+			var keys = Object.keys(object);
+			for (f=0, length=keys.length; f<length; f++) {
+				var key = keys[f];
+				next = callback(object[key],key,object);
+				if(next === false) {
+					break;
 				}
 			}
 		}
@@ -126,8 +126,8 @@ Display an error and exit
 */
 $tw.utils.error = function(err) {
 	// Prepare the error message
-	var errHeading = "Internal JavaScript Error",
-		promptMsg = "Well, this is embarrassing. It is recommended that you restart TiddlyWiki by refreshing your browser";
+	var errHeading = ( $tw.language == undefined ? "Internal JavaScript Error" : $tw.language.getString("InternalJavaScriptError/Title") ),
+		promptMsg = ( $tw.language == undefined ? "Well, this is embarrassing. It is recommended that you restart TiddlyWiki by refreshing your browser" : $tw.language.getString("InternalJavaScriptError/Hint") );
 	// Log the error to the console
 	console.error($tw.node ? "\x1b[1;31m" + err + "\x1b[0m" : err);
 	if($tw.browser && !$tw.node) {
@@ -294,7 +294,9 @@ $tw.utils.parseFields = function(text,fields) {
 			if(p !== -1) {
 				var field = line.substr(0, p).trim(),
 					value = line.substr(p+1).trim();
-				fields[field] = value;
+				if(field) {
+					fields[field] = value;
+				}
 			}
 		}
 	});
@@ -588,7 +590,7 @@ Crypto helper object for encrypted content. It maintains the password text in a
 the password, and to encrypt/decrypt a block of text
 */
 $tw.utils.Crypto = function() {
-	var sjcl = $tw.node ? require("./sjcl.js") : window.sjcl,
+	var sjcl = $tw.node ? (global.sjcl || require("./sjcl.js")) : window.sjcl,
 		currentPassword = null,
 		callSjcl = function(method,inputText,password) {
 			password = password || currentPassword;
@@ -881,10 +883,14 @@ $tw.Wiki = function(options) {
 
 	// Delete a tiddler
 	this.deleteTiddler = function(title) {
-		delete tiddlers[title];
-		this.clearCache(title);
-		this.clearGlobalCache();
-		this.enqueueTiddlerEvent(title,true);
+// Uncomment the following line for detailed logs of all tiddler deletions
+// console.log("Deleting",title,tiddler)
+		if($tw.utils.hop(tiddlers,title)) {
+			delete tiddlers[title];
+			this.clearCache(title);
+			this.clearGlobalCache();
+			this.enqueueTiddlerEvent(title,true);
+		}
 	};
 
 	// Get a tiddler from the store
@@ -906,7 +912,10 @@ $tw.Wiki = function(options) {
 
 	// Iterate through all tiddler titles
 	this.each = function(callback) {
-		for(var title in tiddlers) {
+		var titles = Object.keys(tiddlers),
+			index,titlesLength,title;
+		for(index = 0, titlesLength = titles.length; index < titlesLength; index++) {
+			title = titles[index];
 			callback(tiddlers[title],title);
 		}
 	};
@@ -918,7 +927,10 @@ $tw.Wiki = function(options) {
 
 	// Iterate through all shadow tiddler titles
 	this.eachShadow = function(callback) {
-		for(var title in shadowTiddlers) {
+		var titles = Object.keys(shadowTiddlers),
+			index,titlesLength,title;
+		for(index = 0, titlesLength = titles.length; index < titlesLength; index++) {
+			title = titles[index];
 			var shadowInfo = shadowTiddlers[title];
 			callback(shadowInfo.tiddler,title);
 		}
@@ -926,10 +938,15 @@ $tw.Wiki = function(options) {
 
 	// Iterate through all tiddlers and then the shadows
 	this.eachTiddlerPlusShadows = function(callback) {
-		for(var title in tiddlers) {
+		var titles = Object.keys(tiddlers),
+			index,titlesLength,title;
+		for(index = 0, titlesLength = titles.length; index < titlesLength; index++) {
+			title = titles[index];
 			callback(tiddlers[title],title);
 		}
-		for(var title in shadowTiddlers) {
+		titles = Object.keys(shadowTiddlers);
+		for(index = 0, titlesLength = titles.length; index < titlesLength; index++) {
+			title = titles[index];
 			if(!Object.prototype.hasOwnProperty.call(tiddlers,title)) {
 				var shadowInfo = shadowTiddlers[title];
 				callback(shadowInfo.tiddler,title);
@@ -939,7 +956,10 @@ $tw.Wiki = function(options) {
 
 	// Iterate through all the shadows and then the tiddlers
 	this.eachShadowPlusTiddlers = function(callback) {
-		for(var title in shadowTiddlers) {
+		var titles = Object.keys(shadowTiddlers),
+			index,titlesLength,title;
+		for(index = 0, titlesLength = titles.length; index < titlesLength; index++) {
+			title = titles[index];
 			if(Object.prototype.hasOwnProperty.call(tiddlers,title)) {
 				callback(tiddlers[title],title);
 			} else {
@@ -947,7 +967,9 @@ $tw.Wiki = function(options) {
 				callback(shadowInfo.tiddler,title);
 			}
 		}
-		for(var title in tiddlers) {
+		titles = Object.keys(tiddlers);
+		for(index = 0, titlesLength = titles.length; index < titlesLength; index++) {
+			title = titles[index];
 			if(!Object.prototype.hasOwnProperty.call(shadowTiddlers,title)) {
 				callback(tiddlers[title],title);
 			}
@@ -1063,6 +1085,8 @@ $tw.Wiki = function(options) {
 				});
 			}
 		});
+		this.clearCache(null);
+		this.clearGlobalCache();
 	};
 
 };
@@ -1375,10 +1399,6 @@ $tw.loadTiddlersBrowser = function() {
 	for(var t=0; t<containerIds.length; t++) {
 		$tw.wiki.addTiddlers($tw.wiki.deserializeTiddlers("(DOM)",document.getElementById(containerIds[t])));
 	}
-	// Load any preloaded tiddlers
-	if($tw.preloadTiddlers) {
-		$tw.wiki.addTiddlers($tw.preloadTiddlers);
-	}
 };
 
 } else {
@@ -1441,18 +1461,41 @@ $tw.loadTiddlersFromPath = function(filepath,excludeRegExp) {
 			if(files.indexOf("tiddlywiki.files") !== -1) {
 				// If so, process the files it describes
 				var filesInfo = JSON.parse(fs.readFileSync(filepath + path.sep + "tiddlywiki.files","utf8"));
+				// First the tiddlers
 				$tw.utils.each(filesInfo.tiddlers,function(tidInfo) {
-					var typeInfo = $tw.config.contentTypeInfo[tidInfo.fields.type || "text/plain"],
+					var type = tidInfo.fields.type || "text/plain",
+						typeInfo = $tw.config.contentTypeInfo[type],
 						pathname = path.resolve(filepath,tidInfo.file),
 						text = fs.readFileSync(pathname,typeInfo ? typeInfo.encoding : "utf8");
-					if(tidInfo.prefix) {
-						text = tidInfo.prefix + text;
+					if(tidInfo.isTiddlerFile) {
+						var fileTiddlers = $tw.wiki.deserializeTiddlers(path.extname(pathname),text) || [];
+						$tw.utils.each(fileTiddlers,function(tiddler) {
+							$tw.utils.extend(tiddler,tidInfo.fields);
+							if(tidInfo.prefix) {
+								tiddler.text = tidInfo.prefix + tiddler.text;
+							}
+							if(tidInfo.suffix) {
+								tiddler.text = tiddler.text + tidInfo.suffix;
+							}
+						});
+						tiddlers.push({tiddlers: fileTiddlers});
+					} else {
+						if(tidInfo.prefix) {
+							text = tidInfo.prefix + text;
+						}
+						if(tidInfo.suffix) {
+							text = text + tidInfo.suffix;
+						}
+						tidInfo.fields.text = text;
+						tiddlers.push({tiddlers: [tidInfo.fields]});
 					}
-					if(tidInfo.suffix) {
-						text = text + tidInfo.suffix;
+				});
+				// Then any recursive directories
+				$tw.utils.each(filesInfo.directories,function(dirPath) {
+					var pathname = path.resolve(filepath,dirPath);
+					if(fs.existsSync(pathname) && fs.statSync(pathname).isDirectory()) {
+						tiddlers.push.apply(tiddlers,$tw.loadTiddlersFromPath(pathname,excludeRegExp));
 					}
-					tidInfo.fields.text = text;
-					tiddlers.push({tiddlers: [tidInfo.fields]});
 				});
 			} else {
 				// If not, read all the files in the directory
@@ -1738,7 +1781,8 @@ $tw.boot.startup = function(options) {
 			languagesEnvVar: "TIDDLYWIKI_LANGUAGE_PATH",
 			editionsEnvVar: "TIDDLYWIKI_EDITION_PATH"
 		},
-		log: {} // Log flags
+		log: {}, // Log flags
+		unloadTasks: []
 	});
 	if(!$tw.boot.tasks.readBrowserTiddlers) {
 		// For writable tiddler files, a hashmap of title to {filepath:,type:,hasMetaFile:}
@@ -1760,7 +1804,7 @@ $tw.boot.startup = function(options) {
 			$tw.boot.wikiPath = process.cwd();
 		}
 		// Read package info
-		$tw.packageInfo = require("../package.json");
+		$tw.packageInfo = $tw.packageInfo || require("../package.json");
 		// Check node version number
 		if(!$tw.utils.checkVersions(process.version.substr(1),$tw.packageInfo.engines.node.substr(2))) {
 			$tw.utils.error("TiddlyWiki5 requires node.js version " + $tw.packageInfo.engines.node);
@@ -1787,6 +1831,7 @@ $tw.boot.startup = function(options) {
 	$tw.utils.registerFileType("image/x-icon","base64",".ico",{flags:["image"]});
 	$tw.utils.registerFileType("application/font-woff","base64",".woff");
 	$tw.utils.registerFileType("audio/ogg","base64",".ogg");
+	$tw.utils.registerFileType("video/mp4","base64",".mp4");
 	$tw.utils.registerFileType("audio/mp3","base64",".mp3");
 	$tw.utils.registerFileType("audio/mp4","base64",[".mp4",".m4a"]);
 	$tw.utils.registerFileType("text/x-markdown","utf8",[".md",".markdown"]);
@@ -1797,12 +1842,30 @@ $tw.boot.startup = function(options) {
 	// Install the tiddler deserializer modules
 	$tw.Wiki.tiddlerDeserializerModules = Object.create(null);
 	$tw.modules.applyMethods("tiddlerdeserializer",$tw.Wiki.tiddlerDeserializerModules);
+	// Call unload handlers in the browser
+	if($tw.browser) {
+		window.onbeforeunload = function(event) {
+			event = event || {};
+			var result;
+			$tw.utils.each($tw.unloadTasks,function(task) {
+				var r = task(event);
+				if(r) {
+					result = r;
+				}
+			});
+			return result;
+		}
+	}
 	// Load tiddlers
 	if($tw.boot.tasks.readBrowserTiddlers) {
 		$tw.loadTiddlersBrowser();
 	} else {
 		$tw.loadTiddlersNode();
 	}
+	// Load any preloaded tiddlers
+	if($tw.preloadTiddlers) {
+		$tw.wiki.addTiddlers($tw.preloadTiddlers);
+	}
 	// Unpack plugin tiddlers
 	$tw.wiki.readPluginInfo();
 	$tw.wiki.registerPluginTiddlers("plugin",$tw.safeMode ? ["$:/core"] : undefined);
@@ -1833,6 +1896,15 @@ $tw.boot.startup = function(options) {
 	$tw.boot.executeNextStartupTask();
 };
 
+/*
+Add another unload task
+*/
+$tw.addUnloadTask = function(task) {
+	if($tw.unloadTasks.indexOf(task) === -1) {
+		$tw.unloadTasks.push(task);
+	}
+}
+
 /*
 Execute the remaining eligible startup tasks
 */

boot/bootprefix.js

@@ -99,7 +99,14 @@ $tw.preloadTiddler = function(fields) {
 	$tw.preloadTiddlers.push(fields);
 };
 
-return $tw
+/*
+Convenience function for pushing an array of tiddlers onto the preloading array
+*/
+$tw.preloadTiddlerArray = function(fieldsArray) {
+	$tw.preloadTiddlers.push.apply($tw.preloadTiddlers,fieldsArray);
+};
+
+return $tw;
 
 });
 

contributing.md

@@ -1,4 +1,4 @@
-<h1 class=''>Contributing to <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWiki5.html'>TiddlyWiki5</a></h1><p>We welcome contributions to the code and documentation of <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWiki.html'>TiddlyWiki</a> in several ways:</p><ul><li><a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/ReportingBugs.html'>ReportingBugs</a></li><li>Helping to <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/Improving%2520TiddlyWiki%2520Documentation.html'>improve our documentation</a></li><li>Contributing to the code via <a class='tc-tiddlylink-external' href='https://github.com/Jermolene/TiddlyWiki5' target='_blank'>GitHub</a><ul><li>See <a class='tc-tiddlylink-external' href='http://tiddlywiki.com/dev' target='_blank'>http://tiddlywiki.com/dev</a> for more details</li></ul></li></ul><p>There are other ways to <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/HelpingTiddlyWiki.html'>help TiddlyWiki</a> too.</p><h1 class=''>Contributor License Agreement</h1><p>Like other <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/OpenSource.html'>OpenSource</a> projects, <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWiki5.html'>TiddlyWiki5</a> needs a signed contributor license agreement from individual contributors. This is a legal agreement that allows contributors  to assert that they own the copyright of their contribution, and that they agree to license it to the <a class='tc-tiddlylink tc-tiddlylink-missing' href='http://tiddlywiki.com/static/UnaMesa.html'>UnaMesa</a> Association (the legal entity that owns <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWiki.html'>TiddlyWiki</a> on behalf of the community).</p><ul><li>For individuals use: <a class='tc-tiddlylink-external' href='https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-individual.md' target='_blank'>licenses/CLA-individual</a></li><li>For entities use: <a class='tc-tiddlylink-external' href='https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-entity.md' target='_blank'>licenses/CLA-entity</a></li></ul><h1 class=''>How to sign the CLA</h1><p>Create a <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/GitHub.html'>GitHub</a> pull request to add your name to <code>cla-individual.md</code> or <code>cla-entity.md</code>, with the date in the format (YYYY/MM/DD).</p><p><strong>step by step</strong></p><ol><li>click <a class='tc-tiddlylink-external' href='https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-individual.md' target='_blank'>licenses/CLA-individual</a> or <a class='tc-tiddlylink-external' href='https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-entity.md' target='_blank'>licenses/CLA-entity</a></li><li>in <code>cla-individual.md</code> or <code>cla-entity.md</code> click icon on the top-right corner (clicking this button will fork the project so you can edit the file)</li><li>add your name at the bottom</li></ol><p>eg: <code>Jeremy Ruston, @Jermolene, 2011/11/22</code></p><hr><p><em>The CLA documents used for this project were created using <a class='tc-tiddlylink-external' href='http://www.harmonyagreements.org' target='_blank'>Harmony Project Templates</a>. &quot;HA-CLA-I-LIST Version 1.0&quot; for &quot;CLA-individual&quot; and &quot;HA-CLA-E-LIST Version 1.0&quot; for &quot;CLA-entity&quot;.</em></p><p>Remarks
+<h1 class="">Contributing to <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki5.html">TiddlyWiki5</a></h1><p>We welcome contributions to the code and documentation of <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> in several ways:</p><ul><li><a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/ReportingBugs.html">ReportingBugs</a></li><li>Helping to <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/Improving%2520TiddlyWiki%2520Documentation.html">improve our documentation</a></li><li>Contributing to the code via <a class="tc-tiddlylink-external" href="https://github.com/Jermolene/TiddlyWiki5" target="_blank">GitHub</a><ul><li>See <a class="tc-tiddlylink-external" href="http://tiddlywiki.com/dev" target="_blank">http://tiddlywiki.com/dev</a> for more details</li></ul></li></ul><p>There are other ways to <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/HelpingTiddlyWiki.html">help TiddlyWiki</a> too.</p><h1 class="">Contributor License Agreement</h1><p>Like other <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/OpenSource.html">OpenSource</a> projects, <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki5.html">TiddlyWiki5</a> needs a signed contributor license agreement from individual contributors. This is a legal agreement that allows contributors  to assert that they own the copyright of their contribution, and that they agree to license it to the <a class="tc-tiddlylink tc-tiddlylink-missing" href="http://tiddlywiki.com/static/UnaMesa.html">UnaMesa</a> Association (the legal entity that owns <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> on behalf of the community).</p><ul><li>For individuals use: <a class="tc-tiddlylink-external" href="https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-individual.md" target="_blank">licenses/CLA-individual</a></li><li>For entities use: <a class="tc-tiddlylink-external" href="https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-entity.md" target="_blank">licenses/CLA-entity</a></li></ul><h1 class="">How to sign the CLA</h1><p>Create a <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/GitHub.html">GitHub</a> pull request to add your name to <code>cla-individual.md</code> or <code>cla-entity.md</code>, with the date in the format (YYYY/MM/DD).</p><p><strong>step by step</strong></p><ol><li>Navigate to <a class="tc-tiddlylink-external" href="https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-individual.md" target="_blank">licenses/CLA-individual</a> or <a class="tc-tiddlylink-external" href="https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-entity.md" target="_blank">licenses/CLA-entity</a> according to whether you are signing as an individual or representative of an organisation</li><li>Click the edit button at the top-right corner (clicking this button will fork the project so you can edit the file)</li><li>Add your name at the bottom<ul><li>eg: <code>Jeremy Ruston, @Jermolene, 2011/11/22</code></li></ul></li><li>Below the edit box for the CLA text you should see a box labelled <strong>Propose file change</strong></li><li>Enter a brief title to explain the change (eg, &quot;Signing the CLA&quot;)</li><li>Click the green button labelled <strong>Propose file change</strong></li><li>On the following screen, click the green button labelled <strong>Create pull request</strong></li></ol><hr><p><em>The CLA documents used for this project were created using <a class="tc-tiddlylink-external" href="http://www.harmonyagreements.org" target="_blank">Harmony Project Templates</a>. &quot;HA-CLA-I-LIST Version 1.0&quot; for &quot;CLA-individual&quot; and &quot;HA-CLA-E-LIST Version 1.0&quot; for &quot;CLA-entity&quot;.</em></p><p>Remarks
 ----—</p><ul><li><ul><li>When not owning the copyright in the entire work of authorship**</li></ul></li></ul><p>In this case, please clearly state so, since otherwise we assume that you are the legal copyright holder of the contributed work! Please provide links and additional information that clarify under which license the rest of the code is distributed.
-</p><p><em>This file was automatically generated by <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWiki5.html'>TiddlyWiki5</a></em>
+</p><p><em>This file was automatically generated by <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki5.html">TiddlyWiki5</a></em>
 </p>

core/copyright.tid

@@ -4,7 +4,7 @@ type: text/plain
 TiddlyWiki created by Jeremy Ruston, (jeremy [at] jermolene [dot] com)
 
 Copyright © Jeremy Ruston 2004-2007
-Copyright © UnaMesa Association 2007-2014
+Copyright © UnaMesa Association 2007-2016
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:

core/images/file.tid

@@ -0,0 +1,14 @@
+title: $:/core/images/file
+tags: $:/tags/Image
+
+<svg class="tc-image-file tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="nonzero">
+        <path d="M111.96811,30.5 L112,30.5 L112,119.999079 C112,124.417866 108.419113,128 104.000754,128 L23.9992458,128 C19.5813843,128 16,124.417687 16,119.999079 L16,8.00092105 C16,3.58213437 19.5808867,0 23.9992458,0 L81,0 L81,0.0201838424 C83.1589869,-0.071534047 85.3482153,0.707077645 86.9982489,2.35711116 L109.625176,24.9840387 C111.151676,26.510538 111.932942,28.4998414 111.96811,30.5 L111.96811,30.5 Z M81,8 L24,8 L24,120 L104,120 L104,30.5 L89.0003461,30.5 C84.5818769,30.5 81,26.9216269 81,22.4996539 L81,8 Z"></path>
+        <rect x="32" y="36" width="64" height="8" rx="8"></rect>
+        <rect x="32" y="52" width="64" height="8" rx="8"></rect>
+        <rect x="32" y="68" width="64" height="8" rx="8"></rect>
+        <rect x="32" y="84" width="64" height="8" rx="8"></rect>
+        <rect x="32" y="100" width="64" height="8" rx="8"></rect>
+        <rect x="32" y="20" width="40" height="8" rx="8"></rect>
+    </g>
+</svg>

core/images/fold-all-button.tid

@@ -0,0 +1,11 @@
+title: $:/core/images/fold-all-button
+tags: $:/tags/Image
+
+<svg class="tc-image-fold-all tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+        <rect x="0" y="0" width="128" height="16" rx="8"></rect>
+        <rect x="0" y="64" width="128" height="16" rx="8"></rect>
+        <path d="M64.0292774,58.6235628 C61.9791013,58.6242848 59.9275217,57.8435723 58.3632024,56.279253 L35.7458219,33.6618725 C32.6211696,30.5372202 32.6166093,25.4673401 35.7408036,22.3431458 C38.8586409,19.2253085 43.9325646,19.2211982 47.0595304,22.348164 L64.0250749,39.3137085 L80.9906194,22.348164 C84.1152717,19.2235117 89.1851518,19.2189514 92.3093461,22.3431458 C95.4271834,25.460983 95.4312937,30.5349067 92.3043279,33.6618725 L69.6869474,56.279253 C68.1237851,57.8424153 66.0737951,58.6247195 64.0241231,58.6250809 Z" transform="translate(64.024316, 39.313708) scale(1, -1) translate(-64.024316, -39.313708) "></path>
+        <path d="M64.0292774,123.621227 C61.9791013,123.621949 59.9275217,122.841236 58.3632024,121.276917 L35.7458219,98.6595365 C32.6211696,95.5348842 32.6166093,90.4650041 35.7408036,87.3408098 C38.8586409,84.2229725 43.9325646,84.2188622 47.0595304,87.345828 L64.0250749,104.311373 L80.9906194,87.345828 C84.1152717,84.2211757 89.1851518,84.2166154 92.3093461,87.3408098 C95.4271834,90.458647 95.4312937,95.5325707 92.3043279,98.6595365 L69.6869474,121.276917 C68.1237851,122.840079 66.0737951,123.622383 64.0241231,123.622745 Z" transform="translate(64.024316, 104.311372) scale(1, -1) translate(-64.024316, -104.311372) "></path>
+    </g>
+</svg>

core/images/fold-button.tid

@@ -0,0 +1,10 @@
+title: $:/core/images/fold-button
+tags: $:/tags/Image
+
+<svg class="tc-image-fold tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+        <rect x="0" y="0" width="128" height="16" rx="8"></rect>
+        <path d="M64.0292774,63.6235628 C61.9791013,63.6242848 59.9275217,62.8435723 58.3632024,61.279253 L35.7458219,38.6618725 C32.6211696,35.5372202 32.6166093,30.4673401 35.7408036,27.3431458 C38.8586409,24.2253085 43.9325646,24.2211982 47.0595304,27.348164 L64.0250749,44.3137085 L80.9906194,27.348164 C84.1152717,24.2235117 89.1851518,24.2189514 92.3093461,27.3431458 C95.4271834,30.460983 95.4312937,35.5349067 92.3043279,38.6618725 L69.6869474,61.279253 C68.1237851,62.8424153 66.0737951,63.6247195 64.0241231,63.6250809 Z" transform="translate(64.024316, 44.313708) scale(1, -1) translate(-64.024316, -44.313708) "></path>
+        <path d="M64.0049614,105.998482 C61.9547853,105.999204 59.9032057,105.218491 58.3388864,103.654172 L35.7215059,81.0367916 C32.5968535,77.9121393 32.5922933,72.8422592 35.7164876,69.7180649 C38.8343248,66.6002276 43.9082485,66.5961173 47.0352144,69.7230831 L64.0007589,86.6886276 L80.9663034,69.7230831 C84.0909557,66.5984308 89.1608358,66.5938705 92.2850301,69.7180649 C95.4028673,72.8359021 95.4069777,77.9098258 92.2800119,81.0367916 L69.6626314,103.654172 C68.099469,105.217334 66.0494791,105.999639 63.999807,106 Z" transform="translate(64.000000, 86.688628) scale(1, -1) translate(-64.000000, -86.688628) "></path>
+    </g>
+</svg>

core/images/fold-others-button.tid

@@ -0,0 +1,10 @@
+title: $:/core/images/fold-others-button
+tags: $:/tags/Image
+
+<svg class="tc-image-fold-others tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+        <rect x="0" y="56.0314331" width="128" height="16" rx="8"></rect>
+        <path d="M101.657101,104.948818 C100.207918,103.498614 98.2051847,102.599976 95.9929031,102.599976 L72,102.599976 L72,78.6070725 C72,76.3964271 71.1036108,74.3936927 69.6545293,72.9441002 L69.6571005,72.9488183 C68.2079177,71.4986143 66.2051847,70.5999756 63.9929031,70.5999756 L32.0070969,70.5999756 C27.5881712,70.5999756 24,74.1816976 24,78.5999756 C24,83.0092633 27.5848994,86.5999756 32.0070969,86.5999756 L56,86.5999756 L56,110.592879 C56,112.803524 56.8963895,114.806259 58.3454713,116.255852 L58.3429,116.251133 C59.7920828,117.701337 61.7948156,118.599976 64.0070969,118.599976 L88,118.599976 L88,142.592879 C88,147.011804 91.581722,150.599976 96,150.599976 C100.409288,150.599976 104,147.015076 104,142.592879 L104,110.607072 C104,108.396427 103.103611,106.393693 101.654529,104.9441 Z" transform="translate(64.000000, 110.599976) rotate(-45.000000) translate(-64.000000, -110.599976) "></path>
+        <path d="M101.725643,11.7488671 C100.27646,10.2986632 98.2737272,9.40002441 96.0614456,9.40002441 L72.0685425,9.40002441 L72.0685425,-14.5928787 C72.0685425,-16.8035241 71.1721533,-18.8062584 69.7230718,-20.255851 L69.725643,-20.2511329 C68.2764602,-21.7013368 66.2737272,-22.5999756 64.0614456,-22.5999756 L32.0756394,-22.5999756 C27.6567137,-22.5999756 24.0685425,-19.0182536 24.0685425,-14.5999756 C24.0685425,-10.1906879 27.6534419,-6.59997559 32.0756394,-6.59997559 L56.0685425,-6.59997559 L56.0685425,17.3929275 C56.0685425,19.6035732 56.964932,21.6063078 58.4140138,23.0559004 L58.4114425,23.0511823 C59.8606253,24.5013859 61.8633581,25.4000244 64.0756394,25.4000244 L88.0685425,25.4000244 L88.0685425,49.3929275 C88.0685425,53.8118532 91.6502645,57.4000244 96.0685425,57.4000244 C100.47783,57.4000244 104.068542,53.815125 104.068542,49.3929275 L104.068542,17.4071213 C104.068542,15.1964759 103.172153,13.1937416 101.723072,11.744149 Z" transform="translate(64.068542, 17.400024) scale(1, -1) rotate(-45.000000) translate(-64.068542, -17.400024) "></path>
+    </g>
+</svg>

core/images/folder.tid

@@ -0,0 +1,9 @@
+title: $:/core/images/folder
+tags: $:/tags/Image
+
+<svg class="tc-image-folder tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+        <path d="M55.6943257,128.000004 L7.99859666,128.000004 C3.5810937,128.000004 0,124.413822 0,119.996384 L0,48.0036243 C0,43.5833471 3.58387508,40.0000044 7.99859666,40.0000044 L16,40.0000044 L16,31.9999914 C16,27.5817181 19.5783731,24 24.0003461,24 L55.9996539,24 C60.4181231,24 64,27.5800761 64,31.9999914 L64,40.0000044 L104.001403,40.0000044 C108.418906,40.0000044 112,43.5861868 112,48.0036243 L112,59.8298353 L104,59.7475921 L104,51.9994189 C104,49.7887607 102.207895,48.0000044 99.9972215,48.0000044 L56,48.0000044 L56,36.0000255 C56,33.7898932 54.2072328,32 51.9957423,32 L28.0042577,32 C25.7890275,32 24,33.7908724 24,36.0000255 L24,48.0000044 L12.0027785,48.0000044 C9.78987688,48.0000044 8,49.7906032 8,51.9994189 L8,116.00059 C8,118.211248 9.79210499,120.000004 12.0027785,120.000004 L58.7630167,120.000004 L55.6943257,128.000004 L55.6943257,128.000004 Z"></path>
+        <path d="M23.8728955,55.5 L119.875702,55.5 C124.293205,55.5 126.87957,59.5532655 125.650111,64.5630007 L112.305967,118.936999 C111.077582,123.942356 106.497904,128 102.083183,128 L6.08037597,128 C1.66287302,128 -0.923492342,123.946735 0.305967145,118.936999 L13.650111,64.5630007 C14.878496,59.5576436 19.4581739,55.5 23.8728955,55.5 L23.8728955,55.5 L23.8728955,55.5 Z M25.6530124,64 L113.647455,64 C115.858129,64 117.151473,66.0930612 116.538306,68.6662267 L105.417772,115.333773 C104.803671,117.910859 102.515967,120 100.303066,120 L12.3086228,120 C10.0979492,120 8.8046054,117.906939 9.41777189,115.333773 L20.5383062,68.6662267 C21.1524069,66.0891409 23.4401107,64 25.6530124,64 L25.6530124,64 L25.6530124,64 Z"></path>
+    </g>
+</svg>

core/images/open-window.tid

@@ -0,0 +1,9 @@
+title: $:/core/images/open-window
+tags: $:/tags/Image
+
+<svg class="tc-image-open-window tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+        <path d="M16,112 L104.993898,112 C108.863261,112 112,115.590712 112,120 C112,124.418278 108.858091,128 104.993898,128 L7.00610161,128 C3.13673853,128 0,124.409288 0,120 C0,119.998364 4.30952878e-07,119.996727 1.29273572e-06,119.995091 C4.89579306e-07,119.993456 0,119.99182 0,119.990183 L0,24.0098166 C0,19.586117 3.59071231,16 8,16 C12.418278,16 16,19.5838751 16,24.0098166 L16,112 Z"></path>
+        <path d="M96,43.1959595 L96,56 C96,60.418278 99.581722,64 104,64 C108.418278,64 112,60.418278 112,56 L112,24 C112,19.5907123 108.415101,16 103.992903,16 L72.0070969,16 C67.5881712,16 64,19.581722 64,24 C64,28.4092877 67.5848994,32 72.0070969,32 L84.5685425,32 L48.2698369,68.2987056 C45.1421332,71.4264093 45.1434327,76.4904296 48.267627,79.614624 C51.3854642,82.7324612 56.4581306,82.7378289 59.5835454,79.6124141 L96,43.1959595 Z M32,7.9992458 C32,3.58138434 35.5881049,0 39.9992458,0 L120.000754,0 C124.418616,0 128,3.5881049 128,7.9992458 L128,88.0007542 C128,92.4186157 124.411895,96 120.000754,96 L39.9992458,96 C35.5813843,96 32,92.4118951 32,88.0007542 L32,7.9992458 Z"></path>
+    </g>
+</svg>

core/images/palette.tid

@@ -0,0 +1,8 @@
+title: $:/core/images/palette
+tags: $:/tags/Image
+
+<svg class="tc-image-palette tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+        <path d="M80.2470434,39.1821571 C75.0645698,38.2680897 69.6261555,37.7814854 64.0193999,37.7814854 C28.6624616,37.7814854 0,57.1324214 0,81.0030106 C0,90.644534 4.67604329,99.5487133 12.5805659,106.738252 C23.5031767,91.1899067 26.3405471,72.3946229 36.8885698,63.5622337 C52.0716764,50.8486559 63.4268694,55.7343343 63.4268694,55.7343343 L80.2470434,39.1821571 Z M106.781666,48.8370714 C119.830962,56.749628 128.0388,68.229191 128.0388,81.0030106 C128.0388,90.3534932 128.557501,98.4142085 116.165191,106.082518 C105.367708,112.763955 112.341384,99.546808 104.321443,95.1851533 C96.3015017,90.8234987 84.3749007,96.492742 86.1084305,103.091059 C89.3087234,115.272303 105.529892,114.54645 92.4224435,119.748569 C79.3149955,124.950687 74.2201582,124.224536 64.0193999,124.224536 C56.1979176,124.224536 48.7040365,123.277578 41.7755684,121.544216 C51.620343,117.347916 69.6563669,109.006202 75.129737,102.088562 C82.7876655,92.4099199 87.3713218,80.0000002 83.3235694,72.4837191 C83.1303943,72.1250117 94.5392656,60.81569 106.781666,48.8370714 Z M1.13430476,123.866563 C0.914084026,123.867944 0.693884185,123.868637 0.473712455,123.868637 C33.9526848,108.928928 22.6351223,59.642592 59.2924543,59.6425917 C59.6085574,61.0606542 59.9358353,62.5865065 60.3541977,64.1372318 C34.4465025,59.9707319 36.7873124,112.168427 1.13429588,123.866563 L1.13430476,123.866563 Z M1.84669213,123.859694 C40.7185279,123.354338 79.9985412,101.513051 79.9985401,79.0466836 C70.7284906,79.0466835 65.9257264,75.5670082 63.1833375,71.1051511 C46.585768,64.1019718 32.81846,116.819636 1.84665952,123.859695 L1.84669213,123.859694 Z M67.1980193,59.8524981 C62.748213,63.9666823 72.0838429,76.2846822 78.5155805,71.1700593 C89.8331416,59.8524993 112.468264,37.2173758 123.785825,25.8998146 C135.103386,14.5822535 123.785825,3.26469247 112.468264,14.5822535 C101.150703,25.8998144 78.9500931,48.9868127 67.1980193,59.8524981 Z"></path>
+    </g>
+</svg>

core/images/plugin-generic-theme.tid

@@ -3,6 +3,6 @@ tags: $:/tags/Image
 
 <svg width="22pt" height="22pt" viewBox="0 0 128 128">
     <g fill-rule="evenodd">
-        <path d="M27.6619958,98.5383065 C27.5690581,98.5388896 27.4761291,98.539182 27.383212,98.539182 C41.5122315,92.2342259 36.7359182,71.4340774 52.2062903,71.4340772 C52.3396942,72.0325374 52.4778143,72.6764878 52.6543744,73.3309353 C41.7206358,71.5725612 42.70852,93.6013809 27.6619958,98.5383065 Z M27.962646,98.5354078 C44.3675979,98.3221342 60.9448114,89.104528 60.944811,79.6231217 C57.0326028,79.6231217 55.0057081,78.1546059 53.8483468,76.2715831 C46.8437297,73.3160546 41.0335584,95.5643154 27.9626323,98.5354081 Z M60.4476718,66.8723739 C57.4632888,63.6421817 54.9582687,60.7541572 53.4305549,58.7453802 C47.3662923,50.7715364 44.307483,54.9700909 40.8462757,58.7453801 C37.3850684,62.5206692 41.7580858,65.5796149 38.4732643,68.2464352 C35.1884428,70.9132556 35.391237,71.8376623 29.8473278,66.9588778 C24.3034186,62.0800933 23.919977,60.7368279 26.4649349,57.9530299 C29.0098928,55.1692318 31.1369568,59.5524845 36.3357237,54.6053302 C41.5344905,49.6581758 37.1673192,45.2736183 37.1673192,45.2736183 C37.1673192,45.2736183 47.9916921,23.1463023 62.4556497,24.7805686 C76.9196074,26.4148348 56.9839048,22.6644011 52.0250205,40.0179431 C49.9018746,47.4478606 52.4201529,45.6971267 56.4460414,48.8353078 C57.8695188,49.9449088 63.120208,53.6842856 69.3136884,58.3372485 C77.8095419,50.1273311 87.3705002,40.8200581 90.1462007,38.0443577 C94.9225135,33.268045 99.6988262,38.0443577 94.9225134,42.8206705 C92.2168565,45.5263274 83.0052228,54.3768782 74.6585455,62.4104777 C84.7196352,70.2010353 95.1107413,79.0341049 95.1107416,82.5307694 C95.1107421,88.9149413 92.3944614,92.7263341 86.6764506,90.6368273 C83.0906414,89.3264812 73.3126471,80.2536547 65.0234105,71.7029822 C62.8994697,73.7599251 61.2357389,75.3821997 60.3189624,76.2989761 C57.6045976,78.4574835 53.6647127,73.2589589 55.5426497,71.5226634 C56.5140946,70.6244887 58.249291,68.9770292 60.4476718,66.8723739 L60.4476718,66.8723739 Z M64,0 L118.5596,32 L118.5596,96 L64,128 L9.44039956,96 L9.44039956,32 L64,0 Z"></path>
+        <path d="M29.4078519,91.4716406 L51.4693474,69.4101451 L51.4646675,69.4054652 C50.5969502,68.5377479 50.5929779,67.1348725 51.4693474,66.2585029 C52.3396494,65.3882009 53.7499654,65.3874786 54.6163097,66.2538229 L64.0805963,75.7181095 C64.9483136,76.5858268 64.9522859,77.9887022 64.0759163,78.8650718 C63.2056143,79.7353737 61.7952984,79.736096 60.9289541,78.8697517 L60.9242741,78.8650718 L60.9242741,78.8650718 L38.8627786,100.926567 C36.2518727,103.537473 32.0187578,103.537473 29.4078519,100.926567 C26.796946,98.3156614 26.796946,94.0825465 29.4078519,91.4716406 Z M60.8017407,66.3810363 C58.3659178,63.6765806 56.3370667,61.2899536 54.9851735,59.5123615 C48.1295381,50.4979488 44.671561,55.2444054 40.7586738,59.5123614 C36.8457866,63.7803174 41.789473,67.2384487 38.0759896,70.2532832 C34.3625062,73.2681177 34.5917646,74.3131575 28.3243876,68.7977024 C22.0570105,63.2822473 21.6235306,61.7636888 24.5005999,58.6166112 C27.3776691,55.4695337 29.7823103,60.4247912 35.6595047,54.8320442 C41.5366991,49.2392972 36.5996215,44.2825646 36.5996215,44.2825646 C36.5996215,44.2825646 48.8365511,19.267683 65.1880231,21.1152173 C81.5394952,22.9627517 59.0022276,18.7228947 53.3962199,38.3410355 C50.9960082,46.7405407 53.8429162,44.7613399 58.3941742,48.3090467 C59.7875202,49.3951602 64.4244828,52.7100463 70.1884353,56.9943417 L90.8648751,36.3179019 L92.4795866,31.5515482 L100.319802,26.8629752 L103.471444,30.0146174 L98.782871,37.8548326 L94.0165173,39.4695441 L73.7934912,59.6925702 C86.4558549,69.2403631 102.104532,81.8392557 102.104532,86.4016913 C102.104533,93.6189834 99.0337832,97.9277545 92.5695848,95.5655717 C87.8765989,93.8506351 73.8015497,80.3744087 63.8173444,69.668717 L60.9242741,72.5617873 L57.7726319,69.4101451 L60.8017407,66.3810363 L60.8017407,66.3810363 Z M63.9533761,1.42108547e-13 L118.512977,32 L118.512977,96 L63.9533761,128 L9.39377563,96 L9.39377563,32 L63.9533761,1.42108547e-13 Z"></path>
     </g>
 </svg>

core/images/spiral.tid

@@ -0,0 +1,8 @@
+title: $:/core/images/spiral
+tags: $:/tags/Image
+
+<svg class="tc-image-spiral tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="nonzero">
+        <path d="M64.534 68.348c3.39 0 6.097-2.62 6.476-5.968l-4.755-.538 4.75.583c.377-3.07-1.194-6.054-3.89-7.78-2.757-1.773-6.34-2.01-9.566-.7-3.46 1.403-6.14 4.392-7.35 8.148l-.01.026c-1.3 4.08-.72 8.64 1.58 12.52 2.5 4.2 6.77 7.2 11.76 8.27 5.37 1.15 11.11-.05 15.83-3.31 5.04-3.51 8.46-9.02 9.45-15.3 1.05-6.7-.72-13.63-4.92-19.19l.02.02c-4.42-5.93-11.2-9.82-18.78-10.78-7.96-1.01-16.13 1.31-22.59 6.43-6.81 5.39-11.18 13.41-12.11 22.26-.98 9.27 1.87 18.65 7.93 26.02 6.32 7.69 15.6 12.56 25.74 13.48 10.54.96 21.15-2.42 29.45-9.4l.01-.01c8.58-7.25 13.94-17.78 14.86-29.21.94-11.84-2.96-23.69-10.86-32.9-8.19-9.5-19.95-15.36-32.69-16.27-13.16-.94-26.24 3.49-36.34 12.34l.01-.01c-10.41 9.08-16.78 22.1-17.68 36.15-.93 14.44 4.03 28.77 13.79 39.78 10.03 11.32 24.28 18.2 39.6 19.09 15.73.92 31.31-4.56 43.24-15.234 12.23-10.954 19.61-26.44 20.5-43.074.14-2.64-1.89-4.89-4.52-5.03-2.64-.14-4.89 1.88-5.03 4.52-.75 14.1-7 27.2-17.33 36.45-10.03 8.98-23.11 13.58-36.3 12.81-12.79-.75-24.67-6.48-33-15.89-8.07-9.11-12.17-20.94-11.41-32.827.74-11.52 5.942-22.15 14.43-29.54l.01-.01c8.18-7.17 18.74-10.75 29.35-9.998 10.21.726 19.6 5.41 26.11 12.96 6.24 7.273 9.32 16.61 8.573 25.894-.718 8.9-4.88 17.064-11.504 22.66l.01-.007c-6.36 5.342-14.44 7.92-22.425 7.19-7.604-.68-14.52-4.314-19.21-10.027-4.44-5.4-6.517-12.23-5.806-18.94.67-6.3 3.76-11.977 8.54-15.766 4.46-3.54 10.05-5.128 15.44-4.44 5.03.63 9.46 3.18 12.32 7.01l.02.024c2.65 3.5 3.75 7.814 3.1 11.92-.59 3.71-2.58 6.925-5.45 8.924-2.56 1.767-5.61 2.403-8.38 1.81-2.42-.516-4.42-1.92-5.53-3.79-.93-1.56-1.15-3.3-.69-4.75l-4.56-1.446L59.325 65c.36-1.12 1.068-1.905 1.84-2.22.25-.103.48-.14.668-.13.06.006.11.015.14.025.01 0 .01 0-.01-.01-.02-.015-.054-.045-.094-.088-.06-.064-.12-.145-.17-.244-.15-.29-.23-.678-.18-1.11l-.005.04c.15-1.332 1.38-2.523 3.035-2.523-2.65 0-4.79 2.144-4.79 4.787s2.14 4.785 4.78 4.785z"></path>
+    </g>
+</svg>

core/images/theme-button.tid

@@ -3,10 +3,7 @@ tags: $:/tags/Image
 
 <svg class="tc-image-theme-button tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
     <g fill-rule="evenodd">
-        <g transform="translate(6.762422, 19.968999)">
-            <path d="M0.824945506,108.186742 C0.664785639,108.187747 0.504640965,108.188251 0.344516735,108.188251 C24.6927592,97.3230528 16.4618388,61.4785938 43.121606,61.4785936 C43.3514982,62.5099075 43.5895175,63.6196137 43.8937798,64.7474092 C25.0518979,61.7172401 26.754298,99.6790423 0.824939051,108.186742 Z M1.34304326,108.181747 C29.613352,107.814217 58.1805158,91.9297101 58.1805151,75.5906019 C51.4386888,75.5906018 47.9457839,73.0599394 45.9513275,69.8149659 C33.880418,64.7217657 23.8678719,103.061726 1.34301955,108.181748 Z"></path>
-            <path d="M48.871084,61.6312522 C45.6348746,64.6233738 52.4243955,73.581882 57.1020034,69.8621716 C65.3329228,61.631253 108.502656,20.4006304 116.733576,12.169711 C124.964495,3.9387916 116.733576,-4.29212771 108.502656,3.9387916 C100.271737,12.1697108 57.4180113,53.7289683 48.871084,61.6312522 Z"></path>
-        </g>
-        <path d="M62.2824054,71.6211067 C57.93733,66.8541323 54.3123948,62.6301561 51.9937779,59.5814279 C41.5433616,45.8402704 36.2721798,53.0755512 30.307554,59.5814276 C24.3429282,66.0873041 31.8788571,71.3587209 26.2181932,75.9543964 C20.5575294,80.5500719 20.9070004,82.1430826 11.3532982,73.7355757 C1.79959591,65.3280689 1.13881905,63.0132479 5.52449152,58.2159872 C9.91016399,53.4187265 13.5756887,60.9722938 22.5346144,52.4469667 C31.4935401,43.9216395 23.9676854,36.3658236 23.9676854,36.3658236 C23.9676854,36.3658236 42.6210998,-1.76571499 67.5465342,1.05058165 C92.4719685,3.8668783 58.1171911,-2.5961653 49.5716499,27.3088291 C45.9128772,40.1126497 50.2525733,37.0956468 57.1903023,42.5036084 C59.4792141,44.2878157 67.5103988,50.0176866 77.2457031,57.2905766 C71.4143155,62.9019825 66.2337717,67.8661661 62.2824054,71.6211067 Z M73.4870997,83.4678852 C87.4278174,97.7290403 103.323635,112.360587 109.285731,114.539289 C119.139459,118.140092 123.820369,111.571999 123.820368,100.570289 C123.820367,94.7414103 107.064445,80.3074425 90.2759123,67.2185217 C83.6390655,73.6178 77.7700759,79.2918373 73.4870997,83.4678852 Z"></path>
+        <path d="M55.854113,66.9453198 C54.3299482,65.1432292 53.0133883,63.518995 51.9542746,62.1263761 C40.8899947,47.578055 35.3091807,55.2383404 28.9941893,62.1263758 C22.6791979,69.0144112 30.6577916,74.5954741 24.6646171,79.4611023 C18.6714426,84.3267304 19.0414417,86.0133155 8.92654943,77.1119468 C-1.18834284,68.2105781 -1.88793412,65.7597832 2.7553553,60.6807286 C7.39864472,55.601674 11.2794845,63.5989423 20.7646627,54.5728325 C30.2498409,45.5467226 22.2819131,37.5470737 22.2819131,37.5470737 C22.2819131,37.5470737 42.0310399,-2.82433362 68.4206088,0.157393922 C94.8101776,3.13912147 58.4373806,-3.70356506 49.3898693,27.958066 C45.5161782,41.5139906 50.1107906,38.3197672 57.4560458,44.0453955 C59.1625767,45.3756367 63.8839488,48.777453 70.127165,53.3625321 C63.9980513,59.2416709 58.9704753,64.0315459 55.854113,66.9453198 Z M67.4952439,79.8919946 C83.5082212,96.9282402 105.237121,117.617674 112.611591,120.312493 C123.044132,124.12481 128.000001,117.170903 128,105.522947 C127.999999,98.3705516 104.170675,78.980486 84.0760493,63.7529565 C76.6683337,70.9090328 70.7000957,76.7055226 67.4952439,79.8919946 Z"></path>
+        <path d="M58.2852966,138.232794 L58.2852966,88.3943645 C56.318874,88.3923153 54.7254089,86.7952906 54.7254089,84.8344788 C54.7254089,82.8684071 56.3175932,81.2745911 58.2890859,81.2745911 L79.6408336,81.2745911 C81.608998,81.2745911 83.2045105,82.8724076 83.2045105,84.8344788 C83.2045105,86.7992907 81.614366,88.3923238 79.6446228,88.3943645 L79.6446228,88.3943646 L79.6446228,138.232794 C79.6446228,144.131009 74.8631748,148.912457 68.9649597,148.912457 C63.0667446,148.912457 58.2852966,144.131009 58.2852966,138.232794 Z M65.405072,-14.8423767 L72.5248474,-14.8423767 L76.0847351,-0.690681892 L72.5248474,6.51694947 L72.5248474,81.2745911 L65.405072,81.2745911 L65.405072,6.51694947 L61.8451843,-0.690681892 L65.405072,-14.8423767 Z" transform="translate(68.964960, 67.035040) rotate(45.000000) translate(-68.964960, -67.035040) "></path>
     </g>
 </svg>

core/images/unfold-all-button.tid

@@ -0,0 +1,11 @@
+title: $:/core/images/unfold-all-button
+tags: $:/tags/Image
+
+<svg class="tc-image-unfold-all tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+        <rect x="0" y="0" width="128" height="16" rx="8"></rect>
+        <rect x="0" y="64" width="128" height="16" rx="8"></rect>
+        <path d="M85.598226,8.34884273 C84.1490432,6.89863875 82.1463102,6 79.9340286,6 L47.9482224,6 C43.5292967,6 39.9411255,9.581722 39.9411255,14 C39.9411255,18.4092877 43.5260249,22 47.9482224,22 L71.9411255,22 L71.9411255,45.9929031 C71.9411255,50.4118288 75.5228475,54 79.9411255,54 C84.3504132,54 87.9411255,50.4151006 87.9411255,45.9929031 L87.9411255,14.0070969 C87.9411255,11.7964515 87.0447363,9.79371715 85.5956548,8.34412458 Z" transform="translate(63.941125, 30.000000) scale(1, -1) rotate(-45.000000) translate(-63.941125, -30.000000) "></path>
+        <path d="M85.6571005,72.2899682 C84.2079177,70.8397642 82.2051847,69.9411255 79.9929031,69.9411255 L48.0070969,69.9411255 C43.5881712,69.9411255 40,73.5228475 40,77.9411255 C40,82.3504132 43.5848994,85.9411255 48.0070969,85.9411255 L72,85.9411255 L72,109.934029 C72,114.352954 75.581722,117.941125 80,117.941125 C84.4092877,117.941125 88,114.356226 88,109.934029 L88,77.9482224 C88,75.737577 87.1036108,73.7348426 85.6545293,72.2852501 Z" transform="translate(64.000000, 93.941125) scale(1, -1) rotate(-45.000000) translate(-64.000000, -93.941125) "></path>
+    </g>
+</svg>

core/images/unfold-button.tid

@@ -0,0 +1,10 @@
+title: $:/core/images/unfold-button
+tags: $:/tags/Image
+
+<svg class="tc-image-unfold tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+        <rect x="0" y="0" width="128" height="16" rx="8"></rect>
+        <path d="M85.598226,11.3488427 C84.1490432,9.89863875 82.1463102,9 79.9340286,9 L47.9482224,9 C43.5292967,9 39.9411255,12.581722 39.9411255,17 C39.9411255,21.4092877 43.5260249,25 47.9482224,25 L71.9411255,25 L71.9411255,48.9929031 C71.9411255,53.4118288 75.5228475,57 79.9411255,57 C84.3504132,57 87.9411255,53.4151006 87.9411255,48.9929031 L87.9411255,17.0070969 C87.9411255,14.7964515 87.0447363,12.7937171 85.5956548,11.3441246 Z" transform="translate(63.941125, 33.000000) scale(1, -1) rotate(-45.000000) translate(-63.941125, -33.000000) "></path>
+        <path d="M85.6571005,53.4077172 C84.2079177,51.9575133 82.2051847,51.0588745 79.9929031,51.0588745 L48.0070969,51.0588745 C43.5881712,51.0588745 40,54.6405965 40,59.0588745 C40,63.4681622 43.5848994,67.0588745 48.0070969,67.0588745 L72,67.0588745 L72,91.0517776 C72,95.4707033 75.581722,99.0588745 80,99.0588745 C84.4092877,99.0588745 88,95.4739751 88,91.0517776 L88,59.0659714 C88,56.855326 87.1036108,54.8525917 85.6545293,53.4029991 Z" transform="translate(64.000000, 75.058875) scale(1, -1) rotate(-45.000000) translate(-64.000000, -75.058875) "></path>
+    </g>
+</svg>

core/language/en-GB/Buttons.multids

@@ -30,12 +30,24 @@ ExportTiddler/Caption: export tiddler
 ExportTiddler/Hint: Export tiddler
 ExportTiddlers/Caption: export tiddlers
 ExportTiddlers/Hint: Export tiddlers
+Fold/Caption: fold tiddler
+Fold/Hint: Fold the body of this tiddler
+Fold/FoldBar/Caption: fold-bar
+Fold/FoldBar/Hint: Optional bars to fold and unfold tiddlers
+Unfold/Caption: unfold tiddler
+Unfold/Hint: Unfold the body of this tiddler
+FoldOthers/Caption: fold other tiddlers
+FoldOthers/Hint: Fold the bodies of other opened tiddlers
+FoldAll/Caption: fold all tiddlers
+FoldAll/Hint: Fold the bodies of all opened tiddlers
+UnfoldAll/Caption: unfold all tiddlers
+UnfoldAll/Hint: Unfold the bodies of all opened tiddlers
 FullScreen/Caption: full-screen
 FullScreen/Hint: Enter or leave full-screen mode
 Help/Caption: help
 Help/Hint: Show help panel
 Import/Caption: import
-Import/Hint: Import files
+Import/Hint: Import many types of file including text, image, TiddlyWiki or JSON
 Info/Caption: info
 Info/Hint: Show information for this tiddler
 Home/Caption: home
@@ -52,6 +64,10 @@ NewJournalHere/Caption: new journal here
 NewJournalHere/Hint: Create a new journal tiddler tagged with this one
 NewTiddler/Caption: new tiddler
 NewTiddler/Hint: Create a new tiddler
+OpenWindow/Caption: open in new window
+OpenWindow/Hint: Open tiddler in new window
+Palette/Caption: palette
+Palette/Hint: Choose the colour palette
 Permalink/Caption: permalink
 Permalink/Hint: Set browser address bar to a direct link to this tiddler
 Permaview/Caption: permaview

core/language/en-GB/ControlPanel.multids

@@ -38,6 +38,11 @@ Palette/Editor/Reset/Caption: reset
 Palette/HideEditor/Caption: hide editor
 Palette/Prompt: Current palette:
 Palette/ShowEditor/Caption: show editor
+Parsing/Caption: Parsing
+Parsing/Hint: Here you can globally disable individual wiki parser rules. Take care as disabling some parser rules can prevent ~TiddlyWiki functioning correctly (you can restore normal operation with [[safe mode|http://tiddlywiki.com/#SafeMode]] )
+Parsing/Block/Caption: Block Parse Rules
+Parsing/Inline/Caption: Inline Parse Rules
+Parsing/Pragma/Caption: Pragma Parse Rules
 Plugins/Add/Hint: Install plugins from the official library
 Plugins/Add/Caption: Get more plugins
 Plugins/Caption: Plugins
@@ -47,11 +52,14 @@ Plugins/Disabled/Status: (disabled)
 Plugins/Empty/Hint: None
 Plugins/Enable/Caption: enable
 Plugins/Enable/Hint: Enable this plugin when reloading page
+Plugins/Install: install
 Plugins/Installed/Hint: Currently installed plugins:
 Plugins/Languages/Caption: Languages
 Plugins/Languages/Hint: Language pack plugins
+Plugins/OpenPluginLibrary: open plugin library
 Plugins/Plugins/Caption: Plugins
 Plugins/Plugins/Hint: Plugins
+Plugins/Reinstall: reinstall
 Plugins/Themes/Caption: Themes
 Plugins/Themes/Hint: Theme plugins
 Saving/Caption: Saving
@@ -71,6 +79,9 @@ Settings/AutoSave/Caption: Autosave
 Settings/AutoSave/Disabled/Description: Do not save changes automatically
 Settings/AutoSave/Enabled/Description: Save changes automatically
 Settings/AutoSave/Hint: Automatically save changes during editing
+Settings/CamelCase/Caption: Camel Case Wiki Links
+Settings/CamelCase/Hint: You can globally disable automatic linking of ~CamelCase phrases. Requires reload to take effect
+Settings/CamelCase/Description: Enable automatic ~CamelCase linking
 Settings/Caption: Settings
 Settings/Hint: These settings let you customise the behaviour of TiddlyWiki.
 Settings/NavigationAddressBar/Caption: Navigation Address Bar
@@ -82,12 +93,31 @@ Settings/NavigationHistory/Caption: Navigation History
 Settings/NavigationHistory/Hint: Update browser history when navigating to a tiddler:
 Settings/NavigationHistory/No/Description: Do not update history
 Settings/NavigationHistory/Yes/Description: Update history
+Settings/PerformanceInstrumentation/Caption: Performance Instrumentation
+Settings/PerformanceInstrumentation/Hint: Displays performance statistics in the browser developer console. Requires reload to take effect
+Settings/PerformanceInstrumentation/Description: Enable performance instrumentation
+Settings/ToolbarButtonStyle/Caption: Toolbar Button Style
+Settings/ToolbarButtonStyle/Hint: Choose the style for toolbar buttons:
+Settings/ToolbarButtonStyle/Styles/Borderless: Borderless
+Settings/ToolbarButtonStyle/Styles/Boxed: Boxed
+Settings/ToolbarButtonStyle/Styles/Rounded: Rounded
 Settings/ToolbarButtons/Caption: Toolbar Buttons
 Settings/ToolbarButtons/Hint: Default toolbar button appearance:
 Settings/ToolbarButtons/Icons/Description: Include icon
 Settings/ToolbarButtons/Text/Description: Include text
 Settings/DefaultSidebarTab/Caption: Default Sidebar Tab
 Settings/DefaultSidebarTab/Hint: Specify which sidebar tab is displayed by default
+Settings/LinkToBehaviour/Caption: Tiddler Opening Behaviour
+Settings/LinkToBehaviour/InsideRiver/Hint: Navigation from //within// the story river
+Settings/LinkToBehaviour/OutsideRiver/Hint: Navigation from //outside// the story river
+Settings/LinkToBehaviour/OpenAbove: Open above the current tiddler
+Settings/LinkToBehaviour/OpenBelow: Open below the current tiddler
+Settings/LinkToBehaviour/OpenAtTop: Open at the top of the story river
+Settings/LinkToBehaviour/OpenAtBottom: Open at the bottom of the story river
+Settings/TitleLinks/Caption: Tiddler Titles
+Settings/TitleLinks/Hint: Optionally display tiddler titles as links
+Settings/TitleLinks/No/Description: Do not display tiddler titles as links
+Settings/TitleLinks/Yes/Description: Display tiddler titles as links
 StoryView/Caption: Story View
 StoryView/Prompt: Current view:
 Theme/Caption: Theme
@@ -99,8 +129,7 @@ Toolbars/EditToolbar/Caption: Edit Toolbar
 Toolbars/EditToolbar/Hint: Choose which buttons are displayed for tiddlers in edit mode
 Toolbars/Hint: Select which toolbar buttons are displayed
 Toolbars/PageControls/Caption: Page Toolbar
-Toolbars/PageControls/Hint: Choose which buttons are displayed on the main page toolbar  
+Toolbars/PageControls/Hint: Choose which buttons are displayed on the main page toolbar
 Toolbars/ViewToolbar/Caption: View Toolbar
 Toolbars/ViewToolbar/Hint: Choose which buttons are displayed for tiddlers in view mode
 Tools/Download/Full/Caption: Download full wiki
-

core/language/en-GB/Docs/PaletteColours.multids

@@ -6,6 +6,9 @@ alert-highlight: Alert highlight
 alert-muted-foreground: Alert muted foreground
 background: General background
 blockquote-bar: Blockquote bar
+button-background: Default button background
+button-border: Default button border
+button-foreground: Default button foreground
 dirty-indicator: Unsaved changes indicator
 code-background: Code background
 code-border: Code border
@@ -58,6 +61,7 @@ sidebar-tab-foreground-selected: Sidebar tab foreground for selected tabs
 sidebar-tab-foreground: Sidebar tab foreground
 sidebar-tiddler-link-foreground-hover: Sidebar tiddler link foreground hover
 sidebar-tiddler-link-foreground: Sidebar tiddler link foreground
+site-title-foreground: Site title foreground
 static-alert-foreground: Static alert foreground
 tab-background-selected: Tab background for selected tabs
 tab-background: Tab background

core/language/en-GB/EditTemplate.multids

@@ -11,8 +11,10 @@ Fields/Add/Button: add
 Fields/Add/Name/Placeholder: field name
 Fields/Add/Prompt: Add a new field:
 Fields/Add/Value/Placeholder: field value
-Shadow/Warning: This is a shadow tiddler. Any changes will override the default version
-Shadow/OverriddenWarning: This is a modified shadow tiddler. You can revert to the default version by deleting this tiddler
+Fields/Add/Dropdown/System: System fields
+Fields/Add/Dropdown/User: User fields
+Shadow/Warning: This is a shadow tiddler. Any changes you make will override the default version from the plugin <<pluginLink>>
+Shadow/OverriddenWarning: This is a modified shadow tiddler. You can revert to the default version in the plugin <<pluginLink>> by deleting this tiddler
 Tags/Add/Button: add
 Tags/Add/Placeholder: tag name
 Tags/Dropdown/Caption: tag list

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

@@ -1,7 +1,7 @@
 title: $:/language/Help/load
 description: Load tiddlers from a file
 
-Load tiddlers from 2.x.x TiddlyWiki files (`.html`), `.tiddler`, `.tid`, `.json` or other files 
+Load tiddlers from 2.x.x TiddlyWiki files (`.html`), `.tiddler`, `.tid`, `.json` or other files
 
 ```
 --load <filepath>

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

@@ -7,3 +7,4 @@ Set a password for subsequent crypto operations
 --password <password>
 ```
 
+''Note'': This should not be used for serving TiddlyWiki with password protection. Instead, see the password option under the [[ServerCommand]].

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

@@ -1,10 +1,10 @@
 title: $:/language/Help/rendertiddler
 description: Render an individual tiddler as a specified ContentType
 
-Render an individual tiddler as a specified ContentType, defaults to `text/html` and save it to the specified filename:
+Render an individual tiddler as a specified ContentType, defaulting to `text/html` and save it to the specified filename. Optionally a template can be specified, in which case the template tiddler is rendered with the "currentTiddler" variable set to the tiddler that is being rendered (the first parameter value).
 
 ```
---rendertiddler <title> <filename> [<type>]
+--rendertiddler <title> <filename> [<type>] [<template>]
 ```
 
 By default, the filename 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/Help/rendertiddlers.tid

@@ -15,4 +15,4 @@ For example:
 
 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.
 
-Any files in the target directory are deleted unless the "noclean" parameter is specified. The target directory is recursively created if it is missing.
+Any files in the target directory are deleted unless the ''noclean'' flag is specified. The target directory is recursively created if it is missing.

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

@@ -1,7 +1,7 @@
 title: $:/language/Help/savetiddler
 description: Saves a raw tiddler to a file
 
-Saves an individual tiddler in its raw text or binary format to the specified filename. 
+Saves an individual tiddler in its raw text or binary format to the specified filename.
 
 ```
 --savetiddler <title> <filename>

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

@@ -1,12 +1,14 @@
 title: $:/language/Help/savetiddlers
 description: Saves a group of raw tiddlers to a directory
 
-Saves a group of tiddlers in their raw text or binary format to the specified directory. 
+Saves a group of tiddlers in their raw text or binary format to the specified directory.
 
 ```
---savetiddlers <filter> <pathname>
+--savetiddlers <filter> <pathname> ["noclean"]
 ```
 
 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.
 
+The output directory is cleared of existing files before saving the specified files. The deletion can be disabled by specifying the ''noclean'' flag.
+
 Any missing directories in the pathname are automatically created.

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

@@ -12,7 +12,7 @@ At the root, it serves a rendering of a specified tiddler. Away from the root, i
 The parameters are:
 
 * ''port'' - port number to serve from (defaults to "8080")
-* ''roottiddler'' - the tiddler to serve at the root (defaults to "$:/core/save/all") 
+* ''roottiddler'' - the tiddler to serve at the root (defaults to "$:/core/save/all")
 * ''rendertype'' - the content type to which the root tiddler should be rendered (defaults to "text/plain")
 * ''servetype'' - the content type with which the root tiddler should be served (defaults to "text/html")
 * ''username'' - the default username for signing edits

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

@@ -14,5 +14,4 @@ The parameters are:
 * ''filter'' - filter identifying the tiddlers to be affected
 * ''fieldname'' - the field to modify (defaults to "text")
 * ''templatetitle'' - the tiddler to wikify into the specified field. If blank or missing then the specified field is deleted
-* ''type'' - the text type to render (defaults to "text/plain"; "text/html" can be used to include HTML tags)
-
+* ''rendertype'' - the text type to render (defaults to "text/plain"; "text/html" can be used to include HTML tags)

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

@@ -1,7 +1,7 @@
 title: $:/language/Help/verbose
 description: Triggers verbose output mode
 
-Triggers verbose output, useful for debugging 
+Triggers verbose output, useful for debugging
 
 ```
 --verbose

core/language/en-GB/Import.multids

@@ -1,13 +1,14 @@
 title: $:/language/Import/
 
+Imported: The following tiddlers were imported:
 Listing/Cancel/Caption: Cancel
 Listing/Hint: These tiddlers are ready to import:
 Listing/Import/Caption: Import
 Listing/Select/Caption: Select
 Listing/Status/Caption: Status
 Listing/Title/Caption: Title
-Upgrader/Plugins/Suppressed/Incompatible: Blocked incompatible or obsolete plugin 
-Upgrader/Plugins/Suppressed/Version: Blocked plugin (due to incoming <<incoming>>  being older than existing <<existing>>)
+Upgrader/Plugins/Suppressed/Incompatible: Blocked incompatible or obsolete plugin
+Upgrader/Plugins/Suppressed/Version: Blocked plugin (due to incoming <<incoming>> being older than existing <<existing>>)
 Upgrader/Plugins/Upgraded: Upgraded plugin from <<incoming>> to <<upgraded>>
 Upgrader/State/Suppressed: Blocked temporary state tiddler
 Upgrader/System/Suppressed: Blocked system tiddler

core/language/en-GB/Misc.multids

@@ -1,7 +1,8 @@
 title: $:/language/
 
+AboveStory/ClassicPlugin/Warning: It looks like you are trying to load a plugin designed for ~TiddlyWiki Classic. Please note that [[these plugins do not work with TiddlyWiki version 5.x.x|http://tiddlywiki.com/#TiddlyWikiClassic]]. ~TiddlyWiki Classic plugins detected:
 BinaryWarning/Prompt: This tiddler contains binary data
-ClassicWarning/Hint: This tiddler is written in TiddlyWiki Classic wiki text format, which is not fully compatible with TiddlyWiki version 5. See http://tiddlywiki.com/static/Upgrading.html for more details. 
+ClassicWarning/Hint: This tiddler is written in TiddlyWiki Classic wiki text format, which is not fully compatible with TiddlyWiki version 5. See http://tiddlywiki.com/static/Upgrading.html for more details.
 ClassicWarning/Upgrade/Caption: upgrade
 CloseAll/Button: close all
 ConfirmCancelTiddler: Do you wish to discard changes to the tiddler "<$text text=<<title>>/>"?
@@ -18,14 +19,20 @@ Encryption/Password: Password
 Encryption/RepeatPassword: Repeat password
 Encryption/PasswordNoMatch: Passwords do not match
 Encryption/SetPassword: Set password
+InternalJavaScriptError/Title: Internal JavaScript Error
+InternalJavaScriptError/Hint: Well, this is embarrassing. It is recommended that you restart TiddlyWiki by refreshing your browser
 InvalidFieldName: Illegal characters in field name "<$text text=<<fieldName>>/>". Fields can only contain lowercase letters, digits and the characters underscore (`_`), hyphen (`-`) and period (`.`)
+LazyLoadingWarning: <p>Loading external text from ''<$text text={{!!_canonical_uri}}/>''</p><p>If this message doesn't disappear you may be using a browser that doesn't support external text in this configuration. See http://tiddlywiki.com/#ExternalText</p>
 MissingTiddler/Hint: Missing tiddler "<$text text=<<currentTiddler>>/>" - click {{$:/core/images/edit-button}} to create
 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 plugins to take effect
 RecentChanges/DateFormat: DDth MMM YYYY
 SystemTiddler/Tooltip: This is a system tiddler
 TagManager/Colour/Heading: Colour
+TagManager/Count/Heading: Count
 TagManager/Icon/Heading: Icon
 TagManager/Info/Heading: Info
 TagManager/Tag/Heading: Tag
+Tiddler/DateFormat: DDth MMM YYYY at hh12:0mmam
 UnsavedChangesWarning: You have unsaved changes in TiddlyWiki

core/language/en-GB/Search.multids

@@ -5,6 +5,9 @@ Filter/Caption: Filter
 Filter/Hint: Search via a [[filter expression|http://tiddlywiki.com/static/Filters.html]]
 Filter/Matches: //<small><<resultCount>> matches</small>//
 Matches: //<small><<resultCount>> matches</small>//
+Matches/All: All matches:
+Matches/Title: Title matches:
+Search: Search
 Shadows/Caption: Shadows
 Shadows/Hint: Search for shadow tiddlers
 Shadows/Matches: //<small><<resultCount>> matches</small>//

core/modules/commands/rendertiddler.js

@@ -32,9 +32,15 @@ Command.prototype.execute = function() {
 		path = require("path"),
 		title = this.params[0],
 		filename = path.resolve(this.commander.outputPath,this.params[1]),
-		type = this.params[2] || "text/html";
+		type = this.params[2] || "text/html",
+		template = this.params[3],
+		variables = {};
 	$tw.utils.createFileDirectories(filename);
-	fs.writeFile(filename,this.commander.wiki.renderTiddler(type,title),"utf8",function(err) {
+	if(template) {
+		variables.currentTiddler = title;
+		title = template;
+	}
+	fs.writeFile(filename,this.commander.wiki.renderTiddler(type,title,{variables: variables}),"utf8",function(err) {
 		self.callback(err);
 	});
 	return null;

core/modules/commands/rendertiddlers.js

@@ -39,7 +39,7 @@ Command.prototype.execute = function() {
 		pathname = path.resolve(outputPath,this.params[2]),		
 		type = this.params[3] || "text/html",
 		extension = this.params[4] || ".html",
-		deleteDirectory = (this.params[5] || "") != "noclean",
+		deleteDirectory = (this.params[5] || "").toLowerCase() !== "noclean",
 		tiddlers = wiki.filterTiddlers(filter);
 	if(deleteDirectory) {
 		$tw.utils.deleteDirectory(pathname);

core/modules/commands/savelibrarytiddlers.js

@@ -43,7 +43,7 @@ Command.prototype.execute = function() {
 		basepath = this.params[2],
 		skinnyListTitle = this.params[3];
 	// Get the container tiddler as data
-	var containerData = self.commander.wiki.getTiddlerData(containerTitle,undefined);
+	var containerData = self.commander.wiki.getTiddlerDataCached(containerTitle,undefined);
 	if(!containerData) {
 		return "'" + containerTitle + "' is not a tiddler bundle";
 	}

core/modules/commands/savetiddlers.js

@@ -35,8 +35,11 @@ Command.prototype.execute = function() {
 		wiki = this.commander.wiki,
 		filter = this.params[0],
 		pathname = path.resolve(this.commander.outputPath,this.params[1]),
+		deleteDirectory = (this.params[2] || "").toLowerCase() !== "noclean",
 		tiddlers = wiki.filterTiddlers(filter);
-	$tw.utils.deleteDirectory(pathname);
+	if(deleteDirectory) {
+		$tw.utils.deleteDirectory(pathname);
+	}
 	$tw.utils.createDirectory(pathname);
 	$tw.utils.each(tiddlers,function(title) {
 		var tiddler = self.commander.wiki.getTiddler(title),

core/modules/commands/server.js

@@ -12,7 +12,7 @@ Serve tiddlers over http
 /*global $tw: false */
 "use strict";
 
-if(!$tw.browser) {
+if($tw.node) {
 	var util = require("util"),
 		fs = require("fs"),
 		url = require("url"),
@@ -170,7 +170,7 @@ var Command = function(params,commander,callback) {
 			if(fields.revision) {
 				delete fields.revision;
 			}
-			state.wiki.addTiddler(new $tw.Tiddler(state.wiki.getCreationFields(),fields,{title: title}));
+			state.wiki.addTiddler(new $tw.Tiddler(state.wiki.getCreationFields(),fields,{title: title},state.wiki.getModificationFields()));
 			var changeCount = state.wiki.getChangeCount(title).toString();
 			response.writeHead(204, "OK",{
 				Etag: "\"default/" + encodeURIComponent(title) + "/" + changeCount + ":\"",
@@ -300,6 +300,10 @@ Command.prototype.execute = function() {
 	this.server.listen(port,host);
 	console.log("Serving on " + host + ":" + port);
 	console.log("(press ctrl-C to exit)");
+	// Warn if required plugins are missing
+	if(!$tw.wiki.getTiddler("$:/plugins/tiddlywiki/tiddlyweb") || !$tw.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");
+	}
 	return null;
 };
 

core/modules/commands/unpackplugin.js

@@ -29,7 +29,7 @@ Command.prototype.execute = function() {
 	}
 	var self = this,
 		title = this.params[0],
-		pluginData = this.commander.wiki.getTiddlerData(title);
+		pluginData = this.commander.wiki.getTiddlerDataCached(title);
 	if(!pluginData) {
 		return "Plugin '" + title + "' not found";
 	}

core/modules/filters/days.js

@@ -0,0 +1,49 @@
+/*\
+title: $:/core/modules/filters/days.js
+type: application/javascript
+module-type: filteroperator
+
+Filter operator that selects tiddlers with a specified date field within a specified date interval.
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+/*
+Export our filter function
+*/
+exports.days = function(source,operator,options) {
+	var results = [],
+		fieldName = operator.suffix || "modified",
+		dayInterval = (parseInt(operator.operand,10)||0),
+		dayIntervalSign = $tw.utils.sign(dayInterval),
+		targetTimeStamp = (new Date()).setHours(0,0,0,0) + 1000*60*60*24*dayInterval,
+		isWithinDays = function(dateField) {
+			var sign = $tw.utils.sign(targetTimeStamp - (new Date(dateField)).setHours(0,0,0,0));
+			return sign === 0 || sign === dayIntervalSign;
+		};
+
+	if(operator.prefix === "!") {
+		source(function(tiddler,title) {
+			if(tiddler && tiddler.fields[fieldName]) {
+				if(!isWithinDays($tw.utils.parseDate(tiddler.fields[fieldName]))) {
+					results.push(title);
+				}
+			}
+		});
+	} else {
+		source(function(tiddler,title) {
+			if(tiddler && tiddler.fields[fieldName]) {
+				if(isWithinDays($tw.utils.parseDate(tiddler.fields[fieldName]))) {
+					results.push(title);
+				}
+			}
+		});
+	}
+	return results;
+};
+
+})();

core/modules/filters/each.js

@@ -3,7 +3,8 @@ title: $:/core/modules/filters/each.js
 type: application/javascript
 module-type: filteroperator
 
-Filter operator that selects one tiddler for each unique value of the specified field
+Filter operator that selects one tiddler for each unique value of the specified field.
+With suffix "list", selects all tiddlers that are values in a specified list field.
 
 \*/
 (function(){
@@ -16,22 +17,34 @@ Filter operator that selects one tiddler for each unique value of the specified
 Export our filter function
 */
 exports.each = function(source,operator,options) {
-	var results = [],
-		values = {};
-	source(function(tiddler,title) {
-		if(tiddler) {
-			var value;
-			if((operator.operand === "") || (operator.operand === "title")) {
-				value = title;
-			} else {
-				value = tiddler.getFieldString(operator.operand);
+	var results =[] ,
+		value,values = {},
+		field = operator.operand || "title";
+	if(operator.suffix !== "list-item") {
+		source(function(tiddler,title) {
+			if(tiddler) {
+				value = (field === "title") ? title : tiddler.getFieldString(field);
+				if(!$tw.utils.hop(values,value)) {
+					values[value] = true;
+					results.push(title);
+				}
 			}
-			if(!$tw.utils.hop(values,value)) {
-				values[value] = true;
-				results.push(title);
+		});
+	} else {
+		source(function(tiddler,title) {
+			if(tiddler) {
+				$tw.utils.each(
+					options.wiki.getTiddlerList(title,field),
+					function(value) {
+						if(!$tw.utils.hop(values,value)) {
+							values[value] = true;
+							results.push(value);
+						}
+					}
+				);
 			}
-		}
-	});
+		});
+	}
 	return results;
 };
 

core/modules/filters/indexes.js

@@ -18,7 +18,7 @@ Export our filter function
 exports.indexes = function(source,operator,options) {
 	var results = [];
 	source(function(tiddler,title) {
-		var data = options.wiki.getTiddlerData(title);
+		var data = options.wiki.getTiddlerDataCached(title);
 		if(data) {
 			$tw.utils.pushTop(results,Object.keys(data));
 		}

core/modules/filters/plugintiddlers.js

@@ -18,7 +18,7 @@ Export our filter function
 exports.plugintiddlers = function(source,operator,options) {
 	var results = [];
 	source(function(tiddler,title) {
-		var pluginInfo = options.wiki.getPluginInfo(title) || options.wiki.getTiddlerData(title,{tiddlers:[]});
+		var pluginInfo = options.wiki.getPluginInfo(title) || options.wiki.getTiddlerDataCached(title,{tiddlers:[]});
 		if(pluginInfo && pluginInfo.tiddlers) {
 			$tw.utils.each(pluginInfo.tiddlers,function(fields,title) {
 				results.push(title);

core/modules/filters/tags.js

@@ -16,13 +16,16 @@ Filter operator returning all the tags of the selected tiddlers
 Export our filter function
 */
 exports.tags = function(source,operator,options) {
-	var results = [];
+	var tags = {};
 	source(function(tiddler,title) {
+		var t, length;
 		if(tiddler && tiddler.fields.tags) {
-			$tw.utils.pushTop(results,tiddler.fields.tags);
+			for(t=0, length=tiddler.fields.tags.length; t<length; t++) {
+				tags[tiddler.fields.tags[t]] = true;
+			}
 		}
 	});
-	return results;
+	return Object.keys(tags);
 };
 
 })();

core/modules/filters/wikiparserrules.js

@@ -0,0 +1,30 @@
+/*\
+title: $:/core/modules/filters/wikiparserrules.js
+type: application/javascript
+module-type: filteroperator
+
+Filter operator for returning the names of the wiki parser rules in this wiki
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+/*
+Export our filter function
+*/
+exports.wikiparserrules = function(source,operator,options) {
+	var results = [];
+	$tw.utils.each($tw.modules.types.wikirule,function(mod) {
+		var exp = mod.exports;
+		if(exp.types[operator.operand]) {
+			results.push(exp.name);
+		}
+	});
+	results.sort();
+	return results;
+};
+
+})();

core/modules/filters/x-listops.js

@@ -0,0 +1,189 @@
+/*\
+title: $:/core/modules/filters/x-listops.js
+type: application/javascript
+module-type: filteroperator
+
+Extended filter operators to manipulate the current list.
+
+\*/
+(function () {
+
+    /*jslint node: true, browser: true */
+    /*global $tw: false */
+    "use strict";
+
+    /*
+    Fetch titles from the current list
+    */
+    var prepare_results = function (source) {
+    var results = [];
+        source(function (tiddler, title) {
+            results.push(title);
+        });
+        return results;
+    };
+
+    /*
+    Moves a number of items from the tail of the current list before the item named in the operand
+    */
+    exports.putbefore = function (source, operator) {
+        var results = prepare_results(source),
+            index = results.indexOf(operator.operand),
+            count = parseInt(operator.suffix) || 1;
+        return (index === -1) ?
+            results.slice(0, -1) :
+            results.slice(0, index).concat(results.slice(-count)).concat(results.slice(index, -count));
+    };
+
+    /*
+    Moves a number of items from the tail of the current list after the item named in the operand
+    */
+    exports.putafter = function (source, operator) {
+        var results = prepare_results(source),
+            index = results.indexOf(operator.operand),
+            count = parseInt(operator.suffix) || 1;
+        return (index === -1) ?
+            results.slice(0, -1) :
+            results.slice(0, index + 1).concat(results.slice(-count)).concat(results.slice(index + 1, -count));
+    };
+
+    /*
+    Replaces the item named in the operand with a number of items from the tail of the current list
+    */
+    exports.replace = function (source, operator) {
+        var results = prepare_results(source),
+            index = results.indexOf(operator.operand),
+            count = parseInt(operator.suffix) || 1;
+        return (index === -1) ?
+            results.slice(0, -count) :
+            results.slice(0, index).concat(results.slice(-count)).concat(results.slice(index + 1, -count));
+    };
+
+    /*
+    Moves a number of items from the tail of the current list to the head of the list
+    */
+    exports.putfirst = function (source, operator) {
+        var results = prepare_results(source),
+            count = parseInt(operator.suffix) || 1;
+        return results.slice(-count).concat(results.slice(0, -count));
+    };
+
+    /*
+    Moves a number of items from the head of the current list to the tail of the list
+    */
+    exports.putlast = function (source, operator) {
+        var results = prepare_results(source),
+            count = parseInt(operator.suffix) || 1;
+        return results.slice(count).concat(results.slice(0, count));
+    };
+
+    /*
+    Moves the item named in the operand a number of places forward or backward in the list
+    */
+    exports.move = function (source, operator) {
+        var results = prepare_results(source),
+            index = results.indexOf(operator.operand),
+            count = parseInt(operator.suffix) || 1,
+            marker = results.splice(index, 1);
+        return results.slice(0, index + count).concat(marker).concat(results.slice(index + count));
+    };
+
+    /*
+    Returns the items from the current list that are after the item named in the operand
+    */
+    exports.allafter = function (source, operator) {
+        var results = prepare_results(source),
+            index = results.indexOf(operator.operand);
+        return (index === -1 || index > (results.length - 2)) ? [] :
+            (operator.suffix) ? results.slice(index) :
+            results.slice(index + 1);
+    };
+
+    /*
+    Returns the items from the current list that are before the item named in the operand
+    */
+    exports.allbefore = function (source, operator) {
+        var results = prepare_results(source),
+            index = results.indexOf(operator.operand);
+        return (index <= 0) ? [] :
+            (operator.suffix) ? results.slice(0, index + 1) :
+            results.slice(0, index);
+    };
+
+    /*
+    Appends the items listed in the operand array to the tail of the current list
+    */
+    exports.append = function (source, operator) {
+        var append = $tw.utils.parseStringArray(operator.operand, "true"),
+            results = prepare_results(source),
+            count = parseInt(operator.suffix) || append.length;
+        return (append.length === 0) ? results :
+            (operator.prefix) ? results.concat(append.slice(-count)) :
+            results.concat(append.slice(0, count));
+    };
+
+    /*
+    Prepends the items listed in the operand array to the head of the current list
+    */
+    exports.prepend = function (source, operator) {
+        var prepend = $tw.utils.parseStringArray(operator.operand, "true"),
+            results = prepare_results(source),
+            count = parseInt(operator.suffix) || prepend.length;
+        return (prepend.length === 0) ? results :
+            (operator.prefix) ? prepend.slice(-count).concat(results) :
+            prepend.slice(0, count).concat(results);
+    };
+
+    /*
+    Returns all items from the current list except the items listed in the operand array
+    */
+    exports.remove = function (source, operator) {
+        var array = $tw.utils.parseStringArray(operator.operand, "true"),
+            results = prepare_results(source),
+            count = parseInt(operator.suffix) || array.length,
+            p,
+            len,
+            index;
+        len = array.length - 1;
+        for (p = 0; p < count; ++p) {
+            if (operator.prefix) {
+                index = results.indexOf(array[len - p]);
+            } else {
+                index = results.indexOf(array[p]);
+            }
+            if (index !== -1) {
+                results.splice(index, 1);
+            }
+        }
+        return results;
+    };
+
+    /*
+    Returns all items from the current list sorted in the order of the items in the operand array
+    */
+    exports.sortby = function (source, operator) {
+        var results = prepare_results(source);
+        if (!results || results.length < 2) {
+            return results;
+        }
+        var lookup = $tw.utils.parseStringArray(operator.operand, "true");
+        results.sort(function (a, b) {
+            return lookup.indexOf(a) - lookup.indexOf(b);
+        });
+        return results;
+    };
+
+    /*
+    Removes all duplicate items from the current list
+    */
+    exports.unique = function (source, operator) {
+        var results = prepare_results(source);
+        var set = results.reduce(function (a, b) {
+            if (a.indexOf(b) < 0) {
+                a.push(b);
+            }
+            return a;
+        }, []);
+        return set;
+    };
+})();

core/modules/language.js

@@ -22,7 +22,7 @@ function Language(options) {
 }
 
 /*
-Return a single translateable string. The title is automatically prefixed with "$:/language/"
+Return a wikified translateable string. The title is automatically prefixed with "$:/language/"
 Options include:
 variables: optional hashmap of variables to supply to the language wikification
 */
@@ -32,6 +32,14 @@ Language.prototype.getString = function(title,options) {
 	return this.wiki.renderTiddler("text/plain",title,{variables: options.variables});
 };
 
+/*
+Return a raw, unwikified translateable string. The title is automatically prefixed with "$:/language/"
+*/
+Language.prototype.getRawString = function(title) {
+	title = "$:/language/" + title;
+	return this.wiki.getTiddlerText(title);
+};
+
 exports.Language = Language;
 
 })();

core/modules/macros/contrastcolour.js

@@ -33,10 +33,20 @@ exports.run = function(target,fallbackTarget,colourA,colourB) {
 	if(!rgbTarget) {
 		return colourA;
 	}
-	// Colour brightness formula derived from http://www.w3.org/WAI/ER/WD-AERT/#color-contrast
 	var rgbColourA = $tw.utils.parseCSSColor(colourA),
-		rgbColourB = $tw.utils.parseCSSColor(colourB),
-		brightnessTarget = rgbTarget[0] * 0.299 + rgbTarget[1] * 0.587 + rgbTarget[2] * 0.114,
+		rgbColourB = $tw.utils.parseCSSColor(colourB);
+	if(rgbColourA && !rgbColourB) {
+		return rgbColourA;
+	}
+	if(rgbColourB && !rgbColourA) {
+		return rgbColourB;
+	}
+	if(!rgbColourA && !rgbColourB) {
+		// If neither colour is readable, return a crude inverse of the target
+		return [255 - rgbTarget[0],255 - rgbTarget[1],255 - rgbTarget[2],rgbTarget[3]];
+	}
+	// Colour brightness formula derived from http://www.w3.org/WAI/ER/WD-AERT/#color-contrast
+	var brightnessTarget = rgbTarget[0] * 0.299 + rgbTarget[1] * 0.587 + rgbTarget[2] * 0.114,
 		brightnessA = rgbColourA[0] * 0.299 + rgbColourA[1] * 0.587 + rgbColourA[2] * 0.114,
 		brightnessB = rgbColourB[0] * 0.299 + rgbColourB[1] * 0.587 + rgbColourB[2] * 0.114;
 	return Math.abs(brightnessTarget - brightnessA) > Math.abs(brightnessTarget - brightnessB) ? colourA : colourB;

core/modules/parsers/parseutils.js

@@ -32,29 +32,39 @@ The exception is `skipWhiteSpace`, which just returns the position after the whi
 Look for a whitespace token. Returns null if not found, otherwise returns {type: "whitespace", start:, end:,}
 */
 exports.parseWhiteSpace = function(source,pos) {
-	var node = {
-		type: "whitespace",
-		start: pos
-	};
-	var re = /(\s)+/g;
-	re.lastIndex = pos;
-	var match = re.exec(source);
-	if(match && match.index === pos) {
-		node.end = pos + match[0].length;
-		return node;
+	var p = pos,c;
+	while(true) {
+		c = source.charAt(p);
+		if((c === " ") || (c === "\f") || (c === "\n") || (c === "\r") || (c === "\t") || (c === "\v") || (c === "\u00a0")) { // Ignores some obscure unicode spaces
+			p++;
+		} else {
+			break;
+		}
+	}
+	if(p === pos) {
+		return null;
+	} else {
+		return {
+			type: "whitespace",
+			start: pos,
+			end: p
+		}
 	}
-	return null;
 };
 
 /*
 Convenience wrapper for parseWhiteSpace. Returns the position after the whitespace
 */
 exports.skipWhiteSpace = function(source,pos) {
-	var whitespace = $tw.utils.parseWhiteSpace(source,pos);
-	if(whitespace) {
-		return whitespace.end;
+	var c;
+	while(true) {
+		c = source.charAt(pos);
+		if((c === " ") || (c === "\f") || (c === "\n") || (c === "\r") || (c === "\t") || (c === "\v") || (c === "\u00a0")) { // Ignores some obscure unicode spaces
+			pos++;
+		} else {
+			return pos;
+		}
 	}
-	return pos;
 };
 
 /*

core/modules/parsers/videoparser.js

@@ -0,0 +1,35 @@
+/*\
+title: $:/core/modules/parsers/videoparser.js
+type: application/javascript
+module-type: parser
+
+The video parser parses a video tiddler into an embeddable HTML element
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+var AudioParser = function(type,text,options) {
+	var element = {
+			type: "element",
+			tag: "video",
+			attributes: {
+				controls: {type: "string", value: "controls"}
+			}
+		},
+		src;
+	if(options._canonical_uri) {
+		element.attributes.src = {type: "string", value: options._canonical_uri};
+	} else if(text) {
+		element.attributes.src = {type: "string", value: "data:" + type + ";base64," + text};
+	}
+	this.tree = [element];
+};
+
+exports["video/mp4"] = AudioParser;
+
+})();
+

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

@@ -78,10 +78,13 @@ exports.parse = function() {
 	}
 	// Save the macro definition
 	return [{
-		type: "macrodef",
-		name: this.match[1],
-		params: params,
-		text: text
+		type: "set",
+		attributes: {
+			name: {type: "string", value: this.match[1]},
+			value: {type: "string", value: text}
+		},
+		children: [],
+		params: params
 	}];
 };
 

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

@@ -18,7 +18,7 @@ exports.types = {inline: true};
 exports.init = function(parser) {
 	this.parser = parser;
 	// Regexp to match
-	this.matchRegExp = /~?\$:[^\s<|]+(?:[^\s<|])/mg;
+	this.matchRegExp = /~?\$:\/[a-zA-Z0-9/.\-_]+/mg;
 };
 
 exports.parse = function() {

core/modules/parsers/wikiparser/wikiparser.js

@@ -26,15 +26,24 @@ Attributes are stored as hashmaps of the following objects:
 
 var WikiParser = function(type,text,options) {
 	this.wiki = options.wiki;
+	var self = this;
+	// Check for an externally linked tiddler
+	if($tw.browser && (text || "") === "" && options._canonical_uri) {
+		this.loadRemoteTiddler(options._canonical_uri);
+		text = $tw.language.getRawString("LazyLoadingWarning");
+	}
 	// Initialise the classes if we don't have them already
 	if(!this.pragmaRuleClasses) {
 		WikiParser.prototype.pragmaRuleClasses = $tw.modules.createClassesFromModules("wikirule","pragma",$tw.WikiRuleBase);
+		this.setupRules(WikiParser.prototype.pragmaRuleClasses,"$:/config/WikiParserRules/Pragmas/");
 	}
 	if(!this.blockRuleClasses) {
 		WikiParser.prototype.blockRuleClasses = $tw.modules.createClassesFromModules("wikirule","block",$tw.WikiRuleBase);
+		this.setupRules(WikiParser.prototype.blockRuleClasses,"$:/config/WikiParserRules/Block/");
 	}
 	if(!this.inlineRuleClasses) {
 		WikiParser.prototype.inlineRuleClasses = $tw.modules.createClassesFromModules("wikirule","inline",$tw.WikiRuleBase);
+		this.setupRules(WikiParser.prototype.inlineRuleClasses,"$:/config/WikiParserRules/Inline/");
 	}
 	// Save the parse text
 	this.type = type || "text/vnd.tiddlywiki";
@@ -48,16 +57,51 @@ var WikiParser = function(type,text,options) {
 	this.blockRules = this.instantiateRules(this.blockRuleClasses,"block",0);
 	this.inlineRules = this.instantiateRules(this.inlineRuleClasses,"inline",0);
 	// Parse any pragmas
-	this.tree = this.parsePragmas();
+	this.tree = [];
+	var topBranch = this.parsePragmas();
 	// Parse the text into inline runs or blocks
 	if(options.parseAsInline) {
-		this.tree.push.apply(this.tree,this.parseInlineRun());
+		topBranch.push.apply(topBranch,this.parseInlineRun());
 	} else {
-		this.tree.push.apply(this.tree,this.parseBlocks());
+		topBranch.push.apply(topBranch,this.parseBlocks());
 	}
 	// Return the parse tree
 };
 
+/*
+*/
+WikiParser.prototype.loadRemoteTiddler = function(url) {
+	var self = this;
+	$tw.utils.httpRequest({
+		url: url,
+		type: "GET",
+		callback: function(err,data) {
+			if(!err) {
+				var tiddlers = self.wiki.deserializeTiddlers(".tid",data,self.wiki.getCreationFields());
+				$tw.utils.each(tiddlers,function(tiddler) {
+					tiddler["_canonical_uri"] = url;
+				});
+				if(tiddlers) {
+					self.wiki.addTiddlers(tiddlers);
+				}
+			}
+		}
+	});
+};
+
+/*
+*/
+WikiParser.prototype.setupRules = function(proto,configPrefix) {
+	var self = this;
+	if(!$tw.safemode) {
+		$tw.utils.each(proto,function(object,name) {
+			if(self.wiki.getTiddlerText(configPrefix + name,"enable") !== "enable") {
+				delete proto[name];
+			}
+		});
+	}
+};
+
 /*
 Instantiate an array of parse rules
 */
@@ -122,7 +166,7 @@ WikiParser.prototype.findNextMatch = function(rules,startPos) {
 Parse any pragmas at the beginning of a block of parse text
 */
 WikiParser.prototype.parsePragmas = function() {
-	var tree = [];
+	var currentTreeBranch = this.tree;
 	while(true) {
 		// Skip whitespace
 		this.skipWhitespace();
@@ -137,9 +181,15 @@ WikiParser.prototype.parsePragmas = function() {
 			break;
 		}
 		// Process the pragma rule
-		tree.push.apply(tree,nextMatch.rule.parse());
+		var subTree = nextMatch.rule.parse();
+		if(subTree.length > 0) {
+			// Quick hack; we only cope with a single parse tree node being returned, which is true at the moment
+			currentTreeBranch.push.apply(currentTreeBranch,subTree);
+			subTree[0].children = [];
+			currentTreeBranch = subTree[0].children;
+		}
 	}
-	return tree;
+	return currentTreeBranch;
 };
 
 /*

core/modules/saver-handler.js

@@ -75,14 +75,14 @@ function SaverHandler(options) {
 			}
 		});
 		// Set up our beforeunload handler
-		window.onbeforeunload = function(event) {
+		$tw.addUnloadTask(function(event) {
 			var confirmationMessage;
 			if(self.isDirty()) {
 				confirmationMessage = $tw.language.getString("UnsavedChangesWarning");
 				event.returnValue = confirmationMessage; // Gecko
 			}
 			return confirmationMessage;
-		};
+		});
 	}
 	// Install the save action handlers
 	if($tw.browser) {

core/modules/startup/render.js

@@ -24,6 +24,7 @@ var PAGE_STYLESHEET_TITLE = "$:/core/ui/PageStylesheet";
 var PAGE_TEMPLATE_TITLE = "$:/core/ui/PageTemplate";
 
 // Time (in ms) that we defer refreshing changes to draft tiddlers
+var DRAFT_TIDDLER_TIMEOUT_TITLE = "$:/config/Drafts/TypingTimeout";
 var DRAFT_TIDDLER_TIMEOUT = 400;
 
 exports.startup = function() {
@@ -81,7 +82,11 @@ exports.startup = function() {
 		}
 		timerId = null;
 		if(onlyDraftsHaveChanged) {
-			timerId = setTimeout(refresh,DRAFT_TIDDLER_TIMEOUT);
+			var timeout = parseInt($tw.wiki.getTiddlerText(DRAFT_TIDDLER_TIMEOUT_TITLE,""),10);
+			if(isNaN(timeout)) {
+				timeout = DRAFT_TIDDLER_TIMEOUT;
+			}
+			timerId = setTimeout(refresh,timeout);
 			$tw.utils.extend(deferredChanges,changes);
 		} else {
 			$tw.utils.extend(deferredChanges,changes);

core/modules/startup/startup.js

@@ -18,7 +18,7 @@ exports.after = ["load-modules"];
 exports.synchronous = true;
 
 // Set to `true` to enable performance instrumentation
-var PERFORMANCE_INSTRUMENTATION = false;
+var PERFORMANCE_INSTRUMENTATION_CONFIG_TITLE = "$:/config/Performance/Instrumentation";
 
 var widget = require("$:/core/modules/widgets/widget.js");
 
@@ -29,7 +29,7 @@ exports.startup = function() {
 	}
 	$tw.version = $tw.utils.extractVersionInfo();
 	// Set up the performance framework
-	$tw.perf = new $tw.Performance(PERFORMANCE_INSTRUMENTATION);
+	$tw.perf = new $tw.Performance($tw.wiki.getTiddlerText(PERFORMANCE_INSTRUMENTATION_CONFIG_TITLE,"no") === "yes");
 	// Kick off the language manager and switcher
 	$tw.language = new $tw.Language();
 	$tw.languageSwitcher = new $tw.PluginSwitcher({

core/modules/startup/story.js

@@ -118,7 +118,7 @@ function openStartupTiddlers(options) {
 	}
 	// Process the story filter to get the story list
 	var storyList = $tw.wiki.filterTiddlers(storyFilter);
-	//invoke any hooks that might change the default story list
+	// Invoke any hooks that want to change the default story list
 	storyList = $tw.hooks.invokeHook("th-opening-default-tiddlers-list",storyList);
 	// If the target tiddler isn't included then splice it in at the top
 	if(target && storyList.indexOf(target) === -1) {

core/modules/startup/windows.js

@@ -0,0 +1,81 @@
+/*\
+title: $:/core/modules/startup/windows.js
+type: application/javascript
+module-type: startup
+
+Setup root widget handlers for the messages concerned with opening external browser windows
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+// Export name and synchronous status
+exports.name = "windows";
+exports.platforms = ["browser"];
+exports.after = ["startup"];
+exports.synchronous = true;
+
+// Global to keep track of open windows (hashmap by title)
+var windows = {};
+
+exports.startup = function() {
+	// Handle open window message
+	$tw.rootWidget.addEventListener("tm-open-window",function(event) {
+		// Get the parameters
+		var refreshHandler,
+			title = event.param || event.tiddlerTitle,
+			paramObject = event.paramObject || {},
+			template = paramObject.template || "$:/core/templates/single.tiddler.window",
+			width = paramObject.width || "700",
+			height = paramObject.height || "600",
+			variables = $tw.utils.extend({},paramObject,{currentTiddler: title});
+		// Open the window
+		var srcWindow = window.open("","external-" + title,"scrollbars,width=" + width + ",height=" + height),
+			srcDocument = srcWindow.document;
+		windows[title] = srcWindow;
+		// Check for reopening the same window
+		if(srcWindow.haveInitialisedWindow) {
+			return;
+		}
+		// Initialise the document
+		srcDocument.write("<html><head></head><body class='tc-body tc-single-tiddler-window'></body></html>");
+		srcDocument.close();
+		srcDocument.title = title;
+		srcWindow.addEventListener("beforeunload",function(event) {
+			delete windows[title];
+			$tw.wiki.removeEventListener("change",refreshHandler);
+		},false);
+		// Set up the styles
+		var styleWidgetNode = $tw.wiki.makeTranscludeWidget("$:/core/ui/PageStylesheet",{document: $tw.fakeDocument, variables: variables}),
+			styleContainer = $tw.fakeDocument.createElement("style");
+		styleWidgetNode.render(styleContainer,null);
+		var styleElement = srcDocument.createElement("style");
+		styleElement.innerHTML = styleContainer.textContent;
+		srcDocument.head.insertBefore(styleElement,srcDocument.head.firstChild);
+		// Render the text of the tiddler
+		var parser = $tw.wiki.parseTiddler(template),
+			widgetNode = $tw.wiki.makeWidget(parser,{document: srcDocument, parentWidget: $tw.rootWidget, variables: variables});
+		widgetNode.render(srcDocument.body,srcDocument.body.firstChild);
+		// Function to handle refreshes
+		refreshHandler = function(changes) {
+			if(styleWidgetNode.refresh(changes,styleContainer,null)) {
+				styleElement.innerHTML = styleContainer.textContent;
+			}
+			widgetNode.refresh(changes);
+		};
+		$tw.wiki.addEventListener("change",refreshHandler);
+		srcWindow.haveInitialisedWindow = true;
+	});
+	// Close open windows when unloading main window
+	$tw.addUnloadTask(function() {
+		$tw.utils.each(windows,function(win) {
+			win.close();
+		});
+	});
+
+};
+
+})();

core/modules/story.js

@@ -0,0 +1,138 @@
+/*\
+title: $:/core/modules/story.js
+type: application/javascript
+module-type: global
+
+Lightweight object for managing interactions with the story and history lists.
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+/*
+Construct Story object with options:
+wiki: reference to wiki object to use to resolve tiddler titles
+storyTitle: title of story list tiddler
+historyTitle: title of history list tiddler
+*/
+function Story(options) {
+	options = options || {};
+	this.wiki = options.wiki || $tw.wiki;
+	this.storyTitle = options.storyTitle || "$:/StoryList";
+	this.historyTitle = options.historyTitle || "$:/HistoryList";
+};
+
+Story.prototype.navigateTiddler = function(navigateTo,navigateFromTitle,navigateFromClientRect) {
+	this.addToStory(navigateTo,navigateFromTitle);
+	this.addToHistory(navigateTo,navigateFromClientRect);
+};
+
+Story.prototype.getStoryList = function() {
+	return this.wiki.getTiddlerList(this.storyTitle) || [];
+};
+
+Story.prototype.addToStory = function(navigateTo,navigateFromTitle,options) {
+	options = options || {};
+	var storyList = this.getStoryList();
+	// See if the tiddler is already there
+	var slot = storyList.indexOf(navigateTo);
+	// Quit if it already exists in the story river
+	if(slot >= 0) {
+		return;
+	}
+	// First we try to find the position of the story element we navigated from
+	var fromIndex = storyList.indexOf(navigateFromTitle);
+	if(fromIndex >= 0) {
+		// The tiddler is added from inside the river
+		// Determine where to insert the tiddler; Fallback is "below"
+		switch(options.openLinkFromInsideRiver) {
+			case "top":
+				slot = 0;
+				break;
+			case "bottom":
+				slot = storyList.length;
+				break;
+			case "above":
+				slot = fromIndex;
+				break;
+			case "below": // Intentional fall-through
+			default:
+				slot = fromIndex + 1;
+				break;
+		}
+	} else {
+		// The tiddler is opened from outside the river. Determine where to insert the tiddler; default is "top"
+		if(options.openLinkFromOutsideRiver === "bottom") {
+			// Insert at bottom
+			slot = storyList.length;
+		} else {
+			// Insert at top
+			slot = 0;
+		}
+	}
+	// Add the tiddler
+	storyList.splice(slot,0,navigateTo);
+	// Save the story
+	this.saveStoryList(storyList);
+};
+
+Story.prototype.saveStoryList = function(storyList) {
+	var storyTiddler = this.wiki.getTiddler(this.storyTitle);
+	this.wiki.addTiddler(new $tw.Tiddler(
+		this.wiki.getCreationFields(),
+		{title: this.storyTitle},
+		storyTiddler,
+		{list: storyList},
+		this.wiki.getModificationFields()
+	));
+};
+
+Story.prototype.addToHistory = function(navigateTo,navigateFromClientRect) {
+	var titles = $tw.utils.isArray(navigateTo) ? navigateTo : [navigateTo];
+	// Add a new record to the top of the history stack
+	var historyList = this.wiki.getTiddlerData(this.historyTitle,[]);
+	$tw.utils.each(titles,function(title) {
+		historyList.push({title: title, fromPageRect: navigateFromClientRect});
+	});
+	this.wiki.setTiddlerData(this.historyTitle,historyList,{"current-tiddler": titles[titles.length-1]});
+};
+
+Story.prototype.storyCloseTiddler = function(targetTitle) {
+// TBD
+};
+
+Story.prototype.storyCloseAllTiddlers = function() {
+// TBD
+};
+
+Story.prototype.storyCloseOtherTiddlers = function(targetTitle) {
+// TBD
+};
+
+Story.prototype.storyEditTiddler = function(targetTitle) {
+// TBD
+};
+
+Story.prototype.storyDeleteTiddler = function(targetTitle) {
+// TBD
+};
+
+Story.prototype.storySaveTiddler = function(targetTitle) {
+// TBD
+};
+
+Story.prototype.storyCancelTiddler = function(targetTitle) {
+// TBD
+};
+
+Story.prototype.storyNewTiddler = function(targetTitle) {
+// TBD
+};
+
+exports.Story = Story;
+
+
+})();

core/modules/storyviews/zoomin.js

@@ -18,7 +18,7 @@ var ZoominListView = function(listWidget) {
 	var self = this;
 	this.listWidget = listWidget;
 	// Get the index of the tiddler that is at the top of the history
-	var history = this.listWidget.wiki.getTiddlerData(this.listWidget.historyTitle,[]),
+	var history = this.listWidget.wiki.getTiddlerDataCached(this.listWidget.historyTitle,[]),
 		targetTiddler;
 	if(history.length > 0) {
 		targetTiddler = history[history.length-1].title;
@@ -151,6 +151,11 @@ ZoominListView.prototype.remove = function(widget) {
 		removeElement();
 		return;
 	}
+	// Abandon if hidden
+	if(targetElement.style.display != "block" ) {
+		removeElement();
+		return;
+	}
 	// Set up the tiddler that is being closed
 	$tw.utils.addClass(targetElement,"tc-storyview-zoomin-tiddler");
 	$tw.utils.setStyle(targetElement,[
@@ -203,4 +208,4 @@ ZoominListView.prototype.remove = function(widget) {
 
 exports.zoomin = ZoominListView;
 
-})();
+})();

core/modules/syncer.js

@@ -39,14 +39,14 @@ function Syncer(options) {
 	// Browser event handlers
 	if($tw.browser) {
 		// Set up our beforeunload handler
-		window.onbeforeunload = function(event) {
+		$tw.addUnloadTask(function(event) {
 			var confirmationMessage;
 			if(self.isDirty()) {
 				confirmationMessage = $tw.language.getString("UnsavedChangesWarning");
 				event.returnValue = confirmationMessage; // Gecko
 			}
 			return confirmationMessage;
-		};
+		});
 		// Listen out for login/logout/refresh events in the browser
 		$tw.rootWidget.addEventListener("tm-login",function() {
 			self.handleLoginEvent();

core/modules/upgraders/themetweaks.js

@@ -44,7 +44,7 @@ exports.upgrade = function(wiki,titles,tiddlers) {
 		var mapping = MAPPINGS[title];
 		if(mapping) {
 			var tiddler = new $tw.Tiddler(tiddlers[title]),
-				tiddlerData = wiki.getTiddlerData(tiddler,{});
+				tiddlerData = wiki.getTiddlerDataCached(tiddler,{});
 			for(var index in mapping) {
 				var mappedTitle = mapping[index];
 				if(!tiddlers[mappedTitle] || tiddlers[mappedTitle].title !== mappedTitle) {

core/modules/utils/dom/browser.js

@@ -43,7 +43,7 @@ exports.convertStyleNameToPropertyName = function(styleName) {
 	// Convert it by first removing any hyphens
 	var propertyName = $tw.utils.unHyphenateCss(styleName);
 	// Then check if it needs a prefix
-	if(document.body.style[propertyName] === undefined) {
+	if($tw.browser && document.body.style[propertyName] === undefined) {
 		var prefixes = ["O","MS","Moz","webkit"];
 		for(var t=0; t<prefixes.length; t++) {
 			var prefixedName = prefixes[t] + propertyName.substr(0,1).toUpperCase() + propertyName.substr(1);

core/modules/utils/dom/http.js

@@ -58,7 +58,11 @@ exports.httpRequest = function(options) {
 	if(data && !$tw.utils.hop(headers,"Content-type")) {
 		request.setRequestHeader("Content-type","application/x-www-form-urlencoded; charset=UTF-8");
 	}
-	request.send(data);
+	try {
+		request.send(data);
+	} catch(e) {
+		options.callback(e);
+	}
 	return request;
 };
 

core/modules/utils/dom/modal.js

@@ -29,6 +29,7 @@ Options include:
 Modal.prototype.display = function(title,options) {
 	options = options || {};
 	var self = this,
+		refreshHandler,
 		duration = $tw.utils.getAnimationDuration(),
 		tiddler = this.wiki.getTiddler(title);
 	// Don't do anything if the tiddler doesn't exist
@@ -83,9 +84,6 @@ Modal.prototype.display = function(title,options) {
 		variables: variables
 	});
 	headerWidgetNode.render(headerTitle,null);
-	this.wiki.addEventListener("change",function(changes) {
-		headerWidgetNode.refresh(changes,modalHeader,null);
-	});
 	// Render the body of the message
 	var bodyWidgetNode = this.wiki.makeTranscludeWidget(title,{
 		parentWidget: $tw.rootWidget,
@@ -93,9 +91,6 @@ Modal.prototype.display = function(title,options) {
 		variables: variables
 	});
 	bodyWidgetNode.render(modalBody,null);
-	this.wiki.addEventListener("change",function(changes) {
-		bodyWidgetNode.refresh(changes,modalBody,null);
-	});
 	// Setup the link if present
 	if(options.downloadLink) {
 		modalLink.href = options.downloadLink;
@@ -135,11 +130,17 @@ Modal.prototype.display = function(title,options) {
 		variables: variables
 	});
 	footerWidgetNode.render(modalFooterButtons,null);
-	this.wiki.addEventListener("change",function(changes) {
+	// Set up the refresh handler
+	refreshHandler = function(changes) {
+		headerWidgetNode.refresh(changes,modalHeader,null);
+		bodyWidgetNode.refresh(changes,modalBody,null);
 		footerWidgetNode.refresh(changes,modalFooterButtons,null);
-	});
+	};
+	this.wiki.addEventListener("change",refreshHandler);
 	// Add the close event handler
 	var closeHandler = function(event) {
+		// Remove our refresh handler
+		self.wiki.removeEventListener("change",refreshHandler);
 		// Decrease the modal count and adjust the body class
 		self.modalCount--;
 		self.adjustPageClass();

core/modules/utils/dom/notifier.js

@@ -27,21 +27,26 @@ Options include:
 Notifier.prototype.display = function(title,options) {
 	options = options || {};
 	// Create the wrapper divs
-	var notification = document.createElement("div"),
+	var self = this,
+		notification = document.createElement("div"),
 		tiddler = this.wiki.getTiddler(title),
-		duration = $tw.utils.getAnimationDuration();
+		duration = $tw.utils.getAnimationDuration(),
+		refreshHandler;
 	// Don't do anything if the tiddler doesn't exist
 	if(!tiddler) {
 		return;
 	}
 	// Add classes
 	$tw.utils.addClass(notification,"tc-notification");
+	// Create the variables
+	var variables = $tw.utils.extend({currentTiddler: title},options.variables);
 	// Render the body of the notification
-	var widgetNode = this.wiki.makeTranscludeWidget(title,{parentWidget: $tw.rootWidget, document: document});
+	var widgetNode = this.wiki.makeTranscludeWidget(title,{parentWidget: $tw.rootWidget, document: document, variables: variables});
 	widgetNode.render(notification,null);
-	this.wiki.addEventListener("change",function(changes) {
+	refreshHandler = function(changes) {
 		widgetNode.refresh(changes,notification,null);
-	});
+	};
+	this.wiki.addEventListener("change",refreshHandler);
 	// Set the initial styles for the notification
 	$tw.utils.setStyle(notification,[
 		{opacity: "0"},
@@ -60,6 +65,8 @@ Notifier.prototype.display = function(title,options) {
 	]);
 	// Set a timer to remove the notification
 	window.setTimeout(function() {
+		// Remove our change event handler
+		self.wiki.removeEventListener("change",refreshHandler);
 		// Force layout and animate the notification away
 		$tw.utils.forceLayout(notification);
 		$tw.utils.setStyle(notification,[

core/modules/utils/dom/popup.js

@@ -31,12 +31,7 @@ Trigger a popup open or closed. Parameters are in a hashmap:
 */
 Popup.prototype.triggerPopup = function(options) {
 	// Check if this popup is already active
-	var index = -1;
-	for(var t=0; t<this.popups.length; t++) {
-		if(this.popups[t].title === options.title) {
-			index = t;
-		}
-	}
+	var index = this.findPopup(options.title);
 	// Compute the new state
 	var state = index === -1;
 	if(options.force !== undefined) {
@@ -50,6 +45,16 @@ Popup.prototype.triggerPopup = function(options) {
 	}
 };
 
+Popup.prototype.findPopup = function(title) {
+	var index = -1;
+	for(var t=0; t<this.popups.length; t++) {
+		if(this.popups[t].title === title) {
+			index = t;
+		}
+	}
+	return index;
+};
+
 Popup.prototype.handleEvent = function(event) {
 	if(event.type === "click") {
 		// Find out what was clicked on
@@ -107,12 +112,14 @@ Popup.prototype.show = function(options) {
 	var info = this.popupInfo(options.domNode);
 	// Cancel any higher level popups
 	this.cancel(info.popupLevel);
-	// Store the popup details
-	this.popups.push({
-		title: options.title,
-		wiki: options.wiki,
-		domNode: options.domNode
-	});
+	// Store the popup details if not already there
+	if(this.findPopup(options.title) === -1) {
+		this.popups.push({
+			title: options.title,
+			wiki: options.wiki,
+			domNode: options.domNode
+		});
+	}
 	// Set the state tiddler
 	options.wiki.setTextReference(options.title,
 			"(" + options.domNode.offsetLeft + "," + options.domNode.offsetTop + "," + 

core/modules/utils/fakedom.js

@@ -26,6 +26,12 @@ var TW_TextNode = function(text) {
 	this.textContent = text;
 };
 
+Object.defineProperty(TW_TextNode.prototype, "nodeType", {
+	get: function() {
+		return 3;
+	}
+});
+
 Object.defineProperty(TW_TextNode.prototype, "formattedTextContent", {
 	get: function() {
 		return this.textContent.replace(/(\r?\n)/g,"");
@@ -43,6 +49,19 @@ var TW_Element = function(tag,namespace) {
 	this.namespaceURI = namespace || "http://www.w3.org/1999/xhtml";
 };
 
+Object.defineProperty(TW_Element.prototype, "nodeType", {
+	get: function() {
+		return 1;
+	}
+});
+
+TW_Element.prototype.getAttribute = function(name) {
+	if(this.isRaw) {
+		throw "Cannot getAttribute on a raw TW_Element";
+	}
+	return this.attributes[name];
+};
+
 TW_Element.prototype.setAttribute = function(name,value) {
 	if(this.isRaw) {
 		throw "Cannot setAttribute on a raw TW_Element";
@@ -93,6 +112,12 @@ TW_Element.prototype.hasChildNodes = function() {
 	return !!this.children.length;
 };
 
+Object.defineProperty(TW_Element.prototype, "childNodes", {
+	get: function() {
+		return this.children;
+	}
+});
+
 Object.defineProperty(TW_Element.prototype, "firstChild", {
 	get: function() {
 		return this.children[0];
@@ -103,6 +128,12 @@ TW_Element.prototype.addEventListener = function(type,listener,useCapture) {
 	// Do nothing
 };
 
+Object.defineProperty(TW_Element.prototype, "tagName", {
+	get: function() {
+		return this.tag || "";
+	}
+});
+
 Object.defineProperty(TW_Element.prototype, "className", {
 	get: function() {
 		return this.attributes["class"] || "";

core/modules/utils/parsetree.js

@@ -56,4 +56,24 @@ exports.findParseTreeNode = function(nodeArray,search) {
 	return undefined;
 };
 
+/*
+Helper to get the text of a parse tree node or array of nodes
+*/
+exports.getParseTreeText = function getParseTreeText(tree) {
+	var output = [];
+	if($tw.utils.isArray(tree)) {
+		$tw.utils.each(tree,function(node) {
+			output.push(getParseTreeText(node));
+		});
+	} else {
+		if(tree.type === "text") {
+			output.push(tree.text);
+		}
+		if(tree.children) {
+			return getParseTreeText(tree.children);
+		}
+	}
+	return output.join("");
+};
+
 })();

core/modules/utils/performance.js

@@ -28,9 +28,9 @@ Performance.prototype.report = function(name,fn) {
 			self.measures = {};
 			var startTime = $tw.utils.timer(),
 				result = fn.apply(this,arguments);
-			self.logger.log(name + ": " + $tw.utils.timer(startTime) + "ms");
+			self.logger.log(name + ": " + $tw.utils.timer(startTime).toFixed(2) + "ms");
 			for(var m in self.measures) {
-				self.logger.log("+" + m + ": " + self.measures[m] + "ms");
+				self.logger.log("+" + m + ": " + self.measures[m].toFixed(2) + "ms");
 			}
 			return result;
 		};

core/modules/utils/utils.js

@@ -35,9 +35,7 @@ exports.trim = function(str) {
 Return the number of keys in an object
 */
 exports.count = function(object) {
-	var s = 0;
-	$tw.utils.each(object,function() {s++;});
-	return s;
+	return Object.keys(object || {}).length;
 };
 
 /*
@@ -171,6 +169,17 @@ exports.extendDeepCopy = function(object,extendedProperties) {
 	return result;
 };
 
+exports.deepFreeze = function deepFreeze(object) {
+	var property, key;
+	Object.freeze(object);
+	for(key in object) {
+		property = object[key];
+		if($tw.utils.hop(object,key) && (typeof property === "object") && !Object.isFrozen(property)) {
+			deepFreeze(property);
+		}
+	}
+};
+
 exports.slowInSlowOut = function(t) {
 	return (1 - ((Math.cos(t * Math.PI) + 1) / 2));
 };
@@ -622,4 +631,27 @@ exports.makeDataUri = function(text,type) {
 	return parts.join("");
 };
 
-})();
+/*
+Useful for finding out the fully escaped CSS selector equivalent to a given tag. For example:
+
+$tw.utils.tagToCssSelector("$:/tags/Stylesheet") --> tc-tagged-\%24\%3A\%2Ftags\%2FStylesheet
+*/
+exports.tagToCssSelector = function(tagName) {
+	return "tc-tagged-" + encodeURIComponent(tagName).replace(/[!"#$%&'()*+,\-./:;<=>?@[\\\]^`{\|}~,]/mg,function(c) {
+		return "\\" + c;
+	});
+};
+
+
+/*
+IE does not have sign function
+*/
+exports.sign = Math.sign || function(x) {
+	x = +x; // convert to a number
+	if (x === 0 || isNaN(x)) {
+		return x;
+	}
+	return x > 0 ? 1 : -1;
+};
+
+})();

core/modules/widgets/action-deletefield.js

@@ -67,7 +67,7 @@ DeleteFieldWidget.prototype.invokeAction = function(triggeringWidget,event) {
 				removeFields[name] = undefined;
 			}
 		});
-		this.wiki.addTiddler(new $tw.Tiddler(tiddler,removeFields));
+		this.wiki.addTiddler(new $tw.Tiddler(this.wiki.getModificationFields(),tiddler,removeFields,this.wiki.getCreationFields()));
 	}
 	return true; // Action was invoked
 };

core/modules/widgets/action-listops.js

@@ -0,0 +1,92 @@
+/*\
+title: $:/core/modules/widgets/action-listops.js
+type: application/javascript
+module-type: widget
+
+Action widget to apply list operations to any tiddler field (defaults to the 'list' field of the current tiddler)
+
+\*/
+(function() {
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
+var ActionListopsWidget = function(parseTreeNode, options) {
+	this.initialise(parseTreeNode, options);
+};
+/**
+ * Inherit from the base widget class
+ */
+ActionListopsWidget.prototype = new Widget();
+/**
+ * Render this widget into the DOM
+ */
+ActionListopsWidget.prototype.render = function(parent, nextSibling) {
+	this.computeAttributes();
+	this.execute();
+};
+/**
+ * Compute the internal state of the widget
+ */
+ActionListopsWidget.prototype.execute = function() {
+	// Get our parameters
+	this.target = this.getAttribute("$tiddler", this.getVariable(
+		"currentTiddler"));
+	this.filter = this.getAttribute("$filter");
+	this.subfilter = this.getAttribute("$subfilter");
+	this.listField = this.getAttribute("$field", "list");
+	this.listIndex = this.getAttribute("$index");
+	this.filtertags = this.getAttribute("$tags");
+};
+/**
+ * 	Refresh the widget by ensuring our attributes are up to date
+ */
+ActionListopsWidget.prototype.refresh = function(changedTiddlers) {
+	var changedAttributes = this.computeAttributes();
+	if(changedAttributes.$tiddler || changedAttributes.$filter ||
+		changedAttributes.$subfilter || changedAttributes.$field ||
+		changedAttributes.$index || changedAttributes.$tags) {
+		this.refreshSelf();
+		return true;
+	}
+	return this.refreshChildren(changedTiddlers);
+};
+/**
+ * 	Invoke the action associated with this widget
+ */
+ActionListopsWidget.prototype.invokeAction = function(triggeringWidget,
+	event) {
+	//Apply the specified filters to the lists
+	var field = this.listField,
+		index,
+		type = "!!",
+		list = this.listField;
+	if(this.listIndex) {
+		field = undefined;
+		index = this.listIndex;
+		type = "##";
+		list = this.listIndex;
+	}
+	if(this.filter) {
+		this.wiki.setText(this.target, field, index, $tw.utils.stringifyList(
+			this.wiki
+			.filterTiddlers(this.filter, this)));
+	}
+	if(this.subfilter) {
+		var subfilter = "[list[" + this.target + type + list + "]] " + this.subfilter;
+		this.wiki.setText(this.target, field, index, $tw.utils.stringifyList(
+			this.wiki
+			.filterTiddlers(subfilter, this)));
+	}
+	if(this.filtertags) {
+		var tagfilter = "[list[" + this.target + "!!tags]] " + this.filtertags;
+		this.wiki.setText(this.target, "tags", undefined, $tw.utils.stringifyList(
+			this.wiki.filterTiddlers(tagfilter, this)));
+	}
+	return true; // Action was invoked
+};
+
+exports["action-listops"] = ActionListopsWidget;
+
+})();

core/modules/widgets/action-sendmessage.js

@@ -37,6 +37,8 @@ Compute the internal state of the widget
 SendMessageWidget.prototype.execute = function() {
 	this.actionMessage = this.getAttribute("$message");
 	this.actionParam = this.getAttribute("$param");
+	this.actionName = this.getAttribute("$name");
+	this.actionValue = this.getAttribute("$value","");
 };
 
 /*
@@ -44,7 +46,7 @@ Refresh the widget by ensuring our attributes are up to date
 */
 SendMessageWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
-	if(changedAttributes["$message"] || changedAttributes["$param"]) {
+	if(Object.keys(changedAttributes).length) {
 		this.refreshSelf();
 		return true;
 	}
@@ -66,8 +68,18 @@ SendMessageWidget.prototype.invokeAction = function(triggeringWidget,event) {
 			count++;
 		}
 	});
+	// Add name/value pair if present
+	if(this.actionName) {
+		paramObject[this.actionName] = this.actionValue;
+	}
 	// Dispatch the message
-	this.dispatchEvent({type: this.actionMessage, param: param, paramObject: paramObject, tiddlerTitle: this.getVariable("currentTiddler")});
+	this.dispatchEvent({
+		type: this.actionMessage,
+		param: param,
+		paramObject: paramObject,
+		tiddlerTitle: this.getVariable("currentTiddler"),
+		navigateFromTitle: this.getVariable("storyTiddler")
+	});
 	return true; // Action was invoked
 };
 

core/modules/widgets/action-setfield.js

@@ -39,6 +39,7 @@ SetFieldWidget.prototype.execute = function() {
 	this.actionField = this.getAttribute("$field");
 	this.actionIndex = this.getAttribute("$index");
 	this.actionValue = this.getAttribute("$value");
+	this.actionTimestamp = this.getAttribute("$timestamp","yes") === "yes";
 };
 
 /*
@@ -57,13 +58,15 @@ SetFieldWidget.prototype.refresh = function(changedTiddlers) {
 Invoke the action associated with this widget
 */
 SetFieldWidget.prototype.invokeAction = function(triggeringWidget,event) {
-	var self = this;
-	if(typeof this.actionValue === "string") {
-		this.wiki.setText(this.actionTiddler,this.actionField,this.actionIndex,this.actionValue);		
+	var self = this,
+		options = {};
+	options.suppressTimestamp = !this.actionTimestamp;
+	if((typeof this.actionField == "string") || (typeof this.actionIndex == "string")  || (typeof this.actionValue == "string")) {
+		this.wiki.setText(this.actionTiddler,this.actionField,this.actionIndex,this.actionValue,options);
 	}
 	$tw.utils.each(this.attributes,function(attribute,name) {
 		if(name.charAt(0) !== "$") {
-			self.wiki.setText(self.actionTiddler,name,undefined,attribute);
+			self.wiki.setText(self.actionTiddler,name,undefined,attribute,options);
 		}
 	});
 	return true; // Action was invoked

core/modules/widgets/browse.js

@@ -42,9 +42,14 @@ BrowseWidget.prototype.render = function(parent,nextSibling) {
 	if(this.tooltip) {
 		domNode.setAttribute("title",this.tooltip);
 	}
+	// Nw.js supports "nwsaveas" to force a "save as" dialogue that allows a new or existing file to be selected
 	if(this.nwsaveas) {
 		domNode.setAttribute("nwsaveas",this.nwsaveas);
 	}
+	// Nw.js supports "webkitdirectory" to allow a directory to be selected
+	if(this.webkitdirectory) {
+		domNode.setAttribute("webkitdirectory",this.webkitdirectory);
+	}
 	// Add a click event handler
 	domNode.addEventListener("change",function (event) {
 		if(self.message) {
@@ -71,6 +76,7 @@ BrowseWidget.prototype.execute = function() {
 	this.param = this.getAttribute("param");
 	this.tooltip = this.getAttribute("tooltip");
 	this.nwsaveas = this.getAttribute("nwsaveas");
+	this.webkitdirectory = this.getAttribute("webkitdirectory");
 };
 
 /*

core/modules/widgets/button.js

@@ -34,7 +34,11 @@ ButtonWidget.prototype.render = function(parent,nextSibling) {
 	this.computeAttributes();
 	this.execute();
 	// Create element
-	var domNode = this.document.createElement("button");
+	var tag = "button";
+	if(this.buttonTag && $tw.config.htmlUnsafeElements.indexOf(this.buttonTag) === -1) {
+		tag = this.buttonTag;
+	}
+	var domNode = this.document.createElement(tag);
 	// Assign classes
 	var classes = this["class"].split(" ") || [],
 		isPoppedUp = this.popup && this.isPoppedUp();
@@ -103,11 +107,10 @@ ButtonWidget.prototype.allowActionPropagation = function() {
 
 ButtonWidget.prototype.getBoundingClientRect = function() {
 	return this.domNodes[0].getBoundingClientRect();
-}
+};
 
 ButtonWidget.prototype.isSelected = function() {
-	var tiddler = this.wiki.getTiddler(this.set);
-	return tiddler ? tiddler.fields.text === this.setTo : this.defaultSetValue === this.setTo;
+    return this.wiki.getTextReference(this.set,this.defaultSetValue,this.getVariable("currentTiddler")) === this.setTo;
 };
 
 ButtonWidget.prototype.isPoppedUp = function() {
@@ -162,7 +165,8 @@ ButtonWidget.prototype.execute = function() {
 	this.tooltip = this.getAttribute("tooltip");
 	this.style = this.getAttribute("style");
 	this.selectedClass = this.getAttribute("selectedClass");
-	this.defaultSetValue = this.getAttribute("default");
+	this.defaultSetValue = this.getAttribute("default","");
+	this.buttonTag = this.getAttribute("tag");
 	// Make child widgets
 	this.makeChildWidgets();
 };

core/modules/widgets/checkbox.js

@@ -58,7 +58,11 @@ CheckboxWidget.prototype.getValue = function() {
 	var tiddler = this.wiki.getTiddler(this.checkboxTitle);
 	if(tiddler) {
 		if(this.checkboxTag) {
-			return tiddler.hasTag(this.checkboxTag);
+			if(this.checkboxInvertTag) {
+				return !tiddler.hasTag(this.checkboxTag);
+			} else {
+				return tiddler.hasTag(this.checkboxTag);
+			}
 		}
 		if(this.checkboxField) {
 			var value = tiddler.fields[this.checkboxField] || this.checkboxDefault || "";
@@ -90,15 +94,24 @@ CheckboxWidget.prototype.handleChangeEvent = function(event) {
 		tiddler = this.wiki.getTiddler(this.checkboxTitle),
 		fallbackFields = {text: ""},
 		newFields = {title: this.checkboxTitle},
-		hasChanged = false;
+		hasChanged = false,
+		tagCheck = false,
+		hasTag = tiddler && tiddler.hasTag(this.checkboxTag);
+	if(this.checkboxTag && this.checkboxInvertTag === "yes") {
+		tagCheck = hasTag === checked;
+	} else {
+		tagCheck = hasTag !== checked;
+	}
 	// Set the tag if specified
-	if(this.checkboxTag && (!tiddler || tiddler.hasTag(this.checkboxTag) !== checked)) {
+	if(this.checkboxTag && (!tiddler || tagCheck)) {
 		newFields.tags = tiddler ? (tiddler.fields.tags || []).slice(0) : [];
 		var pos = newFields.tags.indexOf(this.checkboxTag);
 		if(pos !== -1) {
 			newFields.tags.splice(pos,1);
 		}
-		if(checked) {
+		if(this.checkboxInvertTag === "yes" && !checked) {
+			newFields.tags.push(this.checkboxTag);
+		} else if(this.checkboxInvertTag !== "yes" && checked) {
 			newFields.tags.push(this.checkboxTag);
 		}
 		hasChanged = true;
@@ -112,7 +125,7 @@ CheckboxWidget.prototype.handleChangeEvent = function(event) {
 		}
 	}
 	if(hasChanged) {
-		this.wiki.addTiddler(new $tw.Tiddler(fallbackFields,tiddler,newFields,this.wiki.getModificationFields()));
+		this.wiki.addTiddler(new $tw.Tiddler(this.wiki.getCreationFields(),fallbackFields,tiddler,newFields,this.wiki.getModificationFields()));
 	}
 };
 
@@ -128,6 +141,7 @@ CheckboxWidget.prototype.execute = function() {
 	this.checkboxUnchecked = this.getAttribute("unchecked");
 	this.checkboxDefault = this.getAttribute("default");
 	this.checkboxClass = this.getAttribute("class","");
+	this.checkboxInvertTag = this.getAttribute("invertTag","");
 	// Make the child widgets
 	this.makeChildWidgets();
 };
@@ -137,7 +151,7 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
 */
 CheckboxWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
-	if(changedAttributes.tiddler || changedAttributes.tag || changedAttributes.field || changedAttributes.checked || changedAttributes.unchecked || changedAttributes["default"] || changedAttributes["class"]) {
+	if(changedAttributes.tiddler || changedAttributes.tag || changedAttributes.invertTag || changedAttributes.field || changedAttributes.checked || changedAttributes.unchecked || changedAttributes["default"] || changedAttributes["class"]) {
 		this.refreshSelf();
 		return true;
 	} else {
@@ -152,4 +166,4 @@ CheckboxWidget.prototype.refresh = function(changedTiddlers) {
 
 exports.checkbox = CheckboxWidget;
 
-})();
+})();

core/modules/widgets/edit-bitmap.js

@@ -299,7 +299,7 @@ EditBitmapWidget.prototype.saveChanges = function() {
 			type = dataURL.substring(posColon+1,posSemiColon),
 			text = dataURL.substring(posComma+1);
 		var update = {type: type, text: text};
-		this.wiki.addTiddler(new $tw.Tiddler(tiddler,update));
+		this.wiki.addTiddler(new $tw.Tiddler(this.wiki.getModificationFields(),tiddler,update,this.wiki.getCreationFields()));
 	}
 };
 

core/modules/widgets/edit-text.js

@@ -52,6 +52,9 @@ EditTextWidget.prototype.render = function(parent,nextSibling) {
 	if(this.editSize) {
 		domNode.setAttribute("size",this.editSize);
 	}
+	if(this.editRows) {
+		domNode.setAttribute("rows",this.editRows);
+	}
 	// Assign classes
 	if(this.editClass) {
 		domNode.className = this.editClass;
@@ -79,7 +82,7 @@ EditTextWidget.prototype.render = function(parent,nextSibling) {
 	if(this.editFocus === "true") {
 		if(domNode.focus && domNode.select) {
 			domNode.focus();
-			domNode.select();			
+			domNode.select();
 		}
 	}
 };
@@ -148,6 +151,7 @@ EditTextWidget.prototype.execute = function() {
 	this.editClass = this.getAttribute("class");
 	this.editPlaceholder = this.getAttribute("placeholder");
 	this.editSize = this.getAttribute("size");
+	this.editRows = this.getAttribute("rows");
 	this.editAutoHeight = this.getAttribute("autoHeight","yes") === "yes";
 	this.editMinHeight = this.getAttribute("minHeight",DEFAULT_MIN_TEXT_AREA_HEIGHT);
 	this.editFocusPopup = this.getAttribute("focusPopup");
@@ -178,13 +182,15 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
 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) {
+	if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes["default"] || changedAttributes["class"] || changedAttributes.placeholder || changedAttributes.size || changedAttributes.autoHeight || changedAttributes.minHeight || changedAttributes.focusPopup ||  changedAttributes.rows) {
 		this.refreshSelf();
 		return true;
 	} else if(changedTiddlers[this.editTitle]) {
 		this.updateEditor(this.getEditInfo().value);
 		return true;
 	}
+	// Fix the height anyway in case there has been a reflow
+	this.fixHeight();
 	return false;
 };
 
@@ -211,18 +217,31 @@ EditTextWidget.prototype.updateEditorDomNode = function(text) {
 	}
 };
 
+/*
+Get the first parent element that has scrollbars or use the body as fallback.
+*/
+EditTextWidget.prototype.getScrollContainer = function(el) {
+	while(el.parentNode) {	
+		el = el.parentNode;
+		if(el.scrollTop) {
+			return el;
+		}
+	}
+	return this.document.body;
+};
+
 /*
 Fix the height of textareas to fit their content
 */
 EditTextWidget.prototype.fixHeight = function() {
-	var self = this,
-		domNode = this.domNodes[0];
+	var domNode = this.domNodes[0];
 	if(this.editAutoHeight && domNode && !domNode.isTiddlyWikiFakeDom && this.editTag === "textarea") {
 		// Resize the textarea to fit its content, preserving scroll position
-		var scrollPosition = $tw.utils.getScrollPosition(),
-			scrollTop = scrollPosition.y;
-		// Measure the specified minimum height
-		domNode.style.height = self.editMinHeight;
+		// Get the scroll container and register the current scroll position
+		var container = this.getScrollContainer(domNode),
+			scrollTop = container.scrollTop;
+                // Measure the specified minimum height
+		domNode.style.height = this.editMinHeight;
 		var minHeight = domNode.offsetHeight;
 		// Set its height to auto so that it snaps to the correct height
 		domNode.style.height = "auto";
@@ -230,12 +249,11 @@ EditTextWidget.prototype.fixHeight = function() {
 		var newHeight = Math.max(domNode.scrollHeight + domNode.offsetHeight - domNode.clientHeight,minHeight);
 		// Only try to change the height if it has changed
 		if(newHeight !== domNode.offsetHeight) {
-			domNode.style.height =  newHeight + "px";
+			domNode.style.height = newHeight + "px";
 			// Make sure that the dimensions of the textarea are recalculated
 			$tw.utils.forceLayout(domNode);
-			// Check that the scroll position is still visible before trying to scroll back to it
-			scrollTop = Math.min(scrollTop,self.document.body.scrollHeight - window.innerHeight);
-			window.scrollTo(scrollPosition.x,scrollTop);
+			// Set the container to the position we registered at the beginning
+			container.scrollTop = scrollTop;
 		}
 	}
 };

core/modules/widgets/fieldmangler.js

@@ -135,6 +135,10 @@ FieldManglerWidget.prototype.handleAddTagEvent = function(event) {
 			$tw.utils.pushTop(modification.tags,tag);
 			this.wiki.addTiddler(new $tw.Tiddler(tiddler,modification));			
 		}
+	} else if(typeof event.param === "string" && event.param.trim() !== "" && this.mangleTitle.trim() !== "") {
+		var tag = [];
+		tag.push(event.param.trim());
+		this.wiki.addTiddler({title: this.mangleTitle, tags: tag});		
 	}
 	return true;
 };

core/modules/widgets/keyboard.js

@@ -42,6 +42,7 @@ KeyboardWidget.prototype.render = function(parent,nextSibling) {
 	// Add a keyboard event handler
 	domNode.addEventListener("keydown",function (event) {
 		if($tw.utils.checkKeyDescriptor(event,self.keyInfo)) {
+			self.invokeActions(this,event);
 			self.dispatchMessage(event);
 			event.preventDefault();
 			event.stopPropagation();

core/modules/widgets/link.js

@@ -135,9 +135,9 @@ LinkWidget.prototype.handleClickEvent = function(event) {
 	});
 	if(this.domNodes[0].hasAttribute("href")) {
 		event.preventDefault();
-		event.stopPropagation();
-		return false;
 	}
+	event.stopPropagation();
+	return false;
 };
 
 LinkWidget.prototype.handleDragStartEvent = function(event) {

core/modules/widgets/list.js

@@ -156,7 +156,7 @@ Handle any changes to the history list
 */
 ListWidget.prototype.handleHistoryChanges = function() {
 	// Get the history data
-	var newHistory = this.wiki.getTiddlerData(this.historyTitle,[]);
+	var newHistory = this.wiki.getTiddlerDataCached(this.historyTitle,[]);
 	// Ignore any entries of the history that match the previous history
 	var entry = 0;
 	while(entry < newHistory.length && entry < this.history.length && newHistory[entry].title === this.history[entry].title) {

core/modules/widgets/navigator.js

@@ -29,7 +29,12 @@ var NavigatorWidget = function(parseTreeNode,options) {
 		{type: "tm-close-other-tiddlers", handler: "handleCloseOtherTiddlersEvent"},
 		{type: "tm-new-tiddler", handler: "handleNewTiddlerEvent"},
 		{type: "tm-import-tiddlers", handler: "handleImportTiddlersEvent"},
-		{type: "tm-perform-import", handler: "handlePerformImportEvent"}
+		{type: "tm-perform-import", handler: "handlePerformImportEvent"},
+		{type: "tm-fold-tiddler", handler: "handleFoldTiddlerEvent"},
+		{type: "tm-fold-other-tiddlers", handler: "handleFoldOtherTiddlersEvent"},
+		{type: "tm-fold-all-tiddlers", handler: "handleFoldAllTiddlersEvent"},
+		{type: "tm-unfold-all-tiddlers", handler: "handleUnfoldAllTiddlersEvent"},
+		{type: "tm-rename-tiddler", handler: "handleRenameTiddlerEvent"}
 	]);
 };
 
@@ -85,11 +90,6 @@ NavigatorWidget.prototype.saveStoryList = function(storyList) {
 	));
 };
 
-NavigatorWidget.prototype.findTitleInStory = function(storyList,title,defaultIndex) {
-	var p = storyList.indexOf(title);
-	return p === -1 ? defaultIndex : p;
-};
-
 NavigatorWidget.prototype.removeTitleFromStory = function(storyList,title) {
 	var p = storyList.indexOf(title);
 	while(p !== -1) {
@@ -115,19 +115,50 @@ NavigatorWidget.prototype.replaceFirstTitleInStory = function(storyList,oldTitle
 
 NavigatorWidget.prototype.addToStory = function(title,fromTitle) {
 	var storyList = this.getStoryList();
-	if(storyList) {
-		// See if the tiddler is already there
-		var slot = this.findTitleInStory(storyList,title,-1);
-		// If not we need to add it
-		if(slot === -1) {
-			// First we try to find the position of the story element we navigated from
-			slot = this.findTitleInStory(storyList,fromTitle,-1) + 1;
-			// Add the tiddler
-			storyList.splice(slot,0,title);
-			// Save the story
-			this.saveStoryList(storyList);
+	// Quit if we cannot get hold of the story list
+	if(!storyList) {
+		return;
+	}
+	// See if the tiddler is already there
+	var slot = storyList.indexOf(title);
+	// Quit if it already exists in the story river
+	if(slot >= 0) {
+		return;
+	}
+	// First we try to find the position of the story element we navigated from
+	var fromIndex = storyList.indexOf(fromTitle);
+	if(fromIndex >= 0) {
+		// The tiddler is added from inside the river
+		// Determine where to insert the tiddler; Fallback is "below"
+		switch(this.getAttribute("openLinkFromInsideRiver","below")) {
+			case "top":
+				slot = 0;
+				break;
+			case "bottom":
+				slot = storyList.length;
+				break;
+			case "above":
+				slot = fromIndex;
+				break;
+			case "below": // Intentional fall-through
+			default:
+				slot = fromIndex + 1;
+				break;
+		}
+	} else {
+		// The tiddler is opened from outside the river. Determine where to insert the tiddler; default is "top"
+		if(this.getAttribute("openLinkFromOutsideRiver","top") === "bottom") {
+			// Insert at bottom
+			slot = storyList.length;
+		} else {
+			// Insert at top
+			slot = 0;
 		}
 	}
+	// Add the tiddler
+	storyList.splice(slot,0,title);
+	// Save the story
+	this.saveStoryList(storyList);
 };
 
 /*
@@ -194,14 +225,17 @@ NavigatorWidget.prototype.handleEditTiddlerEvent = function(event) {
 		return false;
 	}
 	// Replace the specified tiddler with a draft in edit mode
-	var draftTiddler = this.makeDraftTiddler(title),
-		draftTitle = draftTiddler.fields.title,
-		storyList = this.getStoryList();
-	this.removeTitleFromStory(storyList,draftTitle);
-	this.replaceFirstTitleInStory(storyList,title,draftTitle);
-	this.addToHistory(draftTitle,event.navigateFromClientRect);
-	this.saveStoryList(storyList);
-	return false;
+	var draftTiddler = this.makeDraftTiddler(title);
+	// Update the story and history if required
+	if(!event.paramObject || event.paramObject.suppressNavigation !== "yes") {
+		var draftTitle = draftTiddler.fields.title,
+			storyList = this.getStoryList();
+		this.removeTitleFromStory(storyList,draftTitle);
+		this.replaceFirstTitleInStory(storyList,title,draftTitle);
+		this.addToHistory(draftTitle,event.navigateFromClientRect);
+		this.saveStoryList(storyList);
+		return false;
+	}
 };
 
 // Delete a tiddler
@@ -307,23 +341,27 @@ NavigatorWidget.prototype.handleSaveTiddlerEvent = function(event) {
 				));
 			}
 			if(isConfirmed) {
-				// Save the draft tiddler as the real tiddler
-				this.wiki.addTiddler(new $tw.Tiddler(this.wiki.getCreationFields(),tiddler,{
+				// Create the new tiddler and pass it through the th-saving-tiddler hook
+				var newTiddler = new $tw.Tiddler(this.wiki.getCreationFields(),tiddler,{
 					title: draftTitle,
 					"draft.title": undefined,
 					"draft.of": undefined
-				},this.wiki.getModificationFields()));
+				},this.wiki.getModificationFields());
+				newTiddler = $tw.hooks.invokeHook("th-saving-tiddler",newTiddler);
+				this.wiki.addTiddler(newTiddler);
 				// Remove the draft tiddler
 				this.wiki.deleteTiddler(title);
 				// Remove the original tiddler if we're renaming it
 				if(isRename) {
 					this.wiki.deleteTiddler(draftOf);
 				}
-				// Replace the draft in the story with the original
-				this.replaceFirstTitleInStory(storyList,title,draftTitle);
-				this.addToHistory(draftTitle,event.navigateFromClientRect);
-				if(draftTitle !== this.storyTitle) {
-					this.saveStoryList(storyList);
+				if(!event.paramObject || event.paramObject.suppressNavigation !== "yes") {
+					// Replace the draft in the story with the original
+					this.replaceFirstTitleInStory(storyList,title,draftTitle);
+					this.addToHistory(draftTitle,event.navigateFromClientRect);
+					if(draftTitle !== this.storyTitle) {
+						this.saveStoryList(storyList);
+					}
 				}
 				// Trigger an autosave
 				$tw.rootWidget.dispatchEvent({type: "tm-auto-save-wiki"});
@@ -355,15 +393,15 @@ NavigatorWidget.prototype.handleCancelTiddlerEvent = function(event) {
 		// Remove the draft tiddler
 		if(isConfirmed) {
 			this.wiki.deleteTiddler(draftTitle);
-			if(originalTiddler) {
-				this.replaceFirstTitleInStory(storyList,draftTitle,originalTitle);
-				this.addToHistory(originalTitle,event.navigateFromClientRect);
-			} else {
-				this.removeTitleFromStory(storyList,draftTitle);
+			if(!event.paramObject || event.paramObject.suppressNavigation !== "yes") {
+				if(originalTiddler) {
+					this.replaceFirstTitleInStory(storyList,draftTitle,originalTitle);
+					this.addToHistory(originalTitle,event.navigateFromClientRect);
+				} else {
+					this.removeTitleFromStory(storyList,draftTitle);
+				}
+				this.saveStoryList(storyList);
 			}
-			this.saveStoryList(storyList);
-			// Trigger an autosave
-			$tw.rootWidget.dispatchEvent({type: "tm-auto-save-wiki"});			
 		}
 	}
 	return false;
@@ -515,10 +553,10 @@ NavigatorWidget.prototype.handleImportTiddlersEvent = function(event) {
 NavigatorWidget.prototype.handlePerformImportEvent = function(event) {
 	var self = this,
 		importTiddler = this.wiki.getTiddler(event.param),
-		importData = this.wiki.getTiddlerData(event.param,{tiddlers: {}}),
+		importData = this.wiki.getTiddlerDataCached(event.param,{tiddlers: {}}),
 		importReport = [];
 	// Add the tiddlers to the store
-	importReport.push("The following tiddlers were imported:\n");
+	importReport.push($tw.language.getString("Import/Imported") + "\n");
 	$tw.utils.each(importData.tiddlers,function(tiddlerFields) {
 		var title = tiddlerFields.title;
 		if(title && importTiddler && importTiddler.fields["selection-" + title] !== "unchecked") {
@@ -528,16 +566,60 @@ NavigatorWidget.prototype.handlePerformImportEvent = function(event) {
 	});
 	// Replace the $:/Import tiddler with an import report
 	this.wiki.addTiddler(new $tw.Tiddler({
-		title: IMPORT_TITLE,
+		title: event.param,
 		text: importReport.join("\n"),
 		"status": "complete"
 	}));
 	// Navigate to the $:/Import tiddler
-	this.addToHistory([IMPORT_TITLE]);
+	this.addToHistory([event.param]);
 	// Trigger an autosave
 	$tw.rootWidget.dispatchEvent({type: "tm-auto-save-wiki"});
 };
 
+NavigatorWidget.prototype.handleFoldTiddlerEvent = function(event) {
+	var self = this,
+		paramObject = event.paramObject || {};
+	if(paramObject.foldedState) {
+		var foldedState = this.wiki.getTiddlerText(paramObject.foldedState,"show") === "show" ? "hide" : "show";
+		this.wiki.setText(paramObject.foldedState,"text",null,foldedState);
+	}
+};
+
+NavigatorWidget.prototype.handleFoldOtherTiddlersEvent = function(event) {
+	var self = this,
+		paramObject = event.paramObject || {},
+		prefix = paramObject.foldedStatePrefix;
+	$tw.utils.each(this.getStoryList(),function(title) {
+		self.wiki.setText(prefix + title,"text",null,event.param === title ? "show" : "hide");
+	});
+};
+
+NavigatorWidget.prototype.handleFoldAllTiddlersEvent = function(event) {
+	var self = this,
+		paramObject = event.paramObject || {},
+		prefix = paramObject.foldedStatePrefix;
+	$tw.utils.each(this.getStoryList(),function(title) {
+		self.wiki.setText(prefix + title,"text",null,"hide");
+	});
+};
+
+NavigatorWidget.prototype.handleUnfoldAllTiddlersEvent = function(event) {
+	var self = this,
+		paramObject = event.paramObject || {},
+		prefix = paramObject.foldedStatePrefix;
+	$tw.utils.each(this.getStoryList(),function(title) {
+		self.wiki.setText(prefix + title,"text",null,"show");
+	});
+};
+
+NavigatorWidget.prototype.handleRenameTiddlerEvent = function(event) {
+	var self = this,
+		paramObject = event.paramObject || {},
+		from = paramObject.from || event.tiddlerTitle,
+		to = paramObject.to;
+	$tw.wiki.renameTiddler(from,to);
+};
+
 exports.navigator = NavigatorWidget;
 
 })();

core/modules/widgets/radio.js

@@ -79,7 +79,7 @@ RadioWidget.prototype.setValue = function() {
 		var tiddler = this.wiki.getTiddler(this.radioTitle),
 			addition = {};
 		addition[this.radioField] = this.radioValue;
-		this.wiki.addTiddler(new $tw.Tiddler({title: this.radioTitle},tiddler,addition,this.wiki.getModificationFields()));
+		this.wiki.addTiddler(new $tw.Tiddler(this.wiki.getCreationFields(),{title: this.radioTitle},tiddler,addition,this.wiki.getModificationFields()));
 	}
 };
 

core/modules/widgets/select.js

@@ -51,7 +51,12 @@ SelectWidget.prototype.render = function(parent,nextSibling) {
 Handle a change event
 */
 SelectWidget.prototype.handleChangeEvent = function(event) {
-	var value = this.getSelectDomNode().value;
+	if(this.selectMultiple == false) {
+		var value = this.getSelectDomNode().value;
+	} else {
+		var value = this.getSelectValues()
+				value = $tw.utils.stringifyList(value);
+	}
 	this.wiki.setText(this.selectTitle,this.selectField,this.selectIndex,value);
 };
 
@@ -81,9 +86,21 @@ SelectWidget.prototype.setSelectValue = function() {
 		}
 	}
 	// Assign it to the select element if it's different than the current value
-	var domNode = this.getSelectDomNode();
-	if(domNode.value !== value) {
-		domNode.value = value;
+	if (this.selectMultiple) {
+		value = value === undefined ? "" : value;
+		var select = this.getSelectDomNode();
+		var values = Array.isArray(value) ? value : $tw.utils.parseStringArray(value);
+		for(var i=0; i < select.children.length; i++){
+			if(values.indexOf(select.children[i].value) != -1) {
+				select.children[i].selected = true;
+			}
+		}
+		
+	} else {
+		var domNode = this.getSelectDomNode();
+		if(domNode.value !== value) {
+			domNode.value = value;
+		}
 	}
 };
 
@@ -94,6 +111,22 @@ SelectWidget.prototype.getSelectDomNode = function() {
 	return this.children[0].domNodes[0];
 };
 
+// Return an array of the selected opion values
+// select is an HTML select element
+SelectWidget.prototype.getSelectValues = function() {
+	var select, result, options, opt;
+	select = this.getSelectDomNode();
+	result = [];
+	options = select && select.options;
+	for (var i=0; i<options.length; i++) {
+		opt = options[i];
+		if (opt.selected) {
+			result.push(opt.value || opt.text);
+		}
+	}
+	return result;
+}
+
 /*
 Compute the internal state of the widget
 */
@@ -104,6 +137,8 @@ SelectWidget.prototype.execute = function() {
 	this.selectIndex = this.getAttribute("index");
 	this.selectClass = this.getAttribute("class");
 	this.selectDefault = this.getAttribute("default");
+	this.selectMultiple = this.getAttribute("multiple", false);
+	this.selectSize = this.getAttribute("size");
 	// Make the child widgets
 	var selectNode = {
 		type: "element",
@@ -113,6 +148,12 @@ SelectWidget.prototype.execute = function() {
 	if(this.selectClass) {
 		$tw.utils.addAttributeToParseTreeNode(selectNode,"class",this.selectClass);
 	}
+	if(this.selectMultiple) {
+		$tw.utils.addAttributeToParseTreeNode(selectNode,"multiple","multiple");
+	}
+	if(this.selectSize) {
+		$tw.utils.addAttributeToParseTreeNode(selectNode,"size",this.selectSize);
+	}
 	this.makeChildWidgets([selectNode]);
 };
 
@@ -127,10 +168,11 @@ SelectWidget.prototype.refresh = function(changedTiddlers) {
 		return true;
 	// If the target tiddler value has changed, just update setting and refresh the children
 	} else {
-		if(changedTiddlers[this.selectTitle]) {
+		var childrenRefreshed = this.refreshChildren(changedTiddlers);
+		if(changedTiddlers[this.selectTitle] || childrenRefreshed) {
 			this.setSelectValue();
 		} 
-		return this.refreshChildren(changedTiddlers);		
+		return childrenRefreshed;
 	}
 };
 

core/modules/widgets/setvariable.js

@@ -43,6 +43,15 @@ SetWidget.prototype.execute = function() {
 	this.setValue = this.getAttribute("value");
 	this.setEmptyValue = this.getAttribute("emptyValue");
 	// Set context variable
+	this.setVariable(this.setName,this.getValue(),this.parseTreeNode.params);
+	// Construct the child widgets
+	this.makeChildWidgets();
+};
+
+/*
+Get the value to be assigned
+*/
+SetWidget.prototype.getValue = function() {
 	var value = this.setValue;
 	if(this.setFilter) {
 		var results = this.wiki.filterTiddlers(this.setFilter,this);
@@ -52,10 +61,10 @@ SetWidget.prototype.execute = function() {
 		if(results.length === 0 && this.setEmptyValue !== undefined) {
 			value = this.setEmptyValue;
 		}
+	} else if(!value && this.setEmptyValue) {
+		value = this.setEmptyValue;
 	}
-	this.setVariable(this.setName,value,this.parseTreeNode.params);
-	// Construct the child widgets
-	this.makeChildWidgets();
+	return value;
 };
 
 /*
@@ -63,11 +72,12 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
 */
 SetWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
-	if(changedAttributes.name || changedAttributes.filter || changedAttributes.value || changedAttributes.emptyValue) {
+	if(changedAttributes.name || changedAttributes.filter || changedAttributes.value || changedAttributes.emptyValue ||
+	   (this.setFilter && this.getValue() != this.variables[this.setName].value)) {
 		this.refreshSelf();
 		return true;
 	} else {
-		return this.refreshChildren(changedTiddlers);		
+		return this.refreshChildren(changedTiddlers);
 	}
 };
 

core/modules/widgets/vars.js

@@ -0,0 +1,75 @@
+/*\
+title: $:/core/modules/widgets/vars.js
+type: application/javascript
+module-type: widget
+
+This widget allows multiple variables to be set in one go:
+
+```
+\define helloworld() Hello world!
+<$vars greeting="Hi" me={{!!title}} sentence=<<helloworld>>>
+  <<greeting>>! I am <<me>> and I say: <<sentence>>
+</$vars>
+```
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
+
+var VarsWidget = function(parseTreeNode,options) {
+	// Call the constructor
+	Widget.call(this);
+	// Initialise	
+	this.initialise(parseTreeNode,options);
+};
+
+/*
+Inherit from the base widget class
+*/
+VarsWidget.prototype = Object.create(Widget.prototype);
+
+/*
+Render this widget into the DOM
+*/
+VarsWidget.prototype.render = function(parent,nextSibling) {
+	this.parentDomNode = parent;
+	this.computeAttributes();
+	this.execute();
+	this.renderChildren(parent,nextSibling);
+};
+
+/*
+Compute the internal state of the widget
+*/
+VarsWidget.prototype.execute = function() {
+	// Parse variables
+	var self = this;
+	$tw.utils.each(this.attributes,function(val,key) {
+		if(key.charAt(0) !== "$") {
+			self.setVariable(key,val);
+		}
+	});
+	// Construct the child widgets
+	this.makeChildWidgets();
+};
+
+/*
+Refresh the widget by ensuring our attributes are up to date
+*/
+VarsWidget.prototype.refresh = function(changedTiddlers) {
+	var changedAttributes = this.computeAttributes();
+	if(Object.keys(changedAttributes).length) {
+		this.refreshSelf();
+		return true;
+	}
+	return this.refreshChildren(changedTiddlers);
+};
+
+exports["vars"] = VarsWidget;
+
+})();

core/modules/widgets/view.js

@@ -55,6 +55,9 @@ ViewWidget.prototype.execute = function() {
 		case "htmlwikified":
 			this.text = this.getValueAsHtmlWikified();
 			break;
+		case "htmlencodedplainwikified":
+			this.text = this.getValueAsHtmlEncodedPlainWikified();
+			break;
 		case "htmlencoded":
 			this.text = this.getValueAsHtmlEncoded();
 			break;
@@ -132,6 +135,10 @@ ViewWidget.prototype.getValueAsHtmlWikified = function() {
 	return this.wiki.renderText("text/html","text/vnd.tiddlywiki",this.getValueAsText(),{parentWidget: this});
 };
 
+ViewWidget.prototype.getValueAsHtmlEncodedPlainWikified = function() {
+	return $tw.utils.htmlEncode(this.wiki.renderText("text/plain","text/vnd.tiddlywiki",this.getValueAsText(),{parentWidget: this}));
+};
+
 ViewWidget.prototype.getValueAsHtmlEncoded = function() {
 	return $tw.utils.htmlEncode(this.getValueAsText());
 };

core/modules/widgets/widget.js

@@ -195,16 +195,23 @@ Widget.prototype.hasVariable = function(name,value) {
 Construct a qualifying string based on a hash of concatenating the values of a given variable in the parent chain
 */
 Widget.prototype.getStateQualifier = function(name) {
+	this.qualifiers = this.qualifiers || Object.create(null);
 	name = name || "transclusion";
-	var output = [],
-		node = this;
-	while(node && node.parentWidget) {
-		if($tw.utils.hop(node.parentWidget.variables,name)) {
-			output.push(node.getVariable(name));
+	if(this.qualifiers[name]) {
+		return this.qualifiers[name];
+	} else {
+		var output = [],
+			node = this;
+		while(node && node.parentWidget) {
+			if($tw.utils.hop(node.parentWidget.variables,name)) {
+				output.push(node.getVariable(name));
+			}
+			node = node.parentWidget;
 		}
-		node = node.parentWidget;
+		var value = $tw.utils.hashString(output.join(""));
+		this.qualifiers[name] = value;
+		return value;
 	}
-	return $tw.utils.hashString(output.join(""));
 };
 
 /*
@@ -434,7 +441,9 @@ if(index === -1) {
 	var grandParent = parent.parentWidget;
 	if(grandParent && parent.parentDomNode === this.parentDomNode) {
 		index = grandParent.children.indexOf(parent);
-		return parent.findNextSiblingDomNode(index);
+		if(index !== -1) {
+			return parent.findNextSiblingDomNode(index);
+		}
 	}
 	return null;
 };

core/modules/wiki-bulkops.js

@@ -0,0 +1,53 @@
+/*\
+title: $:/core/modules/wiki-bulkops.js
+type: application/javascript
+module-type: wikimethod
+
+Bulk tiddler operations such as rename.
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+/*
+Rename a tiddler, and relink any tags or lists that reference it.
+*/
+exports.renameTiddler = function(fromTitle,toTitle) {
+	var self = this;
+	fromTitle = (fromTitle || "").trim();
+	toTitle = (toTitle || "").trim();
+	if(fromTitle && toTitle && fromTitle !== toTitle) {
+		// Rename the tiddler itself
+		var tiddler = this.getTiddler(fromTitle);
+		this.addTiddler(new $tw.Tiddler(tiddler,{title: toTitle},this.getModificationFields()));
+		this.deleteTiddler(fromTitle);
+		// Rename any tags or lists that reference it
+		this.each(function(tiddler,title) {
+			var tags = (tiddler.fields.tags || []).slice(0),
+				list = (tiddler.fields.list || []).slice(0),
+				isModified = false;
+			// Rename tags
+			$tw.utils.each(tags,function (title,index) {
+				if(title === fromTitle) {
+					tags[index] = toTitle;
+					isModified = true;
+				}
+			});
+			// Rename lists
+			$tw.utils.each(list,function (title,index) {
+				if(title === fromTitle) {
+					list[index] = toTitle;
+					isModified = true;
+				}
+			});
+			if(isModified) {
+				self.addTiddler(new $tw.Tiddler(tiddler,{tags: tags, list: list},self.getModificationFields()));
+			}
+		});
+	}
+}
+
+})();

core/modules/wiki.js

@@ -58,17 +58,24 @@ exports.setTextReference = function(textRef,value,currTiddlerTitle) {
 	this.setText(title,tr.field,tr.index,value);
 };
 
-exports.setText = function(title,field,index,value) {
+exports.setText = function(title,field,index,value,options) {
+	options = options || {};
+	var creationFields = options.suppressTimestamp ? {} : this.getCreationFields(),
+		modificationFields = options.suppressTimestamp ? {} : this.getModificationFields();
 	// Check if it is a reference to a tiddler field
 	if(index) {
 		var data = this.getTiddlerData(title,Object.create(null));
-		data[index] = value;
-		this.setTiddlerData(title,data,this.getModificationFields());
+		if(value !== undefined) {
+			data[index] = value;
+		} else {
+			delete data[index];
+		}
+		this.setTiddlerData(title,data,modificationFields);
 	} else {
 		var tiddler = this.getTiddler(title),
 			fields = {title: title};
 		fields[field || "text"] = value;
-		this.addTiddler(new $tw.Tiddler(tiddler,fields,this.getModificationFields()));
+		this.addTiddler(new $tw.Tiddler(creationFields,tiddler,fields,modificationFields));
 	}
 };
 
@@ -137,7 +144,7 @@ exports.enqueueTiddlerEvent = function(title,isDeleted) {
 		this.changeCount[title] = 1;
 	}
 	// Trigger events
-	this.eventListeners = this.eventListeners || [];
+	this.eventListeners = this.eventListeners || {};
 	if(!this.eventsTriggered) {
 		var self = this;
 		$tw.utils.nextTick(function() {
@@ -186,11 +193,11 @@ exports.generateNewTitle = function(baseTitle,options) {
 };
 
 exports.isSystemTiddler = function(title) {
-	return title.indexOf("$:/") === 0;
+	return title && title.indexOf("$:/") === 0;
 };
 
 exports.isTemporaryTiddler = function(title) {
-	return title.indexOf("$:/temp/") === 0;
+	return title && title.indexOf("$:/temp/") === 0;
 };
 
 exports.isImageTiddler = function(title) {
@@ -577,7 +584,7 @@ exports.sortByList = function(array,listTitle) {
 };
 
 exports.getSubTiddler = function(title,subTiddlerTitle) {
-	var bundleInfo = this.getPluginInfo(title) || this.getTiddlerData(title);
+	var bundleInfo = this.getPluginInfo(title) || this.getTiddlerDataCached(title);
 	if(bundleInfo && bundleInfo.tiddlers) {
 		var subTiddler = bundleInfo.tiddlers[subTiddlerTitle];
 		if(subTiddler) {
@@ -613,6 +620,29 @@ Other types currently just return null.
 
 titleOrTiddler: string tiddler title or a tiddler object
 defaultData: default data to be returned if the tiddler is missing or doesn't contain data
+
+Note that the same value is returned for repeated calls for the same tiddler data. The value is frozen to prevent modification; otherwise modifications would be visible to all callers
+*/
+exports.getTiddlerDataCached = function(titleOrTiddler,defaultData) {
+	var self = this,
+		tiddler = titleOrTiddler;
+	if(!(tiddler instanceof $tw.Tiddler)) {
+		tiddler = this.getTiddler(tiddler);	
+	}
+	if(tiddler) {
+		return this.getCacheForTiddler(tiddler.fields.title,"data",function() {
+			// Return the frozen value
+			var value = self.getTiddlerData(tiddler.fields.title,defaultData);
+			$tw.utils.deepFreeze(value);
+			return value;
+		});
+	} else {
+		return defaultData;
+	}
+};
+
+/*
+Alternative, uncached version of getTiddlerDataCached(). The return value can be mutated freely and reused
 */
 exports.getTiddlerData = function(titleOrTiddler,defaultData) {
 	var tiddler = titleOrTiddler,
@@ -705,29 +735,29 @@ exports.clearGlobalCache = function() {
 
 // Return the named cache object for a tiddler. If the cache doesn't exist then the initializer function is invoked to create it
 exports.getCacheForTiddler = function(title,cacheName,initializer) {
-
-// Temporarily disable caching so that tweakParseTreeNode() works
-return initializer();
-
-//	this.caches = this.caches || Object.create(null);
-//	var caches = this.caches[title];
-//	if(caches && caches[cacheName]) {
-//		return caches[cacheName];
-//	} else {
-//		if(!caches) {
-//			caches = Object.create(null);
-//			this.caches[title] = caches;
-//		}
-//		caches[cacheName] = initializer();
-//		return caches[cacheName];
-//	}
+	this.caches = this.caches || Object.create(null);
+	var caches = this.caches[title];
+	if(caches && caches[cacheName]) {
+		return caches[cacheName];
+	} else {
+		if(!caches) {
+			caches = Object.create(null);
+			this.caches[title] = caches;
+		}
+		caches[cacheName] = initializer();
+		return caches[cacheName];
+	}
 };
 
-// Clear all caches associated with a particular tiddler
+// Clear all caches associated with a particular tiddler, or, if the title is null, clear all the caches for all the tiddlers
 exports.clearCache = function(title) {
-	this.caches = this.caches || Object.create(null);
-	if($tw.utils.hop(this.caches,title)) {
-		delete this.caches[title];
+	if(title) {
+		this.caches = this.caches || Object.create(null);
+		if($tw.utils.hop(this.caches,title)) {
+			delete this.caches[title];
+		}
+	} else {
+		this.caches = Object.create(null);
 	}
 };
 
@@ -753,7 +783,7 @@ 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.old_parseText = function(type,text,options) {
+exports.parseText = function(type,text,options) {
 	options = options || {};
 	// Select a parser
 	var Parser = $tw.Wiki.parsers[type];
@@ -777,53 +807,19 @@ exports.old_parseText = function(type,text,options) {
 /*
 Parse a tiddler according to its MIME type
 */
-exports.old_parseTiddler = function(title,options) {
+exports.parseTiddler = function(title,options) {
 	options = $tw.utils.extend({},options);
-	var cacheType = options.parseAsInline ? "newInlineParseTree" : "newBlockParseTree",
+	var cacheType = options.parseAsInline ? "inlineParseTree" : "blockParseTree",
 		tiddler = this.getTiddler(title),
 		self = this;
 	return tiddler ? this.getCacheForTiddler(title,cacheType,function() {
 			if(tiddler.hasField("_canonical_uri")) {
 				options._canonical_uri = tiddler.fields._canonical_uri;
 			}
-			return self.old_parseText(tiddler.fields.type,tiddler.fields.text,options);
+			return self.parseText(tiddler.fields.type,tiddler.fields.text,options);
 		}) : null;
 };
 
-var tweakMacroDefinition = function(nodeList) {
-	if(nodeList && nodeList[0] && nodeList[0].type === "macrodef") {
-		nodeList[0].type = "set";
-		nodeList[0].attributes = {
-			name: {type: "string", value: nodeList[0].name},
-			value: {type: "string", value: nodeList[0].text}
-		};
-		nodeList[0].children = nodeList.slice(1);
-		nodeList.splice(1,nodeList.length-1);
-		tweakMacroDefinition(nodeList[0].children);
-	}
-};
-
-var tweakParser = function(parser) {
-	// Move any macro definitions to contain the body tree
-	tweakMacroDefinition(parser.tree);
-};
-
-exports.parseText = function(type,text,options) {
-	var parser = this.old_parseText(type,text,options);
-	if(parser) {
-		tweakParser(parser);
-	}
-	return parser;
-};
-
-exports.parseTiddler = function(title,options) {
-	var parser = this.old_parseTiddler(title,options);
-	if(parser) {
-		tweakParser(parser);
-	}
-	return parser;
-};
-
 exports.parseTextReference = function(title,field,index,options) {
 	var tiddler,text;
 	if(options.subTiddler) {
@@ -1190,14 +1186,8 @@ fromPageRect: page coordinates of the origin of the navigation
 historyTitle: title of history tiddler (defaults to $:/HistoryList)
 */
 exports.addToHistory = function(title,fromPageRect,historyTitle) {
-	historyTitle = historyTitle || "$:/HistoryList";
-	var titles = $tw.utils.isArray(title) ? title : [title];
-	// Add a new record to the top of the history stack
-	var historyList = this.getTiddlerData(historyTitle,[]);
-	$tw.utils.each(titles,function(title) {
-		historyList.push({title: title, fromPageRect: fromPageRect});
-	});
-	this.setTiddlerData(historyTitle,historyList,{"current-tiddler": titles[titles.length-1]});
+	var story = new $tw.Story({wiki: this, historyTitle: historyTitle});
+	story.addToHistory(title,fromPageRect);
 };
 
 /*

core/palettes/Blanca.tid

@@ -10,6 +10,9 @@ alert-highlight: #881122
 alert-muted-foreground: #b99e2f
 background: #ffffff
 blockquote-bar: <<colour muted-foreground>>
+button-background:
+button-foreground:
+button-border:
 code-background: #f7f7f9
 code-border: #e1e1e8
 code-foreground: #dd1144

core/palettes/Blue.tid

@@ -10,6 +10,9 @@ alert-highlight: #881122
 alert-muted-foreground: #b99e2f
 background: #fff
 blockquote-bar: <<colour muted-foreground>>
+button-background:
+button-foreground:
+button-border:
 code-background: #f7f7f9
 code-border: #e1e1e8
 code-foreground: #dd1144

core/palettes/BrightMute.tid

@@ -10,6 +10,9 @@ alert-highlight: #881122
 alert-muted-foreground: #b99e2f
 background: #ffffff
 blockquote-bar: <<colour muted-foreground>>
+button-background:
+button-foreground:
+button-border:
 code-background: #f7f7f9
 code-border: #e1e1e8
 code-foreground: #dd1144