Force a rebuild

I don't have time right now to resolve the merge conflicts with master

bin/build-site.sh

@@ -107,20 +107,33 @@ fi
 # /index.html			Main site
 # /external-(version).html External core version of 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 $TW5_BUILD_TIDDLYWIKI \
 	$TW5_BUILD_MAIN_EDITION \
 	--version \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
-	--build favicon static index external-js \
+	--build favicon index external-js \
 	|| exit 1
 
+# /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
+
+# Conditionally build static files if $TW5_BUILD_STATIC variable is not set or is set to 0
+if [ -z "$TW5_BUILD_STATIC" ] || [ "$TW5_BUILD_STATIC" = "0" ]; then
+
+node $TW5_BUILD_TIDDLYWIKI \
+	$TW5_BUILD_MAIN_EDITION \
+	--version \
+	--load $TW5_BUILD_OUTPUT/build.tid \
+	--output $TW5_BUILD_OUTPUT \
+	--build static \
+	|| exit 1
+fi
+
 # /empty.html					Empty
 # /empty.hta					For Internet Explorer
 # /empty-external-core.html		External core empty
@@ -156,7 +169,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/tour \
 	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all tour.html text/plain \
+	--rendertiddler $:/core/save/all-external-js tour.html text/plain \
 	|| exit 1
 
 # /share.html				Custom edition for sharing via the URL
@@ -190,12 +203,15 @@ node $TW5_BUILD_TIDDLYWIKI \
 #
 ######################################################
 
+# Conditionally build editions if $TW5_BUILD_EDITIONS variable is not set or is set to 0
+if [ -z "$TW5_BUILD_EDITIONS" ] || [ "$TW5_BUILD_EDITIONS" = "0" ]; then
+
 # /editions/xlsx-utils/index.html	xlsx-utils edition
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/xlsx-utils \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/editions/xlsx-utils/ \
-	--build index \
+	--build external \
 	|| exit 1
 
 # /editions/resumebuilder/index.html	Resume builder edition
@@ -211,7 +227,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 	./editions/text-slicer \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/editions/text-slicer/ \
-	--build index \
+	--build external \
 	|| exit 1
 
 # /editions/translators/index.html	Translators edition
@@ -243,7 +259,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 	./editions/tw5.com-docs \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/editions/tw5.com-docs/ \
-	--build index \
+	--build external \
 	|| exit 1
 
 # /editions/twitter-archivist/index.html	Twitter Archivist edition
@@ -254,19 +270,25 @@ node $TW5_BUILD_TIDDLYWIKI \
 	--build index \
 	|| exit 1
 
+fi
+
+
 ######################################################
 #
 # Plugin demos
 #
 ######################################################
 
+# Conditionally build plugin demos if $TW5_BUILD_PLUGIN_DEMOS variable is not set
+if [ -z "$TW5_BUILD_PLUGIN_DEMOS" ] || [ "$TW5_BUILD_PLUGIN_DEMOS" = "0" ]; then
+
 # /plugins/tiddlywiki/innerwiki/index.html	Demo wiki with Innerwiki plugin
 
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/innerwikidemo \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all plugins/tiddlywiki/innerwiki/index.html text/plain \
+	--rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/innerwiki/index.html text/plain \
 	|| exit 1
 
 # /plugins/tiddlywiki/dynaview/index.html	Demo wiki with DynaView plugin
@@ -276,7 +298,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 	./editions/dynaviewdemo \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all plugins/tiddlywiki/dynaview/index.html text/plain \
+	--rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/dynaview/index.html text/plain \
 	--rendertiddler $:/core/save/empty plugins/tiddlywiki/dynaview/empty.html text/plain \
 	|| exit 1
 
@@ -290,7 +312,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 	./editions/katexdemo \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all plugins/tiddlywiki/katex/index.html text/plain \
+	--rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/katex/index.html text/plain \
 	--rendertiddler $:/core/save/empty plugins/tiddlywiki/katex/empty.html text/plain \
 	|| exit 1
 
@@ -320,7 +342,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 	./editions/codemirrordemo \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all plugins/tiddlywiki/codemirror/index.html text/plain \
+	--rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/codemirror/index.html text/plain \
 	--rendertiddler $:/core/save/empty plugins/tiddlywiki/codemirror/empty.html text/plain \
 	|| exit 1
 
@@ -330,7 +352,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 	./editions/markdowndemo \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all plugins/tiddlywiki/markdown/index.html text/plain \
+	--rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/markdown/index.html text/plain \
 	--rendertiddler $:/core/save/empty plugins/tiddlywiki/markdown/empty.html text/plain \
 	|| exit 1
 
@@ -340,7 +362,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 	./editions/classicparserdemo \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all plugins/tiddlywiki/tw2parser/index.html text/plain \
+	--rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/tw2parser/index.html text/plain \
 	--rendertiddler $:/core/save/empty plugins/tiddlywiki/tw2parser/empty.html text/plain \
 	|| exit 1
 
@@ -350,7 +372,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 	./editions/highlightdemo \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all plugins/tiddlywiki/highlight/index.html text/plain \
+	--rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/highlight/index.html text/plain \
 	--rendertiddler $:/core/save/empty plugins/tiddlywiki/highlight/empty.html text/plain \
 	|| exit 1
 
@@ -360,16 +382,21 @@ node $TW5_BUILD_TIDDLYWIKI \
 	./editions/geospatialdemo \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all plugins/tiddlywiki/geospatial/index.html text/plain \
+	--rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/geospatial/index.html text/plain \
 	--rendertiddler $:/core/save/empty plugins/tiddlywiki/geospatial/empty.html text/plain \
 	|| exit 1
 
+fi
+
 ######################################################
 #
 # Language editions
 #
 ######################################################
 
