Add a cascade for dynamically choosing tiddler icons

As suggested by @pmario

.eslintignore

@@ -1,8 +1,15 @@
-# Ignore "third party" code whose style we will not change.
+# Known minified files
 /boot/sjcl.js
-/core/modules/utils/base64-utf8/base64-utf8.module.js
 /core/modules/utils/base64-utf8/base64-utf8.module.min.js
 /core/modules/utils/diff-match-patch/diff_match_patch.js
-/core/modules/utils/diff-match-patch/diff_match_patch_uncompressed.js
-/core/modules/utils/dom/csscolorparser.js
-/plugins/tiddlywiki/*/files/
+/plugins/tiddlywiki/async/files/async.min.v1.5.0.js
+/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/anyword-hint.js
+/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/css-hint.js
+/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/html-hint.js
+/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/javascript-hint.js
+/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/show-hint.js
+/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/xml-hint.js
+/plugins/tiddlywiki/codemirror-closebrackets/files/addon/edit/closebrackets.js
+/plugins/tiddlywiki/codemirror-closebrackets/files/addon/edit/matchbrackets.js
+/plugins/tiddlywiki/codemirror-closetag/files/addon/edit/closetag.js
+/plugins/tiddlywiki/codemirror-closetag/files/addon/fold/xml-fold.js

.eslintrc.yml

@@ -64,23 +64,7 @@ rules:
   init-declarations: 'off'
   jsx-quotes: error
   key-spacing: 'off'
-  keyword-spacing:
-    - error
-    - before: true
-      after: false
-      overrides:
-        'case':
-          after: true
-        'do':
-          'after': true
-        'else':
-          after: true
-        'return':
-          after: true
-        'throw':
-          after: true
-        'try':
-          after: true
+  keyword-spacing: 'off'
   line-comment-position: 'off'
   linebreak-style: 'off'
   lines-around-comment: 'off'

bin/build-site.sh

@@ -5,7 +5,7 @@
 # Default to the current version number for building the plugin library
 
 if [  -z "$TW5_BUILD_VERSION" ]; then
-    TW5_BUILD_VERSION=v5.2.2
+    TW5_BUILD_VERSION=v5.2.0
 fi
 
 echo "Using TW5_BUILD_VERSION as [$TW5_BUILD_VERSION]"

boot/boot.js

@@ -68,26 +68,6 @@ $tw.utils.isArrayEqual = function(array1,array2) {
 	});
 };
 
-/*
-Add an entry to a sorted array if it doesn't already exist, while maintaining the sort order
-*/
-$tw.utils.insertSortedArray = function(array,value) {
-	var low = 0, high = array.length - 1, mid, cmp;
-	while(low <= high) {
-		mid = (low + high) >> 1;
-		cmp = value.localeCompare(array[mid]);
-		if(cmp > 0) {
-			low = mid + 1;
-		} else if(cmp < 0) {
-			high = mid - 1;
-		} else {
-			return array;
-		}
-	}
-	array.splice(low,0,value);
-	return array;
-};
-
 /*
 Push entries onto an array, removing them first if they already exist in the array
 	array: array to modify (assumed to be free of duplicates)
@@ -429,19 +409,6 @@ $tw.utils.parseFields = function(text,fields) {
 	return fields;
 };
 
-// Safely parse a string as JSON
-$tw.utils.parseJSONSafe = function(text,defaultJSON) {
-	try {
-		return JSON.parse(text);
-	} catch(e) {
-		if(typeof defaultJSON === "function") {
-			return defaultJSON(e);
-		} else {
-			return defaultJSON || {};
-		}
-	}
-};
-
 /*
 Resolves a source filepath delimited with `/` relative to a specified absolute root filepath.
 In relative paths, the special folder name `..` refers to immediate parent directory, and the
@@ -1114,7 +1081,7 @@ $tw.Wiki = function(options) {
 		tiddlerTitles = null, // Array of tiddler titles
 		getTiddlerTitles = function() {
 			if(!tiddlerTitles) {
-				tiddlerTitles = Object.keys(tiddlers).sort(function(a,b) {return a.localeCompare(b);});
+				tiddlerTitles = Object.keys(tiddlers);
 			}
 			return tiddlerTitles;
 		},
@@ -1167,8 +1134,10 @@ $tw.Wiki = function(options) {
 				}
 				// Save the new tiddler
 				tiddlers[title] = tiddler;
-				// Check we've got the title
-				tiddlerTitles = $tw.utils.insertSortedArray(tiddlerTitles || [],title);
+				// Check we've got it's title
+				if(tiddlerTitles && tiddlerTitles.indexOf(title) === -1) {
+					tiddlerTitles.push(title);
+				}
 				// Record the new tiddler state
 				updateDescriptor["new"] = {
 					tiddler: tiddler,
@@ -1353,7 +1322,7 @@ $tw.Wiki = function(options) {
 			var tiddler = tiddlers[title];
 			if(tiddler) {
 				if(tiddler.fields.type === "application/json" && tiddler.hasField("plugin-type") && tiddler.fields.text) {
-					pluginInfo[tiddler.fields.title] = $tw.utils.parseJSONSafe(tiddler.fields.text);
+					pluginInfo[tiddler.fields.title] = JSON.parse(tiddler.fields.text);
 					results.modifiedPlugins.push(tiddler.fields.title);
 				}
 			} else {
@@ -1486,7 +1455,7 @@ $tw.Wiki.prototype.defineTiddlerModules = function() {
 					}
 					break;
 				case "application/json":
-					$tw.modules.define(tiddler.fields.title,tiddler.fields["module-type"],$tw.utils.parseJSONSafe(tiddler.fields.text));
+					$tw.modules.define(tiddler.fields.title,tiddler.fields["module-type"],JSON.parse(tiddler.fields.text));
 					break;
 				case "application/x-tiddler-dictionary":
 					$tw.modules.define(tiddler.fields.title,tiddler.fields["module-type"],$tw.utils.parseFields(tiddler.fields.text));
@@ -1675,7 +1644,12 @@ $tw.modules.define("$:/boot/tiddlerdeserializer/json","tiddlerdeserializer",{
 				}
 				return true;
 			},
-			data = $tw.utils.parseJSONSafe(text);
+			data = {};
+		try {
+			data = JSON.parse(text);			
+		} catch(e) {
+			// Ignore JSON parse errors
+		}
 		if($tw.utils.isArray(data) && isTiddlerArrayValid(data)) {
 			return data;
 		} else if(isTiddlerValid(data)) {
@@ -1715,7 +1689,7 @@ $tw.boot.decryptEncryptedTiddlers = function(callback) {
 				$tw.crypto.setPassword(data.password);
 				var decryptedText = $tw.crypto.decrypt(encryptedText);
 				if(decryptedText) {
-					var json = $tw.utils.parseJSONSafe(decryptedText);
+					var json = JSON.parse(decryptedText);
 					for(var title in json) {
 						$tw.preloadTiddler(json[title]);
 					}
@@ -1915,7 +1889,7 @@ filepath: pathname of the directory containing the specification file
 $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
 	var tiddlers = [];
 	// Read the specification
-	var filesInfo = $tw.utils.parseJSONSafe(fs.readFileSync(filepath + path.sep + "tiddlywiki.files","utf8"));
+	var filesInfo = JSON.parse(fs.readFileSync(filepath + path.sep + "tiddlywiki.files","utf8"));
 	// Helper to process a file
 	var processFile = function(filename,isTiddlerFile,fields,isEditableFile) {
 		var extInfo = $tw.config.fileExtensionInfo[path.extname(filename)],
@@ -2045,7 +2019,7 @@ $tw.loadPluginFolder = function(filepath,excludeRegExp) {
 			console.log("Warning: missing plugin.info file in " + filepath);
 			return null;
 		}
-		var pluginInfo = $tw.utils.parseJSONSafe(fs.readFileSync(infoPath,"utf8"));
+		var pluginInfo = JSON.parse(fs.readFileSync(infoPath,"utf8"));
 		// Read the plugin files
 		var pluginFiles = $tw.loadTiddlersFromPath(filepath,excludeRegExp);
 		// Save the plugin tiddlers into the plugin info
@@ -2162,7 +2136,7 @@ $tw.loadWikiTiddlers = function(wikiPath,options) {
 		pluginFields;
 	// Bail if we don't have a wiki info file
 	if(fs.existsSync(wikiInfoPath)) {
-		wikiInfo = $tw.utils.parseJSONSafe(fs.readFileSync(wikiInfoPath,"utf8"));
+		wikiInfo = JSON.parse(fs.readFileSync(wikiInfoPath,"utf8"));
 	} else {
 		return null;
 	}
@@ -2675,4 +2649,3 @@ if(typeof(exports) !== "undefined") {
 } else {
 	_boot(window.$tw);
 }
-//# sourceURL=$:/boot/boot.js

boot/bootprefix.js

@@ -117,4 +117,3 @@ if(typeof(exports) === "undefined") {
 	// Export functionality as a module
 	exports.bootprefix = _bootprefix;
 }
-//# sourceURL=$:/boot/bootprefix.js

core/copyright.tid

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

core/language/en-GB/ControlPanel.multids

@@ -208,8 +208,6 @@ Theme/Caption: Theme
 Theme/Prompt: Current theme:
 TiddlerFields/Caption: Tiddler Fields
 TiddlerFields/Hint: This is the full set of TiddlerFields in use in this wiki (including system tiddlers but excluding shadow tiddlers).
-TiddlerColour/Caption: Tiddler Colour
-TiddlerColour/Hint: This rules cascade is used to dynamically choose the colour for a tiddler (used for the icon and the associated tag pill).
 TiddlerIcon/Caption: Tiddler Icon
 TiddlerIcon/Hint: This rules cascade is used to dynamically choose the icon for a tiddler.
 Toolbars/Caption: Toolbars

core/language/en-GB/Fields.multids

@@ -3,7 +3,6 @@ title: $:/language/Docs/Fields/
 _canonical_uri: The full URI of an external image tiddler
 bag: The name of the bag from which a tiddler came
 caption: The text to be displayed on a tab or button
-code-body: The view template will display the tiddler as code if set to ''yes''
 color: The CSS color value associated with a tiddler
 component: The name of the component responsible for an [[alert tiddler|AlertMechanism]]
 current-tiddler: Used to cache the top tiddler in a [[history list|HistoryMechanism]]
@@ -14,9 +13,9 @@ description: The descriptive text for a plugin, or a modal dialogue
 draft.of: For draft tiddlers, contains the title of the tiddler of which this is a draft
 draft.title: For draft tiddlers, contains the proposed new title of the tiddler
 footer: The footer text for a wizard
-hide-body: The view template will hide bodies of tiddlers if set to ''yes''
+hide-body: The view template will hide bodies of tiddlers if set to: ''yes''
 icon: The title of the tiddler containing the icon associated with a tiddler
-library: Indicates that a tiddler should be saved as a JavaScript library if set to ''yes''
+library: Indicates that a tiddler should be saved as a JavaScript library if set to: ''yes''
 list: An ordered list of tiddler titles associated with a tiddler
 list-before: If set, the title of a tiddler before which this tiddler should be added to the ordered list of tiddler titles, or at the start of the list if this field is present but empty
 list-after: If set, the title of the tiddler after which this tiddler should be added to the ordered list of tiddler titles, or at the end of the list if this field is present but empty
@@ -33,7 +32,7 @@ tags: A list of tags associated with a tiddler
 text: The body text of a tiddler
 throttle.refresh: If present, throttles refreshes of this tiddler
 title: The unique name of a tiddler
-toc-link: Suppresses the tiddler's link in a Table of Contents tree if set to ''no'' 
+toc-link: Suppresses the tiddler's link in a Table of Contents tree if set to: ''no'' 
 type: The content type of a tiddler
 version: Version information for a plugin
 _is_skinny: If present, indicates that the tiddler text field must be loaded from the server

core/language/en-GB/Misc.multids

@@ -14,7 +14,7 @@ ConfirmAction: Do you wish to proceed?
 Count: count
 DefaultNewTiddlerTitle: New Tiddler
 Diffs/CountMessage: <<diff-count>> differences
-DropMessage: Drop now (or use the 'Escape' key to cancel)
+DropMessage: Drop here (or use the 'Escape' key to cancel)
 Encryption/Cancel: Cancel
 Encryption/ConfirmClearPassword: Do you wish to clear the password? This will remove the encryption applied when saving this wiki
 Encryption/PromptSetPassword: Set a new password for this TiddlyWiki

core/modules/commands/init.js

@@ -48,7 +48,7 @@ Command.prototype.execute = function() {
 	}
 	// Tweak the tiddlywiki.info to remove any included wikis
 	var packagePath = $tw.boot.wikiPath + "/tiddlywiki.info",
-		packageJson = $tw.utils.parseJSONSafe(fs.readFileSync(packagePath));
+		packageJson = JSON.parse(fs.readFileSync(packagePath));
 	delete packageJson.includeWikis;
 	fs.writeFileSync(packagePath,JSON.stringify(packageJson,null,$tw.config.preferences.jsonSpaces));
 	return null;

core/modules/commands/savelibrarytiddlers.js

@@ -69,7 +69,7 @@ Command.prototype.execute = function() {
 		$tw.utils.createFileDirectories(pathname);
 		fs.writeFileSync(pathname,JSON.stringify(tiddler),"utf8");
 		// Collect the skinny list data
-		var pluginTiddlers = $tw.utils.parseJSONSafe(tiddler.text),
+		var pluginTiddlers = JSON.parse(tiddler.text),
 			readmeContent = (pluginTiddlers.tiddlers[title + "/readme"] || {}).text,
 			doesRequireReload = !!self.commander.wiki.doesPluginInfoRequireReload(pluginTiddlers),
 			iconTiddler = pluginTiddlers.tiddlers[title + "/icon"] || {},

core/modules/commands/savewikifolder.js

@@ -151,7 +151,7 @@ WikiFolderMaker.prototype.saveCustomPlugin = function(pluginTiddler) {
 		pluginInfo = pluginTiddler.getFieldStrings({exclude: ["text","type"]});
 	this.saveJSONFile(directory + path.sep + "plugin.info",pluginInfo);
 	self.log("Writing " + directory + path.sep + "plugin.info: " + JSON.stringify(pluginInfo,null,$tw.config.preferences.jsonSpaces));
-	var pluginTiddlers = $tw.utils.parseJSONSafe(pluginTiddler.fields.text).tiddlers; // A hashmap of tiddlers in the plugin
+	var pluginTiddlers = JSON.parse(pluginTiddler.fields.text).tiddlers; // A hashmap of tiddlers in the plugin
 	$tw.utils.each(pluginTiddlers,function(tiddler) {
 		self.saveTiddler(directory,new $tw.Tiddler(tiddler));
 	});

core/modules/deserializers.js

@@ -17,13 +17,16 @@ exports["application/x-tiddler-html-div"] = function(text,fields) {
 };
 
 exports["application/json"] = function(text,fields) {
-	var results = [],
-		incoming = $tw.utils.parseJSONSafe(text,function(err) {
-			return [{
-				title: "JSON error: " + err,
-				text: ""
-			}];
-		});
+	var incoming,
+		results = [];
+	try {
+		incoming = JSON.parse(text);
+	} catch(e) {
+		incoming = [{
+			title: "JSON error: " + e,
+			text: ""
+		}]
+	}
 	if(!$tw.utils.isArray(incoming)) {
 		incoming = [incoming];
 	}

core/modules/editor/factory.js

@@ -324,7 +324,7 @@ function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) {
 	If there are no Files, let the browser handle it.
 	*/
 	EditTextWidget.prototype.handleDropEvent = function(event) {
-		if($tw.utils.dragEventContainsFiles(event)) {
+		if(event.dataTransfer.files.length) {
 			event.preventDefault();
 			event.stopPropagation();
 			this.dispatchDOMEvent(this.cloneEvent(event,["dataTransfer"]));

core/modules/editor/operations/text/wrap-lines.js

@@ -13,17 +13,15 @@ Text editor operation to wrap the selected lines with a prefix and suffix
 "use strict";
 
 exports["wrap-lines"] = function(event,operation) {
-	var prefix = event.paramObject.prefix || "",
-		suffix = event.paramObject.suffix || "";
 	// Cut just past the preceding line break, or the start of the text
 	operation.cutStart = $tw.utils.findPrecedingLineBreak(operation.text,operation.selStart);
 	// Cut to just past the following line break, or to the end of the text
 	operation.cutEnd = $tw.utils.findFollowingLineBreak(operation.text,operation.selEnd);
 	// Add the prefix and suffix
-	operation.replacement = prefix + "\n" +
+	operation.replacement = event.paramObject.prefix + "\n" +
 				operation.text.substring(operation.cutStart,operation.cutEnd) + "\n" +
-				suffix + "\n";
-	operation.newSelStart = operation.cutStart + prefix.length + 1;
+				event.paramObject.suffix + "\n";
+	operation.newSelStart = operation.cutStart + event.paramObject.prefix.length + 1;
 	operation.newSelEnd = operation.newSelStart + (operation.cutEnd - operation.cutStart);
 };
 

core/modules/filterrunprefixes/cascade.js

@@ -26,19 +26,17 @@ exports.cascade = function(operationSubFunction,options) {
 						filterFnList[index] = options.wiki.compileFilter(filter);
 					}
 					var output = filterFnList[index](options.wiki.makeTiddlerIterator([title]),{
-						getVariable: function(name,opts) {
-							opts = opts || {};
-							opts.variables = {
-								"currentTiddler": "" + title,
-								"..currentTiddler": widget.getVariable("currentTiddler")
-							};
-							if(name in opts.variables) {
-								return opts.variables[name];
-							} else {
-								return widget.getVariable(name,opts);
+							getVariable: function(name) {
+								switch(name) {
+									case "currentTiddler":
+										return "" + title;
+									case "..currentTiddler":
+										return widget.getVariable("currentTiddler");
+									default:
+										return widget.getVariable(name);
+								}
 							}
-						}
-					});
+						});
 					if(output.length !== 0) {
 						result = output[0];
 						return false;

core/modules/filterrunprefixes/filter.js

@@ -16,30 +16,23 @@ Export our filter function
 exports.filter = function(operationSubFunction,options) {
 	return function(results,source,widget) {
 		if(results.length > 0) {
-			var resultsToRemove = [],
-				index = 0;
+			var resultsToRemove = [];
 			results.each(function(title) {
 				var filtered = operationSubFunction(options.wiki.makeTiddlerIterator([title]),{
-					getVariable: function(name,opts) {
-						opts = opts || {};
-						opts.variables = {
-							"currentTiddler": "" + title,
-							"..currentTiddler": widget.getVariable("currentTiddler"),
-							"index": "" + index,
-							"revIndex": "" +  (results.length - 1 - index),
-							"length": "" + results.length
-						};
-						if(name in opts.variables) {
-							return opts.variables[name];
-						} else {
-							return widget.getVariable(name,opts);
+					getVariable: function(name) {
+						switch(name) {
+							case "currentTiddler":
+								return "" + title;
+							case "..currentTiddler":
+								return widget.getVariable("currentTiddler");
+							default:
+								return widget.getVariable(name);
 						}
 					}
 				});
 				if(filtered.length === 0) {
 					resultsToRemove.push(title);
 				}
-				++index;
 			});
 			results.remove(resultsToRemove);
 		}

core/modules/filterrunprefixes/map.js

@@ -20,19 +20,20 @@ exports.map = function(operationSubFunction,options) {
 			results.clear();
 			$tw.utils.each(inputTitles,function(title) {
 				var filtered = operationSubFunction(options.wiki.makeTiddlerIterator([title]),{
-					getVariable: function(name,opts) {
-						opts = opts || {};
-						opts.variables = {
-							"currentTiddler": "" + title,
-							"..currentTiddler": widget.getVariable("currentTiddler"),
-							"index": "" + index,
-							"revIndex": "" +  (inputTitles.length - 1 - index),
-							"length": "" + inputTitles.length
-						};
-						if(name in opts.variables) {
-							return opts.variables[name];
-						} else {
-							return widget.getVariable(name,opts);
+					getVariable: function(name) {
+						switch(name) {
+							case "currentTiddler":
+								return "" + title;
+							case "..currentTiddler":
+								return widget.getVariable("currentTiddler");
+							case "index":
+								return "" + index;
+							case "revIndex":
+								return "" +  (inputTitles.length - 1 - index);
+							case "length":
+								return "" + inputTitles.length;
+							default:
+								return widget.getVariable(name);
 						}
 					}
 				});

core/modules/filterrunprefixes/reduce.js

@@ -15,24 +15,26 @@ Export our filter prefix function
 exports.reduce = function(operationSubFunction,options) {
 	return function(results,source,widget) {
 		if(results.length > 0) {
-			var accumulator = "",
-				index = 0;
+			var accumulator = "";
+			var index = 0;
 			results.each(function(title) {
 				var list = operationSubFunction(options.wiki.makeTiddlerIterator([title]),{
-					getVariable: function(name,opts) {
-						opts = opts || {};
-						opts.variables = {
-							"currentTiddler": "" + title,
-							"..currentTiddler": widget.getVariable("currentTiddler"),
-							"index": "" + index,
-							"revIndex": "" +  (results.length - 1 - index),
-							"length": "" + results.length,
-							"accumulator": "" + accumulator
-						};
-						if(name in opts.variables) {
-							return opts.variables[name];
-						} else {
-							return widget.getVariable(name,opts);
+					getVariable: function(name) {
+						switch(name) {
+							case "currentTiddler":
+								return "" + title;
+							case "..currentTiddler":
+								return widget.getVariable("currentTiddler");
+							case "accumulator":
+								return "" + accumulator;
+							case "index":
+								return "" + index;
+							case "revIndex":
+								return "" +  (results.length - 1 - index);
+							case "length":
+								return "" + results.length;
+							default:
+								return widget.getVariable(name);
 						}
 					}
 				});

core/modules/filterrunprefixes/sort.js

@@ -26,16 +26,14 @@ exports.sort = function(operationSubFunction,options) {
 				compareFn;
 			results.each(function(title) {
 				var key = operationSubFunction(options.wiki.makeTiddlerIterator([title]),{
-					getVariable: function(name,opts) {
-						opts = opts || {};
-						opts.variables = {
-							"currentTiddler": "" + title,
-							"..currentTiddler": widget.getVariable("currentTiddler")
-						};
-						if(name in opts.variables) {
-							return opts.variables[name];
-						} else {
-							return widget.getVariable(name,opts);
+					getVariable: function(name) {
+						switch(name) {
+							case "currentTiddler":
+								return "" + title;
+							case "..currentTiddler":
+								return widget.getVariable("currentTiddler");
+							default:
+								return widget.getVariable(name);
 						}
 					}
 				});

core/modules/filters.js

@@ -95,12 +95,10 @@ function parseFilterOperation(operators,filterString,p) {
 			if(nextBracketPos === -1) {
 				throw "Missing closing bracket in filter expression";
 			}
-			if(operator.regexp) {
-				operand.text = "";
-			} else {
+			if(!operator.regexp) {
 				operand.text = filterString.substring(p,nextBracketPos);
+				operator.operands.push(operand);
 			}
-			operator.operands.push(operand);
 			p = nextBracketPos + 1;
 		}
 

core/modules/filters/crypto.js

@@ -1,27 +0,0 @@
-/*\
-title: $:/core/modules/filters/crypto.js
-type: application/javascript
-module-type: filteroperator
-
-Filter operators for cryptography, using the Stanford JavaScript library
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-exports.sha256 = function(source,operator,options) {
-	var results = [],
-		length = parseInt(operator.operand,10) || 20,
-		sha256 = function(text) {
-			return sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(text)).substr(0,length);
-		};
-	source(function(tiddler,title) {
-		results.push(sha256(title));
-	});
-	return results;
-};
-
-})();

core/modules/filters/insertbefore.js

@@ -20,7 +20,7 @@ exports.insertbefore = function(source,operator,options) {
 	source(function(tiddler,title) {
 		results.push(title);
 	});
-	var target = operator.operands[1] || (options.widget && options.widget.getVariable(operator.suffix || "currentTiddler"));
+	var target = options.widget && options.widget.getVariable(operator.suffix || "currentTiddler");
 	if(target !== operator.operand) {
 		// Remove the entry from the list if it is present
 		var pos = results.indexOf(operator.operand);

core/modules/filters/is/draft.js

@@ -19,13 +19,13 @@ exports.draft = function(source,prefix,options) {
 	var results = [];
 	if(prefix === "!") {
 		source(function(tiddler,title) {
-			if(!tiddler || !tiddler.isDraft()) {
+			if(!tiddler || !$tw.utils.hop(tiddler.fields,"draft.of")) {
 				results.push(title);
 			}
 		});
 	} else {
 		source(function(tiddler,title) {
-			if(tiddler && tiddler.isDraft()) {
+			if(tiddler && $tw.utils.hop(tiddler.fields,"draft.of") && (tiddler.fields["draft.of"].length !== 0)) {
 				results.push(title);
 			}
 		});

core/modules/filters/listops.js

@@ -87,8 +87,7 @@ exports.butlast = function(source,operator,options) {
 	source(function(tiddler,title) {
 		results.push(title);
 	});
-	var index = count === 0 ? results.length : -count;
-	return results.slice(0,index);
+	return results.slice(0,-count);
 };
 exports.bl = exports.butlast;
 

core/modules/filters/lookup.js

@@ -5,11 +5,9 @@ module-type: filteroperator
 
 Filter operator that looks up values via a title prefix
 
-[lookup:<defaultvalue>:<field OR index>[<prefix>],[<field-name OR index-name>]]
+[lookup:<field>[<prefix>]]
 
-Prepends the prefix to the selected items and returns the specified 
-field or index value. If the 2nd suffix does not exist, it defaults to field.
-If the second operand is missing it defaults to "text" for fields, and "0" for indexes
+Prepends the prefix to the selected items and returns the specified field value
 
 \*/
 (function(){
@@ -22,31 +20,10 @@ If the second operand is missing it defaults to "text" for fields, and "0" for i
 Export our filter function
 */
 exports.lookup = function(source,operator,options) {
-	var results = [],
-		suffixes = operator.suffixes || [],
-		defaultSuffix = suffixes[0] ? (suffixes[0][0] || "") : "",
-		indexSuffix = (suffixes[1] && suffixes[1][0] === "index") ? true : false,
-		target;
-	if(operator.operands.length == 2) {
-		target = operator.operands[1]
-	} else {
-		target = indexSuffix ? "0": "text";
-	}
-	if(indexSuffix) {
-		source(function(tiddler,title) {
-			var data = options.wiki.extractTiddlerDataItem(operator.operands[0]+title,target,defaultSuffix);
-			results.push(data);
-		});
-	} else {
-		source(function(tiddler,title) {
-			var value = defaultSuffix;
-			var targetTiddler = options.wiki.getTiddler(operator.operands[0]+title);
-			if(targetTiddler && targetTiddler.getFieldString(target)) {
-				value = targetTiddler.getFieldString(target);
-			}
-			results.push(value);
-		});
-	}
+	var results = [];
+	source(function(tiddler,title) {
+		results.push(options.wiki.getTiddlerText(operator.operand + title) || operator.suffix || '');
+	});
 	return results;
 };
 

core/modules/filters/prefix.js

@@ -16,37 +16,19 @@ Filter operator for checking if a title starts with a prefix
 Export our filter function
 */
 exports.prefix = function(source,operator,options) {
-	var results = [],
-		suffixes = (operator.suffixes || [])[0] || [];
-	if(suffixes.indexOf("caseinsensitive") !== -1) {
-		var operand = operator.operand.toLowerCase();
-		if(operator.prefix === "!") {
-			source(function(tiddler,title) {
-				if(title.toLowerCase().substr(0,operand.length) !== operand) {
-					results.push(title);
-				}
-			});
-		} else {
-			source(function(tiddler,title) {
-				if(title.toLowerCase().substr(0,operand.length) === operand) {
-					results.push(title);
-				}
-			});
-		}
+	var results = [];
+	if(operator.prefix === "!") {
+		source(function(tiddler,title) {
+			if(title.substr(0,operator.operand.length) !== operator.operand) {
+				results.push(title);
+			}
+		});
 	} else {
-		if(operator.prefix === "!") {
-			source(function(tiddler,title) {
-				if(title.substr(0,operator.operand.length) !== operator.operand) {
-					results.push(title);
-				}
-			});
-		} else {
-			source(function(tiddler,title) {
-				if(title.substr(0,operator.operand.length) === operator.operand) {
-					results.push(title);
-				}
-			});
-		}
+		source(function(tiddler,title) {
+			if(title.substr(0,operator.operand.length) === operator.operand) {
+				results.push(title);
+			}
+		});
 	}
 	return results;
 };

core/modules/filters/removeprefix.js

@@ -16,22 +16,12 @@ Filter operator for removing a prefix from each title in the list. Titles that d
 Export our filter function
 */
 exports.removeprefix = function(source,operator,options) {
-	var results = [],
-		suffixes = (operator.suffixes || [])[0] || [];
-	if(suffixes.indexOf("caseinsensitive") !== -1) {
-		var operand = operator.operand.toLowerCase();
-		source(function(tiddler,title) {
-			if(title.toLowerCase().substr(0,operand.length) === operand) {
-				results.push(title.substr(operand.length));
-			}
-		});
-	} else {
-		source(function(tiddler,title) {
-			if(title.substr(0,operator.operand.length) === operator.operand) {
-				results.push(title.substr(operator.operand.length));
-			}
-		});
-	}
+	var results = [];
+	source(function(tiddler,title) {
+		if(title.substr(0,operator.operand.length) === operator.operand) {
+			results.push(title.substr(operator.operand.length));
+		}
+	});
 	return results;
 };
 

core/modules/filters/removesuffix.js

@@ -16,26 +16,12 @@ Filter operator for removing a suffix from each title in the list. Titles that d
 Export our filter function
 */
 exports.removesuffix = function(source,operator,options) {
-	var results = [],
-		suffixes = (operator.suffixes || [])[0] || [];
-	if (!operator.operand) {
-		source(function(tiddler,title) {
-			results.push(title);
-		});
-	} else if(suffixes.indexOf("caseinsensitive") !== -1) {
-		var operand = operator.operand.toLowerCase();
-		source(function(tiddler,title) {
-			if(title && title.toLowerCase().substr(-operand.length) === operand) {
-				results.push(title.substr(0,title.length - operand.length));
-			}
-		});
-	} else {
-		source(function(tiddler,title) {
-			if(title && title.substr(-operator.operand.length) === operator.operand) {
-				results.push(title.substr(0,title.length - operator.operand.length));
-			}
-		});
-	}
+	var results = [];
+	source(function(tiddler,title) {
+		if(title && title.substr(-operator.operand.length) === operator.operand) {
+			results.push(title.substr(0,title.length - operator.operand.length));
+		}
+	});
 	return results;
 };
 

core/modules/filters/search.js

@@ -40,7 +40,6 @@ exports.search = function(source,operator,options) {
 			invert: invert,
 			field: fields,
 			excludeField: excludeFields,
-			some: hasFlag("some"),
 			caseSensitive: hasFlag("casesensitive"),
 			literal: hasFlag("literal"),
 			whitespace: hasFlag("whitespace"),

core/modules/filters/suffix.js

@@ -16,41 +16,19 @@ Filter operator for checking if a title ends with a suffix
 Export our filter function
 */
 exports.suffix = function(source,operator,options) {
-	var results = [],
-		suffixes = (operator.suffixes || [])[0] || [];
-	if (!operator.operand) {
+	var results = [];
+	if(operator.prefix === "!") {
 		source(function(tiddler,title) {
-			results.push(title);
+			if(title.substr(-operator.operand.length) !== operator.operand) {
+				results.push(title);
+			}
 		});
-	} else if(suffixes.indexOf("caseinsensitive") !== -1) {
-		var operand = operator.operand.toLowerCase();
-		if(operator.prefix === "!") {
-			source(function(tiddler,title) {
-				if(title.toLowerCase().substr(-operand.length) !== operand) {
-					results.push(title);
-				}
-			});
-		} else {
-			source(function(tiddler,title) {
-				if(title.toLowerCase().substr(-operand.length) === operand) {
-					results.push(title);
-				}
-			});
-		}
 	} else {
-		if(operator.prefix === "!") {
-			source(function(tiddler,title) {
-				if(title.substr(-operator.operand.length) !== operator.operand) {
-					results.push(title);
-				}
-			});
-		} else {
-			source(function(tiddler,title) {
-				if(title.substr(-operator.operand.length) === operator.operand) {
-					results.push(title);
-				}
-			});
-		}
+		source(function(tiddler,title) {
+			if(title.substr(-operator.operand.length) === operator.operand) {
+				results.push(title);
+			}
+		});
 	}
 	return results;
 };

core/modules/filters/untagged.js

@@ -19,7 +19,7 @@ exports.untagged = function(source,operator,options) {
 	var results = [],
 		expected = (operator.prefix === "!");
 	source(function(tiddler,title) {
-		if(((tiddler && $tw.utils.isArray(tiddler.fields.tags) && tiddler.fields.tags.length > 0) === expected) || (!tiddler && !expected)) {
+		if((tiddler && $tw.utils.isArray(tiddler.fields.tags) && tiddler.fields.tags.length > 0) === expected) {
 			results.push(title);
 		}
 	});

core/modules/parsers/parseutils.js

@@ -239,7 +239,7 @@ exports.parseFilterVariable = function(source) {
 };
 
 /*
-Look for an HTML attribute definition. Returns null if not found, otherwise returns {type: "attribute", name:, type: "filtered|string|indirect|macro", value|filter|textReference:, start:, end:,}
+Look for an HTML attribute definition. Returns null if not found, otherwise returns {type: "attribute", name:, valueType: "string|indirect|macro", value:, start:, end:,}
 */
 exports.parseAttribute = function(source,pos) {
 	var node = {
@@ -248,7 +248,7 @@ exports.parseAttribute = function(source,pos) {
 	// Define our regexps
 	var reAttributeName = /([^\/\s>"'=]+)/g,
 		reUnquotedAttribute = /([^\/\s<>"'=]+)/g,
-		reFilteredValue = /\{\{\{([\S\s]+?)\}\}\}/g,
+		reFilteredValue = /\{\{\{(.+?)\}\}\}/g,
 		reIndirectValue = /\{\{([^\}]+)\}\}/g;
 	// Skip whitespace
 	pos = $tw.utils.skipWhiteSpace(source,pos);

core/modules/pluginswitcher.js

@@ -52,7 +52,7 @@ PluginSwitcher.prototype.switchPlugins = function() {
 			var tiddler = self.wiki.getTiddler(title);
 			if(tiddler && tiddler.isPlugin() && plugins.indexOf(title) === -1) {
 				plugins.push(title);
-				var pluginInfo = $tw.utils.parseJSONSafe(self.wiki.getTiddlerText(title)),
+				var pluginInfo = JSON.parse(self.wiki.getTiddlerText(title)),
 					dependents = $tw.utils.parseStringArray(tiddler.fields.dependents || "");
 				$tw.utils.each(dependents,function(title) {
 					accumulatePlugin(title);

core/modules/savers/gitea.js

@@ -61,7 +61,7 @@ GiteaSaver.prototype.save = function(text,method,callback) {
 			}
 			var use_put = true;
 			if(xhr.status !== 404) {
-				getResponseData = $tw.utils.parseJSONSafe(getResponseDataJson);
+				getResponseData = JSON.parse(getResponseDataJson);
 				$tw.utils.each(getResponseData,function(details) {
 					if(details.name === filename) {
 						sha = details.sha;
@@ -104,7 +104,7 @@ GiteaSaver.prototype.upload = function(uri,method,headers,data,callback) {
 			if(err) {
 				return callback(err);
 			}
-			var putResponseData = $tw.utils.parseJSONSafe(putResponseDataJson);
+			var putResponseData = JSON.parse(putResponseDataJson);
 			callback(null);
 		}
 	});

core/modules/savers/github.js

@@ -61,7 +61,7 @@ GitHubSaver.prototype.save = function(text,method,callback) {
 				return callback(err);
 			}
 			if(xhr.status !== 404) {
-				getResponseData = $tw.utils.parseJSONSafe(getResponseDataJson);
+				getResponseData = JSON.parse(getResponseDataJson);
 				$tw.utils.each(getResponseData,function(details) {
 					if(details.name === filename) {
 						sha = details.sha;
@@ -84,7 +84,7 @@ GitHubSaver.prototype.save = function(text,method,callback) {
 					if(err) {
 						return callback(err);
 					}
-					var putResponseData = $tw.utils.parseJSONSafe(putResponseDataJson);
+					var putResponseData = JSON.parse(putResponseDataJson);
 					callback(null);
 				}
 			});

core/modules/savers/gitlab.js

@@ -58,7 +58,7 @@ GitLabSaver.prototype.save = function(text,method,callback) {
 			}
 			var requestType = "POST";
 			if(xhr.status !== 404) {
-				getResponseData = $tw.utils.parseJSONSafe(getResponseDataJson);
+				getResponseData = JSON.parse(getResponseDataJson);
 				$tw.utils.each(getResponseData,function(details) {
 					if(details.name === filename) {
 						requestType = "PUT";
@@ -82,7 +82,7 @@ GitLabSaver.prototype.save = function(text,method,callback) {
 					if(err) {
 						return callback(err);
 					}
-					var putResponseData = $tw.utils.parseJSONSafe(putResponseDataJson);
+					var putResponseData = JSON.parse(putResponseDataJson);
 					callback(null);
 				}
 			});

core/modules/server/routes/put-tiddler.js

@@ -18,7 +18,7 @@ exports.path = /^\/recipes\/default\/tiddlers\/(.+)$/;
 
 exports.handler = function(request,response,state) {
 	var title = $tw.utils.decodeURIComponentSafe(state.params[0]),
-	fields = $tw.utils.parseJSONSafe(state.data);
+	fields = JSON.parse(state.data);
 	// Pull up any subfields in the `fields` object
 	if(fields.fields) {
 		$tw.utils.each(fields.fields,function(field,name) {

core/modules/server/server.js

@@ -34,6 +34,7 @@ function Server(options) {
 	this.authenticators = options.authenticators || [];
 	this.wiki = options.wiki;
 	this.boot = options.boot || $tw.boot;
+	this.servername = $tw.utils.transliterateToSafeASCII(this.wiki.getTiddlerText("$:/SiteTitle") || "TiddlyWiki5");
 	// Initialise the variables
 	this.variables = $tw.utils.extend({},this.defaultVariables);
 	if(options.variables) {
@@ -43,8 +44,7 @@ function Server(options) {
 			}
 		}
 	}
-	// Setup the default required plugins
-	this.requiredPlugins = this.get("required-plugins").split(',');
+	$tw.utils.extend({},this.defaultVariables,options.variables);
 	// Initialise CSRF
 	this.csrfDisable = this.get("csrf-disable") === "yes";
 	// Initialize Gzip compression
@@ -52,24 +52,14 @@ function Server(options) {
 	// Initialize browser-caching
 	this.enableBrowserCache = this.get("use-browser-cache") === "yes";
 	// Initialise authorization
-	var authorizedUserName;
-	if(this.get("username") && this.get("password")) {
-		authorizedUserName = this.get("username");
-	} else if(this.get("credentials")) {
-		authorizedUserName = "(authenticated)";
-	} else {
-		authorizedUserName = "(anon)";
-	}
+	var authorizedUserName = (this.get("username") && this.get("password")) ? this.get("username") : "(anon)";
 	this.authorizationPrincipals = {
 		readers: (this.get("readers") || authorizedUserName).split(",").map($tw.utils.trim),
 		writers: (this.get("writers") || authorizedUserName).split(",").map($tw.utils.trim)
 	}
-	if(this.get("admin") || authorizedUserName !== "(anon)") {
-		this.authorizationPrincipals["admin"] = (this.get("admin") || authorizedUserName).split(',').map($tw.utils.trim)
-	}
 	// Load and initialise authenticators
 	$tw.modules.forEachModuleOfType("authenticator", function(title,authenticatorDefinition) {
-		// console.log("Loading authenticator " + title);
+		// console.log("Loading server route " + title);
 		self.addAuthenticator(authenticatorDefinition.AuthenticatorClass);
 	});
 	// Load route handlers
@@ -81,21 +71,15 @@ function Server(options) {
 	this.listenOptions = null;
 	this.protocol = "http";
 	var tlsKeyFilepath = this.get("tls-key"),
-		tlsCertFilepath = this.get("tls-cert"),
-		tlsPassphrase = this.get("tls-passphrase");
+		tlsCertFilepath = this.get("tls-cert");
 	if(tlsCertFilepath && tlsKeyFilepath) {
 		this.listenOptions = {
 			key: fs.readFileSync(path.resolve(this.boot.wikiPath,tlsKeyFilepath),"utf8"),
-			cert: fs.readFileSync(path.resolve(this.boot.wikiPath,tlsCertFilepath),"utf8"),
-			passphrase: tlsPassphrase || ''
+			cert: fs.readFileSync(path.resolve(this.boot.wikiPath,tlsCertFilepath),"utf8")
 		};
 		this.protocol = "https";
 	}
 	this.transport = require(this.protocol);
-	// Name the server and init the boot state
-	this.servername = $tw.utils.transliterateToSafeASCII(this.get("server-name") || this.wiki.getTiddlerText("$:/SiteTitle") || "TiddlyWiki5");
-	this.boot.origin = this.get("origin")? this.get("origin"): this.protocol+"://"+this.get("host")+":"+this.get("port");
-	this.boot.pathPrefix = this.get("path-prefix") || "";
 }
 
 /*
@@ -166,7 +150,6 @@ function sendResponse(request,response,statusCode,headers,data,encoding) {
 Server.prototype.defaultVariables = {
 	port: "8080",
 	host: "127.0.0.1",
-	"required-plugins": "$:/plugins/tiddlywiki/filesystem,$:/plugins/tiddlywiki/tiddlyweb",
 	"root-tiddler": "$:/core/save/all",
 	"root-render-type": "text/plain",
 	"root-serve-type": "text/html",
@@ -256,15 +239,15 @@ Server.prototype.requestHandler = function(request,response,options) {
 	state.pathPrefix = options.pathPrefix || this.get("path-prefix") || "";
 	state.sendResponse = sendResponse.bind(self,request,response);
 	// Get the principals authorized to access this resource
-	state.authorizationType = options.authorizationType || this.methodMappings[request.method] || "readers";
+	var authorizationType = this.methodMappings[request.method] || "readers";
 	// Check for the CSRF header if this is a write
-	if(!this.csrfDisable && state.authorizationType === "writers" && request.headers["x-requested-with"] !== "TiddlyWiki") {
+	if(!this.csrfDisable && authorizationType === "writers" && request.headers["x-requested-with"] !== "TiddlyWiki") {
 		response.writeHead(403,"'X-Requested-With' header required to login to '" + this.servername + "'");
 		response.end();
 		return;
 	}
 	// Check whether anonymous access is granted
-	state.allowAnon = this.isAuthorized(state.authorizationType,null);
+	state.allowAnon = this.isAuthorized(authorizationType,null);
 	// Authenticate with the first active authenticator
 	if(this.authenticators.length > 0) {
 		if(!this.authenticators[0].authenticateRequest(request,response,state)) {
@@ -273,7 +256,7 @@ Server.prototype.requestHandler = function(request,response,options) {
 		}
 	}
 	// Authorize with the authenticated username
-	if(!this.isAuthorized(state.authorizationType,state.authenticatedUsername)) {
+	if(!this.isAuthorized(authorizationType,state.authenticatedUsername)) {
 		response.writeHead(401,"'" + state.authenticatedUsername + "' is not authorized to access '" + this.servername + "'");
 		response.end();
 		return;
@@ -339,16 +322,8 @@ Server.prototype.listen = function(port,host,prefix) {
 		port = process.env[port] || 8080;
 	}
 	// Warn if required plugins are missing
-	var missing = [];
-	for (var index=0; index<this.requiredPlugins.length; index++) {
-		if (!this.wiki.getTiddler(this.requiredPlugins[index])) {
-			missing.push(this.requiredPlugins[index]);
-		}
-	}
-	if(missing.length > 0) {
-		var error = "Warning: Plugin(s) required for client-server operation are missing.\n"+
-			"\""+ missing.join("\", \"")+"\"";
-		$tw.utils.warning(error);
+	if(!this.wiki.getTiddler("$:/plugins/tiddlywiki/tiddlyweb") || !this.wiki.getTiddler("$:/plugins/tiddlywiki/filesystem")) {
+		$tw.utils.warning("Warning: Plugins required for client-server operation (\"tiddlywiki/filesystem\" and \"tiddlywiki/tiddlyweb\") are missing from tiddlywiki.info file");
 	}
 	// Create the server
 	var server;

core/modules/startup/browser-messaging.js

@@ -152,7 +152,7 @@ exports.startup = function() {
 				if(event.data.status.charAt(0) === "2") {
 					if(event.data.cookies) {
 						if(event.data.cookies.type === "save-info") {
-							var tiddlers = $tw.utils.parseJSONSafe(event.data.body);
+							var tiddlers = JSON.parse(event.data.body);
 							$tw.utils.each(tiddlers,function(tiddler) {
 								$tw.wiki.addTiddler(new $tw.Tiddler($tw.wiki.getCreationFields(),tiddler,{
 									title: event.data.cookies.infoTitlePrefix + event.data.cookies.url + "/" + tiddler.title,
@@ -170,7 +170,7 @@ exports.startup = function() {
 								},$tw.wiki.getModificationFields()));
 							});
 						} else if(event.data.cookies.type === "save-tiddler") {
-							var tiddler = $tw.utils.parseJSONSafe(event.data.body);
+							var tiddler = JSON.parse(event.data.body);
 							$tw.wiki.addTiddler(new $tw.Tiddler(tiddler));
 						}
 					}

core/modules/startup/rootwidget.js

@@ -51,20 +51,6 @@ exports.startup = function() {
 			element.focus(event.paramObject);
 		}
 	});
-	// Install the tm-rename-tiddler and tm-relink-tiddler messages
-	var makeRenameHandler = function(method) {
-		return function(event) {
-			var options = {},
-				paramObject = event.paramObject || {},
-				from = paramObject.from || event.tiddlerTitle,
-				to = paramObject.to;
-			options.dontRenameInTags = (paramObject.renameInTags === "false" || paramObject.renameInTags === "no") ? true : false;
-			options.dontRenameInLists = (paramObject.renameInLists === "false" || paramObject.renameInLists === "no") ? true : false;
-			$tw.wiki[method](from,to,options);
-		};
-	};
-	$tw.rootWidget.addEventListener("tm-rename-tiddler",makeRenameHandler("renameTiddler"));
-	$tw.rootWidget.addEventListener("tm-relink-tiddler",makeRenameHandler("relinkTiddler"));
 	// Install the scroller
 	$tw.pageScroller = new $tw.utils.PageScroller();
 	$tw.rootWidget.addEventListener("tm-scroll",function(event) {

core/modules/startup/windows.js

@@ -20,8 +20,6 @@ exports.synchronous = true;
 
 // Global to keep track of open windows (hashmap by title)
 $tw.windows = {};
-// Default template to use for new windows
-var DEFAULT_WINDOW_TEMPLATE = "$:/core/templates/single.tiddler.window";
 
 exports.startup = function() {
 	// Handle open window message
@@ -31,25 +29,22 @@ exports.startup = function() {
 			title = event.param || event.tiddlerTitle,
 			paramObject = event.paramObject || {},
 			windowTitle = paramObject.windowTitle || title,
-			windowID = paramObject.windowID || title,
-			template = paramObject.template || DEFAULT_WINDOW_TEMPLATE,
+			template = paramObject.template || "$:/core/templates/single.tiddler.window",
 			width = paramObject.width || "700",
 			height = paramObject.height || "600",
-			top = paramObject.top,
-			left = paramObject.left,
-			variables = $tw.utils.extend({},paramObject,{currentTiddler: title, "tv-window-id": windowID});
+			variables = $tw.utils.extend({},paramObject,{currentTiddler: title});
 		// Open the window
 		var srcWindow,
 		    srcDocument;
 		// In case that popup blockers deny opening a new window
 		try {
-			srcWindow = window.open("","external-" + windowID,"scrollbars,width=" + width + ",height=" + height + (top ? ",top=" + top : "" ) + (left ? ",left=" + left : "" )),
+			srcWindow = window.open("","external-" + title,"scrollbars,width=" + width + ",height=" + height),
 			srcDocument = srcWindow.document;
 		}
 		catch(e) {
 			return;
 		}
-		$tw.windows[windowID] = srcWindow;
+		$tw.windows[title] = srcWindow;
 		// Check for reopening the same window
 		if(srcWindow.haveInitialisedWindow) {
 			return;
@@ -59,7 +54,7 @@ exports.startup = function() {
 		srcDocument.close();
 		srcDocument.title = windowTitle;
 		srcWindow.addEventListener("beforeunload",function(event) {
-			delete $tw.windows[windowID];
+			delete $tw.windows[title];
 			$tw.wiki.removeEventListener("change",refreshHandler);
 		},false);
 		// Set up the styles
@@ -93,21 +88,13 @@ exports.startup = function() {
 		srcWindow.document.documentElement.addEventListener("click",$tw.popup,true);
 		srcWindow.haveInitialisedWindow = true;
 	});
-	$tw.rootWidget.addEventListener("tm-close-window",function(event) {
-		var windowID = event.param,
-			win = $tw.windows[windowID];
-			if(win) {
-				win.close();
-			}
-	});
-	var closeAllWindows = function() {
+	// Close open windows when unloading main window
+	$tw.addUnloadTask(function() {
 		$tw.utils.each($tw.windows,function(win) {
 			win.close();
 		});
-	}
-	$tw.rootWidget.addEventListener("tm-close-all-windows",closeAllWindows);
-	// Close open windows when unloading main window
-	$tw.addUnloadTask(closeAllWindows);
+	});
+
 };
 
 })();

core/modules/tiddler.js

@@ -24,13 +24,13 @@ exports.isDraft = function() {
 	return this.hasField("draft.of");
 };
 
-exports.getFieldString = function(field,defaultValue) {
+exports.getFieldString = function(field) {
 	var value = this.fields[field];
 	// Check for a missing field
 	if(value === undefined || value === null) {
-		return defaultValue || "";
+		return "";
 	}
-	// Stringify the field with the associated tiddler field module (if any)
+	// Parse the field with the associated module (if any)
 	var fieldModule = $tw.Tiddler.fieldModules[field];
 	if(fieldModule && fieldModule.stringify) {
 		return fieldModule.stringify.call(this,value);

core/modules/upgraders/plugins.js

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

core/modules/utils/crypto.js

@@ -21,7 +21,7 @@ exports.extractEncryptedStoreArea = function(text) {
 	if(encryptedStoreAreaStart !== -1) {
 		var encryptedStoreAreaEnd = text.indexOf("</pre>",encryptedStoreAreaStart);
 		if(encryptedStoreAreaEnd !== -1) {
-			return $tw.utils.htmlDecode(text.substring(encryptedStoreAreaStart + encryptedStoreAreaStartMarker.length,encryptedStoreAreaEnd));
+			return $tw.utils.htmlDecode(text.substring(encryptedStoreAreaStart + encryptedStoreAreaStartMarker.length,encryptedStoreAreaEnd-1));
 		}
 	}
 	return null;
@@ -33,7 +33,7 @@ Attempt to extract the tiddlers from an encrypted store area using the current p
 exports.decryptStoreArea = function(encryptedStoreArea,password) {
 	var decryptedText = $tw.crypto.decrypt(encryptedStoreArea,password);
 	if(decryptedText) {
-		var json = $tw.utils.parseJSONSafe(decryptedText),
+		var json = JSON.parse(decryptedText),
 			tiddlers = [];
 		for(var title in json) {
 			if(title !== "$:/isEncrypted") {

core/modules/utils/dom/dragndrop.js

@@ -16,23 +16,21 @@ Browser data transfer utilities, used with the clipboard and drag and drop
 Options:
 
 domNode: dom node to make draggable
-selector: CSS selector to identify element within domNode to be used as drag handle (optional)
 dragImageType: "pill", "blank" or "dom" (the default)
 dragTiddlerFn: optional function to retrieve the title of tiddler to drag
 dragFilterFn: optional function to retreive the filter defining a list of tiddlers to drag
-widget: widget to use as the context for the filter
+widget: widget to use as the contect for the filter
 */
 exports.makeDraggable = function(options) {
 	var dragImageType = options.dragImageType || "dom",
 		dragImage,
-		domNode = options.domNode,
-		dragHandle = options.selector && domNode.querySelector(options.selector) || domNode;
+		domNode = options.domNode;
 	// Make the dom node draggable (not necessary for anchor tags)
 	if((domNode.tagName || "").toLowerCase() !== "a") {
-		dragHandle.setAttribute("draggable","true");
+		domNode.setAttribute("draggable","true");
 	}
 	// Add event handlers
-	$tw.utils.addEventListeners(dragHandle,[
+	$tw.utils.addEventListeners(domNode,[
 		{name: "dragstart", handlerFunction: function(event) {
 			if(event.dataTransfer === undefined) {
 				return false;
@@ -47,7 +45,7 @@ exports.makeDraggable = function(options) {
 			}
 			var titleString = $tw.utils.stringifyList(titles);
 			// Check that we've something to drag
-			if(titles.length > 0 && event.target === dragHandle) {
+			if(titles.length > 0 && event.target === domNode) {
 				// Mark the drag in progress
 				$tw.dragInProgress = domNode;
 				// Set the dragging class on the element being dragged
@@ -200,7 +198,7 @@ var importDataTypes = [
 ];
 
 function parseJSONTiddlers(json,fallbackTitle) {
-	var data = $tw.utils.parseJSONSafe(json);
+	var data = JSON.parse(json);
 	if(!$tw.utils.isArray(data)) {
 		data = [data];
 	}
@@ -210,10 +208,10 @@ function parseJSONTiddlers(json,fallbackTitle) {
 	return data;
 };
 
-function dragEventContainsType(event,targetType) {
+exports.dragEventContainsFiles = function(event) {
 	if(event.dataTransfer.types) {
 		for(var i=0; i<event.dataTransfer.types.length; i++) {
-			if(event.dataTransfer.types[i] === targetType) {
+			if(event.dataTransfer.types[i] === "Files") {
 				return true;
 				break;
 			}
@@ -222,10 +220,4 @@ function dragEventContainsType(event,targetType) {
 	return false;
 };
 
-exports.dragEventContainsFiles = function(event) {
-	return (dragEventContainsType(event,"Files") && !dragEventContainsType(event,"text/plain"));
-};
-
-exports.dragEventContainsType = dragEventContainsType;
-
 })();

core/modules/utils/dom/scroller.js

@@ -49,14 +49,10 @@ Handle an event
 */
 PageScroller.prototype.handleEvent = function(event) {
 	if(event.type === "tm-scroll") {
-		var options = {};
-		if($tw.utils.hop(event.paramObject,"animationDuration")) {
-			options.animationDuration = event.paramObject.animationDuration;
-		}
 		if(event.paramObject && event.paramObject.selector) {
-			this.scrollSelectorIntoView(null,event.paramObject.selector,null,options);
+			this.scrollSelectorIntoView(null,event.paramObject.selector);
 		} else {
-			this.scrollIntoView(event.target,null,options);
+			this.scrollIntoView(event.target);
 		}
 		return false; // Event was handled
 	}
@@ -66,10 +62,10 @@ PageScroller.prototype.handleEvent = function(event) {
 /*
 Handle a scroll event hitting the page document
 */
-PageScroller.prototype.scrollIntoView = function(element,callback,options) {
+PageScroller.prototype.scrollIntoView = function(element,callback) {
 	var self = this,
-		duration = $tw.utils.hop(options,"animationDuration") ? parseInt(options.animationDuration) : $tw.utils.getAnimationDuration(),
-		srcWindow = element ? element.ownerDocument.defaultView : window;
+		duration = $tw.utils.getAnimationDuration(),
+	    srcWindow = element ? element.ownerDocument.defaultView : window;
 	// Now get ready to scroll the body
 	this.cancelScroll(srcWindow);
 	this.startTime = Date.now();
@@ -126,11 +122,11 @@ PageScroller.prototype.scrollIntoView = function(element,callback,options) {
 	drawFrame();
 };
 
-PageScroller.prototype.scrollSelectorIntoView = function(baseElement,selector,callback,options) {
+PageScroller.prototype.scrollSelectorIntoView = function(baseElement,selector,callback) {
 	baseElement = baseElement || document.body;
 	var element = baseElement.querySelector(selector);
 	if(element) {
-		this.scrollIntoView(element,callback,options);
+		this.scrollIntoView(element,callback);
 	}
 };
 

core/modules/utils/edition-info.js

@@ -30,7 +30,11 @@ exports.getEditionInfo = function() {
 				var entry = entries[entryIndex];
 				// Check if directories have a valid tiddlywiki.info
 				if(!editionInfo[entry] && $tw.utils.isDirectory(path.resolve(editionPath,entry))) {
-					var info = $tw.utils.parseJSONSafe(fs.readFileSync(path.resolve(editionPath,entry,"tiddlywiki.info"),"utf8"),null);
+					var info;
+					try {
+						info = JSON.parse(fs.readFileSync(path.resolve(editionPath,entry,"tiddlywiki.info"),"utf8"));
+					} catch(ex) {
+					}
 					if(info) {
 						editionInfo[entry] = info;
 					}

core/modules/utils/pluginmaker.js

@@ -24,8 +24,10 @@ exports.repackPlugin = function(title,additionalTiddlers,excludeTiddlers) {
 		throw "No such tiddler as " + title;
 	}
 	// Extract the JSON
-	var jsonPluginTiddler = $tw.utils.parseJSONSafe(pluginTiddler.fields.text,null);
-	if(!jsonPluginTiddler) {
+	var jsonPluginTiddler;
+	try {
+		jsonPluginTiddler = JSON.parse(pluginTiddler.fields.text);
+	} catch(e) {
 		throw "Cannot parse plugin tiddler " + title + "\n" + $tw.language.getString("Error/Caption") + ": " + e;
 	}
 	// Get the list of tiddlers

core/modules/widgets/draggable.js

@@ -27,10 +27,7 @@ DraggableWidget.prototype = new Widget();
 Render this widget into the DOM
 */
 DraggableWidget.prototype.render = function(parent,nextSibling) {
-	var self = this,
-		tag,
-		domNode,
-		classes = [];
+	var self = this;
 	// Save the parent dom node
 	this.parentDomNode = parent;
 	// Compute our attributes
@@ -38,23 +35,18 @@ DraggableWidget.prototype.render = function(parent,nextSibling) {
 	// Execute our logic
 	this.execute();
 	// Sanitise the specified tag
-	tag = this.draggableTag;
+	var tag = this.draggableTag;
 	if($tw.config.htmlUnsafeElements.indexOf(tag) !== -1) {
 		tag = "div";
 	}
 	// Create our element
-	domNode = this.document.createElement(tag);
+	var domNode = this.document.createElement(tag);
 	// Assign classes
+	var classes = ["tc-draggable"];
 	if(this.draggableClasses) {
 		classes.push(this.draggableClasses);
 	}
-	if(!this.dragHandleSelector) {
-		classes.push("tc-draggable");
-	}
 	domNode.setAttribute("class",classes.join(" "));
-	// Insert the node into the DOM and render any children
-	parent.insertBefore(domNode,nextSibling);
-	this.renderChildren(domNode,null);
 	// Add event handlers
 	$tw.utils.makeDraggable({
 		domNode: domNode,
@@ -63,9 +55,11 @@ DraggableWidget.prototype.render = function(parent,nextSibling) {
 		startActions: self.startActions,
 		endActions: self.endActions,
 		dragImageType: self.dragImageType,
-		widget: this,
-		selector: self.dragHandleSelector
+		widget: this
 	});
+	// Insert the link into the DOM and render any children
+	parent.insertBefore(domNode,nextSibling);
+	this.renderChildren(domNode,null);
 	this.domNodes.push(domNode);
 };
 
@@ -78,8 +72,7 @@ DraggableWidget.prototype.execute = function() {
 	this.draggableClasses = this.getAttribute("class");
 	this.startActions = this.getAttribute("startactions");
 	this.endActions = this.getAttribute("endactions");
-	this.dragImageType = this.getAttribute("dragimagetype");
-	this.dragHandleSelector = this.getAttribute("selector");
+	this.dragImageType = this.getAttribute("dragimagetype"); 
 	// Make the child widgets
 	this.makeChildWidgets();
 };

core/modules/widgets/dropzone.js

@@ -198,8 +198,7 @@ DropZoneWidget.prototype.handleDropEvent  = function(event) {
 	this.resetState();
 	// Import any files in the drop
 	var numFiles = 0;
-	// If we have type text/vnd.tiddlywiki then skip trying to import files
-	if(dataTransfer.files && !$tw.utils.dragEventContainsType(event,"text/vnd.tiddler")) {
+	if(dataTransfer.files) {
 		numFiles = this.wiki.readFiles(dataTransfer.files,{
 			callback: readFileCallback,
 			deserializer: this.dropzoneDeserializer

core/modules/widgets/eventcatcher.js

@@ -46,7 +46,6 @@ EventWidget.prototype.render = function(parent,nextSibling) {
 	$tw.utils.each(this.types,function(type) {
 		domNode.addEventListener(type,function(event) {
 			var selector = self.getAttribute("selector"),
-				matchSelector = self.getAttribute("matchSelector"),
 				actions = self.getAttribute("$"+type) || self.getAttribute("actions-"+type),
 				stopPropagation = self.getAttribute("stopPropagation","onaction"),
 				selectedNode = event.target,
@@ -57,48 +56,45 @@ EventWidget.prototype.render = function(parent,nextSibling) {
 			if(selectedNode.nodeType === 3) {
 				selectedNode = selectedNode.parentNode;
 			}
-			// Check that the selected node matches any matchSelector
-			if(matchSelector && !$tw.utils.domMatchesSelector(selectedNode,matchSelector)) {
-				return false;
-			}
 			if(selector) {
 				// Search ancestors for a node that matches the selector
 				while(!$tw.utils.domMatchesSelector(selectedNode,selector) && selectedNode !== domNode) {
 					selectedNode = selectedNode.parentNode;
 				}
-				// Exit if we didn't find one
-				if(selectedNode === domNode) {
-					return false;
-				}
-				// Only set up variables if we have actions to invoke
-				if(actions) {
-					$tw.utils.each(selectedNode.attributes,function(attribute) {
-						variables["dom-" + attribute.name] = attribute.value.toString();
-					});
-					//Add a variable with a popup coordinate string for the selected node
-					variables["tv-popup-coords"] = "(" + selectedNode.offsetLeft + "," + selectedNode.offsetTop +"," + selectedNode.offsetWidth + "," + selectedNode.offsetHeight + ")";
+				// If we found one, copy the attributes as variables, otherwise exit
+				if($tw.utils.domMatchesSelector(selectedNode,selector)) {
+					// Only set up variables if we have actions to invoke
+					if(actions) {
+						$tw.utils.each(selectedNode.attributes,function(attribute) {
+							variables["dom-" + attribute.name] = attribute.value.toString();
+						});
+						//Add a variable with a popup coordinate string for the selected node
+						variables["tv-popup-coords"] = "(" + selectedNode.offsetLeft + "," + selectedNode.offsetTop +"," + selectedNode.offsetWidth + "," + selectedNode.offsetHeight + ")";
 
-					//Add variables for offset of selected node
-					variables["tv-selectednode-posx"] = selectedNode.offsetLeft.toString();
-					variables["tv-selectednode-posy"] = selectedNode.offsetTop.toString();
-					variables["tv-selectednode-width"] = selectedNode.offsetWidth.toString();
-					variables["tv-selectednode-height"] = selectedNode.offsetHeight.toString();
-					
-					if(event.clientX && event.clientY) {
-						//Add variables for event X and Y position relative to selected node
-						selectedNodeRect = selectedNode.getBoundingClientRect();
-						variables["event-fromselected-posx"] = (event.clientX - selectedNodeRect.left).toString();
-						variables["event-fromselected-posy"] = (event.clientY - selectedNodeRect.top).toString();
+						//Add variables for offset of selected node
+						variables["tv-selectednode-posx"] = selectedNode.offsetLeft.toString();
+						variables["tv-selectednode-posy"] = selectedNode.offsetTop.toString();
+						variables["tv-selectednode-width"] = selectedNode.offsetWidth.toString();
+						variables["tv-selectednode-height"] = selectedNode.offsetHeight.toString();
+						
+						if(event.clientX && event.clientY) {
+							//Add variables for event X and Y position relative to selected node
+							selectedNodeRect = selectedNode.getBoundingClientRect();
+							variables["event-fromselected-posx"] = (event.clientX - selectedNodeRect.left).toString();
+							variables["event-fromselected-posy"] = (event.clientY - selectedNodeRect.top).toString();
 
-						//Add variables for event X and Y position relative to event catcher node
-						catcherNodeRect = self.domNode.getBoundingClientRect();
-						variables["event-fromcatcher-posx"] = (event.clientX - catcherNodeRect.left).toString();
-						variables["event-fromcatcher-posy"] = (event.clientY - catcherNodeRect.top).toString();
+							//Add variables for event X and Y position relative to event catcher node
+							catcherNodeRect = self.domNode.getBoundingClientRect();
+							variables["event-fromcatcher-posx"] = (event.clientX - catcherNodeRect.left).toString();
+							variables["event-fromcatcher-posy"] = (event.clientY - catcherNodeRect.top).toString();
 
-						//Add variables for event X and Y position relative to the viewport
-						variables["event-fromviewport-posx"] = event.clientX.toString();
-						variables["event-fromviewport-posy"] = event.clientY.toString();
+							//Add variables for event X and Y position relative to the viewport
+							variables["event-fromviewport-posx"] = event.clientX.toString();
+							variables["event-fromviewport-posy"] = event.clientY.toString();
+						}
 					}
+				} else {
+					return false;
 				}
 			}
 			// Execute our actions with the variables

core/modules/widgets/image.js

@@ -111,16 +111,6 @@ ImageWidget.prototype.render = function(parent,nextSibling) {
 	if(this.imageAlt) {
 		domNode.setAttribute("alt",this.imageAlt);
 	}
-	// Add classes when the image loads or fails
-	$tw.utils.addClass(domNode,"tc-image-loading");
-	domNode.addEventListener("load",function() {
-		$tw.utils.removeClass(domNode,"tc-image-loading");
-		$tw.utils.addClass(domNode,"tc-image-loaded");
-	},false);
-	domNode.addEventListener("error",function() {
-		$tw.utils.removeClass(domNode,"tc-image-loading");
-		$tw.utils.addClass(domNode,"tc-image-error");
-	},false);
 	// Insert element
 	parent.insertBefore(domNode,nextSibling);
 	this.domNodes.push(domNode);

core/modules/widgets/importvariables.js

@@ -46,7 +46,7 @@ ImportVariablesWidget.prototype.execute = function(tiddlerList) {
 	this.tiddlerList = tiddlerList || this.wiki.filterTiddlers(this.filter,this);
 	// Accumulate the <$set> widgets from each tiddler
 	$tw.utils.each(this.tiddlerList,function(title) {
-		var parser = widgetPointer.wiki.parseTiddler(title,{parseAsInline:true});
+		var parser = widgetPointer.wiki.parseTiddler(title);
 		if(parser) {
 			var parseTreeNode = parser.tree[0];
 			while(parseTreeNode && parseTreeNode.type === "set") {

core/modules/widgets/list.js

@@ -51,9 +51,6 @@ ListWidget.prototype.render = function(parent,nextSibling) {
 	} else {
 		this.storyview = null;
 	}
-	if(this.storyview && this.storyview.renderEnd) {
-		this.storyview.renderEnd();
-	}
 };
 
 /*

core/modules/widgets/navigator.js

@@ -44,7 +44,8 @@ NavigatorWidget.prototype.render = function(parent,nextSibling) {
 		{type: "tm-fold-tiddler", handler: "handleFoldTiddlerEvent"},
 		{type: "tm-fold-other-tiddlers", handler: "handleFoldOtherTiddlersEvent"},
 		{type: "tm-fold-all-tiddlers", handler: "handleFoldAllTiddlersEvent"},
-		{type: "tm-unfold-all-tiddlers", handler: "handleUnfoldAllTiddlersEvent"}
+		{type: "tm-unfold-all-tiddlers", handler: "handleUnfoldAllTiddlersEvent"},
+		{type: "tm-rename-tiddler", handler: "handleRenameTiddlerEvent"}
 	]);
 	this.parentDomNode = parent;
 	this.computeAttributes();
@@ -498,7 +499,11 @@ NavigatorWidget.prototype.handleNewTiddlerEvent = function(event) {
 // Import JSON tiddlers into a pending import tiddler
 NavigatorWidget.prototype.handleImportTiddlersEvent = function(event) {
 	// Get the tiddlers
-	var tiddlers = $tw.utils.parseJSONSafe(event.param,[]);
+	var tiddlers = [];
+	try {
+		tiddlers = JSON.parse(event.param);
+	} catch(e) {
+	}
 	// Get the current $:/Import tiddler
 	var importTitle = event.importTitle ? event.importTitle : IMPORT_TITLE,
 		importTiddler = this.wiki.getTiddler(importTitle),
@@ -631,6 +636,16 @@ NavigatorWidget.prototype.handleUnfoldAllTiddlersEvent = function(event) {
 	});
 };
 
+NavigatorWidget.prototype.handleRenameTiddlerEvent = function(event) {
+	var options = {},
+		paramObject = event.paramObject || {},
+		from = paramObject.from || event.tiddlerTitle,
+		to = paramObject.to;
+	options.dontRenameInTags = (paramObject.renameInTags === "false" || paramObject.renameInTags === "no") ? true : false;
+	options.dontRenameInLists = (paramObject.renameInLists === "false" || paramObject.renameInLists === "no") ? true : false;
+	this.wiki.renameTiddler(from,to,options);
+};
+
 exports.navigator = NavigatorWidget;
 
 })();

core/modules/widgets/radio.js

@@ -64,9 +64,9 @@ RadioWidget.prototype.getValue = function() {
 		tiddler = this.wiki.getTiddler(this.radioTitle);
 	if(tiddler) {
 		if(this.radioIndex) {
-			value = this.wiki.extractTiddlerDataItem(this.radioTitle,this.radioIndex,this.radioDefault);
+			value = this.wiki.extractTiddlerDataItem(this.radioTitle,this.radioIndex);
 		} else {
-			value = tiddler.getFieldString(this.radioField,this.radioDefault);
+			value = tiddler.getFieldString(this.radioField);
 		}
 	} else {
 		value = this.radioDefault;

core/modules/widgets/scrollable.js

@@ -38,14 +38,10 @@ ScrollableWidget.prototype.handleScrollEvent = function(event) {
 	if(this.outerDomNode.scrollWidth <= this.outerDomNode.offsetWidth && this.outerDomNode.scrollHeight <= this.outerDomNode.offsetHeight && this.fallthrough === "yes") {
 		return true;
 	}
-	var options = {};
-	if($tw.utils.hop(event.paramObject,"animationDuration")) {
-		options.animationDuration = event.paramObject.animationDuration;
-	}
 	if(event.paramObject && event.paramObject.selector) {
-		this.scrollSelectorIntoView(null,event.paramObject.selector,null,options);
+		this.scrollSelectorIntoView(null,event.paramObject.selector);
 	} else {
-		this.scrollIntoView(event.target,null,options);
+		this.scrollIntoView(event.target);
 	}
 	return false; // Handled event
 };
@@ -53,9 +49,9 @@ ScrollableWidget.prototype.handleScrollEvent = function(event) {
 /*
 Scroll an element into view
 */
-ScrollableWidget.prototype.scrollIntoView = function(element,callback,options) {
-	var duration = $tw.utils.hop(options,"animationDuration") ? parseInt(options.animationDuration) : $tw.utils.getAnimationDuration(),
-		srcWindow = element ? element.ownerDocument.defaultView : window;
+ScrollableWidget.prototype.scrollIntoView = function(element) {
+	var duration = $tw.utils.getAnimationDuration(),
+	srcWindow = element ? element.ownerDocument.defaultView : window;
 	this.cancelScroll();
 	this.startTime = Date.now();
 	var scrollPosition = {
@@ -118,11 +114,11 @@ ScrollableWidget.prototype.scrollIntoView = function(element,callback,options) {
 	}
 };
 
-ScrollableWidget.prototype.scrollSelectorIntoView = function(baseElement,selector,callback,options) {
+ScrollableWidget.prototype.scrollSelectorIntoView = function(baseElement,selector,callback) {
 	baseElement = baseElement || document.body;
 	var element = baseElement.querySelector(selector);
 	if(element) {
-		this.scrollIntoView(element,callback,options);
+		this.scrollIntoView(element,callback);
 	}
 };
 
@@ -159,6 +155,8 @@ ScrollableWidget.prototype.render = function(parent,nextSibling) {
 	// Create elements
 	this.outerDomNode = this.document.createElement("div");
 	$tw.utils.setStyle(this.outerDomNode,[
+		{overflowY: "auto"},
+		{overflowX: "auto"},
 		{webkitOverflowScrolling: "touch"}
 	]);
 	this.innerDomNode = this.document.createElement("div");

core/modules/widgets/widget.js

@@ -122,7 +122,7 @@ Widget.prototype.getVariableInfo = function(name,options) {
 		});
 		// Only substitute variable references if this variable was defined with the \define pragma
 		if(variable.isMacroDefinition) {
-			value = this.substituteVariableReferences(value,options);
+			value = this.substituteVariableReferences(value);
 		}
 		return {
 			text: value,
@@ -175,10 +175,10 @@ Widget.prototype.resolveVariableParameters = function(formalParams,actualParams)
 	return results;
 };
 
-Widget.prototype.substituteVariableReferences = function(text,options) {
+Widget.prototype.substituteVariableReferences = function(text) {
 	var self = this;
 	return (text || "").replace(/\$\(([^\)\$]+)\)\$/g,function(match,p1,offset,string) {
-		return options.variables && options.variables[p1] || (self.getVariable(p1,{defaultValue: ""}));
+		return self.getVariable(p1,{defaultValue: ""});
 	});
 };
 
@@ -314,40 +314,24 @@ excludeEventAttributes: ignores attributes whose name begins with "on"
 Widget.prototype.assignAttributes = function(domNode,options) {
 	options = options || {};
 	var self = this;
-	var assignAttribute = function(name,value) {
-		// Check for excluded attribute names
-		if(options.excludeEventAttributes && name.substr(0,2) === "on") {
-			value = undefined;
+	$tw.utils.each(this.attributes,function(v,a) {
+		// Check exclusions
+		if(options.excludeEventAttributes && a.substr(0,2) === "on") {
+			v = undefined;
 		}
-		if(value !== undefined) {
-			// Handle the xlink: namespace
-			var namespace = null;
-			if(name.substr(0,6) === "xlink:" && name.length > 6) {
-				namespace = "http://www.w3.org/1999/xlink";
-				name = name.substr(6);
-			}
-			// Handle styles
-			if(name.substr(0,6) === "style." && name.length > 6) {
-				domNode.style[$tw.utils.unHyphenateCss(name.substr(6))] = value;
-			} else {
-				// Setting certain attributes can cause a DOM error (eg xmlns on the svg element)
-				try {
-					domNode.setAttributeNS(namespace,name,value);
-				} catch(e) {
+		if(v !== undefined) {
+			var b = a.split(":");
+			// Setting certain attributes can cause a DOM error (eg xmlns on the svg element)
+			try {
+				if (b.length == 2 && b[0] == "xlink"){
+					domNode.setAttributeNS("http://www.w3.org/1999/xlink",b[1],v);
+				} else {
+					domNode.setAttributeNS(null,a,v);
 				}
+			} catch(e) {
 			}
 		}
-	}
-	// Not all parse tree nodes have the orderedAttributes property
-	if(this.parseTreeNode.orderedAttributes) {
-		$tw.utils.each(this.parseTreeNode.orderedAttributes,function(attribute,index) {
-			assignAttribute(attribute.name,self.attributes[attribute.name]);
-		});	
-	} else {
-		$tw.utils.each(Object.keys(self.attributes).sort(),function(name) {
-			assignAttribute(name,self.attributes[name]);
-		});	
-	}
+	});
 };
 
 /*

core/modules/wiki-bulkops.js

@@ -46,31 +46,26 @@ function relinkTiddler(fromTitle,toTitle,options) {
 			if(!tiddler.fields["plugin-type"] && type !== "application/javascript") {
 				var tags = tiddler.fields.tags ? tiddler.fields.tags.slice(0) : undefined,
 					list = tiddler.fields.list ? tiddler.fields.list.slice(0) : undefined,
-					isModified = false,
-					processList = function(listField) {
-						if(listField && listField.indexOf(fromTitle) !== -1) {
-							// Remove any existing instances of the toTitle
-							var p = listField.indexOf(toTitle);
-							while(p !== -1) {
-								listField.splice(p,1);
-								p = listField.indexOf(toTitle);
-							}
-							// Replace the fromTitle with toTitle
-							$tw.utils.each(listField,function (title,index) {
-								if(title === fromTitle) {
-									listField[index] = toTitle;
-									isModified = true;
-								}
-							});
-						}
-					};
+					isModified = false;
 				if(!options.dontRenameInTags) {
 					// Rename tags
-					processList(tags);
+					$tw.utils.each(tags,function (title,index) {
+						if(title === fromTitle) {
+console.log("Renaming tag '" + tags[index] + "' to '" + toTitle + "' of tiddler '" + tiddler.fields.title + "'");
+							tags[index] = toTitle;
+							isModified = true;
+						}
+					});
 				}
 				if(!options.dontRenameInLists) {
 					// Rename lists
-					processList(list);
+					$tw.utils.each(list,function (title,index) {
+						if(title === fromTitle) {
+console.log("Renaming list item '" + list[index] + "' to '" + toTitle + "' of tiddler '" + tiddler.fields.title + "'");
+							list[index] = toTitle;
+							isModified = true;
+						}
+					});
 				}
 				if(isModified) {
 					var newTiddler = new $tw.Tiddler(tiddler,{tags: tags, list: list},self.getModificationFields())

core/modules/wiki.js

@@ -639,25 +639,14 @@ Lookup a given tiddler and return a list of all the tiddlers that include it in
 */
 exports.findListingsOfTiddler = function(targetTitle,fieldName) {
 	fieldName = fieldName || "list";
-	var wiki = this;
-	var listings = this.getGlobalCache("listings-" + fieldName,function() {
-		var listings = Object.create(null);
-		wiki.each(function(tiddler,title) {
-			var list = $tw.utils.parseStringArray(tiddler.fields[fieldName]);
-			if(list) {
-				for(var i = 0; i < list.length; i++) {
-					var listItem = list[i],
-						listing = listings[listItem] || [];
-					if (listing.indexOf(title) === -1) {
-						listing.push(title);
-					}
-					listings[listItem] = listing;
-				}
-			}
-		});
-		return listings;
+	var titles = [];
+	this.each(function(tiddler,title) {
+		var list = $tw.utils.parseStringArray(tiddler.fields[fieldName]);
+		if(list && list.indexOf(targetTitle) !== -1) {
+			titles.push(title);
+		}
 	});
-	return listings[targetTitle] || [];
+	return titles;
 };
 
 /*
@@ -833,7 +822,12 @@ exports.getTiddlerData = function(titleOrTiddler,defaultData) {
 		switch(tiddler.fields.type) {
 			case "application/json":
 				// JSON tiddler
-				return $tw.utils.parseJSONSafe(tiddler.fields.text,defaultData);
+				try {
+					data = JSON.parse(tiddler.fields.text);
+				} catch(ex) {
+					return defaultData;
+				}
+				return data;
 			case "application/x-tiddler-dictionary":
 				return $tw.utils.parseFields(tiddler.fields.text);
 		}
@@ -1207,28 +1201,23 @@ Return an array of tiddler titles that match a search string
 	text: The text string to search for
 	options: see below
 Options available:
-	source: an iterator function for the source tiddlers, called source(iterator),
-		where iterator is called as iterator(tiddler,title)
+	source: an iterator function for the source tiddlers, called source(iterator), where iterator is called as iterator(tiddler,title)
 	exclude: An array of tiddler titles to exclude from the search
 	invert: If true returns tiddlers that do not contain the specified string
 	caseSensitive: If true forces a case sensitive search
 	field: If specified, restricts the search to the specified field, or an array of field names
 	anchored: If true, forces all but regexp searches to be anchored to the start of text
 	excludeField: If true, the field options are inverted to specify the fields that are not to be searched
-
 	The search mode is determined by the first of these boolean flags to be true
 		literal: searches for literal string
 		whitespace: same as literal except runs of whitespace are treated as a single space
 		regexp: treats the search term as a regular expression
-		words: (default) treats search string as a list of tokens, and matches if all tokens are found, 
-			regardless of adjacency or ordering
-		some: treats search string as a list of tokens, and matches if at least ONE token is found
+		words: (default) treats search string as a list of tokens, and matches if all tokens are found, regardless of adjacency or ordering
 */
 exports.search = function(text,options) {
 	options = options || {};
 	var self = this,
 		t,
-		regExpStr="",
 		invert = !!options.invert;
 	// Convert the search string into a regexp for each term
 	var terms, searchTermsRegExps,
@@ -1255,18 +1244,7 @@ exports.search = function(text,options) {
 			searchTermsRegExps = null;
 			console.log("Regexp error parsing /(" + text + ")/" + flags + ": ",e);
 		}
-	} else if(options.some) {
-		terms = text.trim().split(/ +/);
-		if(terms.length === 1 && terms[0] === "") {
-			searchTermsRegExps = null;
-		} else {
-			searchTermsRegExps = [];
-			for(t=0; t<terms.length; t++) {
-				regExpStr += (t===0) ? anchor + $tw.utils.escapeRegExp(terms[t]) : "|" + anchor + $tw.utils.escapeRegExp(terms[t]);
-			}
-			searchTermsRegExps.push(new RegExp("(" + regExpStr + ")",flags));
-		}
-	} else { // default: words
+	} else {
 		terms = text.split(/ +/);
 		if(terms.length === 1 && terms[0] === "") {
 			searchTermsRegExps = null;
@@ -1277,7 +1255,7 @@ exports.search = function(text,options) {
 			}
 		}
 	}
-// Accumulate the array of fields to be searched or excluded from the search
+	// Accumulate the array of fields to be searched or excluded from the search
 	var fields = [];
 	if(options.field) {
 		if($tw.utils.isArray(options.field)) {

core/templates/tiddlywiki5.html.tid

@@ -6,7 +6,7 @@ title: $:/core/templates/tiddlywiki5.html
 <head>
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <!--~~ Raw markup for the top of the head section ~~-->
-`{{{ [enlist<saveTiddlerAndShadowsFilter>tag[$:/tags/RawMarkupWikified/TopHead]] ||$:/core/templates/raw-static-tiddler}}}`
+`{{{ [<saveTiddlerAndShadowsFilter>tag[$:/tags/RawMarkupWikified/TopHead]] ||$:/core/templates/raw-static-tiddler}}}`
 <meta http-equiv="X-UA-Compatible" content="IE=Edge"/>
 <meta name="application-name" content="TiddlyWiki" />
 <meta name="generator" content="TiddlyWiki" />

core/ui/Components/tag-link.tid

@@ -1,7 +1,7 @@
 title: $:/core/ui/Components/tag-link
 
 <$link>
-<$set name="backgroundColor" value={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}}>
+<$set name="backgroundColor" value={{!!color}}>
 <span style=<<tag-styles>> class="tc-tag-label">
 <$view field="title" format="text"/>
 </span>

core/ui/ControlPanel/Cascades/EditTemplateBody.tid

@@ -1,5 +1,5 @@
 title: $:/core/ui/ControlPanel/EditTemplateBody
-tags: $:/tags/ControlPanel/Cascades
+tags: $:/tags/ControlPanel/Cascade
 caption: {{$:/language/ControlPanel/EditTemplateBody/Caption}}
 
 \define lingo-base() $:/language/ControlPanel/EditTemplateBody/

core/ui/ControlPanel/Cascades/TiddlerColour.tid

@@ -1,9 +0,0 @@
-title: $:/core/ui/ControlPanel/TiddlerColour
-tags: $:/tags/ControlPanel/Cascades
-caption: {{$:/language/ControlPanel/TiddlerColour/Caption}}
-
-\define lingo-base() $:/language/ControlPanel/TiddlerColour/
-
-<<lingo Hint>>
-
-{{$:/tags/TiddlerColourFilter||$:/snippets/ListTaggedCascade}}

core/ui/EditTemplate/body.tid

@@ -1,4 +1,4 @@
 title: $:/core/ui/EditTemplate/body
 tags: $:/tags/EditTemplate
 
-<$transclude tiddler={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/EditTemplateBodyFilter]!is[draft]get[text]] :and[!is[blank]else[$:/core/ui/EditTemplate/body/default]] }}} />
+<$transclude tiddler={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/EditTemplateBodyFilter]get[text]] :and[!is[blank]else[$:/core/ui/EditTemplate/body/default]] }}} />

core/ui/EditTemplate/tags.tid

@@ -29,7 +29,7 @@ color:$(foregroundColor)$;
 \whitespace trim
 <div class="tc-edit-tags">
 <$list filter="[list[!!$tagField$]sort[title]]" storyview="pop">
-<$macrocall $name="tag-body" colour={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}} palette={{$:/palette}} icon={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerIconFilter]!is[draft]get[text]] }}} tagField=<<__tagField__>>/>
+<$macrocall $name="tag-body" colour={{!!color}} palette={{$:/palette}} icon={{!!icon}} tagField=<<__tagField__>>/>
 </$list>
 <$vars tabIndex={{$:/config/EditTabIndex}} cancelPopups="yes">
 <$macrocall $name="tag-picker" tagField=<<__tagField__>>/>

core/ui/EditTemplate/type.tid

@@ -23,7 +23,7 @@ first-search-filter: [all[shadows+tiddlers]prefix[$:/language/Docs/Types/]sort[d
 <$text text={{!!group}}/>
 </div>
 <$set name="userInput" value={{{ [<typeInputTiddler>get[text]] }}}>
-<$list filter="[all[shadows+tiddlers]prefix[$:/language/Docs/Types/]group{!!group}] +[sort[description]] +[removeprefix[$:/language/Docs/Types/]] +[search<userInput>]"><span class={{{ [<currentTiddler>addsuffix[-primaryList]] -[<typeSelectionTiddler>get[text]] +[then[]else[tc-list-item-selected]] }}}><$link to={{{ [<currentTiddler>addprefix[$:/language/Docs/Types/]get[name]] }}}><$view tiddler={{{ [<currentTiddler>addprefix[$:/language/Docs/Types/]] }}} field="description"/><$text text=" "/>(<$view tiddler={{{ [<currentTiddler>addprefix[$:/language/Docs/Types/]] }}} field="name"/>)</$link></span>
+<$list filter="[all[shadows+tiddlers]prefix[$:/language/Docs/Types/]group{!!group}] +[sort[description]] +[removeprefix[$:/language/Docs/Types/]] +[search<userInput>]"><span class={{{ [<currentTiddler>addsuffix[-primaryList]] -[<typeSelectionTiddler>get[text]] +[then[]else[tc-list-item-selected]] }}}><$link to={{{ [<currentTiddler>addprefix[$:/language/Docs/Types/]get[name]] }}}><$view tiddler={{{ [<currentTiddler>addprefix[$:/language/Docs/Types/]] }}} field="description"/> (<$view tiddler={{{ [<currentTiddler>addprefix[$:/language/Docs/Types/]] }}} field="name"/>)</$link></span>
 </$list>
 </$set>
 </$list>

core/ui/MoreSideBar/plugins/Languages.tid

@@ -2,4 +2,4 @@ title: $:/core/ui/MoreSideBar/Plugins/Languages
 tags: $:/tags/MoreSideBar/Plugins
 caption: {{$:/language/ControlPanel/Plugins/Languages/Caption}}
 
-<$list filter="[!has[draft.of]plugin-type[language]sort[name]]" template="$:/core/ui/PluginListItemTemplate" emptyMessage={{$:/language/ControlPanel/Plugins/Empty/Hint}}/>
+<$list filter="[!has[draft.of]plugin-type[language]sort[description]]" template="$:/core/ui/PluginListItemTemplate" emptyMessage={{$:/language/ControlPanel/Plugins/Empty/Hint}}/>

core/ui/MoreSideBar/plugins/Plugins.tid

@@ -2,4 +2,4 @@ title: $:/core/ui/MoreSideBar/Plugins/Plugins
 tags: $:/tags/MoreSideBar/Plugins
 caption: {{$:/language/ControlPanel/Plugins/Plugins/Caption}}
 
-<$list filter="[!has[draft.of]plugin-type[plugin]sort[name]]" template="$:/core/ui/PluginListItemTemplate" emptyMessage={{$:/language/ControlPanel/Plugins/Empty/Hint}}>>/>
+<$list filter="[!has[draft.of]plugin-type[plugin]sort[description]]" template="$:/core/ui/PluginListItemTemplate" emptyMessage={{$:/language/ControlPanel/Plugins/Empty/Hint}}>>/>

core/ui/MoreSideBar/plugins/Theme.tid

@@ -2,4 +2,4 @@ title: $:/core/ui/MoreSideBar/Plugins/Theme
 tags: $:/tags/MoreSideBar/Plugins
 caption: {{$:/language/ControlPanel/Plugins/Themes/Caption}}
 
-<$list filter="[!has[draft.of]plugin-type[theme]sort[name]]" template="$:/core/ui/PluginListItemTemplate" emptyMessage={{$:/language/ControlPanel/Plugins/Empty/Hint}}/>
+<$list filter="[!has[draft.of]plugin-type[theme]sort[description]]" template="$:/core/ui/PluginListItemTemplate" emptyMessage={{$:/language/ControlPanel/Plugins/Empty/Hint}}/>

core/ui/PluginListItemTemplate.tid

@@ -1,15 +1,5 @@
 title: $:/core/ui/PluginListItemTemplate
 
-\whitespace trim
-<$link to={{!!title}} class="tc-plugin-info">
-	<div class="tc-plugin-info-chunk tc-plugin-info-icon">
-		<$transclude tiddler=<<currentTiddler>> subtiddler={{{ [<currentTiddler>addsuffix[/icon]] }}}>
-			<$transclude tiddler={{{ [<currentTiddler>get[plugin-type]addprefix[$:/core/images/plugin-generic-]] }}}/>
-		</$transclude>
-	</div>
-	<div class="tc-plugin-info-chunk tc-plugin-info-description">
-		<h1>
-			''<$text text={{{ [<currentTiddler>get[name]] ~[<currentTiddler>split[/]last[1]] }}}/>'':&nbsp;<$view field="description"><$view field="title"/></$view>
-		</h1>
-	</div>
-</$link>
+<div class="tc-menu-list-item">
+<$link to={{!!title}}><$view field="description"><$view field="title"/></$view></$link>
+</div>

core/ui/SideBar/Open.tid

@@ -6,7 +6,7 @@ caption: {{$:/language/SideBar/Open/Caption}}
 \define lingo-base() $:/language/CloseAll/
 
 \define drop-actions()
-<$action-listops $tiddler=<<tv-story-list>> $subfilter="+[insertbefore<actionTiddler>,<currentTiddler>]"/>
+<$action-listops $tiddler=<<tv-story-list>> $subfilter="+[insertbefore:currentTiddler<actionTiddler>]"/>
 \end
 
 \define placeholder()

core/ui/StoryTiddlerTemplate.tid

@@ -1,3 +1,3 @@
 title: $:/core/ui/StoryTiddlerTemplate
 
-<$transclude tiddler={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/StoryTiddlerTemplateFilter]!is[draft]get[text]] :and[!is[blank]else{$:/config/ui/ViewTemplate}] }}} />
+<$transclude tiddler={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/StoryTiddlerTemplateFilter]get[text]] :and[!is[blank]else{$:/config/ui/ViewTemplate}] }}} />

core/ui/TagPickerTagTemplate.tid

@@ -13,8 +13,8 @@ title: $:/core/ui/TagPickerTagTemplate
 <$action-setfield $tiddler=<<refreshTitle>> text="yes"/>
 </$list>
 <<actions>>
-<$set name="backgroundColor" value={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}}>
-<$wikify name="foregroundColor" text="""<$macrocall $name="contrastcolour" target=<<backgroundColor>> fallbackTarget=<<fallbackTarget>> colourA=<<colourA>> colourB=<<colourB>>/>""">
+<$set name="backgroundColor" value={{!!color}}>
+<$wikify name="foregroundColor" text="""<$macrocall $name="contrastcolour" target={{!!color}} fallbackTarget=<<fallbackTarget>> colourA=<<colourA>> colourB=<<colourB>>/>""">
 <span class="tc-tag-label tc-btn-invisible" style=<<tag-pill-styles>>>
 {{||$:/core/ui/TiddlerIcon}}<$view field="title" format="text"/>
 </span>

core/ui/TagTemplate.tid

@@ -3,7 +3,7 @@ title: $:/core/ui/TagTemplate
 \whitespace trim
 <span class="tc-tag-list-item" data-tag-title=<<currentTiddler>>>
 <$set name="transclusion" value=<<currentTiddler>>>
-<$macrocall $name="tag-pill-body" tag=<<currentTiddler>> icon={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerIconFilter]!is[draft]get[text]] }}} colour={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}} palette={{$:/palette}} element-tag="""$button""" element-attributes="""popup=<<qualify "$:/state/popup/tag">> dragFilter='[all[current]tagging[]]' tag='span'"""/>
+<$macrocall $name="tag-pill-body" tag=<<currentTiddler>> colour={{!!color}} palette={{$:/palette}} element-tag="""$button""" element-attributes="""popup=<<qualify "$:/state/popup/tag">> dragFilter='[all[current]tagging[]]' tag='span'"""/>
 <$reveal state=<<qualify "$:/state/popup/tag">> type="popup" position="below" animate="yes" class="tc-drop-down">
 <$set name="tv-show-missing-links" value="yes">
 <$transclude tiddler="$:/core/ui/ListItemTemplate"/>

core/ui/TiddlerIcon.tid

@@ -1,8 +1,15 @@
 title: $:/core/ui/TiddlerIcon
 
 \whitespace trim
-<$let tiddlerIcon={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerIconFilter]!is[draft]get[text]] }}}>
+\define title-styles()
+fill:$(foregroundColor)$;
+\end
+<$let tiddlerIcon={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerIconFilter]get[text]] }}}>
 <$list filter="[<tiddlerIcon>!is[blank]]" variable="ignore">
+<$let foregroundColor={{!!color}}>
+<span class=<<iconSpanClass>> style=<<title-styles>>>
 <$transclude tiddler=<<tiddlerIcon>>/>
+</span>
+</$let>
 </$list>
 </$let>

core/ui/ViewTemplate/body.tid

@@ -3,6 +3,6 @@ tags: $:/tags/ViewTemplate
 
 <$reveal tag="div" class="tc-tiddler-body" type="nomatch" stateTitle=<<folded-state>> text="hide" retain="yes" animate="yes">
 
-<$transclude tiddler={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/ViewTemplateBodyFilter]!is[draft]get[text]] :and[!is[blank]else[$:/core/ui/ViewTemplate/body/default]] }}} />
+<$transclude tiddler={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/ViewTemplateBodyFilter]get[text]] :and[!is[blank]else[$:/core/ui/ViewTemplate/body/default]] }}} />
 
 </$reveal>

core/ui/ViewTemplate/title.tid

@@ -2,9 +2,6 @@ title: $:/core/ui/ViewTemplate/title
 tags: $:/tags/ViewTemplate
 
 \whitespace trim
-\define title-styles()
-fill:$(foregroundColor)$;
-\end
 <div class="tc-tiddler-title">
 <div class="tc-titlebar">
 <span class="tc-tiddler-controls">
@@ -12,12 +9,10 @@ fill:$(foregroundColor)$;
 </span>
 <$set name="tv-wikilinks" value={{$:/config/Tiddlers/TitleLinks}}>
 <$link>
-<$let foregroundColor={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}}>
-<span class="tc-tiddler-title-icon" style=<<title-styles>>>
+<$let iconSpanClass="tc-tiddler-title-icon">
 {{||$:/core/ui/TiddlerIcon}}
-</span>
 </$let>
-<$transclude tiddler={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/ViewTemplateTitleFilter]!is[draft]get[text]] :and[!is[blank]else[$:/core/ui/ViewTemplate/title/default]] }}} />
+<$transclude tiddler={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/ViewTemplateTitleFilter]get[text]] :and[!is[blank]else[$:/core/ui/ViewTemplate/title/default]] }}} />
 </$link>
 </$set>
 </div>

core/wiki/allfields.tid

@@ -1,7 +1,7 @@
 title: $:/snippets/allfields
 
 \define renderfield(title)
-<tr class="tc-view-field"><td class="tc-view-field-name">''<$text text=<<__title__>>/>'':</td><td class="tc-view-field-value">//{{$:/language/Docs/Fields/$title$}}//</td></tr>
+<tr class="tc-view-field"><td class="tc-view-field-name">''$title$'':</td><td class="tc-view-field-value">//{{$:/language/Docs/Fields/$title$}}//</td></tr>
 \end
 <table class="tc-view-field-table"><tbody><$list filter="[fields[]sort[title]]" variable="listItem"><$macrocall $name="renderfield" title=<<listItem>>/></$list>
 </tbody></table>

core/wiki/config/OfficialPluginLibrary.tid

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

core/wiki/config/TiddlerColourFilters.multids

@@ -1,5 +0,0 @@
-title: $:/config/TiddlerColourFilters/
-tags: $:/tags/TiddlerColourFilter
-
-color-field: [has[color]then{!!color}]
-default: [[$:/config/DefaultTiddlerColour]has[text]get[text]trim[]]

core/wiki/config/ViewTemplateBodyFilters.multids

@@ -1,8 +1,7 @@
 title: $:/config/ViewTemplateBodyFilters/
 tags: $:/tags/ViewTemplateBodyFilter
 
-system: [prefix[$:/boot/]] [prefix[$:/config/]] [prefix[$:/core/macros]] [prefix[$:/core/save/]] [prefix[$:/core/templates/]] [prefix[$:/core/ui/]split[/]count[]compare:number:eq[4]] [prefix[$:/info/]] [prefix[$:/language/]] [prefix[$:/languages/]] [prefix[$:/snippets/]] [prefix[$:/state/]] [prefix[$:/status/]] [prefix[$:/info/]] [prefix[$:/temp/]] +[limit[1]then[$:/core/ui/ViewTemplate/body/code]]
-code-body: [field:code-body[yes]then[$:/core/ui/ViewTemplate/body/code]]
+system: [prefix[$:/boot/]] [prefix[$:/config/]] [prefix[$:/core/]!field:title[$:/core/readme]!field:title[$:/core/icon]] [prefix[$:/info/]] [prefix[$:/language/]] [prefix[$:/languages/]] [prefix[$:/snippets/]] [prefix[$:/state/]] [prefix[$:/status/]] [prefix[$:/info/]] [prefix[$:/temp/]] +[limit[1]then[$:/core/ui/ViewTemplate/body/code]]
 import: [field:plugin-type[import]then[$:/core/ui/ViewTemplate/body/import]]
 plugin: [has[plugin-type]then[$:/core/ui/ViewTemplate/body/plugin]]
 hide-body: [field:hide-body[yes]then[$:/core/ui/ViewTemplate/body/blank]]

core/wiki/debugstylesheets.tid

@@ -1,9 +0,0 @@
-title: $:/snippets/DebugStylesheets
-
-<style>[test]{list-style:'❌'}</style>
-<ul>
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/Stylesheet]has[modified]]" counter="n">
-<style>{{!!text}}[test="<<n>>"]{list-style:disc;}</style>
-<li test=<<n>>><$link/></li>
-</$list>
-</ul>

core/wiki/macros/list.tid

@@ -17,7 +17,7 @@ tags: $:/tags/Macro
 \end
 
 \define list-links-draggable-drop-actions()
-<$action-listops $tiddler=<<targetTiddler>> $field=<<targetField>> $subfilter="+[insertbefore<actionTiddler>,<currentTiddler>]"/>
+<$action-listops $tiddler=<<targetTiddler>> $field=<<targetField>> $subfilter="+[insertbefore:currentTiddler<actionTiddler>]"/>
 \end
 
 \define list-links-draggable(tiddler,field:"list",type:"ul",subtype:"li",class:"",itemTemplate)
@@ -61,7 +61,7 @@ tags: $:/tags/Macro
 <$action-deletefield $field="list-after"/>
 </$list>
 <!-- Save the new order to the Tag Tiddler -->
-<$action-listops $tiddler=<<__tag__>> $field="list" $filter="+[enlist<order>] +[insertbefore<actionTiddler>,<currentTiddler>]"/>
+<$action-listops $tiddler=<<__tag__>> $field="list" $filter="+[enlist<order>] +[insertbefore:currentTiddler<actionTiddler>]"/>
 <!-- Make sure the newly added item has the right tag -->
 <!-- Removing this line makes dragging tags within the dropdown work as intended -->
 <!--<$action-listops $tiddler=<<actionTiddler>> $tags=<<__tag__>>/>-->

core/wiki/macros/tag.tid

@@ -10,20 +10,18 @@ color:$(foregroundColor)$;
 \define tag-pill-inner(tag,icon,colour,fallbackTarget,colourA,colourB,element-tag,element-attributes,actions)
 <$vars foregroundColor=<<contrastcolour target:"""$colour$""" fallbackTarget:"""$fallbackTarget$""" colourA:"""$colourA$""" colourB:"""$colourB$""">> backgroundColor="""$colour$""">
 <$element-tag$ $element-attributes$ class="tc-tag-label tc-btn-invisible" style=<<tag-pill-styles>>>
-$actions$<$transclude tiddler="""$icon$"""/><$view tiddler=<<__tag__>> field="title" format="text" />
+$actions${{||$:/core/ui/TiddlerIcon}}<$view tiddler=<<__tag__>> field="title" format="text" />
 </$element-tag$>
 </$vars>
 \end
 
 \define tag-pill-body(tag,icon,colour,palette,element-tag,element-attributes,actions)
-<$macrocall $name="tag-pill-inner" tag=<<__tag__>> icon="""$icon$""" colour="""$colour$""" fallbackTarget={{$palette$##tag-background}} colourA={{$palette$##foreground}} colourB={{$palette$##background}} element-tag="""$element-tag$""" element-attributes="""$element-attributes$""" actions="""$actions$"""/>
+<$macrocall $name="tag-pill-inner" tag=<<__tag__>> colour="""$colour$""" fallbackTarget={{$palette$##tag-background}} colourA={{$palette$##foreground}} colourB={{$palette$##background}} element-tag="""$element-tag$""" element-attributes="""$element-attributes$""" actions="""$actions$"""/>
 \end
 
 \define tag-pill(tag,element-tag:"span",element-attributes:"",actions:"")
 <span class="tc-tag-list-item" data-tag-title=<<__tag__>>>
-<$let currentTiddler=<<__tag__>>>
-<$macrocall $name="tag-pill-body" tag=<<__tag__>> icon={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerIconFilter]!is[draft]get[text]] }}} colour={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}} palette={{$:/palette}} element-tag="""$element-tag$""" element-attributes="""$element-attributes$""" actions="""$actions$"""/>
-</$let>
+<$macrocall $name="tag-pill-body" tag=<<__tag__>> colour={{{ [<__tag__>get[color]] }}} palette={{$:/palette}} element-tag="""$element-tag$""" element-attributes="""$element-attributes$""" actions="""$actions$"""/>
 </span>
 \end
 

core/wiki/peek-stylesheets.tid

@@ -1,7 +1,6 @@
 title: $:/snippets/peek-stylesheets
 
 \define expandable-stylesheets-list()
-\whitespace trim
 <ol>
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/Stylesheet]!has[draft.of]]">
 <$vars state=<<qualify "$:/state/peek-stylesheets/open/">>>
@@ -39,7 +38,6 @@ title: $:/snippets/peek-stylesheets
 \end
 
 \define stylesheets-list()
-\whitespace trim
 <ol>
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/Stylesheet]!has[draft.of]]">
 <li>
@@ -59,7 +57,6 @@ title: $:/snippets/peek-stylesheets
 </$list>
 </ol>
 \end
-\whitespace trim
 
 <$vars modeState=<<qualify "$:/state/peek-stylesheets/mode/">>>
 

core/wiki/tags/TiddlerColourFilter.tid

@@ -1,3 +0,0 @@
-title: $:/tags/TiddlerColourFilter
-list: $:/config/TiddlerColourFilters/color-field $:/config/TiddlerColourFilters/default
-

core/wiki/tags/ViewTemplateBodyFilter.tid

@@ -1,3 +1,3 @@
 title: $:/tags/ViewTemplateBodyFilter
-list: $:/config/ViewTemplateBodyFilters/system $:/config/ViewTemplateBodyFilters/code-body $:/config/ViewTemplateBodyFilters/import $:/config/ViewTemplateBodyFilters/plugin $:/config/ViewTemplateBodyFilters/hide-body $:/config/ViewTemplateBodyFilters/default
+list: $:/config/ViewTemplateBodyFilters/system $:/config/ViewTemplateBodyFilters/import $:/config/ViewTemplateBodyFilters/plugin $:/config/ViewTemplateBodyFilters/hide-body $:/config/ViewTemplateBodyFilters/default
 

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

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

editions/dynaviewdemo/tiddlers/SideBar-Open.tid

@@ -5,7 +5,7 @@ caption: {{$:/language/SideBar/Open/Caption}}
 \define lingo-base() $:/language/CloseAll/
 
 \define drop-actions()
-<$action-listops $tiddler="$:/StoryList" $subfilter="+[insertbefore<actionTiddler>,<currentTiddler>]"/>
+<$action-listops $tiddler="$:/StoryList" $subfilter="+[insertbefore:currentTiddler<actionTiddler>]"/>
 \end
 
 <$list filter="[list[$:/StoryList]]" history="$:/HistoryList" storyview="pop">

editions/fr-FR/tiddlers/$ _config_ViewTemplateTitleFilters_fr-default.tid

@@ -1,7 +0,0 @@
-created: 20220219141117559
-list-before: $:/config/ViewTemplateTitleFilters/default
-modified: 20220220192507247
-tags: $:/tags/ViewTemplateTitleFilter
-title: $:/config/ViewTemplateTitleFilters/fr-default
-
-[has[fr-title]then[$:/core/ui/ViewTemplate/title/fr-default]]

editions/fr-FR/tiddlers/$ _core_ui_ViewTemplate_title_fr-default.tid

@@ -1,8 +0,0 @@
-created: 20220219134855444
-modified: 20220220192530872
-title: $:/core/ui/ViewTemplate/title/fr-default
-
-\whitespace trim
-<h2 class="tc-title">
-<$view field="fr-title"/>
-</h2>

editions/fr-FR/tiddlers/$ _editions_tw5.com_doc-macros.tid

@@ -1,174 +0,0 @@
-created: 20150117152607000
-modified: 20220220000852855
-tags: $:/tags/Macro
-title: $:/editions/tw5.com/doc-macros
-type: text/vnd.tiddlywiki
-
-\define .concat(1,2,3,4,5) $1$$2$$3$$4$$5$
-
-\define .def(_) <dfn class="doc-def">$_$</dfn>
-\define .em(_) <em class="doc-em">$_$</em>
-\define .strong(_) <strong class="doc-strong">$_$</strong>
-\define .place(_) <code class="doc-place">$_$</code>
-\define .word(_) "$_$"
-
-\define .preamble(_) :.doc-preamble $_$
-\define .note(_)
-@@.doc-note
-;Note
-: $_$
-@@
-\end
-
-\define .tid(_) <code class="doc-tiddler">$_$</code>
-\define .tag(_) <code class="doc-tag">$_$</code>
-\define .field(_) <code class="doc-field">$_$</code>
-\define .value(_) <code class="doc-value">$_$</code>
-\define .op(_) <code class="doc-operator">$_$</code>
-\define .var(_) <code class="doc-var">$_$</code>
-\define .wid(_) <code class="doc-widget">$$_$</code>
-\define .attr(_) <code class="doc-attr">$_$</code>
-\define .param(_) <code class="doc-param">$_$</code>
-
-\define .mtitle(_) $_$ Macro
-\define .otitle(_) $_$ Operator
-\define .vtitle(_) $_$ Variable
-
-\define .link(_,to) <$link to="$to$">$_$</$link>
-\define .clink(_,to) <span class="doc-clink"><<.link """$_$""" "$to$">></span>
-\define .dlink(_,to) <$macrocall $name=".link" _=<<.def "$_$">> to="$to$">/>
-\define .dlink-ex(_,to) <a href="$to$" class="tc-tiddlylink-external" target="_blank" rel="noopener noreferrer"><<.def "$_$">></a>
-\define .flink(to) <$macrocall $name=".link" _=<<.field {{$to$!!caption}}>> to="$to$"/>
-\define .mlink(_,to) <$macrocall $name=".link" _=<<.var "$_$">> to=<<.mtitle "$_$">>/>
-\define .mlink2(_,to) <$macrocall $name=".link" _=<<.var "$_$">> to="$to$"/>
-\define .olink(_) <$macrocall $name=".link" _=<<.op "$_$">> to=<<.otitle "$_$">>/>
-\define .olink2(_,to) <$macrocall $name=".link" _=<<.op "$_$">> to=<<.otitle "$to$">>/>
-\define .vlink(_,to) <$macrocall $name=".link" _=<<.var "$_$">> to=<<.vtitle "$_$">>/>
-\define .vlink2(_,to) <$macrocall $name=".link" _=<<.var "$_$">> to="$to$"/>
-\define .wlink(to) <$macrocall $name=".link" _=<<.wid {{$to$!!caption}}>> to="$to$"/>
-\define .wlink2(_,to) <$macrocall $name=".link" _="$_$" to="$to$"/>
-
-\define .key(_) <span class="doc-key">$_$</span>
-\define .combokey(_) <$macrocall $name=".if" cond="$_$" then=<<.key '$_$'>>/>
-\define .keycombo(1,2,3,4) <<.combokey "$1$">><<.if "$2$" +>><<.combokey "$2$">><<.if "$3$" +>><<.combokey "$3$">><<.if "$4$" +>><<.combokey "$4$">>
-
-\define .tab(_) <span class="doc-tab">{{$_$!!caption}}</span>
-\define .sidebar-tab(_) <<.tab "$:/core/ui/SideBar/$_$">>
-\define .more-tab(_) <<.tab "$:/core/ui/MoreSideBar/$_$">>
-\define .info-tab(_) <<.tab "$:/core/ui/TiddlerInfo/$_$">>
-\define .controlpanel-tab(_) <<.tab "$:/core/ui/ControlPanel/$_$">>
-\define .advancedsearch-tab(_) <<.tab "$:/core/ui/AdvancedSearch/$_$">>
-\define .toc-tab() <<.tab "TableOfContents">>
-\define .example-tab(_) <span class="doc-tab">$_$</span>
-
-\define .button(_) <span class="doc-button">{{$:/core/ui/Buttons/$_$!!caption}}</span>
-
-\define .icon(_) <span class="doc-icon">{{$_$}}</span>
-
-\define .tip(_) <div class="doc-icon-block"><div class="doc-block-icon">{{$:/core/images/tip}}</div> $_$</div>
-\define .warning(_) <div class="doc-icon-block"><div class="doc-block-icon">{{$:/core/images/warning}}</div> $_$</div>
-
-\define .state-prefix() $:/state/editions/tw5.com/
-
-\define .lorem()
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-\end
-
-\define .toc-lorem()
-C'est un exemple de tiddler. Voir [[Macros Table des matières (Exemples)|Table-of-Contents Macros (Examples)]].
-
-<<.lorem>>
-\end
-
-\define .example(n,eg,egvar:NO-SUCH-VAR)
-<div class="doc-example">
-<$reveal default="$egvar$" type="match" text="NO-SUCH-VAR">
-	<$macrocall $name="copy-to-clipboard-above-right" src="""$eg$"""/>
-	<$codeblock code="""$eg$"""/>
-</$reveal>
-<$reveal default="$egvar$" type="nomatch" text="NO-SUCH-VAR">
-	<!-- allow an example to contain """ -->
-	<$macrocall $name="copy-to-clipboard-above-right" src=<<$egvar$>>/>
-	<$codeblock code=<<$egvar$>>/>
-</$reveal>
-<$list filter="[title<.state-prefix>addsuffix{!!title}addsuffix[/]addsuffix[$n$]]" variable=".state">
-<$reveal state=<<.state>> type="nomatch" text="show">
-	<dl>
-	<dd><$button set=<<.state>> setTo="show">Essayez</$button></dd>
-	</dl>
-</$reveal>
-<$reveal state=<<.state>> type="match" text="show">
-	<dl>
-	<dd><$button set=<<.state>> setTo="">Cachez</$button></dd>
-	</dl>
-	<blockquote class="doc-example-result">
-	<$reveal default="$egvar$" type="match" text="NO-SUCH-VAR">
-		$eg$
-	</$reveal>
-	<$reveal default="$egvar$" type="nomatch" text="NO-SUCH-VAR">
-		<<$egvar$>>
-	</$reveal>
-	</blockquote>
-</$reveal>
-</$list>
-\end
-
-\define .bad-example(eg)
-<table class="doc-bad-example">
-<tbody>
-<tr class="evenRow">
-<td><span class="tc-inline-style" style="font-size:1.5em;">&#9888;</span> Warning:<br> Don't do it this way!</td>
-<td>
-
-$eg$
-</td>
-</tr>
-</tbody>
-</table>
-\end
-
-\define .link-badge(text,link,colour)
-<a href=<<__link__>> class="doc-link-badge" style="background-color:$colour$;" target="_blank" rel="noopener noreferrer"><$text text=<<__text__>>/></a>
-\end
-
-
-\define .link-badge-added(link,colour:#ffe246) <<.link-badge "added" """$link$""" """$colour$""">>
-\define .link-badge-addendum(link,colour:#fcc84a) <<.link-badge "addendum" """$link$""" """$colour$""">>
-\define .link-badge-extended(link,colour:#f9a344) <<.link-badge "extended" """$link$""" """$colour$""">>
-\define .link-badge-fixed(link,colour:#ffa86d) <<.link-badge "fixed" """$link$""" """$colour$""">>
-\define .link-badge-here(link,colour:#d88e63) <<.link-badge "here" """$link$""" """$colour$""">>
-\define .link-badge-hide(link,colour:#9d959f) <<.link-badge "hide" """$link$""" """$colour$""">>
-\define .link-badge-improved(link,colour:#7593c7) <<.link-badge "improved" """$link$""" """$colour$""">>
-\define .link-badge-modified(link,colour:#7f99c9) <<.link-badge "modified" """$link$""" """$colour$""">>
-\define .link-badge-removed(link,colour:#a9aabc) <<.link-badge "removed" """$link$""" """$colour$""">>
-\define .link-badge-renamed(link,colour:#b4b995) <<.link-badge "renamed" """$link$""" """$colour$""">>
-\define .link-badge-updated(link,colour:#91ba66) <<.link-badge "updated" """$link$""" """$colour$""">>
-
-\define .tiddler-fields(tiddler)
-<$tiddler tiddler=<<__tiddler__>>>
-<div class="doc-tiddler-fields">
-<h2>
-<$link>
-<span class="tc-tiddler-title-icon">{{||$:/core/ui/TiddlerIcon}}</span><$text text=<<currentTiddler>>/>
-</$link>
-</h2>
-<table class="tc-view-field-table">
-<tbody>
-<$list filter="[all[current]fields[]sort[title]] -title" template="$:/core/ui/TiddlerFieldTemplate" variable="listItem"/>
-</tbody>
-</table>
-</div>
-</$tiddler>
-\end
-
-\define .banner-credits(credit,url)
-<img src=<<__url__>> width="140" style="float:left;margin-right:0.5em;"/>
-
-$credit$
-
-<div style="clear:both;">
-
-</div>
-\end
-
-<pre><$view field="text"/></pre>

editions/fr-FR/tiddlers/$__core_ui_ViewTemplate_title.tid

@@ -0,0 +1,46 @@
+created: 20141119191707140
+modified: 20141128165607841
+tags: $:/tags/ViewTemplate
+title: $:/core/ui/ViewTemplate/title
+type: text/vnd.tiddlywiki
+
+\define title-styles()
+fill:$(foregroundColor)$;
+\end
+\define config-title()
+$:/config/ViewToolbarButtons/Visibility/$(listItem)$
+\end
+<div class="tc-tiddler-title">
+<div class="tc-titlebar">
+<span class="tc-tiddler-controls">
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]]" variable="listItem"><$reveal type="nomatch" state=<<config-title>> text="hide"><$transclude tiddler=<<listItem>>/></$reveal></$list>
+</span>
+<$set name="tv-wikilinks" value={{$:/config/Tiddlers/TitleLinks}}>
+<$link>
+<$set name="foregroundColor" value={{!!color}}>
+<span class="tc-tiddler-title-icon" style=<<title-styles>>>
+<$transclude tiddler={{!!icon}}/>
+</span>
+</$set>
+<$list filter="[all[current]removeprefix[$:/]]">
+<h2 class="tc-title" title={{$:/language/SystemTiddler/Tooltip}}>
+<span class="tc-system-title-prefix">$:/</span><$text text=<<currentTiddler>>/>
+</h2>
+</$list>
+<$list filter="[all[current]!prefix[$:/]]">
+<h2 class="tc-title">
+<$view field="fr-title">
+<$view field="title"/>
+</$view>
+</h2>
+</$list>
+</$link>
+</$set>
+</div>
+
+<$reveal type="nomatch" text="" default="" state=<<tiddlerInfoState>> class="tc-tiddler-info tc-popup-handle" animate="yes" retain="yes">
+
+<$transclude tiddler="$:/core/ui/TiddlerInfo"/>
+
+</$reveal>
+</div>

editions/fr-FR/tiddlers/$__editions_fr-FR_util-macros.tid

@@ -36,4 +36,3 @@ type: text/vnd.tiddlywiki
 <!-- NO-BREAK SPACE Unicode: U+00A0, UTF-8: C2 A0, ISO-8859-1: A0 -->
 «&#160;$text$&#160;»
 \end
-\define fr(cible) <$link to="$cible$"><$view tiddler="$cible$" field="fr-title">{{$cible$!!title}}</$view></$link>

editions/fr-FR/tiddlers/Community Links Aggregator.tid

@@ -1,11 +0,0 @@
-created: 20210322151848025
-fr-title: Agrégateur de liens communautaire
-modified: 20220217174626896
-tags: Community
-title: Community Links Aggregator
-
-L'Agrégateur de liens communautaire est une collection fréquemment mise à jour de liens vers des ressources utiles et intéressantes sur <<tw>>, dénichés par notre équipe d'éditeurs communautaires. Le site agrège les liens soigneusement sélectionnés par les membres de la communauté <<tw>>. Il permet de visualiser les liens les plus récents, et de les explorer par catégorie et chronologiquement.
-
-https://links.tiddlywiki.com/
-
-Plus les contributeurs sont nombreux, et mieux le site fonctionne<<!>> Comme chacun n'est pas tenu de recenser chaque lien qui passe, la pression individuelle sur les contributeurs est réduite. L'agrégation des liens réduit aussi l'impact d'une erreur, par exemple d'une erreur de catégorisation<<:>> si un contributeur catégorise un lien dans la mauvaise rubrique, le site permet de voir qu'une seule personne a utilisé cette rubrique, alors que la majorité utilise la catégorie appropriée. Ainsi, nous espérons qu'une sorte de //intelligence collective// émergera, avec un consensus sur la manière la plus utile de décrire et de catégoriser les liens.

editions/fr-FR/tiddlers/Community.tid

@@ -1,12 +1,10 @@
-created: 20130909151600000
 fr-title: Communauté
-modified: 20220217155910582
+created: 20130909151600000
+modified: 20141019103047540
 tags: TableOfContents
 title: Community
 type: text/vnd.tiddlywiki
 
-<<.tip "Les liens les plus utiles et les plus récents sont maintenant regroupés dans [[l’Agrégateur de liens communautaire|Community Links Aggregator]].">>
+C'est ici que nous rassemblons les dernières productions les plus utiles en provenance de la communauté <<tw>>.
 
-Lorsque tous les liens pertinents auront été transférés, ces entrées seront retirées du site tiddlywiki.com.
-
-<<tabs "Forums Latest Tutorials [[Community Editions]] [[Community Plugins]] [[Community Themes]] [[Community Palettes]] [[Other Resources]] Examples Articles Meetups" "Latest">>
+<<tabs "Forums Latest Tutorials Resources Examples Articles Meetups" "Latest">>

editions/fr-FR/tiddlers/Developers.tid

@@ -1,17 +1,12 @@
 created: 20150412191004348
 fr-title: Développeurs
-modified: 20220217174800697
+modified: 20150621192259510
 tags: Community
 title: Developers
 type: text/vnd.tiddlywiki
 
-Plusieurs ressources permettent aux développeurs d'en apprendre plus sur <<tw>>, de collaborer et de discuter de son développement.
+Les développeurs disposent de plusieurs ressources pour discuter et contribuer au développement de TiddlyWiki.
 
-* [[tiddlywiki.com/dev|https://tiddlywiki.com/dev]] est la documentation officielle des développeurs
-* Vous pouvez vous impliquer dans le développement de <<tw>> sur [[GitHub|https://github.com/Jermolene/TiddlyWiki5]]
-** Les [[discussions|https://github.com/Jermolene/TiddlyWiki5/discussions]] sont disponibles pour les questions ouvertes et les questions/réponses.
-** Les [[problèmes|https://github.com/Jermolene/TiddlyWiki5/issues]] permettent de signaler les bogues et de proposer de nouvelles idées spécifiques, réalistes et raisonnables
-* L'ancien groupe ~TiddlyWikiDev sur Google Group est maintenant fermé, et remplacé par les [[discussions GitHub|https://github.com/Jermolene/TiddlyWiki5/discussions]], mais une archive reste disponible<<:>> https://groups.google.com/group/TiddlyWikiDev
-** Une fonctionnalité de recherche étendue du groupe est disponible sur [[mail-archive.com|https://www.mail-archive.com/tiddlywikidev@googlegroups.com/]]
-* Pour les dernières nouvelles, suivez [[@TiddlyWiki sur Twitter|http://twitter.com/#!/TiddlyWiki]]
-* Tchatchez sur https://gitter.im/TiddlyWiki/public (une salle dédiée au développement arrive bientôt)
+* [[tiddlywiki.com/dev|https://tiddlywiki.com/dev]] la documentation officielle de développement 
+* [[TiddlyWikiDev group|http://groups.google.com/group/TiddlyWikiDev]] pour les discussions au sujet du développement de TiddlyWiki
+* https://github.com/Jermolene/TiddlyWiki5 pour le code source et l'activité de développement