Version number update for 5.1.7

Also preparing for 5.1.7-prerelease

boot/boot.js

@@ -62,14 +62,22 @@ $tw.utils.isDate = function(value) {
 Iterate through all the own properties of an object or array. Callback is invoked with (element,title,object)
 */
 $tw.utils.each = function(object,callback) {
-	var f;
+	var next,f;
 	if(object) {
 		if(Object.prototype.toString.call(object) == "[object Array]") {
-			object.forEach(callback);
+			for (f=0; f<object.length; f++) {
+				next = callback(object[f],f,object);
+				if(next === false) {
+					break;
+				}
+		    }
 		} else {
 			for(f in object) {
 				if(Object.prototype.hasOwnProperty.call(object,f)) {
-					callback(object[f],f,object);
+					next = callback(object[f],f,object);
+					if(next === false) {
+						break;
+					}
 				}
 			}
 		}
@@ -1529,7 +1537,7 @@ $tw.getLibraryItemSearchPaths = function(libraryPath,envVar) {
 	var pluginPaths = [path.resolve($tw.boot.corePath,libraryPath)],
 		env = process.env[envVar];
 	if(env) {
-		Array.prototype.push.apply(pluginPaths,env.split(":"));
+		Array.prototype.push.apply(pluginPaths,env.split(path.delimiter));
 	}
 	return pluginPaths;
 };
@@ -1958,4 +1966,4 @@ if(typeof(exports) !== "undefined") {
 	exports.TiddlyWiki = _boot;
 } else {
 	_boot(window.$tw);
-}
+}

core/language/en-GB/GettingStarted.tid

@@ -1,13 +1,14 @@
 title: GettingStarted
 
-Welcome to TiddlyWiki, the non-linear personal web notebook.
+\define lingo-base() $:/language/ControlPanel/Basics/
+Welcome to ~TiddlyWiki and the ~TiddlyWiki community
 
-To get started, first verify that you can save changes successfully - see http://tiddlywiki.com/ for detailed instructions.
+Before you start storing important information in ~TiddlyWiki it is important to make sure that you can reliably save changes. See http://tiddlywiki.com/#GettingStarted for details
 
-Then you can:
+!! Set up this ~TiddlyWiki
 
-* Create new tiddlers using the 'plus' button in the sidebar
-* Visit the [[control panel|$:/ControlPanel]] using the 'cog' button in the sidebar to customise your wiki
-** Stop this message appearing by changing the default tiddlers under the ''Basics'' tab
-* Save changes using the 'download' button in the sidebar
-* Learn more about [[WikiText|http://tiddlywiki.com/static/WikiText.html]]
+|<$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
+|<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
+|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit-text tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
+
+See the [[control panel|$:/ControlPanel]] for more options.

core/modules/commands/init.js

@@ -26,7 +26,7 @@ Command.prototype.execute = function() {
 	var fs = require("fs"),
 		path = require("path");
 	// Check that we don't already have a valid wiki folder
-	if($tw.boot.wikiTiddlersPath) {
+	if($tw.boot.wikiTiddlersPath || ($tw.utils.isDirectory($tw.boot.wikiPath) && !$tw.utils.isDirectoryEmpty($tw.boot.wikiPath))) {
 		return "Wiki folder is not empty";
 	}
 	// Loop through each of the specified editions

core/modules/filters/field.js

@@ -26,6 +26,8 @@ exports.field = function(source,operator,options) {
 					if(text !== null && !operator.regexp.exec(text)) {
 						results.push(title);
 					}
+				} else {
+					results.push(title);
 				}
 			});
 		} else {
@@ -35,6 +37,8 @@ exports.field = function(source,operator,options) {
 					if(text !== null && text !== operator.operand) {
 						results.push(title);
 					}
+				} else {
+					results.push(title);
 				}
 			});
 		}

core/modules/filters/has.js

@@ -19,7 +19,7 @@ exports.has = function(source,operator,options) {
 	var results = [];
 	if(operator.prefix === "!") {
 		source(function(tiddler,title) {
-			if(tiddler && (!$tw.utils.hop(tiddler.fields,operator.operand) || tiddler.fields[operator.operand] === "")) {
+			if(!tiddler || (tiddler && (!$tw.utils.hop(tiddler.fields,operator.operand) || tiddler.fields[operator.operand] === ""))) {
 				results.push(title);
 			}
 		});

core/modules/filters/splitbefore.js

@@ -0,0 +1,31 @@
+/*\
+title: $:/core/modules/filters/splitbefore.js
+type: application/javascript
+module-type: filteroperator
+
+Filter operator that splits each result on the first occurance of the specified separator and returns the unique values.
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+/*
+Export our filter function
+*/
+exports.splitbefore = function(source,operator,options) {
+	var results = [];
+	source(function(tiddler,title) {
+		var parts = title.split(operator.operand);
+		if(parts.length === 1) {
+			$tw.utils.pushTop(results,parts[0]);
+		} else {
+			$tw.utils.pushTop(results,parts[0] + operator.operand);
+		}
+	});
+	return results;
+};
+
+})();

core/modules/savers/download.js

@@ -26,10 +26,11 @@ DownloadSaver.prototype.save = function(text,method,callback,options) {
 		var p = document.location.pathname.lastIndexOf("/");
 		if(p !== -1) {
 			filename = document.location.pathname.substr(p+1);
-		} else {
-			filename = "tiddlywiki.html";
 		}
 	}
+	if(!filename) {
+		filename = "tiddlywiki.html";
+	}
 	// Set up the link
 	var link = document.createElement("a");
 	link.setAttribute("target","_blank");

core/modules/startup/load-modules.js

@@ -19,7 +19,7 @@ exports.synchronous = true;
 exports.startup = function() {
 	// Load modules
 	$tw.modules.applyMethods("utils",$tw.utils);
-	if($tw.node && !$tw.browser) {
+	if($tw.node) {
 		$tw.modules.applyMethods("utils-node",$tw.utils);
 	}
 	$tw.modules.applyMethods("global",$tw);

core/modules/utils/dom/popup.js

@@ -30,7 +30,6 @@ Trigger a popup open or closed. Parameters are in a hashmap:
 	force: if specified, forces the popup state to true or false (instead of toggling it)
 */
 Popup.prototype.triggerPopup = function(options) {
-console.log("triggerPopup",options)
 	// Check if this popup is already active
 	var index = -1;
 	for(var t=0; t<this.popups.length; t++) {
@@ -52,7 +51,6 @@ console.log("triggerPopup",options)
 };
 
 Popup.prototype.handleEvent = function(event) {
-console.log("handleEvent",event)
 	if(event.type === "click") {
 		// Find out what was clicked on
 		var info = this.popupInfo(event.target),
@@ -98,7 +96,6 @@ Popup.prototype.popupInfo = function(domNode) {
 		popupLevel: popupCount,
 		isHandle: isHandle
 	};
-console.log("Returning popupInfo",info)
 	return info;
 };
 
@@ -106,7 +103,6 @@ console.log("Returning popupInfo",info)
 Display a popup by adding it to the stack
 */
 Popup.prototype.show = function(options) {
-console.log("show",options)
 	// Find out what was clicked on
 	var info = this.popupInfo(options.domNode);
 	// Cancel any higher level popups
@@ -123,7 +119,6 @@ console.log("show",options)
 				options.domNode.offsetWidth + "," + options.domNode.offsetHeight + ")");
 	// Add the click handler if we have any popups
 	if(this.popups.length > 0) {
-console.log("Adding click handler")
 		this.rootElement.addEventListener("click",this,true);		
 	}
 };
@@ -133,7 +128,6 @@ Cancel all popups at or above a specified level or DOM node
 level: popup level to cancel (0 cancels all popups)
 */
 Popup.prototype.cancel = function(level) {
-console.log("cancel",level)
 	var numPopups = this.popups.length;
 	level = Math.max(0,Math.min(level,numPopups));
 	for(var t=level; t<numPopups; t++) {
@@ -143,7 +137,6 @@ console.log("cancel",level)
 		}
 	}
 	if(this.popups.length === 0) {
-console.log("Removing click handler")
 		this.rootElement.removeEventListener("click",this,false);
 	}
 };
@@ -152,7 +145,6 @@ console.log("Removing click handler")
 Returns true if the specified title and text identifies an active popup
 */
 Popup.prototype.readPopupState = function(text) {
-console.log("readPopupState",text)
 	var popupLocationRegExp = /^\((-?[0-9\.E]+),(-?[0-9\.E]+),(-?[0-9\.E]+),(-?[0-9\.E]+)\)$/;
 	return popupLocationRegExp.test(text);
 };

core/modules/utils/filesystem.js

@@ -52,9 +52,13 @@ exports.copyDirectory = function(srcPath,dstPath) {
 Copy a file
 */
 var FILE_BUFFER_LENGTH = 64 * 1024,
-	fileBuffer = $tw.node && new Buffer(FILE_BUFFER_LENGTH);
+	fileBuffer;
 
 exports.copyFile = function(srcPath,dstPath) {
+	// Create buffer if required
+	if(!fileBuffer) {
+		fileBuffer = new Buffer(FILE_BUFFER_LENGTH);
+	}
 	// Create any directories in the destination
 	$tw.utils.createDirectory(path.dirname(dstPath));
 	// Copy the file
@@ -139,4 +143,21 @@ exports.isDirectory = function(dirPath) {
 	return fs.existsSync(dirPath) && fs.statSync(dirPath).isDirectory();
 };
 
+/*
+Check if a path identifies a directory that is empty
+*/
+exports.isDirectoryEmpty = function(dirPath) {
+	if(!$tw.utils.isDirectory(dirPath)) {
+		return false;
+	}
+	var files = fs.readdirSync(dirPath),
+		empty = true;
+	$tw.utils.each(files,function(file,index) {
+		if(file.charAt(0) !== ".") {
+			empty = false;
+		}
+	});
+	return empty;
+};
+
 })();

core/modules/utils/utils.js

@@ -176,89 +176,109 @@ exports.slowInSlowOut = function(t) {
 };
 
 exports.formatDateString = function(date,template) {
-	var t = template;
-	t = t.replace(/0hh12/g,function() {
-		return $tw.utils.pad($tw.utils.getHours12(date));
-	});
-	t = t.replace(/hh12/g,function() {
-		return $tw.utils.getHours12(date);
-	});
-	t = t.replace(/0hh/g,function() {
-		return $tw.utils.pad(date.getHours());
-	});
-	t = t.replace(/hh/g,function() {
-		return date.getHours();
-	});
-	t = t.replace(/mmm/g,function() {
-		return $tw.language.getString("Date/Short/Month/" + (date.getMonth() + 1));
-	});
-	t = t.replace(/0mm/g,function() {
-		return $tw.utils.pad(date.getMinutes());
-	});
-	t = t.replace(/mm/g,function() {
-		return date.getMinutes();
-	});
-	t = t.replace(/0ss/g,function() {
-		return $tw.utils.pad(date.getSeconds());
-	});
-	t = t.replace(/ss/g,function() {
-		return date.getSeconds();
-	});
-	t = t.replace(/[ap]m/g,function() {
-		return $tw.utils.getAmPm(date).toLowerCase();
-	});
-	t = t.replace(/[AP]M/g,function() {
-		return $tw.utils.getAmPm(date).toUpperCase();
-	});
-	t = t.replace(/wYYYY/g,function() {
-		return $tw.utils.getYearForWeekNo(date);
-	});
-	t = t.replace(/wYY/g,function() {
-		return $tw.utils.pad($tw.utils.getYearForWeekNo(date)-2000);
-	});
-	t = t.replace(/YYYY/g,function() {
-		return date.getFullYear();
-	});
-	t = t.replace(/YY/g,function() {
-		return $tw.utils.pad(date.getFullYear()-2000);
-	});
-	t = t.replace(/MMM/g,function() {
-		return $tw.language.getString("Date/Long/Month/" + (date.getMonth() + 1));
-	});
-	t = t.replace(/0MM/g,function() {
-		return $tw.utils.pad(date.getMonth()+1);
-	});
-	t = t.replace(/MM/g,function() {
-		return date.getMonth() + 1;
-	});
-	t = t.replace(/0WW/g,function() {
-		return $tw.utils.pad($tw.utils.getWeek(date));
-	});
-	t = t.replace(/WW/g,function() {
-		return $tw.utils.getWeek(date);
-	});
-	t = t.replace(/DDD/g,function() {
-		return $tw.language.getString("Date/Long/Day/" + date.getDay());
-	});
-	t = t.replace(/ddd/g,function() {
-		return $tw.language.getString("Date/Short/Day/" + date.getDay());
-	});
-	t = t.replace(/0DD/g,function() {
-		return $tw.utils.pad(date.getDate());
-	});
-	t = t.replace(/DDth/g,function() {
-		return date.getDate() + $tw.utils.getDaySuffix(date);
-	});
-	t = t.replace(/DD/g,function() {
-		return date.getDate();
-	});
-	t = t.replace(/TZD/g,function() {
-		var tz = date.getTimezoneOffset(),
-			atz = Math.abs(tz);
-		return (tz < 0 ? '+' : '-') + $tw.utils.pad(Math.floor(atz / 60)) + ':' + $tw.utils.pad(atz % 60);
-	});
-	t = t.replace(/\\(.)/g,"$1");
-	return t;
+	var result = "",
+		t = template,
+		matches = [
+			[/^0hh12/, function() {
+				return $tw.utils.pad($tw.utils.getHours12(date));
+			}],
+			[/^wYYYY/, function() {
+				return $tw.utils.getYearForWeekNo(date);
+			}],
+			[/^hh12/, function() {
+				return $tw.utils.getHours12(date);
+			}],
+			[/^DDth/, function() {
+				return date.getDate() + $tw.utils.getDaySuffix(date);
+			}],
+			[/^YYYY/, function() {
+				return date.getFullYear();
+			}],
+			[/^0hh/, function() {
+				return $tw.utils.pad(date.getHours());
+			}],
+			[/^0mm/, function() {
+				return $tw.utils.pad(date.getMinutes());
+			}],
+			[/^0ss/, function() {
+				return $tw.utils.pad(date.getSeconds());
+			}],
+			[/^0DD/, function() {
+				return $tw.utils.pad(date.getDate());
+			}],
+			[/^0MM/, function() {
+				return $tw.utils.pad(date.getMonth()+1);
+			}],
+			[/^0WW/, function() {
+				return $tw.utils.pad($tw.utils.getWeek(date));
+			}],
+			[/^ddd/, function() {
+				return $tw.language.getString("Date/Short/Day/" + date.getDay());
+			}],
+			[/^mmm/, function() {
+				return $tw.language.getString("Date/Short/Month/" + (date.getMonth() + 1));
+			}],
+			[/^DDD/, function() {
+				return $tw.language.getString("Date/Long/Day/" + date.getDay());
+			}],
+			[/^MMM/, function() {
+				return $tw.language.getString("Date/Long/Month/" + (date.getMonth() + 1));
+			}],
+			[/^TZD/, function() {
+				var tz = date.getTimezoneOffset(),
+				atz = Math.abs(tz);
+				return (tz < 0 ? '+' : '-') + $tw.utils.pad(Math.floor(atz / 60)) + ':' + $tw.utils.pad(atz % 60);
+			}],
+			[/^wYY/, function() {
+				return $tw.utils.pad($tw.utils.getYearForWeekNo(date) - 2000);
+			}],
+			[/^[ap]m/, function() {
+				return $tw.utils.getAmPm(date).toLowerCase();
+			}],
+			[/^hh/, function() {
+				return date.getHours();
+			}],
+			[/^mm/, function() {
+				return date.getMinutes();
+			}],
+			[/^ss/, function() {
+				return date.getSeconds();
+			}],
+			[/^[AP]M/, function() {
+				return $tw.utils.getAmPm(date).toUpperCase();
+			}],
+			[/^DD/, function() {
+				return date.getDate();
+			}],
+			[/^MM/, function() {
+				return date.getMonth() + 1;
+			}],
+			[/^WW/, function() {
+				return $tw.utils.getWeek(date);
+			}],
+			[/^YY/, function() {
+				return $tw.utils.pad(date.getFullYear() - 2000);
+			}]
+		];
+	while(t.length){
+		var matchString = "";
+		$tw.utils.each(matches, function(m) {
+			var match = m[0].exec(t);
+			if(match) {
+				matchString = m[1].call();
+				t = t.substr(match[0].length);
+				return false;
+			}
+		});
+		if(matchString) {
+			result += matchString;
+		} else {
+			result += t.charAt(0);
+			t = t.substr(1);
+		}
+	}
+	result = result.replace(/\\(.)/g,"$1");
+	return result;
 };
 
 exports.getAmPm = function(date) {
@@ -504,29 +524,22 @@ exports.isValidFieldName = function(name) {
 Extract the version number from the meta tag or from the boot file
 */
 
-if($tw.browser) {
-
 // Browser version
 exports.extractVersionInfo = function() {
-	var metatags = document.getElementsByTagName("meta");
-	for(var t=0; t<metatags.length; t++) {
-		var m = metatags[t];
-		if(m.name === "tiddlywiki-version") {
-			return m.content;
+	if($tw.packageInfo) {
+		return $tw.packageInfo.version;
+	} else {
+		var metatags = document.getElementsByTagName("meta");
+		for(var t=0; t<metatags.length; t++) {
+			var m = metatags[t];
+			if(m.name === "tiddlywiki-version") {
+				return m.content;
+			}
 		}
 	}
 	return null;
 };
 
-} else {
-
-// Server version
-exports.extractVersionInfo = function() {
-	return $tw.packageInfo.version;
-};
-
-}
-
 /*
 Get the animation duration in ms
 */
@@ -587,4 +600,4 @@ exports.timer = function(base) {
 	return m;
 };
 
-})();
+})();

core/modules/widgets/browse.js

@@ -39,6 +39,9 @@ BrowseWidget.prototype.render = function(parent,nextSibling) {
 	if(this.browseMultiple) {
 		domNode.setAttribute("multiple","multiple");
 	}
+	if(this.tooltip) {
+		domNode.setAttribute("title",this.tooltip);
+	}
 	// Add a click event handler
 	domNode.addEventListener("change",function (event) {
 		if(self.message) {
@@ -62,6 +65,7 @@ Compute the internal state of the widget
 BrowseWidget.prototype.execute = function() {
 	this.browseMultiple = this.getAttribute("multiple");
 	this.message = this.getAttribute("message");
+	this.tooltip = this.getAttribute("tooltip");
 };
 
 /*

core/modules/widgets/edit-bitmap.js

@@ -80,7 +80,9 @@ EditBitmapWidget.prototype.render = function(parent,nextSibling) {
 	parent.insertBefore(this.heightDomNode,nextSibling);
 	this.domNodes.push(this.canvasDomNode,this.widthDomNode,this.heightDomNode);
 	// Load the image into the canvas
-	this.loadCanvas();
+	if($tw.browser) {
+		this.loadCanvas();
+	}
 };
 
 /*

core/modules/widgets/fieldmangler.js

@@ -71,24 +71,40 @@ FieldManglerWidget.prototype.handleRemoveFieldEvent = function(event) {
 };
 
 FieldManglerWidget.prototype.handleAddFieldEvent = function(event) {
-	var tiddler = this.wiki.getTiddler(this.mangleTitle);
-	if(tiddler && typeof event.param === "string") {
-		var name = event.param.toLowerCase().trim();
-		if(name !== "" && !$tw.utils.hop(tiddler.fields,name)) {
-			if(!$tw.utils.isValidFieldName(name)) {
-				alert($tw.language.getString(
-					"InvalidFieldName",
-					{variables:
-						{fieldName: name}
-					}
-				));
-				return true;
+	var tiddler = this.wiki.getTiddler(this.mangleTitle),
+		addition = this.wiki.getModificationFields(),
+		hadInvalidFieldName = false,
+		addField = function(name,value) {
+			var trimmedName = name.toLowerCase().trim();
+			if(!$tw.utils.isValidFieldName(trimmedName)) {
+				if(!hadInvalidFieldName) {
+					alert($tw.language.getString(
+						"InvalidFieldName",
+						{variables:
+							{fieldName: trimmedName}
+						}
+					));
+					hadInvalidFieldName = true;
+					return;
+				}
+			} else {
+				if(!value && tiddler) {
+					value = tiddler.fields[trimmedName];
+				}
+				addition[trimmedName] = value || "";
 			}
-			var addition = this.wiki.getModificationFields();
-			addition[name] = "";
-			this.wiki.addTiddler(new $tw.Tiddler(tiddler,addition));
+			return;
+		};
+	addition.title = this.mangleTitle;
+	if(typeof event.param === "string") {
+		addField(event.param,"");
+	}
+	if(typeof event.paramObject === "object") {
+		for(var name in event.paramObject) {
+			addField(name,event.paramObject[name]);
 		}
 	}
+	this.wiki.addTiddler(new $tw.Tiddler(tiddler,addition));
 	return true;
 };
 

core/templates/alltiddlers.template.html.tid

@@ -3,4 +3,8 @@ type: text/vnd.tiddlywiki-html
 
 <!-- This template is provided for backwards compatibility with older versions of TiddlyWiki -->
 
+<$set name="exportFilter" value="[!is[system]sort[title]]">
+
 {{$:/core/templates/exporters/StaticRiver}}
+
+</$set>

core/ui/EditTemplate/fields.tid

@@ -5,9 +5,27 @@ tags: $:/tags/EditTemplate
 \define config-title()
 $:/config/EditTemplateFields/Visibility/$(currentField)$
 \end
+
 \define config-filter()
 [[hide]] -[title{$(config-title)$}]
 \end
+
+\define new-field(name,value)
+<$reveal type="nomatch" text="" default="""$name$""">
+<$button>
+<$action-sendmessage $message="tm-add-field" $name$="""$value$"""/>
+<$action-deletetiddler $tiddler="$:/temp/newfieldname"/>
+<$action-deletetiddler $tiddler="$:/temp/newfieldvalue"/>
+<<lingo Fields/Add/Button>>
+</$button>
+</$reveal>
+<$reveal type="match" text="" default="""$name$""">
+<$button>
+<<lingo Fields/Add/Button>>
+</$button>
+</$reveal>
+\end
+
 <div class="tc-edit-fields">
 <table class="tc-edit-fields">
 <tbody>
@@ -32,6 +50,7 @@ $:/config/EditTemplateFields/Visibility/$(currentField)$
 </table>
 </div>
 
+<$fieldmangler>
 <div class="tc-edit-field-add">
 <em class="tc-edit">
 <<lingo Fields/Add/Prompt>>
@@ -43,11 +62,8 @@ $:/config/EditTemplateFields/Visibility/$(currentField)$
 <$edit-text tiddler="$:/temp/newfieldvalue" tag="input" default="" placeholder={{$:/language/EditTemplate/Fields/Add/Value/Placeholder}} class="tc-edit-texteditor"/>
 </span>
 <span class="tc-edit-field-add-button">
-<$button>
-<$action-setfield $field={{$:/temp/newfieldname}} $value={{$:/temp/newfieldvalue}}/>
-<$action-deletetiddler $tiddler="$:/temp/newfieldname"/>
-<$action-deletetiddler $tiddler="$:/temp/newfieldvalue"/>
-<<lingo Fields/Add/Button>>
-</$button>
+<$macrocall $name="new-field" name={{$:/temp/newfieldname}} value={{$:/temp/newfieldvalue}}/>
 </span>
 </div>
+</$fieldmangler>
+

core/ui/PageControls/import.tid

@@ -12,5 +12,5 @@ description: {{$:/language/Buttons/Import/Hint}}
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/Import/Caption}}/></span>
 </$list>
 </$button>
-<$browse/>
+<$browse tooltip={{$:/language/Buttons/Import/Hint}}/>
 </div>

core/ui/PageControls/language.tid

@@ -23,7 +23,7 @@ $(languagePluginTitle)$/icon
 <$reveal state=<<qualify "$:/state/popup/language">> type="popup" position="below" animate="yes">
 <div class="tc-drop-down tc-drop-down-language-chooser">
 <$linkcatcher to="$:/language">
-<$list filter="[[$:/languages/en-GB]] [plugin-type[language]sort[title]]">
+<$list filter="[[$:/languages/en-GB]] [plugin-type[language]sort[description]]">
 <$link>
 <span class="tc-drop-down-bullet">
 <$reveal type="match" state="$:/language" text=<<currentTiddler>>>

core/ui/ViewToolbar/more-tiddler-actions.tid

@@ -13,8 +13,7 @@ $:/config/ViewToolbarButtons/Visibility/$(listItem)$
 <$list filter="[<tv-config-toolbar-text>prefix[yes]]">
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/More/Caption}}/></span>
 </$list>
-</$button>
-<$reveal state=<<qualify "$:/state/popup/more">> type="popup" position="below" animate="yes">
+</$button><$reveal state=<<qualify "$:/state/popup/more">> type="popup" position="below" animate="yes">
 <div class="tc-drop-down">
 <$set name="tv-config-toolbar-icons" value="yes">
 <$set name="tv-config-toolbar-text" value="yes">

core/wiki/download-wiki-button.tid

@@ -1,4 +1,7 @@
 title: $:/snippets/download-wiki-button
 
 \define lingo-base() $:/language/ControlPanel/Tools/Download/
-<$button message="tm-download-file" param="$:/core/save/all" class="tc-btn-big-green"><<lingo Full/Caption>> {{$:/core/images/save-button}}</$button>
+<$button class="tc-btn-big-green">
+<$action-sendmessage $message="tm-download-file" $param="$:/core/save/all" filename="index.html"/>
+<<lingo Full/Caption>> {{$:/core/images/save-button}}
+</$button>

core/wiki/languageswitcher.tid

@@ -1,7 +1,7 @@
 title: $:/snippets/languageswitcher
 
 {{$:/language/ControlPanel/Basics/Language/Prompt}} <$select tiddler="$:/language">
-<$list filter="[[$:/languages/en-GB]] [plugin-type[language]sort[title]]">
+<$list filter="[[$:/languages/en-GB]] [plugin-type[language]sort[description]]">
 <option value=<<currentTiddler>>><$view field="description"><$view field="name"><$view field="title"/></$view></$view></option>
 </$list>
 </$select>

core/wiki/macros/tag.tid

@@ -0,0 +1,6 @@
+title: $:/core/macros/tag
+tags: $:/tags/Macro
+
+\define tag(tag)
+{{$tag$||$:/core/ui/TagTemplate}}
+\end

core/wiki/macros/timeline.tid

@@ -1,6 +1,16 @@
-title: $:/core/macros/timeline
+created: 20141212105914482
+modified: 20141212110330815
 tags: $:/tags/Macro
+title: $:/core/macros/timeline
+type: text/vnd.tiddlywiki
 
+\define timeline-title()
+<!-- Override this macro with a global macro 
+     of the same name if you need to change 
+     how titles are displayed on the timeline 
+     -->
+<$view field="title"/>
+\end
 \define timeline(limit:"100",format:"DDth MMM YYYY",subfilter:"",dateField:"modified")
 <div class="tc-timeline">
 <$list filter="[!is[system]$subfilter$has[$dateField$]!sort[$dateField$]limit[$limit$]eachday[$dateField$]]">
@@ -9,7 +19,7 @@ tags: $:/tags/Macro
 <$list filter="[sameday{!!$dateField$}!is[system]$subfilter$!sort[$dateField$]]">
 <div class="tc-menu-list-subitem">
 <$link to={{!!title}}>
-<$view field="title"/>
+<<timeline-title>>
 </$link>
 </div>
 </$list>

core/wiki/macros/toc.tid

@@ -1,15 +1,21 @@
 title: $:/core/macros/toc
 tags: $:/tags/Macro
 
+\define toc-caption()
+<$set name="tv-wikilinks" value="no">
+<$transclude field="caption">
+<$view field="title"/>
+</$transclude>
+</$set>
+\end
+
 \define toc-body(rootTag,tag,sort:"",itemClassFilter)
 <ol class="tc-toc">
-<$list filter="""[tag[$tag$]!has[draft.of]$sort$]""">
+<$list filter="""[all[shadows+tiddlers]tag[$tag$]!has[draft.of]$sort$]""">
 <$set name="toc-item-class" filter="""$itemClassFilter$""" value="toc-item-selected" emptyValue="toc-item">
 <li class=<<toc-item-class>>>
-<$list filter="[is[current]toc-link[no]]" emptyMessage="<$link><$view field='caption'><$view field='title'/></$view></$link>">
-<$view field="caption">
-<$view field="title"/>
-</$view>
+<$list filter="[all[current]toc-link[no]]" emptyMessage="<$link><$view field='caption'><$view field='title'/></$view></$link>">
+<<toc-caption>>
 </$list>
 <$list filter="""[all[current]] -[[$rootTag$]]""">
 <$macrocall $name="toc-body" rootTag="""$rootTag$""" tag=<<currentTiddler>> sort="""$sort$""" itemClassFilter="""$itemClassFilter$"""/>
@@ -39,9 +45,7 @@ tags: $:/tags/Macro
 {{$:/core/images/down-arrow}}
 </$button>
 </$reveal>
-<$view field="caption">
-<$view field="title"/>
-</$view>
+<<toc-caption>>
 </$link>
 <$reveal type="match" state=<<toc-state>> text="open">
 <$macrocall $name="toc-expandable" tag=<<currentTiddler>> sort="""$sort$""" itemClassFilter="""$itemClassFilter$"""/>
@@ -58,17 +62,13 @@ tags: $:/tags/Macro
 <$reveal type="nomatch" state=<<toc-state>> text="open">
 <$button set=<<toc-state>> setTo="open" class="tc-btn-invisible">
 {{$:/core/images/right-arrow}}
-<$view field="caption">
-<$view field="title"/>
-</$view>
+<<toc-caption>>
 </$button>
 </$reveal>
 <$reveal type="match" state=<<toc-state>> text="open">
 <$button set=<<toc-state>> setTo="close" class="tc-btn-invisible">
 {{$:/core/images/down-arrow}}
-<$view field="caption">
-<$view field="title"/>
-</$view>
+<<toc-caption>>
 </$button>
 </$reveal>
 <$reveal type="match" state=<<toc-state>> text="open">
@@ -81,8 +81,8 @@ tags: $:/tags/Macro
 
 \define toc-expandable(tag,sort:"",itemClassFilter)
 <ol class="tc-toc toc-expandable">
-<$list filter="[tag[$tag$]!has[draft.of]$sort$]">
-<$list filter="[is[current]toc-link[no]]" emptyMessage="<<toc-linked-expandable-body tag:'$tag$' sort:'$sort$' itemClassFilter:'$itemClassFilter$'>>">
+<$list filter="[all[shadows+tiddlers]tag[$tag$]!has[draft.of]$sort$]">
+<$list filter="[all[current]toc-link[no]]" emptyMessage="<<toc-linked-expandable-body tag:'$tag$' sort:'$sort$' itemClassFilter:'$itemClassFilter$'>>">
 <<toc-unlinked-expandable-body tag:"""$tag$""" sort:"""$sort$""" itemClassFilter:"""itemClassFilter""">>
 </$list>
 </$list>
@@ -106,9 +106,7 @@ tags: $:/tags/Macro
 </$button>
 </$reveal>
 </$list>
-<$view field="caption">
-<$view field="title"/>
-</$view>
+<<toc-caption>>
 </$link>
 <$reveal type="match" state=<<toc-state>> text="open">
 <$macrocall $name="toc-selective-expandable" tag=<<currentTiddler>> sort="""$sort$""" itemClassFilter="""$itemClassFilter$"""/>
@@ -126,17 +124,13 @@ tags: $:/tags/Macro
 <$reveal type="nomatch" state=<<toc-state>> text="open">
 <$button set=<<toc-state>> setTo="open" class="tc-btn-invisible">
 {{$:/core/images/right-arrow}}
-<$view field="caption">
-<$view field="title"/>
-</$view>
+<<toc-caption>>
 </$button>
 </$reveal>
 <$reveal type="match" state=<<toc-state>> text="open">
 <$button set=<<toc-state>> setTo="close" class="tc-btn-invisible">
 {{$:/core/images/down-arrow}}
-<$view field="caption">
-<$view field="title"/>
-</$view>
+<<toc-caption>>
 </$button>
 </$reveal>
 </$list>
@@ -150,8 +144,8 @@ tags: $:/tags/Macro
 
 \define toc-selective-expandable(tag,sort:"",itemClassFilter)
 <ol class="tc-toc toc-selective-expandable">
-<$list filter="[tag[$tag$]!has[draft.of]$sort$]">
-<$list filter="[is[current]toc-link[no]]" variable="ignore" emptyMessage="<<toc-linked-selective-expandable-body tag:'$tag$' sort:'$sort$' itemClassFilter:'$itemClassFilter$'>>">
+<$list filter="[all[shadows+tiddlers]tag[$tag$]!has[draft.of]$sort$]">
+<$list filter="[all[current]toc-link[no]]" variable="ignore" emptyMessage="<<toc-linked-selective-expandable-body tag:'$tag$' sort:'$sort$' itemClassFilter:'$itemClassFilter$'>>">
 <<toc-unlinked-selective-expandable-body tag:"""$tag$""" sort:"""$sort$""" itemClassFilter:"""$itemClassFilter$""">>
 </$list>
 </$list>
@@ -162,7 +156,7 @@ tags: $:/tags/Macro
 [all[current]field:title{$selectedTiddler$}]
 \end
 
-\define toc-tabbed-external-nav(tag,sort:"",selectedTiddler:"$:/temp/toc/selectedTiddler",unselectedText)
+\define toc-tabbed-external-nav(tag,sort:"",selectedTiddler:"$:/temp/toc/selectedTiddler",unselectedText,missingText,template:"")
 <$tiddler tiddler={{$selectedTiddler$}}>
 <div class="tc-tabbed-table-of-contents">
 <$linkcatcher to="$selectedTiddler$">
@@ -171,16 +165,23 @@ tags: $:/tags/Macro
 </div>
 </$linkcatcher>
 <div class="tc-tabbed-table-of-contents-content">
-<h1><$view field="caption"><$view field="title"/></$view></h1>
-<$transclude mode="block">$unselectedText$</$transclude>
+<$reveal state="""$selectedTiddler$""" type="nomatch" text="">
+<$transclude mode="block" tiddler="$template$">
+<h1><$transclude field="caption"><$view field="title"/></$transclude></h1>
+<$transclude mode="block">$missingText$</$transclude>
+</$transclude>
+</$reveal>
+<$reveal state="""$selectedTiddler$""" type="match" text="">
+$unselectedText$
+</$reveal>
 </div>
 </div>
 </$tiddler>
 \end
 
-\define toc-tabbed-internal-nav(tag,sort:"",selectedTiddler:"$:/temp/toc/selectedTiddler",unselectedText)
+\define toc-tabbed-internal-nav(tag,sort:"",selectedTiddler:"$:/temp/toc/selectedTiddler",unselectedText,missingText,template:"")
 <$linkcatcher to="""$selectedTiddler$""">
-<$macrocall $name="toc-tabbed-external-nav" tag="""$tag$""" sort="""$sort$""" selectedTiddler="""$selectedTiddler$""" unselectedText="""$unselectedText$"""/>
+<$macrocall $name="toc-tabbed-external-nav" tag="""$tag$""" sort="""$sort$""" selectedTiddler="""$selectedTiddler$""" unselectedText="""$unselectedText$""" missingText="""$missingText$""" template="""$template$"""/>
 </$linkcatcher>
 \end
 

editions/dev/tiddlers/build/Scripts for building tiddlywiki.com.tid

@@ -26,8 +26,7 @@ The scripts are designed to be executed with the current directory being the `Ti
 
 The `package.json` in the root of the `build.jermolene.github.io` repository contains a dependency declaration that specifies the latest official released version of TiddlyWiki to be used when building the release targets:
 
-```
-
+```js
   "dependencies": {
     "tiddlywiki": "5.1.2"
   }
@@ -47,7 +46,7 @@ Some of the scripts use the following environment variables:
 
 Builds the `tiddlywiki.com` target files. By default, it uses the version of tiddlywiki specified in the `package.json` file. This can be overridden with the ''TW5_BUILD_TIDDLYWIKI'' environment variable. The following command would select the latest prerelease version of tiddlywiki from the `TiddlyWiki5` directory:
 
-```
+```bash
     TW5_BUILD_TIDDLYWIKI=./tiddlywiki.js
 ```
 

editions/dev/tiddlers/from Heigele and Jurke/Data-Storage.tid

@@ -5,7 +5,7 @@ title: Data-Storage
 
 TW has two approaches to save the user data. These approaches depends on way you use TW. either you use node.js as a server for TW its saves the tiddlers as plain text in different files or you use TW as standalone in a browser it persists the data within the HTML-File in two Div-Areas depending on whether the encryption of the TiddlyWiki is activated or not. If the TiddlyWiki is not encrypted the data is stored in the Div-Area called "~StoreArea". Every created Tiddler is stored in a own Div-area with a few custom values. An example of a saved Tiddler is shown below (\prettyref{lst:data-div}). 
 
-```
+```html
 <div created="20140611153703343" modified="20140611153734589" tags="testTag" testfield="testvalue" title="TestTiddler" type="text/plain">
 	<pre>testText</pre>
 </div>

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

@@ -7,7 +7,7 @@ title: Datamodel
 
 The micro-kernel creates a TiddlyWiki specific data-structure called tiddler. Here you have to separate the different definition of tiddlers. In the architectural view a tiddler is a JavaScript object holding some data. In the overall concept a tiddler is similar to a wiki page in a normal wiki application like wikipedia. In this section we describe the architectural view of a tiddler. The listing below shows the JSON representation of a tiddler object. During the runtime of the TiddlyWiki everything is saved an object like this. Without any plug-in the architecture is not able to persist any kind of data. All the data is stored in a store. This store is a JavaScript object. This store is constructed like a Map with a bunch of key value pairs. Every tiddler has its name as the key in the map and the JavaScript-Object as the value. The tiddler concept is the main data-model within TiddlyWiki, everything from data up to plug-ins is stored as a tiddler.
 
-```
+```javascript
 {"fields":{
    "text":"example Text",
    "title":"Infrastruktur",

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

@@ -8,7 +8,7 @@ title: Messages
 Messages are events that are triggered by the user. They are generated by widgets for example when the user clicks on a ~ButtonWidget.
 Each message has a type property like "tm-delete-tiddler" and a parameter.
 
-```
+```js
 {type: "tm-delete-tiddler", param: "MyOldTiddler"}
 ```
 

editions/dev/tiddlers/from Heigele and Jurke/Module System.tid

@@ -8,7 +8,7 @@ title: Module System
 After the boot kernel provides the functions used to load tiddlers, the rest of the TiddlyWiki application is loaded as modules.
 A module is a tiddler which has the type ``application/javascript`` and contains CommonJS compatible JavaScript code. This means a single module provides its public structures and functions in a variable called ``export``. Other modules can obtain these structures and functions by using a global ``require`` function.
 
-```
+```js
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
 // ...
 ButtonWidget.prototype = new Widget();

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

@@ -9,7 +9,7 @@ The first stage of WikiText processing is the parser.
 A Parser is provided by a module with ``module-type: parser`` and is responsible to transform block of text to a parse-tree.
 The parse-tree consists of nested nodes like
 
-```
+```js
 {type: "element", tag: <string>, attributes: {}, children: []} - an HTML element
 {type: "text", text: <string>} - a text node
 {type: "entity", value: <string>} - an HTML entity like &copy; for a copyright symbol
@@ -26,14 +26,15 @@ But the html-rule has another special purpose. By parsing the HTML tag syntax it
 It the recognises them by the $ character at the beginning of the tag name and instead of producing "element" nodes 
 it uses the tag name for the type:
 
-```
+```js
 {type: "list", tag: "$list", attributes: {}, children: []} - a list element
 ```
+
 The [[Widgets]] part will reveal why this makes sense and how each node is transformed into a widget.
 Another special characteristic of the html-rule or the parse nodes in general is the attributes property.
 Attributes in the parse-tree are not stored as simple strings but they are nodes of its own to make indirect text references available as attributes as described in [[Widgets]]:
 
-```
+```js
 {type: "string", value: <string>} - literal string
 {type: "indirect", textReference: <textReference>} - indirect through a text reference
 ```

editions/dev/tiddlers/from Heigele and Jurke/Persist data.tid

@@ -5,7 +5,7 @@ title: Persist data
 
 TiddlyWiki supports a wide range of methods to persist your data. One of this methods is the HTML5 fallback saver. This methods works on almost every browser. With this method a copy of the entire wiki will be downloaded by the browser. This means you get a new file everytime you hit the save button.  To avoid this and because every Browser has a different API to allow writing direct to the file system there a some plugins for the different browsers. These plug-ins allow the user to save direct to the current open TiddlyWiki-File. The Listing below shows the HTML5-compliant to save the changes via the HTML5 fallback saver by downloading the TW as a complete HTML-file.
 
-```
+```js
 DownloadSaver.prototype.save = function(text,method,callback) {
 	...
 	var link = document.createElement("a");

editions/dev/tiddlers/from Heigele and Jurke/Selective Update.tid

@@ -17,9 +17,10 @@ This way every time a tiddler or the wiki store itself changes, each widget can
 
 Another way of updating are text reference attributes (text references explained in [[Transclusion and TextReference]]):
 
-```
+```js
 {type: "indirect", textReference: <textReference>}
 ```
+
 When a widget got a attribute which is a text reference and the refresh function is called, it can check if the text reference references a changed tiddler and update accordingly.
 
 Nearly every state of the UI is stored in tiddlers. A search mechanism for example would use a ~EditTextWidget which shows an text input field for the search string and a ListWidget to show the results.

editions/dev/tiddlers/from Heigele and Jurke/Startup Process.tid

@@ -7,7 +7,7 @@ title: Startup Process
 
 Modules with ``module-type: startup`` have to export a  function named ``startup`` and may export a name property to identify this module. The startup function will be executed by the boot kernel at the end of the boot process.
 
-```
+```js
 // From boot.js:
 // Gather up any startup modules
 $tw.boot.remainingStartupModules = []; // Array of startup modules

editions/dev/tiddlers/from Heigele and Jurke/Tags and Filter Mechanism.tid

@@ -27,6 +27,7 @@ Filters are noted as strings and can look like
 ```
 [tag[task]!tag[done]interesting[very]]
 ```
+
 This example would (implicitly) put all available tiddlers into the pipe.
 The first operator ``tag[task]`` would only pass tiddlers which are tagged with "task".
 The ``!tag[done]`` operator is negated and only passes tiddlers which are not tagged with "done".
@@ -39,6 +40,7 @@ An example would be the search-operator. This filter operator looks for the sear
 If the provided filter operators are not enough, a developer can add new filters by adding a module with the ``filteroperator`` type.
 
 !!! System Tags
+
 Tags and the filter mechanism are used throughout the core plug-in for internal puproses.
 Tags which start with ``$:/`` are normally hidden from the casual user, similar to [[System Tiddlers]]
 

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

@@ -14,9 +14,10 @@ When a widget gets a parse node with child nodes it must create the correspondin
 All this functionality is basically provided with the base widget. But when creating the widget for a parse node it loads additional modules with ``module-type: widget``. These modules can export multiple widgets which extend the base widget and can override it's methods like the rendering and refresh functions.
 As described in [[Parser]] each parse node contains a "type" property. This type directly determines which widget module is used.
 
-```
+```js
 {type: "text", text: <string>} - a text node
 ```
+
 Would be transformed to a [[TextWidget|$:/core/modules/widgets/text.js]].
 (Note that the ~TextWidget module exports a property "text".)
 

editions/dev/tiddlers/from tw5.com/Developing plugins using Node.js and GitHub.tid

@@ -28,21 +28,21 @@ Choose a location in your file system (eg TW5) for your plugin project; issue co
 
 !!! 1. Create the directory
 
-```
+```bash
 mkdir TW5
 
 ```
 
 !!! 2. Make a local read-only copy of the ~TiddlyWiki5 repository
 
-```
+```bash
 git clone https://github.com/Jermolene/TiddlyWiki5.git TW5
 
 ```
 
 !!! 3. Make a directory for your plugin
 
-```
+```bash
 cd TW5
 cd plugins
 mkdir yourname
@@ -53,20 +53,20 @@ mkdir pluginname
 
 !!! 4. Make a local copy of your plugin repository
 
-```
+```bash
 git clone https://github.com/yourgithub/pluginname.git pluginname
 
 ```
 !!! 5. Go to your files
 
-```
+```bash
 cd pluginname
 
 ```
 
 Create the file plugin.info with content:
 
-```
+```js
 {
 	"title": "$:/plugins/yourgithub/pluginname",
 	"description": "summary of the plugin's purpose",
@@ -89,7 +89,7 @@ Modify `editions/tw5.com/tiddlywiki.info` to include a reference to your plugin
 
 From the TW5 directory issue the command
 
-```
+```bash
 node ./tiddlywiki.js editions/tw5.com --build index
 ```
 
@@ -101,18 +101,18 @@ From `plugins/yourname/pluginname/` issue commands to:
 
 !!! 1. Add all files
 
-```
+```bash
 git add -A
 ```
 
 !!! 2. Commit to your local repository
 
-```
+```bash
 git commit -am "something meaningful about this check in"
 ```
 
 !!! 3. Copy local changes to github
 
-```
+```bash
 git push
 ```

editions/dev/tiddlers/from tw5.com/How to create a translation for TiddlyWiki.tid

@@ -28,7 +28,7 @@ type: text/vnd.tiddlywiki
 
 Content of `plugin.info` for Joe Bloggs' Welsh translation:
 
-```
+```js
 {
 	"title": "$:/languages/cy-GB",
 	"name": "cy-GB",

editions/dev/tiddlers/from tw5.com/How to create plugins in the browser.tid

@@ -37,7 +37,7 @@ Click the link to the plugin tiddler to open it. Assuming it doesn't currently e
 
 Then in the body of the tiddler, insert:
 
-```
+```js
 {"tiddlers": {}}
 ```
 
@@ -51,7 +51,7 @@ Create the payload tiddlers by clicking on the links in the ''HelloThere'' tiddl
 
 Open the browser developer console, and type the following JavaScript statement, but first change the first parameter to the name of your plugin. The second parameter is an optional array of tiddler titles to be added to the plugin:
 
-```
+```js
 $tw.utils.repackPlugin("$:/plugins/yourname/pluginname",["$:/plugins/yourname/pluginname/mywidget.js"])
 ```
 
@@ -67,7 +67,7 @@ To test the plugin, first make sure that it has been packed. Then save changes a
 
 Once you've built the plugin for the first time you can omit the second parameter to `repackPlugin()` unless you are adding a new tiddler:
 
-```
+```js
 $tw.utils.repackPlugin("$:/plugins/yourname/pluginname")
 ```
 
@@ -75,7 +75,7 @@ $tw.utils.repackPlugin("$:/plugins/yourname/pluginname")
 
 To remove tiddlers from the plugin specify their titles in the optional third parameter:
 
-```
+```jss
 $tw.utils.repackPlugin("$:/plugins/yourname/pluginname",null,["$:/plugins/yourname/pluginname/mywidget.js"])
 ```
 

editions/dev/tiddlers/from tw5.com/TiddlyWiki Coding Style Guidelines.tid

@@ -20,7 +20,7 @@ One blank line is used to separate blocks of code. Occasional blank lines are pe
 
 See the following example for layout of basic JavaScript constructs:
 
-```
+```js
 /*
 Multiline comments are used to introduce a block of code such as a function definition
 */

editions/dev/tiddlers/from tw5.com/TiddlyWiki on node-webkit.tid

@@ -11,7 +11,7 @@ type: text/vnd.tiddlywiki
 ## The appropriate copy of [[node-webkit]] for your platform, downloaded from https://github.com/rogerwang/node-webkit
 ## Your TiddlyWiki HTML file as `index.html`
 ## A file called `package.json` with the following content:
-##> {{packge.json for node-webkit}}
+##> {{package.json for node-webkit}}
 # Run the [[node-webkit]] application
 #* If it doesn't work, you may need to unblock the application before your operating system will run it
 #** OS X: see http://support.apple.com/kb/PH14369

editions/dev/tiddlers/from tw5.com/TiddlyWiki5 Development Environment.tid

@@ -9,7 +9,7 @@ title: TiddlyWiki5 Development Environment
 
 [[Installing TiddlyWiki5]] with NPM downloads a snapshot release of TiddlyWIki5. To use a development copy of the TiddlyWiki5 repository instead of the copy installed by [[NPM]], use this command within the root of the TiddlyWiki5 repo:
 
-```
+```bash
 npm link
 ```
 
@@ -17,7 +17,7 @@ npm link
 
 As releases are made during development it is necessary to adjust the version number of the TiddlyWiki5 core. This is done with the [[npm version|https://npmjs.org/doc/version.html]] command. For example:
 
-```
+```bash
 npm version 5.0.0-alpha.10
 ```
 

editions/dev/tiddlers/new/HookMechanism.tid

@@ -5,7 +5,9 @@ type: text/vnd.tiddlywiki
 
 The hook mechanism provides a way for plugins to intercept and modify default functionality. Hooks are added as follows:
 
-``$tw.hooks.addHook(name,handler);`` 
+```js
+$tw.hooks.addHook(name,handler);
+```
 
 Multiple handlers can be assigned to the same name using repeated calls. When a hook is invoked by name all registered functions will be called sequentially in their order of addition.
 
@@ -15,7 +17,7 @@ Though not essential care should be taken to ensure that hooks are added before
 
 A working example of a hook that adds "test" to the default tiddlers.
 
-```javascript
+```js
 $tw.hooks.addHook("th-opening-default-tiddlers-list",function(list) { 
     list.push("test");
     return list; 

editions/dev/tiddlers/system/fontfamily.tid

@@ -0,0 +1,3 @@
+title: $:/themes/tiddlywiki/vanilla/settings/fontfamily
+
+"Georgia", serif

editions/dev/tiddlers/system/palettes-Dev.tid

@@ -29,7 +29,7 @@ external-link-background: inherit
 external-link-foreground-hover: inherit
 external-link-foreground-visited: #0000aa
 external-link-foreground: #0000ee
-foreground: #333333
+foreground: #4e432f
 message-background: #ecf2ff
 message-border: #cfd6e6
 message-foreground: #547599
@@ -46,24 +46,24 @@ page-background: #f4d7a3
 pre-background: #f5f5f5
 pre-border: #cccccc
 primary: #5778d8
-sidebar-button-foreground: <<colour foreground>>
+sidebar-button-foreground: #877452
 sidebar-controls-foreground-hover: #000000
-sidebar-controls-foreground: #aaaaaa
-sidebar-foreground-shadow: rgba(255,255,255, 0.8)
-sidebar-foreground: #acacac
+sidebar-controls-foreground: #658deb
+sidebar-foreground-shadow: rgba(255,255,255, 0.4)
+sidebar-foreground: #9f8860
 sidebar-muted-foreground-hover: #444444
-sidebar-muted-foreground: #c0c0c0
-sidebar-tab-background-selected: #ececec
-sidebar-tab-background: <<colour tab-background>>
-sidebar-tab-border-selected: <<colour tab-border-selected>>
-sidebar-tab-border: <<colour tab-border>>
-sidebar-tab-divider: #e4e4e4
-sidebar-tab-foreground-selected: 
-sidebar-tab-foreground: <<colour tab-foreground>>
-sidebar-tiddler-link-foreground-hover: #444444
-sidebar-tiddler-link-foreground: #999999
+sidebar-muted-foreground: #c9ac7a
+sidebar-tab-background-selected: #f4d7a3
+sidebar-tab-background: #e6c58b
+sidebar-tab-border-selected: #d9ba83
+sidebar-tab-border: #dbb678
+sidebar-tab-divider: #dfbe87
+sidebar-tab-foreground-selected: #8d764e
+sidebar-tab-foreground: #66573e
+sidebar-tiddler-link-foreground-hover: #8e7a56
+sidebar-tiddler-link-foreground: #937e59
 static-alert-foreground: #aaaaaa
-tab-background-selected: #ffffff
+tab-background-selected: #dff6fc
 tab-background: #d8d8d8
 tab-border-selected: #d8d8d8
 tab-border: #cccccc
@@ -79,7 +79,7 @@ tiddler-background: <<colour background>>
 tiddler-border: <<colour background>>
 tiddler-controls-foreground-hover: #888888
 tiddler-controls-foreground-selected: #444444
-tiddler-controls-foreground: #cccccc
+tiddler-controls-foreground: #9eaeb4
 tiddler-editor-background: #f8f8f8
 tiddler-editor-border-image: #ffffff
 tiddler-editor-border: #cccccc
@@ -91,7 +91,7 @@ tiddler-info-tab-background: #f8f8f8
 tiddler-link-background: <<colour background>>
 tiddler-link-foreground: <<colour primary>>
 tiddler-subtitle-foreground: #c0c0c0
-tiddler-title-foreground: #182955
+tiddler-title-foreground: #715e3e
 toolbar-new-button: 
 toolbar-options-button: 
 toolbar-save-button: 

editions/dev/tiddlywiki.info

@@ -1,7 +1,7 @@
 {
 	"description": "Developer documentation from http://tiddlywiki.com/dev/",
 	"plugins": [
-		"tiddlywiki/cecily",
+		"tiddlywiki/highlight",
 		"tiddlywiki/googleanalytics",
 		"tiddlywiki/nodewebkitsaver",
 		"tiddlywiki/github-fork-ribbon"

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

@@ -1,8 +1,6 @@
 created: 20141123120637390
-creator: 127.0.0.1
 list-after: $:/core/ui/EditTemplate/title
 modified: 20141123162403315
-modifier: 127.0.0.1
 tags: $:/tags/EditTemplate
 title: $:/ContributionBanner
 type: text/vnd.tiddlywiki

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

@@ -1,8 +1,6 @@
 created: 20141116131524391
-creator: 127.0.0.1
 modified: 20141116132730693
-modifier: 127.0.0.1
 title: $:/CurvedText
 type: text/vnd.tiddlywiki
 
-On Firefox/Mac, it can only climb the last hill
+On Firefox/Mac, it can only climb the last hill

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

@@ -1,5 +1,5 @@
 created: 20131127215321439
-modified: 20141115234546200
+modified: 20141129081225712
 title: $:/DefaultTiddlers
 type: text/vnd.tiddlywiki
 

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

@@ -3,4 +3,4 @@ modified: 20141115234636070
 title: $:/SiteSubtitle
 type: text/vnd.tiddlywiki
 
-un carnet de notes web personnel et non linéaire
+un carnet de notes web personnel et non linéaire

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

@@ -0,0 +1,21 @@
+created: 20141127091159720
+modified: 20141203144808981
+tags: $:/tags/Macro
+title: $:/core/macros/list
+type: text/vnd.tiddlywiki
+
+\define list-links(filter,type:"ul",subtype:"li",class:"")
+<$type$ class="$class$">
+<$list filter="$filter$">
+<$subtype$>
+<$link to={{!!title}}>
+<$view field="fr-title">
+<$transclude field="caption">
+<$view field="title"/>
+</$transclude>
+</$view>
+</$link>
+</$subtype$>
+</$list>
+</$type$>
+\end

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

@@ -1,26 +0,0 @@
-created: 20141119224138888
-creator: 127.0.0.1
-modified: 20141119224210297
-modifier: 127.0.0.1
-tags: $:/tags/Macro
-title: $:/core/macros/timeline
-type: text/vnd.tiddlywiki
-
-\define timeline(limit:"100",format:"DDth MMM YYYY",subfilter:"",dateField:"modified")
-<div class="tc-timeline">
-<$list filter="[!is[system]$subfilter$has[$dateField$]!sort[$dateField$]limit[$limit$]eachday[$dateField$]]">
-<div class="tc-menu-list-item">
-<$view field="$dateField$" format="date" template="$format$"/>
-<$list filter="[sameday{!!$dateField$}!is[system]$subfilter$!sort[$dateField$]]">
-<div class="tc-menu-list-subitem">
-<$link to={{!!title}}>
-<$view field="caption">
-<$view field="title"/>
-</$view>
-</$link>
-</div>
-</$list>
-</div>
-</$list>
-</div>
-\end

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

@@ -1,8 +1,6 @@
 caption: {{$:/language/Search/DefaultResults/Caption}}
 created: 20141117081621387
-creator: 127.0.0.1
-modified: 20141118214915276
-modifier: 127.0.0.1
+modified: 20141203175833281
 tags: $:/tags/SearchResults
 title: $:/core/ui/DefaultSearchResultList
 type: text/vnd.tiddlywiki
@@ -16,7 +14,7 @@ type: text/vnd.tiddlywiki
 
 //<small>Correspondances parmi les titres :</small>//
 
-<$list filter="[!is[system]search:caption{$(searchTiddler)$}sort[caption]limit[250]] [!is[system]search:title{$(searchTiddler)$}sort[title]limit[250]]" template="$:/core/ui/ListItemTemplate"/>
+<$list filter="[!is[system]search:title{$(searchTiddler)$}sort[caption]limit[250]] [!is[system]search:fr-title{$(searchTiddler)$}sort[title]limit[250]][!is[system]search:en-title{$(searchTiddler)$}sort[title]limit[250]]" template="$:/core/ui/ListItemTemplate"/>
 
 //<small>Toutes les correspondances :</small>//
 

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

@@ -1,14 +1,12 @@
 created: 20141117221740337
-creator: 127.0.0.1
-modified: 20141119225717026
-modifier: 127.0.0.1
+modified: 20141203175714604
 title: $:/core/ui/ListItemTemplate
 type: text/vnd.tiddlywiki
 
 <div class="tc-menu-list-item">
 <$link to={{!!title}}>
-<$transclude field="caption">
+<$view field="fr-title">
 <$view field="title"/>
-</$transclude>
+</$view>
 </$link>
-</div>
+</div>

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

@@ -1,8 +1,6 @@
 caption: {{$:/language/SideBar/Open/Caption}}
 created: 20141119223515194
-creator: 127.0.0.1
-modified: 20141119230318907
-modifier: 127.0.0.1
+modified: 20141127160706002
 tags: $:/tags/SideBar
 title: $:/core/ui/SideBar/Open
 type: text/vnd.tiddlywiki
@@ -10,7 +8,7 @@ type: text/vnd.tiddlywiki
 \define lingo-base() $:/language/CloseAll/
 <$list filter="[list[$:/StoryList]]" history="$:/HistoryList" storyview="pop">
 
-<$button message="tm-close-tiddler" tooltip={{$:/language/Buttons/Close/Hint}} aria-label={{$:/language/Buttons/Close/Caption}} class="tc-btn-invisible tc-btn-mini">&times;</$button> <$link to={{!!title}}><$transclude field="caption"><$view field="title"/></$transclude></$link>
+<$button message="tm-close-tiddler" tooltip={{$:/language/Buttons/Close/Hint}} aria-label={{$:/language/Buttons/Close/Caption}} class="tc-btn-invisible tc-btn-mini">&times;</$button> <$link to={{!!title}}><$transclude field="fr-title"><$view field="title"/></$transclude></$link>
 
 </$list>
 

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

@@ -1,7 +1,5 @@
 created: 20141119191707140
-creator: 127.0.0.1
-modified: 20141119223956119
-modifier: 127.0.0.1
+modified: 20141128165607841
 tags: $:/tags/ViewTemplate
 title: $:/core/ui/ViewTemplate/title
 type: text/vnd.tiddlywiki
@@ -29,9 +27,9 @@ $:/config/ViewToolbarButtons/Visibility/$(listItem)$
 </$list>
 <$list filter="[all[current]!prefix[$:/]]">
 <h2 class="tc-title">
-<$transclude field="caption">
+<$view field="fr-title">
 <$view field="title"/>
-</$transclude>
+</$view>
 </h2>
 </$list>
 </div>
@@ -41,4 +39,4 @@ $:/config/ViewToolbarButtons/Visibility/$(listItem)$
 <$transclude tiddler="$:/core/ui/TiddlerInfo"/>
 
 </$reveal>
-</div>
+</div>

editions/fr-FR/tiddlers/$__editions_fr-FR_CSS Stylesheets_mesStyles.tid

@@ -1,7 +1,5 @@
 created: 20141017093648366
-creator: evolena
 modified: 20141116084637091
-modifier: evolena
 tags: $:/tags/Stylesheet
 title: $:/editions/fr-FR/CSS Stylesheets/mesStyles
 type: text/css
@@ -9,4 +7,4 @@ type: text/css
 .monStyle {
   color:#ff0000;
   background-color:#ffff00;
-}
+}

editions/fr-FR/tiddlers/$__editions_fr-FR_CSS Stylesheets_utils.tid

@@ -0,0 +1,13 @@
+created: 20141128135102023
+modified: 20141128135233410
+tags: $:/tags/Stylesheet
+title: $:/editions/fr-FR/CSS Stylesheets/utils
+type: text/css
+
+.inline-button {
+  height: 13px; 
+  width: 13px; 
+  vertical-align:-1ex; 
+  display:inline-block; 
+  fill:grey;
+}

editions/fr-FR/tiddlers/$__editions_fr-FR_CSS stylesheets_latex.tid

@@ -1,7 +1,5 @@
 created: 20141005182628123
-creator: xcazin
 modified: 20141115214429648
-modifier: xcazin
 tags: $:/tags/Stylesheet
 title: $:/editions/fr-FR/CSS stylesheets/latex
 type: text/css

editions/fr-FR/tiddlers/$__editions_fr-FR_Macros_timeline-title.tid

@@ -0,0 +1,11 @@
+created: 20141212105632762
+modified: 20141212105822388
+tags: $:/tags/Macro
+title: $:/editions/fr-FR/Macros/timeline-title
+type: text/vnd.tiddlywiki
+
+\define timeline-title()
+<$view field="fr-title">
+<$view field="title"/>
+</$view>
+\end

editions/fr-FR/tiddlers/$__editions_fr-FR_Macros_toc-caption.tid

@@ -0,0 +1,16 @@
+created: 20141212090228728
+modified: 20141212090606825
+tags: $:/tags/Macro
+title: $:/editions/fr-FR/Macros/toc-caption
+type: text/vnd.tiddlywiki
+
+\define toc-caption()
+<$set name="tv-wikilinks" value="no">
+<$transclude field="caption">
+<$view field="fr-title">
+<$view field="title"/>
+</$view>
+</$transclude>
+</$set>
+\end
+

editions/fr-FR/tiddlers/$__editions_fr-FR_Macros_wikitexte-exemple.tid

@@ -1,7 +1,5 @@
 created: 20141017091409980
-creator: evolena
 modified: 20141116084827059
-modifier: evolena
 tags: $:/tags/Macro
 title: $:/editions/fr-FR/Macros/wikitexte-exemple
 type: text/vnd.tiddlywiki
@@ -14,4 +12,4 @@ $src$
 
 $src$
 </div>
-\end
+\end

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

@@ -1,5 +1,7 @@
 created: 20141108184809586
-modified: 20141115213313072
+creator: 127.0.0.1
+modified: 20141212092801073
+modifier: 127.0.0.1
 tags: $:/tags/Macro
 title: $:/editions/fr-FR/util-macros
 type: text/vnd.tiddlywiki
@@ -9,16 +11,28 @@ type: text/vnd.tiddlywiki
 \define dp()
 &#160;:<!-- NO-BREAK SPACE Unicode: U+00A0, UTF-8: C2 A0, ISO-8859-1: A0 -->
 \end
+\define :()
+&#160;:<!-- NO-BREAK SPACE Unicode: U+00A0, UTF-8: C2 A0, ISO-8859-1: A0 -->
+\end
 \define pv()
 &#160;;<!-- NO-BREAK SPACE Unicode: U+00A0, UTF-8: C2 A0, ISO-8859-1: A0 -->
 \end
+\define ;()
+&#160;;<!-- NO-BREAK SPACE Unicode: U+00A0, UTF-8: C2 A0, ISO-8859-1: A0 -->
+\end
 \define pi()
 &#160;?<!-- NO-BREAK SPACE Unicode: U+00A0, UTF-8: C2 A0, ISO-8859-1: A0 -->
 \end
+\define ?()
+&#160;?<!-- NO-BREAK SPACE Unicode: U+00A0, UTF-8: C2 A0, ISO-8859-1: A0 -->
+\end
 \define pe()
 &#160;!<!-- NO-BREAK SPACE Unicode: U+00A0, UTF-8: C2 A0, ISO-8859-1: A0 -->
 \end
+\define !()
+&#160;!<!-- NO-BREAK SPACE Unicode: U+00A0, UTF-8: C2 A0, ISO-8859-1: A0 -->
+\end
 \define gf(text) 
 <!-- NO-BREAK SPACE Unicode: U+00A0, UTF-8: C2 A0, ISO-8859-1: A0 -->
 «&#160;$text$&#160;»
-\end
+\end

editions/fr-FR/tiddlers/About.tid

@@ -1,8 +1,6 @@
 caption: À propos
 created: 20140912145139340
-creator: 127.0.0.1
 modified: 20141105143218197
-modifier: 127.0.0.1
 tags: TableOfContents
 title: About
 type: text/vnd.tiddlywiki

editions/fr-FR/tiddlers/Acknowledgements.tid

@@ -1,8 +1,6 @@
-caption: Remerciements
+fr-title: Remerciements
 created: 20140129204112515
-creator: 127.0.0.1
 modified: 20141115225702483
-modifier: 127.0.0.1
 tags: About
 title: Acknowledgements
 type: text/vnd.tiddlywiki

editions/fr-FR/tiddlers/Adopt a Titles Policy.tid

@@ -1,8 +1,6 @@
-caption: Adoptez une politique pour vos titres
+fr-title: Adoptez une politique pour vos titres
 created: 20130825103300000
-creator: 127.0.0.1
 modified: 20141115221758884
-modifier: 127.0.0.1
 tags: Learning
 title: Adopt a Titles Policy
 type: text/vnd.tiddlywiki

editions/fr-FR/tiddlers/BT Acquisition.tid

@@ -1,11 +1,9 @@
-caption: Acquisition par //British Telecom//
+fr-title: Acquisition par //British Telecom//
 created: 20140923201232223
-creator: xcazin
 modified: 20141005141434026
-modifier: xcazin
 title: BT Acquisition
 type: text/vnd.tiddlywiki
 
 En mai 2007, [[British Telecom|BT]] a acquis [[Osmosoft]], ma société de consultant. Acquérir une société avec un seul employé et un minuscule filet de revenu relevait d'une décision inhabituelle, [[Osmosoft]] ne détenant même pas la propriété intellectuelle de <<tw>>, puisque je l'avais transférée à //~UnaMesa// pour assurer son avenir pour la communauté.
 
-La motivation de [[British Telecom|BT]] était de mieux comprendre les écosystèmes basés sur les communautés. Je rejoignis la société en tant que <<gf "Head of Open Source Innovation">>, responsable de la gouvernance //open source//, et fournissant des conseils et de l'expertise sur la manière de participer à des communautés //open source//.
+La motivation de [[British Telecom|BT]] était de mieux comprendre les écosystèmes basés sur les communautés. Je rejoignis la société en tant que <<gf "Head of Open Source Innovation">>, responsable de la gouvernance //open source//, et fournissant des conseils et de l'expertise sur la manière de participer à des communautés //open source//.

editions/fr-FR/tiddlers/BuildCommand.tid

@@ -1,8 +1,6 @@
 caption: build
 created: 20140425085548209
-creator: 127.0.0.1
 modified: 20141115223038555
-modifier: 127.0.0.1
 tags: Commands
 title: BuildCommand
 type: text/vnd.tiddlywiki

editions/fr-FR/tiddlers/Changes to filters in 5.0.9-beta.tid

@@ -1,7 +1,5 @@
 created: 20140403223413403
-creator: xcazin
 modified: 20141008171634188
-modifier: 127.0.0.1
 tags: [[Release 5.0.9-beta]]
 title: Changes to filters in 5.0.9-beta
 type: text/vnd.tiddlywiki

editions/fr-FR/tiddlers/Chinese (Simplified) Edition.tid

@@ -0,0 +1,14 @@
+caption: Chinois (simplifié)
+created: 20140919215640174
+fr-title: Édition en Chinois (simplifié)
+modified: 20141203174809830
+tags: Languages
+title: Chinese (Simplified) Edition
+type: text/vnd.tiddlywiki
+
+TiddlyWiki 的简体中文翻译版本：
+
+<!-- * ''文件'': http://tiddlywiki.com/languages/zh-Hans/index.html -->
+* ''空白版本'': http://tiddlywiki.com/languages/zh-Hans/empty.html
+
+另请参阅 [[中文 (正體) 版|Chinese (Traditional) Edition]]。

editions/fr-FR/tiddlers/Chinese (Traditional) Edition.tid

@@ -0,0 +1,14 @@
+caption: Chinois (traditionnel)
+created: 20140919215743298
+fr-title: Édition en Chinois (traditionnel)
+modified: 20141203174923002
+tags: Languages
+title: Chinese (Traditional) Edition
+type: text/vnd.tiddlywiki
+
+TiddlyWiki 的正體中文翻譯版本：
+
+<!-- * ''文件'': http://tiddlywiki.com/languages/zh-Hant/index.html -->
+* ''空白版本'': http://tiddlywiki.com/languages/zh-Hant/empty.html
+
+另請參閱 [[中文 (简体) 版|Chinese (Simplified) Edition]]。

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

@@ -1,10 +1,9 @@
 caption: Blocs de code
 created: 20141016143834720
-creator: evolena
 modified: 20141116091520961
-modifier: evolena
 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") :

editions/fr-FR/tiddlers/Codes HTML.tid

@@ -4,4 +4,4 @@ tags: Lexique
 title: Codes HTML
 type: text/vnd.tiddlywiki
 
-<<wikitexte-exemple "&lt;chevrons&gt;">>
+<<wikitexte-exemple "&lt;chevrons&gt;">>

editions/fr-FR/tiddlers/Commands.tid

@@ -1,8 +1,6 @@
-caption: Commandes
+fr-title: Commandes
 created: 20141025215106555
-creator: 127.0.0.1
 modified: 20141115215857164
-modifier: 127.0.0.1
 tags: Reference
 title: Commands
 type: text/vnd.tiddlywiki

editions/fr-FR/tiddlers/Community.tid

@@ -1,8 +1,6 @@
-caption: Communauté
+fr-title: Communauté
 created: 20130909151600000
-creator: xcazin
 modified: 20141019103047540
-modifier: 127.0.0.1
 tags: TableOfContents
 title: Community
 type: text/vnd.tiddlywiki

editions/fr-FR/tiddlers/Compose ballad.tid

@@ -1,8 +1,6 @@
-caption: Composer une ballade
+fr-title: Composer une ballade
 created: 20130825143000000
-creator: 127.0.0.1
 modified: 20141119225542290
-modifier: 127.0.0.1
 tags: task
 title: Compose ballad
 type: text/vnd.tiddlywiki

editions/fr-FR/tiddlers/Contributors.tid

@@ -1,8 +1,6 @@
-caption: Contributeurs
+fr-title: Contributeurs
 created: 20140916132828137
-creator: 127.0.0.1
 modified: 20141105143410484
-modifier: 127.0.0.1
 tags: About
 title: Contributors
 type: text/vnd.tiddlywiki

editions/fr-FR/tiddlers/Customise TiddlyWiki.tid

@@ -1,7 +1,8 @@
 caption: Personnaliser TiddlyWiki
 created: 20140904101600000
+fr-title: Personnaliser TiddlyWiki
 list: [[Initial customisation]]
-modified: 20141115212329546
+modified: 20141129092851178
 tags: TableOfContents
 title: Customise TiddlyWiki
 type: text/vnd.tiddlywiki

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

@@ -1,10 +1,9 @@
 caption: Tirets
 created: 20141016153634338
-creator: evolena
 modified: 20141116092606603
-modifier: evolena
 tags: WikiText
 title: Dashes in WikiText
+fr-title: Tirets en WikiText
 type: text/vnd.tiddlywiki
 
 Les [[tirets|Tirets]] se font avec :

editions/fr-FR/tiddlers/Development of TiddlyWiki5.tid

@@ -1,9 +1,7 @@
-caption: Développement de ~TiddlyWiki5
+fr-title: Développement de ~TiddlyWiki5
 created: 20141005122238133
-creator: xcazin
 modified: 20141005181533745
-modifier: xcazin
 title: Development of TiddlyWiki5
 type: text/vnd.tiddlywiki
 
-J'ai travaillé sur une nouvelle version de <<tw>> à partir de novembre 2011. En tant que programmeur, travailler à une <<gf "version 2.0">> de quelque chose que j'avais déjà écrit était une projet très séduisant. Cela signifiait que les besoins étaient bien compris, et je pouvais dès lors me concentrer sur l'architecture et ses évolutions nécessaires à la mise en œuvre des fonctionnalités désirées.
+J'ai travaillé sur une nouvelle version de <<tw>> à partir de novembre 2011. En tant que programmeur, travailler à une <<gf "version 2.0">> de quelque chose que j'avais déjà écrit était une projet très séduisant. Cela signifiait que les besoins étaient bien compris, et je pouvais dès lors me concentrer sur l'architecture et ses évolutions nécessaires à la mise en œuvre des fonctionnalités désirées.

editions/fr-FR/tiddlers/Discover TiddlyWiki.tid

@@ -1,8 +1,6 @@
-caption: Découvrez TiddlyWiki
+fr-title: Découvrez TiddlyWiki
 created: 20140904121000000
-creator: 127.0.0.1
 modified: 20141115223324127
-modifier: 127.0.0.1
 tags: HelloThere
 title: Discover TiddlyWiki
 type: text/vnd.tiddlywiki

editions/fr-FR/tiddlers/Documentation Style Guide.tid

@@ -0,0 +1,14 @@
+created: 20140904164608166
+fr-title: Manuel de style pour la documentation TiddlyWiki
+modified: 20141128170624843
+tags: Improving TiddlyWiki Documentation
+title: Documentation Style Guide
+type: text/vnd.tiddlywiki
+
+La documentation de ~TiddlyWiki tente de suivre les règles suivantes. L'objectif est de s'assurer que la documentation issue d'auteurs différents se lira de façon aussi homogène que possible.
+
+# Adressez-vous au lecteur directement en disant "vous"
+# Évitez la [[voix passive|http://bdl.oqlf.gouv.qc.ca/bdl/gabarit_bdl.asp?id=2950]] dans vos tutoriels et vos présentations
+# Lorsque vous écrivez en Anglais, utilisez [[l'Anglais britannique de préférence à l'Anglais des États-Unis|http://en.wikipedia.org/wiki/American_and_British_English_spelling_differences]]. En Français, si vous utilisez des expressions qui ne sont pas employées en France, reliez-les à un tiddler qui les replace dans leur contexte.
+
+Voir aussi les règles pour [[les titres des tiddlers|Adopt a Titles Policy]].

editions/fr-FR/tiddlers/Editions.tid

@@ -1,9 +1,8 @@
 caption: Éditions
 created: 20140908125500000
-creator: 127.0.0.1
+fr-title: Éditions
 list: [[Empty Edition]] [[TiddlyWiki in the Sky for TiddlyWeb]]
-modified: 20141115215331035
-modifier: 127.0.0.1
+modified: 20141127090932793
 tags: TableOfContents
 title: Editions
 type: text/vnd.tiddlywiki

editions/fr-FR/tiddlers/Empty Edition.tid

@@ -1,8 +1,6 @@
-caption: Édition « empty »
+fr-title: Édition « empty »
 created: 20140916213421041
-creator: 127.0.0.1
 modified: 20141119192536463
-modifier: 127.0.0.1
 tags: Editions
 title: Empty Edition
 type: text/vnd.tiddlywiki

editions/fr-FR/tiddlers/Encryption.tid

@@ -1,8 +1,6 @@
 caption: Chiffrement
 created: 20130825160900000
-creator: xcazin
 modified: 20141115225515913
-modifier: xcazin
 tags: Features [[Working with TiddlyWiki]]
 title: Encryption
 type: text/vnd.tiddlywiki
@@ -17,4 +15,4 @@ Lorsqu'il est utilisé comme un fichier HTML unique, TiddlyWiki5 permet de chiff
 
 # Si vous voulez vérifier que vos données sont bien chiffrées, vous pouvez ouvrir le fichier enregistré dans un éditeur de texte (faites attention de ne pas le modifier !)
 
-# Ouvrez le fichier dans votre navigateur. Avant d'afficher le contenu, un mot de passe vous sera demandé.
+# Ouvrez le fichier dans votre navigateur. Avant d'afficher le contenu, un mot de passe vous sera demandé.

editions/fr-FR/tiddlers/Environment Variables on Node.js.tid

@@ -1,7 +1,5 @@
 created: 20140617211749290
-creator: 127.0.0.1
 modified: 20141005141619389
-modifier: xcazin
 tags: [[TiddlyWiki on Node.js]]
 title: Environment Variables on Node.js
 type: text/vnd.tiddlywiki

editions/fr-FR/tiddlers/Examples.tid

@@ -1,8 +1,6 @@
-caption: Exemples d'utilisation
+fr-title: Exemples d'utilisation
 created: 20140320230543190
-creator: 127.0.0.1
 modified: 20141116113123645
-modifier: 127.0.0.1
 tags: HelloThere Community
 title: Examples
 type: text/vnd.tiddlywiki

editions/fr-FR/tiddlers/Exporter un sous-ensemble de tiddlers.tid

@@ -0,0 +1,11 @@
+created: 20141128103901173
+modified: 20141128170659622
+tags: Saving
+title: Exporter un sous-ensemble de tiddlers
+type: text/vnd.tiddlywiki
+
+Le mécanisme d'exportation qui a fait son apparition avec la version [[5.1.5]] de <<tw>> permet de sélectionner facilement un sous-ensemble de tiddlers afin de le sauvegarder dans un fichier.
+
+Si par exemple vous souhaitez sauvegarder dans un fichier tous les tiddlers ayant un tag `WikiText` et contenant un champ `fr-title`, entrez le [[filtre|Filters]] `[tag[WikiText]has[fr-title]]` dans l'onglet //Filtre// de la [[Recherche avancée|$:/AdvancedSearch]] et choisissez //Fichier de tiddlers au format JSON// après avoir cliqué sur @@.inline-button {{$:/core/images/export-button}}@@
+
+Vous obtenez alors un fichier nommé `tiddlers.json`, qui contient tous les tiddlers sélectionnés et qui pourra être réutilisé plus tard via un simple glissé-déposé sur un <<tw>> ouvert.

editions/fr-FR/tiddlers/Features.tid

@@ -1,8 +1,6 @@
-caption: Fonctionnalités
+fr-title: Fonctionnalités
 created: 20130822172800000
-creator: 127.0.0.1
 modified: 20141115214833142
-modifier: 127.0.0.1
 tags: TableOfContents
 title: Features
 type: text/vnd.tiddlywiki

editions/fr-FR/tiddlers/FilterOperator_ fields.tid

@@ -1,7 +1,5 @@
 created: 20140924115616653
-creator: xcazin
 modified: 20141006103216206
-modifier: xcazin
 tags: Filters
 title: FilterOperator: fields
 type: text/vnd.tiddlywiki

editions/fr-FR/tiddlers/FilterOperators.tid

@@ -0,0 +1,12 @@
+created: 20140410103123179
+fr-title: Opérateurs de filtre
+modified: 20141213084515111
+tags: Concepts
+title: FilterOperators
+type: text/vnd.tiddlywiki
+
+Les opérateurs de filtre sont les briques des [[filtres|Filters]]. Reportez-vous à notre [[Introduction au maniement des filtres|Introduction to Filters]] pour les détails.
+
+Voici la liste exhaustive des opérateurs de filtre<<:>>
+
+<<list-links "[tag[Filters]]">>

editions/fr-FR/tiddlers/Filters.tid

@@ -0,0 +1,17 @@
+created: 20130827080000000
+fr-title: Filtres
+modified: 20141213084853423
+tags: Reference Concepts
+title: Filters
+type: text/vnd.tiddlywiki
+
+Dans <<tw>>, les filtres servent à sélectionner des tiddlers en spécifiant des critères de correspondance simples. Les filtres sont utilisés par des widgets comme ListWidget et CountWidget pour effectuer des opérations sur plusieurs tiddlers à la fois.
+
+* [[Introduction au maniement des filtres|Introduction to Filters]] vous initie par étape à la manière d'utiliser les filtres
+* [[Grammaire formelle des filtres|Filter Formal Grammar]] est une explication technique de la syntaxe des filtres.
+
+Les opérateurs de filtre les plus courants sont<<:>>
+
+<<list-links "[tag[CommonFilters]]">>
+
+Il existe par ailleurs une liste exhaustive des [[opérateurs de filtre|FilterOperators]].

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

@@ -1,8 +1,6 @@
 caption: Formatage
 created: 20141016142259705
-creator: evolena
 modified: 20141116093315685
-modifier: evolena
 tags: WikiText
 title: Formatting in WikiText
 type: text/vnd.tiddlywiki

editions/fr-FR/tiddlers/Formatting text in TiddlyWiki.tid

@@ -1,41 +1,41 @@
-caption: Formater du texte dans TiddlyWiki
 created: 20140908131500000
-modified: 20141116091250359
+fr-title: Formater du texte dans TiddlyWiki
+modified: 20141203151407522
 tags: [[Working with TiddlyWiki]]
 title: Formatting text in TiddlyWiki
 type: text/vnd.tiddlywiki
 
-Within the text of a tiddler you can use special formatting called WikiText to control how the text is displayed.
+Au sein d'un tiddler, vous pouvez utiliser un formatage spécifique appelé WikiText, afin de contrôler la manière dont le texte sera affiché.
 
-! Simple Formatting
+! Formatage simple
 
-At its simplest, WikiText lets you use familiar word-processing features like bold, italic, lists and tables. For example:
+Dans sa plus simple expression, WikiText vous permet d'appliquer des fonctions de traitement de texte familières comme le gras, l'italique, les listes et les tableaux. Par exemple<<dp>>
 
 ```
-The ''quick'' brown ~~flea~~ fox //jumps// over the `lazy` dog
+Portez ce //vieux// whisky au ''juge'' ~~brun~~ blond qui `fume`
 ```
 
-Displays as:
+S'affiche ainsi<<dp>>
 
-The ''quick'' brown ~~flea~~ fox //jumps// over the `lazy` dog
+Portez ce //vieux// whisky au ''juge'' ~~brun~~ blond qui `fume`
 
-! Working with Tiddlers
+! Travailler avec les tiddlers
 
-WikiText allows you to link to tiddlers using double square brackets, or taking advantage of the automatic linking of CamelCase words:
+WikiText vous permet de [[pointer vers d'autres tiddlers|Linking in WikiText]] à l'aide des doubles crochets droits, ou grâce aux liens automatiques engendrés par les mots en CamelCase<<dp>>
 
 ```
-This is a link to HelloThere, and one to [[History of TiddlyWiki]]
+Voici un lien vers HelloThere, et un autre vers l'[[histoire de TiddlyWiki|History of TiddlyWiki]]
 ```
 
-Displays as:
+S'affiche comme<<dp>>
 
-This is a link to HelloThere, and one to [[History of TiddlyWiki]]
+Voici un lien vers HelloThere, et un autre vers l'[[histoire de TiddlyWiki|History of TiddlyWiki]]
 
 ! Macros
 
-Macros let you package repetitive fragments of WikiText so that you can easily reuse them.
+Les macros vous permettent d'assembler des bouts de WikiText répétitifs, afin de les réutiliser facilement.
 
-For example, here is the definition of a macro that generates a YouTube video URL from its unique identifier:
+Par exemple, voici la définition d'une macro qui génère une URL vidéo ~YouTube à partir de son identifiant unique<<dp>>
 
 ```
 \define youtube(video)
@@ -43,14 +43,14 @@ https://www.youtube.com/watch?v=$video$
 \end
 ```
 
-With that definition in place, `<<youtube 1g66s7UbyuU>>` generates the URL https://www.youtube.com/watch?v=1g66s7UbyuU
+Une fois cette définition mise en place, `<<youtube 1g66s7UbyuU>>` génèrera l'URL https://www.youtube.com/watch?v=1g66s7UbyuU
 
-! Advanced WikiText
+! ~WikiText avancé
 
-Advanced WikiText features allow you to produce automated lists and interactive features like dropdown menus. In fact, the entire user interface of TiddlyWiki itself is written in WikiText, so any feature that you see in TiddlyWiki can be adapted for use in your own wikis.
+Les fonctionnalités avancées de WikiText permettent de produire des listes automatisées et des fonctions interactives comme des menus déroulants. En fait, toute l'interface de TiddlyWiki est elle-même écrite en WikiText<<pv>> autrement dit, toutes les fonctionnalités que vous voyez dans TiddlyWiki peuvent être adaptées pour être utilisées dans vos propres wikis.
 
-Some of the advanced features require complex coding. TiddlyWiki includes several built-in macros that simplify common user interface tasks, like tabs, tables of content, and lists of tiddlers.
+Certaines fonctionnalités avancées nécessitent un codage complexe. <<tw>> inclut plusieurs macros prédéfinies, qui simplifient les fonctions usuelles d'interface utilisateur, comme les onglets, les tables des matières, et les listes de tiddlers.
 
-! Find out more
+! En savoir plus
 
-See [[WikiText]] for a detailed introduction to writing WikiText.
+Voir [[WikiText]] pour une introduction détaillée à l'écriture de ~WikiText.

editions/fr-FR/tiddlers/French (France) Edition.tid

@@ -1,8 +1,8 @@
+caption: Français (France)
 created: 20140919215540827
-creator: 127.0.0.1
-modified: 20141019102936017
-modifier: 127.0.0.1
-tags: Editions
+en-title: French (France) Edition
+modified: 20141203175944610
+tags: Languages
 title: Édition en Français (France)
 type: text/vnd.tiddlywiki
 

editions/fr-FR/tiddlers/Future.tid

@@ -1,9 +1,8 @@
+fr-title: L'avenir
 caption: L'avenir
 created: 20141005122306855
-creator: xcazin
 modified: 20141005181504007
-modifier: xcazin
 title: Future
 type: text/vnd.tiddlywiki
 
-À présent que ~TiddlyWiki5 a enfin quitté son statut de <<gf beta>>, j'ai bon espoir qu'il vivra longtemps. Comme il n'utilise que des fonctionnalités standard de HTML5 et Node.js, il n'y a aucune raison pour qu'il ne reste pas entièrement opérationnel dans les années qui viennent. Mon but est qu'il survive au moins 25 ans.
+À présent que ~TiddlyWiki5 a enfin quitté son statut de <<gf beta>>, j'ai bon espoir qu'il vivra longtemps. Comme il n'utilise que des fonctionnalités standard de HTML5 et Node.js, il n'y a aucune raison pour qu'il ne reste pas entièrement opérationnel dans les années qui viennent. Mon but est qu'il survive au moins 25 ans.

editions/fr-FR/tiddlers/German (Austria) Edition.tid

@@ -0,0 +1,15 @@
+caption: Allemand (Autriche)
+created: 20140919214900580
+en-title: German (Austria) Edition
+fr-title: Édition en Allemand (Autriche)
+modified: 20141203175142914
+tags: Languages
+title: Deutsch (Österreich) Edition
+type: text/vnd.tiddlywiki
+
+Die österreichische Übersetzung von TiddlyWiki ist verfügbar unter:
+
+* ''Dokumentation'': http://tiddlywiki.com/languages/de-AT/index.html
+* ''Leer'': http://tiddlywiki.com/languages/de-AT/empty.html
+
+Siehe auch: [[Deutsch (Deutschland) Edition]].

editions/fr-FR/tiddlers/German (Germany) Edition.tid

@@ -0,0 +1,15 @@
+caption: Allemand (Allemagne)
+created: 20140919215410238
+en-title: German (Germany) Edition
+fr-title: Édition en Allemand (Allemagne)
+modified: 20141203175121759
+tags: Languages
+title: Deutsch (Deutschland) Edition
+type: text/vnd.tiddlywiki
+
+Die deutsche Übersetzung von TiddlyWiki ist verfügbar unter:
+
+* ''Dokumentation'': http://tiddlywiki.com/languages/de-DE/index.html
+* ''Leer'': http://tiddlywiki.com/languages/de-DE/empty.html
+
+Siehe auch: [[Deutsch (Österreich) Edition]].

editions/fr-FR/tiddlers/Get the Ring.tid

@@ -1,8 +1,6 @@
-caption: Ramener l'Anneau
+fr-title: Ramener l'Anneau
 created: 20130825143100000
-creator: 127.0.0.1
 modified: 20141119225552824
-modifier: 127.0.0.1
 tags: task
 title: Get the Ring
 type: text/vnd.tiddlywiki

editions/fr-FR/tiddlers/Getting Started Video.tid

@@ -1,8 +1,6 @@
-caption: Bien démarrer en vidéo
+fr-title: Bien démarrer en vidéo
 created: 20140104134911101
-creator: 127.0.0.1
 modified: 20141030100458780
-modifier: 127.0.0.1
 tags: Videos [[Working with TiddlyWiki]]
 title: Getting Started Video
 type: text/vnd.tiddlywiki

editions/fr-FR/tiddlers/GettingStarted - Android.tid

@@ -1,9 +1,8 @@
 caption: Android
 created: 20140811171036268
-creator: xcazin
 modified: 20140928130227913
-modifier: xcazin
 title: GettingStarted - Android
+fr-title: Bien démarrer — Android
 type: text/vnd.tiddlywiki
 
 Deux options s'offrent à vous pour utiliser <<tw>> sur Android :