+# Conditionally build language editions if $TW5_BUILD_LANGUAGE_DEMOS variable is not set
+if [ -z "$TW5_BUILD_LANGUAGE_DEMOS" ] || [ "$TW5_BUILD_LANGUAGE_DEMOS" = "0" ]; then
+
 # Delete any existing static content
 
 rm -rf $TW5_BUILD_OUTPUT/languages/de-AT/static/*
@@ -453,12 +480,17 @@ node $TW5_BUILD_TIDDLYWIKI \
 	--build empty index \
 	|| exit 1
 
+fi
+
 ######################################################
 #
 # Plugin library
 #
 ######################################################
 
+# Conditionally build plugin library if $TW5_BUILD_PLUGIN_LIBRARY variable is not set
+if [ -z "$TW5_BUILD_PLUGIN_LIBRARY" ] || [ "$TW5_BUILD_PLUGIN_LIBRARY" = "0" ]; then
+
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/pluginlibrary \
 	--load $TW5_BUILD_OUTPUT/build.tid \
@@ -466,6 +498,8 @@ node $TW5_BUILD_TIDDLYWIKI \
 	--build library\
 	|| exit 1
 
+fi
+
 # Delete the temporary build tiddler
 
 rm $TW5_BUILD_OUTPUT/build.tid || exit 1

boot/boot.js

@@ -1902,8 +1902,16 @@ $tw.loadTiddlersFromFile = function(filepath,fields) {
 		extensionInfo = $tw.utils.getFileExtensionInfo(ext),
 		type = extensionInfo ? extensionInfo.type : null,
 		typeInfo = type ? $tw.config.contentTypeInfo[type] : null,
-		data = fs.readFileSync(filepath,typeInfo ? typeInfo.encoding : "utf8"),
-		tiddlers = $tw.wiki.deserializeTiddlers(ext,data,fields),
+		fileSize = fs.statSync(filepath).size,
+		data;
+	if(fileSize > $tw.config.maxEditFileSize) {
+		data = "File " + filepath + "not loaded because it is too large";
+		console.log("Warning: " + data);
+		ext = ".txt";
+	} else {
+		data = fs.readFileSync(filepath,typeInfo ? typeInfo.encoding : "utf8");
+	}
+	var tiddlers = $tw.wiki.deserializeTiddlers(ext,data,fields),
 		metadata = $tw.loadMetadataForFile(filepath);
 	if(metadata) {
 		if(type === "application/json") {
@@ -1992,7 +2000,7 @@ $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
 					var value = tiddler[name];
 					switch(fieldInfo.source) {
 						case "subdirectories":
-							value = path.relative(rootPath, filename).split(path.sep).slice(0, -1);
+							value = $tw.utils.stringifyList(path.relative(rootPath, filename).split(path.sep).slice(0, -1));
 							break;
 						case "filepath":
 							value = path.relative(rootPath, filename).split(path.sep).join('/');
@@ -2013,10 +2021,10 @@ $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
 							value = path.extname(filename);
 							break;
 						case "created":
-							value = new Date(fs.statSync(pathname).birthtime);
+							value = $tw.utils.stringifyDate(new Date(fs.statSync(pathname).birthtime));
 							break;
 						case "modified":
-							value = new Date(fs.statSync(pathname).mtime);
+							value = $tw.utils.stringifyDate(new Date(fs.statSync(pathname).mtime));
 							break;
 					}
 					if(fieldInfo.prefix) {
@@ -2724,14 +2732,15 @@ $tw.hooks.removeHook = function(hookName,definition) {
 /*
 Invoke the hook by key
 */
-$tw.hooks.invokeHook = function(hookName /*, value,... */) {
-	var args = Array.prototype.slice.call(arguments,1);
-	if($tw.utils.hop($tw.hooks.names,hookName)) {
+$tw.hooks.invokeHook = function(hookName, firstArgument /*, value,... */) {
+	if(Object.prototype.hasOwnProperty.call($tw.hooks.names,hookName)) {
+		var args = Array.prototype.slice.call(arguments,1);
 		for(var i = 0; i < $tw.hooks.names[hookName].length; i++) {
 			args[0] = $tw.hooks.names[hookName][i].apply(null,args);
 		}
+		return args[0];
 	}
-	return args[0];
+	return firstArgument;
 };
 
 /////////////////////////// Main boot function to decrypt tiddlers and then startup

boot/bootprefix.js

@@ -19,6 +19,10 @@ var _bootprefix = (function($tw) {
 $tw = $tw || Object.create(null);
 $tw.boot = $tw.boot || Object.create(null);
 
+// Config
+$tw.config = $tw.config || Object.create(null);
+$tw.config.maxEditFileSize = 100 * 1024 * 1024; // 100MB
+
 // Detect platforms
 if(!("browser" in $tw)) {
 	$tw.browser = typeof(window) !== "undefined" && typeof(document) !== "undefined" ? {} : null;

core/language/en-GB/Fields.multids

@@ -4,12 +4,12 @@ _canonical_uri: The full URI of an external image tiddler
 author: Name of the author of a plugin
 bag: The name of the bag from which a tiddler came
 caption: The text to be displayed on a tab or button
-class: The CSS class applied to a tiddler when rendering it - see [[Custom styles by user-class]].  Also used for [[Modals]]
+class: The CSS class applied to a tiddler when rendering it.  Also used for Modals
 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]]
+component: The name of the component responsible for an alert tiddler
 core-version: For a plugin, indicates what version of TiddlyWiki with which it is compatible
-current-tiddler: Used to cache the top tiddler in a [[history list|HistoryMechanism]]
+current-tiddler: Used to cache the top tiddler in a history list
 created: The date a tiddler was created
 creator: The name of the person who created a tiddler
 dependents: For a plugin, lists the dependent plugin titles

core/language/en-GB/Search.multids

@@ -3,7 +3,9 @@ title: $:/language/Search/
 DefaultResults/Caption: List
 Filter/Caption: Filter
 Filter/Hint: Search via a [[filter expression|https://tiddlywiki.com/static/Filters.html]]
+Filter/Placeholder: Filter expression
 Filter/Matches: //<small><<resultCount>> matches</small>//
+Filter/FilterResults/Results/Caption: Results
 Matches: //<small><<resultCount>> matches</small>//
 Matches/All: All matches:
 Matches/NoMatch: //No match//

core/modules/commander.js

@@ -6,10 +6,7 @@ module-type: global
 The $tw.Commander class is a command interpreter
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -173,5 +170,3 @@ Commander.initCommands = function(moduleType) {
 };
 
 exports.Commander = Commander;
-
-})();

core/modules/commands/build.js

@@ -6,10 +6,7 @@ module-type: command
 Command to build a build target
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -48,5 +45,3 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
-
-})();

core/modules/commands/clearpassword.js

@@ -6,10 +6,7 @@ module-type: command
 Clear password for crypto operations
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -29,5 +26,3 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
-
-})();

core/modules/commands/commands.js

@@ -7,10 +7,6 @@ Runs the commands returned from a filter
 
 \*/
 
