Fix new selection tracker to return relative coordinates

* Fix nesting of block elements inside inline elements in the edit template

* Fix typo in previous commit

.eslintignore

@@ -1,15 +1,8 @@
-# Known minified files
+# Ignore "third party" code whose style we will not change.
 /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
-/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
+/core/modules/utils/diff-match-patch/diff_match_patch_uncompressed.js
+/core/modules/utils/dom/csscolorparser.js
+/plugins/tiddlywiki/*/files/

.eslintrc.yml

@@ -64,7 +64,23 @@ rules:
   init-declarations: 'off'
   jsx-quotes: error
   key-spacing: 'off'
-  keyword-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
   line-comment-position: 'off'
   linebreak-style: 'off'
   lines-around-comment: 'off'

.github/workflows/ci.yml

@@ -72,3 +72,6 @@ jobs:
       - run: "./bin/ci-push.sh"
         env:
           GH_TOKEN: ${{ secrets.GITHUBPUSHTOKEN }}
+      - run: "./bin/build-tw-org.sh"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUBPUSHTOKEN }}

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

bin/build-tw-org.sh

@@ -0,0 +1,97 @@
+#!/bin/bash
+
+# Build tiddlywiki.org assets.
+
+# Default to the version of TiddlyWiki installed in this repo
+
+if [  -z "$TWORG_BUILD_TIDDLYWIKI" ]; then
+    TWORG_BUILD_TIDDLYWIKI=./tiddlywiki.js
+fi
+
+echo "Using TWORG_BUILD_TIDDLYWIKI as [$TWORG_BUILD_TIDDLYWIKI]"
+
+# Set up the build details
+
+if [  -z "$TWORG_BUILD_DETAILS" ]; then
+    TWORG_BUILD_DETAILS="$(git symbolic-ref --short HEAD)-$(git rev-parse HEAD) from $(git remote get-url origin)"
+fi
+
+echo "Using TWORG_BUILD_DETAILS as [$TWORG_BUILD_DETAILS]"
+
+if [  -z "$TWORG_BUILD_COMMIT" ]; then
+	TWORG_BUILD_COMMIT="$(git rev-parse HEAD)"
+fi
+
+echo "Using TWORG_BUILD_COMMIT as [$TWORG_BUILD_COMMIT]"
+
+# Set up the build output directory
+
+if [  -z "$TWORG_BUILD_OUTPUT" ]; then
+    TWORG_BUILD_OUTPUT=$(mktemp -d)
+fi
+
+mkdir -p $TWORG_BUILD_OUTPUT
+
+if [  ! -d "$TWORG_BUILD_OUTPUT" ]; then
+    echo 'A valid TWORG_BUILD_OUTPUT environment variable must be set'
+    exit 1
+fi
+
+echo "Using TWORG_BUILD_OUTPUT as [$TWORG_BUILD_OUTPUT]"
+
+# Pull existing GitHub pages content
+
+git clone --depth=1 --branch=main "https://github.com/TiddlyWiki/tiddlywiki.org-gh-pages.git" $TWORG_BUILD_OUTPUT
+
+# Make the CNAME file that GitHub Pages requires
+
+echo "tiddlywiki.org" > $TWORG_BUILD_OUTPUT/CNAME
+
+# Delete any existing static content
+
+mkdir -p $TWORG_BUILD_OUTPUT/static
+rm $TWORG_BUILD_OUTPUT/static/*
+
+# Put the build details into a .tid file so that it can be included in each build (deleted at the end of this script)
+
+echo -e -n "title: $:/build\ncommit: $TWORG_BUILD_COMMIT\n\n$TWORG_BUILD_DETAILS\n" > $TWORG_BUILD_OUTPUT/build.tid
+
+######################################################
+#
+# tiddlywiki.org distribution
+#
+######################################################
+
+# /index.html			Main site
+# /favicon.ico			Favicon for main site
+# /static.html			Static rendering of default tiddlers
+# /alltiddlers.html		Static rendering of all tiddlers
+# /static/*				Static single tiddlers
+# /static/static.css	Static stylesheet
+# /static/favicon.ico	Favicon for static pages
+node $TWORG_BUILD_TIDDLYWIKI \
+	editions/tw.org \
+	--verbose \
+	--version \
+	--load $TWORG_BUILD_OUTPUT/build.tid \
+	--output $TWORG_BUILD_OUTPUT \
+	--build favicon static index \
+	|| exit 1
+
+# Delete the temporary build tiddler
+
+rm $TWORG_BUILD_OUTPUT/build.tid || exit 1
+
+# Push output back to GitHub
+
+# Exit script immediately if any command fails
+set -e
+
+pushd $TWORG_BUILD_OUTPUT
+git config --global user.email "actions@github.com"
+git config --global user.name "GitHub Actions"
+git add -A .
+git commit --message "GitHub build: $GITHUB_RUN_NUMBER of $TW5_BUILD_BRANCH ($(date +'%F %T %Z'))"
+git remote add deploy "https://$GH_TOKEN@github.com/TiddlyWiki/tiddlywiki.org-gh-pages.git" &>/dev/null
+git push deploy main &>/dev/null
+popd

boot/boot.js

@@ -68,6 +68,26 @@ $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)
@@ -409,6 +429,19 @@ $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
@@ -1081,7 +1114,7 @@ $tw.Wiki = function(options) {
 		tiddlerTitles = null, // Array of tiddler titles
 		getTiddlerTitles = function() {
 			if(!tiddlerTitles) {
-				tiddlerTitles = Object.keys(tiddlers);
+				tiddlerTitles = Object.keys(tiddlers).sort(function(a,b) {return a.localeCompare(b);});
 			}
 			return tiddlerTitles;
 		},
@@ -1134,10 +1167,8 @@ $tw.Wiki = function(options) {
 				}
 				// Save the new tiddler
 				tiddlers[title] = tiddler;
-				// Check we've got it's title
-				if(tiddlerTitles && tiddlerTitles.indexOf(title) === -1) {
-					tiddlerTitles.push(title);
-				}
+				// Check we've got the title
+				tiddlerTitles = $tw.utils.insertSortedArray(tiddlerTitles || [],title);
 				// Record the new tiddler state
 				updateDescriptor["new"] = {
 					tiddler: tiddler,
@@ -1322,7 +1353,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] = JSON.parse(tiddler.fields.text);
+					pluginInfo[tiddler.fields.title] = $tw.utils.parseJSONSafe(tiddler.fields.text);
 					results.modifiedPlugins.push(tiddler.fields.title);
 				}
 			} else {
@@ -1455,7 +1486,7 @@ $tw.Wiki.prototype.defineTiddlerModules = function() {
 					}
 					break;
 				case "application/json":
-					$tw.modules.define(tiddler.fields.title,tiddler.fields["module-type"],JSON.parse(tiddler.fields.text));
+					$tw.modules.define(tiddler.fields.title,tiddler.fields["module-type"],$tw.utils.parseJSONSafe(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));
@@ -1644,12 +1675,7 @@ $tw.modules.define("$:/boot/tiddlerdeserializer/json","tiddlerdeserializer",{
 				}
 				return true;
 			},
-			data = {};
-		try {
-			data = JSON.parse(text);			
-		} catch(e) {
-			// Ignore JSON parse errors
-		}
+			data = $tw.utils.parseJSONSafe(text);
 		if($tw.utils.isArray(data) && isTiddlerArrayValid(data)) {
 			return data;
 		} else if(isTiddlerValid(data)) {
@@ -1689,7 +1715,7 @@ $tw.boot.decryptEncryptedTiddlers = function(callback) {
 				$tw.crypto.setPassword(data.password);
 				var decryptedText = $tw.crypto.decrypt(encryptedText);
 				if(decryptedText) {
-					var json = JSON.parse(decryptedText);
+					var json = $tw.utils.parseJSONSafe(decryptedText);
 					for(var title in json) {
 						$tw.preloadTiddler(json[title]);
 					}
@@ -1889,7 +1915,7 @@ filepath: pathname of the directory containing the specification file
 $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
 	var tiddlers = [];
 	// Read the specification
-	var filesInfo = JSON.parse(fs.readFileSync(filepath + path.sep + "tiddlywiki.files","utf8"));
+	var filesInfo = $tw.utils.parseJSONSafe(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)],
@@ -2019,7 +2045,7 @@ $tw.loadPluginFolder = function(filepath,excludeRegExp) {
 			console.log("Warning: missing plugin.info file in " + filepath);
 			return null;
 		}
-		var pluginInfo = JSON.parse(fs.readFileSync(infoPath,"utf8"));
+		var pluginInfo = $tw.utils.parseJSONSafe(fs.readFileSync(infoPath,"utf8"));
 		// Read the plugin files
 		var pluginFiles = $tw.loadTiddlersFromPath(filepath,excludeRegExp);
 		// Save the plugin tiddlers into the plugin info
@@ -2136,7 +2162,7 @@ $tw.loadWikiTiddlers = function(wikiPath,options) {
 		pluginFields;
 	// Bail if we don't have a wiki info file
 	if(fs.existsSync(wikiInfoPath)) {
-		wikiInfo = JSON.parse(fs.readFileSync(wikiInfoPath,"utf8"));
+		wikiInfo = $tw.utils.parseJSONSafe(fs.readFileSync(wikiInfoPath,"utf8"));
 	} else {
 		return null;
 	}
@@ -2649,3 +2675,4 @@ if(typeof(exports) !== "undefined") {
 } else {
 	_boot(window.$tw);
 }
+//# sourceURL=$:/boot/boot.js

boot/bootprefix.js

@@ -117,3 +117,4 @@ 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-2021, UnaMesa Association
+Copyright (c) 2007-2022, UnaMesa Association
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

core/language/en-GB/ControlPanel.multids

@@ -36,6 +36,8 @@ EditorTypes/Hint: These tiddlers determine which editor is used to edit specific
 EditorTypes/Type/Caption: Type
 EditTemplateBody/Caption: Edit Template Body
 EditTemplateBody/Hint: This rule cascade is used by the default edit template to dynamically choose the template for editing the body of a tiddler.
+FieldEditor/Caption: Field Editor
+FieldEditor/Hint: This rules cascade is used to dynamically choose the template for rendering a tiddler field based on its name. It is used within the Edit Template.
 Info/Caption: Info
 Info/Hint: Information about this TiddlyWiki
 KeyboardShortcuts/Add/Prompt: Type shortcut here
@@ -226,4 +228,4 @@ Tools/Download/Full/Caption: Download full wiki
 ViewTemplateBody/Caption: View Template Body
 ViewTemplateBody/Hint: This rule cascade is used by the default view template to dynamically choose the template for displaying the body of a tiddler.
 ViewTemplateTitle/Caption: View Template Title
-ViewTemplateTitle/Hint: This rule cascade is used by the default view template to dynamically choose the template for displaying the title of a tiddler.
+ViewTemplateTitle/Hint: This rule cascade is used by the default view template to dynamically choose the template for displaying the title of a tiddler.

core/language/en-GB/Fields.multids

@@ -3,6 +3,7 @@ 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]]
@@ -13,9 +14,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
@@ -32,7 +33,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 here (or use the 'Escape' key to cancel)
+DropMessage: Drop now (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 = JSON.parse(fs.readFileSync(packagePath));
+		packageJson = $tw.utils.parseJSONSafe(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 = JSON.parse(tiddler.text),
+		var pluginTiddlers = $tw.utils.parseJSONSafe(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 = JSON.parse(pluginTiddler.fields.text).tiddlers; // A hashmap of tiddlers in the plugin
+	var pluginTiddlers = $tw.utils.parseJSONSafe(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,16 +17,13 @@ exports["application/x-tiddler-html-div"] = function(text,fields) {
 };
 
 exports["application/json"] = function(text,fields) {
-	var incoming,
-		results = [];
-	try {
-		incoming = JSON.parse(text);
-	} catch(e) {
-		incoming = [{
-			title: "JSON error: " + e,
-			text: ""
-		}]
-	}
+	var results = [],
+		incoming = $tw.utils.parseJSONSafe(text,function(err) {
+			return [{
+				title: "JSON error: " + err,
+				text: ""
+			}];
+		});
 	if(!$tw.utils.isArray(incoming)) {
 		incoming = [incoming];
 	}

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

@@ -13,15 +13,17 @@ 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 = event.paramObject.prefix + "\n" +
+	operation.replacement = prefix + "\n" +
 				operation.text.substring(operation.cutStart,operation.cutEnd) + "\n" +
-				event.paramObject.suffix + "\n";
-	operation.newSelStart = operation.cutStart + event.paramObject.prefix.length + 1;
+				suffix + "\n";
+	operation.newSelStart = operation.cutStart + prefix.length + 1;
 	operation.newSelEnd = operation.newSelStart + (operation.cutEnd - operation.cutStart);
 };
 

core/modules/filters.js

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

core/modules/filters/crypto.js

@@ -0,0 +1,27 @@
+/*\
+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 = options.widget && options.widget.getVariable(operator.suffix || "currentTiddler");
+	var target = operator.operands[1] || (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 || !$tw.utils.hop(tiddler.fields,"draft.of")) {
+			if(!tiddler || !tiddler.isDraft()) {
 				results.push(title);
 			}
 		});
 	} else {
 		source(function(tiddler,title) {
-			if(tiddler && $tw.utils.hop(tiddler.fields,"draft.of") && (tiddler.fields["draft.of"].length !== 0)) {
+			if(tiddler && tiddler.isDraft()) {
 				results.push(title);
 			}
 		});

core/modules/filters/json-ops.js

@@ -0,0 +1,167 @@
+/*\
+title: $:/core/modules/filters/json-ops.js
+type: application/javascript
+module-type: filteroperator
+
+Filter operators for JSON operations
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+exports["getjson"] = function(source,operator,options) {
+	var results = [];
+	source(function(tiddler,title) {
+		var data = options.wiki.getTiddlerDataCached(title);
+		if(data) {
+			var item = getDataItemValueAsStrings(data,operator.operands);
+			if(item !== undefined) {
+				results.push.apply(results,item);
+			}
+		}
+	});
+	return results;
+};
+
+exports["indexesjson"] = function(source,operator,options) {
+	var results = [];
+	source(function(tiddler,title) {
+		var data = options.wiki.getTiddlerDataCached(title);
+		if(data) {
+			var item = getDataItemKeysAsStrings(data,operator.operands);
+			if(item !== undefined) {
+				results.push.apply(results,item);
+			}
+		}
+	});
+	return results;
+};
+
+exports["typejson"] = function(source,operator,options) {
+	var results = [];
+	source(function(tiddler,title) {
+		var data = options.wiki.getTiddlerDataCached(title);
+		if(data) {
+			var item = getDataItemType(data,operator.operands);
+			if(item !== undefined) {
+				results.push(item);
+			}
+		}
+	});
+	return results;
+};
+
+/*
+Given a JSON data structure and an array of index strings, return an array of the string representation of the values at the end of the index chain, or "undefined" if any of the index strings are invalid
+*/
+function getDataItemValueAsStrings(data,indexes) {
+	// Get the item
+	var item = getDataItem(data,indexes);
+	// Return the item as a string
+	return convertDataItemValueToStrings(item);
+}
+
+/*
+Given a JSON data structure and an array of index strings, return an array of the string representation of the keys of the item at the end of the index chain, or "undefined" if any of the index strings are invalid
+*/
+function getDataItemKeysAsStrings(data,indexes) {
+	// Get the item
+	var item = getDataItem(data,indexes);
+	// Return the item keys as a string
+	return convertDataItemKeysToStrings(item);
+}
+
+/*
+Return an array of the string representation of the values of a data item, or "undefined" if the item is undefined
+*/
+function convertDataItemValueToStrings(item) {
+	// Return the item as a string
+	if(item === undefined) {
+		return item;
+	}
+	if(typeof item === "object") {
+		if(item === null) {
+			return ["null"];
+		}
+		var results = [];
+		if($tw.utils.isArray(item)) {
+			$tw.utils.each(item,function(value) {
+				results.push.apply(results,convertDataItemValueToStrings(value));
+			});
+			return results;
+		} else {
+			$tw.utils.each(Object.keys(item).sort(),function(key) {
+				results.push.apply(results,convertDataItemValueToStrings(item[key]));
+			});
+			return results;
+		}
+	}
+	return [item.toString()];
+}
+
+/*
+Return an array of the string representation of the keys of a data item, or "undefined" if the item is undefined
+*/
+function convertDataItemKeysToStrings(item) {
+	// Return the item as a string
+	if(item === undefined) {
+		return item;
+	} else if(typeof item === "object") {
+		if(item === null) {
+			return [];
+		}
+		var results = [];
+		if($tw.utils.isArray(item)) {
+			for(var i=0; i<item.length; i++) {
+				results.push(i.toString());
+			}
+			return results;
+		} else {
+			$tw.utils.each(Object.keys(item).sort(),function(key) {
+				results.push(key);
+			});
+			return results;
+		}
+	}
+	return [];
+}
+
+function getDataItemType(data,indexes) {
+	// Get the item
+	var item = getDataItem(data,indexes);
+	// Return the item type
+	if(item === undefined) {
+		return item;
+	} else if(item === null) {
+		return "null";
+	} else if($tw.utils.isArray(item)) {
+		return "array";
+	} else if(typeof item === "object") {
+		return "object";
+	} else {
+		return typeof item;
+	}
+}
+
+/*
+Given a JSON data structure and an array of index strings, return the value at the end of the index chain, or "undefined" if any of the index strings are invalid
+*/
+function getDataItem(data,indexes) {
+	if(indexes.length === 0 || (indexes.length === 1 && indexes[0] === "")) {
+		return data;
+	}
+	// Get the item
+	var item = data;
+	for(var i=0; i<indexes.length; i++) {
+		if(item !== undefined) {
+			item = item[indexes[i]];
+		}
+	}
+	return item;
+}
+
+})();
+	

