Merge branch 'master' into polymorphic-filters

* Add chinese translations of palette colour names used for stability badges

bin/build-site.sh

@@ -393,6 +393,17 @@ node $TW5_BUILD_TIDDLYWIKI \
 	--rendertiddler $:/core/save/empty plugins/tiddlywiki/highlight/empty.html text/plain \
 	|| exit 1
 
+# /plugins/tiddlywiki/geospatial/index.html		Demo wiki with geospatial plugin
+# /plugins/tiddlywiki/geospatial/empty.html		Empty wiki with geospatial plugin
+node $TW5_BUILD_TIDDLYWIKI \
+	./editions/geospatialdemo \
+	--verbose \
+	--load $TW5_BUILD_OUTPUT/build.tid \
+	--output $TW5_BUILD_OUTPUT \
+	--rendertiddler $:/core/save/all plugins/tiddlywiki/geospatial/index.html text/plain \
+	--rendertiddler $:/core/save/empty plugins/tiddlywiki/geospatial/empty.html text/plain \
+	|| exit 1
+
 ######################################################
 #
 # Language editions

boot/boot.js

@@ -142,15 +142,15 @@ $tw.utils.each = function(object,callback) {
 	var next,f,length;
 	if(object) {
 		if(Object.prototype.toString.call(object) == "[object Array]") {
-			for (f=0, length=object.length; f<length; f++) {
+			for(f=0, length=object.length; f<length; f++) {
 				next = callback(object[f],f,object);
 				if(next === false) {
 					break;
 				}
-		    }
+			}
 		} else {
 			var keys = Object.keys(object);
-			for (f=0, length=keys.length; f<length; f++) {
+			for(f=0, length=keys.length; f<length; f++) {
 				var key = keys[f];
 				next = callback(object[key],key,object);
 				if(next === false) {
@@ -275,7 +275,7 @@ Extend an object with the properties from a list of source objects
 $tw.utils.extend = function(object /*, sourceObjectList */) {
 	$tw.utils.each(Array.prototype.slice.call(arguments,1),function(source) {
 		if(source) {
-			for (var p in source) {
+			for(var p in source) {
 				object[p] = source[p];
 			}
 		}
@@ -289,7 +289,7 @@ Fill in any null or undefined properties of an object with the properties from a
 $tw.utils.deepDefaults = function(object /*, sourceObjectList */) {
 	$tw.utils.each(Array.prototype.slice.call(arguments,1),function(source) {
 		if(source) {
-			for (var p in source) {
+			for(var p in source) {
 				if(object[p] === null || object[p] === undefined) {
 					object[p] = source[p];
 				}
@@ -893,8 +893,8 @@ $tw.modules.execute = function(moduleName,moduleRoot) {
 	} else {
 		/*
 		CommonJS optional require.main property:
-		 In a browser we offer a fake main module which points back to the boot function
-		 (Theoretically, this may allow TW to eventually load itself as a module in the browser)
+			In a browser we offer a fake main module which points back to the boot function
+			(Theoretically, this may allow TW to eventually load itself as a module in the browser)
 		*/
 		Object.defineProperty(sandbox.require, "main", {
 			value: (typeof(require) !== "undefined") ? require.main : {TiddlyWiki: _boot},
@@ -936,9 +936,9 @@ $tw.modules.execute = function(moduleName,moduleRoot) {
 				moduleInfo.exports = moduleInfo.definition;
 			}
 		} catch(e) {
-			if (e instanceof SyntaxError) {
+			if(e instanceof SyntaxError) {
 				var line = e.lineNumber || e.line; // Firefox || Safari
-				if (typeof(line) != "undefined" && line !== null) {
+				if(typeof(line) != "undefined" && line !== null) {
 					$tw.utils.error("Syntax error in boot module " + name + ":" + line + ":\n" + e.stack);
 				} else if(!$tw.browser) {
 					// this is the only way to get node.js to display the line at which the syntax error appeared,
@@ -1533,7 +1533,7 @@ Define all modules stored in ordinary tiddlers
 $tw.Wiki.prototype.defineTiddlerModules = function() {
 	this.each(function(tiddler,title) {
 		if(tiddler.hasField("module-type")) {
-			switch (tiddler.fields.type) {
+			switch(tiddler.fields.type) {
 				case "application/javascript":
 					// We only define modules that haven't already been defined, because in the browser modules in system tiddlers are defined in inline script
 					if(!$tw.utils.hop($tw.modules.titles,tiddler.fields.title)) {
@@ -2043,7 +2043,7 @@ $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
 		arrayOfFiles = arrayOfFiles || [];
 		var files = fs.readdirSync(dirPath);
 		files.forEach(function(file) {
-			if (recurse && fs.statSync(dirPath + path.sep + file).isDirectory()) {
+			if(recurse && fs.statSync(dirPath + path.sep + file).isDirectory()) {
 				arrayOfFiles = getAllFiles(dirPath + path.sep + file, recurse, arrayOfFiles);
 			} else if(fs.statSync(dirPath + path.sep + file).isFile()){
 				arrayOfFiles.push(path.join(dirPath, path.sep, file));
@@ -2188,13 +2188,16 @@ Returns an array of search paths
 */
 $tw.getLibraryItemSearchPaths = function(libraryPath,envVar) {
 	var pluginPaths = [path.resolve($tw.boot.corePath,libraryPath)],
+		env;
+	if(envVar) {
 		env = process.env[envVar];
-	if(env) {
-		env.split(path.delimiter).map(function(item) {
-			if(item) {
-				pluginPaths.push(item);
-			}
-		});
+		if(env) {
+			env.split(path.delimiter).map(function(item) {
+				if(item) {
+					pluginPaths.push(item);
+				}
+			});
+		}
 	}
 	return pluginPaths;
 };
@@ -2280,7 +2283,7 @@ $tw.loadWikiTiddlers = function(wikiPath,options) {
 		}
 		$tw.wiki.addTiddlers(tiddlerFile.tiddlers);
 	});
-	if ($tw.boot.wikiPath == wikiPath) {
+	if($tw.boot.wikiPath == wikiPath) {
 		// Save the original tiddler file locations if requested
 		var output = {}, relativePath, fileInfo;
 		for(var title in $tw.boot.files) {
@@ -2634,14 +2637,14 @@ $tw.boot.doesTaskMatchPlatform = function(taskModule) {
 	var platforms = taskModule.platforms;
 	if(platforms) {
 		for(var t=0; t<platforms.length; t++) {
-			switch (platforms[t]) {
+			switch(platforms[t]) {
 				case "browser":
-					if ($tw.browser) {
+					if($tw.browser) {
 						return true;
 					}
 					break;
 				case "node":
-					if ($tw.node) {
+					if($tw.node) {
 						return true;
 					}
 					break;
@@ -2724,7 +2727,7 @@ Invoke the hook by key
 $tw.hooks.invokeHook = function(hookName /*, value,... */) {
 	var args = Array.prototype.slice.call(arguments,1);
 	if($tw.utils.hop($tw.hooks.names,hookName)) {
-		for (var i = 0; i < $tw.hooks.names[hookName].length; i++) {
+		for(var i = 0; i < $tw.hooks.names[hookName].length; i++) {
 			args[0] = $tw.hooks.names[hookName][i].apply(null,args);
 		}
 	}

boot/sjcl.js.meta

@@ -1,3 +0,0 @@
-title: $:/library/sjcl.js
-type: application/javascript
-library: yes

boot/tiddlywiki.files

@@ -0,0 +1,32 @@
+{
+	"tiddlers": [
+		{
+			"file": "sjcl.js",
+			"fields": {
+				"title": "$:/library/sjcl.js",
+				"type": "application/javascript",
+				"library": "yes"
+			},
+			"prefix": "(function(define) {\n",
+			"suffix": "\n})(function (_,defined){window.sjcl = defined()})\n"
+		},
+		{
+			"file": "boot.js",
+			"fields": {
+				"title": "$:/boot/boot.js",
+				"type": "application/javascript"
+			}
+		},
+		{
+			"file": "bootprefix.js",
+			"fields": {
+				"title": "$:/boot/bootprefix.js",
+				"type": "application/javascript"
+			}
+		},
+		{
+			"file": "boot.css.tid",
+			"isTiddlerFile": true
+		}
+	]
+}

core/images/standard-layout.tid

@@ -1,7 +1,7 @@
-title: $:/core/images/default-layout
+title: $:/core/images/standard-layout
 tags: $:/tags/Image
 
 \parameters (size:"22pt")
-<svg width=<<size>> height=<<size>> class="tc-image-default-layout tc-image-button" viewBox="0 0 128 128">
+<svg width=<<size>> height=<<size>> class="tc-image-standard-layout tc-image-button" viewBox="0 0 128 128">
     <path d="M71.93 72A8.07 8.07 0 0 1 80 80.07v7.86A8.071 8.071 0 0 1 71.93 96H8.07A8.067 8.067 0 0 1 0 87.93v-7.86A8.072 8.072 0 0 1 8.07 72h63.86Zm0 32a8.07 8.07 0 0 1 8.07 8.07v7.86a8.071 8.071 0 0 1-8.07 8.07H8.07A8.067 8.067 0 0 1 0 119.93v-7.86A8.072 8.072 0 0 1 8.07 104h63.86Zm0-104A8.068 8.068 0 0 1 80 8.07v47.86A8.073 8.073 0 0 1 71.93 64H8.07A8.07 8.07 0 0 1 0 55.93V8.07A8.072 8.072 0 0 1 8.07 0h63.86Zm48 0c2.14 0 4.193.85 5.706 2.364A8.067 8.067 0 0 1 128 8.07v111.86c0 2.14-.85 4.193-2.364 5.706A8.067 8.067 0 0 1 119.93 128H96.07c-2.14 0-4.193-.85-5.706-2.364A8.067 8.067 0 0 1 88 119.93V8.07c0-2.14.85-4.193 2.364-5.706A8.067 8.067 0 0 1 96.07 0h23.86ZM116 24h-16a3.995 3.995 0 0 0-2.828 1.172 3.995 3.995 0 0 0 0 5.656A3.995 3.995 0 0 0 100 32h16a3.995 3.995 0 0 0 2.828-1.172 3.995 3.995 0 0 0 0-5.656A3.995 3.995 0 0 0 116 24Z"/>
 </svg>

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

@@ -65,6 +65,10 @@ 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
+stability-stable: Badge for stability level "stable"
+stability-experimental: Badge for stability level "experimental"
+stability-deprecated: Badge for stability level "deprecated"
+stability-legacy: Badge for stability level "legacy"
 testcase-accent-level-1: Test case accent colour with no nesting
 testcase-accent-level-2: Test case accent colour with 2nd level nesting
 testcase-accent-level-3: Test case accent colour with 3rd level nesting or higher

core/language/en-GB/Fields.multids

@@ -30,6 +30,7 @@ name: The human readable name associated with a plugin tiddler
 parent-plugin: For a plugin, specifies which plugin of which it is a sub-plugin
 plugin-priority: A numerical value indicating the priority of a plugin tiddler
 plugin-type: The type of plugin in a plugin tiddler
+stability: The development status of a plugin: deprecated, experimental, stable, or legacy
 revision: The revision of the tiddler held at the server
 released: Date of a TiddlyWiki release
 source: The source URL associated with a tiddler

core/language/en-GB/Misc.multids

@@ -70,7 +70,7 @@ No: No
 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.
 PageTemplate/Description: the default ~TiddlyWiki layout
-PageTemplate/Name: Default ~PageTemplate
+PageTemplate/Name: Standard Layout
 PluginReloadWarning: Please save {{$:/core/ui/Buttons/save-wiki}} and reload {{$:/core/ui/Buttons/refresh}} to allow changes to ~JavaScript plugins to take effect
 RecentChanges/DateFormat: DDth MMM YYYY
 Shortcuts/Input/AdvancedSearch/Hint: Open the ~AdvancedSearch panel from within the sidebar search field

core/modules/commands/makelibrary.js

@@ -27,33 +27,8 @@ var Command = function(params,commander,callback) {
 
 Command.prototype.execute = function() {
 	var wiki = this.commander.wiki,
-		fs = require("fs"),
-		path = require("path"),
 		upgradeLibraryTitle = this.params[0] || UPGRADE_LIBRARY_TITLE,
-		tiddlers = {};
-	// Collect up the library plugins
-	var collectPlugins = function(folder) {
-			var pluginFolders = $tw.utils.getSubdirectories(folder) || [];
-			for(var p=0; p<pluginFolders.length; p++) {
-				if(!$tw.boot.excludeRegExp.test(pluginFolders[p])) {
-					pluginFields = $tw.loadPluginFolder(path.resolve(folder,"./" + pluginFolders[p]));
-					if(pluginFields && pluginFields.title) {
-						tiddlers[pluginFields.title] = pluginFields;
-					}
-				}
-			}
-		},
-		collectPublisherPlugins = function(folder) {
-			var publisherFolders = $tw.utils.getSubdirectories(folder) || [];
-			for(var t=0; t<publisherFolders.length; t++) {
-				if(!$tw.boot.excludeRegExp.test(publisherFolders[t])) {
-					collectPlugins(path.resolve(folder,"./" + publisherFolders[t]));
-				}
-			}
-		};
-	$tw.utils.each($tw.getLibraryItemSearchPaths($tw.config.pluginsPath,$tw.config.pluginsEnvVar),collectPublisherPlugins);
-	$tw.utils.each($tw.getLibraryItemSearchPaths($tw.config.themesPath,$tw.config.themesEnvVar),collectPublisherPlugins);
-	$tw.utils.each($tw.getLibraryItemSearchPaths($tw.config.languagesPath,$tw.config.languagesEnvVar),collectPlugins);
+		tiddlers = $tw.utils.getAllPlugins();
 	// Save the upgrade library tiddler
 	var pluginFields = {
 		title: upgradeLibraryTitle,

core/modules/filters.js

@@ -200,12 +200,20 @@ exports.parseFilter = function(filterString) {
 
 exports.getFilterOperators = function() {
 	if(!this.filterOperators) {
-		$tw.Wiki.prototype.filterOperators = {};
-		$tw.modules.applyMethods("filteroperator",this.filterOperators);
+		$tw.Wiki.prototype.oldFilterOperators = {};
+		$tw.modules.applyMethods("filteroperator",this.oldFilterOperators);
+		$tw.Wiki.prototype.newFilterOperators = {};
+		$tw.modules.applyMethods("newfilteroperator",this.newFilterOperators);
+		$tw.Wiki.prototype.filterOperators = $tw.utils.extend({},$tw.Wiki.prototype.oldFilterOperators,$tw.Wiki.prototype.newFilterOperators);
 	}
 	return this.filterOperators;
 };
 
+exports.isFilterOperatorNew = function(name) {
+	this.getFilterOperators();
+	return name in $tw.Wiki.prototype.newFilterOperators;
+};
+
 exports.getFilterRunPrefixes = function() {
 	if(!this.filterRunPrefixes) {
 		$tw.Wiki.prototype.filterRunPrefixes = {};
@@ -214,11 +222,21 @@ exports.getFilterRunPrefixes = function() {
 	return this.filterRunPrefixes;
 }
 
-exports.filterTiddlers = function(filterString,widget,source) {
+exports.filterTiddlersPolymorphic = function(filterString,widget,source) {
 	var fn = this.compileFilter(filterString);
 	return fn.call(this,source,widget);
 };
 
+exports.filterTiddlers = function(filterString,widget,source) {
+	var results = this.filterTiddlersPolymorphic(filterString,widget,source);
+	for(var t=0; t<results.length; t++) {
+		if(typeof results[t] !== "string") {
+			results[t] = $tw.utils.filterItemToString(results[t]);
+		}
+	}
+	return results;
+};
+
 /*
 Compile a filter into a function with the signature fn(source,widget) where:
 source: an iterator function for the source tiddlers, called source(iterator), where iterator is called as iterator(tiddler,title)
@@ -255,16 +273,19 @@ exports.compileFilter = function(filterString) {
 				currTiddlerTitle = widget && widget.getVariable("currentTiddler");
 			$tw.utils.each(operation.operators,function(operator) {
 				var operands = [],
-					operatorFunction;
+					operatorFunction,
+					operatorName;
 				if(!operator.operator) {
 					// Use the "title" operator if no operator is specified
 					operatorFunction = filterOperators.title;
+					operatorName = "title";
 				} else if(!filterOperators[operator.operator]) {
 					// Unknown operators treated as "[unknown]" - at run time we can distinguish between a custom operator and falling back to the default "field" operator
 					operatorFunction = filterOperators["[unknown]"];
 				} else {
 					// Use the operator function
 					operatorFunction = filterOperators[operator.operator];
+					operatorName = operator.operator;
 				}
 				$tw.utils.each(operator.operands,function(operand) {
 					if(operand.indirect) {
@@ -277,7 +298,17 @@ exports.compileFilter = function(filterString) {
 					}
 					operands.push(operand.value);
 				});
-
+				// If this is a legacy monomorphic operator then wrap the accumulator source in a wrapper that converts each item to a string
+				if(!self.isFilterOperatorNew(operatorName)) {
+					var innerAccumulator = accumulator;
+					accumulator = function(iterator) {
+						innerAccumulator(function(ignored,item) {
+							var title = $tw.utils.filterItemToString(item),
+								tiddler = self.getTiddler(title);
+							iterator(tiddler,title);
+						});
+					};
+				}
 				// Invoke the appropriate filteroperator module
 				results = operatorFunction(accumulator,{
 							operator: operator.operator,

core/modules/filters/backtranscludes.js

@@ -16,11 +16,11 @@ Filter operator for returning all the backtranscludes from a tiddler
 Export our filter function
 */
 exports.backtranscludes = function(source,operator,options) {
-	var results = [];
+	var results = new $tw.utils.LinkedList();
 	source(function(tiddler,title) {
-		$tw.utils.pushTop(results,options.wiki.getTiddlerBacktranscludes(title));
+		results.pushTop(options.wiki.getTiddlerBacktranscludes(title));
 	});
-	return results;
+	return results.makeTiddlerIterator(options.wiki);
 };
 
 })();

core/modules/filters/count.js

@@ -1,7 +1,7 @@
 /*\
 title: $:/core/modules/filters/count.js
 type: application/javascript
-module-type: filteroperator
+module-type: newfilteroperator
 
 Filter operator returning the number of entries in the current list.
 
@@ -20,7 +20,7 @@ exports.count = function(source,operator,options) {
 	source(function(tiddler,title) {
 		count++;
 	});
-	return [count + ""];
+	return [count];
 };
 
 })();

core/modules/filters/json-ops.js

@@ -1,7 +1,7 @@
 /*\
 title: $:/core/modules/filters/json-ops.js
 type: application/javascript
-module-type: filteroperator
+module-type: newfilteroperator
 
 Filter operators for JSON operations
 
@@ -57,9 +57,9 @@ exports["jsonindexes"] = function(source,operator,options) {
 exports["jsontype"] = function(source,operator,options) {
 	var results = [];
 	source(function(tiddler,title) {
-		var data = $tw.utils.parseJSONSafe(title,title);
-		if(data) {
-			var item = getDataItemType(data,operator.operands);
+		var data = $tw.utils.filterItemToObject(title,{defaultValue: title,parseStringsAsJson: true});
+		if(data !== undefined) {
+			var item = getFilterItemType(data,operator.operands);
 			if(item !== undefined) {
 				results.push(item);
 			}
@@ -196,7 +196,7 @@ function convertDataItemKeysToStrings(item) {
 	return [];
 }
 
-function getDataItemType(data,indexes) {
+function getFilterItemType(data,indexes) {
 	// Get the item
 	var item = getDataItem(data,indexes);
 	// Return the item type
@@ -281,4 +281,3 @@ function setDataItem(data,indexes,value) {
 }
 
 })();
-	

core/modules/filters/math.js

@@ -1,7 +1,7 @@
 /*\
 title: $:/core/modules/filters/math.js
 type: application/javascript
-module-type: filteroperator
+module-type: newfilteroperator
 
 Filter operators for math. Unary/binary operators work on each item in turn, and return a new item list.
 
@@ -207,7 +207,7 @@ function makeNumericBinaryOperator(fnCalc) {
 		var result = [],
 			numOperand = $tw.utils.parseNumber(operator.operand);
 		source(function(tiddler,title) {
-			result.push($tw.utils.stringifyNumber(fnCalc($tw.utils.parseNumber(title),numOperand)));
+			result.push(fnCalc($tw.utils.parseNumber(title),numOperand));
 		});
 		return result;
 	};
@@ -226,7 +226,7 @@ function makeNumericReducingOperator(fnCalc,initialValue,fnFinal) {
 		if(fnFinal) {
 			value = fnFinal(value,result.length,result);
 		}
-		return [$tw.utils.stringifyNumber(value)];
+		return [value];
 	};
 };
 
@@ -238,7 +238,7 @@ function makeNumericArrayOperator(fnCalc) {
 		});
 		results = fnCalc(results);
 		$tw.utils.each(results,function(value,index) {
-			results[index] = $tw.utils.stringifyNumber(value);
+			results[index] = value;
 		});
 		return results;
 	};

core/modules/filters/strings.js

@@ -127,7 +127,7 @@ function diffPartsToChars(text1,text2,mode) {
             if(lineHash.hasOwnProperty ? lineHash.hasOwnProperty(line) : (lineHash[line] !== undefined)) {
 				chars += String.fromCharCode(lineHash[line]);
             } else {
-                if (lineArrayLength == maxLines) {
+                if(lineArrayLength == maxLines) {
                   line = text.substring(lineStart);
                   lineEnd = text.length;
                 }
@@ -217,7 +217,10 @@ exports.splitregexp = function(source,operator,options) {
 		return ["RegExp error: " + ex];
 	}
 	source(function(tiddler,title) {
-		Array.prototype.push.apply(result,title.split(regExp));
+		var parts = title.split(regExp).map(function(part){
+			return part || "";	// make sure it's a string
+		});
+		Array.prototype.push.apply(result,parts);
 	});
 	return result;
 };
@@ -264,7 +267,7 @@ exports.pad = function(source,operator,options) {
 			} else {
 				var padString = "",
 					padStringLength = targetLength - title.length;
-				while (padStringLength > padString.length) {
+				while(padStringLength > padString.length) {
 					padString += fill;
 				}
 				//make sure we do not exceed the specified length

core/modules/filters/transcludes.js

@@ -20,7 +20,7 @@ exports.transcludes = function(source,operator,options) {
 	source(function(tiddler,title) {
 		results.pushTop(options.wiki.getTiddlerTranscludes(title));
 	});
-	return results.toArray();
+	return results.makeTiddlerIterator(options.wiki);
 };
 
 })();

core/modules/indexers/back-indexer.js

@@ -70,9 +70,12 @@ BackSubIndexer.prototype.rebuild = function() {
 * Get things that is being referenced in the text, e.g. tiddler names in the link syntax.
 */
 BackSubIndexer.prototype._getTarget = function(tiddler) {
+	if(this.wiki.isBinaryTiddler(tiddler.fields.text)) {
+		return [];
+	}
 	var parser = this.wiki.parseText(tiddler.fields.type, tiddler.fields.text, {});
 	if(parser) {
-		return this.wiki[this.extractor](parser.tree);
+		return this.wiki[this.extractor](parser.tree, tiddler.fields.title);
 	}
 	return [];
 }

core/modules/parsers/parseutils.js

@@ -114,7 +114,7 @@ exports.parseStringLiteral = function(source,pos) {
 	var match = reString.exec(source);
 	if(match && match.index === pos) {
 		node.value = match[1] !== undefined ? match[1] :(
-			match[2] !== undefined ? match[2] : match[3] 
+			match[2] !== undefined ? match[2] : match[3]
 					);
 		node.end = pos + match[0].length;
 		return node;

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

@@ -29,13 +29,16 @@ exports.init = function(parser) {
 
 exports.parse = function() {
 	var reEnd = /(\r?\n```$)/mg;
+	var languageStart = this.parser.pos + 3,
+		languageEnd = languageStart + this.match[1].length;
 	// Move past the match
 	this.parser.pos = this.matchRegExp.lastIndex;
 
 	// Look for the end of the block
 	reEnd.lastIndex = this.parser.pos;
 	var match = reEnd.exec(this.parser.source),
-		text;
+		text,
+		codeStart = this.parser.pos;
 	// Process the block
 	if(match) {
 		text = this.parser.source.substring(this.parser.pos,match.index);
@@ -48,8 +51,8 @@ exports.parse = function() {
 	return [{
 			type: "codeblock",
 			attributes: {
-					code: {type: "string", value: text},
-					language: {type: "string", value: this.match[1]}
+					code: {type: "string", value: text, start: codeStart, end: this.parser.pos},
+					language: {type: "string", value: this.match[1], start: languageStart, end: languageEnd}
 			}
 	}];
 };

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

@@ -33,7 +33,8 @@ exports.parse = function() {
 	// Look for the end marker
 	reEnd.lastIndex = this.parser.pos;
 	var match = reEnd.exec(this.parser.source),
-		text;
+		text,
+		start = this.parser.pos;
 	// Process the text
 	if(match) {
 		text = this.parser.source.substring(this.parser.pos,match.index);
@@ -47,7 +48,9 @@ exports.parse = function() {
 		tag: "code",
 		children: [{
 			type: "text",
-			text: text
+			text: text,
+			start: start,
+			end: this.parser.pos
 		}]
 	}];
 };

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

@@ -31,6 +31,7 @@ exports.init = function(parser) {
 
 exports.parse = function() {
 	// Move past the match
+    var start = this.parser.pos;
 	this.parser.pos = this.matchRegExp.lastIndex;
 	// Create the link unless it is suppressed
 	if(this.match[0].substr(0,1) === "~") {
@@ -46,7 +47,7 @@ exports.parse = function() {
 				rel: {type: "string", value: "noopener noreferrer"}
 			},
 			children: [{
-				type: "text", text: this.match[0]
+				type: "text", text: this.match[0], start: start, end: this.parser.pos
 			}]
 		}];
 	}

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

@@ -31,6 +31,16 @@ exports.init = function(parser) {
 
 exports.parse = function() {
 	// Move past the match
+	var filterStart = this.parser.pos + 3;
+	var filterEnd = filterStart + this.match[1].length;
+	var toolTipStart = filterEnd + 1;
+	var toolTipEnd = toolTipStart + (this.match[2] ? this.match[2].length : 0);
+	var templateStart = toolTipEnd + 2;
+	var templateEnd = templateStart + (this.match[3] ? this.match[3].length : 0);
+	var styleStart = templateEnd + 2;
+	var styleEnd = styleStart + (this.match[4] ? this.match[4].length : 0);
+	var classesStart = styleEnd + 1;
+	var classesEnd = classesStart + (this.match[5] ? this.match[5].length : 0);
 	this.parser.pos = this.matchRegExp.lastIndex;
 	// Get the match details
 	var filter = this.match[1],
@@ -42,21 +52,21 @@ exports.parse = function() {
 	var node = {
 		type: "list",
 		attributes: {
-			filter: {type: "string", value: filter}
+			filter: {type: "string", value: filter, start: filterStart, end: filterEnd},
 		},
 		isBlock: true
 	};
 	if(tooltip) {
-		node.attributes.tooltip = {type: "string", value: tooltip};
+		node.attributes.tooltip = {type: "string", value: tooltip, start: toolTipStart, end: toolTipEnd};
 	}
 	if(template) {
-		node.attributes.template = {type: "string", value: template};
+		node.attributes.template = {type: "string", value: template, start: templateStart, end: templateEnd};
 	}
 	if(style) {
-		node.attributes.style = {type: "string", value: style};
+		node.attributes.style = {type: "string", value: style, start: styleStart, end: styleEnd};
 	}
 	if(classes) {
-		node.attributes.itemClass = {type: "string", value: classes.split(".").join(" ")};
+		node.attributes.itemClass = {type: "string", value: classes.split(".").join(" "), start: classesStart, end: classesEnd};
 	}
 	return [node];
 };

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

@@ -30,6 +30,16 @@ exports.init = function(parser) {
 };
 
 exports.parse = function() {
+	var filterStart = this.parser.pos + 3;
+	var filterEnd = filterStart + this.match[1].length;
+	var toolTipStart = filterEnd + 1;
+	var toolTipEnd = toolTipStart + (this.match[2] ? this.match[2].length : 0);
+	var templateStart = toolTipEnd + 2;
+	var templateEnd = templateStart + (this.match[3] ? this.match[3].length : 0);
+	var styleStart = templateEnd + 2;
+	var styleEnd = styleStart + (this.match[4] ? this.match[4].length : 0);
+	var classesStart = styleEnd + 1;
+	var classesEnd = classesStart + (this.match[5] ? this.match[5].length : 0);
 	// Move past the match
 	this.parser.pos = this.matchRegExp.lastIndex;
 	// Get the match details
@@ -42,20 +52,20 @@ exports.parse = function() {
 	var node = {
 		type: "list",
 		attributes: {
-			filter: {type: "string", value: filter}
+			filter: {type: "string", value: filter, start: filterStart, end: filterEnd},
 		}
 	};
 	if(tooltip) {
-		node.attributes.tooltip = {type: "string", value: tooltip};
+		node.attributes.tooltip = {type: "string", value: tooltip, start: toolTipStart, end: toolTipEnd};
 	}
 	if(template) {
-		node.attributes.template = {type: "string", value: template};
+		node.attributes.template = {type: "string", value: template, start: templateStart, end: templateEnd};
 	}
 	if(style) {
-		node.attributes.style = {type: "string", value: style};
+		node.attributes.style = {type: "string", value: style, start: styleStart, end: styleEnd};
 	}
 	if(classes) {
-		node.attributes.itemClass = {type: "string", value: classes.split(".").join(" ")};
+		node.attributes.itemClass = {type: "string", value: classes.split(".").join(" "), start: classesStart, end: classesEnd};
 	}
 	return [node];
 };

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

@@ -45,10 +45,11 @@ exports.parse = function() {
 		reEnd.lastIndex = this.parser.pos;
 		match = reEnd.exec(this.parser.source);
 		if(match) {
+			var start = this.parser.pos;
 			this.parser.pos = reEnd.lastIndex;
 			// Add a line break if the terminator was a line break
 			if(match[2]) {
-				tree.push({type: "element", tag: "br"});
+				tree.push({type: "element", tag: "br", start: start, end: this.parser.pos});
 			}
 		}
 	} while(match && !match[1]);

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

@@ -30,15 +30,17 @@ exports.parse = function() {
 	// Move past the !s
 	this.parser.pos = this.matchRegExp.lastIndex;
 	// Parse any classes, whitespace and then the heading itself
+	var classStart = this.parser.pos;
 	var classes = this.parser.parseClasses();
+	var classEnd = this.parser.pos;
 	this.parser.skipWhitespace({treatNewlinesAsNonWhitespace: true});
 	var tree = this.parser.parseInlineRun(/(\r?\n)/mg);
 	// Return the heading
 	return [{
 		type: "element",
-		tag: "h" + headingLevel, 
+		tag: "h" + headingLevel,
 		attributes: {
-			"class": {type: "string", value: classes.join(" ")}
+			"class": {type: "string", value: classes.join(" "), start: classStart, end: classEnd}
 		},
 		children: tree
 	}];

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

@@ -44,6 +44,10 @@ Parse the most recent match
 exports.parse = function() {
 	// Retrieve the most recent match so that recursive calls don't overwrite it
 	var tag = this.nextTag;
+	if (!tag.isSelfClosing) {
+		tag.openTagStart = tag.start;
+		tag.openTagEnd = tag.end;
+	}
 	this.nextTag = null;
 	// Advance the parser position to past the tag
 	this.parser.pos = tag.end;
@@ -60,6 +64,27 @@ exports.parse = function() {
 			var reEnd = new RegExp("(" + reEndString + ")","mg");
 			tag.children = this.parser.parseInlineRun(reEnd,{eatTerminator: true});
 		}
+		tag.end = this.parser.pos;
+		tag.closeTagEnd = tag.end;
+		if (tag.closeTagEnd === tag.openTagEnd || this.parser.source[tag.closeTagEnd - 1] !== '>') {
+			tag.closeTagStart = tag.end;
+		} else {
+			tag.closeTagStart = tag.closeTagEnd - 2;
+			var closeTagMinPos = tag.children.length > 0 ? tag.children[tag.children.length-1].end : tag.openTagEnd;
+			if (!Number.isSafeInteger(closeTagMinPos)) closeTagMinPos = tag.openTagEnd;
+			while (tag.closeTagStart >= closeTagMinPos) {
+				var char = this.parser.source[tag.closeTagStart];
+				if (char === '>') {
+					tag.closeTagStart = -1;
+					break;
+				}
+				if (char === '<') break;
+				tag.closeTagStart -= 1;
+			}
+			if (tag.closeTagStart < closeTagMinPos) {
+				tag.closeTagStart = tag.end;
+			}
+		}
 	}
 	// Return the tag
 	return [tag];

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

@@ -122,9 +122,9 @@ exports.parseImage = function(source,pos) {
 	}
 	pos = token.end;
 	if(token.match[1]) {
-		node.attributes.tooltip = {type: "string", value: token.match[1].trim()};
+		node.attributes.tooltip = {type: "string", value: token.match[1].trim(),start: token.start,end:token.start + token.match[1].length - 1};
 	}
-	node.attributes.source = {type: "string", value: (token.match[2] || "").trim()};
+	node.attributes.source = {type: "string", value: (token.match[2] || "").trim(), start: token.start + (token.match[1] ? token.match[1].length : 0), end: token.end - 2};
 	// Update the end position
 	node.end = pos;
 	return node;

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

@@ -38,13 +38,14 @@ exports.parse = function() {
 	// Parse the filter terminated by a line break
 	var reMatch = /(.*)(?:$|\r?\n)/mg;
 	reMatch.lastIndex = this.parser.pos;
+	var filterStart = this.parser.source;
 	var match = reMatch.exec(this.parser.source);
 	this.parser.pos = reMatch.lastIndex;
 	// Parse tree nodes to return
 	return [{
 		type: "importvariables",
 		attributes: {
-			filter: {type: "string", value: match[1]}
+			filter: {type: "string", value: match[1], start: filterStart, end: this.parser.pos}
 		},
 		children: []
 	}];

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

@@ -74,6 +74,7 @@ exports.parse = function() {
 		// Match the list marker
 		var reMatch = /([\*#;:>]+)/mg;
 		reMatch.lastIndex = this.parser.pos;
+		var start = this.parser.pos;
 		var match = reMatch.exec(this.parser.source);
 		if(!match || match.index !== this.parser.pos) {
 			break;
@@ -94,9 +95,21 @@ exports.parse = function() {
 			}
 			// Construct the list element or reuse the previous one at this level
 			if(listStack.length <= t) {
-				var listElement = {type: "element", tag: listInfo.listTag, children: [
-					{type: "element", tag: listInfo.itemTag, children: []}
-				]};
+				var listElement = {
+					type: "element",
+					tag: listInfo.listTag,
+					children: [
+						{
+							type: "element",
+							tag: listInfo.itemTag,
+							children: [],
+							start: start,
+							end: this.parser.pos,
+						}
+					],
+					start: start,
+					end: this.parser.pos,
+				};
 				// Link this list element into the last child item of the parent list item
 				if(t) {
 					var prevListItem = listStack[t-1].children[listStack[t-1].children.length-1];
@@ -105,21 +118,33 @@ exports.parse = function() {
 				// Save this element in the stack
 				listStack[t] = listElement;
 			} else if(t === (match[0].length - 1)) {
-				listStack[t].children.push({type: "element", tag: listInfo.itemTag, children: []});
+				listStack[t].children.push({
+					type: "element",
+					tag: listInfo.itemTag,
+					children: [],
+					start: start,
+					end: this.parser.pos,
+				});
 			}
 		}
 		if(listStack.length > match[0].length) {
 			listStack.splice(match[0].length,listStack.length - match[0].length);
 		}
 		// Process the body of the list item into the last list item
+		var classStart = this.parser.pos;
 		var lastListChildren = listStack[listStack.length-1].children,
 			lastListItem = lastListChildren[lastListChildren.length-1],
 			classes = this.parser.parseClasses();
+		var classEnd = this.parser.pos;
 		this.parser.skipWhitespace({treatNewlinesAsNonWhitespace: true});
 		var tree = this.parser.parseInlineRun(/(\r?\n)/mg);
 		lastListItem.children.push.apply(lastListItem.children,tree);
+		lastListItem.end = this.parser.pos;
+		listStack[listStack.length-1].end = this.parser.pos;
 		if(classes.length > 0) {
 			$tw.utils.addClassToParseTreeNode(lastListItem,classes.join(" "));
+			lastListItem.attributes.class.start = classStart;
+			lastListItem.attributes.class.end = classEnd;
 		}
 		// Consume any whitespace following the list item
 		this.parser.skipWhitespace();

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

@@ -96,15 +96,20 @@ exports.parseLink = function(source,pos) {
 		splitPos = null;
 	}
 	// Pull out the tooltip and URL
-	var tooltip, URL;
+	var tooltip, URL, urlStart;
+	textNode.start = pos;
 	if(splitPos) {
+		urlStart = splitPos + 1;
 		URL = source.substring(splitPos + 1,closePos).trim();
 		textNode.text = source.substring(pos,splitPos).trim();
+		textNode.end = splitPos;
 	} else {
+		urlStart = pos;
 		URL = source.substring(pos,closePos).trim();
 		textNode.text = URL;
+		textNode.end = closePos;
 	}
-	node.attributes.href = {type: "string", value: URL};
+	node.attributes.href = {type: "string", value: URL, start: urlStart, end: closePos};
 	node.attributes.target = {type: "string", value: "_blank"};
 	node.attributes.rel = {type: "string", value: "noopener noreferrer"};
 	// Update the end position

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

@@ -29,32 +29,39 @@ exports.init = function(parser) {
 
 exports.parse = function() {
 	// Move past the match
+	var start = this.parser.pos + 2;
 	this.parser.pos = this.matchRegExp.lastIndex;
 	// Process the link
 	var text = this.match[1],
-		link = this.match[2] || text;
+		link = this.match[2] || text,
+		textEndPos = this.parser.source.indexOf("|", start);
+	if (textEndPos < 0 || textEndPos > this.matchRegExp.lastIndex) {
+		textEndPos = this.matchRegExp.lastIndex - 2;
+	}
+	var linkStart = this.match[2] ? (start + this.match[1].length + 1) : start;
+	var linkEnd = linkStart + link.length;
 	if($tw.utils.isLinkExternal(link)) {
 		return [{
 			type: "element",
 			tag: "a",
 			attributes: {
-				href: {type: "string", value: link},
+				href: {type: "string", value: link, start: linkStart, end: linkEnd},
 				"class": {type: "string", value: "tc-tiddlylink-external"},
 				target: {type: "string", value: "_blank"},
 				rel: {type: "string", value: "noopener noreferrer"}
 			},
 			children: [{
-				type: "text", text: text
+				type: "text", text: text, start: start, end: textEndPos
 			}]
 		}];
 	} else {
 		return [{
 			type: "link",
 			attributes: {
-				to: {type: "string", value: link}
+				to: {type: "string", value: link, start: linkStart, end: linkEnd}
 			},
 			children: [{
-				type: "text", text: text
+				type: "text", text: text, start: start, end: textEndPos
 			}]
 		}];
 	}

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

@@ -28,9 +28,13 @@ exports.parse = function() {
 	// Move past the <s
 	this.parser.pos = this.matchRegExp.lastIndex;
 	// Parse any classes, whitespace and then the optional cite itself
+	var classStart = this.parser.pos;
 	classes.push.apply(classes, this.parser.parseClasses());
+	var classEnd = this.parser.pos;
 	this.parser.skipWhitespace({treatNewlinesAsNonWhitespace: true});
+	var citeStart = this.parser.pos;
 	var cite = this.parser.parseInlineRun(/(\r?\n)/mg);
+	var citeEnd = this.parser.pos;
 	// before handling the cite, parse the body of the quote
 	var tree = this.parser.parseBlocks(reEndString);
 	// If we got a cite, put it before the text
@@ -38,18 +42,24 @@ exports.parse = function() {
 		tree.unshift({
 			type: "element",
 			tag: "cite",
-			children: cite
+			children: cite,
+			start: citeStart,
+			end: citeEnd
 		});
 	}
 	// Parse any optional cite
 	this.parser.skipWhitespace({treatNewlinesAsNonWhitespace: true});
+	citeStart = this.parser.pos;
 	cite = this.parser.parseInlineRun(/(\r?\n)/mg);
+	citeEnd = this.parser.pos;
 	// If we got a cite, push it
 	if(cite.length > 0) {
 		tree.push({
 			type: "element",
 			tag: "cite",
-			children: cite
+			children: cite,
+			start: citeStart,
+			end: citeEnd
 		});
 	}
 	// Return the blockquote element
@@ -57,7 +67,7 @@ exports.parse = function() {
 		type: "element",
 		tag: "blockquote",
 		attributes: {
-			class: { type: "string", value: classes.join(" ") },
+			class: { type: "string", value: classes.join(" "), start: classStart, end: classEnd },
 		},
 		children: tree
 	}];

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

@@ -29,10 +29,11 @@ exports.init = function(parser) {
 exports.parse = function() {
 	var match = this.match[0];
 	// Move past the match
+	var start = this.parser.pos;
 	this.parser.pos = this.matchRegExp.lastIndex;
 	// Create the link unless it is suppressed
 	if(match.substr(0,1) === "~") {
-		return [{type: "text", text: match.substr(1)}];
+		return [{type: "text", text: match.substr(1), start: start+1, end: this.parser.pos}];
 	} else {
 		return [{
 			type: "link",
@@ -41,10 +42,12 @@ exports.parse = function() {
 			},
 			children: [{
 				type: "text",
-				text: match
+				text: match,
+				start: start,
+				end: this.parser.pos
 			}]
 		}];
 	}
 };
 
-})();
+})();

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

@@ -150,7 +150,7 @@ exports.parse = function() {
 		} else {
 			// Otherwise, create a new row if this one is of a different type
 			if(rowType !== currRowType) {
-				rowContainer = {type: "element", tag: rowContainerTypes[rowType], children: []};
+				rowContainer = {type: "element", tag: rowContainerTypes[rowType], children: [], start: this.parser.pos, end: this.parser.pos};
 				table.children.push(rowContainer);
 				currRowType = rowType;
 			}
@@ -178,6 +178,7 @@ exports.parse = function() {
 				// Increment the row count
 				rowCount++;
 			}
+			rowContainer.end = this.parser.pos;
 		}
 		rowMatch = rowRegExp.exec(this.parser.source);
 	}

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

@@ -46,6 +46,7 @@ exports.parse = function() {
 		renderType = this.match[2];
 	// Move past the match
 	this.parser.pos = this.matchRegExp.lastIndex;
+	var start = this.parser.pos;
 	// Look for the end of the block
 	reEnd.lastIndex = this.parser.pos;
 	var match = reEnd.exec(this.parser.source),
@@ -74,7 +75,9 @@ exports.parse = function() {
 			tag: "pre",
 			children: [{
 				type: "text",
-				text: text
+				text: text,
+				start: start,
+				end: this.parser.pos
 			}]
 		}];
 	}

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

@@ -36,6 +36,7 @@ exports.parse = function() {
 	// Get the details of the match
 	var linkText = this.match[0];
 	// Move past the macro call
+	var start = this.parser.pos;
 	this.parser.pos = this.matchRegExp.lastIndex;
 	// If the link starts with the unwikilink character then just output it as plain text
 	if(linkText.substr(0,1) === $tw.config.textPrimitives.unWikiLink) {
@@ -57,7 +58,9 @@ exports.parse = function() {
 		},
 		children: [{
 			type: "text",
-			text: linkText
+			text: linkText,
+			start: start,
+			end: this.parser.pos
 		}]
 	}];
 };

core/modules/parsers/wikiparser/wikiparser.js

@@ -91,6 +91,11 @@ var WikiParser = function(type,text,options) {
 	} else {
 		topBranch.push.apply(topBranch,this.parseBlocks());
 	}
+	// Build rules' name map
+	this.usingRuleMap = {};
+	$tw.utils.each(this.pragmaRules, function (ruleInfo) { self.usingRuleMap[ruleInfo.rule.name] = Object.getPrototypeOf(ruleInfo.rule); });
+	$tw.utils.each(this.blockRules, function (ruleInfo) { self.usingRuleMap[ruleInfo.rule.name] = Object.getPrototypeOf(ruleInfo.rule); });
+	$tw.utils.each(this.inlineRules, function (ruleInfo) { self.usingRuleMap[ruleInfo.rule.name] = Object.getPrototypeOf(ruleInfo.rule); });
 	// Return the parse tree
 };
 
@@ -209,8 +214,13 @@ WikiParser.prototype.parsePragmas = function() {
 			break;
 		}
 		// Process the pragma rule
+		var start = this.pos;
 		var subTree = nextMatch.rule.parse();
 		if(subTree.length > 0) {
+			// Set the start and end positions of the pragma rule if
+			if (subTree[0].start === undefined) subTree[0].start = start;
+			if (subTree[subTree.length - 1].end === undefined) subTree[subTree.length - 1].end = this.pos;
+			$tw.utils.each(subTree, function (node) { node.rule = nextMatch.rule.name; });
 			// 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 = [];
@@ -235,7 +245,15 @@ WikiParser.prototype.parseBlock = function(terminatorRegExpString) {
 	// Look for a block rule that applies at the current position
 	var nextMatch = this.findNextMatch(this.blockRules,this.pos);
 	if(nextMatch && nextMatch.matchIndex === this.pos) {
-		return nextMatch.rule.parse();
+		var start = this.pos;
+		var subTree = nextMatch.rule.parse();
+		// Set the start and end positions of the first and last blocks if they're not already set
+		if (subTree.length > 0) {
+			if (subTree[0].start === undefined) subTree[0].start = start;
+			if (subTree[subTree.length - 1].end === undefined) subTree[subTree.length - 1].end = this.pos;
+		}
+		$tw.utils.each(subTree, function (node) { node.rule = nextMatch.rule.name; });
+		return subTree;
 	}
 	// Treat it as a paragraph if we didn't find a block rule
 	var start = this.pos;
@@ -332,7 +350,16 @@ WikiParser.prototype.parseInlineRunUnterminated = function(options) {
 			this.pos = nextMatch.matchIndex;
 		}
 		// Process the run rule
-		tree.push.apply(tree,nextMatch.rule.parse());
+		var start = this.pos;
+		var subTree = nextMatch.rule.parse();
+		// Set the start and end positions of the first and last child if they're not already set
+		if (subTree.length > 0) {
+			// Set the start and end positions of the first and last child if they're not already set
+			if (subTree[0].start === undefined) subTree[0].start = start;
+			if (subTree[subTree.length - 1].end === undefined) subTree[subTree.length - 1].end = this.pos;
+		}
+		$tw.utils.each(subTree, function (node) { node.rule = nextMatch.rule.name; });
+		tree.push.apply(tree,subTree);
 		// Look for the next run rule
 		nextMatch = this.findNextMatch(this.inlineRules,this.pos);
 	}
@@ -383,7 +410,15 @@ WikiParser.prototype.parseInlineRunTerminatedExtended = function(terminatorRegEx
 				this.pos = inlineRuleMatch.matchIndex;
 			}
 			// Process the inline rule
-			tree.push.apply(tree,inlineRuleMatch.rule.parse());
+			var start = this.pos;
+			var subTree = inlineRuleMatch.rule.parse();
+			// Set the start and end positions of the first and last child if they're not already set
+			if (subTree.length > 0) {
+				if (subTree[0].start === undefined) subTree[0].start = start;
+				if (subTree[subTree.length - 1].end === undefined) subTree[subTree.length - 1].end = this.pos;
+			}
+			$tw.utils.each(subTree, function (node) { node.rule = inlineRuleMatch.rule.name; });
+			tree.push.apply(tree,subTree);
 			// Look for the next inline rule
 			inlineRuleMatch = this.findNextMatch(this.inlineRules,this.pos);
 			// Look for the next terminator match
@@ -409,7 +444,7 @@ WikiParser.prototype.pushTextWidget = function(array,text,start,end) {
 		text = $tw.utils.trim(text);
 	}
 	if(text) {
-		array.push({type: "text", text: text, start: start, end: end});		
+		array.push({type: "text", text: text, start: start, end: end});
 	}
 };
 
@@ -462,4 +497,3 @@ WikiParser.prototype.amendRules = function(type,names) {
 exports["text/vnd.tiddlywiki"] = WikiParser;
 
 })();
-

core/modules/server/authenticators/header.js

@@ -37,7 +37,9 @@ HeaderAuthenticator.prototype.authenticateRequest = function(request,response,st
 		return false;
 	} else {
 		// authenticatedUsername will be undefined for anonymous users
-		state.authenticatedUsername = $tw.utils.decodeURIComponentSafe(username);
+		if(username) {
+			state.authenticatedUsername = $tw.utils.decodeURIComponentSafe(username);
+		}
 		return true;
 	}
 };

core/modules/startup/render.js

@@ -29,7 +29,11 @@ var THROTTLE_REFRESH_TIMEOUT = 400;
 
 exports.startup = function() {
 	// Set up the title
-	$tw.titleWidgetNode = $tw.wiki.makeTranscludeWidget(PAGE_TITLE_TITLE,{document: $tw.fakeDocument, parseAsInline: true});
+	$tw.titleWidgetNode = $tw.wiki.makeTranscludeWidget(PAGE_TITLE_TITLE, {
+		document: $tw.fakeDocument,
+		parseAsInline: true,
+		importPageMacros: true,
+	});
 	$tw.titleContainer = $tw.fakeDocument.createElement("div");
 	$tw.titleWidgetNode.render($tw.titleContainer,null);
 	document.title = $tw.titleContainer.textContent;

core/modules/startup/rootwidget.js

@@ -39,6 +39,7 @@ exports.startup = function() {
 			method: params.method,
 			body: params.body,
 			binary: params.binary,
+			useDefaultHeaders: params.useDefaultHeaders,
 			oncompletion: params.oncompletion,
 			onprogress: params.onprogress,
 			bindStatus: params["bind-status"],
@@ -47,7 +48,11 @@ exports.startup = function() {
 			headers: getPropertiesWithPrefix(params,"header-"),
 			passwordHeaders: getPropertiesWithPrefix(params,"password-header-"),
 			queryStrings: getPropertiesWithPrefix(params,"query-"),
-			passwordQueryStrings: getPropertiesWithPrefix(params,"password-query-")
+			passwordQueryStrings: getPropertiesWithPrefix(params,"password-query-"),
+			basicAuthUsername: params["basic-auth-username"],
+			basicAuthUsernameFromStore: params["basic-auth-username-from-store"],
+			basicAuthPassword: params["basic-auth-password"],
+			basicAuthPasswordFromStore: params["basic-auth-password-from-store"]
 		});
 	});
 	$tw.rootWidget.addEventListener("tm-http-cancel-all-requests",function(event) {
@@ -68,7 +73,10 @@ exports.startup = function() {
 	});
 	// Install the copy-to-clipboard  mechanism
 	$tw.rootWidget.addEventListener("tm-copy-to-clipboard",function(event) {
-		$tw.utils.copyToClipboard(event.param);
+		$tw.utils.copyToClipboard(event.param,{
+			successNotification: event.paramObject && event.paramObject.successNotification,
+			failureNotification: event.paramObject && event.paramObject.failureNotification
+		});
 	});
 	// Install the tm-focus-selector message
 	$tw.rootWidget.addEventListener("tm-focus-selector",function(event) {

core/modules/startup/story.js

@@ -93,7 +93,9 @@ exports.startup = function() {
 				updateAddressBar: $tw.wiki.getTiddlerText(CONFIG_PERMALINKVIEW_UPDATE_ADDRESS_BAR,"yes").trim() === "yes" ? "permalink" : "none",
 				updateHistory: $tw.wiki.getTiddlerText(CONFIG_UPDATE_HISTORY,"no").trim(),
 				targetTiddler: event.param || event.tiddlerTitle,
-				copyToClipboard: $tw.wiki.getTiddlerText(CONFIG_PERMALINKVIEW_COPY_TO_CLIPBOARD,"yes").trim() === "yes" ? "permalink" : "none"
+				copyToClipboard: $tw.wiki.getTiddlerText(CONFIG_PERMALINKVIEW_COPY_TO_CLIPBOARD,"yes").trim() === "yes" ? "permalink" : "none",
+				successNotification: event.paramObject && event.paramObject.successNotification,
+				failureNotification: event.paramObject && event.paramObject.failureNotification
 			});
 		});
 		// Listen for the tm-permaview message
@@ -102,7 +104,9 @@ exports.startup = function() {
 				updateAddressBar: $tw.wiki.getTiddlerText(CONFIG_PERMALINKVIEW_UPDATE_ADDRESS_BAR,"yes").trim() === "yes" ? "permaview" : "none",
 				updateHistory: $tw.wiki.getTiddlerText(CONFIG_UPDATE_HISTORY,"no").trim(),
 				targetTiddler: event.param || event.tiddlerTitle,
-				copyToClipboard: $tw.wiki.getTiddlerText(CONFIG_PERMALINKVIEW_COPY_TO_CLIPBOARD,"yes").trim() === "yes" ? "permaview" : "none"
+				copyToClipboard: $tw.wiki.getTiddlerText(CONFIG_PERMALINKVIEW_COPY_TO_CLIPBOARD,"yes").trim() === "yes" ? "permaview" : "none",
+				successNotification: event.paramObject && event.paramObject.successNotification,
+				failureNotification: event.paramObject && event.paramObject.failureNotification
 			});
 		});
 	}
@@ -177,6 +181,8 @@ options.updateAddressBar: "permalink", "permaview" or "no" (defaults to "permavi
 options.updateHistory: "yes" or "no" (defaults to "no")
 options.copyToClipboard: "permalink", "permaview" or "no" (defaults to "no")
 options.targetTiddler: optional title of target tiddler for permalink
+options.successNotification: optional title of tiddler to use as the notification in case of success
+options.failureNotification: optional title of tiddler to use as the notification in case of failure
 */
 function updateLocationHash(options) {
 	// Get the story and the history stack
@@ -205,14 +211,18 @@ function updateLocationHash(options) {
 			break;
 	}
 	// Copy URL to the clipboard
+	var url = "";
 	switch(options.copyToClipboard) {
 		case "permalink":
-			$tw.utils.copyToClipboard($tw.utils.getLocationPath() + "#" + encodeURIComponent(targetTiddler));
+			url = $tw.utils.getLocationPath() + "#" + encodeURIComponent(targetTiddler);
 			break;
 		case "permaview":
-			$tw.utils.copyToClipboard($tw.utils.getLocationPath() + "#" + encodeURIComponent(targetTiddler) + ":" + encodeURIComponent($tw.utils.stringifyList(storyList)));
+			url = $tw.utils.getLocationPath() + "#" + encodeURIComponent(targetTiddler) + ":" + encodeURIComponent($tw.utils.stringifyList(storyList));
 			break;
 	}
+	if(url) {
+		$tw.utils.copyToClipboard(url,{successNotification: options.successNotification, failureNotification: options.failureNotification});
+	}
 	// Only change the location hash if we must, thus avoiding unnecessary onhashchange events
 	if($tw.utils.getLocationHash() !== $tw.locationHash) {
 		if(options.updateHistory === "yes") {

core/modules/utils/dom/dom.js

@@ -292,7 +292,9 @@ exports.copyToClipboard = function(text,options) {
 	} catch (err) {
 	}
 	if(!options.doNotNotify) {
-		$tw.notifier.display(succeeded ? "$:/language/Notifications/CopiedToClipboard/Succeeded" : "$:/language/Notifications/CopiedToClipboard/Failed");
+		var successNotification = options.successNotification || "$:/language/Notifications/CopiedToClipboard/Succeeded",
+			failureNotification = options.failureNotification || "$:/language/Notifications/CopiedToClipboard/Failed"
+		$tw.notifier.display(succeeded ? successNotification : failureNotification);
 	}
 	document.body.removeChild(textArea);
 };

core/modules/utils/dom/http.js

@@ -69,7 +69,7 @@ HttpClient.prototype.cancelAllHttpRequests = function() {
 		for(var t=this.requests.length - 1; t--; t>=0) {
 			var requestInfo = this.requests[t];
 			requestInfo.request.cancel();
-		}	
+		}
 	}
 	this.requests = [];
 	this.updateRequestTracker();
@@ -100,6 +100,10 @@ headers: hashmap of header name to header value to be sent with the request
 passwordHeaders: hashmap of header name to password store name to be sent with the request
 queryStrings: hashmap of query string parameter name to parameter value to be sent with the request
 passwordQueryStrings: hashmap of query string parameter name to password store name to be sent with the request
+basicAuthUsername: plain username for basic authentication
+basicAuthUsernameFromStore: name of password store entry containing username
+basicAuthPassword: plain password for basic authentication
+basicAuthPasswordFromStore: name of password store entry containing password
 */
 function HttpClientRequest(options) {
 	var self = this;
@@ -112,6 +116,7 @@ function HttpClientRequest(options) {
 	this.method = options.method || "GET";
 	this.body = options.body || "";
 	this.binary = options.binary || "";
+	this.useDefaultHeaders = options.useDefaultHeaders !== "false" ? true : false,
 	this.variables = options.variables;
 	var url = options.url;
 	$tw.utils.each(options.queryStrings,function(value,name) {
@@ -128,6 +133,11 @@ function HttpClientRequest(options) {
 	$tw.utils.each(options.passwordHeaders,function(value,name) {
 		self.requestHeaders[name] = $tw.utils.getPassword(value) || "";
 	});
+	this.basicAuthUsername = options.basicAuthUsername || (options.basicAuthUsernameFromStore && $tw.utils.getPassword(options.basicAuthUsernameFromStore)) || "";
+	this.basicAuthPassword = options.basicAuthPassword || (options.basicAuthPasswordFromStore && $tw.utils.getPassword(options.basicAuthPasswordFromStore)) || "";
+	if(this.basicAuthUsername && this.basicAuthPassword) {
+		this.requestHeaders.Authorization = "Basic " + $tw.utils.base64Encode(this.basicAuthUsername + ":" + this.basicAuthPassword);
+	}
 }
 
 HttpClientRequest.prototype.send = function(callback) {
@@ -156,6 +166,7 @@ HttpClientRequest.prototype.send = function(callback) {
 		this.xhr = $tw.utils.httpRequest({
 			url: this.url,
 			type: this.method,
+			useDefaultHeaders: this.useDefaultHeaders,
 			headers: this.requestHeaders,
 			data: this.body,
 			returnProp: this.binary === "" ? "responseText" : "response",
@@ -231,7 +242,8 @@ Make an HTTP request. Options are:
 exports.httpRequest = function(options) {
 	var type = options.type || "GET",
 		url = options.url,
-		headers = options.headers || {accept: "application/json"},
+		useDefaultHeaders = options.useDefaultHeaders !== false ? true : false,
+		headers = options.headers || (useDefaultHeaders ? {accept: "application/json"} : {}),
 		hasHeader = function(targetHeader) {
 			targetHeader = targetHeader.toLowerCase();
 			var result = false;
@@ -257,7 +269,7 @@ exports.httpRequest = function(options) {
 			if(hasHeader("Content-Type") && ["application/x-www-form-urlencoded","multipart/form-data","text/plain"].indexOf(getHeader["Content-Type"]) === -1) {
 				return false;
 			}
-			return true;	
+			return true;
 		},
 		returnProp = options.returnProp || "responseText",
 		request = new XMLHttpRequest(),
@@ -307,10 +319,10 @@ exports.httpRequest = function(options) {
 			request.setRequestHeader(headerTitle,header);
 		});
 	}
-	if(data && !hasHeader("Content-Type")) {
+	if(data && !hasHeader("Content-Type") && useDefaultHeaders) {
 		request.setRequestHeader("Content-Type","application/x-www-form-urlencoded; charset=UTF-8");
 	}
-	if(!hasHeader("X-Requested-With") && !isSimpleRequest(type,headers)) {
+	if(!hasHeader("X-Requested-With") && !isSimpleRequest(type,headers) && useDefaultHeaders) {
 		request.setRequestHeader("X-Requested-With","TiddlyWiki");
 	}
 	// Send data

core/modules/utils/errors.js

@@ -0,0 +1,23 @@
+/*\
+title: $:/core/modules/utils/errors.js
+type: application/javascript
+module-type: utils
+
+Custom errors for TiddlyWiki.
+
+\*/
+(function(){
+
+function TranscludeRecursionError() {
+	Error.apply(this,arguments);
+	this.signatures = Object.create(null);
+};
+
+/* Maximum permitted depth of the widget tree for recursion detection */
+TranscludeRecursionError.MAX_WIDGET_TREE_DEPTH = 1000;
+
+TranscludeRecursionError.prototype = Object.create(Error);
+
+exports.TranscludeRecursionError = TranscludeRecursionError;
+
+})();

core/modules/utils/fakedom.js

@@ -42,7 +42,7 @@ var TW_TextNode = function(text) {
 	this.textContent = text + "";
 };
 
-Object.setPrototypeOf(TW_TextNode,TW_Node.prototype);
+Object.setPrototypeOf(TW_TextNode.prototype,TW_Node.prototype);
 
 Object.defineProperty(TW_TextNode.prototype, "nodeType", {
 	get: function() {
@@ -67,7 +67,7 @@ var TW_Element = function(tag,namespace) {
 	this.namespaceURI = namespace || "http://www.w3.org/1999/xhtml";
 };
 
-Object.setPrototypeOf(TW_Element,TW_Node.prototype);
+Object.setPrototypeOf(TW_Element.prototype,TW_Node.prototype);
 
 Object.defineProperty(TW_Element.prototype, "style", {
 	get: function() {

core/modules/utils/repository.js

@@ -0,0 +1,52 @@
+/*\
+title: $:/core/modules/utils/repository.js
+type: application/javascript
+module-type: utils
+
+Utilities for working with the TiddlyWiki repository file structure
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+/*
+Get an object containing all the plugins as a hashmap by title of the JSON representation of the plugin
+Options:
+
+ignoreEnvironmentVariables: defaults to false
+*/
+exports.getAllPlugins = function(options) {
+	options = options || {};
+	var fs = require("fs"),
+		path = require("path"),
+		tiddlers = {};
+	// Collect up the library plugins
+	var collectPlugins = function(folder) {
+			var pluginFolders = $tw.utils.getSubdirectories(folder) || [];
+			for(var p=0; p<pluginFolders.length; p++) {
+				if(!$tw.boot.excludeRegExp.test(pluginFolders[p])) {
+					var pluginFields = $tw.loadPluginFolder(path.resolve(folder,"./" + pluginFolders[p]));
+					if(pluginFields && pluginFields.title) {
+						tiddlers[pluginFields.title] = pluginFields;
+					}
+				}
+			}
+		},
+		collectPublisherPlugins = function(folder) {
+			var publisherFolders = $tw.utils.getSubdirectories(folder) || [];
+			for(var t=0; t<publisherFolders.length; t++) {
+				if(!$tw.boot.excludeRegExp.test(publisherFolders[t])) {
+					collectPlugins(path.resolve(folder,"./" + publisherFolders[t]));
+				}
+			}
+		};
+	$tw.utils.each($tw.getLibraryItemSearchPaths($tw.config.pluginsPath,options.ignoreEnvironmentVariables ? undefined : $tw.config.pluginsEnvVar),collectPublisherPlugins);
+	$tw.utils.each($tw.getLibraryItemSearchPaths($tw.config.themesPath,options.ignoreEnvironmentVariables ? undefined : $tw.config.themesEnvVar),collectPublisherPlugins);
+	$tw.utils.each($tw.getLibraryItemSearchPaths($tw.config.languagesPath,options.ignoreEnvironmentVariables ? undefined : $tw.config.languagesEnvVar),collectPlugins);
+	return tiddlers;
+};
+
+})();

core/modules/utils/simple-list.js

@@ -0,0 +1,86 @@
+/*\
+module-type: utils
+title: $:/core/modules/utils/simple-list.js
+type: application/javascript
+
+Switched from a linked list to simplify things
+
+\*/
+(function(){
+
+function SimpleList() {
+	this.clear();
+};
+
+Object.defineProperty(SimpleList.prototype,"length", {
+	get: function() {
+		return this.list.length;
+	}
+});
+
+SimpleList.prototype.clear = function() {
+	this.list = [];
+};
+
+SimpleList.prototype.remove = function(value) {
+	if($tw.utils.isArray(value)) {
+		for(var t=0; t<value.length; t++) {
+			this._remove(value[t]);
+		}
+	} else {
+		this._remove(value);
+	}
+};
+
+/*
+Push behaves like array.push and accepts multiple string arguments. But it also
+accepts a single array argument too, to be consistent with its other methods.
+*/
+SimpleList.prototype.push = function(/* values */) {
+	var values = arguments;
+	if(arguments.length === 1 && $tw.utils.isArray(values[0])) {
+		values = values[0];
+	}
+	for(var i = 0; i < values.length; i++) {
+		this._push(values[i]);
+	}
+	return this.list.length;
+};
+
+SimpleList.prototype.pushTop = function(value) {
+	// this.push(value);
+	// -or-
+	$tw.utils.pushTop(this.list,value);
+};
+
+SimpleList.prototype.each = function(callback) {
+	$tw.utils.each(this.list,callback);
+};
+
+SimpleList.prototype.toArray = function() {
+	return this.list.slice(0);
+};
+
+SimpleList.prototype.makeTiddlerIterator = function(wiki) {
+	var self = this;
+	return function(callback) {
+		self.each(function(title) {
+			callback(wiki.getTiddler(title),title);
+		});
+	};
+};
+
+SimpleList.prototype._remove = function(value) {
+	var p = this.list.indexOf(value);
+	if(p !== -1) {
+		this.list.splice(p,1);
+	}
+};
+
+SimpleList.prototype._push = function(value) {
+	this.list.push(value);
+};
+
+exports.SimpleList = SimpleList;
+
+})();

core/modules/utils/utils.js

@@ -825,7 +825,7 @@ options.length .. number of characters returned defaults to 64
 */
 exports.sha256 = function(str, options) {
 	options = options || {}
-	return sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(str)).substr(0,options.length || 64);
+	return $tw.sjcl.codec.hex.fromBits($tw.sjcl.hash.sha256.hash(str)).substr(0,options.length || 64);
 }
 
 /*
@@ -1037,4 +1037,52 @@ exports.makeCompareFunction = function(type,options) {
 	return (types[type] || types[options.defaultType] || types.number);
 };
 
+exports.filterItemToString = function(value) {
+	switch(typeof value) {
+		case "undefined":
+			return "undefined"
+		case "object":
+			return JSON.stringify(value);
+		case "boolean":
+			return value ? "true" : "false";
+		case "number":
+			return value.toString();
+		case "bigint":
+			return value.toString();
+		case "string":
+			return value;
+		case "symbol":
+			throw "Filter operators cannot return Symbols";
+		case "function":
+			throw "Filter operators cannot return Functions";
+	}
+};
+
+exports.filterItemToObject = function(value,options) {
+	options = options || {};
+	var defaultValue = options.defaultValue || {};
+	switch(typeof value) {
+		case "undefined":
+			return defaultValue;
+		case "object":
+			return value;
+		case "boolean":
+			return value;
+		case "number":
+			return value;
+		case "bigint":
+			return value;
+		case "string":
+			if(options.parseStringsAsJson) {
+				return $tw.utils.parseJSONSafe(value,defaultValue);
+			} else {
+				return value;
+			}
+		case "symbol":
+			throw "Filter operators cannot return Symbols";
+		case "function":
+			throw "Filter operators cannot return Functions";
+	}
+};
+
 })();

core/modules/widgets/action-log.js

@@ -66,7 +66,12 @@ LogWidget.prototype.log = function() {
 	});
 
 	for(var v in this.variables) {
-		allVars[v] = this.getVariable(v,{defaultValue:""});
+		var variable = this.parentWidget && this.parentWidget.variables[v];
+		if(variable && variable.isFunctionDefinition) {
+			allVars[v] = variable.value;
+		} else {
+			allVars[v]  = this.getVariable(v,{defaultValue:""});
+		}
 	}
 	if(this.filter) {
 		filteredVars = this.wiki.compileFilter(this.filter).call(this.wiki,this.wiki.makeTiddlerIterator(allVars));

core/modules/widgets/button.js

@@ -262,7 +262,7 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
 */
 ButtonWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
-	if(changedAttributes.actions || changedAttributes.to || changedAttributes.message || changedAttributes.param || changedAttributes.set || changedAttributes.setTo || changedAttributes.popup || changedAttributes.hover || changedAttributes.selectedClass || changedAttributes.style || changedAttributes.dragFilter || changedAttributes.dragTiddler || (this.set && changedTiddlers[this.set]) || (this.popup && changedTiddlers[this.popup]) || (this.popupTitle && changedTiddlers[this.popupTitle]) || changedAttributes.popupAbsCoords || changedAttributes.setTitle || changedAttributes.setField || changedAttributes.setIndex || changedAttributes.popupTitle || changedAttributes.disabled || changedAttributes["default"]) {
+	if(changedAttributes.tooltip || changedAttributes.actions || changedAttributes.to || changedAttributes.message || changedAttributes.param || changedAttributes.set || changedAttributes.setTo || changedAttributes.popup || changedAttributes.hover || changedAttributes.selectedClass || changedAttributes.style || changedAttributes.dragFilter || changedAttributes.dragTiddler || (this.set && changedTiddlers[this.set]) || (this.popup && changedTiddlers[this.popup]) || (this.popupTitle && changedTiddlers[this.popupTitle]) || changedAttributes.popupAbsCoords || changedAttributes.setTitle || changedAttributes.setField || changedAttributes.setIndex || changedAttributes.popupTitle || changedAttributes.disabled || changedAttributes["default"]) {
 		this.refreshSelf();
 		return true;
 	} else {

core/modules/widgets/data.js

@@ -31,34 +31,49 @@ DataWidget.prototype.render = function(parent,nextSibling) {
 	this.parentDomNode = parent;
 	this.computeAttributes();
 	this.execute();
-	var jsonPayload = JSON.stringify(this.readDataTiddlerValues(),null,4);
-	var textNode = this.document.createTextNode(jsonPayload);
-	parent.insertBefore(textNode,nextSibling);
-	this.domNodes.push(textNode);
+	this.dataPayload = this.computeDataTiddlerValues(); // Array of $tw.Tiddler objects
+	this.domNode = this.document.createTextNode(this.readDataTiddlerValuesAsJson());
+	parent.insertBefore(this.domNode,nextSibling);
+	this.domNodes.push(this.domNode);
 };
 
 /*
 Compute the internal state of the widget
 */
 DataWidget.prototype.execute = function() {
-	// Construct the child widgets
-	this.makeChildWidgets();
+	// Nothing to do here
 };
 
 /*
-Read the tiddler value(s) from a data widget – must be called after the .render() method
+Read the tiddler value(s) from a data widget as an array of tiddler field objects (not $tw.Tiddler objects)
 */
 DataWidget.prototype.readDataTiddlerValues = function() {
+	var results = [];
+	$tw.utils.each(this.dataPayload,function(tiddler,index) {
+		results.push(tiddler.getFieldStrings());
+	});
+	return results;
+};
+
+/*
+Read the tiddler value(s) from a data widget as an array of tiddler field objects (not $tw.Tiddler objects)
+*/
+DataWidget.prototype.readDataTiddlerValuesAsJson = function() {
+	return JSON.stringify(this.readDataTiddlerValues(),null,4);
+};
+
+/*
+Compute list of tiddlers from a data widget
+*/
+DataWidget.prototype.computeDataTiddlerValues = function() {
 	var self = this;
-	// Start with a blank object
-	var item = Object.create(null);
 	// Read any attributes not prefixed with $
+	var item = Object.create(null);
 	$tw.utils.each(this.attributes,function(value,name) {
 		if(name.charAt(0) !== "$") {
 			item[name] = value;	
 		}
 	});
-	item = new $tw.Tiddler(item);
 	// Deal with $tiddler, $filter or $compound-tiddler attributes
 	var tiddlers = [],title;
 	if(this.hasAttribute("$tiddler")) {
@@ -86,21 +101,22 @@ DataWidget.prototype.readDataTiddlerValues = function() {
 			tiddlers.push.apply(tiddlers,this.extractCompoundTiddler(title));
 		}
 	}
-	// Convert the literal item to field strings
-	item = item.getFieldStrings();
-	if(tiddlers.length === 0) {
+	// Return the literal item if none of the special attributes were used
+	if(!this.hasAttribute("$tiddler") && !this.hasAttribute("$filter") && !this.hasAttribute("$compound-tiddler")) {
 		if(Object.keys(item).length > 0 && !!item.title) {
-			return [item];
+			return [new $tw.Tiddler(item)];
 		} else {
 			return [];
 		}
 	} else {
-		var results = [];
-		$tw.utils.each(tiddlers,function(tiddler,index) {
-			var fields = tiddler.getFieldStrings();
-			results.push($tw.utils.extend({},fields,item));
-		});
-		return results;	
+		// Apply the item fields to each of the tiddlers
+		delete item.title; // Do not overwrite the title
+		if(Object.keys(item).length > 0) {
+			$tw.utils.each(tiddlers,function(tiddler,index) {
+				tiddlers[index] = new $tw.Tiddler(tiddler,item);
+			});
+		}
+		return tiddlers;
 	}
 };
 
@@ -134,12 +150,33 @@ DataWidget.prototype.extractCompoundTiddler = function(title) {
 Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
 */
 DataWidget.prototype.refresh = function(changedTiddlers) {
-	// It would be expensive to calculate whether the changedTiddlers impact the filter
-	// identified by the $filter attribute so we just refresh ourselves unconditionally
-	this.refreshSelf();
-	return true;
+	var changedAttributes = this.computeAttributes();
+	var newPayload = this.computeDataTiddlerValues();
+	if(hasPayloadChanged(this.dataPayload,newPayload)) {
+		this.dataPayload = newPayload;
+		this.domNode.textContent = this.readDataTiddlerValuesAsJson();
+		return true;
+	} else {
+		return false;
+	}
 };
 
+/*
+Compare two arrays of tiddlers and return true if they are different
+*/
+function hasPayloadChanged(a,b) {
+	if(a.length === b.length) {
+		for(var t=0; t<a.length; t++) {
+			if(!(a[t].isEqual(b[t]))) {
+				return true;
+			}
+		}
+		return false;
+	} else {
+		return true;
+	}
+}
+
 exports.data = DataWidget;
 
 })();

core/modules/widgets/parameters.js

@@ -74,6 +74,18 @@ ParametersWidget.prototype.execute = function() {
 				self.setVariable(variableName,getValue(name));
 			}
 		});
+	} else {
+		// There is no parent transclude. i.e. direct rendering.
+		// We use default values only.
+		$tw.utils.each($tw.utils.getOrderedAttributesFromParseTreeNode(self.parseTreeNode),function(attr,index) {
+			var name = attr.name;
+			// If the attribute name starts with $$ then reduce to a single dollar
+			if(name.substr(0,2) === "$$") {
+				name = name.substr(1);
+			}
+			var value = self.getAttribute(attr.name,"");
+			self.setVariable(name,value);
+		});
 	}
 	// Construct the child widgets
 	this.makeChildWidgets();

core/modules/widgets/testcase.js

@@ -77,8 +77,13 @@ TestCaseWidget.prototype.render = function(parent,nextSibling) {
 	this.setVariable("transclusion",$tw.utils.hashString(jsonPayload));
 	// Generate a `payloadTiddlers` variable that contains the payload in JSON format
 	this.setVariable("payloadTiddlers",jsonPayload);
+	// Only run the tests if the testcase output and expected results were specified, and those tiddlers actually exist in the wiki
+	var shouldRunTests = false;
+	if(this.testcaseTestOutput && this.testcaseWiki.tiddlerExists(this.testcaseTestOutput) && this.testcaseTestExpectedResult && this.testcaseWiki.tiddlerExists(this.testcaseTestExpectedResult)) {
+		shouldRunTests = true;
+	}
 	// Render the test rendering if required
-	if(this.testcaseTestOutput && this.testcaseTestExpectedResult) {
+	if(shouldRunTests) {
 		var testcaseOutputContainer = $tw.fakeDocument.createElement("div");
 		var testcaseOutputWidget = this.testcaseWiki.makeTranscludeWidget(this.testcaseTestOutput,{
 			document: $tw.fakeDocument,
@@ -101,7 +106,7 @@ TestCaseWidget.prototype.render = function(parent,nextSibling) {
 	var testResult = "",
 		outputHTML = "",
 		expectedHTML = "";
-	if(this.testcaseTestOutput && this.testcaseTestExpectedResult) {
+	if(shouldRunTests) {
 		outputHTML = testcaseOutputContainer.children[0].innerHTML;
 		expectedHTML = this.testcaseWiki.getTiddlerText(this.testcaseTestExpectedResult);
 		if(outputHTML === expectedHTML) {
@@ -115,7 +120,7 @@ TestCaseWidget.prototype.render = function(parent,nextSibling) {
 		this.setVariable("currentTiddler",this.testcaseTestOutput);
 	}
 	// Don't display anything if testHideIfPass is "yes" and the tests have passed
-	if(this.testcaseHideIfPass === "yes" && testResult === "pass") {
+	if(this.testcaseHideIfPass === "yes" && testResult !== "fail") {
 		return;
 	}
 	// Render the page root template of the subwiki

core/modules/widgets/transclude.js

@@ -30,7 +30,30 @@ TranscludeWidget.prototype.render = function(parent,nextSibling) {
 	this.parentDomNode = parent;
 	this.computeAttributes();
 	this.execute();
-	this.renderChildren(parent,nextSibling);
+	try {
+		this.renderChildren(parent,nextSibling);
+	} catch(error) {
+		if(error instanceof $tw.utils.TranscludeRecursionError) {
+			// We were infinite looping.
+			// We need to try and abort as much of the loop as we can, so we will keep "throwing" upward until we find a transclusion that has a different signature.
+			// Hopefully that will land us just outside where the loop began. That's where we want to issue an error.
+			// Rendering widgets beneath this point may result in a freezing browser if they explode exponentially.
+			var transcludeSignature = this.getVariable("transclusion");
+			if(this.getAncestorCount() > $tw.utils.TranscludeRecursionError.MAX_WIDGET_TREE_DEPTH - 50) {
+				// For the first fifty transcludes we climb up, we simply collect signatures.
+				// We're assuming that those first 50 will likely include all transcludes involved in the loop.
+				error.signatures[transcludeSignature] = true;
+			} else if(!error.signatures[transcludeSignature]) {
+				// Now that we're past the first 50, let's look for the first signature that wasn't in the loop. That'll be where we print the error and resume rendering.
+				this.children = [this.makeChildWidget({type: "error", attributes: {
+					"$message": {type: "string", value: $tw.language.getString("Error/RecursiveTransclusion")}
+				}})];
+				this.renderChildren(parent,nextSibling);
+				return;
+			}
+		}
+		throw error;
+	}
 };
 
 /*

core/modules/widgets/widget.js

@@ -12,9 +12,6 @@ Widget base class
 /*global $tw: false */
 "use strict";
 
-/* Maximum permitted depth of the widget tree for recursion detection */
-var MAX_WIDGET_TREE_DEPTH = 1000;
-
 /*
 Create a widget object for a parse tree node
 	parseTreeNode: reference to the parse tree node to be rendered
@@ -166,6 +163,8 @@ Widget.prototype.getVariableInfo = function(name,options) {
 			});
 			resultList = this.wiki.filterTiddlers(value,this.makeFakeWidgetWithVariables(variables),options.source);
 			value = resultList[0] || "";
+		} else {
+			params = variable.params;
 		}
 		return {
 			text: value,
@@ -317,7 +316,8 @@ Widget.prototype.getStateQualifier = function(name) {
 Make a fake widget with specified variables, suitable for variable lookup in filters
 */
 Widget.prototype.makeFakeWidgetWithVariables = function(variables) {
-	var self = this;
+	var self = this,
+		variables = variables || {};
 	return {
 		getVariable: function(name,opts) {
 			if($tw.utils.hop(variables,name)) {
@@ -335,7 +335,7 @@ Widget.prototype.makeFakeWidgetWithVariables = function(variables) {
 				};
 			} else {
 				opts = opts || {};
-				opts.variables = variables;
+				opts.variables = $tw.utils.extend(variables,opts.variables);
 				return self.getVariableInfo(name,opts);
 			};
 		},
@@ -494,10 +494,8 @@ Widget.prototype.makeChildWidgets = function(parseTreeNodes,options) {
 	this.children = [];
 	var self = this;
 	// Check for too much recursion
-	if(this.getAncestorCount() > MAX_WIDGET_TREE_DEPTH) {
-		this.children.push(this.makeChildWidget({type: "error", attributes: {
-			"$message": {type: "string", value: $tw.language.getString("Error/RecursiveTransclusion")}
-		}}));
+	if(this.getAncestorCount() > $tw.utils.TranscludeRecursionError.MAX_WIDGET_TREE_DEPTH) {
+		throw new $tw.utils.TranscludeRecursionError();
 	} else {
 		// Create set variable widgets for each variable
 		$tw.utils.each(options.variables,function(value,name) {

core/modules/wiki.js

@@ -551,28 +551,41 @@ exports.getTiddlerBacklinks = function(targetTitle) {
 
 
 /*
-Return an array of tiddler titles that are directly transcluded within the given parse tree
+Return an array of tiddler titles that are directly transcluded within the given parse tree. `title` is the tiddler being parsed, we will ignore its self-referential transclusions, only return
  */
-exports.extractTranscludes = function(parseTreeRoot) {
+exports.extractTranscludes = function(parseTreeRoot, title) {
 	// Count up the transcludes
 	var transcludes = [],
 		checkParseTree = function(parseTree, parentNode) {
 			for(var t=0; t<parseTree.length; t++) {
 				var parseTreeNode = parseTree[t];
-				if(parseTreeNode.type === "transclude" && parseTreeNode.attributes.$tiddler && parseTreeNode.attributes.$tiddler.type === "string") {
-					var value;
-					// if it is Transclusion with Templates like `{{Index||$:/core/ui/TagTemplate}}`, the `$tiddler` will point to the template. We need to find the actual target tiddler from parent node
-					if(parentNode && parentNode.type === "tiddler" && parentNode.attributes.tiddler && parentNode.attributes.tiddler.type === "string") {
-						value = parentNode.attributes.tiddler.value;
-					} else {
-						value = parseTreeNode.attributes.$tiddler.value;
+				if(parseTreeNode.type === "transclude") {
+					if(parseTreeNode.attributes.$tiddler && parseTreeNode.attributes.$tiddler.type === "string") {
+						var value;
+						// if it is Transclusion with Templates like `{{Index||$:/core/ui/TagTemplate}}`, the `$tiddler` will point to the template. We need to find the actual target tiddler from parent node
+						if(parentNode && parentNode.type === "tiddler" && parentNode.attributes.tiddler && parentNode.attributes.tiddler.type === "string") {
+							// Empty value (like `{{!!field}}`) means self-referential transclusion. 
+							value = parentNode.attributes.tiddler.value || title;
+						} else {
+							value = parseTreeNode.attributes.$tiddler.value;
+						}
+					} else if(parseTreeNode.attributes.tiddler && parseTreeNode.attributes.tiddler.type === "string") {
+						// Old transclude widget usage
+						value = parseTreeNode.attributes.tiddler.value;
+					} else if(parseTreeNode.attributes.$field && parseTreeNode.attributes.$field.type === "string") {
+						// Empty value (like `<$transclude $field='created'/>`) means self-referential transclusion. 
+						value = title;
+					} else if(parseTreeNode.attributes.field && parseTreeNode.attributes.field.type === "string") {
+						// Old usage with Empty value (like `<$transclude field='created'/>`)
+						value = title;
 					}
-					if(transcludes.indexOf(value) === -1) {
-						transcludes.push(value);
+					// Deduplicate the result.
+					if(value && transcludes.indexOf(value) === -1) {
+						$tw.utils.pushTop(transcludes,value);
 					}
 				}
 				if(parseTreeNode.children) {
-					checkParseTree(parseTreeNode.children, parseTreeNode);
+					checkParseTree(parseTreeNode.children,parseTreeNode);
 				}
 			}
 		};
@@ -591,7 +604,8 @@ exports.getTiddlerTranscludes = function(title) {
 		// Parse the tiddler
 		var parser = self.parseTiddler(title);
 		if(parser) {
-			return self.extractTranscludes(parser.tree);
+			// this will ignore self-referential transclusions from `title`
+			return self.extractTranscludes(parser.tree,title);
 		}
 		return [];
 	});

core/palettes/Vanilla.tid

@@ -82,6 +82,10 @@ sidebar-tab-foreground: <<colour tab-foreground>>
 sidebar-tiddler-link-foreground-hover: #444444
 sidebar-tiddler-link-foreground: #999999
 site-title-foreground: <<colour tiddler-title-foreground>>
+stability-stable: #008000
+stability-experimental: #c07c00
+stability-deprecated: #ff0000
+stability-legacy: #0000ff
 static-alert-foreground: #aaaaaa
 tab-background-selected: #ffffff
 tab-background: #d8d8d8

core/plugin.info

@@ -5,5 +5,6 @@
 	"author": "JeremyRuston",
 	"core-version": ">=5.0.0",
 	"plugin-priority": "0",
-	"list": "readme"
+	"list": "readme",
+	"stability": "STABILITY_2_STABLE"
 }

core/ui/Components/plugin-info.tid

@@ -45,7 +45,17 @@ $:/config/Plugins/Disabled/$(currentTiddler)$
 		<$view field="title"/>
 	</h2>
 	<h2>
-		<div><em><$view field="version"/></em></div>
+		<div>
+			<%if [<currentTiddler>get[stability]match[STABILITY_0_DEPRECATED]] %>
+				<span class="tc-plugin-info-stability tc-plugin-info-stability-deprecated">DEPRECATED</span>
+			<%elseif [<currentTiddler>get[stability]match[STABILITY_1_EXPERIMENTAL]] %>
+				<span class="tc-plugin-info-stability tc-plugin-info-stability-experimental">EXPERIMENTAL</span>
+			<%elseif [<currentTiddler>get[stability]match[STABILITY_2_STABLE]] %>
+				<span class="tc-plugin-info-stability tc-plugin-info-stability-stable">STABLE</span>
+			<%elseif [<currentTiddler>get[stability]match[STABILITY_3_LEGACY]] %>
+				<span class="tc-plugin-info-stability tc-plugin-info-stability-legacy">LEGACY</span>
+			<%endif%>
+			<em><$view field="version"/></em></div>
 	</h2>
 </div>
 \end

core/ui/ControlPanel/Modals/AddPlugins.tid

@@ -70,9 +70,20 @@ $:/state/add-plugin-info/$(connectionTiddler)$/$(assetInfo)$
 <div class="tc-plugin-info-chunk tc-plugin-info-description">
 <h1><strong><$text text={{{ [<assetInfo>get[name]] ~[<assetInfo>get[original-title]split[/]last[1]] }}}/></strong>:
 &#32;
-<$view tiddler=<<assetInfo>> field="description"/></h1>
+<$view tiddler=<<assetInfo>> field="description"/>
+</h1>
 <h2><$view tiddler=<<assetInfo>> field="original-title"/></h2>
-<div><em><$view tiddler=<<assetInfo>> field="version"/></em></div>
+<div>
+<%if [<assetInfo>get[stability]match[STABILITY_0_DEPRECATED]] %>
+	<span class="tc-plugin-info-stability tc-plugin-info-stability-deprecated">DEPRECATED</span>
+<%elseif [<assetInfo>get[stability]match[STABILITY_1_EXPERIMENTAL]] %>
+	<span class="tc-plugin-info-stability tc-plugin-info-stability-experimental">EXPERIMENTAL</span>
+<%elseif [<assetInfo>get[stability]match[STABILITY_2_STABLE]] %>
+	<span class="tc-plugin-info-stability tc-plugin-info-stability-stable">STABLE</span>
+<%elseif [<assetInfo>get[stability]match[STABILITY_3_LEGACY]] %>
+	<span class="tc-plugin-info-stability tc-plugin-info-stability-legacy">LEGACY</span>
+<%endif%>
+<em><$view tiddler=<<assetInfo>> field="version"/></em></div>
 <$list filter="[<assetInfo>get[original-title]get[version]]" variable="installedVersion"><div><em>{{$:/language/ControlPanel/Plugins/AlreadyInstalled/Hint}}</em></div></$list>
 </div>
 <div class="tc-plugin-info-chunk tc-plugin-info-buttons">

core/ui/ControlPanel/TiddlyWiki.tid

@@ -9,7 +9,7 @@ list-before:
 
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Settings]]">
 
-<div class="tc-control-panel-setting" data-setting-title=<<currentTiddler>> style="border-top:1px solid #eee;">
+<div class="tc-control-panel-setting" data-setting-title=<<currentTiddler>> >
 
 !!.tc-control-panel-accent <$link><$transclude field="caption"/></$link>
 

core/ui/StandardLayout.tid

@@ -1,7 +1,7 @@
 title: $:/core/ui/PageTemplate
 name: {{$:/language/PageTemplate/Name}}
 description: {{$:/language/PageTemplate/Description}}
-icon: $:/core/images/default-layout
+icon: $:/core/images/standard-layout
 code-body: yes
 
 \whitespace trim

core/ui/TestCaseTemplate.tid

@@ -5,6 +5,7 @@ title: $:/core/ui/TestCaseTemplate
 <$let
 	linkTarget="yes"
 	displayFormat={{!!display-format}}
+	testcaseTiddler=<<currentTiddler>>
 >
 	<$testcase
 		testOutput="Output"

core/ui/TestCases/DefaultTemplate.tid

@@ -15,7 +15,7 @@ title: $:/core/ui/testcases/DefaultTemplate
 	<div class="tc-test-case-wrapper">
 		<div class="tc-test-case-header">
 			<h2>
-				<$genesis $type={{{ [<linkTarget>!match[]then[$link]else[div]] }}}>
+				<$genesis $type={{{ [<linkTarget>!match[]then[$link]else[div]] }}} to=<<testcaseTiddler>>>
 					<%if [<testResult>!match[]] %>
 						<span class={{{ tc-test-case-result-icon [<testResult>!match[fail]then[tc-test-case-result-icon-pass]] [<testResult>match[fail]then[tc-test-case-result-icon-fail]] +[join[ ]] }}}>
 							<%if [<testResult>!match[fail]] %>
@@ -55,7 +55,9 @@ title: $:/core/ui/testcases/DefaultTemplate
 					<pre><$view tiddler="Output" format="plainwikified" mode="block"/></pre>
 				<%else%>
 					<$linkcatcher actions=<<linkcatcherActions>>>
-						<$transclude $tiddler="Output" $mode="block"/>
+						<$tiddler tiddler="Output">
+							<$transclude $tiddler="Output" $mode="block"/>
+						</$tiddler>
 					</$linkcatcher>
 				<%endif%>
 			</div>

core/wiki/config/OfficialPluginLibrary.tid

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

editions/geospatialdemo/tiddlers/DefaultTiddlers.tid

@@ -0,0 +1,4 @@
+title: $:/DefaultTiddlers
+
+HelloThere
+$:/plugins/tiddlywiki/geospatial

editions/geospatialdemo/tiddlers/Features.tid

@@ -0,0 +1,14 @@
+title: GeoFeatures
+tags: $:/tags/GeospatialDemo
+
+This is a list of all the tiddlers containing ~GeoJSON feature collections in this wiki (identified by the tag <<tag "$:/tags/GeoFeature">>). A ~GeoJSON feature collection is a list of features, each of which consists of a geometry and associated metadata.
+
+<ul>
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/GeoFeature]sort[caption]]">
+<li>
+<$link>
+<$transclude field="caption"><$view field="title"/></$view>
+</$link>
+</li>
+</$list>
+</ul>

editions/geospatialdemo/tiddlers/Flickr Demo.tid

@@ -0,0 +1,27 @@
+title: Flickr Demo
+caption: Flickr
+tags: $:/tags/GeospatialDemo
+
+! Retrieve Geotagged Flickr Photos
+
+This demo will not work until you have set a Flickr API key in the [[Geospatial plugin settings|$:/plugins/tiddlywiki/geospatial/settings]].
+
+<$button>
+<$macrocall $name="flickr-get-album-items" albumID={{$:/config/flickr-param/album-id}}/>
+Get Flickr album
+</$button> <$edit-text tiddler="$:/config/flickr-param/album-id" tag="input"/> (parameter should be an album ID, e.g. 72157630297432522)
+
+<$button>
+<$macrocall $name="flickr-get-interesting-items"/>
+Get Flickr interesting items
+</$button>
+
+<$button>
+<$macrocall $name="flickr-get-photos-of-user-items" userID={{$:/config/flickr-param/user-id}}/>
+Get Flickr photos of user
+</$button> <$edit-text tiddler="$:/config/flickr-param/user-id" tag="input"/> (parameter should be a user ID, e.g. 35468148136@N01)
+
+<$button>
+<$macrocall $name="flickr-get-group-items" groupID={{$:/config/flickr-param/group-id}}/>
+Get Flickr group
+</$button> <$edit-text tiddler="$:/config/flickr-param/group-id" tag="input"/> (parameter should be an group ID, e.g. 22075379@N00)

editions/geospatialdemo/tiddlers/Geospatial Plugin Logo.png.meta

@@ -0,0 +1,2 @@
+title: Geospatial Plugin Logo
+type: image/png

editions/geospatialdemo/tiddlers/HelloThere.tid

@@ -0,0 +1,37 @@
+title: HelloThere
+
+//The latest build of the Geospatial Plugin can be found at:// https://tiddlywiki5-git-geospatial-plugin-jermolene.vercel.app/plugins/tiddlywiki/geospatial/index.html
+
+!! Introduction
+
+{{$:/plugins/tiddlywiki/geospatial/readme}}
+
+!! Prerequisites
+
+This demo requires that the API keys needed to access external services be obtained by the end user and manually configured. These keys are stored in the browser and so only need to be set up once. See the ''Settings'' tab of [[the plugin|$:/plugins/tiddlywiki/geospatial]] for details.
+
+!! Demos
+
+* Visit the ~GeoFeatures and ~GeoMarkers tabs to see the data loaded into this wiki
+* Click on a link to a layer or marker to open the corresponding tiddler that includes a map
+* Use the Flickr tab to retrieve geotagged photographs from Flickr
+* Visit a ~GeoMarker tiddler and use the "Call ~TravelTime" button to calculate an isochrone from that location using the ~TravelTime API
+
+! Map Showing All Features and Markers
+
+<$geomap
+	state=<<qualify "$:/state/demo-map">>
+	startPosition="bounds"
+>
+	<$list filter="[all[tiddlers+shadows]tag[$:/tags/GeoBaseLayer]]">
+		<$geobaselayer title=<<currentTiddler>>/>
+	</$list>
+	<$list filter="[all[tiddlers+shadows]tag[$:/tags/GeoMarker]]">
+		<$geolayer lat={{!!lat}} long={{!!long}} alt={{!!alt}} color={{!!color}} name={{!!caption}}/>
+	</$list>
+	<$list filter="[all[tiddlers+shadows]tag[$:/tags/GeoFeature]]">
+		<$geolayer json={{!!text}} color={{!!color}} name={{!!caption}}/>
+	</$list>
+</$geomap>
+
+<<tabs tabsList:"[all[tiddlers+shadows]tag[$:/tags/GeospatialDemo]]" default:"GeoMarkers">>

editions/geospatialdemo/tiddlers/Markers.tid

@@ -0,0 +1,53 @@
+title: GeoMarkers
+tags: $:/tags/GeospatialDemo
+
+
+
+\procedure onsuccess()
+	<$action-setfield
+		$tiddler="CurrentLocation"
+		tags="$:/tags/GeoMarker"
+		timestamp=<<timestamp>>
+		lat=<<latitude>>
+		long=<<longitude>>
+		alt=<<altitude>>
+		accuracy=<<accuracy>>
+		altitudeAccuracy=<<altitudeAccuracy>>
+		heading=<<heading>>
+		speed=<<speed>>
+	/>
+\end
+\procedure onerror()
+	<$action-setfield
+		$tiddler="CurrentLocation"
+		$field="text"
+		$value=<<error>>
+	/>
+\end
+\procedure onclick()
+	<$action-sendmessage
+		$message="tm-request-geolocation"
+		actionsSuccess=<<onsuccess>>
+		actionsError=<<onerror>>
+	/>
+\end
+
+This is a list of all the tiddlers containing ~GeoJSON markers in this wiki (identified by the tag <<tag "$:/tags/GeoMarker">>). A ~GeoJSON marker identifies a location via latitude and longitude (and optional altitude) and may also contain associated metadata in JSON format.
+
+Click this button to create a marker from the current location. Your browser will ask for permission before granting the request. On some browsers it takes a couple of seconds for the location to appear.
+
+<$button actions=<<onclick>>>
+Request location
+</$button>
+
+{{CurrentLocation}}
+
+<ul>
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/GeoMarker]sort[caption]]">
+<li>
+<$link>
+<$view field="caption"><$view field="title"/></$view>
+</$link>
+</li>
+</$list>
+</ul>

editions/geospatialdemo/tiddlers/SiteSubtitle.tid

@@ -0,0 +1,3 @@
+title: $:/SiteSubtitle
+
+Geographic Data Features for ~TiddlyWiki

editions/geospatialdemo/tiddlers/SiteTitle.tid

@@ -0,0 +1,3 @@
+title: $:/SiteTitle
+
+[img width=200 [Geospatial Plugin Logo]]<br>Geospatial Plugin

editions/geospatialdemo/tiddlers/cascades/ViewTemplateBodyFilters.tid

@@ -0,0 +1,6 @@
+title: $:/plugins/geospatial/demo/ViewTemplateBodyFilters
+tags: $:/tags/ViewTemplateBodyFilter
+list-before: $:/config/ViewTemplateBodyFilters/stylesheet
+
+[tag[$:/tags/GeoFeature]then[ui/geofeature]]
+[tag[$:/tags/GeoMarker]then[ui/geomarker]]

editions/geospatialdemo/tiddlers/cities/LimehouseTownHall.tid

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

editions/geospatialdemo/tiddlers/cities/Motovun.tid

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

editions/geospatialdemo/tiddlers/cities/NewYork.tid

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

editions/geospatialdemo/tiddlers/cities/Oxford.tid

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

editions/geospatialdemo/tiddlers/cities/Toronto.tid

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

editions/geospatialdemo/tiddlers/cities/Winchester.tid

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

editions/geospatialdemo/tiddlers/config/flickr-param.multids

@@ -0,0 +1,5 @@
+title: $:/config/flickr-param/
+
+album-id: 72157630297432522
+user-id: 35468148136@N01
+group-id: 22075379@N00

editions/geospatialdemo/tiddlers/default-import-spec.tid

@@ -0,0 +1,4 @@
+title: $:/config/plugins/tiddlywiki/xlsx-utils/default-import-spec
+type: text/vnd.tiddlywiki
+
+$:/_importspec/RealEstate/

editions/geospatialdemo/tiddlers/favicon.png.meta

@@ -0,0 +1,2 @@
+title: $:/favicon.ico
+type: image/png

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

@@ -0,0 +1,5 @@
+title: $:/geospatialdemo/features/canada-census-subdivision-millesime
+caption: Canada Census Subdivisions Millesime
+type: application/json
+tags: $:/tags/GeoFeature
+color: #f8f

editions/geospatialdemo/tiddlers/features/denver-bikerental.tid

@@ -0,0 +1,109 @@
+title: $:/geospatialdemo/features/denver/bikerental
+caption: Denver bike rentals as ~GeoJSON points
+tags: $:/tags/GeoFeature
+type: application/json
+color: blue
+
+ {
+    "type": "FeatureCollection",
+    "features": [
+        {
+            "geometry": {
+                "type": "Point",
+                "coordinates": [
+                    -104.9998241,
+                    39.7471494
+                ]
+            },
+            "type": "Feature",
+            "properties": {
+                "popupContent": "This is a B-Cycle Station. Come pick up a bike and pay by the hour. What a deal!"
+            },
+            "id": 51
+        },
+        {
+            "geometry": {
+                "type": "Point",
+                "coordinates": [
+                    -104.9983545,
+                    39.7502833
+                ]
+            },
+            "type": "Feature",
+            "properties": {
+                "popupContent": "This is a B-Cycle Station. Come pick up a bike and pay by the hour. What a deal!"
+            },
+            "id": 52
+        },
+        {
+            "geometry": {
+                "type": "Point",
+                "coordinates": [
+                    -104.9963919,
+                    39.7444271
+                ]
+            },
+            "type": "Feature",
+            "properties": {
+                "popupContent": "This is a B-Cycle Station. Come pick up a bike and pay by the hour. What a deal!"
+            },
+            "id": 54
+        },
+        {
+            "geometry": {
+                "type": "Point",
+                "coordinates": [
+                    -104.9960754,
+                    39.7498956
+                ]
+            },
+            "type": "Feature",
+            "properties": {
+                "popupContent": "This is a B-Cycle Station. Come pick up a bike and pay by the hour. What a deal!"
+            },
+            "id": 55
+        },
+        {
+            "geometry": {
+                "type": "Point",
+                "coordinates": [
+                    -104.9933717,
+                    39.7477264
+                ]
+            },
+            "type": "Feature",
+            "properties": {
+                "popupContent": "This is a B-Cycle Station. Come pick up a bike and pay by the hour. What a deal!"
+            },
+            "id": 57
+        },
+        {
+            "geometry": {
+                "type": "Point",
+                "coordinates": [
+                    -104.9913392,
+                    39.7432392
+                ]
+            },
+            "type": "Feature",
+            "properties": {
+                "popupContent": "This is a B-Cycle Station. Come pick up a bike and pay by the hour. What a deal!"
+            },
+            "id": 58
+        },
+        {
+            "geometry": {
+                "type": "Point",
+                "coordinates": [
+                    -104.9788452,
+                    39.6933755
+                ]
+            },
+            "type": "Feature",
+            "properties": {
+                "popupContent": "This is a B-Cycle Station. Come pick up a bike and pay by the hour. What a deal!"
+            },
+            "id": 74
+        }
+    ]
+}

editions/geospatialdemo/tiddlers/features/denver-campus.tid

@@ -0,0 +1,63 @@
+title: $:/geospatialdemo/features/denver/campus
+caption: Denver Auraria West Campus as ~GeoJSON multipolygons
+tags: $:/tags/GeoFeature
+type: application/json
+color: purple
+
+{
+    "type": "Feature",
+    "properties": {
+        "popupContent": "This is the Auraria West Campus",
+        "style": {
+            "weight": 2,
+            "color": "#999",
+            "opacity": 1,
+            "fillColor": "#B0DE5C",
+            "fillOpacity": 0.8
+        }
+    },
+    "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+            [
+                [
+                    [-105.00432014465332, 39.74732195489861],
+                    [-105.00715255737305, 39.74620006835170],
+                    [-105.00921249389647, 39.74468219277038],
+                    [-105.01067161560059, 39.74362625960105],
+                    [-105.01195907592773, 39.74290029616054],
+                    [-105.00989913940431, 39.74078835902781],
+                    [-105.00758171081543, 39.74059036160317],
+                    [-105.00346183776855, 39.74059036160317],
+                    [-105.00097274780272, 39.74059036160317],
+                    [-105.00062942504881, 39.74072235994946],
+                    [-105.00020027160645, 39.74191033368865],
+                    [-105.00071525573731, 39.74276830198601],
+                    [-105.00097274780272, 39.74369225589818],
+                    [-105.00097274780272, 39.74461619742136],
+                    [-105.00123023986816, 39.74534214278395],
+                    [-105.00183105468751, 39.74613407445653],
+                    [-105.00432014465332, 39.74732195489861]
+                ],[
+                    [-105.00361204147337, 39.74354376414072],
+                    [-105.00301122665405, 39.74278480127163],
+                    [-105.00221729278564, 39.74316428375108],
+                    [-105.00283956527711, 39.74390674342741],
+                    [-105.00361204147337, 39.74354376414072]
+                ]
+            ],[
+                [
+                    [-105.00942707061768, 39.73989736613708],
+                    [-105.00942707061768, 39.73910536278566],
+                    [-105.00685214996338, 39.73923736397631],
+                    [-105.00384807586671, 39.73910536278566],
+                    [-105.00174522399902, 39.73903936209552],
+                    [-105.00041484832764, 39.73910536278566],
+                    [-105.00041484832764, 39.73979836621592],
+                    [-105.00535011291504, 39.73986436617916],
+                    [-105.00942707061768, 39.73989736613708]
+                ]
+            ]
+        ]
+    }
+}

editions/geospatialdemo/tiddlers/features/denver-freebus.tid

@@ -0,0 +1,56 @@
+title: $:/geospatialdemo/features/denver/freebus
+caption: Denver free bus routes as ~GeoJSON linestrings
+tags: $:/tags/GeoFeature
+type: application/json
+color: green
+
+{
+    "type": "FeatureCollection",
+    "features": [
+        {
+            "type": "Feature",
+            "geometry": {
+                "type": "LineString",
+                "coordinates": [
+                    [-105.00341892242432, 39.75383843460583],
+                    [-105.0008225440979, 39.751891803969535]
+                ]
+            },
+            "properties": {
+                "popupContent": "This is a free bus line that will take you across downtown.",
+                "underConstruction": false
+            },
+            "id": 1
+        },
+        {
+            "type": "Feature",
+            "geometry": {
+                "type": "LineString",
+                "coordinates": [
+                    [-105.0008225440979, 39.751891803969535],
+                    [-104.99820470809937, 39.74979664004068]
+                ]
+            },
+            "properties": {
+                "popupContent": "This is a free bus line that will take you across downtown.",
+                "underConstruction": true
+            },
+            "id": 2
+        },
+        {
+            "type": "Feature",
+            "geometry": {
+                "type": "LineString",
+                "coordinates": [
+                    [-104.99820470809937, 39.74979664004068],
+                    [-104.98689651489258, 39.741052354709055]
+                ]
+            },
+            "properties": {
+                "popupContent": "This is a free bus line that will take you across downtown.",
+                "underConstruction": false
+            },
+            "id": 3
+        }
+    ]
+}

editions/geospatialdemo/tiddlers/features/denver-lightrail.tid

@@ -0,0 +1,30 @@
+title: $:/geospatialdemo/features/denver/lightrail
+caption: Denver light rail stops as ~GeoJSON points
+tags: $:/tags/GeoFeature
+type: application/json
+color: red
+
+{
+    "type": "FeatureCollection",
+    "features": [
+        {
+            "type": "Feature",
+            "properties": {
+                "popupContent": "18th & California Light Rail Stop"
+            },
+            "geometry": {
+                "type": "Point",
+                "coordinates": [-104.98999178409576, 39.74683938093904]
+            }
+        },{
+            "type": "Feature",
+            "properties": {
+                "popupContent": "20th & Welton Light Rail Stop"
+            },
+            "geometry": {
+                "type": "Point",
+                "coordinates": [-104.98689115047453, 39.747924136466565]
+            }
+        }
+    ]
+}

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

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

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

@@ -0,0 +1,5 @@
+title: $:/geospatialdemo/features/us-states
+caption: US State Boundaries
+type: application/json
+tags: $:/tags/GeoFeature
+color: #88f

editions/geospatialdemo/tiddlers/real-estate-demo/real-estate-demo.tid

@@ -0,0 +1,99 @@
+title: real-estate-demo
+caption: Real Estate Demo
+tags: $:/tags/GeospatialDemo
+
+\define default-display-filter() [<currentTiddler>get<fieldname>]
+\define default-limit() 10
+
+This is a list of all the tiddlers containing ~GeoJSON markers in this wiki (identified by the tag <<tag "$:/tags/GeoMarker">>) viewed as both a map and a table.
+
+<$let
+	schema={{real-estate-demo/schema}}
+>
+	<div>
+		<$list filter="[<schema>jsonindexes[columns]]" variable="index">
+			<$let
+				config={{{ [<schema>jsonget[columns],<index>,[name]addprefix[$:/config/geospatial/demo/real-estate-demo/columns/]] }}}
+			>
+				<div>
+					<$checkbox tiddler=<<config>> field="visible" checked="yes" unchecked="no" default="yes">
+						<$text text={{{ [<schema>jsonget[columns],<index>,[caption]] }}}/>
+					</$checkbox>
+				</div>
+			</$let>
+		</$list>
+	</div>
+	<div>
+		Sorting by
+		<$select tiddler="$:/config/geospatial/demo/real-estate-demo/sort-field" default="title">
+			<$list filter="[<schema>jsonindexes[columns]]" variable="index">
+				<option value={{{ [<schema>jsonget[columns],<index>,[name]] }}}>
+					<$text text={{{ [<schema>jsonget[columns],<index>,[caption]] }}}/>
+				</option>
+			</$list>
+		</$select>
+		<$checkbox tiddler="$:/config/geospatial/demo/real-estate-demo/sort-order" field="text" checked="reverse" unchecked="normal" default="normal">
+			Reverse sort order
+		</$checkbox>
+	</div>
+	<div>
+	Search: <$edit-text tiddler="$:/config/geospatial/demo/real-estate-demo/search" tag="input"/>
+	</div>
+	<div>
+	Limit: <$edit-text tiddler="$:/config/geospatial/demo/real-estate-demo/limit" tag="input" placeholder=<<default-limit>>/>
+	</div>
+	<table>
+		<thead>
+			<tr>
+				<$list filter="[<schema>jsonindexes[columns]]" variable="index">
+					<$let
+						config={{{ [<schema>jsonget[columns],<index>,[name]addprefix[$:/config/geospatial/demo/real-estate-demo/columns/]] }}}
+					>
+						<$list filter="[<config>get[visible]else[yes]match[yes]]" variable="ignore">
+							<th>
+								<$text text={{{ [<schema>jsonget[columns],<index>,[caption]] }}}/>
+							</th>
+						</$list>
+					</$let>
+				</$list>
+			</tr>
+		</thead>
+		<tbody>
+			<$let
+				sortField={{{ [[$:/config/geospatial/demo/real-estate-demo/sort-field]get[text]else[title]] }}}
+				sortOrder={{{ [[$:/config/geospatial/demo/real-estate-demo/sort-order]get[text]else[normal]] }}}
+				limit={{{ [[$:/config/geospatial/demo/real-estate-demo/limit]get[text]] :else[<default-limit>] }}}
+			>
+				<$list filter="[all[shadows+tiddlers]tag[$:/tags/GeoMarker]search:*{$:/config/geospatial/demo/real-estate-demo/search}nsort<sortField>order<sortOrder>limit<limit>]">
+					<$let
+						rowTiddler=<<currentTiddler>>
+					>
+						<$setmultiplevariables
+							$names="[<schema>jsonindexes[variables]sort[]]"
+							$values="[<schema>jsonindexes[variables]sort[]] :map[<schema>jsonget[variables],<currentTiddler>] :map[subfilter<currentTiddler>]"
+						>
+							<tr>
+								<$list filter="[<schema>jsonindexes[columns]]" variable="index">
+									<$let
+										config={{{ [<schema>jsonget[columns],<index>,[name]addprefix[$:/config/geospatial/demo/real-estate-demo/columns/]] }}}
+									>
+										<$list filter="[<config>get[visible]else[yes]match[yes]]" variable="ignore">
+											<td>
+												<$let
+													fieldname={{{ [<schema>jsonget[columns],<index>,[name]] }}}
+													displayFilter={{{ [<schema>jsonget[columns],<index>,[display]] :else[<default-display-filter>] }}}
+												>
+													<$text text={{{ [subfilter<displayFilter>] }}}/>
+												</$let>
+											</td>
+										</$list>
+									</$let>
+								</$list>
+							</tr>
+						</$setmultiplevariables>
+					</$let>
+				</$list>
+			</$let>
+		</tbody>
+	</table>
+</$let>

editions/geospatialdemo/tiddlers/real-estate-demo/schema.json

@@ -0,0 +1,22 @@
+{
+	"columns": [
+		{"name": "address", "caption": "Address", "type": "string"},
+		{"name": "broker", "caption": "Broker", "type": "string"},
+		{"name": "city", "caption": "City", "type": "string"},
+		{"name": "lat", "caption": "Latitude", "type": "number"},
+		{"name": "long", "caption": "Longitude", "type": "number"},
+		{"name": "price", "caption": "Price", "type": "number"},
+		{"name": "salesagent", "caption": "Sales Agent", "type": "string"},
+		{"name": "state", "caption": "State", "type": "string"},
+		{"name": "title", "caption": "Title", "type": "string"},
+		{"name": "zipcode", "caption": "Zip Code", "type": "string"},
+		{"name": "census-province", "caption": "Census Province", "type": "string", "display": "[<census-data>jsonget[0],[prov_name_en],[0]]"},
+		{"name": "census-division", "caption": "Census Division", "type": "string", "display": "[<census-data>jsonget[0],[cd_name_en],[0]]"},
+		{"name": "census-subdivision", "caption": "Census Subdivision", "type": "string", "display": "[<census-data>jsonget[0],[csd_name_en],[0]]"},
+		{"name": "nearest-volcano", "caption": "Nearest Volcano", "type": "string", "display": "[{$:/geospatialdemo/features/harvard-volcanoes-of-the-world}geonearestpoint<coords>]"}
+	],
+	"variables": {
+		"coords": "[<rowTiddler>] :map[geopoint{!!long},{!!lat}]",
+		"census-data": "[<rowTiddler>] :map[geopoint{!!long},{!!lat}geolookup{$:/geospatialdemo/features/canada-census-subdivision-millesime}]"
+	}
+}

editions/geospatialdemo/tiddlers/real-estate-demo/schema.json.meta

@@ -0,0 +1,3 @@
+title: real-estate-demo/schema
+type: application/json
+

editions/geospatialdemo/tiddlers/real-estate-demo/xlsx-utils-import-specs/PropertiesRow.tid

@@ -0,0 +1,5 @@
+import-spec-role: row
+list: $:/_importspec/RealEstate/PropertiesRow/Field/long $:/_importspec/RealEstate/PropertiesRow/Field/lat $:/_importspec/RealEstate/PropertiesRow/Field/price $:/_importspec/RealEstate/PropertiesRow/Field/broker $:/_importspec/RealEstate/PropertiesRow/Field/salesagent $:/_importspec/RealEstate/PropertiesRow/Field/zipcode $:/_importspec/RealEstate/PropertiesRow/Field/state $:/_importspec/RealEstate/PropertiesRow/Field/city $:/_importspec/RealEstate/PropertiesRow/Field/tags $:/_importspec/RealEstate/PropertiesRow/Field/title $:/_importspec/RealEstate/PropertiesRow/Field/address
+tags: 
+title: $:/_importspec/RealEstate/PropertiesRow
+type: text/vnd.tiddlywiki

editions/geospatialdemo/tiddlers/real-estate-demo/xlsx-utils-import-specs/PropertiesRowFieldAddress.tid

@@ -0,0 +1,7 @@
+import-field-column: Address
+import-field-name: address
+import-field-source: column
+import-spec-role: field
+title: $:/_importspec/RealEstate/PropertiesRow/Field/address
+type: text/vnd.tiddlywiki
+