-(function() {
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -38,5 +34,3 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
-
-})();

core/modules/commands/deletetiddlers.js

@@ -6,10 +6,7 @@ module-type: command
 Command to delete tiddlers
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -38,5 +35,3 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
-
-})();

core/modules/commands/editions.js

@@ -6,10 +6,7 @@ module-type: command
 Command to list the available editions
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -35,5 +32,3 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
-
-})();

core/modules/commands/fetch.js

@@ -6,10 +6,7 @@ module-type: command
 Commands to fetch external tiddlers
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -171,5 +168,3 @@ Command.prototype.processBody = function(body,type,options,url) {
 };
 
 exports.Command = Command;
-
-})();

core/modules/commands/help.js

@@ -6,10 +6,7 @@ module-type: command
 Help command
 
 \*/
-(function(){
 
-/*jshint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -37,5 +34,3 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
-
-})();

core/modules/commands/import.js

@@ -6,10 +6,7 @@ module-type: command
 Command to import tiddlers from a file
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -44,5 +41,3 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
-
-})();

core/modules/commands/init.js

@@ -6,10 +6,7 @@ module-type: command
 Command to initialise an empty wiki folder
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -55,5 +52,3 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
-
-})();

core/modules/commands/listen.js

@@ -6,10 +6,7 @@ module-type: command
 Listen for HTTP requests and serve tiddlers
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var Server = require("$:/core/modules/server/server.js").Server;
@@ -44,5 +41,3 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
-
-})();

core/modules/commands/load.js

@@ -6,10 +6,7 @@ module-type: command
 Command to load tiddlers from a file or directory
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -47,5 +44,3 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
-
-})();

core/modules/commands/makelibrary.js

@@ -6,10 +6,7 @@ module-type: command
 Command to pack all of the plugins in the library into a plugin tiddler of type "library"
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -41,5 +38,3 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
-
-})();

core/modules/commands/output.js

@@ -6,10 +6,7 @@ module-type: command
 Command to set the default output location (defaults to current working directory)
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -34,5 +31,3 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
-
-})();

core/modules/commands/password.js

@@ -6,10 +6,7 @@ module-type: command
 Save password for crypto operations
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -32,5 +29,3 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
-
-})();

core/modules/commands/render.js

@@ -6,10 +6,7 @@ module-type: command
 Render individual tiddlers and save the results to the specified files
 
 \*/
-(function(){
 
-	/*jslint node: true, browser: true */
-	/*global $tw: false */
 	"use strict";
 	
 	var widget = require("$:/core/modules/widgets/widget.js");
@@ -66,6 +63,3 @@ Render individual tiddlers and save the results to the specified files
 	};
 	
 	exports.Command = Command;
-	
-	})();
-	

core/modules/commands/rendertiddler.js

@@ -6,10 +6,7 @@ module-type: command
 Command to render a tiddler and save it to a file
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -53,5 +50,3 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
-
-})();

core/modules/commands/rendertiddlers.js

@@ -6,10 +6,7 @@ module-type: command
 Command to render several tiddlers to a folder of files
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var widget = require("$:/core/modules/widgets/widget.js");
@@ -65,5 +62,3 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
-
-})();

core/modules/commands/save.js

@@ -6,10 +6,7 @@ module-type: command
 Saves individual tiddlers in their raw text or binary format to the specified files
 
 \*/
-(function(){
 
-	/*jslint node: true, browser: true */
-	/*global $tw: false */
 	"use strict";
 	
 	exports.info = {
@@ -64,6 +61,3 @@ Saves individual tiddlers in their raw text or binary format to the specified fi
 	};
 	
 	exports.Command = Command;
-	
-	})();
-	

core/modules/commands/savelibrarytiddlers.js

@@ -16,10 +16,7 @@ The pathname specifies the pathname to the folder in which the JSON files should
 The skinnylisting specifies the title of the tiddler to which a JSON catalogue of the subtiddlers will be saved. The JSON file contains the same data as the bundle tiddler but with the `text` field removed.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -94,5 +91,3 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
-
-})();

core/modules/commands/savetiddler.js

@@ -6,10 +6,7 @@ module-type: command
 Command to save the content of a tiddler to a file
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -47,5 +44,3 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
-
-})();

core/modules/commands/savetiddlers.js

@@ -6,10 +6,7 @@ module-type: command
 Command to save several tiddlers to a folder of files
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var widget = require("$:/core/modules/widgets/widget.js");
@@ -52,5 +49,3 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
-
-})();

core/modules/commands/savewikifolder.js

@@ -15,10 +15,7 @@ The following options are supported:
 Supports backward compatibility with --savewikifolder <wikifolderpath> [<filter>] [ [<name>=<value>] ]*
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -221,5 +218,3 @@ WikiFolderMaker.prototype.saveFile = function(filename,encoding,data) {
 };
 
 exports.Command = Command;
-
-})();

core/modules/commands/server.js

@@ -6,10 +6,7 @@ module-type: command
 Deprecated legacy command for serving tiddlers
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var Server = require("$:/core/modules/server/server.js").Server;
@@ -51,5 +48,3 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
-
-})();

core/modules/commands/setfield.js

@@ -6,10 +6,7 @@ module-type: command
 Command to modify selected tiddlers to set a field to the text of a template tiddler that has been wikified with the selected tiddler as the current tiddler.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var widget = require("$:/core/modules/widgets/widget.js");
@@ -54,5 +51,3 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
-
-})();

core/modules/commands/unpackplugin.js

@@ -6,10 +6,7 @@ module-type: command
 Command to extract the shadow tiddlers from within a plugin
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -40,5 +37,3 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
-
-})();

core/modules/commands/verbose.js

@@ -6,10 +6,7 @@ module-type: command
 Verbose command
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -30,5 +27,3 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
-
-})();

core/modules/commands/version.js

@@ -6,10 +6,7 @@ module-type: command
 Version command
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -28,5 +25,3 @@ Command.prototype.execute = function() {
 };
 
 exports.Command = Command;
-
-})();

core/modules/config.js

@@ -6,10 +6,7 @@ module-type: config
 Core configuration constants
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.preferences = {};
@@ -37,5 +34,3 @@ exports.htmlVoidElements = "area,base,br,col,command,embed,hr,img,input,keygen,l
 exports.htmlBlockElements = "address,article,aside,audio,blockquote,canvas,dd,details,div,dl,dt,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,header,hgroup,hr,li,nav,ol,p,pre,section,summary,table,tfoot,ul,video".split(",");
 
 exports.htmlUnsafeElements = "script".split(",");