core/modules/filters/listops.js

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

core/modules/filters/lookup.js

@@ -5,9 +5,11 @@ module-type: filteroperator
 
 Filter operator that looks up values via a title prefix
 
-[lookup:<field>[<prefix>]]
+[lookup:<defaultvalue>:<field OR index>[<prefix>],[<field-name OR index-name>]]
 
-Prepends the prefix to the selected items and returns the specified field value
+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
 
 \*/
 (function(){
@@ -20,10 +22,31 @@ Prepends the prefix to the selected items and returns the specified field value
 Export our filter function
 */
 exports.lookup = function(source,operator,options) {
-	var results = [];
-	source(function(tiddler,title) {
-		results.push(options.wiki.getTiddlerText(operator.operand + title) || operator.suffix || '');
-	});
+	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);
+		});
+	}
 	return results;
 };
 

core/modules/filters/prefix.js

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

core/modules/filters/removeprefix.js

@@ -16,12 +16,22 @@ 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 = [];
-	source(function(tiddler,title) {
-		if(title.substr(0,operator.operand.length) === operator.operand) {
-			results.push(title.substr(operator.operand.length));
-		}
-	});
+	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));
+			}
+		});
+	}
 	return results;
 };
 

core/modules/filters/removesuffix.js

@@ -16,12 +16,26 @@ 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 = [];
-	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 = [],
+		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));
+			}
+		});
+	}
 	return results;
 };
 

core/modules/filters/search.js