-
-})();

core/modules/deserializers.js

@@ -6,10 +6,7 @@ module-type: tiddlerdeserializer
 Functions to deserialise tiddlers from a block of text
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports["application/x-tiddler-html-div"] = function(text,fields) {
@@ -181,5 +178,3 @@ var deserializeTiddlerDiv = function(text /* [,fields] */) {
 	}
 	return undefined;
 };
-
-})();

core/modules/editor/engines/framed.js

@@ -6,10 +6,7 @@ module-type: library
 Text editor engine based on a simple input or textarea within an iframe. This is done so that the selection is preserved even when clicking away from the textarea
 
 \*/
-(function(){
 
-/*jslint node: true,browser: true */
-/*global $tw: false */
 "use strict";
 
 var HEIGHT_VALUE_TITLE = "$:/config/TextEditor/EditorHeight/Height";
@@ -273,5 +270,3 @@ FramedEngine.prototype.executeTextOperation = function(operation) {
 };
 
 exports.FramedEngine = FramedEngine;
-
-})();

core/modules/editor/engines/simple.js

@@ -6,10 +6,7 @@ module-type: library
 Text editor engine based on a simple input or textarea tag
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var HEIGHT_VALUE_TITLE = "$:/config/TextEditor/EditorHeight/Height";
@@ -172,5 +169,3 @@ SimpleEngine.prototype.executeTextOperation = function(operation) {
 };
 
 exports.SimpleEngine = SimpleEngine;
-
-})();

core/modules/editor/factory.js

@@ -6,10 +6,7 @@ module-type: library
 Factory for constructing text editor widgets with specified engines for the toolbar and non-toolbar cases
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var DEFAULT_MIN_TEXT_AREA_HEIGHT = "100px"; // Minimum height of textareas in pixels
@@ -386,5 +383,3 @@ function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) {
 }
 
 exports.editTextWidgetFactory = editTextWidgetFactory;
-
-})();

core/modules/editor/operations/bitmap/clear.js

@@ -6,10 +6,7 @@ module-type: bitmapeditoroperation
 Bitmap editor operation to clear the image
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports["clear"] = function(event) {
@@ -20,5 +17,3 @@ exports["clear"] = function(event) {
 	// Save changes
 	this.strokeEnd();
 };
-
-})();

core/modules/editor/operations/bitmap/resize.js

@@ -6,10 +6,7 @@ module-type: bitmapeditoroperation
 Bitmap editor operation to resize the image
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports["resize"] = function(event) {
@@ -25,5 +22,3 @@ exports["resize"] = function(event) {
 	// Save the image into the tiddler
 	this.saveChanges();
 };
-
-})();

core/modules/editor/operations/bitmap/rotate-left.js

@@ -6,10 +6,7 @@ module-type: bitmapeditoroperation
 Bitmap editor operation to rotate the image left by 90 degrees
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports["rotate-left"] = function(event) {
@@ -20,5 +17,3 @@ exports["rotate-left"] = function(event) {
 	// Save the image into the tiddler
 	this.saveChanges();
 };
-
-})();

core/modules/editor/operations/text/excise.js

@@ -6,10 +6,7 @@ module-type: texteditoroperation
 Text editor operation to excise the selection to a new tiddler
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 function isMarkdown(mediaType) {
@@ -53,5 +50,3 @@ exports["excise"] = function(event,operation) {
 	operation.newSelStart = operation.selStart;
 	operation.newSelEnd = operation.selStart + operation.replacement.length;
 };
-
-})();

core/modules/editor/operations/text/focus-editor.js

@@ -4,14 +4,9 @@ type: application/javascript
 module-type: texteditoroperation
 Simply focus the Text editor
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports["focus-editor"] = function(event,operation) {
 	operation = null;
 };
-
-})();

core/modules/editor/operations/text/insert-text.js

@@ -6,10 +6,7 @@ module-type: texteditoroperation
 Text editor operation insert text at the caret position. If there is a selection it is replaced.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports["insert-text"] = function(event,operation) {
@@ -19,5 +16,3 @@ exports["insert-text"] = function(event,operation) {
 	operation.newSelStart = operation.selStart + operation.replacement.length;
 	operation.newSelEnd = operation.newSelStart;
 };
-
-})();

core/modules/editor/operations/text/make-link.js

@@ -6,10 +6,7 @@ module-type: texteditoroperation
 Text editor operation to make a link
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports["make-link"] = function(event,operation) {
@@ -25,5 +22,3 @@ exports["make-link"] = function(event,operation) {
 	operation.newSelStart = operation.selStart + operation.replacement.length;
 	operation.newSelEnd = operation.newSelStart;
 };
-
-})();

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

@@ -6,10 +6,7 @@ module-type: texteditoroperation
 Text editor operation to add a prefix to the selected lines
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports["prefix-lines"] = function(event,operation) {
@@ -51,5 +48,3 @@ exports["prefix-lines"] = function(event,operation) {
 		operation.newSelEnd = operation.newSelStart + operation.replacement.length;
 	}
 };
-
-})();

core/modules/editor/operations/text/replace-all.js

@@ -6,10 +6,7 @@ module-type: texteditoroperation
 Text editor operation to replace the entire text
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports["replace-all"] = function(event,operation) {
@@ -19,5 +16,3 @@ exports["replace-all"] = function(event,operation) {
 	operation.newSelStart = 0;
 	operation.newSelEnd = operation.replacement.length;
 };
-
-})();

core/modules/editor/operations/text/replace-selection.js

@@ -6,10 +6,7 @@ module-type: texteditoroperation
 Text editor operation to replace the selection
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports["replace-selection"] = function(event,operation) {
@@ -19,5 +16,3 @@ exports["replace-selection"] = function(event,operation) {
 	operation.newSelStart = operation.selStart;
 	operation.newSelEnd = operation.selStart + operation.replacement.length;
 };
-
-})();

core/modules/editor/operations/text/save-selection.js

@@ -6,10 +6,7 @@ module-type: texteditoroperation
 Text editor operation to save the current selection in a specified tiddler
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports["save-selection"] = function(event,operation) {
@@ -19,5 +16,3 @@ exports["save-selection"] = function(event,operation) {
 		this.wiki.setText(tiddler,field,null,operation.text.substring(operation.selStart,operation.selEnd));
 	}
 };
-
-})();

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

@@ -6,10 +6,7 @@ module-type: texteditoroperation
 Text editor operation to wrap the selected lines with a prefix and suffix
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports["wrap-lines"] = function(event,operation) {
@@ -43,5 +40,3 @@ exports["wrap-lines"] = function(event,operation) {
 		operation.newSelEnd = operation.newSelStart + (operation.cutEnd - operation.cutStart);
 	}
 };
-
-})();

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

@@ -6,10 +6,7 @@ module-type: texteditoroperation
 Text editor operation to wrap the selection with the specified prefix and suffix
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports["wrap-selection"] = function(event,operation) {
@@ -134,5 +131,3 @@ exports["wrap-selection"] = function(event,operation) {
 		addPrefixSuffix();
 	}
 };
-
-})();

core/modules/filterrunprefixes/all.js

@@ -7,10 +7,7 @@ Union of sets without de-duplication.
 Equivalent to = filter run prefix.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -21,5 +18,3 @@ exports.all = function(operationSubFunction) {
 		results.push.apply(results, operationSubFunction(source,widget));
 	};
 };
-
-})();

core/modules/filterrunprefixes/and.js

@@ -7,10 +7,7 @@ Intersection of sets.
 Equivalent to + filter run prefix.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -24,5 +21,3 @@ exports.and = function(operationSubFunction,options) {
 		results.pushTop(operationSubFunction(source,widget));
 	};
 };
-
-})();

core/modules/filterrunprefixes/cascade.js

@@ -3,10 +3,7 @@ title: $:/core/modules/filterrunprefixes/cascade.js
 type: application/javascript
 module-type: filterrunprefix
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -39,5 +36,3 @@ exports.cascade = function(operationSubFunction,options) {
 		}
 	}
 };
-
-})();

core/modules/filterrunprefixes/else.js

@@ -6,10 +6,7 @@ module-type: filterrunprefix
 Equivalent to ~ filter run prefix.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -23,5 +20,3 @@ exports.else = function(operationSubFunction) {
 		}
 	};
 };
-
-})();

core/modules/filterrunprefixes/except.js

@@ -7,10 +7,7 @@ Difference of sets.
 Equivalent to - filter run prefix.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -21,5 +18,3 @@ exports.except = function(operationSubFunction) {
 		results.remove(operationSubFunction(source,widget));
 	};
 };
-
-})();

core/modules/filterrunprefixes/filter.js

@@ -4,10 +4,7 @@ type: application/javascript
 module-type: filterrunprefix
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -35,5 +32,3 @@ exports.filter = function(operationSubFunction,options) {
 		}
 	}
 };
-
-})();

core/modules/filterrunprefixes/intersection.js

@@ -4,10 +4,7 @@ type: application/javascript
 module-type: filterrunprefix
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -27,5 +24,3 @@ exports.intersection = function(operationSubFunction) {
 		}
 	};
 };
-
-})();

core/modules/filterrunprefixes/map.js

@@ -3,10 +3,7 @@ title: $:/core/modules/filterrunprefixes/map.js
 type: application/javascript
 module-type: filterrunprefix
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -40,5 +37,3 @@ exports.map = function(operationSubFunction,options) {
 		}
 	}
 };
-
-})();

core/modules/filterrunprefixes/or.js

@@ -6,10 +6,7 @@ module-type: filterrunprefix
 Equivalent to a filter run with no prefix.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -20,5 +17,3 @@ exports.or = function(operationSubFunction) {
 		results.pushTop(operationSubFunction(source,widget));
 	};
 };
-
-})();

core/modules/filterrunprefixes/reduce.js

@@ -3,10 +3,7 @@ title: $:/core/modules/filterrunprefixes/reduce.js
 type: application/javascript
 module-type: filterrunprefix
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -36,5 +33,3 @@ exports.reduce = function(operationSubFunction,options) {
 		}
 	}
 };
-
-})();

core/modules/filterrunprefixes/sort.js

@@ -4,10 +4,7 @@ type: application/javascript
 module-type: filterrunprefix
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -48,5 +45,3 @@ exports.sort = function(operationSubFunction,options) {
 		}
 	}
 };
-
-})();

core/modules/filterrunprefixes/then.js

@@ -6,10 +6,7 @@ module-type: filterrunprefix
 Replace results of previous runs unless empty
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -28,5 +25,3 @@ exports.then = function(operationSubFunction) {
 		}
 	};
 };
-
-})();

core/modules/filters.js

@@ -6,10 +6,7 @@ module-type: wikimethod
 Adds tiddler filtering methods to the $tw.Wiki object.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var widgetClass = require("$:/core/modules/widgets/widget.js").widget;