@@ -40,6 +40,7 @@ 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,19 +16,41 @@ Filter operator for checking if a title ends with a suffix
 Export our filter function
 */
 exports.suffix = function(source,operator,options) {
-	var results = [];
-	if(operator.prefix === "!") {
+	var results = [],
+		suffixes = (operator.suffixes || [])[0] || [];
+	if (!operator.operand) {
 		source(function(tiddler,title) {
-			if(title.substr(-operator.operand.length) !== operator.operand) {
-				results.push(title);
-			}
+			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 {
-		source(function(tiddler,title) {
-			if(title.substr(-operator.operand.length) === operator.operand) {
-				results.push(title);
-			}
-		});
+		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);
+				}
+			});
+		}
 	}
 	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) {
+		if(((tiddler && $tw.utils.isArray(tiddler.fields.tags) && tiddler.fields.tags.length > 0) === expected) || (!tiddler && !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:, valueType: "string|indirect|macro", value:, start:, end:,}
+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:,}
 */
 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 = /\{\{\{(.+?)\}\}\}/g,
+		reFilteredValue = /\{\{\{([\S\s]+?)\}\}\}/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 = JSON.parse(self.wiki.getTiddlerText(title)),
+				var pluginInfo = $tw.utils.parseJSONSafe(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 = JSON.parse(getResponseDataJson);
+				getResponseData = $tw.utils.parseJSONSafe(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 = JSON.parse(putResponseDataJson);
+			var putResponseData = $tw.utils.parseJSONSafe(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 = JSON.parse(getResponseDataJson);
+				getResponseData = $tw.utils.parseJSONSafe(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 = JSON.parse(putResponseDataJson);
+					var putResponseData = $tw.utils.parseJSONSafe(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 = JSON.parse(getResponseDataJson);
+				getResponseData = $tw.utils.parseJSONSafe(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 = JSON.parse(putResponseDataJson);
+					var putResponseData = $tw.utils.parseJSONSafe(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 = JSON.parse(state.data);
+	fields = $tw.utils.parseJSONSafe(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,7 +34,6 @@ 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) {
@@ -44,7 +43,8 @@ function Server(options) {
 			}
 		}
 	}
-	$tw.utils.extend({},this.defaultVariables,options.variables);
+	// Setup the default required plugins
+	this.requiredPlugins = this.get("required-plugins").split(',');
 	// Initialise CSRF
 	this.csrfDisable = this.get("csrf-disable") === "yes";
 	// Initialize Gzip compression
@@ -52,14 +52,24 @@ function Server(options) {
 	// Initialize browser-caching
 	this.enableBrowserCache = this.get("use-browser-cache") === "yes";
 	// Initialise authorization
-	var authorizedUserName = (this.get("username") && this.get("password")) ? this.get("username") : "(anon)";
+	var authorizedUserName;
+	if(this.get("username") && this.get("password")) {
+		authorizedUserName = this.get("username");
+	} else if(this.get("credentials")) {
+		authorizedUserName = "(authenticated)";
+	} else {
+		authorizedUserName = "(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 server route " + title);
+		// console.log("Loading authenticator " + title);
 		self.addAuthenticator(authenticatorDefinition.AuthenticatorClass);
 	});
 	// Load route handlers
@@ -71,15 +81,21 @@ function Server(options) {
 	this.listenOptions = null;
 	this.protocol = "http";
 	var tlsKeyFilepath = this.get("tls-key"),
-		tlsCertFilepath = this.get("tls-cert");
+		tlsCertFilepath = this.get("tls-cert"),
+		tlsPassphrase = this.get("tls-passphrase");
 	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")
+			cert: fs.readFileSync(path.resolve(this.boot.wikiPath,tlsCertFilepath),"utf8"),
+			passphrase: tlsPassphrase || ''
 		};
 		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") || "";
 }
 
 /*
@@ -150,6 +166,7 @@ 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",
@@ -239,15 +256,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
-	var authorizationType = this.methodMappings[request.method] || "readers";
+	state.authorizationType = options.authorizationType || this.methodMappings[request.method] || "readers";
 	// Check for the CSRF header if this is a write
-	if(!this.csrfDisable && authorizationType === "writers" && request.headers["x-requested-with"] !== "TiddlyWiki") {
+	if(!this.csrfDisable && state.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(authorizationType,null);
+	state.allowAnon = this.isAuthorized(state.authorizationType,null);
 	// Authenticate with the first active authenticator
 	if(this.authenticators.length > 0) {
 		if(!this.authenticators[0].authenticateRequest(request,response,state)) {
@@ -256,7 +273,7 @@ Server.prototype.requestHandler = function(request,response,options) {
 		}
 	}
 	// Authorize with the authenticated username
-	if(!this.isAuthorized(authorizationType,state.authenticatedUsername)) {
+	if(!this.isAuthorized(state.authorizationType,state.authenticatedUsername)) {
 		response.writeHead(401,"'" + state.authenticatedUsername + "' is not authorized to access '" + this.servername + "'");
 		response.end();
 		return;
@@ -322,8 +339,16 @@ Server.prototype.listen = function(port,host,prefix) {
 		port = process.env[port] || 8080;
 	}
 	// Warn if required plugins are missing
-	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");
+	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);
 	}
 	// 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 = JSON.parse(event.data.body);
+							var tiddlers = $tw.utils.parseJSONSafe(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 = JSON.parse(event.data.body);
+							var tiddler = $tw.utils.parseJSONSafe(event.data.body);
 							$tw.wiki.addTiddler(new $tw.Tiddler(tiddler));
 						}
 					}

core/modules/startup/render.js

@@ -42,12 +42,17 @@ exports.startup = function() {
 	$tw.styleWidgetNode = $tw.wiki.makeTranscludeWidget(PAGE_STYLESHEET_TITLE,{document: $tw.fakeDocument});
 	$tw.styleContainer = $tw.fakeDocument.createElement("style");
 	$tw.styleWidgetNode.render($tw.styleContainer,null);
+	$tw.styleWidgetNode.assignedStyles = $tw.styleContainer.textContent;
 	$tw.styleElement = document.createElement("style");
-	$tw.styleElement.innerHTML = $tw.styleContainer.textContent;
+	$tw.styleElement.innerHTML = $tw.styleWidgetNode.assignedStyles;
 	document.head.insertBefore($tw.styleElement,document.head.firstChild);
 	$tw.wiki.addEventListener("change",$tw.perf.report("styleRefresh",function(changes) {
 		if($tw.styleWidgetNode.refresh(changes,$tw.styleContainer,null)) {
-			$tw.styleElement.innerHTML = $tw.styleContainer.textContent;
+			var newStyles = $tw.styleContainer.textContent;
+			if(newStyles !== $tw.styleWidgetNode.assignedStyles) {
+				$tw.styleWidgetNode.assignedStyles = newStyles;
+				$tw.styleElement.innerHTML = $tw.styleWidgetNode.assignedStyles;
+			}
 		}
 	}));
 	// Display the $:/core/ui/PageTemplate tiddler to kick off the display

core/modules/startup/rootwidget.js

@@ -51,6 +51,20 @@ 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,6 +20,8 @@ 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
@@ -29,22 +31,25 @@ exports.startup = function() {
 			title = event.param || event.tiddlerTitle,
 			paramObject = event.paramObject || {},
 			windowTitle = paramObject.windowTitle || title,
-			template = paramObject.template || "$:/core/templates/single.tiddler.window",
+			windowID = paramObject.windowID || title,
+			template = paramObject.template || DEFAULT_WINDOW_TEMPLATE,
 			width = paramObject.width || "700",
 			height = paramObject.height || "600",
-			variables = $tw.utils.extend({},paramObject,{currentTiddler: title});
+			top = paramObject.top,
+			left = paramObject.left,
+			variables = $tw.utils.extend({},paramObject,{currentTiddler: title, "tv-window-id": windowID});
 		// Open the window
 		var srcWindow,
 		    srcDocument;
 		// In case that popup blockers deny opening a new window
 		try {
-			srcWindow = window.open("","external-" + title,"scrollbars,width=" + width + ",height=" + height),
+			srcWindow = window.open("","external-" + windowID,"scrollbars,width=" + width + ",height=" + height + (top ? ",top=" + top : "" ) + (left ? ",left=" + left : "" )),
 			srcDocument = srcWindow.document;
 		}
 		catch(e) {
 			return;
 		}
-		$tw.windows[title] = srcWindow;
+		$tw.windows[windowID] = srcWindow;
 		// Check for reopening the same window
 		if(srcWindow.haveInitialisedWindow) {
 			return;
@@ -54,7 +59,7 @@ exports.startup = function() {
 		srcDocument.close();
 		srcDocument.title = windowTitle;
 		srcWindow.addEventListener("beforeunload",function(event) {
-			delete $tw.windows[title];
+			delete $tw.windows[windowID];
 			$tw.wiki.removeEventListener("change",refreshHandler);
 		},false);
 		// Set up the styles
@@ -88,13 +93,21 @@ exports.startup = function() {
 		srcWindow.document.documentElement.addEventListener("click",$tw.popup,true);
 		srcWindow.haveInitialisedWindow = true;
 	});
-	// Close open windows when unloading main window
-	$tw.addUnloadTask(function() {
+	$tw.rootWidget.addEventListener("tm-close-window",function(event) {
+		var windowID = event.param,
+			win = $tw.windows[windowID];
+			if(win) {
+				win.close();
+			}
+	});
+	var closeAllWindows = 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) {
+exports.getFieldString = function(field,defaultValue) {
 	var value = this.fields[field];
 	// Check for a missing field
 	if(value === undefined || value === null) {
-		return "";
+		return defaultValue || "";
 	}
-	// Parse the field with the associated module (if any)
+	// Stringify the field with the associated tiddler field 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(JSON.parse(incomingTiddler.text)) ? (wiki.getTiddlerText("$:/language/ControlPanel/Plugins/PluginWillRequireReload") + " ") : "";
+			var requiresReload = wiki.doesPluginInfoRequireReload($tw.utils.parseJSONSafe(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-1));
+			return $tw.utils.htmlDecode(text.substring(encryptedStoreAreaStart + encryptedStoreAreaStartMarker.length,encryptedStoreAreaEnd));
 		}
 	}
 	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 = JSON.parse(decryptedText),
+		var json = $tw.utils.parseJSONSafe(decryptedText),
 			tiddlers = [];
 		for(var title in json) {
 			if(title !== "$:/isEncrypted") {

core/modules/utils/dom/dragndrop.js

@@ -16,21 +16,23 @@ 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 contect for the filter
+widget: widget to use as the context for the filter
 */
 exports.makeDraggable = function(options) {
 	var dragImageType = options.dragImageType || "dom",
 		dragImage,
-		domNode = options.domNode;
+		domNode = options.domNode,
+		dragHandle = options.selector && domNode.querySelector(options.selector) || domNode;
 	// Make the dom node draggable (not necessary for anchor tags)
 	if((domNode.tagName || "").toLowerCase() !== "a") {
-		domNode.setAttribute("draggable","true");
+		dragHandle.setAttribute("draggable","true");
 	}
 	// Add event handlers
-	$tw.utils.addEventListeners(domNode,[
+	$tw.utils.addEventListeners(dragHandle,[
 		{name: "dragstart", handlerFunction: function(event) {
 			if(event.dataTransfer === undefined) {
 				return false;
@@ -45,7 +47,7 @@ exports.makeDraggable = function(options) {
 			}
 			var titleString = $tw.utils.stringifyList(titles);
 			// Check that we've something to drag
-			if(titles.length > 0 && event.target === domNode) {
+			if(titles.length > 0 && event.target === dragHandle) {
 				// Mark the drag in progress
 				$tw.dragInProgress = domNode;
 				// Set the dragging class on the element being dragged
@@ -198,7 +200,7 @@ var importDataTypes = [
 ];
 
 function parseJSONTiddlers(json,fallbackTitle) {
-	var data = JSON.parse(json);
+	var data = $tw.utils.parseJSONSafe(json);
 	if(!$tw.utils.isArray(data)) {
 		data = [data];
 	}

core/modules/utils/dom/scroller.js

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

core/modules/utils/edition-info.js

@@ -30,11 +30,7 @@ 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;
-					try {
-						info = JSON.parse(fs.readFileSync(path.resolve(editionPath,entry,"tiddlywiki.info"),"utf8"));
-					} catch(ex) {
-					}
+					var info = $tw.utils.parseJSONSafe(fs.readFileSync(path.resolve(editionPath,entry,"tiddlywiki.info"),"utf8"),null);
 					if(info) {
 						editionInfo[entry] = info;
 					}

core/modules/utils/pluginmaker.js

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

core/modules/widgets/action-listops.js

@@ -71,8 +71,8 @@ ActionListopsWidget.prototype.invokeAction = function(triggeringWidget,
 	}
 	if(this.subfilter) {
 		var inputList = this.wiki.getTiddlerList(this.target,field,index),
-			subfilter = $tw.utils.stringifyList(inputList) + " " + this.subfilter;
-		this.wiki.setText(this.target, field, index, $tw.utils.stringifyList(this.wiki.filterTiddlers(subfilter,this)));
+			subfilter = "[all[]] " + this.subfilter;
+		this.wiki.setText(this.target, field, index, $tw.utils.stringifyList(this.wiki.filterTiddlers(subfilter,this,this.wiki.makeTiddlerIterator(inputList))));
 	}
 	if(this.filtertags) {
 		var tiddler = this.wiki.getTiddler(this.target),

core/modules/widgets/button.js

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

core/modules/widgets/draggable.js

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

core/modules/widgets/eventcatcher.js

@@ -46,6 +46,7 @@ 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,
@@ -56,46 +57,49 @@ 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;
 				}
-				// 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 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();
-						}
-					}
-				} else {
+				// 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 + ")";
+
+					//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 the viewport
+						variables["event-fromviewport-posx"] = event.clientX.toString();
+						variables["event-fromviewport-posy"] = event.clientY.toString();
+					}
+				}
 			}
 			// Execute our actions with the variables
 			if(actions) {

core/modules/widgets/image.js

@@ -111,6 +111,16 @@ 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);
+		var parser = widgetPointer.wiki.parseTiddler(title,{parseAsInline:true});
 		if(parser) {
 			var parseTreeNode = parser.tree[0];
 			while(parseTreeNode && parseTreeNode.type === "set") {

core/modules/widgets/list.js

@@ -51,6 +51,9 @@ 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,8 +44,7 @@ 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-rename-tiddler", handler: "handleRenameTiddlerEvent"}
+		{type: "tm-unfold-all-tiddlers", handler: "handleUnfoldAllTiddlersEvent"}
 	]);
 	this.parentDomNode = parent;
 	this.computeAttributes();
@@ -499,11 +498,7 @@ NavigatorWidget.prototype.handleNewTiddlerEvent = function(event) {
 // Import JSON tiddlers into a pending import tiddler
 NavigatorWidget.prototype.handleImportTiddlersEvent = function(event) {
 	// Get the tiddlers
-	var tiddlers = [];
-	try {
-		tiddlers = JSON.parse(event.param);
-	} catch(e) {
-	}
+	var tiddlers = $tw.utils.parseJSONSafe(event.param,[]);
 	// Get the current $:/Import tiddler
 	var importTitle = event.importTitle ? event.importTitle : IMPORT_TITLE,
 		importTiddler = this.wiki.getTiddler(importTitle),
@@ -636,16 +631,6 @@ 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);
+			value = this.wiki.extractTiddlerDataItem(this.radioTitle,this.radioIndex,this.radioDefault);
 		} else {
-			value = tiddler.getFieldString(this.radioField);
+			value = tiddler.getFieldString(this.radioField,this.radioDefault);
 		}
 	} else {
 		value = this.radioDefault;

core/modules/widgets/scrollable.js

@@ -38,10 +38,14 @@ 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);
+		this.scrollSelectorIntoView(null,event.paramObject.selector,null,options);
 	} else {
-		this.scrollIntoView(event.target);
+		this.scrollIntoView(event.target,null,options);
 	}
 	return false; // Handled event
 };
@@ -49,9 +53,9 @@ ScrollableWidget.prototype.handleScrollEvent = function(event) {
 /*
 Scroll an element into view
 */
-ScrollableWidget.prototype.scrollIntoView = function(element) {
-	var duration = $tw.utils.getAnimationDuration(),
-	srcWindow = element ? element.ownerDocument.defaultView : window;
+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;
 	this.cancelScroll();
 	this.startTime = Date.now();
 	var scrollPosition = {
@@ -114,11 +118,11 @@ ScrollableWidget.prototype.scrollIntoView = function(element) {
 	}
 };
 
-ScrollableWidget.prototype.scrollSelectorIntoView = function(baseElement,selector,callback) {
+ScrollableWidget.prototype.scrollSelectorIntoView = function(baseElement,selector,callback,options) {
 	baseElement = baseElement || document.body;
 	var element = baseElement.querySelector(selector);
 	if(element) {
-		this.scrollIntoView(element,callback);
+		this.scrollIntoView(element,callback,options);
 	}
 };
 
@@ -155,8 +159,6 @@ 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

@@ -314,24 +314,40 @@ excludeEventAttributes: ignores attributes whose name begins with "on"
 Widget.prototype.assignAttributes = function(domNode,options) {
 	options = options || {};
 	var self = this;
-	$tw.utils.each(this.attributes,function(v,a) {
-		// Check exclusions
-		if(options.excludeEventAttributes && a.substr(0,2) === "on") {
-			v = undefined;
+	var assignAttribute = function(name,value) {
+		// Check for excluded attribute names
+		if(options.excludeEventAttributes && name.substr(0,2) === "on") {
+			value = undefined;
 		}
-		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);
+		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) {
 				}
-			} 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,26 +46,31 @@ 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;
+					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;
+								}
+							});
+						}
+					};
 				if(!options.dontRenameInTags) {
 					// Rename 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;
-						}
-					});
+					processList(tags);
 				}
 				if(!options.dontRenameInLists) {
 					// Rename lists
-					$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;
-						}
-					});
+					processList(list);
 				}
 				if(isModified) {
 					var newTiddler = new $tw.Tiddler(tiddler,{tags: tags, list: list},self.getModificationFields())

core/modules/wiki.js

@@ -639,14 +639,25 @@ 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 titles = [];
-	this.each(function(tiddler,title) {
-		var list = $tw.utils.parseStringArray(tiddler.fields[fieldName]);
-		if(list && list.indexOf(targetTitle) !== -1) {
-			titles.push(title);
-		}
+	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;
 	});
-	return titles;
+	return listings[targetTitle] || [];
 };
 
 /*
@@ -822,12 +833,7 @@ exports.getTiddlerData = function(titleOrTiddler,defaultData) {
 		switch(tiddler.fields.type) {
 			case "application/json":
 				// JSON tiddler
-				try {
-					data = JSON.parse(tiddler.fields.text);
-				} catch(ex) {
-					return defaultData;
-				}
-				return data;
+				return $tw.utils.parseJSONSafe(tiddler.fields.text,defaultData);
 			case "application/x-tiddler-dictionary":
 				return $tw.utils.parseFields(tiddler.fields.text);
 		}
@@ -1201,23 +1207,28 @@ 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
+		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
 */
 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,
@@ -1244,7 +1255,18 @@ exports.search = function(text,options) {
 			searchTermsRegExps = null;
 			console.log("Regexp error parsing /(" + text + ")/" + flags + ": ",e);
 		}
-	} else {
+	} 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
 		terms = text.split(/ +/);
 		if(terms.length === 1 && terms[0] === "") {
 			searchTermsRegExps = null;
@@ -1255,7 +1277,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 ~~-->
-`{{{ [<saveTiddlerAndShadowsFilter>tag[$:/tags/RawMarkupWikified/TopHead]] ||$:/core/templates/raw-static-tiddler}}}`
+`{{{ [enlist<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/ControlPanel/Cascades/FieldEditor.tid

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

core/ui/EditTemplate.tid

@@ -14,8 +14,8 @@ title: $:/core/ui/EditTemplate
 <div data-tiddler-title=<<currentTiddler>> data-tags={{!!tags}} class={{{ tc-tiddler-frame tc-tiddler-edit-frame [<currentTiddler>is[tiddler]then[tc-tiddler-exists]] [<currentTiddler>is[missing]!is[shadow]then[tc-tiddler-missing]] [<currentTiddler>is[shadow]then[tc-tiddler-exists tc-tiddler-shadow]] [<currentTiddler>is[system]then[tc-tiddler-system]] [{!!class}] [<currentTiddler>tags[]encodeuricomponent[]addprefix[tc-tagged-]] +[join[ ]] }}}>
 <$fieldmangler>
 <$vars storyTiddler=<<currentTiddler>> newTagNameTiddler=<<qualify "$:/temp/NewTagName">> newFieldNameTiddler=<<qualify "$:/temp/NewFieldName">> newFieldValueTiddler=<<qualify "$:/temp/NewFieldValue">> newFieldNameInputTiddler=<<qualify "$:/temp/NewFieldName/input">> newFieldNameSelectionTiddler=<<qualify "$:/temp/NewFieldName/selected-item">> newTagNameInputTiddler=<<qualify "$:/temp/NewTagName/input">> newTagNameSelectionTiddler=<<qualify "$:/temp/NewTagName/selected-item">> typeInputTiddler=<<qualify "$:/temp/Type/input">> typeSelectionTiddler=<<qualify "$:/temp/Type/selected-item">>>
-<$keyboard key="((cancel-edit-tiddler))" actions=<<cancel-delete-tiddler-actions "cancel">>>
-<$keyboard key="((save-tiddler))" actions=<<save-tiddler-actions>>>
+<$keyboard key="((cancel-edit-tiddler))" actions=<<cancel-delete-tiddler-actions "cancel">> tag="div">
+<$keyboard key="((save-tiddler))" actions=<<save-tiddler-actions>> tag="div">
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/EditTemplate]!has[draft.of]]" variable="listItem">
 <$set name="tv-config-toolbar-class" filter="[<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]]">
 <$transclude tiddler=<<listItem>>/>

core/ui/EditTemplate/body/default.tid

@@ -10,7 +10,7 @@ $:/config/EditorToolbarButtons/Visibility/$(currentTiddler)$
 
 <$set name="edit-preview-state" value={{{ [{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[<qualify "$:/state/showeditpreview">] }}}>
 <$vars importTitle=<<qualify $:/ImportImage>> importState=<<qualify $:/state/ImportImage>> >
-<$dropzone importTitle=<<importTitle>> autoOpenOnImport="no" contentTypesFilter={{$:/config/Editor/ImportContentTypesFilter}} class="tc-dropzone-editor" enable={{{ [{$:/config/DragAndDrop/Enable}match[no]] :else[subfilter{$:/config/Editor/EnableImportFilter}then[yes]else[no]] }}} filesOnly="yes" actions=<<importFileActions>> ><$reveal stateTitle=<<edit-preview-state>> type="match" text="yes">
+<$dropzone importTitle=<<importTitle>> autoOpenOnImport="no" contentTypesFilter={{$:/config/Editor/ImportContentTypesFilter}} class="tc-dropzone-editor" enable={{{ [{$:/config/DragAndDrop/Enable}match[no]] :else[subfilter{$:/config/Editor/EnableImportFilter}then[yes]else[no]] }}} filesOnly="yes" actions=<<importFileActions>> ><$reveal stateTitle=<<edit-preview-state>> type="match" text="yes" tag="div">
 <div class="tc-tiddler-preview">
 
 <$transclude tiddler="$:/core/ui/EditTemplate/body/editor" mode="inline"/>
@@ -28,7 +28,7 @@ $:/config/EditorToolbarButtons/Visibility/$(currentTiddler)$
 </div>
 </$reveal>
 
-<$reveal stateTitle=<<edit-preview-state>> type="nomatch" text="yes">
+<$reveal stateTitle=<<edit-preview-state>> type="nomatch" text="yes" tag="div">
 
 <$transclude tiddler="$:/core/ui/EditTemplate/body/editor" mode="inline"/>
 

core/ui/EditTemplate/fieldEditor-default.tid

@@ -0,0 +1,3 @@
+title: $:/core/ui/EditTemplate/fieldEditor/default
+
+<$edit-text tiddler=<<currentTiddler>> field=<<currentField>> default="" class="tc-edit-texteditor" placeholder={{$:/language/EditTemplate/Fields/Add/Value/Placeholder}} tabindex={{$:/config/EditTabIndex}} cancelPopups="yes"/>

core/ui/EditTemplate/fields.tid

@@ -15,7 +15,7 @@ $:/config/EditTemplateFields/Visibility/$(currentField)$
 \end
 
 \define new-field-actions()
-<$action-sendmessage $message="tm-add-field" $name={{{ [<newFieldNameTiddler>get[text]] }}} $value={{{ [<newFieldValueTiddler>get[text]] }}}/>
+<$action-sendmessage $message="tm-add-field" $name={{{ [<newFieldNameTiddler>get[text]] }}} $value={{{ [<newFieldNameTiddler>get[text]] :map[<newFieldValueTiddler>get<currentTiddler>] }}}/>
 <$action-deletetiddler $filter="[<newFieldNameTiddler>] [<newFieldValueTiddler>] [<storeTitle>] [<searchListState>]"/>
 <$action-sendmessage $message="tm-focus-selector" $param=<<current-tiddler-new-field-selector>>/>
 \end
@@ -42,7 +42,7 @@ $:/config/EditTemplateFields/Visibility/$(currentField)$
 <$button tooltip=<<lingo Fields/Add/Button/Hint>>>
 <$action-sendmessage $message="tm-add-field"
 $name=<<name>>
-$value={{{ [<newFieldValueTiddler>get[text]] }}}/>
+$value={{{ [<newFieldValueTiddler>get<name>] }}}/>
 <$action-deletetiddler $filter="[<newFieldNameTiddler>] [<newFieldValueTiddler>] [<storeTitle>] [<searchListState>]"/>
 <<lingo Fields/Add/Button>>
 </$button>
@@ -66,7 +66,7 @@ $value={{{ [<newFieldValueTiddler>get[text]] }}}/>
 <$text text=<<currentField>>/>:</td>
 <td class="tc-edit-field-value">
 <$keyboard key="((delete-field))" actions="""<$action-deletefield $field=<<currentField>>/><$set name="currentTiddlerCSSescaped" value={{{ [<currentTiddler>escapecss[]] }}}><$action-sendmessage $message="tm-focus-selector" $param=<<current-tiddler-new-field-selector>>/></$set>""">
-<$edit-text tiddler=<<currentTiddler>> field=<<currentField>> placeholder={{$:/language/EditTemplate/Fields/Add/Value/Placeholder}} tabindex={{$:/config/EditTabIndex}} cancelPopups="yes"/>
+<$transclude tiddler={{{ [<currentField>] :cascade[all[shadows+tiddlers]tag[$:/tags/FieldEditorFilter]!is[draft]get[text]] :and[!is[blank]else{$:/core/ui/EditTemplate/fieldEditor/default}] }}} />
 </$keyboard>
 </td>
 <td class="tc-edit-field-remove">
@@ -126,16 +126,18 @@ $value={{{ [<newFieldValueTiddler>get[text]] }}}/>
 </div>
 </$reveal>
 </div>
+<$let currentTiddler=<<newFieldValueTiddler>> currentField={{{ [<newFieldNameTiddler>get[text]] }}}>
 <span class="tc-edit-field-add-value tc-small-gap-right">
 <$set name="currentTiddlerCSSescaped" value={{{ [<currentTiddler>escapecss[]] }}}>
 <$keyboard key="((add-field))" actions=<<new-field-actions>>>
-<$edit-text tiddler=<<newFieldValueTiddler>> tag="input" default="" placeholder={{$:/language/EditTemplate/Fields/Add/Value/Placeholder}} class="tc-edit-texteditor" tabindex={{$:/config/EditTabIndex}} cancelPopups="yes"/>
+<$transclude tiddler={{{ [<currentField>] :cascade[all[shadows+tiddlers]tag[$:/tags/FieldEditorFilter]!is[draft]get[text]] :and[!is[blank]else{$:/core/ui/EditTemplate/fieldEditor/default}] }}} />
 </$keyboard>
 </$set>
 </span>
 <span class="tc-edit-field-add-button">
 <$macrocall $name="new-field"/>
 </span>
+</$let>
 </$vars>
 </div>
 </$fieldmangler>

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"/> (<$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"/><$text text=" "/>(<$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[description]]" template="$:/core/ui/PluginListItemTemplate" emptyMessage={{$:/language/ControlPanel/Plugins/Empty/Hint}}/>
+<$list filter="[!has[draft.of]plugin-type[language]sort[name]]" 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[description]]" template="$:/core/ui/PluginListItemTemplate" emptyMessage={{$:/language/ControlPanel/Plugins/Empty/Hint}}>>/>
+<$list filter="[!has[draft.of]plugin-type[plugin]sort[name]]" 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[description]]" template="$:/core/ui/PluginListItemTemplate" emptyMessage={{$:/language/ControlPanel/Plugins/Empty/Hint}}/>
+<$list filter="[!has[draft.of]plugin-type[theme]sort[name]]" template="$:/core/ui/PluginListItemTemplate" emptyMessage={{$:/language/ControlPanel/Plugins/Empty/Hint}}/>

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:currentTiddler<actionTiddler>]"/>
+<$action-listops $tiddler=<<tv-story-list>> $subfilter="+[insertbefore<actionTiddler>,<currentTiddler>]"/>
 \end
 
 \define placeholder()

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">''$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">''<$text text=<<__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/FieldEditorFilters.multids

@@ -0,0 +1,4 @@
+title: $:/config/FieldEditorFilters/
+tags: $:/tags/FieldEditorFilter
+
+default: [[$:/core/ui/EditTemplate/fieldEditor/default]]

core/wiki/config/OfficialPluginLibrary.tid

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

core/wiki/config/ViewTemplateBodyFilters.multids

@@ -1,7 +1,8 @@
 title: $:/config/ViewTemplateBodyFilters/
 tags: $:/tags/ViewTemplateBodyFilter
 
-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]]
+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]]
 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/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:currentTiddler<actionTiddler>]"/>
+<$action-listops $tiddler=<<targetTiddler>> $field=<<targetField>> $subfilter="+[insertbefore<actionTiddler>,<currentTiddler>]"/>
 \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:currentTiddler<actionTiddler>]"/>
+<$action-listops $tiddler=<<__tag__>> $field="list" $filter="+[enlist<order>] +[insertbefore<actionTiddler>,<currentTiddler>]"/>
 <!-- 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/tags/ViewTemplateBodyFilter.tid

@@ -1,3 +1,3 @@
 title: $:/tags/ViewTemplateBodyFilter
-list: $:/config/ViewTemplateBodyFilters/system $:/config/ViewTemplateBodyFilters/import $:/config/ViewTemplateBodyFilters/plugin $:/config/ViewTemplateBodyFilters/hide-body $:/config/ViewTemplateBodyFilters/default
+list: $:/config/ViewTemplateBodyFilters/system $:/config/ViewTemplateBodyFilters/code-body $:/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: 20140717181245449
+modified: 20210720193245000
 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 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.
+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.

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:currentTiddler<actionTiddler>]"/>
+<$action-listops $tiddler="$:/StoryList" $subfilter="+[insertbefore<actionTiddler>,<currentTiddler>]"/>
 \end
 
 <$list filter="[list[$:/StoryList]]" history="$:/HistoryList" storyview="pop">

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

@@ -0,0 +1,7 @@
+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

@@ -0,0 +1,8 @@
+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/$__core_ui_ViewTemplate_title.tid

@@ -1,46 +0,0 @@
-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/$__deprecated.tid

@@ -0,0 +1,9 @@
+created: 20170126143833588
+fr-title: obsolète
+modified: 20220303000909524
+title: $:/deprecated
+type: text/vnd.tiddlywiki
+
+<<<
+L'obsolescence est, dans le domaine du développement logiciel, la situation où une ancienne fonctionnalité est considérée comme dépassée au regard d'un nouveau standard, et où, bien qu'elle soit conservée dans les versions plus récentes (par souci de rétro-compatibilité, et pour donner aux développeurs le temps de mettre leur code source en conformité), elle pourrait disparaître à l'avenir, si bien qu'il est recommandé d'en abandonner l'usage.
+<<< [[wikipedia|https://fr.wikipedia.org/wiki/Obsolescence_(informatique)]]

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

@@ -36,3 +36,4 @@ 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/$__editions_tw5.com_doc-macros.tid

@@ -1,5 +1,5 @@
 created: 20150117152607000
-modified: 20150620212025034
+modified: 20220304140636794
 tags: $:/tags/Macro
 title: $:/editions/tw5.com/doc-macros
 type: text/vnd.tiddlywiki
@@ -30,14 +30,14 @@ type: text/vnd.tiddlywiki
 \define .attr(_) <code class="doc-attr">$_$</code>
 \define .param(_) <code class="doc-param">$_$</code>
 
-\define .mtitle(_) $_$ Macro
-\define .otitle(_) $_$ Operator
-\define .vtitle(_) $_$ Variable
+\define .mtitle(_) Macro $_$
+\define .otitle(_) Opérateur $_$
+\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"><<.def "$_$">></a>
+\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$"/>
@@ -63,6 +63,8 @@ type: text/vnd.tiddlywiki
 
 \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>
 
@@ -81,10 +83,12 @@ C'est un exemple de tiddler. Voir [[Macros Table des matières (Exemples)|Table-
 \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">
@@ -108,3 +112,63 @@ C'est un exemple de tiddler. Voir [[Macros Table des matières (Exemples)|Table-
 </$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> Attention&nbsp;:<br> Ne faites pas comme ça !</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 "ajouté" """$link$""" """$colour$""">>
+\define .link-badge-addendum(link,colour:#fcc84a) <<.link-badge "addendum" """$link$""" """$colour$""">>
+\define .link-badge-extended(link,colour:#f9a344) <<.link-badge "étendu" """$link$""" """$colour$""">>
+\define .link-badge-fixed(link,colour:#ffa86d) <<.link-badge "corrigé" """$link$""" """$colour$""">>
+\define .link-badge-here(link,colour:#d88e63) <<.link-badge "ici" """$link$""" """$colour$""">>
+\define .link-badge-hide(link,colour:#9d959f) <<.link-badge "cacher" """$link$""" """$colour$""">>
+\define .link-badge-improved(link,colour:#7593c7) <<.link-badge "amélioré" """$link$""" """$colour$""">>
+\define .link-badge-modified(link,colour:#7f99c9) <<.link-badge "modifié" """$link$""" """$colour$""">>
+\define .link-badge-removed(link,colour:#a9aabc) <<.link-badge "retiré" """$link$""" """$colour$""">>
+\define .link-badge-renamed(link,colour:#b4b995) <<.link-badge "renommé" """$link$""" """$colour$""">>
+\define .link-badge-updated(link,colour:#91ba66) <<.link-badge "mis à jour" """$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/$__editions_tw5.com_version-macros.tid

@@ -0,0 +1,15 @@
+created: 20161008085627406
+modified: 20220303000119560
+tags: $:/tags/Macro
+title: $:/editions/tw5.com/version-macros
+type: text/vnd.tiddlywiki
+
+\define .from-version(version)
+<span class="doc-from-version">{{$:/core/images/warning}} Depuis<<:>> $version$</span>
+\end
+
+\define .deprecated-since(version, superseded:"TODO-Link")
+<$button to="Deprecated - What does it mean" class="doc-deprecated-version tc-btn-invisible">{{$:/core/images/warning}} Obsolète depuis<<:>> $version$ </$button>. Utilisez [[$superseded$]] à la place
+\end
+
+<pre><$view field="text"/></pre>

editions/fr-FR/tiddlers/$__editions_tw5.com_wikitext-macros.tid

@@ -1,5 +1,5 @@
 created: 20150531155638729
-modified: 20150601094935758
+modified: 20220304175111424
 tags: $:/tags/Macro
 title: $:/editions/tw5.com/wikitext-macros
 type: text/vnd.tiddlywiki
@@ -15,7 +15,7 @@ Affichera ceci :
 
 $src$
 
-... Génération du HTML :
+Code HTML correspondant :
 
 $$$text/vnd.tiddlywiki>text/html
 $src$

editions/fr-FR/tiddlers/Block_Quotes_in_WikiText.tid

@@ -1,11 +1,11 @@
 created: 20131206154636572
 fr-title: Citations en bloc dans WikiText
-modified: 20150624090734021
+modified: 20220226225218713
 tags: WikiText
 title: Block Quotes in WikiText
 type: text/vnd.tiddlywiki
 
-Il existe deux manières de produire des éléments HTML de type citation en bloc avec <<tw>>, l'un pour du contenu qui pourra s'afficher sur plusieurs lignes, et l'autre pour du contenu qui ne devra s'afficher que sur une seule ligne.
+Il existe deux manières de produire des éléments HTML de type citation en bloc avec <<tw>>, l'une pour du contenu qui pourra s'afficher sur plusieurs lignes, et l'autre pour du contenu qui ne devra s'afficher que sur une seule ligne.
 
 ! Citation en bloc multi-lignes
 
@@ -19,7 +19,7 @@ Ceci est un paragraphe de type citation en bloc
 
 !! Attribution
 
-Une attribution peut-être ajoutée au bloc comme ceci, comme ceci&nbsp;:
+Une attribution peut-être ajoutée au bloc comme ceci<<:>>
 
 <<wikitext-example src:"<<<
 Les ordinateurs sont des vélos pour nos neurones
@@ -28,22 +28,29 @@ Les ordinateurs sont des vélos pour nos neurones
 
 !! Classes CSS
 
-Les blocs peuvent hériter des propriétés de classes CSS:
+Les blocs peuvent hériter des propriétés de classes CSS<<:>>
 
 <<wikitext-example src:"<<<.myClass.another-class
 Les systèmes d'exploitation sont des murs pour notre esprit
 <<< Personne
 ">>
 
+Le cœur de <<tw>> inclut la classe `tc-big-quote` qui représente les citations avec des guillemets géants<<:>>
+
+<<wikitext-example src:"<<<.tc-big-quote
+Une citation dramatique
+<<< Quelqu'un d'important
+">>
+
 ! Bloc uniligne
 
-La syntaxe des citations uniligne est une extension de la syntaxe des [[Listes avec WikiText]]. Par exemple&nbsp;:
+La syntaxe des citations uniligne est une extension de la syntaxe des [[listes avec WikiText|Lists in WikiText]]. Par exemple<<:>>
 
 <<wikitext-example src:"> Bloc de citation uniligne
 > Un autre bloc uniligne
 ">>
 
-Vous pouvez agréger des blocs unilignes comme ceci&nbsp;:
+Vous pouvez imbriquer des blocs unilignes comme ceci<<:>>
 
 ```
 > Un bloc de niveau 1
@@ -52,13 +59,13 @@ Vous pouvez agréger des blocs unilignes comme ceci&nbsp;:
 ">>
 ```
 
-Affichera&nbsp;:
+Ce qui affichera<<:>>
 
 > Un bloc de niveau 1
 >> Un bloc de niveau 2
 > Un autre bloc de niveau 1
 
-Vous pouvez mixer les citations en bloc avec d'autres types de listes. Par exemple&nbsp;:
+Vous pouvez aussi mixer les citations en bloc avec d'autres types de listes. Par exemple<<:>>
 
 <<wikitext-example src:"* Liste une
 ** Liste deux

editions/fr-FR/tiddlers/CamelCase.tid

@@ -1,11 +1,14 @@
 caption: CamelCase
 created: 20130828185300000
-modified: 20150623062412435
+fr-title: Notation chameau
+modified: 20220304015529727
 tags: Definitions
 title: CamelCase
 type: text/vnd.tiddlywiki
 
-La convention de casse Camel est formée à partir d'une phrase, dont on met en capital la première lettre de chaque mot et dont on supprime les espaces entre eux, formant ainsi un seul et unique mot. De nombreux wiki utilisent CamelCase pour marquer les phrases qui génèrent un lien de façon automatique.
+La <<gf "notation chameau">> (en anglais <<gf "//Camel Case//">>) est une convention de casse formée en passant en majuscule l'initiale de chaque mot d'une phrase et en supprimant les espaces entre les mots, ce qui forme un long mot composé. De nombreux wikis utilisent la <<fr CamelCase>> pour marquer les phrases qui produisent automatiquement un lien.
 
 Exemple&nbsp;:
-ExempleDeCamelCaseQuiGénèreUnLienVersUnNouveauTiddlerPortantCeNom
+ExempleDeNotationChameauQuiProduitUnLienVersUnNouveauTiddlerPortantCeNom
+
+NDT<<:>> Visuellement, l'alternance des lettres en majuscules et en minuscules dans les phrases en notation chameau produit une sorte d'ondulation, comme les bosses d'un chameau.

editions/fr-FR/tiddlers/Code Blocks in WikiText.tid

@@ -1,12 +1,37 @@
 caption: Blocs de code
 created: 20141016143834720
-modified: 20141116091520961
+fr-title: Blocs de code en WikiText
+modified: 20220226232420710
 tags: WikiText
 title: Code Blocks in WikiText
-fr-title: Blocs de code en WikiText
 type: text/vnd.tiddlywiki
 
-Un bloc de code est délimité par trois caractères "accents graves" <code>&#96;&#96;&#96;</code> (connus en anglais sous le nom de "backticks") :
+Un bloc de code (<<.icon $:/core/images/mono-block>>) est délimité par trois caractères <<gf "accent grave">> <code>&#96;&#96;&#96;</code> (connus en anglais sous le nom de <<gf "backticks">>)<<:>>
+
+<pre>
+&#96;&#96;&#96;
+Ce texte aura une chasse fixe et ne sera pas &#96;formaté&#96;.
+&#96;&#96;&#96;
+</pre>
+
+Donnera le résultat suivant<<:>>
+
+```
+Ce texte aura une chasse fixe et ne sera pas `formaté`.
+```
+
+Pour être interprétés correctement, les trois accents graves doivent être placés au début d'une ligne et immédiatement suivis d'un retour à la ligne.
+
+Souvenez-vous que le paragraphe précédent doit s'être terminé correctement, à l'aide de deux retours à la ligne. L'exemple suivant est donc ''faux''<<:>>
+
+<pre>
+Ceci est un paragraphe ordinaire.
+&#96;&#96;&#96;
+Ce texte aura une chasse fixe et ne sera pas &#96;formaté&#96;.
+&#96;&#96;&#96;
+</pre>
+
+La version correcte est<<:>>
 
 <pre>
 Ceci est un paragraphe ordinaire.
@@ -16,18 +41,4 @@ Ce texte aura une chasse fixe et ne sera pas &#96;formaté&#96;.
 &#96;&#96;&#96;
 </pre>
 
-<div class="tc-message-box">
-
-Ceci est un paragraphe ordinaire.
-
-```
-Ce texte aura une chasse fixe et ne sera pas `formaté`.
-```
-</div>
-
-; Remarques
-* Pour être interprétés correctements, les trois backticks doivent être :
-** précédés de deux retours à la ligne (pour terminer correctement le paragraphe précédent) ;
-** au début de la ligne ;
-** immédiatement suivis d'un retour à la ligne.
-* Certains claviers traitent le backtick comme une [[touche morte|http://fr.wikipedia.org/wiki/Touche_morte]], le rendant difficile à taper. L'astuce est de taper 3 <code>&#96;</code> suivis d'un espace. Une autre méthode consiste à taper 6 <code>&#96;</code> d'affilée, puis de bouger le curseur en arrière trois fois pour taper ou coller le contenu du bloc.
+Certains claviers traitent le backtick comme une [[touche morte|http://fr.wikipedia.org/wiki/Touche_morte]], le rendant difficile à taper. L'astuce est de taper 3 <code>&#96;</code> suivis d'un espace. Une autre méthode consiste à taper 6 <code>&#96;</code> d'affilée, puis de bouger le curseur en arrière trois fois pour taper ou coller le contenu du bloc.

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

@@ -0,0 +1,11 @@
+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,10 +1,12 @@
-fr-title: Communauté
 created: 20130909151600000
-modified: 20141019103047540
+fr-title: Communauté
+modified: 20220217155910582
 tags: TableOfContents
 title: Community
 type: text/vnd.tiddlywiki
 
-C'est ici que nous rassemblons les dernières productions les plus utiles en provenance de la communauté <<tw>>.
+<<.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]].">>
 
-<<tabs "Forums Latest Tutorials Resources Examples Articles Meetups" "Latest">>
+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">>

editions/fr-FR/tiddlers/Creating and editing tiddlers.tid

@@ -1,13 +1,13 @@
 created: 20140904140300000
 fr-title: Créer et modifier des tiddlers
-modified: 20150620081426868
+modified: 20220221002250215
 tags: [[Working with TiddlyWiki]]
 title: Creating and editing tiddlers
 type: text/vnd.tiddlywiki
 
 ! Créer des tiddlers
 
-Vous créez un tiddler soit en cliquant sur le bouton {{$:/core/images/new-button}} du menu latéral, soit en cliquant sur un lien vers un tiddler absent. Les liens vers les tiddlers absents sont affichés en [[italique bleu]].
+Vous créez un tiddler soit en cliquant sur le bouton <<.icon $:/core/images/new-button>> du menu latéral, soit en cliquant sur un lien vers un tiddler absent. Les liens vers les tiddlers absents sont affichés en [[italique bleu]].
 
 Voir aussi<<:>>
 
@@ -15,23 +15,23 @@ Voir aussi<<:>>
 
 ! Modifier des tiddlers
 
-Pour modifier un tiddler existant, cliquez sur le bouton {{$:/core/images/edit-button}} en haut et à droit du tiddler.
+Pour modifier un tiddler existant, cliquez sur le bouton <<.icon $:/core/images/edit-button>> en haut et à droite du tiddler.
 
 !! Mode ébauche
 
-Quand vous créez un nouveau tiddler ou modifiez un existant, le tiddler passe en mode ébauche. Ce qui propose un panneau de contrôle pour apporter différents types de modifications. Il a plusieurs parties, de bas en haut<<:>>
+Quand vous créez un nouveau tiddler ou modifiez un existant, le tiddler passe en mode ébauche. Ce mode propose un panneau de contrôle pour apporter différents types de modifications. Il a plusieurs parties, de bas en haut<<:>>
 
 *''Le champ titre'' - pour modifier le titre du tiddler
-*''Le sélecteur de tags'' - pour ajouter ou supprimer des tags. Lors de la saisie d'un tag, une liste déroulante affiche les tags correspondant sous forme de complétions. Vous pouvez choisir dans cette liste ou créer un tag entièrement nouveau. Puis cliquez sur le bouton ''ajouter'' pour ajouter le tag au tiddler. Chaque tag est affiché sous forme d'une pilule colorée. Cliquez le &quot;×&quot; d'un pilule pour supprimer le tag
-*''La zone de texte'' - pour modifier le contenu principal du tiddler. Cliquez sur le bouton ''afficher la prévisualiation'' pour visualiser l'apparence des modifications
-*''Le sélecteur de type'' - pour afficher vos tiddlers dans un format spécial, comme une image. Voir ContentType pour la liste des options. Le choix par défaut est `text/vnd.tiddlywiki`, qui indique que le tiddler contient du [[WikiTexte|WikiText]]
-*''Le sélecteur de champ'' - pour ajouter ou supprimer des champs du tiddler. Par exemple, si vous modifiez un tiddler utilisé comme tag par d'autres tiddlers, vous pouvez ajouter un [[champ ''list''|ListField]] pour modifier l'ordre dans lequel ces tiddlers seront listé
+*''Le sélecteur de tags'' - pour ajouter ou supprimer des tags. Lors de la saisie d'un tag, une liste déroulante affiche les tags correspondant sous forme de complétions. Vous pouvez choisir dans cette liste ou créer un tag entièrement nouveau. Puis cliquez sur le bouton ''ajouter'' ou utilisez la touche <kbd>Entrée</kbd> pour ajouter le tag au tiddler. Chaque tag est affiché sous forme d'une pilule colorée. Cliquez le &quot;×&quot; d'une pilule pour supprimer le tag
+*''La zone de texte'' - pour modifier le contenu principal du tiddler. Cliquez sur le bouton ''afficher la prévisualiation'' (<<.icon $:/core/images/preview-closed>> / <<.icon $:/core/images/preview-open>>) pour visualiser l'apparence des modifications
+*''Le sélecteur de type'' - pour afficher vos tiddlers dans un format spécial, comme une image. Voir ContentType pour la liste des options. Le choix par défaut est `text/vnd.tiddlywiki`, qui indique que le tiddler contient du <<fr WikiText>>
+*''Le sélecteur de champ'' - pour ajouter ou supprimer des champs du tiddler. Par exemple, si vous modifiez un tiddler utilisé comme tag par d'autres tiddlers, vous pouvez ajouter un [[champ ''list''|ListField]] pour modifier l'ordre dans lequel ces tiddlers seront listés
 
 
 ! Confirmer, annuler ou supprimer
 
 Quand vous avez terminé les modifications, cliquez sur le bouton en haut et à droite du tiddler<<:>>
 
-*Le bouton ''confirmer'' ({{$:/core/images/done-button}}) mémorise vos modifications dans le tiddler et quitte le mode ébauche. Si votre wiki est configuré en [[AutoSave]], vos modifications seront enregistrées de façon permanente. Autrement elles sont mémorisées temporairement dans votre navigateur web, et vous les perdrez si vous fermez votre page ~TiddlyWiki sans avoir cliqué sur le bouton principal pour ''Enregistrer'' {{$:/core/images/save-button}} dans le menu latéral.
-*Le bouton ''annuler'' ({{$:/core/images/cancel-button}}) ignore vos modifications (après demande de confirmation) et quitte le mode ébauche.
-*Le bouton ''supprimer'' ({{$:/core/images/delete-button}}) supprime tout le tiddler (après demande de confirmation).
+*Le bouton ''confirmer'' (<<.icon $:/core/images/done-button>>) mémorise vos modifications dans le tiddler et quitte le mode ébauche. Si votre wiki est configuré en <<fr AutoSave>>, vos modifications seront enregistrées de façon permanente. Autrement elles sont mémorisées temporairement dans votre navigateur web, et vous les perdrez si vous fermez votre page ~TiddlyWiki sans avoir cliqué sur le bouton principal pour ''Enregistrer'' (<<.icon $:/core/images/save-button>>) dans le menu latéral.
+*Le bouton ''annuler'' (<<.icon $:/core/images/cancel-button>>) ignore vos modifications (après demande de confirmation) et quitte le mode ébauche.
+*Le bouton ''supprimer'' (<<.icon $:/core/images/delete-button>>) supprime tout le tiddler (après demande de confirmation).

editions/fr-FR/tiddlers/Deprecated - What does it mean.tid

@@ -0,0 +1,17 @@
+created: 20170126142116898
+fr-title: Obsolète - définition
+modified: 20220303002330037
+title: Deprecated - What does it mean
+type: text/vnd.tiddlywiki
+
+Avant tout<<:>> ''Restez calme<<!>>''
+
+{{$:/deprecated}}
+
+Pour <<tw>>, cela signifie que vous ne devriez plus utiliser ce mécanisme pour du nouveau contenu, ''et que vous devriez mettre à jour votre contenu existant''<<!>>
+
+Les fonctionnalités obsolètes sont identifiées avec un style particulier. Voir<<:>> <<fr  "How to apply custom styles by tag">>
+
+''Tiddlers étiquetés `$:/deprecated`'' :
+
+><<list-links "[tag[$:/deprecated]else[(aucun)]]">>

editions/fr-FR/tiddlers/Developers.tid

@@ -1,12 +1,17 @@
 created: 20150412191004348
 fr-title: Développeurs
-modified: 20150621192259510
+modified: 20220217174800697
 tags: Community
 title: Developers
 type: text/vnd.tiddlywiki
 
-Les développeurs disposent de plusieurs ressources pour discuter et contribuer au développement de TiddlyWiki.
+Plusieurs ressources permettent aux développeurs d'en apprendre plus sur <<tw>>, de collaborer et de discuter de son développement.
 
-* [[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
+* [[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)

editions/fr-FR/tiddlers/Federatial.tid

@@ -0,0 +1,11 @@
+created: 20130825154900000
+modified: 20220219164816011
+tags: Definitions
+title: Federatial
+type: text/vnd.tiddlywiki
+
+Federatial Limited est une entreprise de consultants en logiciel fondée par JeremyRuston, le créateur de <<tw>>.
+
+Federatial aide les organisations à explorer de nouveaux concepts d'interaction utilisateur grâce au prototypage rapide d'outils sophistiqués basés sur le web.
+
+Pour plus d'informations, visitez [[https://federatial.com/]] et [[https://twitter.com/federatial]].

editions/fr-FR/tiddlers/Formatting in WikiText.tid

@@ -1,23 +1,23 @@
 caption: Formatage
 created: 20141016142259705
 fr-title: Mise en forme avec WikiText
-modified: 20150601093436425
+modified: 20220226233811803
 tags: WikiText
 title: Formatting in WikiText
 type: text/vnd.tiddlywiki
 
-Voici les formatages de texte disponibles en [[WikiTexte|WikiText]] :
+Voici les formatages de caractères disponibles en [[WikiTexte|WikiText]]<<:>>
 
-|Format |Résultat |h
-|`''gras''` |texte en ''gras'' |
-|`//italique//` |texte en //italique// |
-|`__souligné__` |texte __souligné__ |
-|`~~barré~~` |texte ~~barré~~ |
-|<code>&#96;code&#96;</code><br><code>&#96;&#96;code contenant du &#96;code&#96; &#96;&#96;</code> |`code`<br>``code contenant du `code` `` |
-|`^^exposant^^` |texte en ^^exposant^^ |
-|`,,indice,,` |texte en ,,indice,, |
+|Format |Résultat |Icône |h
+|<code>&#96;code&#96;</code><br><code>&#96;&#96;code contenant du &#96;code&#96; &#96;&#96;</code> |`code`<br>``code contenant du `code` `` |<<.icon $:/core/images/mono-line>> |
+|`''gras''` |texte en ''gras'' |<<.icon $:/core/images/bold>> |
+|`//italique//` |texte en //italique// |<<.icon $:/core/images/italic>> |
+|`__souligné__` |texte __souligné__ |<<.icon $:/core/images/underline>> |
+|`~~barré~~` |texte ~~barré~~ |<<.icon $:/core/images/strikethrough>> |
+|`^^exposant^^` |texte en ^^exposant^^ |<<.icon $:/core/images/superscript>> |
+|`,,indice,,` |texte en ,,indice,, |<<.icon $:/core/images/subscript>> |
 
-Voir aussi : [[WikiTexte : blocs de code|Code Blocks in WikiText]]
+Voir aussi<<:>> [[WikiTexte : blocs de code|Code Blocks in WikiText]]
 
 ; Remarque
-* Si le code inclus est à la fin du code contenant, l'espace entre le <code>&#96;</code> et les <code>&#96;&#96;</code> est nécessaire.
+: Si le code inclus est à la fin du code contenant, l'espace entre le <code>&#96;</code> et les <code>&#96;&#96;</code> est nécessaire.

editions/fr-FR/tiddlers/Forums.tid

@@ -1,25 +1,39 @@
 caption: Forum
 created: 20140721121924384
 fr-title: Forum
-modified: 20150614155153966
+modified: 20220217174719926
 tags: Community
 title: Forums
 type: text/vnd.tiddlywiki
 
-! Utilisateurs
+! Forum en français
 
-Les groupes de discussion ~TiddlyWiki sont des listes de publipostage pour discuter de ~TiddlyWiki<<:>> demandes d'aide, annonces de nouvelles version et plugins, échanges sur les nouvelles fonctionnalités, ou simples partages d'expériences. Vous pouvez participer via le site web associé, ou souscrire par email.
+La communauté francophone sur <<tw>> a son forum, venez contribuer<<!>>
 
-* Le groupe principal de ~TiddlyWiki<<:>> http://groups.google.com/group/TiddlyWiki
-*> Notez qu'il n'est nul besoin d'avoir un compte Google pour vous joindre aux groupes de discussion. Souscrire par l'envoi d'un email à mailto:tiddlywiki+subscribe@googlegroups.com ou mailto:tiddlywikidev+subscribe@googlegroups.com.
-* Visualiser les enregistrements de nos réguliers [[TiddlyWiki Hangouts]]
-* Suivre [[@TiddlyWiki sur Twitter|http://twitter.com/TiddlyWiki]] pour les dernières nouvelles.
+https://forum.tiddlywiki.fr/
 
-! Développeurs
+! Forums officiels
 
-* Le groupe TiddlyWikiDev pour les dévelopeurs<<:>> http://groups.google.com/group/TiddlyWikiDev
-*> Notez qu'il n'est nul besoin d'avoir un compte Google pour vous joindre aux groupes de discussion. Souscrire par l'envoi d'un email à mailto:tiddlywiki+subscribe@googlegroups.com ou mailto:tiddlywikidev+subscribe@googlegroups.com.
-* Suivre [[@TiddlyWiki sur Twitter|http://twitter.com/TiddlyWiki]] pour les dernières nouvelles.
-* Impliquez-vous dans le [[développement sur GitHub|https://github.com/Jermolene/TiddlyWiki5]]
+Le nouveau forum officiel pour discuter de <<tw>><<:>> demandes d'aide, annonces de nouvelles version et plugins, échanges sur les nouvelles fonctionnalités, ou simples partages d'expériences. Vous pouvez participer via le site web associé, ou souscrire par email.
 
-Les nouvelles versions de TiddlyWiki, TiddlyDesktop et TiddlyFox sont annoncés par les groupes de discussion et [[Twitter|https://twitter.com/TiddlyWiki]] (vous pouvez aussi souscrire au flux Atom/RSS des [[versions de TiddlyWiki sur GitHub|https://github.com/jermolene/tiddlywiki5/releases.atom]])
+https://talk.tiddlywiki.org/
+
+Notez que talk.tiddlywiki.org est un service communautaire que nous hébergeons et maintenons nous-mêmes. Les modestes frais de mise à disposition du site sont couverts par les contributions de la communauté.
+
+Pour le confort de la communauté, l'ancien groupe <<tw>>, hébergé sur Google Groups depuis 2005, reste fonctionnel.
+
+https://groups.google.com/group/TiddlyWiki
+
+! Forums des développeurs
+
+{{Developers}}
+
+! Autres forums
+
+* [[TiddlyWiki Subreddit|https://www.reddit.com/r/TiddlyWiki5/]]
+* Tchatchez avec Gitter sur https://gitter.im/TiddlyWiki/public<<!>>
+* Tchatchez avec Discord sur https://discord.gg/HFFZVQ8
+
+!! Documentation
+
+Il existe un groupe de discussion spécialement dédié aux initiatives d'amélioration de la documentation<<:>> https://groups.google.com/group/tiddlywikidocs

editions/fr-FR/tiddlers/GettingStarted.tid

@@ -1,30 +1,32 @@
 created: 20131129090249275
 fr-title: La mise en route
-modified: 20160526131021571
+modified: 20220217175123712
 tags: [[Working with TiddlyWiki]]
 title: GettingStarted
 type: text/vnd.tiddlywiki
 
-\define default-platform()
-GettingStarted - $(browser-name)$
-\end
-Instructions pour bien commencer avec <<tw>>, selon les différentes plates-formes et configurations supportées.
 
-<$set name="browser-name" value={{$:/info/browser/name}}>
-<$macrocall $name="tabs" state="$:/state/tabs/platform" tabsList="[prefix[GettingStarted - ]]" default=<<default-platform>> class="tc-vertical"/>
-</$set>
+Téléchargez un <<tw>> vide en cliquant sur ce bouton<<:>> {{$:/editions/fr-FR/snippets/download-empty-button}}
 
-Autres informations :
+L'étape suivante consiste à choisir une solution d'enregistrement des modifications. De nombreuses méthodes sont disponibles, chacune avec ses atouts et ses limites. Cliquez sur la fiche d'une méthode pour voir plus d'informations la concernant. Vous pouvez aussi cocher une case de plateformes et de navigateur pour afficher les solutions qui fonctionnent pour cette combinaison.
 
-* [[Cryptage|Encryption]] explique comment utiliser le système de cryptage intégré à <<tw>> pour protéger votre contenu avec un mot de passe ;
-* [[Enregistrer avec Tiddlyspot|Saving on TiddlySpot]], un service gratuit qui vous permet d'utiliser <<tw>> en ligne ;
-* Sauvegarde avec TiddlyDesktop, une application de bureautique dédiée au travail avec <<tw>> ;
-* Vous pouvez aussi télécharger ce <<tw>> complet, avec toute sa documentation<<dp>><div>
+<<.warning "N'utilisez pas le menu ''Fichier''/''Enregistrer'' du navigateur internet pour enregistrer vos modifications (ça ne marche pas)<<!>>">><br/><br/>
+
+{{Saving}}
+
+
+
+Autres informations<<:>>
+
+* [[Protéger le contenu avec un mot de passe|Encryption]] grâce au système de chiffrement intégré à <<tw>><<;>>
+* [[Enregistrer avec Tiddlyspot|Saving on TiddlySpot]], un service gratuit qui vous permet d'utiliser <<tw>> en ligne<<;>>
+* Sauvegarde avec TiddlyDesktop, une application de bureautique dédiée au travail avec <<tw>><<;>>
+* Vous pouvez aussi télécharger ce <<tw>> complet, avec toute sa documentation<<:>><div>
 
 <<<
 {{$:/snippets/download-wiki-button}}
 
-Si le bouton ne fonctionne pas, sauvegardez ce lien :
+Si le bouton ne fonctionne pas, sauvegardez ce lien<<:>>
 
 <a href="https://tiddlywiki.com/languages/fr-FR/index.html" download="index.html">~https://tiddlywiki.com/languages/fr-FR/index.html</a>
 

editions/fr-FR/tiddlers/Glossaire en-GB -_ fr-FR.tid

@@ -1,5 +1,5 @@
 created: 20141217193625476
-modified: 20150624092403261
+modified: 20220304170551125
 title: Glossaire en-GB -> fr-FR
 type: text/vnd.tiddlywiki
 
@@ -8,9 +8,11 @@ type: text/vnd.tiddlywiki
 |background|arrière plan||
 |bug|bogue||
 |core |noyau ||
+|dominant append|ajout prépondérant|//ajouté par prépondérance//|
 |draft|ébauche||
 |empty édition |édition basique ||
 |encryption|cryptage||
+|filter run|séquence de filtre||
 |fixed|corrigé||
 |flexible|souple|maléable |
 |improved|amélioré||