@@ -223,13 +220,25 @@ exports.filterTiddlers = function(filterString,widget,source) {
 Compile a filter into a function with the signature fn(source,widget) where:
 source: an iterator function for the source tiddlers, called source(iterator), where iterator is called as iterator(tiddler,title)
 widget: an optional widget node for retrieving the current tiddler etc.
+
+Parameters:
+filterString: the filter string to compile
+options: includes:
+
+wrappers: a hashmap of wrapper functions to apply to the compiled filter function
 */
-exports.compileFilter = function(filterString) {
+exports.compileFilter = function(filterString,options) {
+	options = options || {};
+	var self = this;
+	var wrappers = options.wrappers || {};
+	// Invoke the hook to allow the filter to be inspected
+	wrappers = $tw.hooks.invokeHook("th-filter-evaluation",filterString,wrappers) || wrappers;
+	// Get the result from the cache if we can
 	if(!this.filterCache) {
 		this.filterCache = Object.create(null);
 		this.filterCacheCount = 0;
 	}
-	if(this.filterCache[filterString] !== undefined) {
+	if(this.filterCache[filterString] !== undefined && !wrappers.prefix && !wrappers.operation && !wrappers.operator && !wrappers.start && !wrappers.done) {
 		return this.filterCache[filterString];
 	}
 	var filterParseTree;
@@ -238,7 +247,14 @@ exports.compileFilter = function(filterString) {
 	} catch(e) {
 		// We do not cache this result, so it adjusts along with localization changes
 		return function(source,widget) {
-			return [$tw.language.getString("Error/Filter") + ": " + e];
+			if(wrappers.start) {
+				wrappers.start(source,widget);
+			}
+			var resultsArray = [$tw.language.getString("Error/Filter") + ": " + e];
+			if(wrappers.done) {
+				wrappers.done(resultsArray);
+			}
+			return resultsArray;
 		};
 	}
 	// Get the hashmap of filter operator functions
@@ -252,52 +268,64 @@ exports.compileFilter = function(filterString) {
 		var operationSubFunction = function(source,widget) {
 			var accumulator = source,
 				results = [],
-				currTiddlerTitle = widget && widget.getVariable("currentTiddler");
-			$tw.utils.each(operation.operators,function(operator) {
-				var operands = [],
-					operatorFunction;
-				if(!operator.operator) {
-					// Use the "title" operator if no operator is specified
-					operatorFunction = filterOperators.title;
-				} else if(!filterOperators[operator.operator]) {
-					// Unknown operators treated as "[unknown]" - at run time we can distinguish between a custom operator and falling back to the default "field" operator
-					operatorFunction = filterOperators["[unknown]"];
-				} else {
-					// Use the operator function
-					operatorFunction = filterOperators[operator.operator];
-				}
-				$tw.utils.each(operator.operands,function(operand) {
-					if(operand.indirect) {
-						operand.value = self.getTextReference(operand.text,"",currTiddlerTitle);
-					} else if(operand.variable) {
-						var varTree = $tw.utils.parseFilterVariable(operand.text);
-						operand.value = widgetClass.evaluateVariable(widget,varTree.name,{params: varTree.params, source: source})[0] || "";
-					} else {
-						operand.value = operand.text;
-					}
-					operands.push(operand.value);
-				});
-
-				// Invoke the appropriate filteroperator module
-				results = operatorFunction(accumulator,{
-							operator: operator.operator,
-							operand: operands.length > 0 ? operands[0] : undefined,
-							operands: operands,
-							prefix: operator.prefix,
-							suffix: operator.suffix,
-							suffixes: operator.suffixes,
-							regexp: operator.regexp
-						},{
-							wiki: self,
-							widget: widget
+				currTiddlerTitle = widget && widget.getVariable("currentTiddler"),
+				handleOperation = function() {
+					$tw.utils.each(operation.operators,function(operator) {
+						var operands = [],
+							operatorName,operatorFunction;
+						if(!operator.operator) {
+							// Use the "title" operator if no operator is specified
+							operatorName = "title";
+						} else if(!filterOperators[operator.operator]) {
+							// Unknown operators treated as "[unknown]" - at run time we can distinguish between a custom operator and falling back to the default "field" operator
+							operatorName = "[unknown]";
+						} else {
+							// Use the operator function
+							operatorName = operator.operator;
+						}
+						operatorFunction = filterOperators[operatorName];
+						$tw.utils.each(operator.operands,function(operand) {
+							if(operand.indirect) {
+								operand.value = self.getTextReference(operand.text,"",currTiddlerTitle);
+							} else if(operand.variable) {
+								var varTree = $tw.utils.parseFilterVariable(operand.text);
+								operand.value = widgetClass.evaluateVariable(widget,varTree.name,{params: varTree.params, source: source})[0] || "";
+							} else {
+								operand.value = operand.text;
+							}
+							operands.push(operand.value);
 						});
-				if($tw.utils.isArray(results)) {
-					accumulator = self.makeTiddlerIterator(results);
-				} else {
-					accumulator = results;
-				}
-			});
-			if($tw.utils.isArray(results)) {
+						// Wrap the filter operator module if required
+						if(wrappers.operator) {
+							operatorFunction = wrappers.operator.bind(self,operatorFunction);
+						}
+						// Invoke the appropriate filteroperator module
+						results = operatorFunction(accumulator,{
+									parseTree: operator,
+									operator: operator.operator,
+									operatorName: operatorName,
+									operand: operands.length > 0 ? operands[0] : undefined,
+									operands: operands,
+									prefix: operator.prefix,
+									suffix: operator.suffix,
+									suffixes: operator.suffixes,
+									regexp: operator.regexp
+								},{
+									wiki: self,
+									widget: widget
+								});
+						if($tw.utils.isArray(results)) {
+							accumulator = self.makeTiddlerIterator(results);
+						} else {
+							accumulator = results;
+						}
+					});
+				};
+		if(wrappers.operation) {
+			handleOperation = wrappers.operation.bind(self,handleOperation,operation);
+		}
+		handleOperation();
+		if($tw.utils.isArray(results)) {
 				return results;
 			} else {
 				var resultArray = [];
@@ -310,27 +338,45 @@ exports.compileFilter = function(filterString) {
 		var filterRunPrefixes = self.getFilterRunPrefixes();
 		// Wrap the operator functions in a wrapper function that depends on the prefix
 		operationFunctions.push((function() {
-			var options = {wiki: self, suffixes: operation.suffixes || []};
+			var prefixName;
 			switch(operation.prefix || "") {
 				case "": // No prefix means that the operation is unioned into the result
-					return filterRunPrefixes["or"](operationSubFunction, options);
+					prefixName = "or";
+					break;
 				case "=": // The results of the operation are pushed into the result without deduplication
-					return filterRunPrefixes["all"](operationSubFunction, options);
+					prefixName = "all";
+					break;
 				case "-": // The results of this operation are removed from the main result
-					return filterRunPrefixes["except"](operationSubFunction, options);
+					prefixName = "except";
+					break;
 				case "+": // This operation is applied to the main results so far
-					return filterRunPrefixes["and"](operationSubFunction, options);
+					prefixName = "and";
+					break;
 				case "~": // This operation is unioned into the result only if the main result so far is empty
-					return filterRunPrefixes["else"](operationSubFunction, options);
-				default: 
-					if(operation.namedPrefix && filterRunPrefixes[operation.namedPrefix]) {
-						return filterRunPrefixes[operation.namedPrefix](operationSubFunction, options);
-					} else {
-						return function(results,source,widget) {
-							results.clear();
-							results.push($tw.language.getString("Error/FilterRunPrefix"));
-						};
-					}
+					prefixName = "else";
+					break;
+				default:
+					prefixName = operation.namedPrefix;
+					break;
+			}
+			if(prefixName && filterRunPrefixes[prefixName]) {
+				var options = {
+						wiki: self,
+						suffixes: operation.suffixes || [],
+						prefixName: prefixName,
+						prefix: operation.prefix
+					},
+					filterRunPrefixFunction = filterRunPrefixes[prefixName];
+				// Wrap the filter operator module if required
+				if(wrappers.prefix) {
+					filterRunPrefixFunction = wrappers.prefix.bind(self,filterRunPrefixFunction);
+				}
+				return filterRunPrefixFunction(operationSubFunction,options);
+			} else {
+				return function(results,source,widget) {
+					results.clear();
+					results.push($tw.language.getString("Error/FilterRunPrefix"));
+				};
 			}
 		})());
 	});
@@ -344,6 +390,9 @@ exports.compileFilter = function(filterString) {
 		if(!widget) {
 			widget = $tw.rootWidget;
 		}
+		if(wrappers.start) {
+			wrappers.start(source,widget);
+		}
 		var results = new $tw.utils.LinkedList();
 		self.filterRecursionCount = (self.filterRecursionCount || 0) + 1;
 		if(self.filterRecursionCount < MAX_FILTER_DEPTH) {
@@ -354,7 +403,11 @@ exports.compileFilter = function(filterString) {
 			results.push("/**-- Excessive filter recursion --**/");
 		}
 		self.filterRecursionCount = self.filterRecursionCount - 1;
-		return results.toArray();
+		var resultsArray = results.toArray();
+		if(wrappers.done) {
+			wrappers.done(resultsArray);
+		}
+		return resultsArray;
 	});
 	if(this.filterCacheCount >= 2000) {
 		// To prevent memory leak, we maintain an upper limit for cache size.
@@ -363,9 +416,9 @@ exports.compileFilter = function(filterString) {
 		this.filterCache = Object.create(null);
 		this.filterCacheCount = 0;
 	}
-	this.filterCache[filterString] = fnMeasured;
-	this.filterCacheCount++;
+	if(!wrappers.prefix && !wrappers.operator) {
+		this.filterCache[filterString] = fnMeasured;
+		this.filterCacheCount++;
+	}
 	return fnMeasured;
 };
-
-})();

core/modules/filters/addprefix.js

@@ -8,10 +8,7 @@ especially useful in contexts where only a filter expression is allowed
 and macro substitution isn't available.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -24,5 +21,3 @@ exports.addprefix = function(source,operator,options) {
 	});
 	return results;
 };
-
-})();

core/modules/filters/addsuffix.js

@@ -8,10 +8,7 @@ especially useful in contexts where only a filter expression is allowed
 and macro substitution isn't available.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -24,5 +21,3 @@ exports.addsuffix = function(source,operator,options) {
 	});
 	return results;
 };
-
-})();

core/modules/filters/after.js

@@ -6,10 +6,7 @@ module-type: filteroperator
 Filter operator returning the tiddler from the current list that is after the tiddler named in the operand.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -27,5 +24,3 @@ exports.after = function(source,operator,options) {
 		return [results[index + 1]];
 	}
 };
-
-})();

core/modules/filters/all.js

@@ -8,10 +8,7 @@ Filter operator for selecting tiddlers
 [all[shadows+tiddlers]]
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var allFilterOperators;
@@ -54,5 +51,3 @@ exports.all = function(source,operator,options) {
 	}
 	return results.makeTiddlerIterator(options.wiki);
 };
-
-})();

core/modules/filters/all/current.js

@@ -6,10 +6,7 @@ module-type: allfilteroperator
 Filter function for [all[current]]
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -23,5 +20,3 @@ exports.current = function(source,prefix,options) {
 		return [];
 	}
 };
-
-})();

core/modules/filters/all/missing.js

@@ -6,10 +6,7 @@ module-type: allfilteroperator
 Filter function for [all[missing]]
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -18,5 +15,3 @@ Export our filter function
 exports.missing = function(source,prefix,options) {
 	return options.wiki.getMissingTitles();
 };
-
-})();

core/modules/filters/all/orphans.js

@@ -6,10 +6,7 @@ module-type: allfilteroperator
 Filter function for [all[orphans]]
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -18,5 +15,3 @@ Export our filter function
 exports.orphans = function(source,prefix,options) {
 	return options.wiki.getOrphanTitles();
 };
-
-})();

core/modules/filters/all/shadows.js

@@ -6,10 +6,7 @@ module-type: allfilteroperator
 Filter function for [all[shadows]]
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -18,5 +15,3 @@ Export our filter function
 exports.shadows = function(source,prefix,options) {
 	return options.wiki.allShadowTitles();
 };
-
-})();

core/modules/filters/all/tags.js

@@ -6,10 +6,7 @@ module-type: allfilteroperator
 Filter function for [all[tags]]
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -18,5 +15,3 @@ Export our filter function
 exports.tags = function(source,prefix,options) {
 	return Object.keys(options.wiki.getTagMap());
 };
-
-})();

core/modules/filters/all/tiddlers.js

@@ -6,10 +6,7 @@ module-type: allfilteroperator
 Filter function for [all[tiddlers]]
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -18,5 +15,3 @@ Export our filter function
 exports.tiddlers = function(source,prefix,options) {
 	return options.wiki.allTitles();
 };
-
-})();

core/modules/filters/backlinks.js

@@ -6,10 +6,7 @@ module-type: filteroperator
 Filter operator for returning all the backlinks from a tiddler
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -22,5 +19,3 @@ exports.backlinks = function(source,operator,options) {
 	});
 	return results.makeTiddlerIterator(options.wiki);
 };
-
-})();

core/modules/filters/backtranscludes.js

@@ -6,10 +6,6 @@ module-type: filteroperator
 Filter operator for returning all the backtranscludes from a tiddler
 
 \*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -22,5 +18,3 @@ exports.backtranscludes = function(source,operator,options) {
 	});
 	return results.makeTiddlerIterator(options.wiki);
 };
-
-})();

core/modules/filters/before.js

@@ -6,10 +6,7 @@ module-type: filteroperator
 Filter operator returning the tiddler from the current list that is before the tiddler named in the operand.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -27,5 +24,3 @@ exports.before = function(source,operator,options) {
 		return [results[index - 1]];
 	}
 };
-
-})();

core/modules/filters/commands.js

@@ -6,10 +6,7 @@ module-type: filteroperator
 Filter operator for returning the names of the commands available in this wiki
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -23,5 +20,3 @@ exports.commands = function(source,operator,options) {
 	results.sort();
 	return results;
 };
-
-})();

core/modules/filters/compare.js

@@ -6,10 +6,7 @@ module-type: filteroperator
 General purpose comparison operator
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.compare = function(source,operator,options) {
@@ -36,5 +33,3 @@ var modes = {
 	"lteq": function(value) {return value <= 0;},
 	"lt": function(value) {return value < 0;}
 }
-
-})();

core/modules/filters/contains.js

@@ -6,10 +6,7 @@ module-type: filteroperator
 Filter operator for finding values in array fields
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -41,5 +38,3 @@ exports.contains = function(source,operator,options) {
 	}
 	return results;
 };
-
-})();

core/modules/filters/count.js

@@ -6,10 +6,7 @@ module-type: filteroperator
 Filter operator returning the number of entries in the current list.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -22,5 +19,3 @@ exports.count = function(source,operator,options) {
 	});
 	return [count + ""];
 };
-
-})();

core/modules/filters/crypto.js

@@ -6,10 +6,7 @@ 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) {
@@ -20,5 +17,3 @@ exports.sha256 = function(source,operator,options) {
 	});
 	return results;
 };
-
-})();

core/modules/filters/days.js

@@ -6,10 +6,7 @@ module-type: filteroperator
 Filter operator that selects tiddlers with a specified date field within a specified date interval.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -46,5 +43,3 @@ exports.days = function(source,operator,options) {
 	}
 	return results;
 };
-
-})();

core/modules/filters/deserialize.js

@@ -4,10 +4,7 @@ type: application/javascript
 module-type: filteroperator
 Filter operator for deserializing string data into JSON representing tiddlers
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports["deserialize"] = function(source,operator,options) {
@@ -35,5 +32,3 @@ exports["deserialize"] = function(source,operator,options) {
 	}
 	return results;
 }
-
-})();

core/modules/filters/deserializers.js

@@ -6,10 +6,7 @@ module-type: filteroperator
 Filter operator for returning the names of the deserializers in this wiki
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -23,5 +20,3 @@ exports.deserializers = function(source,operator,options) {
 	results.sort();
 	return results;
 };
-
-})();

core/modules/filters/duplicateslugs.js

@@ -6,10 +6,7 @@ module-type: filteroperator
 Filter function for [duplicateslugs[]]
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -32,5 +29,3 @@ exports.duplicateslugs = function(source,operator,options) {
 	});
 	return results;
 };
-
-})();

core/modules/filters/each.js

@@ -7,10 +7,7 @@ Filter operator that selects one tiddler for each unique value of the specified
 With suffix "list", selects all tiddlers that are values in a specified list field.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -63,5 +60,3 @@ exports.each = function(source,operator,options) {
 	}
 	return results;
 };
-
-})();

core/modules/filters/eachday.js

@@ -6,10 +6,7 @@ module-type: filteroperator
 Filter operator that selects one tiddler for each unique day covered by the specified date field
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -35,5 +32,3 @@ exports.eachday = function(source,operator,options) {
 	});
 	return results;
 };
-
-})();

core/modules/filters/editiondescription.js

@@ -6,10 +6,7 @@ module-type: filteroperator
 Filter operator for returning the descriptions of the specified edition names
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -29,5 +26,3 @@ exports.editiondescription = function(source,operator,options) {
 	}
 	return results;
 };
-
-})();

core/modules/filters/editions.js

@@ -6,10 +6,7 @@ module-type: filteroperator
 Filter operator for returning the names of the available editions in this wiki
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -28,5 +25,3 @@ exports.editions = function(source,operator,options) {
 	}
 	return results;
 };
-
-})();

core/modules/filters/else.js

@@ -6,10 +6,7 @@ module-type: filteroperator
 Filter operator for replacing an empty input list with a constant, passing a non-empty input list straight through
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -26,5 +23,3 @@ exports.else = function(source,operator,options) {
 		return results;
 	}
 };
-
-})();

core/modules/filters/encodings.js

@@ -6,10 +6,7 @@ module-type: filteroperator
 Filter operator for applying decodeURIComponent() to each item.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -116,5 +113,3 @@ exports.escapecss = function(source,operator,options) {
 	});
 	return results;
 };
-
-})();

core/modules/filters/enlist.js

@@ -6,10 +6,7 @@ module-type: filteroperator
 Filter operator returning its operand parsed as a list
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -38,5 +35,3 @@ exports.enlist = function(source,operator,options) {
 		return list;
 	}
 };
-
-})();

core/modules/filters/field.js

@@ -6,10 +6,7 @@ module-type: filteroperator
 Filter operator for comparing fields for equality
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -71,5 +68,3 @@ exports.field = function(source,operator,options) {
 	}
 	return results;
 };
-
-})();

core/modules/filters/fields.js

@@ -6,10 +6,7 @@ module-type: filteroperator
 Filter operator for returning the names of the fields on the selected tiddlers
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -41,5 +38,3 @@ exports.fields = function(source,operator,options) {
 	});
 	return results;
 };
-
-})();

core/modules/filters/filter.js

@@ -6,10 +6,7 @@ module-type: filteroperator
 Filter operator returning those input titles that pass a subfilter
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -30,5 +27,3 @@ exports.filter = function(source,operator,options) {
 	});
 	return results;
 };
-
-})();

core/modules/filters/format.js

@@ -4,10 +4,7 @@ type: application/javascript
 module-type: filteroperator
 Filter operator for formatting strings
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var formatFilterOperators;
@@ -42,5 +39,3 @@ exports.format = function(source,operator,options) {
 		return results;
 	}
 };
-
-})();

core/modules/filters/format/date.js

@@ -3,10 +3,7 @@ title: $:/core/modules/filters/format/date.js
 type: application/javascript
 module-type: formatfilteroperator
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -22,5 +19,3 @@ exports.date = function(source,operand,options) {
 	});
 	return results;
 };
-
-})();

core/modules/filters/format/json.js

@@ -3,10 +3,7 @@ title: $:/core/modules/filters/format/json.js
 type: application/javascript
 module-type: formatfilteroperator
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -31,5 +28,3 @@ exports.json = function(source,operand,options) {
 	});
 	return results;
 };
-
-})();

core/modules/filters/format/relativedate.js

@@ -3,10 +3,7 @@ title: $:/core/modules/filters/format/relativedate.js
 type: application/javascript
 module-type: formatfilteroperator
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -22,5 +19,3 @@ exports.relativedate = function(source,operand,options) {
 	});
 	return results;
 };
-
-})();