commit f96708a846169bcbd0ab263d2db55fdd4cc79d29
Author: Jeremy Ruston <jeremy@osmosoft.com>
Date:   Tue Nov 22 14:29:29 2011 +0000

    Initial commit

diff --git a/cook.js b/cook.js
new file mode 100644
index 000000000..8d1e48680
--- /dev/null
+++ b/cook.js
@@ -0,0 +1,15 @@
+// Cook a TiddlyWiki recipe and send it to STDOUT
+//
+// Usage: node cook.js <recipefile>
+
+var sys = require("sys"),
+	tiddlywiki = require("./js/TiddlyWiki.js"),
+	recipe = require("./js/Recipe.js");
+
+var filename = process.argv[2];
+
+var store = new tiddlywiki.TiddlyWiki();
+
+var theRecipe = new recipe.Recipe(store,filename);
+
+console.log(theRecipe.cook());
diff --git a/js/ArgParser.js b/js/ArgParser.js
new file mode 100644
index 000000000..5a5ee2cc7
--- /dev/null
+++ b/js/ArgParser.js
@@ -0,0 +1,90 @@
+/*
+ Parse a space-separated string of name:value parameters
+ The parameters are returned in a structure that can be referenced like this:
+
+		(return).byName["name"][0] - First occurance of parameter with a given name
+		(return).byPos[0].n - Name of parameter in first position
+		(return).byPos[0].v - Value of parameter in first position
+
+Options and their defaults are:
+
+		defaultName: null,
+		defaultValue: null,
+		noNames: false,
+		cascadeDefaults: false
+
+*/
+
+var ArgParser = function(argString,options) {
+	var parseToken = function(match,p) {
+		var n;
+		if(match[p]) // Double quoted
+			n = match[p];
+		else if(match[p+1]) // Single quoted
+			n = match[p+1];
+		else if(match[p+2]) // Double-square-bracket quoted
+			n = match[p+2];
+		else if(match[p+3]) // Double-brace quoted
+			n = match[p+3];
+		else if(match[p+4]) // Unquoted
+			n = match[p+4];
+		else if(match[p+5]) // empty quote
+			n = "";
+		return n;
+	};
+	this.byPos = [];
+	var dblQuote = "(?:\"((?:(?:\\\\\")|[^\"])+)\")";
+	var sngQuote = "(?:'((?:(?:\\\\\')|[^'])+)')";
+	var dblSquare = "(?:\\[\\[((?:\\s|\\S)*?)\\]\\])";
+	var dblBrace = "(?:\\{\\{((?:\\s|\\S)*?)\\}\\})";
+	var unQuoted = options.noNames ? "([^\"'\\s]\\S*)" : "([^\"':\\s][^\\s:]*)";
+	var emptyQuote = "((?:\"\")|(?:''))";
+	var skipSpace = "(?:\\s*)";
+	var token = "(?:" + dblQuote + "|" + sngQuote + "|" + dblSquare + "|" + dblBrace + "|" + unQuoted + "|" + emptyQuote + ")";
+	var re = options.noNames ? new RegExp(token,"mg") : new RegExp(skipSpace + token + skipSpace + "(?:(\\:)" + skipSpace + token + ")?","mg");
+	do {
+		var match = re.exec(argString);
+		if(match) {
+			var n = parseToken(match,1);
+			if(options.noNames) {
+				this.byPos.push({n:"", v:n});
+			} else {
+				var v = parseToken(match,8);
+				if(v === null && options.defaultName) {
+					v = n;
+					n = options.defaultName;
+				} else if(v === null && options.defaultValue) {
+					v = options.defaultValue;
+				}
+				this.byPos.push({n:n, v:v});
+				if(options.cascadeDefaults) {
+					options.defaultName = n;
+					options.defaultValue = v;
+				}
+			}
+		}
+	} while(match);
+	this.byName = {};
+	for(var t=0; t<this.byPos.length; t++) {
+		var n = this.byPos[t].n;
+		var v = this.byPos[t].v;
+		if(n in this.byName)
+			this.byName[n].push(v);
+		else
+			this.byName[n] = [v];
+	}
+}
+
+// Retrieve the first occurance of a named parameter, or the default if missing
+ArgParser.prototype.getValueByName = function(n,defaultValue) {
+	var v = this.byName[n];
+	return v && v.length > 0 ? v[0] : defaultValue;
+}
+
+// Retrieve all the values of a named parameter as an array
+ArgParser.prototype.getValuesByName = function(n,defaultValue) {
+	var v = this.byName[n];
+	return v && v.length > 0 ? v : defaultValue;
+}
+
+exports.ArgParser = ArgParser
diff --git a/js/Recipe.js b/js/Recipe.js
new file mode 100644
index 000000000..d0c2e1368
--- /dev/null
+++ b/js/Recipe.js
@@ -0,0 +1,205 @@
+/*
+
+Recipe files consist of recipe lines consisting of a marker, a colon and the pathname of an ingredient:
+
+marker: pathname
+
+The pathname is interpreted relative to the directory containing the recipe file.
+
+The special marker "recipe" is used to load a sub-recipe file.
+
+The special marker "template" is used to identify the HTML template. The HTML template contains
+markers in two different forms:
+
+<!--@@marker@@-->
+&lt;!--@@marker@@--&gt;
+
+Recipe processing is in two parts. First the recipe file is parsed and the referenced files are loaded into tiddlers.
+Second, the template is processed by replacing the markers with the text of the tiddlers indicated in the recipe file.
+
+The recipe is parsed into the 'ingredients' hashmap like this:
+
+this.ingredients = {
+	"marker1": [Tiddler1,Tiddler2,Tiddler3,...],
+	"marker2": [TiddlerA,TiddlerB,TiddlerC,...],
+	....
+};
+
+*/
+
+var tiddler = require("./Tiddler.js"),
+	tiddlerUtils = require("./TiddlerUtils.js"),
+	tiddlywiki = require("./TiddlyWiki.js"),
+	fs = require("fs"),
+	path = require("path"),
+	util = require("util");
+
+// Create a new Recipe object from the specified recipe file, storing the tiddlers in a specified TiddlyWiki store
+var Recipe = function(store,filepath) {
+	this.store = store; // Save a reference to the store
+	this.ingredients = {}; // Hashmap of array of ingredients
+	this.readRecipe(filepath); // Read the recipe file
+}
+
+// Specialised configuration and handlers for particular ingredient markers
+var specialMarkers = {
+	shadow: {
+		readIngredientPostProcess: function(fields) {
+			// Add ".shadow" to the name of shadow tiddlers
+			fields.title = fields.title + ".shadow";
+			return fields;
+		}	
+	}
+};
+
+// Process the contents of a recipe file
+Recipe.prototype.readRecipe = function(filepath) {
+	var dirname = path.dirname(filepath),
+		me = this;
+	fs.readFileSync(filepath,"utf8").split("\n").forEach(function(line) {
+		var p = line.indexOf(":");
+		if(p !== -1) {
+			var marker = line.substr(0, p).trim(),
+				value = line.substr(p+1).trim();
+			if(marker === "recipe") {
+				me.readRecipe(path.resolve(dirname,value));
+			} else {
+				var fields = me.readIngredient(dirname,value),
+					postProcess = me.readIngredientPostProcess[marker];
+				if(postProcess)
+					fields = postProcess(fields);
+				me.addIngredient(marker,fields);
+			}
+		}
+	});
+}
+
+// Special post-processing required for certain ingredient types
+Recipe.prototype.readIngredientPostProcess = {
+	"shadow": function(fields) {
+		// Add ".shadow" to the name of shadow tiddlers
+		fields.title = fields.title + ".shadow";
+		return fields;
+	}	
+};
+
+Recipe.prototype.addIngredient = function(marker,tiddlerFields) {
+	var ingredientTiddler = new tiddler.Tiddler(tiddlerFields);
+	this.store.addTiddler(ingredientTiddler);
+	if(marker in this.ingredients) {
+		this.ingredients[marker].push(ingredientTiddler);
+	} else {
+		this.ingredients[marker] = [ingredientTiddler];
+	}
+}
+
+// Read an ingredient file and return it as a hashmap of tiddler fields. Also read the .meta file, if present
+Recipe.prototype.readIngredient = function(dirname,filepath) {
+	var fullpath = path.resolve(dirname,filepath),
+		extname = path.extname(filepath),
+		basename = path.basename(filepath,extname),
+		fields = {
+			title: basename
+		};
+	// Read the tiddler file
+	fields = tiddlerUtils.parseTiddler(fs.readFileSync(fullpath,"utf8"),extname,fields);
+	// Check for the .meta file
+	var metafile = fullpath + ".meta";
+	if(path.existsSync(metafile)) {
+		fields = tiddlerUtils.parseMetaDataBlock(fs.readFileSync(metafile,"utf8"),fields);
+	}
+	return fields;
+}
+
+// Return a string of the cooked recipe
+Recipe.prototype.cook = function() {
+	var template = this.ingredients.template ? this.ingredients.template[0].fields.text : "";
+	var out = [];
+	var me = this;
+	template.split("\n").forEach(function(line) {
+		var templateRegExp = /^(?:<!--@@(.*)@@-->)|(?:&lt;!--@@(.*)@@--&gt;)$/gi;
+		var match = templateRegExp.exec(line);
+		if(match) {
+			var marker = match[1] === undefined ? match[2] : match[1];
+			me.outputIngredient(out,marker);
+		} else {
+			out.push(line);
+		}
+	});
+//	out.push("\nRecipe:\n" + util.inspect(this.ingredients,false,4));
+	return out.join("\n");
+}
+
+// Output all the tiddlers in the recipe with a particular marker
+Recipe.prototype.outputIngredient = function(out,marker) {
+	var ingredient = this.ingredients[marker];
+	var outputType = Recipe.ingredientOutputMapper[marker] || "raw";
+	var outputter = Recipe.ingredientOutputter[outputType];
+	if(outputter && ingredient) {
+		outputter(out,ingredient);
+	}
+}
+
+// Allows for specialised processing for certain markers
+Recipe.ingredientOutputMapper = {
+	tiddler: "div",
+	js: "javascript",
+	jsdeprecated: "javascript",
+	jquery: "javascript",
+	shadow: "shadow"
+};
+
+Recipe.ingredientOutputter = {
+	raw: function(out,ingredient) {
+		// The default is just to output the raw text of the tiddler, ignoring any metadata
+		for(var t=0; t<ingredient.length; t++) {
+			var tid = ingredient[t];
+			// For compatibility with cook.rb, remove one trailing \n from tiddler
+			var text = tid.fields.text;
+			text = text.charAt(text.length-1) === "\n" ? text.substr(0,text.length-1) : text;
+			out.push(text);
+		}
+	},
+	div: function(out,ingredient) {
+		// Ordinary tiddlers are output as a <DIV>
+		for(var t=0; t<ingredient.length; t++) {
+			var tid = ingredient[t];
+			tiddlerUtils.outputTiddlerDiv(out,tid);
+		}
+	},
+	javascript: function(out,ingredient) {
+		// Lines starting with //# are removed from javascript tiddlers
+		for(var t=0; t<ingredient.length; t++) {
+			var tid = ingredient[t];
+			var text = tid.fields.text;
+			// For compatibility with cook.rb, remove one trailing \n from tiddler
+			text = text.charAt(text.length-1) === "\n" ? text.substr(0,text.length-1) : text;
+			var lines = text.split("\n");
+			for(var line=0; line<lines.length; line++) {
+				var commentRegExp = /^\s*\/\/#/gi;
+				if(!commentRegExp.test(lines[line])) {
+					out.push(lines[line]);	
+				}
+			}	
+		}
+	},
+	shadow: function(out,ingredient) {
+		// Shadows are output as a <DIV> with the the ".shadow" suffix removed from the title
+		for(var t=0; t<ingredient.length; t++) {
+			var tid = ingredient[t];
+			var title = tid.fields.title;
+			var tweakedTiddler;
+			if(title.indexOf(".shadow") === title.length - 7) {
+				tweakedTiddler = new tiddler.Tiddler(tid,{
+					title: title.substr(0, title.length-7)
+				});
+			} else {
+				tweakedTiddler = tid;
+			}
+			tiddlerUtils.outputTiddlerDiv(out,tweakedTiddler,{omitPrecedingLineFeed: true});
+		}
+	}
+};
+
+exports.Recipe = Recipe;
+
diff --git a/js/Tiddler.js b/js/Tiddler.js
new file mode 100644
index 000000000..24137a840
--- /dev/null
+++ b/js/Tiddler.js
@@ -0,0 +1,34 @@
+/*
+
+Tiddlers are an immutable dictionary of name:value pairs called fields. Values can be a string, an array
+of strings, or a date.
+
+Hardcoded in the system is the knowledge that the 'tags' field is a string array, and that the 'modified'
+and 'created' fields are dates. All other fields are strings.
+
+The Tiddler object exposes the following API
+
+new Tiddler(fields) - create a Tiddler given a hashmap of field values
+new Tiddler(tiddler,fields) - create a Tiddler from an existing tiddler with a hashmap of modified field values
+Tiddler.fields - hashmap of tiddler fields
+
+*/
+
+var Tiddler = function(/* tiddler,fields */) {
+	var tiddler, fields, c = 0, t;
+	if(arguments[c] instanceof Tiddler) {
+		tiddler = arguments[c++];
+	}
+	fields = arguments[c++];
+	this.fields = {};
+	if(tiddler instanceof Tiddler) {
+		for(t in tiddler.fields) {
+			this.fields[t] = tiddler.fields[t]; // Should copy arrays by value
+		}
+	}
+	for(t in fields) {
+		this.fields[t] = fields[t]; // Should copy arrays by value
+	}
+}
+
+exports.Tiddler = Tiddler;
diff --git a/js/TiddlerUtils.js b/js/TiddlerUtils.js
new file mode 100644
index 000000000..eea9bdb37
--- /dev/null
+++ b/js/TiddlerUtils.js
@@ -0,0 +1,274 @@
+/*
+Various static utility functions concerned with parsing and generating representations of tiddlers and
+other objects.
+
+This file is a bit of a dumping ground; the expectation is that most of these functions will be refactored.
+*/
+
+var argParser = require("./ArgParser.js");
+
+var tiddlerUtils = exports;
+
+/*
+Parse a tiddler given its mimetype, and merge the results into a hashmap of tiddler fields.
+
+A file extension can be passed as a shortcut for the mimetype, as shown in tiddlerUtils.fileExtensionMappings.
+For example ".txt" file extension is mapped to the "text/plain" mimetype.
+
+Special processing to extract embedded metadata is applied to some mimetypes.
+*/
+
+tiddlerUtils.parseTiddler = function(text,type,fields) {
+	if(fields === undefined) {
+		var fields = {};
+	}
+	// Map extensions to mimetpyes
+	var fileExtensionMapping = tiddlerUtils.fileExtensionMappings[type];
+	if(fileExtensionMapping)
+		type = fileExtensionMapping;
+	// Invoke the parser for the specified mimetype
+	var parser = tiddlerUtils.parseTiddlerByMimeType[type];
+	if(parser) {
+		return parser(text,fields);
+	}
+	return fields;
+}
+
+tiddlerUtils.fileExtensionMappings = {
+	".txt": "text/plain",
+	".html": "text/html",
+	".tiddler": "application/x-tiddler-html-div",
+	".tid": "application/x-tiddler",
+	".js": "application/javascript"
+}
+
+tiddlerUtils.parseTiddlerByMimeType = {
+	"text/plain": function(text,fields) {
+		fields.text = text;
+		return fields;
+	},
+	"text/html": function(text,fields) {
+		fields.text = text;
+		return fields;
+	},
+	"application/x-tiddler-html-div": function(text,fields) {
+		fields = tiddlerUtils.parseTiddlerDiv(text,fields);
+		return fields;
+	},
+	"application/x-tiddler": function(text,fields) {
+		var split = text.indexOf("\n\n");
+		if(split === -1) {
+			split = text.length;
+		}
+		fields = tiddlerUtils.parseMetaDataBlock(text.substr(0,split),fields);
+		fields.text = text.substr(split + 2);
+		return fields;
+	},
+	"application/javascript": function(text,fields) {
+		fields.text = text;
+		return fields;
+	}
+}
+
+/*
+Parse a block of metadata and merge the results into a hashmap of tiddler fields.
+
+The block consists of newline delimited lines consisting of the field name, a colon, and then the value. For example:
+
+title: Safari
+modifier: blaine
+created: 20110211110700
+modified: 20110211131020
+tags: browsers issues
+creator: psd
+*/
+tiddlerUtils.parseMetaDataBlock = function(metaData,fields) {
+	if(fields === undefined) {
+		var fields = {};
+	}
+	metaData.split("\n").forEach(function(line) {
+		var p = line.indexOf(":");
+		if(p !== -1) {
+			var field = line.substr(0, p).trim();
+			var value = line.substr(p+1).trim();
+			fields[field] = tiddlerUtils.parseMetaDataItem(field,value);
+		}
+	});
+	return fields;
+}
+
+/*
+Parse an old-style tiddler DIV. It looks like this:
+
+<div title="Title" creator="JoeBloggs" modifier="JoeBloggs" created="201102111106" modified="201102111310" tags="myTag [[my long tag]]">
+<pre>The text of the tiddler (without the expected HTML encoding).
+</pre>
+</div>
+
+Note that the field attributes are HTML encoded, but that the body of the <PRE> tag is not.
+*/
+tiddlerUtils.parseTiddlerDiv = function(text,fields) {
+	if(fields === undefined) {
+		var fields = {};
+	}
+	var divRegExp = /^\s*<div\s+([^>]*)>((?:.|\n)*)<\/div>\s*$/gi;
+	var subDivRegExp = /^(?:\s*<pre>)((?:.|\n)*)(?:<\/pre>\s*)$/gi;
+	var attrRegExp = /\s*([^=\s]+)\s*=\s*"([^"]*)"/gi;
+	var match = divRegExp.exec(text);
+	if(match) {
+		var subMatch = subDivRegExp.exec(match[2]); // Body of the <DIV> tag
+		if(subMatch) {
+			fields.text = subMatch[1];
+		} else {
+			fields.text = match[2]; 
+		}
+		do {
+			var attrMatch = attrRegExp.exec(match[1]);
+			if(attrMatch) {
+				var name = attrMatch[1];
+				var value = attrMatch[2];
+				fields[name] = tiddlerUtils.parseMetaDataItem(name,value);
+			}
+		} while(attrMatch);
+	}
+	return fields;	
+}
+
+// Output a tiddler as an HTML <DIV>
+// out - array to push the output strings
+// tid - the tiddler to be output
+// options - options:
+//		omitPrecedingLineFeed - determines if a linefeed is inserted between the <PRE> tag and the text
+tiddlerUtils.outputTiddlerDiv = function(out,tid,options) {
+	var result = [];
+	var outputAttribute = function(name,value) {
+		result.push(" " + name + "=\"" + value + "\"");
+	};
+	result.push("<div");
+	for(var t in tid.fields) {
+		switch(t) {
+			case "text":
+				// Ignore the text field
+				break;
+			case "tags":
+				// Output tags as a list
+				outputAttribute(t,tiddlerUtils.stringifyTags(tid.fields.tags));
+				break;
+			case "modified":
+			case "created":
+				// Output dates in YYYYMMDDHHMMSS
+				outputAttribute(t,tiddlerUtils.convertToYYYYMMDDHHMM(tid.fields[t]));
+				break;
+			default:
+				// Output other attributes raw
+				outputAttribute(t,tid.fields[t]);
+				break;
+		}
+	}
+	result.push(">\n<pre>");
+	if(!(options && options.omitPrecedingLineFeed))
+		result.push("\n");
+	result.push(tiddlerUtils.htmlEncode(tid.fields.text));
+	result.push("</pre>\n</div>");
+	out.push(result.join(""));
+}
+
+tiddlerUtils.stringifyTags = function(tags) {
+	var results = [];
+	for(var t=0; t<tags.length; t++) {
+		if(tags[t].indexOf(" ") !== -1) {
+			results.push("[[" + tags[t] + "]]");
+		} else {
+			results.push(tags[t]);
+		}
+	}
+	return results.join(" ");
+}
+
+/*
+Parse a single metadata field/value pair and return the value as the appropriate data type
+*/
+tiddlerUtils.parseMetaDataItem = function(field,value) {
+	var result;
+	switch(field) {
+		case "modified":
+		case "created":
+			result = tiddlerUtils.convertFromYYYYMMDDHHMMSS(value);
+			break;
+		case "tags":
+			var parser = new argParser.ArgParser(value,{noNames: true});
+			result = parser.getValuesByName("","");
+			break;
+		default:
+			result = value;
+			break;
+	}
+	return result;
+}
+
+// Pad a string to a certain length with zeros
+tiddlerUtils.zeroPad = function(n,d)
+{
+	var s = n.toString();
+	if(s.length < d)
+		s = "000000000000000000000000000".substr(0,d-s.length) + s;
+	return s;
+};
+
+// Convert a date to local YYYYMMDDHHMM string format
+tiddlerUtils.convertToLocalYYYYMMDDHHMM = function(date)
+{
+	return date.getFullYear() + tiddlerUtils.zeroPad(date.getMonth()+1,2) + tiddlerUtils.zeroPad(date.getDate(),2) + tiddlerUtils.zeroPad(date.getHours(),2) + tiddlerUtils.zeroPad(date.getMinutes(),2);
+};
+
+// Convert a date to UTC YYYYMMDDHHMM string format
+tiddlerUtils.convertToYYYYMMDDHHMM = function(date)
+{
+	return date.getUTCFullYear() + tiddlerUtils.zeroPad(date.getUTCMonth()+1,2) + tiddlerUtils.zeroPad(date.getUTCDate(),2) + tiddlerUtils.zeroPad(date.getUTCHours(),2) + tiddlerUtils.zeroPad(date.getUTCMinutes(),2);
+};
+
+// Convert a date to UTC YYYYMMDD.HHMMSSMMM string format
+tiddlerUtils.convertToYYYYMMDDHHMMSSMMM = function(date)
+{
+	return date.getUTCFullYear() + tiddlerUtils.zeroPad(date.getUTCMonth()+1,2) + tiddlerUtils.zeroPad(date.getUTCDate(),2) + "." + tiddlerUtils.zeroPad(date.getUTCHours(),2) + tiddlerUtils.zeroPad(date.getUTCMinutes(),2) + tiddlerUtils.zeroPad(date.getUTCSeconds(),2) + tiddlerUtils.zeroPad(date.getUTCMilliseconds(),3) +"0";
+};
+
+// Create a date from a UTC YYYYMMDDHHMM format string
+tiddlerUtils.convertFromYYYYMMDDHHMM = function(d)
+{
+	d = d?d.replace(/[^0-9]/g, ""):"";
+	return tiddlerUtils.convertFromYYYYMMDDHHMMSSMMM(d.substr(0,12));
+};
+
+// Create a date from a UTC YYYYMMDDHHMMSS format string
+tiddlerUtils.convertFromYYYYMMDDHHMMSS = function(d)
+{
+	d = d?d.replace(/[^0-9]/g, ""):"";
+	return tiddlerUtils.convertFromYYYYMMDDHHMMSSMMM(d.substr(0,14));
+};
+
+// Create a date from a UTC YYYYMMDDHHMMSSMMM format string
+tiddlerUtils.convertFromYYYYMMDDHHMMSSMMM = function(d)
+{
+	d = d ? d.replace(/[^0-9]/g, "") : "";
+	return new Date(Date.UTC(parseInt(d.substr(0,4),10),
+			parseInt(d.substr(4,2),10)-1,
+			parseInt(d.substr(6,2),10),
+			parseInt(d.substr(8,2)||"00",10),
+			parseInt(d.substr(10,2)||"00",10),
+			parseInt(d.substr(12,2)||"00",10),
+			parseInt(d.substr(14,3)||"000",10)));
+};
+
+// Convert & to "&amp;", < to "&lt;", > to "&gt;" and " to "&quot;"
+tiddlerUtils.htmlEncode = function(s)
+{
+	return s.replace(/&/mg,"&amp;").replace(/</mg,"&lt;").replace(/>/mg,"&gt;").replace(/\"/mg,"&quot;");
+};
+
+// Convert "&amp;" to &, "&lt;" to <, "&gt;" to > and "&quot;" to "
+tiddlerUtils.htmlDecode = function(s)
+{
+	return s.replace(/&lt;/mg,"<").replace(/&gt;/mg,">").replace(/&quot;/mg,"\"").replace(/&amp;/mg,"&");
+};
+
diff --git a/js/TiddlyWiki.js b/js/TiddlyWiki.js
new file mode 100644
index 000000000..e8f8fbd59
--- /dev/null
+++ b/js/TiddlyWiki.js
@@ -0,0 +1,33 @@
+var tiddler = require("./Tiddler.js");
+
+var TiddlyWiki = function() {
+	this.tiddlers = {};
+};
+
+TiddlyWiki.prototype.clear = function() {
+	this.tiddlers = {};
+}
+
+TiddlyWiki.prototype.fetchTiddler = function(title) {
+	var t = this.tiddlers[title];
+	return t instanceof tiddler.Tiddler ? t : null;
+}
+
+TiddlyWiki.prototype.deleteTiddler = function(title) {
+	delete this.tiddlers[title];
+}
+
+TiddlyWiki.prototype.addTiddler = function(tiddler) {
+	this.tiddlers[tiddler.title] = tiddler;
+}
+
+TiddlyWiki.prototype.forEachTiddler = function(callback) {
+	var t;
+	for(t in this.tiddlers) {
+		var tiddler = this.tiddlers[t];
+		if(tiddler instanceof tiddler.Tiddler)
+			callback.call(this,t,tiddler);
+	}
+}
+
+exports.TiddlyWiki = TiddlyWiki
diff --git a/readme.md b/readme.md
new file mode 100644
index 000000000..a198bd45e
--- /dev/null
+++ b/readme.md
@@ -0,0 +1,21 @@
+# cook.js
+
+This is an attempt to modernise TiddlyWiki's build system, which is based on tools written in Ruby called Cook and Ginsu (see https://github.com/TiddlyWiki/cooker for details). This new version is written in JavaScript for node.js, with the intention that it can share code with TiddlyWiki itself.
+
+## Usage
+
+	node cook.js <recipefile>
+
+Cooks a recipe file and sends the output to STDOUT
+
+	node server.js <recipefile>
+
+Cooks a recipe file and serves it over HTTP port 8000
+
+## Testing
+
+`test.sh` contains a simple test that cooks the main tiddlywiki.com recipe, first with the old Ruby-based tool, and then the new one. It uses OS X's opendiff to display the differences between the two files.
+
+## Current status
+
+As of 22nd November 2011, cook.js can now build a fully functional TiddlyWiki from the existing recipe files. There are still some minor differences in the layout of tiddler attributes, and some whitespace issues that prevent full byte-for-byte compatibility.
diff --git a/server.js b/server.js
new file mode 100644
index 000000000..cc0649393
--- /dev/null
+++ b/server.js
@@ -0,0 +1,22 @@
+// Cook a TiddlyWiki recipe and serve the result over HTTP
+//
+// Usage: node server.js <recipefile>
+
+var tiddlywiki = require("./js/TiddlyWiki.js"),
+	recipe = require("./js/Recipe.js"),
+	sys = require("sys"),
+	http = require("http"),
+	fs = require("fs"),
+	url = require("url"),
+	path = require("path");
+
+var filename = process.argv[2];
+
+http.createServer(function (request, response) {
+	response.writeHead(200, {"Content-Type": "text/html"});
+	var store = new tiddlywiki.TiddlyWiki();
+	var theRecipe = new recipe.Recipe(store,filename);
+	response.end(theRecipe.cook(), "utf-8");
+}).listen(8000);
+
+sys.puts("Server running at http://127.0.0.1:8000/");
diff --git a/test.sh b/test.sh
new file mode 100755
index 000000000..51d16b7af
--- /dev/null
+++ b/test.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# cook the recipe with the old cook.rb (assuming you have set it up as described in github.com/TiddlyWiki/cooker)
+cook $PWD/test/data/tiddlywiki.com/index.html.recipe -d $PWD -o oldcooked.html
+
+# cook it with cook.js
+node cook.js $PWD/test/data/tiddlywiki.com/index.html.recipe > newcooked.html
+
+# compare the two
+opendiff oldcooked.html newcooked.html
diff --git a/test/data/.DS_Store b/test/data/.DS_Store
new file mode 100644
index 000000000..32370b4cf
Binary files /dev/null and b/test/data/.DS_Store differ
diff --git a/test/data/samples/tiddlers/Test1.tiddler b/test/data/samples/tiddlers/Test1.tiddler
new file mode 100755
index 000000000..799f631fb
--- /dev/null
+++ b/test/data/samples/tiddlers/Test1.tiddler
@@ -0,0 +1,3 @@
+<div title="Test1">
+<pre>This is a testing tiddler.</pre>
+</div>
\ No newline at end of file
diff --git a/test/data/samples/tiddlers/TestContainsTag.tiddler b/test/data/samples/tiddlers/TestContainsTag.tiddler
new file mode 100755
index 000000000..26b022c17
--- /dev/null
+++ b/test/data/samples/tiddlers/TestContainsTag.tiddler
@@ -0,0 +1,3 @@
+<div title="TestContainsTag">
+<pre>This is a testing tiddler with </pre></div> in it.</pre>
+</div>
\ No newline at end of file
diff --git a/test/data/samples/tiddlers/TestNoPreTag.tiddler b/test/data/samples/tiddlers/TestNoPreTag.tiddler
new file mode 100644
index 000000000..b2932189d
--- /dev/null
+++ b/test/data/samples/tiddlers/TestNoPreTag.tiddler
@@ -0,0 +1 @@
+<div tiddler="TestNoPreTag" modifier="JeremyRuston" modified="200605111124" created="200511301204" tags="">This is a tiddler that hasn't got a {{{<pre>}}} tag</div>
\ No newline at end of file
diff --git a/test/data/samples/tiddlers/TestWithTags.tiddler b/test/data/samples/tiddlers/TestWithTags.tiddler
new file mode 100644
index 000000000..2165816e8
--- /dev/null
+++ b/test/data/samples/tiddlers/TestWithTags.tiddler
@@ -0,0 +1 @@
+<div tiddler="TestWithTags" modifier="JeremyRuston" modified="200602241819" created="200602071851" tags="one two [[three and a half]]"><pre>I welcome contributions to the TiddlyWiki core: code, documentation, or anything else that helps to make it a better product.\n\nIn terms of code, I'm happy to accept small snippets inline in emails or group messages. For larger changes, I prefer to receive a modified version of the entire TiddlyWiki HTML file via email; I can then easily analyse the differences.\n\nTo maximise the chances of your work being accepted into the core, you should consider these points:\n* Is the code reasonably short?\n* Is the functionality nearly universally useful?\n* Is the functionality impractical to offer as a plugin?\n* Have you used the same coding conventions as the rest of the core?\n* Have you tested the change on all major browsers?\n</pre></div>
\ No newline at end of file
diff --git a/test/data/samples/tiddlers/test.recipe b/test/data/samples/tiddlers/test.recipe
new file mode 100755
index 000000000..eec465140
--- /dev/null
+++ b/test/data/samples/tiddlers/test.recipe
@@ -0,0 +1,5 @@
+recipe: ../../tiddlywiki.com/index.html.recipe
+tiddler: Test1.tiddler
+tiddler: TestNoPreTag.tiddler
+tiddler: TestWithTags.tiddler
+tiddler: TestContainsTag.tiddler
diff --git a/test/data/tiddlywiki.com/README.md b/test/data/tiddlywiki.com/README.md
new file mode 100755
index 000000000..06cd6af15
--- /dev/null
+++ b/test/data/tiddlywiki.com/README.md
@@ -0,0 +1,63 @@
+TiddlyWiki
+==========
+
+https://github.com/TiddlyWiki/tiddlywiki.com
+
+
+Description
+-----------
+
+This repository contains the tools required to create the site http://tiddlywiki.com/
+
+The content for tiddlywiki.com is obtained from a [TiddlySpace](http://tiddlyspace.com/).
+
+
+Prerequisites
+-------------
+
+Ensure that you have downloaded and installed TiddlyWiki as described at https://github.com/TiddlyWiki/tiddlywiki
+
+You need perl to build tiddlywiki.com. If you do not have it installed, it can be downloaded [here](http://www.perl.org/get.html).
+
+You need to set up `ginsu`. Copy the `ginsu` script file to somewhere that is on your path. Edit this file according to the instructions in the file.
+
+You need to set up the `tiddler2tid`. Copy the `tiddler2tid` script file to somewhere that is on your path.
+
+
+Building tiddlywiki.com
+-----------------------
+
+After downloading and installing TiddlyWiki checkout the version of TiddlyWiki that you wish to use for tiddlywiki.com. Ongoing development occurs in the tiddlywiki repository, so you need to checkout a tagged release version of TiddlyWiki. Change to the tiddlywiki directory and checkout the required version, eg:
+
+    git checkout tags/v2.6.5
+
+Change back to the tiddlywiki.com directory.
+
+Pull down the tiddlywiki.com content form TiddlySpace by invoking the `pull.sh` script:
+
+    ./pull.sh
+
+Edit the build script `bld` setting the correct version number for TiddlyWiki.
+
+Invoke the build script:
+
+    ./bld
+
+You now need to generate the TiddlyWiki RSS file. To do this open the TiddlyWiki file index.html in Firefox, ensure the AdvancedOption "Generate an RSS feed when saving changes" is set, and then save the TiddlyWiki. Doing this also causes TiddlyWiki to generate some static HTML for display when Javascript is not enabled.
+
+Edit the upload script `upload` setting the correct version number for TiddlyWiki.
+
+Finally you need to upload the TiddlyWiki files to tiddlywiki.com. If this is the first time you are uploading, then you will need to create a `tmp` directory on tiddlywiki.com:
+
+    ssh user@tiddlywiki.com
+    [enter your password when prompted]
+    mkdir tmp
+    exit
+
+You can now upload the TiddlyWiki files, run the upload script:
+
+    ./upload
+
+You will be prompted for your password on several occasions during the upload process. To do this you will of course need an account on tiddlywiki.com. The upload script assumes your remote user name is the same as your local user name, if it is not then you may specify your remote user name as the first parameter to the upload script.
+
+Migrated from http://svn.tiddlywiki.org on 20110719.
diff --git a/test/data/tiddlywiki.com/bld b/test/data/tiddlywiki.com/bld
new file mode 100755
index 000000000..cd8c49fc4
--- /dev/null
+++ b/test/data/tiddlywiki.com/bld
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+# Usage:
+#  bld [release]
+
+DEFAULT_RELEASE="2.6.5"
+RELEASE=${1:-$DEFAULT_RELEASE}
+DEST=$PWD/cooked/tiddlywiki.com
+mkdir -p cooked
+mkdir -p cooked/tiddlywiki.com
+cook $PWD/index.html.recipe -d $DEST -o index.$RELEASE.html
+cook $PWD/empty.html.recipe -d $DEST -o empty.$RELEASE.html
+cp ../tiddlywiki/java/TiddlySaver.jar $DEST/TiddlySaver.jar
+rm $DEST/empty.$RELEASE.zip
+cp $DEST/empty.$RELEASE.html tmp/empty.html
+zip -j $DEST/empty.$RELEASE.zip tmp/empty.html $DEST/TiddlySaver.jar
+rm tmp/empty.html
diff --git a/test/data/tiddlywiki.com/empty.html.recipe b/test/data/tiddlywiki.com/empty.html.recipe
new file mode 100755
index 000000000..c25233e11
--- /dev/null
+++ b/test/data/tiddlywiki.com/empty.html.recipe
@@ -0,0 +1 @@
+recipe: ../tiddlywiki/tiddlywiki.html.recipe
diff --git a/test/data/tiddlywiki.com/ginsu b/test/data/tiddlywiki.com/ginsu
new file mode 100755
index 000000000..2cb334d8a
--- /dev/null
+++ b/test/data/tiddlywiki.com/ginsu
@@ -0,0 +1,14 @@
+#!/bin/bash
+#
+# This is a sample ginsu script to be used with the tiddlywiki.com scripts
+# Adjust this script and then install it somewhere on your $PATH, such as ~/bin.
+#
+# You will need to adjust COOKER_TRUNK below.
+#
+# Change this to where you have the cooker code installed
+COOKER_TRUNK=$HOME/Documents/Code/GitHub/tiddlywiki/cooker
+DEFAULT_FILENAME=index
+FILENAME=${1:-$DEFAULT_FILENAME}
+DEST=$PWD
+RECIPE=$PWD/$FILENAME.html
+ruby -C $COOKER_TRUNK ginsu.rb $RECIPE -d$DEST $2 $3 $4 $5
diff --git a/test/data/tiddlywiki.com/index.html.recipe b/test/data/tiddlywiki.com/index.html.recipe
new file mode 100755
index 000000000..a493049eb
--- /dev/null
+++ b/test/data/tiddlywiki.com/index.html.recipe
@@ -0,0 +1,3 @@
+recipe: ../tiddlywiki/tiddlywikinonoscript.html.recipe
+recipe: tiddlywiki-com-ref/split.recipe
+recipe: tiddlywiki-com/split.recipe
diff --git a/test/data/tiddlywiki.com/pull.sh b/test/data/tiddlywiki.com/pull.sh
new file mode 100755
index 000000000..469b990ba
--- /dev/null
+++ b/test/data/tiddlywiki.com/pull.sh
@@ -0,0 +1,58 @@
+#!/bin/sh
+#
+# this hack pulls down the wikis for each bag, splitting the wiki into tiddlers using ginsu
+# long term plan is to use the "fat" JSON for a bag
+#
+
+set -e
+export space
+export dir
+
+mkdir -p tmp
+
+for space in tiddlywiki-com-ref tiddlywiki-com
+do
+	mkdir -p $space
+
+	dir=tmp/${space}.html.0
+	curl -s http://${space}.tiddlyspace.com/bags/${space}_public/tiddlers.wiki > tmp/$space.html
+
+	# clear out the space directory so we can see deleted files when we commit
+	rm -f $space/*
+
+	# backup any existing exploded content
+	mkdir -p backups
+	[ -d $dir ] && mv $dir backups/$$
+
+	# split into tiddlers
+	(
+		cd tmp
+		ginsu $space > /dev/null
+	)
+
+	# convert .tiddler files into .tid files
+	(
+		cd "$dir"
+
+		tiddler2tid *.tiddler
+		find . -name \*.tid -o -name \*.js -o -name \*.meta |
+			while read file
+			do
+				sed -e '/^server.*: /d' -e '/^_hash:/d' < "$file" > "../../$space/$file"
+			done
+	)
+
+	# make recipe based on files in the space directory
+	(
+		cd $space
+
+		find . -name \*.tid -o -name \*.js |
+			grep -v '\.jpg\.' |
+			grep -v 'PageTemplate' |
+			grep -v 'SplashScreen' |
+			grep -v 'SiteSubtitle' |
+			sed 's/^/tiddler: /' > split.recipe
+	)
+done
+
+cook $PWD/index.html.recipe
diff --git a/test/data/tiddlywiki.com/tiddler2tid b/test/data/tiddlywiki.com/tiddler2tid
new file mode 100755
index 000000000..7e45ceb8b
--- /dev/null
+++ b/test/data/tiddlywiki.com/tiddler2tid
@@ -0,0 +1,53 @@
+#!/usr//bin/env perl
+
+#
+#  convert .tiddler into .tid files
+#  useful for ginsu a TiddlyWiki, then HTTP PUT them to TiddlyWeb/TiddlySpaces
+#
+
+use strict;
+
+sub read_file {
+	my ($filename) = @_;
+	undef $/;
+	local *FILE;
+	open FILE, "< $filename";
+	binmode(FILE, ":utf8");
+	my $c = <FILE>;
+	close FILE;
+	return $c;
+}
+
+foreach my $file (@ARGV) {
+
+	my $tid = $file;
+	my $text = "";
+
+	if ($file =~ /.tiddler$/) {
+
+		$tid =~ s/dler$//;
+		$text = read_file($file, encoding => 'utf8');
+
+		my $attrs = $text;
+		$attrs =~ s/\s*<div([^>]*)>.*$/$1/s;
+		$attrs =~ s/\s*(\w+)\s*=\s*["']([^"']*)["']\s*/$1: $2\n/gs;
+
+		$text =~ s/^\s*<div[^>]*>\s*<\s*pre>\s*(.*)\s*<\/pre\s*>\s*<\/div\s*>\s*$/$1/s;
+
+		$text = $attrs . "\n" . $text;
+
+	} elsif ($file =~ /.js$/) {
+
+		$tid =~ s/.js$/.tid/;
+		$text = read_file($file . ".meta") . "\n" .  read_file($file);
+
+	}
+
+	if ($text) {
+		print "$tid\n";
+		open(FILE, "> $tid");
+		binmode(FILE, ":utf8");
+		print FILE $text;
+		close(FILE);
+	}
+}
diff --git a/test/data/tiddlywiki.com/upload b/test/data/tiddlywiki.com/upload
new file mode 100755
index 000000000..3a3883c63
--- /dev/null
+++ b/test/data/tiddlywiki.com/upload
@@ -0,0 +1,70 @@
+#!/usr/bin/env bash
+
+# Usage:
+#  upload [user] [release] [cleanup]
+
+# default values
+DEFAULT_RELEASE="2.6.5"
+REMOTE_USER=${1:-$USER}
+RELEASE=${2:-$DEFAULT_RELEASE}
+DEST=$PWD/cooked/tiddlywiki.com
+HOST="tiddlywiki.com"
+DIR="/var/www/www.tiddlywiki.com/htdocs"
+ARCHIVE_DIR="$DIR/archive"
+OWNER="www-data:www-data"
+PERM="664"
+
+# setPermissions()
+# Usage:
+#  setPermissions file
+function setPermissions() {
+	COMMANDS="$COMMANDS sudo chown $OWNER $1;"
+	COMMANDS="$COMMANDS sudo chmod $PERM $1;"
+}
+
+# upload files to temporary folder
+echo
+echo "uploading files"
+echo
+FILES="$DEST/index.$RELEASE.html $DEST/index.$RELEASE.xml $DEST/empty.$RELEASE.html $DEST/TiddlySaver.jar $DEST/empty.$RELEASE.zip"
+scp $FILES "$REMOTE_USER@$HOST:./tmp/"
+
+# transfer files to their respective folders
+echo
+echo "transferring files"
+echo
+COMMANDS="ssh $REMOTE_USER@$HOST"
+# Index
+COMMANDS="$COMMANDS sudo cp ./tmp/index.$RELEASE.html $ARCHIVE_DIR/;"
+setPermissions "$ARCHIVE_DIR/index.$RELEASE.html"
+COMMANDS="$COMMANDS sudo mv ./tmp/index.$RELEASE.html $DIR/index.html;"
+setPermissions "$DIR/index.html"
+COMMANDS="$COMMANDS sudo mv ./tmp/index.$RELEASE.xml $DIR/index.xml;"
+setPermissions "$DIR/index.xml"
+# Empty
+COMMANDS="$COMMANDS sudo cp ./tmp/empty.$RELEASE.html $ARCHIVE_DIR/;"
+setPermissions "$ARCHIVE_DIR/empty.$RELEASE.html"
+COMMANDS="$COMMANDS sudo cp ./tmp/empty.$RELEASE.html $DIR/empty.html;"
+setPermissions "$DIR/empty.html"
+# Upgrade
+COMMANDS="$COMMANDS sudo mv ./tmp/empty.$RELEASE.html $DIR/upgrade/index.html;"
+setPermissions "$DIR/upgrade/index.html"
+# TiddlySaver
+COMMANDS="$COMMANDS sudo mv ./tmp/TiddlySaver.jar $DIR/TiddlySaver.jar;"
+setPermissions "$DIR/TiddlySaver.jar"
+# ZIP package
+COMMANDS="$COMMANDS sudo mv ./tmp/empty.$RELEASE.zip $DIR/empty.zip;"
+setPermissions "$DIR/empty.zip"
+# execute
+$COMMANDS
+
+# cleanup
+if [ "$3" = "true" ]; then
+	echo "cleaning up (removing cooked files)"
+	echo "removing index.$RELEASE.html"
+	rm "index.$RELEASE.html"
+	echo "removing empty.$RELEASE.html"
+	rm "empty.$RELEASE.html"
+	echo "removing TiddlySaver.jar"
+	rm "TiddlySaver.jar"
+fi
diff --git a/test/data/tiddlywiki/ALPHA b/test/data/tiddlywiki/ALPHA
new file mode 100755
index 000000000..cd2d1e195
--- /dev/null
+++ b/test/data/tiddlywiki/ALPHA
@@ -0,0 +1 @@
+2.6.6.A1
diff --git a/test/data/tiddlywiki/Makefile b/test/data/tiddlywiki/Makefile
new file mode 100755
index 000000000..999c116b2
--- /dev/null
+++ b/test/data/tiddlywiki/Makefile
@@ -0,0 +1,23 @@
+# Start at a Makefile or managing build activities.
+# Expects a 'cook' script somewhere on the $PATH.
+# See 'cook' in this directory for a sample you can use.
+# For now users the OSX specific "open" to run a test file. This
+# will need to change.
+#
+
+clean:
+	rm cooked/*.html || true
+	rm cooked/*.jar || true
+	rm cooked/*.js || true
+	rmdir cooked || true
+
+test: clean tests.html
+	ln -sf test/recipes/sample.txt .
+	open cooked/tests.html
+
+tests.html:
+	mkdir -p cooked
+	cook $(PWD)/test/recipes/tests.html.recipe -d $(PWD)/cooked -o tests.html
+
+alpha:
+	./bldalpha
diff --git a/test/data/tiddlywiki/README.md b/test/data/tiddlywiki/README.md
new file mode 100755
index 000000000..7bc92a606
--- /dev/null
+++ b/test/data/tiddlywiki/README.md
@@ -0,0 +1,75 @@
+TiddlyWiki
+==========
+
+https://github.com/TiddlyWiki/tiddlywiki
+
+
+Description
+-----------
+
+This is the master repository for the core of TiddlyWiki. It is for the development and maintenance of TiddlyWiki.
+
+If you simply wish to use TiddlyWiki, it is easiest to download it from: http://tiddlywiki.com/
+
+This site also gives details about TiddlyWiki.
+
+TiddlyWiki code and issues used to be stored at http://svn.tiddlywiki.org and http://trac.tiddlywiki.org .
+
+
+Installation
+------------
+
+Install the [git](http://git-scm.com/download) version control system, if you do not already have it.
+
+Install the [ruby](http://www.ruby-lang.org/en/downloads/) programming language, if you do not already have it. Ruby is required for some of the TiddlyWiki tools (cook and ginsu).
+
+TiddlyWiki has 4 important parallel repositories:
+
+1. [tiddlywiki](https://github.com/TiddlyWiki/tiddlywiki), this includes the source and test code for TiddlyWiki itself.
+
+2. [cooker](https://github.com/TiddlyWiki/cooker), this includes the tool for building a TiddlyWiki from a set of tiddlers (`cook`) and the tool for splitting a TiddlyWiki into separate tiddlers (`ginsu`). You need to download this repository for any TiddlyWiki development.
+
+3. [translations](https://github.com/TiddlyWiki/translations), this includes the translations of TiddlyWiki into a number of different languages.
+
+4. [tiddlywiki.com](https://github.com/TiddlyWiki/tiddlywiki.com), this includes what is required to build and upload the http://tiddlywiki.com website.
+
+
+To do any serious work on TiddlyWiki you will probably want to download all four of these repositories. They should be downloaded into parallel directories, since some of the build scripts used relative links to the other repositories:
+
+    git clone git@github.com:TiddlyWiki/tiddlywiki.git
+    git clone git@github.com:TiddlyWiki/cooker.git
+    git clone git@github.com:TiddlyWiki/tiddlywiki.com.git
+    git clone git@github.com:TiddlyWiki/translations.git
+
+
+Next you need to set up `cook`. Copy the `cook` script file to somewhere that is on your path. Edit this file according to the instructions in the file.
+
+
+Building and testing
+--------------------
+
+There is a `Makefile` for managing testing. To build and execute the TiddlyWiki tests, type:
+
+    make test
+
+Note that, depending on your machine configuration, the tests may take a while to run (perhaps as long as a 30 seconds to a minute).
+
+To set the version number of the alpha build output files edit the file `ALPHA`. This should normally be set to the same version as in the TiddlyWiki Version.js file.
+
+To build an alpha version of TiddlyWiki incorporating any changes you have made, run the `bldalpha` script by typing:
+
+    ./bldalpha
+
+
+Contributing
+------------
+
+Pull requests for feature requests/bug fixes are being accepted for this project. Pull requests should be accompanied by tests. If no tests existed for the given functionality previously, please include these in your contribution to ensure that the TiddlyWiki code base is as reliable as possible going forward. Any pull requests without tests will not generally be folded into the core codebase. See https://github.com/TiddlyWiki/tiddlywiki/wiki for more information.
+
+
+License
+-------
+
+TiddlyWiki is Copyright 2011 UneMesa Assocation
+
+It is licensed under a BSD License.
diff --git a/test/data/tiddlywiki/bldalpha b/test/data/tiddlywiki/bldalpha
new file mode 100755
index 000000000..d120a9061
--- /dev/null
+++ b/test/data/tiddlywiki/bldalpha
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+# Usage:
+#  bldalpha [release]
+
+# Requires a cook script on $PATH.
+# See 'cook' in this directory for a sample.
+
+DEFAULT_RELEASE=`cat ALPHA`
+OUTPUT_DIR=$PWD/cooked
+mkdir -p $OUTPUT_DIR
+RELEASE=${1:-$DEFAULT_RELEASE}
+RECIPE=$PWD/tiddlywiki.html.recipe
+RECIPE_EXT_JS=$PWD/tiddlywiki_externaljs.html.recipe
+RECIPE_EXT_JS_TS=$PWD/tiddlywiki_externaljs_tiddlyspace_alpha.html.recipe
+cook $RECIPE -d $OUTPUT_DIR -o tiddlywiki.$RELEASE.html
+cp java/TiddlySaver.jar $OUTPUT_DIR
+cook $RECIPE -d $OUTPUT_DIR -o tiddlywiki_compressed.$RELEASE.html -cr -Cr -Dr
+cook $RECIPE -d $OUTPUT_DIR -o twcore.$RELEASE.js -j
+cook $RECIPE_EXT_JS -d $OUTPUT_DIR -o tiddlywiki_externaljs.$RELEASE.html
+cook $RECIPE_EXT_JS_TS -d $OUTPUT_DIR -o tiddlywiki_externaljs_tiddlyspace.$RELEASE.html
diff --git a/test/data/tiddlywiki/bldxjs b/test/data/tiddlywiki/bldxjs
new file mode 100755
index 000000000..78937f83c
--- /dev/null
+++ b/test/data/tiddlywiki/bldxjs
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+# Build version of TiddlyWiki with external javascript
+# Usage:
+#  bldxjs [release]
+
+DEFAULT_RELEASE=2.6.3.A2
+RELEASE=${1:-$DEFAULT_RELEASE}
+DEST=$PWD
+RECIPE=$PWD/tiddlywiki.html.recipe
+RECIPE_EXT_JS=$PWD/tiddlywiki_externaljs.html.recipe
+RECIPE_EXT_JS_TS=$PWD/tiddlywiki_externaljs_tiddlyspace_alpha.html.recipe
+ruby -Ku -C ../tools/cooker cook.rb $RECIPE -d$DEST -q -j -o twcore.$RELEASE.js $2 $3 $4 $5
+cp -f twcore.$RELEASE.js twcore.js
+cp -f jquery/jquery.js jquery.js
+cp -f jquery/plugins/jQuery.twStylesheet.js jQuery.twStylesheet.js
+ruby -Ku -C ../tools/cooker cook.rb $RECIPE_EXT_JS -d$DEST -q -o tiddlywiki_externaljs.$RELEASE.html$2 $3 $4 $5
+ruby -Ku -C ../tools/cooker cook.rb $RECIPE_EXT_JS_TS -d$DEST -q -o tiddlywiki_externaljs_tiddlyspace.$RELEASE.html$2 $3 $4 $5
diff --git a/test/data/tiddlywiki/cook b/test/data/tiddlywiki/cook
new file mode 100755
index 000000000..fb72b9800
--- /dev/null
+++ b/test/data/tiddlywiki/cook
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+# This is a sample cook script to be used with the build scripts
+# and Makefile for TiddlyWiki. Adjust this script and then install
+# it somewhere on your $PATH, such as ~/bin.
+#
+# You will need to adjust DEFAULT_TRUNK and COOKER_TRUNK below.
+
+# change this to where your tiddlywiki repo lives,
+# unless you have TW_TRUNKDIR set.
+DEFAULT_TRUNK=$HOME/Documents/Code/Github/tiddlywiki
+
+# Change this to where you have the cooker code installed
+COOKER_TRUNK=$HOME/Documents/Code/Github/tiddlywiki/cooker
+
+if [ -z "$TW_TRUNKDIR" ]
+then
+    export TW_TRUNKDIR=$DEFAULT_TRUNK
+fi
+RECIPE=$1 && shift
+ruby -Ku -C $COOKER_TRUNK cook.rb $RECIPE "$@"
diff --git a/test/data/tiddlywiki/deprecated/Crypto.js b/test/data/tiddlywiki/deprecated/Crypto.js
new file mode 100755
index 000000000..17459cc05
--- /dev/null
+++ b/test/data/tiddlywiki/deprecated/Crypto.js
@@ -0,0 +1,44 @@
+//--
+//-- Deprecated Crypto functions and associated conversion routines.
+//-- Use the jQuery.encoding functions directly instead.
+//--
+
+// Crypto 'namespace'
+function Crypto() {}
+
+// Convert a string to an array of big-endian 32-bit words
+Crypto.strToBe32s = function(str)
+{
+	return jQuery.encoding.strToBe32s(str);
+};
+
+// Convert an array of big-endian 32-bit words to a string
+Crypto.be32sToStr = function(be)
+{
+	return jQuery.encoding.be32sToStr(be);
+};
+
+// Convert an array of big-endian 32-bit words to a hex string
+Crypto.be32sToHex = function(be)
+{
+	return jQuery.encoding.be32sToHex(be);
+};
+
+// Return, in hex, the SHA-1 hash of a string
+Crypto.hexSha1Str = function(str)
+{
+	return jQuery.encoding.digests.hexSha1Str(str);
+};
+
+// Return the SHA-1 hash of a string
+Crypto.sha1Str = function(str)
+{
+	return jQuery.encoding.digests.sha1Str(str);
+};
+
+// Calculate the SHA-1 hash of an array of blen bytes of big-endian 32-bit words
+Crypto.sha1 = function(x,blen)
+{
+	return jQuery.encoding.digests.sha1(x,blen);
+};
+
diff --git a/test/data/tiddlywiki/deprecated/Deprecated.js b/test/data/tiddlywiki/deprecated/Deprecated.js
new file mode 100755
index 000000000..ab2f1cb00
--- /dev/null
+++ b/test/data/tiddlywiki/deprecated/Deprecated.js
@@ -0,0 +1,90 @@
+//--
+//-- Deprecated code
+//--
+
+// @Deprecated: Use createElementAndWikify and this.termRegExp instead
+config.formatterHelpers.charFormatHelper = function(w)
+{
+	w.subWikify(createTiddlyElement(w.output,this.element),this.terminator);
+};
+
+// @Deprecated: Use enclosedTextHelper and this.lookaheadRegExp instead
+config.formatterHelpers.monospacedByLineHelper = function(w)
+{
+	var lookaheadRegExp = new RegExp(this.lookahead,"mg");
+	lookaheadRegExp.lastIndex = w.matchStart;
+	var lookaheadMatch = lookaheadRegExp.exec(w.source);
+	if(lookaheadMatch && lookaheadMatch.index == w.matchStart) {
+		var text = lookaheadMatch[1];
+		if(config.browser.isIE)
+			text = text.replace(/\n/g,"\r");
+		createTiddlyElement(w.output,"pre",null,null,text);
+		w.nextMatch = lookaheadRegExp.lastIndex;
+	}
+};
+
+// @Deprecated: Use <br> or <br /> instead of <<br>>
+config.macros.br = {};
+config.macros.br.handler = function(place)
+{
+	createTiddlyElement(place,"br");
+};
+
+// Find an entry in an array. Returns the array index or null
+// @Deprecated: Use indexOf instead
+Array.prototype.find = function(item)
+{
+	var i = this.indexOf(item);
+	return i == -1 ? null : i;
+};
+
+// Load a tiddler from an HTML DIV. The caller should make sure to later call Tiddler.changed()
+// @Deprecated: Use store.getLoader().internalizeTiddler instead
+Tiddler.prototype.loadFromDiv = function(divRef,title)
+{
+	return store.getLoader().internalizeTiddler(store,this,title,divRef);
+};
+
+// Format the text for storage in an HTML DIV
+// @Deprecated Use store.getSaver().externalizeTiddler instead.
+Tiddler.prototype.saveToDiv = function()
+{
+	return store.getSaver().externalizeTiddler(store,this);
+};
+
+// @Deprecated: Use store.allTiddlersAsHtml() instead
+function allTiddlersAsHtml()
+{
+	return store.allTiddlersAsHtml();
+}
+
+// @Deprecated: Use refreshPageTemplate instead
+function applyPageTemplate(title)
+{
+	refreshPageTemplate(title);
+}
+
+// @Deprecated: Use story.displayTiddlers instead
+function displayTiddlers(srcElement,titles,template,unused1,unused2,animate,unused3)
+{
+	story.displayTiddlers(srcElement,titles,template,animate);
+}
+
+// @Deprecated: Use story.displayTiddler instead
+function displayTiddler(srcElement,title,template,unused1,unused2,animate,unused3)
+{
+	story.displayTiddler(srcElement,title,template,animate);
+}
+
+// @Deprecated: Use functions on right hand side directly instead
+var createTiddlerPopup = Popup.create;
+var scrollToTiddlerPopup = Popup.show;
+var hideTiddlerPopup = Popup.remove;
+
+// @Deprecated: Use right hand side directly instead
+var regexpBackSlashEn = new RegExp("\\\\n","mg");
+var regexpBackSlash = new RegExp("\\\\","mg");
+var regexpBackSlashEss = new RegExp("\\\\s","mg");
+var regexpNewLine = new RegExp("\n","mg");
+var regexpCarriageReturn = new RegExp("\r","mg");
+
diff --git a/test/data/tiddlywiki/deprecated/FileAdaptor.js b/test/data/tiddlywiki/deprecated/FileAdaptor.js
new file mode 100755
index 000000000..30ee96b2c
--- /dev/null
+++ b/test/data/tiddlywiki/deprecated/FileAdaptor.js
@@ -0,0 +1,20 @@
+//--
+//-- Deprecated FileAdaptor functions
+//--
+
+FileAdaptor.loadTiddlyWikiCallback = function(status,context,responseText,url,xhr)
+{
+	context.status = status;
+	if(!status) {
+		context.statusText = "Error reading file";
+	} else {
+		//# Load the content into a TiddlyWiki() object
+		context.adaptor.store = new TiddlyWiki();
+		if(!context.adaptor.store.importTiddlyWiki(responseText)) {
+			context.statusText = config.messages.invalidFileError.format([url]);
+			context.status = false;
+		}
+	}
+	context.complete(context,context.userParams);
+};
+
diff --git a/test/data/tiddlywiki/deprecated/Http.js b/test/data/tiddlywiki/deprecated/Http.js
new file mode 100755
index 000000000..5d1709f55
--- /dev/null
+++ b/test/data/tiddlywiki/deprecated/Http.js
@@ -0,0 +1,26 @@
+//--
+//-- Deprecated HTTP request code
+//-- Use the jQuery ajax functions directly instead
+//--
+
+//# Load a file over http
+//#   url - the source url
+//#   callback - function to call when there is a response
+//#   params - parameter object that gets passed to the callback for storing it's state
+//# Return value is the underlying XMLHttpRequest object, or a string if there was an error
+//# Callback function is called like this:
+//#   callback(status,params,responseText,xhr)
+//#     status - true if OK, false if error
+//#     params - the parameter object provided to loadRemoteFile()
+//#     responseText - the text of the file
+//#     xhr - the underlying XMLHttpRequest object
+function loadRemoteFile(url,callback,params)
+{
+	return httpReq("GET",url,callback,params);
+}
+
+function doHttp(type,url,data,contentType,username,password,callback,params,headers,allowCache)
+{
+	return httpReq(type,url,callback,params,headers,data,contentType,username,password,allowCache);
+}
+
diff --git a/test/data/tiddlywiki/deprecated/Numbers.js b/test/data/tiddlywiki/deprecated/Numbers.js
new file mode 100755
index 000000000..3b70f0846
--- /dev/null
+++ b/test/data/tiddlywiki/deprecated/Numbers.js
@@ -0,0 +1,16 @@
+//--
+//-- Deprecated Number functions
+//--
+
+// @Deprecated: no direct replacement, since not used in core code
+// Clamp a number to a range
+Number.prototype.clamp = function(min,max)
+{
+	var c = this;
+	if(c < min)
+		c = min;
+	if(c > max)
+		c = max;
+	return Number(c);
+};
+
diff --git a/test/data/tiddlywiki/deprecated/Strings.js b/test/data/tiddlywiki/deprecated/Strings.js
new file mode 100755
index 000000000..5bcaf4bce
--- /dev/null
+++ b/test/data/tiddlywiki/deprecated/Strings.js
@@ -0,0 +1,29 @@
+//--
+//-- Deprecated String functions
+//--
+
+// @Deprecated: no direct replacement, since not used in core code
+String.prototype.toJSONString = function()
+{
+	// Convert a string to it's JSON representation by encoding control characters, double quotes and backslash. See json.org
+	var m = {
+		'\b': '\\b',
+		'\f': '\\f',
+		'\n': '\\n',
+		'\r': '\\r',
+		'\t': '\\t',
+		'"' : '\\"',
+		'\\': '\\\\'
+		};
+	var replaceFn = function(a,b) {
+		var c = m[b];
+		if(c)
+			return c;
+		c = b.charCodeAt();
+		return '\\u00' + Math.floor(c / 16).toString(16) + (c % 16).toString(16);
+		};
+	if(/["\\\x00-\x1f]/.test(this))
+		return '"' + this.replace(/([\x00-\x1f\\"])/g,replaceFn) + '"';
+	return '"' + this + '"';
+};
+
diff --git a/test/data/tiddlywiki/deprecated/Tiddler.js b/test/data/tiddlywiki/deprecated/Tiddler.js
new file mode 100755
index 000000000..073b5c349
--- /dev/null
+++ b/test/data/tiddlywiki/deprecated/Tiddler.js
@@ -0,0 +1,22 @@
+//--
+//-- Deprecated Tiddler code
+//--
+
+// @Deprecated: Use tiddlerToRssItem(tiddler,uri) instead
+Tiddler.prototype.toRssItem = function(uri)
+{
+	return tiddlerToRssItem(this,uri);
+};
+
+// @Deprecated: Use "<item>\n" + tiddlerToRssItem(tiddler,uri)  + "\n</item>" instead
+Tiddler.prototype.saveToRss = function(uri)
+{
+	return "<item>\n" + tiddlerToRssItem(this,uri) + "\n</item>";
+};
+
+// @Deprecated: Use jQuery.encoding.digests.hexSha1Str instead
+Tiddler.prototype.generateFingerprint = function()
+{
+	return "0x" + Crypto.hexSha1Str(this.text);
+};
+
diff --git a/test/data/tiddlywiki/deprecated/Utilities.js b/test/data/tiddlywiki/deprecated/Utilities.js
new file mode 100755
index 000000000..cf6b8b602
--- /dev/null
+++ b/test/data/tiddlywiki/deprecated/Utilities.js
@@ -0,0 +1,38 @@
+//--
+//-- Deprecated utility functions
+//-- Use the jQuery functions directly instead
+//--
+
+// Remove all children of a node
+function removeChildren(e)
+{
+	jQuery(e).empty();
+}
+
+// Remove a node and all it's children
+function removeNode(e)
+{
+	jQuery(e).remove();
+}
+
+// Return the content of an element as plain text with no formatting
+function getPlainText(e)
+{
+	return jQuery(e).text();
+}
+
+function addClass(e,className)
+{
+	jQuery(e).addClass(className);
+}
+
+function removeClass(e,className)
+{
+	jQuery(e).removeClass(className);
+}
+
+function hasClass(e,className)
+{
+	return jQuery(e).hasClass(className);
+}
+
diff --git a/test/data/tiddlywiki/deprecated/Wikifier.js b/test/data/tiddlywiki/deprecated/Wikifier.js
new file mode 100755
index 000000000..335625360
--- /dev/null
+++ b/test/data/tiddlywiki/deprecated/Wikifier.js
@@ -0,0 +1,16 @@
+//--
+//-- Deprecated Wikifier code
+//--
+
+//# Wikify a named tiddler to plain text
+function wikifyPlain(title,theStore,limit)
+{
+	if(!theStore)
+		theStore = store;
+	if(theStore.tiddlerExists(title) || theStore.isShadowTiddler(title)) {
+		return wikifyPlainText(theStore.getTiddlerText(title),limit,tiddler);
+	} else {
+		return "";
+	}
+}
+
diff --git a/test/data/tiddlywiki/deprecated/split.recipe b/test/data/tiddlywiki/deprecated/split.recipe
new file mode 100755
index 000000000..288ec2134
--- /dev/null
+++ b/test/data/tiddlywiki/deprecated/split.recipe
@@ -0,0 +1,10 @@
+jsdeprecated: Crypto.js
+jsdeprecated: Deprecated.js
+jsdeprecated: FileAdaptor.js
+jsdeprecated: Http.js
+jsdeprecated: Strings.js
+jsdeprecated: Tiddler.js
+jsdeprecated: Numbers.js
+jsdeprecated: Utilities.js
+jsdeprecated: Wikifier.js
+
diff --git a/test/data/tiddlywiki/html/copyright.txt b/test/data/tiddlywiki/html/copyright.txt
new file mode 100755
index 000000000..5d50e92aa
--- /dev/null
+++ b/test/data/tiddlywiki/html/copyright.txt
@@ -0,0 +1,29 @@
+TiddlyWiki created by Jeremy Ruston, (jeremy [at] osmosoft [dot] com)
+
+Copyright (c) Jeremy Ruston 2004-2007
+Copyright (c) UnaMesa Association 2007-2011
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or other
+materials provided with the distribution.
+
+Neither the name of the UnaMesa Association nor the names of its contributors may be
+used to endorse or promote products derived from this software without specific
+prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
diff --git a/test/data/tiddlywiki/html/externaljs.txt b/test/data/tiddlywiki/html/externaljs.txt
new file mode 100755
index 000000000..b4b88826e
--- /dev/null
+++ b/test/data/tiddlywiki/html/externaljs.txt
@@ -0,0 +1,3 @@
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="jQuery.twStylesheet.js"></script>
+<script type="text/javascript" src="twcore.js"></script>
diff --git a/test/data/tiddlywiki/html/externaljs_tiddlyspace.txt b/test/data/tiddlywiki/html/externaljs_tiddlyspace.txt
new file mode 100755
index 000000000..9873ba982
--- /dev/null
+++ b/test/data/tiddlywiki/html/externaljs_tiddlyspace.txt
@@ -0,0 +1,3 @@
+<script type="text/javascript" src="/bags/common/tiddlers/jquery.js"></script>
+<script type="text/javascript" src="/bags/common/tiddlers/jQuery.twStylesheet.js"></script>
+<script type="text/javascript" src="/bags/common/tiddlers/twcore.js"></script>
diff --git a/test/data/tiddlywiki/html/externaljs_tiddlyspace_alpha.txt b/test/data/tiddlywiki/html/externaljs_tiddlyspace_alpha.txt
new file mode 100755
index 000000000..bde0205e9
--- /dev/null
+++ b/test/data/tiddlywiki/html/externaljs_tiddlyspace_alpha.txt
@@ -0,0 +1,3 @@
+<script type="text/javascript" src="/bags/common/tiddlers/alpha_jquery.js"></script>
+<script type="text/javascript" src="/bags/common/tiddlers/alpha_jQuery.twStylesheet.js"></script>
+<script type="text/javascript" src="/bags/common/tiddlers/alpha_twcore.js"></script>
diff --git a/test/data/tiddlywiki/html/externaljs_tiddlyspace_beta.txt b/test/data/tiddlywiki/html/externaljs_tiddlyspace_beta.txt
new file mode 100755
index 000000000..44ab9c0da
--- /dev/null
+++ b/test/data/tiddlywiki/html/externaljs_tiddlyspace_beta.txt
@@ -0,0 +1,3 @@
+<script type="text/javascript" src="/bags/common/tiddlers/beta_jquery.js"></script>
+<script type="text/javascript" src="/bags/common/tiddlers/beta_jQuery.twStylesheet.js"></script>
+<script type="text/javascript" src="/bags/common/tiddlers/beta_twcore.js"></script>
diff --git a/test/data/tiddlywiki/html/noscript.txt b/test/data/tiddlywiki/html/noscript.txt
new file mode 100755
index 000000000..a9dad34aa
--- /dev/null
+++ b/test/data/tiddlywiki/html/noscript.txt
@@ -0,0 +1,3 @@
+<div id="javascriptWarning">
+This page requires JavaScript to function properly.<br /><br />If you are using Microsoft Internet Explorer you may need to click on the yellow bar above and select 'Allow Blocked Content'. You must then click 'Yes' on the following security warning.
+</div>
diff --git a/test/data/tiddlywiki/html/rss.link.html b/test/data/tiddlywiki/html/rss.link.html
new file mode 100755
index 000000000..4da2bc3dd
--- /dev/null
+++ b/test/data/tiddlywiki/html/rss.link.html
@@ -0,0 +1 @@
+<link rel='alternate' type='application/rss+xml' title='RSS' href='index.xml'/>
diff --git a/test/data/tiddlywiki/html/split.recipe b/test/data/tiddlywiki/html/split.recipe
new file mode 100755
index 000000000..9503dc82c
--- /dev/null
+++ b/test/data/tiddlywiki/html/split.recipe
@@ -0,0 +1,5 @@
+template: tiddlywiki.template.html
+copyright: copyright.txt
+style: style.txt
+noscript: noscript.txt
+jsext: tiddlysaver.txt
diff --git a/test/data/tiddlywiki/html/splitnonoscript.recipe b/test/data/tiddlywiki/html/splitnonoscript.recipe
new file mode 100755
index 000000000..e1dee93d9
--- /dev/null
+++ b/test/data/tiddlywiki/html/splitnonoscript.recipe
@@ -0,0 +1,3 @@
+template: tiddlywiki.template.html
+copyright: copyright.txt
+style: style.txt
diff --git a/test/data/tiddlywiki/html/style.txt b/test/data/tiddlywiki/html/style.txt
new file mode 100755
index 000000000..a70bd458c
--- /dev/null
+++ b/test/data/tiddlywiki/html/style.txt
@@ -0,0 +1,7 @@
+#saveTest {display:none;}
+#messageArea {display:none;}
+#copyright {display:none;}
+#storeArea {display:none;}
+#storeArea div {padding:0.5em; margin:1em 0em 0em 0em; border-color:#fff #666 #444 #ddd; border-style:solid; border-width:2px; overflow:auto;}
+#shadowArea {display:none;}
+#javascriptWarning {width:100%; text-align:center; font-weight:bold; background-color:#dd1100; color:#fff; padding:1em 0em;}
diff --git a/test/data/tiddlywiki/html/tiddlysaver.txt b/test/data/tiddlywiki/html/tiddlysaver.txt
new file mode 100755
index 000000000..a43069962
--- /dev/null
+++ b/test/data/tiddlywiki/html/tiddlysaver.txt
@@ -0,0 +1,6 @@
+<script type="text/javascript">
+//<![CDATA[
+if(useJavaSaver)
+	document.write("<applet style='position:absolute;left:-1px' name='TiddlySaver' code='TiddlySaver.class' archive='TiddlySaver.jar' width='1' height='1'></applet>");
+//]]>
+</script>
diff --git a/test/data/tiddlywiki/html/tiddlywiki.template.html b/test/data/tiddlywiki/html/tiddlywiki.template.html
new file mode 100755
index 000000000..5d8ccb12c
--- /dev/null
+++ b/test/data/tiddlywiki/html/tiddlywiki.template.html
@@ -0,0 +1,86 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<script id="versionArea" type="text/javascript">
+//<![CDATA[
+<!--@@version@@-->
+//]]>
+</script>
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<meta name="copyright" content="
+&lt;!--@@copyright@@--&gt;
+" />
+<!--PRE-HEAD-START-->
+<!--@@prehead@@-->
+<!--PRE-HEAD-END-->
+<title>
+<!--@@title@@-->
+</title>
+<style id="styleArea" type="text/css">
+<!--@@style@@-->
+</style>
+<!--POST-HEAD-START-->
+<!--@@posthead@@-->
+<!--POST-HEAD-END-->
+</head>
+<body onload="main();" onunload="if(window.unload) unload();">
+<!--PRE-BODY-START-->
+<!--@@prebody@@-->
+<!--PRE-BODY-END-->
+<div id="copyright">
+Welcome to TiddlyWiki created by Jeremy Ruston; Copyright &copy; 2004-2007 Jeremy Ruston, Copyright &copy; 2007-2011 UnaMesa Association
+</div>
+<noscript>
+<!--@@noscript@@-->
+</noscript>
+<div id="saveTest"></div>
+<div id="backstageCloak"></div>
+<div id="backstageButton"></div>
+<div id="backstageArea"><div id="backstageToolbar"></div></div>
+<div id="backstage">
+	<div id="backstagePanel"></div>
+</div>
+<div id="contentWrapper"></div>
+<div id="contentStash"></div>
+<div id="shadowArea">
+<!--@@shadow@@-->
+</div>
+<!--POST-SHADOWAREA-->
+<div id="storeArea">
+<!--@@tiddler@@-->
+<!--@@plugin@@-->
+<!--@@posttiddlers@@-->
+</div>
+<!--POST-STOREAREA-->
+<!--POST-BODY-START-->
+<!--@@postbody@@-->
+<!--POST-BODY-END-->
+<script id="jsArea" type="text/javascript">
+//<![CDATA[
+<!--@@prejs@@-->
+<!--@@js@@-->
+<!--@@postjs@@-->
+//]]>
+</script>
+<!--@@jsext@@-->
+<script id="jsdeprecatedArea" type="text/javascript">
+//<![CDATA[
+<!--@@jsdeprecated@@-->
+//]]>
+</script>
+<script id="jslibArea" type="text/javascript">
+//<![CDATA[
+<!--@@jslib@@-->
+
+//]]>
+</script>
+<script id="jqueryArea" type="text/javascript">
+//<![CDATA[
+<!--@@jquery@@-->
+//]]>
+</script>
+<!--POST-SCRIPT-START-->
+<!--@@postscript@@-->
+<!--POST-SCRIPT-END-->
+</body>
+</html>
diff --git a/test/data/tiddlywiki/java/TiddlySaver$1.class b/test/data/tiddlywiki/java/TiddlySaver$1.class
new file mode 100755
index 000000000..9f4be242b
Binary files /dev/null and b/test/data/tiddlywiki/java/TiddlySaver$1.class differ
diff --git a/test/data/tiddlywiki/java/TiddlySaver$2.class b/test/data/tiddlywiki/java/TiddlySaver$2.class
new file mode 100755
index 000000000..c6d303a03
Binary files /dev/null and b/test/data/tiddlywiki/java/TiddlySaver$2.class differ
diff --git a/test/data/tiddlywiki/java/TiddlySaver.class b/test/data/tiddlywiki/java/TiddlySaver.class
new file mode 100755
index 000000000..64cac6801
Binary files /dev/null and b/test/data/tiddlywiki/java/TiddlySaver.class differ
diff --git a/test/data/tiddlywiki/java/TiddlySaver.jar b/test/data/tiddlywiki/java/TiddlySaver.jar
new file mode 100755
index 000000000..e42d06d3a
Binary files /dev/null and b/test/data/tiddlywiki/java/TiddlySaver.jar differ
diff --git a/test/data/tiddlywiki/java/TiddlySaver.java b/test/data/tiddlywiki/java/TiddlySaver.java
new file mode 100755
index 000000000..df7d17316
--- /dev/null
+++ b/test/data/tiddlywiki/java/TiddlySaver.java
@@ -0,0 +1,71 @@
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+public class TiddlySaver extends java.applet.Applet {
+  public String loadFile(final String filename, final String charset) {
+	return (String)AccessController.doPrivileged(new PrivilegedAction() {
+	    public Object run() {		
+		  try {
+		    if (charset.length() == 0) {
+		      StringBuffer data = new StringBuffer();
+		      BufferedReader r = new BufferedReader(new FileReader(filename));
+		      String line;
+		      while ((line = r.readLine()) != null) data.append(line).append("\n");
+		      r.close();
+		      return data.toString();
+		    } else {
+		      File f = new File(filename);
+		      FileInputStream i = new FileInputStream(f);
+		      byte[] b = new byte[(f.length() > Integer.MAX_VALUE) ? Integer.MAX_VALUE : (int)f.length()];
+		      int offset = 0;
+		      int num = 0;
+		      while (offset < b.length && (num = i.read(b, offset, b.length - offset)) >= 0) {
+		        offset += num;
+		      }
+		      i.close();
+		      return new String(b, 0, offset, charset);
+		    }
+		  } catch (Exception x) {
+		    x.printStackTrace();
+		    return null;
+		  }
+        }
+	  });
+  }
+  public int saveFile(final String filename, final String charset, final String data) {
+    return ((Integer)AccessController.doPrivileged(new PrivilegedAction() {
+      public Object run() {		
+    	try {
+          if (charset.length() == 0) {
+            int e, s = 0;
+            BufferedWriter w = new BufferedWriter(new FileWriter(filename));
+            do {
+              e = data.indexOf('\n', s);
+              if (e == -1) e = data.length();
+              w.write(data, s, e - s);
+              w.newLine();
+              s = e + 1;
+            } while (s < data.length());
+            w.close();
+            return new Integer(1);
+          } else {
+            FileOutputStream o = new FileOutputStream(filename);
+            o.write(data.getBytes(charset));
+            o.close();
+            return new Integer(1);
+          }
+        } catch (Exception x) {
+          x.printStackTrace();
+          return new Integer(0);
+        }
+      }
+    })).intValue();
+  }
+}
\ No newline at end of file
diff --git a/test/data/tiddlywiki/java/TiddlySaverVerify.keystore b/test/data/tiddlywiki/java/TiddlySaverVerify.keystore
new file mode 100755
index 000000000..65fdce53b
Binary files /dev/null and b/test/data/tiddlywiki/java/TiddlySaverVerify.keystore differ
diff --git a/test/data/tiddlywiki/java/UnaMesa-2.cer b/test/data/tiddlywiki/java/UnaMesa-2.cer
new file mode 100755
index 000000000..677e59757
--- /dev/null
+++ b/test/data/tiddlywiki/java/UnaMesa-2.cer
@@ -0,0 +1,38 @@
+-----BEGIN PKCS #7 SIGNED DATA-----
+MIAGCSqGSIb3DQEHAqCAMIACAQExADALBgkqhkiG9w0BBwGggDCCAyIwggKLoAMC
+AQICEEtycpHmJVBWKTR1fltuZYgwDQYJKoZIhvcNAQEFBQAwVTELMAkGA1UEBhMC
+WkExJTAjBgNVBAoTHFRoYXd0ZSBDb25zdWx0aW5nIChQdHkpIEx0ZC4xHzAdBgNV
+BAMTFlRoYXd0ZSBDb2RlIFNpZ25pbmcgQ0EwHhcNMTAwMzA0MDAwMDAwWhcNMTIw
+MzAzMjM1OTU5WjBvMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTES
+MBAGA1UEBxMJUGFsbyBBbHRvMRAwDgYDVQQKFAdVbmFNZXNhMRMwEQYDVQQLFApU
+aWRkbHlXaWtpMRAwDgYDVQQDFAdVbmFNZXNhMIGfMA0GCSqGSIb3DQEBAQUAA4GN
+ADCBiQKBgQDy7syNTVAWoApezeC5oKYWsS19uO87TgHcwqAG2R6U8pBVuHoKpzL9
+YpOnwIL3p+l/fHy5T8ghmxdX4d73RtHiHMFIL6ABrSvt/WxUKtyImleBv521pK5P
+S0sdBJWgWCSIV76YKxHdHTZfU83rNih1IGzxP+96MflXh4wPsVuvcwIDAQABo4HY
+MIHVMAwGA1UdEwEB/wQCMAAwPgYDVR0fBDcwNTAzoDGgL4YtaHR0cDovL2NybC50
+aGF3dGUuY29tL1RoYXd0ZUNvZGVTaWduaW5nQ0EuY3JsMB8GA1UdJQQYMBYGCCsG
+AQUFBwMDBgorBgEEAYI3AgEWMB0GA1UdBAQWMBQwDjAMBgorBgEEAYI3AgEWAwIH
+gDAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLnRoYXd0
+ZS5jb20wEQYJYIZIAYb4QgEBBAQDAgQQMA0GCSqGSIb3DQEBBQUAA4GBAHgyGc8J
+hNHrtizy6e4bWDlYBwVJiGPe1h0qTNrL9qGexHfF9Msik9CYCFHHv0NlatkP0g0L
+ZNkR4pTg7QFPBxfV/fh74SxnzadgyX5vsuohC3n7r7XLZy+vh/jeZR2Qt9QTkyxY
+AONfQLWpTUvFy6Rqb6KcPmW70s6t7NORkWF1MIIDTjCCAregAwIBAgIBCjANBgkq
+hkiG9w0BAQUFADCBzjELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdlc3Rlcm4gQ2Fw
+ZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29uc3VsdGlu
+ZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEh
+MB8GA1UEAxMYVGhhd3RlIFByZW1pdW0gU2VydmVyIENBMSgwJgYJKoZIhvcNAQkB
+FhlwcmVtaXVtLXNlcnZlckB0aGF3dGUuY29tMB4XDTAzMDgwNjAwMDAwMFoXDTEz
+MDgwNTIzNTk1OVowVTELMAkGA1UEBhMCWkExJTAjBgNVBAoTHFRoYXd0ZSBDb25z
+dWx0aW5nIChQdHkpIEx0ZC4xHzAdBgNVBAMTFlRoYXd0ZSBDb2RlIFNpZ25pbmcg
+Q0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMa4uSdgrwvjkWll236N7ZHm
+qvG+1e3+bdQsf9Fwd/smmVe03T8wuNwh6miNgZL8LkuRNYQg8tpKurT85tqI8iDF
+IZIJR5WgCRymeb6xTB388YpuVNJpofFMkzpB/n3UZHtjRfdgYB0xHaTp0w+L+24m
+JLOo/+XlkNS0wtxQYK5ZAgMBAAGjgbMwgbAwEgYDVR0TAQH/BAgwBgEB/wIBADBA
+BgNVHR8EOTA3MDWgM6Axhi9odHRwOi8vY3JsLnRoYXd0ZS5jb20vVGhhd3RlUHJl
+bWl1bVNlcnZlckNBLmNybDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwMw
+DgYDVR0PAQH/BAQDAgEGMCkGA1UdEQQiMCCkHjAcMRowGAYDVQQDExFQcml2YXRl
+TGFiZWwyLTE0NDANBgkqhkiG9w0BAQUFAAOBgQB2spzuE58b9i00kpRFczTcjmsu
+XPxMfYnrw2jx15kPLh0XyLUWi77NigUG8hlJOgNbBckgjm1S4XaBoMNliiJn5BxT
+UzdGv7zXL+t7ntAURWxAIQjiXXV2ZjAe9N+Cii+986IMvx3bnxSimnI3TbB3SOhK
+PwnOVRks7+YHJOGv7AAAMQAAAAAAAAA=
+-----END PKCS #7 SIGNED DATA-----
\ No newline at end of file
diff --git a/test/data/tiddlywiki/java/UnaMesa-3.cer b/test/data/tiddlywiki/java/UnaMesa-3.cer
new file mode 100755
index 000000000..193cd2c02
Binary files /dev/null and b/test/data/tiddlywiki/java/UnaMesa-3.cer differ
diff --git a/test/data/tiddlywiki/java/UnaMesa.old.cer b/test/data/tiddlywiki/java/UnaMesa.old.cer
new file mode 100755
index 000000000..e460840e3
Binary files /dev/null and b/test/data/tiddlywiki/java/UnaMesa.old.cer differ
diff --git a/test/data/tiddlywiki/java/build b/test/data/tiddlywiki/java/build
new file mode 100755
index 000000000..b4bae1a78
--- /dev/null
+++ b/test/data/tiddlywiki/java/build
@@ -0,0 +1,5 @@
+javac -source 1.2 -target 1.2 -g:none TiddlySaver.java
+jar cf TiddlySaver.jar TiddlySaver*.class
+# assume you have UnaMesa.keystore in the same directory
+# and Passphrase for keystore
+jarsigner -keystore UnaMesa.keystore TiddlySaver.jar BidiX
diff --git a/test/data/tiddlywiki/java/sign.readme b/test/data/tiddlywiki/java/sign.readme
new file mode 100755
index 000000000..ceaa17b2b
--- /dev/null
+++ b/test/data/tiddlywiki/java/sign.readme
@@ -0,0 +1,323 @@
+
+	Readme file for signing TiddlySaver applet
+
+for verifying see verify.readme file
+
+1 - HISTORY
+
+2010 03 06 - BidiX : Signing TiddlySaver.jar with a new Signing Certificate
+					The files were updated with the new process used for signing (sorry my Macbook was configured in French)
+					New signed TiddlySaver.jar was tested with Safari 4.0.4 on MacOS 10.6.2
+2008 04 06 - BidiX : documentation
+2008 04 06 - BidiX : create TiddlySaverVerify.keystore
+2008 03 27 - BidiX : Signing TiddlySaver.jar
+2008 03 26 - BidiX : obtaining UnaMesa Signing Certificate
+2008 03 17 - BidiX : Issuing a certificate request to Thawte with a BidiX CSR
+2003 03 12 - BidiX : Create UnaMesa.keystore with BidiX alias and Private key
+
+
+2 - UNAMESA.KEYSTORE CREATION
+
+Using this command:
+----------------
+> keytool -genkey -keyalg RSA -alias BidiX -keystore UnaMesa.keystore
+Tapez le mot de passe du Keystore :  
+Ressaisissez le nouveau mot de passe : 
+Quels sont vos pr?nom et nom ?
+  [Unknown] :  BidiX
+Quel est le nom de votre unit? organisationnelle ?
+  [Unknown] :  TiddlyWiki
+Quelle est le nom de votre organisation ?
+  [Unknown] :  UnaMesa
+Quel est le nom de votre ville de r?sidence ?
+  [Unknown] :  Palo Alto
+Quel est le nom de votre ?tat ou province ?
+  [Unknown] :  California
+Quel est le code de pays ? deux lettres pour cette unit? ?
+  [Unknown] :  US
+Est-ce CN=BidiX, OU=TiddlyWiki, O=UnaMesa, L=Palo Alto, ST=California, C=US ?
+  [non] :  OUI
+
+Sp?cifiez le mot de passe de la cl? pour <BidiX>
+	(appuyez sur Entr?e s'il s'agit du mot de passe du Keystore) :  
+Ressaisissez le nouveau mot de passe : 
+---------------
+
+For security reasons the Keystore is kept in a safe place in BidiX environment (BidiX @ bidix.info)
+
+
+3 - CERTICATE REQUEST
+Using this command :
+--------------
+> keytool -certreq -alias BidiX -file certreq -keystore UnaMesa.keystore -storepass "???"
+> cat certreq
+-----BEGIN NEW CERTIFICATE REQUEST-----
+MIIBrTCCARYCAQAwbTELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExEjAQBgNVBAcT
+...
+sxoX+IbLVSs4Ye4HDqFodRkmehWBJsdWpQa/yji72pY+eA3fCgTt57VL+san9pPaLcwPfAiL23cD
+R1j/y2RjQYLpE0PH+vQXn26xNeUDo2OONijyG0RLIX57yA==
+-----END NEW CERTIFICATE REQUEST-----
+---------------
+Certificate received
+-----BEGIN PKCS #7 SIGNED DATA-----
+MIAGCSqGSIb3DQEHAqCAMIACAQExADALBgkqhkiG9w0BBwGggDCCAyIwggKLoAMC
+...
+PwnOVRks7+YHJOGv7AAAMQAAAAAAAAA=
+-----END PKCS #7 SIGNED DATA-----
+copied in UnaMesa-2.cer
+
+4 - ADDING CERTICATE TO KEYSTORE
+---------------
+> keytool -import -alias BidiX -trustcacerts -file UnaMesa-2.cer -keystore UnaMesa.keystore 
+Tapez le mot de passe du Keystore :  
+R?ponse de certificat install?e dans le Keystore
+---------------
+List Keystore
+---------------
+> keytool -list -v -alias BidiX -keystore UnaMesa.keystore 
+Tapez le mot de passe du Keystore :  
+Nom d'alias : BidiX
+Date de cr?ation : 6 mars 2010
+Type dentr?e?: {0}
+Longueur de cha?ne du certificat : 3
+Certificat[1]:
+Propri?taire?: CN=UnaMesa, OU=TiddlyWiki, O=UnaMesa, L=Palo Alto, ST=California, C=US
+?metteur?: CN=Thawte Code Signing CA, O=Thawte Consulting (Pty) Ltd., C=ZA
+Num?ro de s?rie?: 4b727291e62550562934757e5b6e6588
+Valide du?: Thu Mar 04 01:00:00 CET 2010 au?: Sun Mar 04 00:59:59 CET 2012
+Empreintes du certificat?:
+	 MD5?:  1B:79:CE:47:BE:A9:E4:04:2A:DD:04:F5:BA:62:64:AD
+	 SHA1?: 42:A9:6F:4D:C3:20:F8:7F:90:1A:1F:A5:66:92:ED:06:38:19:1E:D4
+	 Nom de lalgorithme de signature?: {7}
+	 Version?: {8}
+
+Extensions?: 
+
+#1: ObjectId: 2.5.29.19 Criticality=true
+BasicConstraints:[
+  CA:false
+  PathLen: undefined
+]
+
+#2: ObjectId: 1.3.6.1.5.5.7.1.1 Criticality=false
+AuthorityInfoAccess [
+  [accessMethod: 1.3.6.1.5.5.7.48.1
+   accessLocation: URIName: http://ocsp.thawte.com]
+]
+
+#3: ObjectId: 2.5.29.4 Criticality=false
+
+#4: ObjectId: 2.5.29.31 Criticality=false
+CRLDistributionPoints [
+  [DistributionPoint:
+     [URIName: http://crl.thawte.com/ThawteCodeSigningCA.crl]
+]]
+
+#5: ObjectId: 2.5.29.37 Criticality=false
+ExtendedKeyUsages [
+  codeSigning
+  1.3.6.1.4.1.311.2.1.22
+]
+
+#6: ObjectId: 2.16.840.1.113730.1.1 Criticality=false
+NetscapeCertType [
+   Object Signing
+]
+
+Certificat[2]:
+Propri?taire?: CN=Thawte Code Signing CA, O=Thawte Consulting (Pty) Ltd., C=ZA
+?metteur?: EMAILADDRESS=premium-server@thawte.com, CN=Thawte Premium Server CA, OU=Certification Services Division, O=Thawte Consulting cc, L=Cape Town, ST=Western Cape, C=ZA
+Num?ro de s?rie?: a
+Valide du?: Wed Aug 06 02:00:00 CEST 2003 au?: Tue Aug 06 01:59:59 CEST 2013
+Empreintes du certificat?:
+	 MD5?:  D4:A7:BF:00:7B:6A:0C:20:D9:23:CD:5B:60:7B:7C:12
+	 SHA1?: A7:06:BA:1E:CA:B6:A2:AB:18:69:9F:C0:D7:DD:8C:7D:E3:6F:29:0F
+	 Nom de lalgorithme de signature?: {7}
+	 Version?: {8}
+
+Extensions?: 
+
+#1: ObjectId: 2.5.29.15 Criticality=true
+KeyUsage [
+  Key_CertSign
+  Crl_Sign
+]
+
+#2: ObjectId: 2.5.29.19 Criticality=true
+BasicConstraints:[
+  CA:true
+  PathLen:0
+]
+
+#3: ObjectId: 2.5.29.31 Criticality=false
+CRLDistributionPoints [
+  [DistributionPoint:
+     [URIName: http://crl.thawte.com/ThawtePremiumServerCA.crl]
+]]
+
+#4: ObjectId: 2.5.29.37 Criticality=false
+ExtendedKeyUsages [
+  clientAuth
+  codeSigning
+]
+
+#5: ObjectId: 2.5.29.17 Criticality=false
+SubjectAlternativeName [
+  CN=PrivateLabel2-144
+]
+
+Certificat[3]:
+Propri?taire?: EMAILADDRESS=premium-server@thawte.com, CN=Thawte Premium Server CA, OU=Certification Services Division, O=Thawte Consulting cc, L=Cape Town, ST=Western Cape, C=ZA
+?metteur?: EMAILADDRESS=premium-server@thawte.com, CN=Thawte Premium Server CA, OU=Certification Services Division, O=Thawte Consulting cc, L=Cape Town, ST=Western Cape, C=ZA
+Num?ro de s?rie?: 1
+Valide du?: Thu Aug 01 02:00:00 CEST 1996 au?: Fri Jan 01 00:59:59 CET 2021
+Empreintes du certificat?:
+	 MD5?:  06:9F:69:79:16:66:90:02:1B:8C:8C:A2:C3:07:6F:3A
+	 SHA1?: 62:7F:8D:78:27:65:63:99:D2:7D:7F:90:44:C9:FE:B3:F3:3E:FA:9A
+	 Nom de lalgorithme de signature?: {7}
+	 Version?: {8}
+
+Extensions?: 
+
+#1: ObjectId: 2.5.29.19 Criticality=true
+BasicConstraints:[
+  CA:true
+  PathLen:2147483647
+]
+---------------
+
+5 - SIGNING TIDDLYSAVER.JAR
+
+Get TiddlySaver.jar from http://trac.tiddlywiki.org/browser/Trunk/core/java/TiddlySaver.jar.
+TiddlySaver.jar contained classes compiled on Thu Dec 07 14:48:00 CET 2006
+
+With UnaMesa.keystore in the current directory Signing jar on Sam  6 mar 2010 15:16:04 CET using this command :
+---------------
+> jarsigner -keystore UnaMesa.keystore TiddlySaver.jar BidiX
+Enter Passphrase for keystore:
+---------------
+
+6 - VERIFYING SIGNATURE  WITHOUT KEYSTORE
+---------------
+> jarsigner -verify -verbose TiddlySaver.jar
+
+         284 Thu Mar 27 07:59:12 CET 2008 META-INF/MANIFEST.MF
+         395 Sat Mar 06 15:16:04 CET 2010 META-INF/BIDIX.SF
+        2798 Sat Mar 06 15:16:04 CET 2010 META-INF/BIDIX.RSA
+           0 Thu Dec 07 14:48:00 CET 2006 META-INF/
+sm      1271 Thu Dec 07 14:48:00 CET 2006 TiddlySaver$1.class
+sm      1184 Thu Dec 07 14:48:00 CET 2006 TiddlySaver$2.class
+sm       775 Thu Dec 07 14:48:00 CET 2006 TiddlySaver.class
+
+  s = signature was verified 
+  m = entry is listed in manifest
+  k = at least one certificate was found in keystore
+  i = at least one certificate was found in identity scope
+
+jar verified.
+---------------
+
+7 - CREATE TiddlySaverVerify.keystore KEYSTORE
+export SigningCertificate
+---------------
+> keytool -export -alias BidiX -file UnaMesa-3.cer -keystore UnaMesa.keystore 
+Tapez le mot de passe du Keystore :  
+Certificat enregistr? dans le fichier <UnaMesa-3.cer>
+---------------
+create keystore "TiddlySaverVerify.keystore" with "tiddlywiki" as password and import SigningCertificate 
+---------------
+> keytool -import -alias BidiX -keystore TiddlySaverVerify.keystore -storepass tiddlywiki -file UnaMesa-3.cer 
+Propri?taire?: CN=UnaMesa, OU=TiddlyWiki, O=UnaMesa, L=Palo Alto, ST=California, C=US
+?metteur?: CN=Thawte Code Signing CA, O=Thawte Consulting (Pty) Ltd., C=ZA
+Num?ro de s?rie?: 4b727291e62550562934757e5b6e6588
+Valide du?: Thu Mar 04 01:00:00 CET 2010 au?: Sun Mar 04 00:59:59 CET 2012
+Empreintes du certificat?:
+	 MD5?:  1B:79:CE:47:BE:A9:E4:04:2A:DD:04:F5:BA:62:64:AD
+	 SHA1?: 42:A9:6F:4D:C3:20:F8:7F:90:1A:1F:A5:66:92:ED:06:38:19:1E:D4
+	 Nom de lalgorithme de signature?: {7}
+	 Version?: {8}
+
+Extensions?: 
+
+#1: ObjectId: 2.5.29.19 Criticality=true
+BasicConstraints:[
+  CA:false
+  PathLen: undefined
+]
+
+#2: ObjectId: 1.3.6.1.5.5.7.1.1 Criticality=false
+AuthorityInfoAccess [
+  [accessMethod: 1.3.6.1.5.5.7.48.1
+   accessLocation: URIName: http://ocsp.thawte.com]
+]
+
+#3: ObjectId: 2.5.29.4 Criticality=false
+
+#4: ObjectId: 2.5.29.31 Criticality=false
+CRLDistributionPoints [
+  [DistributionPoint:
+     [URIName: http://crl.thawte.com/ThawteCodeSigningCA.crl]
+]]
+
+#5: ObjectId: 2.5.29.37 Criticality=false
+ExtendedKeyUsages [
+  codeSigning
+  1.3.6.1.4.1.311.2.1.22
+]
+
+#6: ObjectId: 2.16.840.1.113730.1.1 Criticality=false
+NetscapeCertType [
+   Object Signing
+]
+
+Faire confiance ? ce certificat ? [non] :  Y
+R?ponse incorrecte, recommencez
+Faire confiance ? ce certificat ? [non] :  oui
+Certificat ajout? au Keystore
+---------------
+
+8 - VERIFYING SIGNATURE WITH TiddlySaverVerify.keystore
+---------------
+> jarsigner -verify -verbose -certs -keystore TiddlySaverVerify.keystore TiddlySaver.jar
+         284 Thu Mar 27 07:59:12 CET 2008 META-INF/MANIFEST.MF
+         395 Sat Mar 06 15:16:04 CET 2010 META-INF/BIDIX.SF
+        2798 Sat Mar 06 15:16:04 CET 2010 META-INF/BIDIX.RSA
+           0 Thu Dec 07 14:48:00 CET 2006 META-INF/
+smk     1271 Thu Dec 07 14:48:00 CET 2006 TiddlySaver$1.class
+
+      X.509, CN=UnaMesa, OU=TiddlyWiki, O=UnaMesa, L=Palo Alto, ST=California, C=US (bidix)
+      [certificate is valid from 04/03/10 01:00 to 04/03/12 00:59]
+      X.509, CN=Thawte Code Signing CA, O=Thawte Consulting (Pty) Ltd., C=ZA
+      [certificate is valid from 06/08/03 02:00 to 06/08/13 01:59]
+      [KeyUsage extension does not support code signing]
+      X.509, EMAILADDRESS=premium-server@thawte.com, CN=Thawte Premium Server CA, OU=Certification Services Division, O=Thawte Consulting cc, L=Cape Town, ST=Western Cape, C=ZA
+      [certificate is valid from 01/08/96 02:00 to 01/01/21 00:59]
+
+smk     1184 Thu Dec 07 14:48:00 CET 2006 TiddlySaver$2.class
+
+      X.509, CN=UnaMesa, OU=TiddlyWiki, O=UnaMesa, L=Palo Alto, ST=California, C=US (bidix)
+      [certificate is valid from 04/03/10 01:00 to 04/03/12 00:59]
+      X.509, CN=Thawte Code Signing CA, O=Thawte Consulting (Pty) Ltd., C=ZA
+      [certificate is valid from 06/08/03 02:00 to 06/08/13 01:59]
+      [KeyUsage extension does not support code signing]
+      X.509, EMAILADDRESS=premium-server@thawte.com, CN=Thawte Premium Server CA, OU=Certification Services Division, O=Thawte Consulting cc, L=Cape Town, ST=Western Cape, C=ZA
+      [certificate is valid from 01/08/96 02:00 to 01/01/21 00:59]
+
+smk      775 Thu Dec 07 14:48:00 CET 2006 TiddlySaver.class
+
+      X.509, CN=UnaMesa, OU=TiddlyWiki, O=UnaMesa, L=Palo Alto, ST=California, C=US (bidix)
+      [certificate is valid from 04/03/10 01:00 to 04/03/12 00:59]
+      X.509, CN=Thawte Code Signing CA, O=Thawte Consulting (Pty) Ltd., C=ZA
+      [certificate is valid from 06/08/03 02:00 to 06/08/13 01:59]
+      [KeyUsage extension does not support code signing]
+      X.509, EMAILADDRESS=premium-server@thawte.com, CN=Thawte Premium Server CA, OU=Certification Services Division, O=Thawte Consulting cc, L=Cape Town, ST=Western Cape, C=ZA
+      [certificate is valid from 01/08/96 02:00 to 01/01/21 00:59]
+
+
+  s = signature was verified 
+  m = entry is listed in manifest
+  k = at least one certificate was found in keystore
+  i = at least one certificate was found in identity scope
+
+jar verified.
+---------------
\ No newline at end of file
diff --git a/test/data/tiddlywiki/java/verify b/test/data/tiddlywiki/java/verify
new file mode 100755
index 000000000..71d4e9431
--- /dev/null
+++ b/test/data/tiddlywiki/java/verify
@@ -0,0 +1,2 @@
+# assume TiddlySaverVerify.keystore and TiddlySaver.jar in the current directory
+jarsigner -verify -verbose -certs -keystore TiddlySaverVerify.keystore -keypass tiddlywiki TiddlySaver.jar
diff --git a/test/data/tiddlywiki/java/verify.readme b/test/data/tiddlywiki/java/verify.readme
new file mode 100755
index 000000000..0f555556f
--- /dev/null
+++ b/test/data/tiddlywiki/java/verify.readme
@@ -0,0 +1,46 @@
+
+Above the verifying command and the expected return: 
+
+
+> jarsigner -verify -verbose -certs -keystore TiddlySaverVerify.keystore TiddlySaver.jar
+         284 Thu Mar 27 07:59:12 CET 2008 META-INF/MANIFEST.MF
+         395 Sat Mar 06 15:16:04 CET 2010 META-INF/BIDIX.SF
+        2798 Sat Mar 06 15:16:04 CET 2010 META-INF/BIDIX.RSA
+           0 Thu Dec 07 14:48:00 CET 2006 META-INF/
+smk     1271 Thu Dec 07 14:48:00 CET 2006 TiddlySaver$1.class
+
+      X.509, CN=UnaMesa, OU=TiddlyWiki, O=UnaMesa, L=Palo Alto, ST=California, C=US (bidix)
+      [certificate is valid from 04/03/10 01:00 to 04/03/12 00:59]
+      X.509, CN=Thawte Code Signing CA, O=Thawte Consulting (Pty) Ltd., C=ZA
+      [certificate is valid from 06/08/03 02:00 to 06/08/13 01:59]
+      [KeyUsage extension does not support code signing]
+      X.509, EMAILADDRESS=premium-server@thawte.com, CN=Thawte Premium Server CA, OU=Certification Services Division, O=Thawte Consulting cc, L=Cape Town, ST=Western Cape, C=ZA
+      [certificate is valid from 01/08/96 02:00 to 01/01/21 00:59]
+
+smk     1184 Thu Dec 07 14:48:00 CET 2006 TiddlySaver$2.class
+
+      X.509, CN=UnaMesa, OU=TiddlyWiki, O=UnaMesa, L=Palo Alto, ST=California, C=US (bidix)
+      [certificate is valid from 04/03/10 01:00 to 04/03/12 00:59]
+      X.509, CN=Thawte Code Signing CA, O=Thawte Consulting (Pty) Ltd., C=ZA
+      [certificate is valid from 06/08/03 02:00 to 06/08/13 01:59]
+      [KeyUsage extension does not support code signing]
+      X.509, EMAILADDRESS=premium-server@thawte.com, CN=Thawte Premium Server CA, OU=Certification Services Division, O=Thawte Consulting cc, L=Cape Town, ST=Western Cape, C=ZA
+      [certificate is valid from 01/08/96 02:00 to 01/01/21 00:59]
+
+smk      775 Thu Dec 07 14:48:00 CET 2006 TiddlySaver.class
+
+      X.509, CN=UnaMesa, OU=TiddlyWiki, O=UnaMesa, L=Palo Alto, ST=California, C=US (bidix)
+      [certificate is valid from 04/03/10 01:00 to 04/03/12 00:59]
+      X.509, CN=Thawte Code Signing CA, O=Thawte Consulting (Pty) Ltd., C=ZA
+      [certificate is valid from 06/08/03 02:00 to 06/08/13 01:59]
+      [KeyUsage extension does not support code signing]
+      X.509, EMAILADDRESS=premium-server@thawte.com, CN=Thawte Premium Server CA, OU=Certification Services Division, O=Thawte Consulting cc, L=Cape Town, ST=Western Cape, C=ZA
+      [certificate is valid from 01/08/96 02:00 to 01/01/21 00:59]
+
+
+  s = signature was verified 
+  m = entry is listed in manifest
+  k = at least one certificate was found in keystore
+  i = at least one certificate was found in identity scope
+
+jar verified.
diff --git a/test/data/tiddlywiki/jquery/jquery.js b/test/data/tiddlywiki/jquery/jquery.js
new file mode 100755
index 000000000..628ed9b31
--- /dev/null
+++ b/test/data/tiddlywiki/jquery/jquery.js
@@ -0,0 +1,4 @@
+/*! jQuery v1.6.4 http://jquery.com/ | http://jquery.org/license */
+(function(a,b){function cu(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cr(a){if(!cg[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){ch||(ch=c.createElement("iframe"),ch.frameBorder=ch.width=ch.height=0),b.appendChild(ch);if(!ci||!ch.createElement)ci=(ch.contentWindow||ch.contentDocument).document,ci.write((c.compatMode==="CSS1Compat"?"<!doctype html>":"")+"<html><body>"),ci.close();d=ci.createElement(a),ci.body.appendChild(d),e=f.css(d,"display"),b.removeChild(ch)}cg[a]=e}return cg[a]}function cq(a,b){var c={};f.each(cm.concat.apply([],cm.slice(0,b)),function(){c[this]=a});return c}function cp(){cn=b}function co(){setTimeout(cp,0);return cn=f.now()}function cf(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ce(){try{return new a.XMLHttpRequest}catch(b){}}function b$(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function bZ(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function bY(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bA.test(a)?d(a,e):bY(a+"["+(typeof e=="object"||f.isArray(e)?b:"")+"]",e,c,d)});else if(!c&&b!=null&&typeof b=="object")for(var e in b)bY(a+"["+e+"]",b[e],c,d);else d(a,b)}function bX(a,c){var d,e,g=f.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((g[d]?a:e||(e={}))[d]=c[d]);e&&f.extend(!0,a,e)}function bW(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bP,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=bW(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=bW(a,c,d,e,"*",g));return l}function bV(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bL),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function by(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?bt:bu;if(d>0){c!=="border"&&f.each(e,function(){c||(d-=parseFloat(f.css(a,"padding"+this))||0),c==="margin"?d+=parseFloat(f.css(a,c+this))||0:d-=parseFloat(f.css(a,"border"+this+"Width"))||0});return d+"px"}d=bv(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0,c&&f.each(e,function(){d+=parseFloat(f.css(a,"padding"+this))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+this+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+this))||0)});return d+"px"}function bl(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bd,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bk(a){f.nodeName(a,"input")?bj(a):"getElementsByTagName"in a&&f.grep(a.getElementsByTagName("input"),bj)}function bj(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bi(a){return"getElementsByTagName"in a?a.getElementsByTagName("*"):"querySelectorAll"in a?a.querySelectorAll("*"):[]}function bh(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bg(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c=f.expando,d=f.data(a),e=f.data(b,d);if(d=d[c]){var g=d.events;e=e[c]=f.extend({},d);if(g){delete e.handle,e.events={};for(var h in g)for(var i=0,j=g[h].length;i<j;i++)f.event.add(b,h+(g[h][i].namespace?".":"")+g[h][i].namespace,g[h][i],g[h][i].data)}}}}function bf(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function V(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(Q.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function U(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function M(a,b){return(a&&a!=="*"?a+".":"")+b.replace(y,"`").replace(z,"&")}function L(a){var b,c,d,e,g,h,i,j,k,l,m,n,o,p=[],q=[],r=f._data(this,"events");if(!(a.liveFired===this||!r||!r.live||a.target.disabled||a.button&&a.type==="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var s=r.live.slice(0);for(i=0;i<s.length;i++)g=s[i],g.origType.replace(w,"")===a.type?q.push(g.selector):s.splice(i--,1);e=f(a.target).closest(q,a.currentTarget);for(j=0,k=e.length;j<k;j++){m=e[j];for(i=0;i<s.length;i++){g=s[i];if(m.selector===g.selector&&(!n||n.test(g.namespace))&&!m.elem.disabled){h=m.elem,d=null;if(g.preType==="mouseenter"||g.preType==="mouseleave")a.type=g.preType,d=f(a.relatedTarget).closest(g.selector)[0],d&&f.contains(h,d)&&(d=h);(!d||d!==h)&&p.push({elem:h,handleObj:g,level:m.level})}}}for(j=0,k=p.length;j<k;j++){e=p[j];if(c&&e.level>c)break;a.currentTarget=e.elem,a.data=e.handleObj.data,a.handleObj=e.handleObj,o=e.handleObj.origHandler.apply(e.elem,arguments);if(o===!1||a.isPropagationStopped()){c=e.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function J(a,c,d){var e=f.extend({},d[0]);e.type=a,e.originalEvent={},e.liveFired=b,f.event.handle.call(c,e),e.isDefaultPrevented()&&d[0].preventDefault()}function D(){return!0}function C(){return!1}function m(a,c,d){var e=c+"defer",g=c+"queue",h=c+"mark",i=f.data(a,e,b,!0);i&&(d==="queue"||!f.data(a,g,b,!0))&&(d==="mark"||!f.data(a,h,b,!0))&&setTimeout(function(){!f.data(a,g,b,!0)&&!f.data(a,h,b,!0)&&(f.removeData(a,e,!0),i.resolve())},0)}function l(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function k(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(j,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNaN(d)?i.test(d)?f.parseJSON(d):d:parseFloat(d)}catch(g){}f.data(a,c,d)}else d=b}return d}var c=a.document,d=a.navigator,e=a.location,f=function(){function K(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(K,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/\d/,n=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,o=/^[\],:{}\s]*$/,p=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,q=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,r=/(?:^|:|,)(?:\s*\[)+/g,s=/(webkit)[ \/]([\w.]+)/,t=/(opera)(?:.*version)?[ \/]([\w.]+)/,u=/(msie) ([\w.]+)/,v=/(mozilla)(?:.*? rv:([\w.]+))?/,w=/-([a-z]|[0-9])/ig,x=/^-ms-/,y=function(a,b){return(b+"").toUpperCase()},z=d.userAgent,A,B,C,D=Object.prototype.toString,E=Object.prototype.hasOwnProperty,F=Array.prototype.push,G=Array.prototype.slice,H=String.prototype.trim,I=Array.prototype.indexOf,J={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=n.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.6.4",length:0,size:function(){return this.length},toArray:function(){return G.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?F.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),B.done(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(G.apply(this,arguments),"slice",G.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:F,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;B.resolveWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!B){B=e._Deferred();if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",C,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",C),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&K()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNaN:function(a){return a==null||!m.test(a)||isNaN(a)},type:function(a){return a==null?String(a):J[D.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!E.call(a,"constructor")&&!E.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||E.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(o.test(b.replace(p,"@").replace(q,"]").replace(r,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(x,"ms-").replace(w,y)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:H?function(a){return a==null?"":H.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?F.call(c,a):e.merge(c,a)}return c},inArray:function(a,b){if(!b)return-1;if(I)return I.call(b,a);for(var c=0,d=b.length;c<d;c++)if(b[c]===a)return c;return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=G.call(arguments,2),g=function(){return a.apply(c,f.concat(G.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h){var i=a.length;if(typeof c=="object"){for(var j in c)e.access(a,j,c[j],f,g,d);return a}if(d!==b){f=!h&&f&&e.isFunction(d);for(var k=0;k<i;k++)g(a[k],c,f?d.call(a[k],k,g(a[k],c)):d,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=s.exec(a)||t.exec(a)||u.exec(a)||a.indexOf("compatible")<0&&v.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){J["[object "+b+"]"]=b.toLowerCase()}),A=e.uaMatch(z),A.browser&&(e.browser[A.browser]=!0,e.browser.version=A.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?C=function(){c.removeEventListener("DOMContentLoaded",C,!1),e.ready()}:c.attachEvent&&(C=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",C),e.ready())});return e}(),g="done fail isResolved isRejected promise then always pipe".split(" "),h=[].slice;f.extend({_Deferred:function(){var a=[],b,c,d,e={done:function(){if(!d){var c=arguments,g,h,i,j,k;b&&(k=b,b=0);for(g=0,h=c.length;g<h;g++)i=c[g],j=f.type(i),j==="array"?e.done.apply(e,i):j==="function"&&a.push(i);k&&e.resolveWith(k[0],k[1])}return this},resolveWith:function(e,f){if(!d&&!b&&!c){f=f||[],c=1;try{while(a[0])a.shift().apply(e,f)}finally{b=[e,f],c=0}}return this},resolve:function(){e.resolveWith(this,arguments);return this},isResolved:function(){return!!c||!!b},cancel:function(){d=1,a=[];return this}};return e},Deferred:function(a){var b=f._Deferred(),c=f._Deferred(),d;f.extend(b,{then:function(a,c){b.done(a).fail(c);return this},always:function(){return b.done.apply(b,arguments).fail.apply(this,arguments)},fail:c.done,rejectWith:c.resolveWith,reject:c.resolve,isRejected:c.isResolved,pipe:function(a,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[c,"reject"]},function(a,c){var e=c[0],g=c[1],h;f.isFunction(e)?b[a](function(){h=e.apply(this,arguments),h&&f.isFunction(h.promise)?h.promise().then(d.resolve,d.reject):d[g+"With"](this===b?d:this,[h])}):b[a](d[g])})}).promise()},promise:function(a){if(a==null){if(d)return d;d=a={}}var c=g.length;while(c--)a[g[c]]=b[g[c]];return a}}),b.done(c.cancel).fail(b.cancel),delete b.cancel,a&&a.call(b,b);return b},when:function(a){function i(a){return function(c){b[a]=arguments.length>1?h.call(arguments,0):c,--e||g.resolveWith(g,h.call(b,0))}}var b=arguments,c=0,d=b.length,e=d,g=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred();if(d>1){for(;c<d;c++)b[c]&&f.isFunction(b[c].promise)?b[c].promise().then(i(c),g.reject):--e;e||g.resolveWith(g,b)}else g!==a&&g.resolveWith(g,d?[a]:[]);return g.promise()}}),f.support=function(){var a=c.createElement("div"),b=c.documentElement,d,e,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u;a.setAttribute("className","t"),a.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=a.getElementsByTagName("*"),e=a.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=a.getElementsByTagName("input")[0],k={leadingWhitespace:a.firstChild.nodeType===3,tbody:!a.getElementsByTagName("tbody").length,htmlSerialize:!!a.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55$/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:a.className!=="t",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,k.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,k.optDisabled=!h.disabled;try{delete a.test}catch(v){k.deleteExpando=!1}!a.addEventListener&&a.attachEvent&&a.fireEvent&&(a.attachEvent("onclick",function(){k.noCloneEvent=!1}),a.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),k.radioValue=i.value==="t",i.setAttribute("checked","checked"),a.appendChild(i),l=c.createDocumentFragment(),l.appendChild(a.firstChild),k.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,a.innerHTML="",a.style.width=a.style.paddingLeft="1px",m=c.getElementsByTagName("body")[0],o=c.createElement(m?"div":"body"),p={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"},m&&f.extend(p,{position:"absolute",left:"-1000px",top:"-1000px"});for(t in p)o.style[t]=p[t];o.appendChild(a),n=m||b,n.insertBefore(o,n.firstChild),k.appendChecked=i.checked,k.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,k.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="<div style='width:4px;'></div>",k.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>",q=a.getElementsByTagName("td"),u=q[0].offsetHeight===0,q[0].style.display="",q[1].style.display="none",k.reliableHiddenOffsets=u&&q[0].offsetHeight===0,a.innerHTML="",c.defaultView&&c.defaultView.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",a.appendChild(j),k.reliableMarginRight=(parseInt((c.defaultView.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0),o.innerHTML="",n.removeChild(o);if(a.attachEvent)for(t in{submit:1,change:1,focusin:1})s="on"+t,u=s in a,u||(a.setAttribute(s,"return;"),u=typeof a[s]=="function"),k[t+"Bubbles"]=u;o=l=g=h=m=j=a=i=null;return k}(),f.boxModel=f.support.boxModel;var i=/^(?:\{.*\}|\[.*\])$/,j=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!l(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i=f.expando,j=typeof c=="string",k=a.nodeType,l=k?f.cache:a,m=k?a[f.expando]:a[f.expando]&&f.expando;if((!m||e&&m&&l[m]&&!l[m][i])&&j&&d===b)return;m||(k?a[f.expando]=m=++f.uuid:m=f.expando),l[m]||(l[m]={},k||(l[m].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?l[m][i]=f.extend(l[m][i],c):l[m]=f.extend(l[m],c);g=l[m],e&&(g[i]||(g[i]={}),g=g[i]),d!==b&&(g[f.camelCase(c)]=d);if(c==="events"&&!g[c])return g[i]&&g[i].events;j?(h=g[c],h==null&&(h=g[f.camelCase(c)])):h=g;return h}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e=f.expando,g=a.nodeType,h=g?f.cache:a,i=g?a[f.expando]:f.expando;if(!h[i])return;if(b){d=c?h[i][e]:h[i];if(d){d[b]||(b=f.camelCase(b)),delete d[b];if(!l(d))return}}if(c){delete h[i][e];if(!l(h[i]))return}var j=h[i][e];f.support.deleteExpando||!h.setInterval?delete h[i]:h[i]=null,j?(h[i]={},g||(h[i].toJSON=f.noop),h[i][e]=j):g&&(f.support.deleteExpando?delete a[f.expando]:a.removeAttribute?a.removeAttribute(f.expando):a[f.expando]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d=null;if(typeof a=="undefined"){if(this.length){d=f.data(this[0]);if(this[0].nodeType===1){var e=this[0].attributes,g;for(var h=0,i=e.length;h<i;h++)g=e[h].name,g.indexOf("data-")===0&&(g=f.camelCase(g.substring(5)),k(this[0],g,d[g]))}}return d}if(typeof a=="object")return this.each(function(){f.data(this,a)});var j=a.split(".");j[1]=j[1]?"."+j[1]:"";if(c===b){d=this.triggerHandler("getData"+j[1]+"!",[j[0]]),d===b&&this.length&&(d=f.data(this[0],a),d=k(this[0],a,d));return d===b&&j[1]?this.data(j[0]):d}return this.each(function(){var b=f(this),d=[j[0],c];b.triggerHandler("setData"+j[1]+"!",d),f.data(this,a,c),b.triggerHandler("changeData"+j[1]+"!",d)})},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,c){a&&(c=(c||"fx")+"mark",f.data(a,c,(f.data(a,c,b,!0)||0)+1,!0))},_unmark:function(a,c,d){a!==!0&&(d=c,c=a,a=!1);if(c){d=d||"fx";var e=d+"mark",g=a?0:(f.data(c,e,b,!0)||1)-1;g?f.data(c,e,g,!0):(f.removeData(c,e,!0),m(c,d,"mark"))}},queue:function(a,c,d){if(a){c=(c||"fx")+"queue";var e=f.data(a,c,b,!0);d&&(!e||f.isArray(d)?e=f.data(a,c,f.makeArray(d),!0):e.push(d));return e||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e;d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),d.call(a,function(){f.dequeue(a,b)})),c.length||(f.removeData(a,b+"queue",!0),m(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){typeof a!="string"&&(c=a,a="fx");if(c===b)return f.queue(this[0],a);return this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(){var c=this;setTimeout(function(){f.dequeue(c,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f._Deferred(),!0))h++,l.done(m);m();return d.promise()}});var n=/[\n\t\r]/g,o=/\s+/,p=/\r/g,q=/^(?:button|input)$/i,r=/^(?:button|input|object|select|textarea)$/i,s=/^a(?:rea)?$/i,t=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,u,v;f.fn.extend({attr:function(a,b){return f.access(this,a,b,!0,f.attr)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,a,b,!0,f.prop)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(o);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(o);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(n," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(o);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ";for(var c=0,d=this.length;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(n," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e=this[0];if(!arguments.length){if(e){c=f.valHooks[e.nodeName.toLowerCase()]||f.valHooks[e.type];if(c&&"get"in c&&(d=c.get(e,"value"))!==b)return d;d=e.value;return typeof d=="string"?d.replace(p,""):d==null?"":d}return b}var g=f.isFunction(a);return this.each(function(d){var e=f(this),h;if(this.nodeType===1){g?h=a.call(this,d,e.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c=a.selectedIndex,d=[],e=a.options,g=a.type==="select-one";if(c<0)return null;for(var h=g?c:0,i=g?c+1:e.length;h<i;h++){var j=e[h];if(j.selected&&(f.support.optDisabled?!j.disabled:j.getAttribute("disabled")===null)&&(!j.parentNode.disabled||!f.nodeName(j.parentNode,"optgroup"))){b=f(j).val();if(g)return b;d.push(b)}}if(g&&!d.length&&e.length)return f(e[c]).val();return d},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attrFix:{tabindex:"tabIndex"},attr:function(a,c,d,e){var g=a.nodeType;if(!a||g===3||g===8||g===2)return b;if(e&&c in f.attrFn)return f(a)[c](d);if(!("getAttribute"in a))return f.prop(a,c,d);var h,i,j=g!==1||!f.isXMLDoc(a);j&&(c=f.attrFix[c]||c,i=f.attrHooks[c],i||(t.test(c)?i=v:u&&(i=u)));if(d!==b){if(d===null){f.removeAttr(a,c);return b}if(i&&"set"in i&&j&&(h=i.set(a,d,c))!==b)return h;a.setAttribute(c,""+d);return d}if(i&&"get"in i&&j&&(h=i.get(a,c))!==null)return h;h=a.getAttribute(c);return h===null?b:h},removeAttr:function(a,b){var c;a.nodeType===1&&(b=f.attrFix[b]||b,f.attr(a,b,""),a.removeAttribute(b),t.test(b)&&(c=f.propFix[b]||b)in a&&(a[c]=!1))},attrHooks:{type:{set:function(a,b){if(q.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},value:{get:function(a,b){if(u&&f.nodeName(a,"button"))return u.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(u&&f.nodeName(a,"button"))return u.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e=a.nodeType;if(!a||e===3||e===8||e===2)return b;var g,h,i=e!==1||!f.isXMLDoc(a);i&&(c=f.propFix[c]||c,h=f.propHooks[c]);return d!==b?h&&"set"in h&&(g=h.set(a,d,c))!==b?g:a[c]=d:h&&"get"in h&&(g=h.get(a,c))!==null?g:a[c]},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):r.test(a.nodeName)||s.test(a.nodeName)&&a.href?0:b}}}}),f.attrHooks.tabIndex=f.propHooks.tabIndex,v={get:function(a,c){var d;return f.prop(a,c)===!0||(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},f.support.getSetAttribute||(u=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&d.nodeValue!==""?d.nodeValue:b},set:function(a,b,d){var e=a.getAttributeNode(d);e||(e=c.createAttribute(d),a.setAttributeNode(e));return e.nodeValue=b+""}},f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})})),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex);return null}})),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var w=/\.(.*)$/,x=/^(?:textarea|input|select)$/i,y=/\./g,z=/ /g,A=/[^\w\s.|`]/g,B=function(a){return a.replace(A,"\\$&")};f.event={add:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){if(d===!1)d=C;else if(!d)return;var g,h;d.handler&&(g=d,d=g.handler),d.guid||(d.guid=f.guid++);var i=f._data(a);if(!i)return;var j=i.events,k=i.handle;j||(i.events=j={}),k||(i.handle=k=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.handle.apply(k.elem,arguments):b}),k.elem=a,c=c.split(" ");var l,m=0,n;while(l=c[m++]){h=g?f.extend({},g):{handler:d,data:e},l.indexOf(".")>-1?(n=l.split("."),l=n.shift(),h.namespace=n.slice(0).sort().join(".")):(n=[],h.namespace=""),h.type=l,h.guid||(h.guid=d.guid);var o=j[l],p=f.event.special[l]||{};if(!o){o=j[l]=[];if(!p.setup||p.setup.call(a,e,n,k)===!1)a.addEventListener?a.addEventListener(l,k,!1):a.attachEvent&&a.attachEvent("on"+l,k)}p.add&&(p.add.call(a,h),h.handler.guid||(h.handler.guid=d.guid)),o.push(h),f.event.global[l]=!0}a=null}},global:{},remove:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){d===!1&&(d=C);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=f.hasData(a)&&f._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(d=c.handler,c=c.type);if(!c||typeof c=="string"&&c.charAt(0)==="."){c=c||"";for(h in t)f.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+f.map(m.slice(0).sort(),B).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!d){for(j=0;j<p.length;j++){q=p[j];if(l||n.test(q.namespace))f.event.remove(a,r,q.handler,j),p.splice(j--,1)}continue}o=f.event.special[h]||{};for(j=e||0;j<p.length;j++){q=p[j];if(d.guid===q.guid){if(l||n.test(q.namespace))e==null&&p.splice(j--,1),o.remove&&o.remove.call(a,q);if(e!=null)break}}if(p.length===0||e!=null&&p.length===1)(!o.teardown||o.teardown.call(a,m)===!1)&&f.removeEvent(a,h,s.handle),g=null,delete 
+t[h]}if(f.isEmptyObject(t)){var u=s.handle;u&&(u.elem=null),delete s.events,delete s.handle,f.isEmptyObject(s)&&f.removeData(a,b,!0)}}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){var h=c.type||c,i=[],j;h.indexOf("!")>=0&&(h=h.slice(0,-1),j=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if(!!e&&!f.event.customEvent[h]||!!f.event.global[h]){c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.exclusive=j,c.namespace=i.join("."),c.namespace_re=new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)");if(g||!e)c.preventDefault(),c.stopPropagation();if(!e){f.each(f.cache,function(){var a=f.expando,b=this[a];b&&b.events&&b.events[h]&&f.event.trigger(c,d,b.handle.elem)});return}if(e.nodeType===3||e.nodeType===8)return;c.result=b,c.target=e,d=d!=null?f.makeArray(d):[],d.unshift(c);var k=e,l=h.indexOf(":")<0?"on"+h:"";do{var m=f._data(k,"handle");c.currentTarget=k,m&&m.apply(k,d),l&&f.acceptData(k)&&k[l]&&k[l].apply(k,d)===!1&&(c.result=!1,c.preventDefault()),k=k.parentNode||k.ownerDocument||k===c.target.ownerDocument&&a}while(k&&!c.isPropagationStopped());if(!c.isDefaultPrevented()){var n,o=f.event.special[h]||{};if((!o._default||o._default.call(e.ownerDocument,c)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)){try{l&&e[h]&&(n=e[l],n&&(e[l]=null),f.event.triggered=h,e[h]())}catch(p){}n&&(e[l]=n),f.event.triggered=b}}return c.result}},handle:function(c){c=f.event.fix(c||a.event);var d=((f._data(this,"events")||{})[c.type]||[]).slice(0),e=!c.exclusive&&!c.namespace,g=Array.prototype.slice.call(arguments,0);g[0]=c,c.currentTarget=this;for(var h=0,i=d.length;h<i;h++){var j=d[h];if(e||c.namespace_re.test(j.namespace)){c.handler=j.handler,c.data=j.data,c.handleObj=j;var k=j.handler.apply(this,g);k!==b&&(c.result=k,k===!1&&(c.preventDefault(),c.stopPropagation()));if(c.isImmediatePropagationStopped())break}}return c.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(a){if(a[f.expando])return a;var d=a;a=f.Event(d);for(var e=this.props.length,g;e;)g=this.props[--e],a[g]=d[g];a.target||(a.target=a.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),!a.relatedTarget&&a.fromElement&&(a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement);if(a.pageX==null&&a.clientX!=null){var h=a.target.ownerDocument||c,i=h.documentElement,j=h.body;a.pageX=a.clientX+(i&&i.scrollLeft||j&&j.scrollLeft||0)-(i&&i.clientLeft||j&&j.clientLeft||0),a.pageY=a.clientY+(i&&i.scrollTop||j&&j.scrollTop||0)-(i&&i.clientTop||j&&j.clientTop||0)}a.which==null&&(a.charCode!=null||a.keyCode!=null)&&(a.which=a.charCode!=null?a.charCode:a.keyCode),!a.metaKey&&a.ctrlKey&&(a.metaKey=a.ctrlKey),!a.which&&a.button!==b&&(a.which=a.button&1?1:a.button&2?3:a.button&4?2:0);return a},guid:1e8,proxy:f.proxy,special:{ready:{setup:f.bindReady,teardown:f.noop},live:{add:function(a){f.event.add(this,M(a.origType,a.selector),f.extend({},a,{handler:L,guid:a.handler.guid}))},remove:function(a){f.event.remove(this,M(a.origType,a.selector),a)}},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}}},f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!this.preventDefault)return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?D:C):this.type=a,b&&f.extend(this,b),this.timeStamp=f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=D;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=D;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=D,this.stopPropagation()},isDefaultPrevented:C,isPropagationStopped:C,isImmediatePropagationStopped:C};var E=function(a){var b=a.relatedTarget,c=!1,d=a.type;a.type=a.data,b!==this&&(b&&(c=f.contains(this,b)),c||(f.event.handle.apply(this,arguments),a.type=d))},F=function(a){a.type=a.data,f.event.handle.apply(this,arguments)};f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={setup:function(c){f.event.add(this,b,c&&c.selector?F:E,a)},teardown:function(a){f.event.remove(this,b,a&&a.selector?F:E)}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(a,b){if(!f.nodeName(this,"form"))f.event.add(this,"click.specialSubmit",function(a){var b=a.target,c=f.nodeName(b,"input")||f.nodeName(b,"button")?b.type:"";(c==="submit"||c==="image")&&f(b).closest("form").length&&J("submit",this,arguments)}),f.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,c=f.nodeName(b,"input")||f.nodeName(b,"button")?b.type:"";(c==="text"||c==="password")&&f(b).closest("form").length&&a.keyCode===13&&J("submit",this,arguments)});else return!1},teardown:function(a){f.event.remove(this,".specialSubmit")}});if(!f.support.changeBubbles){var G,H=function(a){var b=f.nodeName(a,"input")?a.type:"",c=a.value;b==="radio"||b==="checkbox"?c=a.checked:b==="select-multiple"?c=a.selectedIndex>-1?f.map(a.options,function(a){return a.selected}).join("-"):"":f.nodeName(a,"select")&&(c=a.selectedIndex);return c},I=function(c){var d=c.target,e,g;if(!!x.test(d.nodeName)&&!d.readOnly){e=f._data(d,"_change_data"),g=H(d),(c.type!=="focusout"||d.type!=="radio")&&f._data(d,"_change_data",g);if(e===b||g===e)return;if(e!=null||g)c.type="change",c.liveFired=b,f.event.trigger(c,arguments[1],d)}};f.event.special.change={filters:{focusout:I,beforedeactivate:I,click:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(c==="radio"||c==="checkbox"||f.nodeName(b,"select"))&&I.call(this,a)},keydown:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(a.keyCode===13&&!f.nodeName(b,"textarea")||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&I.call(this,a)},beforeactivate:function(a){var b=a.target;f._data(b,"_change_data",H(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in G)f.event.add(this,c+".specialChange",G[c]);return x.test(this.nodeName)},teardown:function(a){f.event.remove(this,".specialChange");return x.test(this.nodeName)}},G=f.event.special.change.filters,G.focus=G.beforeactivate}f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){function e(a){var c=f.event.fix(a);c.type=b,c.originalEvent={},f.event.trigger(c,null,c.target),c.isDefaultPrevented()&&a.preventDefault()}var d=0;f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.each(["bind","one"],function(a,c){f.fn[c]=function(a,d,e){var g;if(typeof a=="object"){for(var h in a)this[c](h,d,a[h],e);return this}if(arguments.length===2||d===!1)e=d,d=b;c==="one"?(g=function(a){f(this).unbind(a,g);return e.apply(this,arguments)},g.guid=e.guid||f.guid++):g=e;if(a==="unload"&&c!=="one")this.one(a,d,e);else for(var i=0,j=this.length;i<j;i++)f.event.add(this[i],a,g,d);return this}}),f.fn.extend({unbind:function(a,b){if(typeof a=="object"&&!a.preventDefault)for(var c in a)this.unbind(c,a[c]);else for(var d=0,e=this.length;d<e;d++)f.event.remove(this[d],a,b);return this},delegate:function(a,b,c,d){return this.live(b,c,d,a)},undelegate:function(a,b,c){return arguments.length===0?this.unbind("live"):this.die(b,null,c,a)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f.data(this,"lastToggle"+a.guid)||0)%d;f.data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var K={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};f.each(["live","die"],function(a,c){f.fn[c]=function(a,d,e,g){var h,i=0,j,k,l,m=g||this.selector,n=g?this:f(this.context);if(typeof a=="object"&&!a.preventDefault){for(var o in a)n[c](o,d,a[o],m);return this}if(c==="die"&&!a&&g&&g.charAt(0)==="."){n.unbind(g);return this}if(d===!1||f.isFunction(d))e=d||C,d=b;a=(a||"").split(" ");while((h=a[i++])!=null){j=w.exec(h),k="",j&&(k=j[0],h=h.replace(w,""));if(h==="hover"){a.push("mouseenter"+k,"mouseleave"+k);continue}l=h,K[h]?(a.push(K[h]+k),h=h+k):h=(K[h]||h)+k;if(c==="live")for(var p=0,q=n.length;p<q;p++)f.event.add(n[p],"live."+M(h,m),{data:d,selector:m,handler:e,origType:h,origHandler:e,preType:l});else n.unbind("live."+M(h,m),e)}return this}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.bind(b,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}if(i.nodeType===1){f||(i.sizcache=c,i.sizset=g);if(typeof b!="string"){if(i===b){j=!0;break}}else if(k.filter(b,[i]).length>0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}i.nodeType===1&&!f&&(i.sizcache=c,i.sizset=g);if(i.nodeName.toLowerCase()===b){j=i;break}i=i[a]}d[g]=j}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d=0,e=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,f,g){f=f||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return f;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(e.call(n)==="[object Array]")if(!u)f.push.apply(f,n);else if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&f.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&f.push(j[t]);else p(n,f);o&&(k(o,h,f,g),k.uniqueSort(f));return f};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},k.matches=function(a,b){return k(a,null,null,b)},k.matchesSelector=function(a,b){return k(b,null,null,[a]).length>0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e<f;e++){var g,h=l.order[e];if(g=l.leftMatch[h].exec(a)){var j=g[1];g.splice(1,1);if(j.substr(j.length-1)!=="\\"){g[1]=(g[1]||"").replace(i,""),d=l.find[h](g,b,c);if(d!=null){a=a.replace(l.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},k.filter=function(a,c,d,e){var f,g,h=a,i=[],j=c,m=c&&c[0]&&k.isXML(c[0]);while(a&&c.length){for(var n in l.filter)if((f=l.leftMatch[n].exec(a))!=null&&f[2]){var o,p,q=l.filter[n],r=f[1];g=!1,f.splice(1,1);if(r.substr(r.length-1)==="\\")continue;j===i&&(i=[]);if(l.preFilter[n]){f=l.preFilter[n](f,j,d,i,e,m);if(!f)g=o=!0;else if(f===!0)continue}if(f)for(var s=0;(p=j[s])!=null;s++)if(p){o=q(p,f,s,j);var t=e^!!o;d&&o!=null?t?g=!0:j[s]=!1:t&&(i.push(p),g=!0)}if(o!==b){d||(j=i),a=a.replace(l.match[n],"");if(!g)return[];break}}if(a===h)if(g==null)k.error(a);else break;h=a}return j},k.error=function(a){throw"Syntax error, unrecognized expression: "+a};var l=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!j.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&k.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&k.filter(b,a,!0)}},"":function(a,b,c){var e,f=d++,g=u;typeof b=="string"&&!j.test(b)&&(b=b.toLowerCase(),e=b,g=t),g("parentNode",b,f,a,e,c)},"~":function(a,b,c){var e,f=d++,g=u;typeof b=="string"&&!j.test(b)&&(b=b.toLowerCase(),e=b,g=t),g("previousSibling",b,f,a,e,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(i,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=d++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}k.error(e)},CHILD:function(a,b){var c=b[1],d=a;switch(c){case"only":case"first":while(d=d.previousSibling)if(d.nodeType===1)return!1;if(c==="first")return!0;d=a;case"last":while(d=d.nextSibling)if(d.nodeType===1)return!1;return!0;case"nth":var e=b[2],f=b[3];if(e===1&&f===0)return!0;var g=b[0],h=a.parentNode;if(h&&(h.sizcache!==g||!a.nodeIndex)){var i=0;for(d=h.firstChild;d;d=d.nextSibling)d.nodeType===1&&(d.nodeIndex=++i);h.sizcache=g}var j=a.nodeIndex-f;return e===0?j===0:j%e===0&&j/e>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(e.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var f=a.length;c<f;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var r,s;c.documentElement.compareDocumentPosition?r=function(a,b){if(a===b){g=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(r=function(a,b){if(a===b){g=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],h=a.parentNode,i=b.parentNode,j=h;if(h===i)return s(a,b);if(!h)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return s(e[k],f[k]);return k===c?s(a,f[k],-1):s(e[k],b,1)},s=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),k.getText=function(a){var b="",c;for(var d=0;a[d];d++)c=a[d],c.nodeType===3||c.nodeType===4?b+=c.nodeValue:c.nodeType!==8&&(b+=k.getText(c.childNodes));return b},function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(e||!l.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return k(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g<h;g++)k(a,f[g],d);return k.filter(e,d)};f.find=k,f.expr=k.selectors,f.expr[":"]=f.expr.filters,f.unique=k.uniqueSort,f.text=k.getText,f.isXMLDoc=k.isXML,f.contains=k.contains}();var N=/Until$/,O=/^(?:parents|prevUntil|prevAll)/,P=/,/,Q=/^.[^:#\[\.,]*$/,R=Array.prototype.slice,S=f.expr.match.POS,T={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(V(this,a,!1),"not",a)},filter:function(a){return this.pushStack(V(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(d=0,e=a.length;d<e;d++)i=a[d],j[i]||(j[i]=S.test(i)?f(i,b||this.context):i);while(g&&g.ownerDocument&&g!==b){for(i in j)h=j[i],(h.jquery?h.index(g)>-1:f(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=S.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(l?l.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(U(c[0])||U(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c),g=R.call(arguments);N.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!T[a]?f.unique(e):e,(this.length>1||P.test(d))&&O.test(a)&&(e=e.reverse());return this.pushStack(e,a,g.join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/<tbody/i,_=/<|&#?\w+;/,ba=/<(?:script|object|embed|option|style)/i,bb=/checked\s*(?:[^=]|=\s*.checked.)/i,bc=/\/(java|ecma)script/i,bd=/^\s*<!(?:\[CDATA\[|\-\-)/,be={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};be.optgroup=be.option,be.tbody=be.tfoot=be.colgroup=be.caption=be.thead,be.th=be.td,f.support.htmlSerialize||(be._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){f(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!be[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1></$2>");try{for(var c=0,d=this.length;c<d;c++)this[c].nodeType===1&&(f.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(e){this.empty().append(a)}}else f.isFunction(a)?this.each(function(b){var c=f(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bb.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bf(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,bl)}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i;b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof a[0]=="string"&&a[0].length<512&&i===c&&a[0].charAt(0)==="<"&&!ba.test(a[0])&&(f.support.checkClone||!bb.test(a[0]))&&(g=!0,h=f.fragments[a[0]],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean
+(a,i,e,d)),g&&(f.fragments[a[0]]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d=a.cloneNode(!0),e,g,h;if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bh(a,d),e=bi(a),g=bi(d);for(h=0;e[h];++h)g[h]&&bh(e[h],g[h])}if(b){bg(a,d);if(c){e=bi(a),g=bi(d);for(h=0;e[h];++h)bg(e[h],g[h])}}e=g=null;return d},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1></$2>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=be[l]||be._default,n=m[0],o=b.createElement("div");o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]==="<table>"&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i<r;i++)bk(k[i]);else bk(k);k.nodeType?h.push(k):h=f.merge(h,k)}if(d){g=function(a){return!a.type||bc.test(a.type)};for(j=0;h[j];j++)if(e&&f.nodeName(h[j],"script")&&(!h[j].type||h[j].type.toLowerCase()==="text/javascript"))e.push(h[j].parentNode?h[j].parentNode.removeChild(h[j]):h[j]);else{if(h[j].nodeType===1){var s=f.grep(h[j].getElementsByTagName("script"),g);h.splice.apply(h,[j+1,0].concat(s))}d.appendChild(h[j])}}return h},cleanData:function(a){var b,c,d=f.cache,e=f.expando,g=f.event.special,h=f.support.deleteExpando;for(var i=0,j;(j=a[i])!=null;i++){if(j.nodeName&&f.noData[j.nodeName.toLowerCase()])continue;c=j[f.expando];if(c){b=d[c]&&d[c][e];if(b&&b.events){for(var k in b.events)g[k]?f.event.remove(j,k):f.removeEvent(j,k,b.handle);b.handle&&(b.handle.elem=null)}h?delete j[f.expando]:j.removeAttribute&&j.removeAttribute(f.expando),delete d[c]}}}});var bm=/alpha\([^)]*\)/i,bn=/opacity=([^)]*)/,bo=/([A-Z]|^ms)/g,bp=/^-?\d+(?:px)?$/i,bq=/^-?\d/,br=/^([\-+])=([\-+.\de]+)/,bs={position:"absolute",visibility:"hidden",display:"block"},bt=["Left","Right"],bu=["Top","Bottom"],bv,bw,bx;f.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return f.access(this,a,c,!0,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)})},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bv(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d,h==="string"&&(g=br.exec(d))&&(d=+(g[1]+1)*+g[2]+parseFloat(f.css(a,c)),h="number");if(d==null||h==="number"&&isNaN(d))return;h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(bv)return bv(a,c)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]}}),f.curCSS=f.css,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){var e;if(c){if(a.offsetWidth!==0)return by(a,b,d);f.swap(a,bs,function(){e=by(a,b,d)});return e}},set:function(a,b){if(!bp.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bn.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNaN(b)?"":"alpha(opacity="+b*100+")",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bm,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bm.test(g)?g.replace(bm,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bv(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bw=function(a,c){var d,e,g;c=c.replace(bo,"-$1").toLowerCase();if(!(e=a.ownerDocument.defaultView))return b;if(g=e.getComputedStyle(a,null))d=g.getPropertyValue(c),d===""&&!f.contains(a.ownerDocument.documentElement,a)&&(d=f.style(a,c));return d}),c.documentElement.currentStyle&&(bx=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bp.test(d)&&bq.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bv=bw||bx,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bz=/%20/g,bA=/\[\]$/,bB=/\r?\n/g,bC=/#.*$/,bD=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bE=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bF=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bG=/^(?:GET|HEAD)$/,bH=/^\/\//,bI=/\?/,bJ=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bK=/^(?:select|textarea)/i,bL=/\s+/,bM=/([?&])_=[^&]*/,bN=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bO=f.fn.load,bP={},bQ={},bR,bS,bT=["*/"]+["*"];try{bR=e.href}catch(bU){bR=c.createElement("a"),bR.href="",bR=bR.href}bS=bN.exec(bR.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bO)return bO.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bJ,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bK.test(this.nodeName)||bE.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bB,"\r\n")}}):{name:b.name,value:c.replace(bB,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.bind(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?bX(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),bX(a,b);return a},ajaxSettings:{url:bR,isLocal:bF.test(bS[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bT},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bV(bP),ajaxTransport:bV(bQ),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?bZ(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=b$(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.resolveWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f._Deferred(),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bD.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.done,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bC,"").replace(bH,bS[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bL),d.crossDomain==null&&(r=bN.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bS[1]&&r[2]==bS[2]&&(r[3]||(r[1]==="http:"?80:443))==(bS[3]||(bS[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),bW(bP,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bG.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bI.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bM,"$1_="+x);d.url=y+(y===d.url?(bI.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bT+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=bW(bQ,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){s<2?w(-1,z):f.error(z)}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)bY(g,a[g],c,e);return d.join("&").replace(bz,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var b_=f.now(),ca=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+b_++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ca.test(b.url)||e&&ca.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ca,l),b.url===j&&(e&&(k=k.replace(ca,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cb=a.ActiveXObject?function(){for(var a in cd)cd[a](0,1)}:!1,cc=0,cd;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ce()||cf()}:ce,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cb&&delete cd[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cc,cb&&(cd||(cd={},f(a).unload(cb)),cd[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cg={},ch,ci,cj=/^(?:toggle|show|hide)$/,ck=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cl,cm=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cn;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cq("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),e===""&&f.css(d,"display")==="none"&&f._data(d,"olddisplay",cr(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cq("hide",3),a,b,c);for(var d=0,e=this.length;d<e;d++)if(this[d].style){var g=f.css(this[d],"display");g!=="none"&&!f._data(this[d],"olddisplay")&&f._data(this[d],"olddisplay",g)}for(d=0;d<e;d++)this[d].style&&(this[d].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(cq("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return this[e.queue===!1?"each":"queue"](function(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]),h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(f.support.inlineBlockNeedsLayout?(j=cr(this.nodeName),j==="inline"?this.style.display="inline-block":(this.style.display="inline",this.style.zoom=1)):this.style.display="inline-block"))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)k=new f.fx(this,b,i),h=a[i],cj.test(h)?k[h==="toggle"?d?"show":"hide":h]():(l=ck.exec(h),m=k.cur(),l?(n=parseFloat(l[2]),o=l[3]||(f.cssNumber[i]?"":"px"),o!=="px"&&(f.style(this,i,(n||1)+o),m=(n||1)/k.cur()*m,f.style(this,i,m+o)),l[1]&&(n=(l[1]==="-="?-1:1)*n+m),k.custom(m,n,o)):k.custom(m,h,""));return!0})},stop:function(a,b){a&&this.queue([]),this.each(function(){var a=f.timers,c=a.length;b||f._unmark(!0,this);while(c--)a[c].elem===this&&(b&&a[c](!0),a.splice(c,1))}),b||this.dequeue();return this}}),f.each({slideDown:cq("show",1),slideUp:cq("hide",1),slideToggle:cq("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default,d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue!==!1?f.dequeue(this):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,b,c){function g(a){return d.step(a)}var d=this,e=f.fx;this.startTime=cn||co(),this.start=a,this.end=b,this.unit=c||this.unit||(f.cssNumber[this.prop]?"":"px"),this.now=this.start,this.pos=this.state=0,g.elem=this.elem,g()&&f.timers.push(g)&&!cl&&(cl=setInterval(e.tick,e.interval))},show:function(){this.options.orig[this.prop]=f.style(this.elem,this.prop),this.options.show=!0,this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b=cn||co(),c=!0,d=this.elem,e=this.options,g,h;if(a||b>=e.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),e.animatedProperties[this.prop]=!0;for(g in e.animatedProperties)e.animatedProperties[g]!==!0&&(c=!1);if(c){e.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){d.style["overflow"+b]=e.overflow[a]}),e.hide&&f(d).hide();if(e.hide||e.show)for(var i in e.animatedProperties)f.style(d,i,e.orig[i]);e.complete.call(d)}return!1}e.duration==Infinity?this.now=b:(h=b-this.startTime,this.state=h/e.duration,this.pos=f.easing[e.animatedProperties[this.prop]](this.state,h,0,1,e.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){for(var a=f.timers,b=0;b<a.length;++b)a[b]()||a.splice(b--,1);a.length||f.fx.stop()},interval:13,stop:function(){clearInterval(cl),cl=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit:a.elem[a.prop]=a.now}}}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var cs=/^t(?:able|d|h)$/i,ct=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?f.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(d){}var e=b.ownerDocument,g=e.documentElement;if(!c||!f.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=e.body,i=cu(e),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||f.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||f.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:f.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);f.offset.initialize();var c,d=b.offsetParent,e=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(f.offset.supportsFixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===d&&(l+=b.offsetTop,m+=b.offsetLeft,f.offset.doesNotAddBorder&&(!f.offset.doesAddBorderForTableAndCells||!cs.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),e=d,d=b.offsetParent),f.offset.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;f.offset.supportsFixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},f.offset={initialize:function(){var a=c.body,b=c.createElement("div"),d,e,g,h,i=parseFloat(f.css(a,"marginTop"))||0,j="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";f.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),d=b.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,this.doesNotAddBorder=e.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,e.style.position="fixed",e.style.top="20px",this.supportsFixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",this.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),f.offset.initialize=f.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.offset.initialize(),f.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=ct.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!ct.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cu(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cu(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a&&a.style?parseFloat(f.css(a,d,"padding")):null},f.fn["outer"+c]=function(a){var b=this[0];return b&&b.style?parseFloat(f.css(b,d,a?"margin":"border")):null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNaN(j)?i:j}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f})(window);
\ No newline at end of file
diff --git a/test/data/tiddlywiki/jquery/plugins/doc/encoding.digests.sha1.html b/test/data/tiddlywiki/jquery/plugins/doc/encoding.digests.sha1.html
new file mode 100755
index 000000000..8a5cb7879
--- /dev/null
+++ b/test/data/tiddlywiki/jquery/plugins/doc/encoding.digests.sha1.html
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>jQuery.encoding.digests.sha1</title>
+	<link rel="stylesheet" type="text/css" href="styles/main.css">
+</head>
+
+<body>
+	<h1>jQuery.encoding.digests.sha1</h1>
+	<p>
+		This <a href="http://jquery.com">jQuery</a> plugin implements the SHA-1 cryptographic hash function.
+	</p>
+
+	<h2>Source</h2>
+	<p>
+		The source code is currently hosted in TiddlyWiki's
+		<a href="http://svn.tiddlywiki.org/Trunk/core/jquery/plugins/jQuery.encoding.digests.sha1.js">Subversion repository</a>.
+	</p>
+	<p>
+		<a href="http://groups.google.com/group/TiddlyWikiDev/">Feedback</a> is welcome.
+	</p>
+
+	<h2>API</h2>
+	<ul>
+		<li>
+		<p><code>$.encoding.digests.hexSha1Str(str)</code>: Return, in hex, the SHA-1 hash of a string</p>
+		</li>
+		<li>
+		<p><code>$.encoding.digests.sha1Str(str)</code>: Return the SHA-1 hash of a string</p>
+		</li>
+		<li>
+		<p><code>$.encoding.digests.sha1(x,blen)</code>: Calculate the SHA-1 hash of an array of blen bytes of big-endian 32-bit words</p>
+		</li>
+	</ul>
+	<p>(full documentation in the code comments)</p>
+
+	<h2>Demo</h2>
+	[TBD]
+</body>
+
+</html>
diff --git a/test/data/tiddlywiki/jquery/plugins/doc/index.html b/test/data/tiddlywiki/jquery/plugins/doc/index.html
new file mode 100755
index 000000000..8c11a8e45
--- /dev/null
+++ b/test/data/tiddlywiki/jquery/plugins/doc/index.html
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>TiddlyWiki jQuery plugins</title>
+	<link rel="stylesheet" type="text/css" href="styles/main.css">
+</head>
+
+<body>
+	<h1>TiddlyWiki jQuery plugins</h1>
+	<p>
+		With <a href="http://jquery.com">jQuery</a> being integrated into the
+		<a href="http://tiddlywiki.com">TiddlyWiki</a> core, the community has
+		begun extracting TiddlyWiki functionality into generic components in
+		the form of jQuery plugins:
+	</p>
+	<ul>
+		<li>
+			<a href="twFile.html">jQuery.twFile</a>
+		</li>
+		<li>
+			<a href="twStylesheet.html">jQuery.twStylesheet</a>
+		</li>
+		<li>
+			<a href="encoding.digests.sha1.html">jQuery.encoding.digests.sha1.html</a>
+		</li>
+	</ul>
+</body>
+
+</html>
diff --git a/test/data/tiddlywiki/jquery/plugins/doc/styles/main.css b/test/data/tiddlywiki/jquery/plugins/doc/styles/main.css
new file mode 100755
index 000000000..d0969d959
--- /dev/null
+++ b/test/data/tiddlywiki/jquery/plugins/doc/styles/main.css
@@ -0,0 +1,78 @@
+* {
+	margin: 0;
+	padding: 0;
+}
+
+html {
+	background-color: #000;
+}
+
+body {
+	width: 50%;
+	margin: 0 auto;
+	padding: 10px;
+	background-color: #FFF;
+}
+
+h1,
+h2 {
+	margin-bottom: 10px;
+}
+
+h2 {
+	margin-top: 20px;
+}
+
+p,
+ul {
+	margin-bottom: 0.5em;
+}
+
+ul {
+	margin-left: 1em;
+}
+
+ul ul {
+	margin-bottom: 0;
+}
+
+li p {
+	margin-bottom: 0.2em;
+}
+
+code {
+	color: #0A0;
+}
+
+fieldset,
+legend {
+	border: 1px solid #AAA;
+}
+
+fieldset {
+	margin: 30px 10px 10px;
+	padding: 10px 5px 5px 10px;
+}
+
+legend,
+.editor {
+	background-color: #EEE;
+}
+
+legend {
+	margin-top: -1em;
+	border-bottom: none;
+	padding: 1px 3px 0;
+	line-height: 1em;
+}
+
+fieldset textarea {
+	display: block;
+	width: 98%;
+}
+
+fieldset input {
+	width: 5em;
+	margin: 10px 10px 5px 0;
+	font-size: 1.1em;
+}
diff --git a/test/data/tiddlywiki/jquery/plugins/doc/twFile.html b/test/data/tiddlywiki/jquery/plugins/doc/twFile.html
new file mode 100755
index 000000000..b4378580c
--- /dev/null
+++ b/test/data/tiddlywiki/jquery/plugins/doc/twFile.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>jQuery.twFile</title>
+	<link rel="stylesheet" type="text/css" href="styles/main.css">
+</head>
+
+<body>
+	<h1>jQuery.twFile</h1>
+	<p>
+		This <a href="http://jquery.com">jQuery</a> plugin provides access to
+		the local file system (for documents loaded from a <code>file://</code>
+		URI) to load and save file contents from the browser.
+	</p>
+
+	<p>
+		The code is based on <a href="http://tiddlywiki.com">TiddlyWiki</a>'s
+		self-saving capabilities.
+	</p>
+
+	<p id="TiddlySaver">
+		Note that the <a href="http://www.tiddlywiki.com/TiddlySaver.jar">TiddlySaver</a>
+		applet is required on Opera and WebKit-based browsers (Safari, Chrome).
+		The applet has to be present in the same folder as the respective HTML document.
+	</p>
+
+	<h2>Source</h2>
+	<p>
+		The source code is currently hosted in TiddlyWiki's
+		<a href="http://svn.tiddlywiki.org/Trunk/core/jquery/plugins/jQuery.twFile.js">Subversion repository</a>.
+	</p>
+	<p>
+		<a href="http://groups.google.com/group/TiddlyWikiDev/">Feedback</a> is welcome.
+	</p>
+
+	<h2>API Summary</h2>
+	<ul>
+		<li>
+			<p><code>$.twFile.load(filePath)</code>: load contents from file</p>
+		</li>
+		<li>
+			<p><code>$.twFile.save(filePath, content)</code>: save contents to file</p>
+		</li>
+		<li>
+			<p><code>$.twFile.copy(dest, source)</code>: duplicate existing file</p>
+			<p><strong>N.B.:</strong> This is not supported on all browsers.</p>
+		</li>
+		<li>
+			<p>
+				<code>$.twFile.convertUriToLocalPath(filePath)</code>:
+				normalizes specified absolute file path
+			</p>
+		</li>
+	</ul>
+	<p>
+		<strong>N.B.:</strong> All file paths must be absolute (e.g.
+		<code>/tmp/foo.txt</code> or <code>C:\temp\foo.txt</code>).
+	</p>
+	<p>(full documentation in the code comments)</p>
+
+	<h2>Limitations</h2>
+	<ul>
+		<li>
+			plugin unavailable until
+			<a href="http://docs.jquery.com/Events/ready">document.ready</a>
+			handlers have completed
+			<p>
+				Since the TiddlySaver applet cannot be injected synchronously
+				into the document, this is done asynchronously during
+				<code>document.ready</code> processing.
+			</p>
+			<p>
+				This means that the plugin is not guaranteed to work properly
+				until after all these handlers have completed.
+			</p>
+		</li>
+		<li>
+			currently unreliable UTF-8 support on Internet Explorer
+			<p>
+				The plugin is designed to work with UTF-8 encoded text files.
+				However, support in Internet Explorer is broken, and can only
+				reliably save files that are encoded with the ANSI subset of
+				UTF-8. In the case of HTML files, this problem can often be
+				avoided by using HTML entity encodings.
+			</p>
+		</li>
+	</ul>
+
+	<h2>Internals</h2>
+	<p>
+		Internally, the plugin uses four separate drivers to implement the functionality on different browsers:
+		<ul>
+			<li>
+				<code>activeX</code>: uses the <code>FileSystemObject</code> built into Internet Explorer 5 and above
+			</li>
+			<li>
+				<code>mozilla</code>: uses the XUL libraries built into Firefox
+			</li>
+			<li>
+				<code>tiddlySaver</code>: uses a custom Java applet that works on Safari, Chrome and Opera
+			</li>
+			<li>
+				<code>javaLiveConnect</code>: uses an ancient (and slow) binding technology to call Java runtime library routines directly - only works on Opera
+			</li>
+		</ul>
+	</p>
+
+	<h2>Demo</h2>
+	<p>
+		Download <a href="twFileDemo.html">this document</a> (and
+		<a href="#TiddlySaver">TiddlySaver</a> if necessary) and open it from
+		the local disk.
+	</p>
+	<p>
+		This demo illustrates self-saving capabilities by passing
+		<code>document.location.href</code> to <code>$.twFile.convertUriToLocalPath</code>,
+		using the return value in load and save functions.
+	</p>
+
+</body>
+
+</html>
diff --git a/test/data/tiddlywiki/jquery/plugins/doc/twFileDemo.html b/test/data/tiddlywiki/jquery/plugins/doc/twFileDemo.html
new file mode 100755
index 000000000..24545b721
--- /dev/null
+++ b/test/data/tiddlywiki/jquery/plugins/doc/twFileDemo.html
@@ -0,0 +1,435 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>jQuery.twFileDemo</title>
+	<style type="text/css">
+		#editButton {
+			float: left;
+		}
+
+		#error {
+			display: none;
+			float: left;
+			text-indent: 20px;
+			color: #F00;
+		}
+	</style>
+</head>
+<body>
+	<h1>jQuery.twFileDemo</h1>
+	<p>
+		This is an example file that can be used to test out the saving and loading system.
+		Press the edit button to view the page HTML and you can then make changes. Press save
+		to update the page.
+	</p>
+	<h2>Dummy Text</h2>
+	<p>
+		Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris viverra nisl sagittis lorem
+		rutrum eu lacinia elit ultrices. In laoreet tortor in dolor dignissim vitae lacinia massa dignissim.
+		Sed luctus, tortor a aliquam vulputate, orci tellus vulasdasdputate risus, sed vehicula quam massa ac orci.
+		Cras in nibh purus, ac tempor est. In tincidunt nulla et velit accumsan non tempor massa vulputate.
+		Nunc condimentum aliquam ligulasdasda, vel tincidunt nunc fringilla eget. Ut arcu nisl, auctor viverra tempor ut,
+		dapibus et mi. Etiam porttitor, quam venenatis luctus porta, risus sapien rutrum ipsum, quis luctus sem mi
+		posuere urna. Duis interdum, justo quis sodales vulputate, mauris nisi hendrerit lacus,
+		porttitor consequat diam tortor ut lorem. Nullam in justo sit amet orci ornare porta quis nec nulla.
+		Vestibulum eu mattis arcu. In nulla purus, vestibulum id ornare placerat, sagittis quis lacus.
+		Aenean a eros eu sem pulvinar iaculis. Quisque molestie, sapien ac luctus tempus, eros dui posuere nulla,
+		quis euismod dolor nisl nec dolor. Duis laoreet varius fermentum. Pellentesque habitant morbi tristique
+		senectus et netus et malesuada fames ac turpis egestas. Mauris at nulla quam, et eleifend mi.
+		Maecenas magna arcu, posuere sit amet ullamcorper vehicula, ornare nec lectus. Curabitur nec interdum nisi.
+		Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+	</p>
+	<h2>Tools</h2>
+	<input type="button" id="editButton" value="Edit">
+	<div id="error">Cannot load file</div>
+
+	<!-- jQuery -->
+	<script type="text/javascript">
+		/*
+		 * jQuery JavaScript Library v1.3.2
+		 * http://jquery.com/
+		 *
+		 * Copyright (c) 2009 John Resig
+		 * Dual licensed under the MIT and GPL licenses.
+		 * http://docs.jquery.com/License
+		 *
+		 * Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009)
+		 * Revision: 6246
+		 */
+		(function(){var l=this,g,y=l.jQuery,p=l.$,o=l.jQuery=l.$=function(E,F){return new o.fn.init(E,F)},D=/^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,f=/^.[^:#\[\.,]*$/;o.fn=o.prototype={init:function(E,H){E=E||document;if(E.nodeType){this[0]=E;this.length=1;this.context=E;return this}if(typeof E==="string"){var G=D.exec(E);if(G&&(G[1]||!H)){if(G[1]){E=o.clean([G[1]],H)}else{var I=document.getElementById(G[3]);if(I&&I.id!=G[3]){return o().find(E)}var F=o(I||[]);F.context=document;F.selector=E;return F}}else{return o(H).find(E)}}else{if(o.isFunction(E)){return o(document).ready(E)}}if(E.selector&&E.context){this.selector=E.selector;this.context=E.context}return this.setArray(o.isArray(E)?E:o.makeArray(E))},selector:"",jquery:"1.3.2",size:function(){return this.length},get:function(E){return E===g?Array.prototype.slice.call(this):this[E]},pushStack:function(F,H,E){var G=o(F);G.prevObject=this;G.context=this.context;if(H==="find"){G.selector=this.selector+(this.selector?" ":"")+E}else{if(H){G.selector=this.selector+"."+H+"("+E+")"}}return G},setArray:function(E){this.length=0;Array.prototype.push.apply(this,E);return this},each:function(F,E){return o.each(this,F,E)},index:function(E){return o.inArray(E&&E.jquery?E[0]:E,this)},attr:function(F,H,G){var E=F;if(typeof F==="string"){if(H===g){return this[0]&&o[G||"attr"](this[0],F)}else{E={};E[F]=H}}return this.each(function(I){for(F in E){o.attr(G?this.style:this,F,o.prop(this,E[F],G,I,F))}})},css:function(E,F){if((E=="width"||E=="height")&&parseFloat(F)<0){F=g}return this.attr(E,F,"curCSS")},text:function(F){if(typeof F!=="object"&&F!=null){return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(F))}var E="";o.each(F||this,function(){o.each(this.childNodes,function(){if(this.nodeType!=8){E+=this.nodeType!=1?this.nodeValue:o.fn.text([this])}})});return E},wrapAll:function(E){if(this[0]){var F=o(E,this[0].ownerDocument).clone();if(this[0].parentNode){F.insertBefore(this[0])}F.map(function(){var G=this;while(G.firstChild){G=G.firstChild}return G}).append(this)}return this},wrapInner:function(E){return this.each(function(){o(this).contents().wrapAll(E)})},wrap:function(E){return this.each(function(){o(this).wrapAll(E)})},append:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.appendChild(E)}})},prepend:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.insertBefore(E,this.firstChild)}})},before:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this)})},after:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this.nextSibling)})},end:function(){return this.prevObject||o([])},push:[].push,sort:[].sort,splice:[].splice,find:function(E){if(this.length===1){var F=this.pushStack([],"find",E);F.length=0;o.find(E,this[0],F);return F}else{return this.pushStack(o.unique(o.map(this,function(G){return o.find(E,G)})),"find",E)}},clone:function(G){var E=this.map(function(){if(!o.support.noCloneEvent&&!o.isXMLDoc(this)){var I=this.outerHTML;if(!I){var J=this.ownerDocument.createElement("div");J.appendChild(this.cloneNode(true));I=J.innerHTML}return o.clean([I.replace(/ jQuery\d+="(?:\d+|null)"/g,"").replace(/^\s*/,"")])[0]}else{return this.cloneNode(true)}});if(G===true){var H=this.find("*").andSelf(),F=0;E.find("*").andSelf().each(function(){if(this.nodeName!==H[F].nodeName){return}var I=o.data(H[F],"events");for(var K in I){for(var J in I[K]){o.event.add(this,K,I[K][J],I[K][J].data)}}F++})}return E},filter:function(E){return this.pushStack(o.isFunction(E)&&o.grep(this,function(G,F){return E.call(G,F)})||o.multiFilter(E,o.grep(this,function(F){return F.nodeType===1})),"filter",E)},closest:function(E){var G=o.expr.match.POS.test(E)?o(E):null,F=0;return this.map(function(){var H=this;while(H&&H.ownerDocument){if(G?G.index(H)>-1:o(H).is(E)){o.data(H,"closest",F);return H}H=H.parentNode;F++}})},not:function(E){if(typeof E==="string"){if(f.test(E)){return this.pushStack(o.multiFilter(E,this,true),"not",E)}else{E=o.multiFilter(E,this)}}var F=E.length&&E[E.length-1]!==g&&!E.nodeType;return this.filter(function(){return F?o.inArray(this,E)<0:this!=E})},add:function(E){return this.pushStack(o.unique(o.merge(this.get(),typeof E==="string"?o(E):o.makeArray(E))))},is:function(E){return !!E&&o.multiFilter(E,this).length>0},hasClass:function(E){return !!E&&this.is("."+E)},val:function(K){if(K===g){var E=this[0];if(E){if(o.nodeName(E,"option")){return(E.attributes.value||{}).specified?E.value:E.text}if(o.nodeName(E,"select")){var I=E.selectedIndex,L=[],M=E.options,H=E.type=="select-one";if(I<0){return null}for(var F=H?I:0,J=H?I+1:M.length;F<J;F++){var G=M[F];if(G.selected){K=o(G).val();if(H){return K}L.push(K)}}return L}return(E.value||"").replace(/\r/g,"")}return g}if(typeof K==="number"){K+=""}return this.each(function(){if(this.nodeType!=1){return}if(o.isArray(K)&&/radio|checkbox/.test(this.type)){this.checked=(o.inArray(this.value,K)>=0||o.inArray(this.name,K)>=0)}else{if(o.nodeName(this,"select")){var N=o.makeArray(K);o("option",this).each(function(){this.selected=(o.inArray(this.value,N)>=0||o.inArray(this.text,N)>=0)});if(!N.length){this.selectedIndex=-1}}else{this.value=K}}})},html:function(E){return E===g?(this[0]?this[0].innerHTML.replace(/ jQuery\d+="(?:\d+|null)"/g,""):null):this.empty().append(E)},replaceWith:function(E){return this.after(E).remove()},eq:function(E){return this.slice(E,+E+1)},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments),"slice",Array.prototype.slice.call(arguments).join(","))},map:function(E){return this.pushStack(o.map(this,function(G,F){return E.call(G,F,G)}))},andSelf:function(){return this.add(this.prevObject)},domManip:function(J,M,L){if(this[0]){var I=(this[0].ownerDocument||this[0]).createDocumentFragment(),F=o.clean(J,(this[0].ownerDocument||this[0]),I),H=I.firstChild;if(H){for(var G=0,E=this.length;G<E;G++){L.call(K(this[G],H),this.length>1||G>0?I.cloneNode(true):I)}}if(F){o.each(F,z)}}return this;function K(N,O){return M&&o.nodeName(N,"table")&&o.nodeName(O,"tr")?(N.getElementsByTagName("tbody")[0]||N.appendChild(N.ownerDocument.createElement("tbody"))):N}}};o.fn.init.prototype=o.fn;function z(E,F){if(F.src){o.ajax({url:F.src,async:false,dataType:"script"})}else{o.globalEval(F.text||F.textContent||F.innerHTML||"")}if(F.parentNode){F.parentNode.removeChild(F)}}function e(){return +new Date}o.extend=o.fn.extend=function(){var J=arguments[0]||{},H=1,I=arguments.length,E=false,G;if(typeof J==="boolean"){E=J;J=arguments[1]||{};H=2}if(typeof J!=="object"&&!o.isFunction(J)){J={}}if(I==H){J=this;--H}for(;H<I;H++){if((G=arguments[H])!=null){for(var F in G){var K=J[F],L=G[F];if(J===L){continue}if(E&&L&&typeof L==="object"&&!L.nodeType){J[F]=o.extend(E,K||(L.length!=null?[]:{}),L)}else{if(L!==g){J[F]=L}}}}}return J};var b=/z-?index|font-?weight|opacity|zoom|line-?height/i,q=document.defaultView||{},s=Object.prototype.toString;o.extend({noConflict:function(E){l.$=p;if(E){l.jQuery=y}return o},isFunction:function(E){return s.call(E)==="[object Function]"},isArray:function(E){return s.call(E)==="[object Array]"},isXMLDoc:function(E){return E.nodeType===9&&E.documentElement.nodeName!=="HTML"||!!E.ownerDocument&&o.isXMLDoc(E.ownerDocument)},globalEval:function(G){if(G&&/\S/.test(G)){var F=document.getElementsByTagName("head")[0]||document.documentElement,E=document.createElement("script");E.type="text/javascript";if(o.support.scriptEval){E.appendChild(document.createTextNode(G))}else{E.text=G}F.insertBefore(E,F.firstChild);F.removeChild(E)}},nodeName:function(F,E){return F.nodeName&&F.nodeName.toUpperCase()==E.toUpperCase()},each:function(G,K,F){var E,H=0,I=G.length;if(F){if(I===g){for(E in G){if(K.apply(G[E],F)===false){break}}}else{for(;H<I;){if(K.apply(G[H++],F)===false){break}}}}else{if(I===g){for(E in G){if(K.call(G[E],E,G[E])===false){break}}}else{for(var J=G[0];H<I&&K.call(J,H,J)!==false;J=G[++H]){}}}return G},prop:function(H,I,G,F,E){if(o.isFunction(I)){I=I.call(H,F)}return typeof I==="number"&&G=="curCSS"&&!b.test(E)?I+"px":I},className:{add:function(E,F){o.each((F||"").split(/\s+/),function(G,H){if(E.nodeType==1&&!o.className.has(E.className,H)){E.className+=(E.className?" ":"")+H}})},remove:function(E,F){if(E.nodeType==1){E.className=F!==g?o.grep(E.className.split(/\s+/),function(G){return !o.className.has(F,G)}).join(" "):""}},has:function(F,E){return F&&o.inArray(E,(F.className||F).toString().split(/\s+/))>-1}},swap:function(H,G,I){var E={};for(var F in G){E[F]=H.style[F];H.style[F]=G[F]}I.call(H);for(var F in G){H.style[F]=E[F]}},css:function(H,F,J,E){if(F=="width"||F=="height"){var L,G={position:"absolute",visibility:"hidden",display:"block"},K=F=="width"?["Left","Right"]:["Top","Bottom"];function I(){L=F=="width"?H.offsetWidth:H.offsetHeight;if(E==="border"){return}o.each(K,function(){if(!E){L-=parseFloat(o.curCSS(H,"padding"+this,true))||0}if(E==="margin"){L+=parseFloat(o.curCSS(H,"margin"+this,true))||0}else{L-=parseFloat(o.curCSS(H,"border"+this+"Width",true))||0}})}if(H.offsetWidth!==0){I()}else{o.swap(H,G,I)}return Math.max(0,Math.round(L))}return o.curCSS(H,F,J)},curCSS:function(I,F,G){var L,E=I.style;if(F=="opacity"&&!o.support.opacity){L=o.attr(E,"opacity");return L==""?"1":L}if(F.match(/float/i)){F=w}if(!G&&E&&E[F]){L=E[F]}else{if(q.getComputedStyle){if(F.match(/float/i)){F="float"}F=F.replace(/([A-Z])/g,"-$1").toLowerCase();var M=q.getComputedStyle(I,null);if(M){L=M.getPropertyValue(F)}if(F=="opacity"&&L==""){L="1"}}else{if(I.currentStyle){var J=F.replace(/\-(\w)/g,function(N,O){return O.toUpperCase()});L=I.currentStyle[F]||I.currentStyle[J];if(!/^\d+(px)?$/i.test(L)&&/^\d/.test(L)){var H=E.left,K=I.runtimeStyle.left;I.runtimeStyle.left=I.currentStyle.left;E.left=L||0;L=E.pixelLeft+"px";E.left=H;I.runtimeStyle.left=K}}}}return L},clean:function(F,K,I){K=K||document;if(typeof K.createElement==="undefined"){K=K.ownerDocument||K[0]&&K[0].ownerDocument||document}if(!I&&F.length===1&&typeof F[0]==="string"){var H=/^<(\w+)\s*\/?>$/.exec(F[0]);if(H){return[K.createElement(H[1])]}}var G=[],E=[],L=K.createElement("div");o.each(F,function(P,S){if(typeof S==="number"){S+=""}if(!S){return}if(typeof S==="string"){S=S.replace(/(<(\w+)[^>]*?)\/>/g,function(U,V,T){return T.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?U:V+"></"+T+">"});var O=S.replace(/^\s+/,"").substring(0,10).toLowerCase();var Q=!O.indexOf("<opt")&&[1,"<select multiple='multiple'>","</select>"]||!O.indexOf("<leg")&&[1,"<fieldset>","</fieldset>"]||O.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"<table>","</table>"]||!O.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!O.indexOf("<td")||!O.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||!O.indexOf("<col")&&[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"]||!o.support.htmlSerialize&&[1,"div<div>","</div>"]||[0,"",""];L.innerHTML=Q[1]+S+Q[2];while(Q[0]--){L=L.lastChild}if(!o.support.tbody){var R=/<tbody/i.test(S),N=!O.indexOf("<table")&&!R?L.firstChild&&L.firstChild.childNodes:Q[1]=="<table>"&&!R?L.childNodes:[];for(var M=N.length-1;M>=0;--M){if(o.nodeName(N[M],"tbody")&&!N[M].childNodes.length){N[M].parentNode.removeChild(N[M])}}}if(!o.support.leadingWhitespace&&/^\s/.test(S)){L.insertBefore(K.createTextNode(S.match(/^\s*/)[0]),L.firstChild)}S=o.makeArray(L.childNodes)}if(S.nodeType){G.push(S)}else{G=o.merge(G,S)}});if(I){for(var J=0;G[J];J++){if(o.nodeName(G[J],"script")&&(!G[J].type||G[J].type.toLowerCase()==="text/javascript")){E.push(G[J].parentNode?G[J].parentNode.removeChild(G[J]):G[J])}else{if(G[J].nodeType===1){G.splice.apply(G,[J+1,0].concat(o.makeArray(G[J].getElementsByTagName("script"))))}I.appendChild(G[J])}}return E}return G},attr:function(J,G,K){if(!J||J.nodeType==3||J.nodeType==8){return g}var H=!o.isXMLDoc(J),L=K!==g;G=H&&o.props[G]||G;if(J.tagName){var F=/href|src|style/.test(G);if(G=="selected"&&J.parentNode){J.parentNode.selectedIndex}if(G in J&&H&&!F){if(L){if(G=="type"&&o.nodeName(J,"input")&&J.parentNode){throw"type property can't be changed"}J[G]=K}if(o.nodeName(J,"form")&&J.getAttributeNode(G)){return J.getAttributeNode(G).nodeValue}if(G=="tabIndex"){var I=J.getAttributeNode("tabIndex");return I&&I.specified?I.value:J.nodeName.match(/(button|input|object|select|textarea)/i)?0:J.nodeName.match(/^(a|area)$/i)&&J.href?0:g}return J[G]}if(!o.support.style&&H&&G=="style"){return o.attr(J.style,"cssText",K)}if(L){J.setAttribute(G,""+K)}var E=!o.support.hrefNormalized&&H&&F?J.getAttribute(G,2):J.getAttribute(G);return E===null?g:E}if(!o.support.opacity&&G=="opacity"){if(L){J.zoom=1;J.filter=(J.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(K)+""=="NaN"?"":"alpha(opacity="+K*100+")")}return J.filter&&J.filter.indexOf("opacity=")>=0?(parseFloat(J.filter.match(/opacity=([^)]*)/)[1])/100)+"":""}G=G.replace(/-([a-z])/ig,function(M,N){return N.toUpperCase()});if(L){J[G]=K}return J[G]},trim:function(E){return(E||"").replace(/^\s+|\s+$/g,"")},makeArray:function(G){var E=[];if(G!=null){var F=G.length;if(F==null||typeof G==="string"||o.isFunction(G)||G.setInterval){E[0]=G}else{while(F){E[--F]=G[F]}}}return E},inArray:function(G,H){for(var E=0,F=H.length;E<F;E++){if(H[E]===G){return E}}return -1},merge:function(H,E){var F=0,G,I=H.length;if(!o.support.getAll){while((G=E[F++])!=null){if(G.nodeType!=8){H[I++]=G}}}else{while((G=E[F++])!=null){H[I++]=G}}return H},unique:function(K){var F=[],E={};try{for(var G=0,H=K.length;G<H;G++){var J=o.data(K[G]);if(!E[J]){E[J]=true;F.push(K[G])}}}catch(I){F=K}return F},grep:function(F,J,E){var G=[];for(var H=0,I=F.length;H<I;H++){if(!E!=!J(F[H],H)){G.push(F[H])}}return G},map:function(E,J){var F=[];for(var G=0,H=E.length;G<H;G++){var I=J(E[G],G);if(I!=null){F[F.length]=I}}return F.concat.apply([],F)}});var C=navigator.userAgent.toLowerCase();o.browser={version:(C.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[0,"0"])[1],safari:/webkit/.test(C),opera:/opera/.test(C),msie:/msie/.test(C)&&!/opera/.test(C),mozilla:/mozilla/.test(C)&&!/(compatible|webkit)/.test(C)};o.each({parent:function(E){return E.parentNode},parents:function(E){return o.dir(E,"parentNode")},next:function(E){return o.nth(E,2,"nextSibling")},prev:function(E){return o.nth(E,2,"previousSibling")},nextAll:function(E){return o.dir(E,"nextSibling")},prevAll:function(E){return o.dir(E,"previousSibling")},siblings:function(E){return o.sibling(E.parentNode.firstChild,E)},children:function(E){return o.sibling(E.firstChild)},contents:function(E){return o.nodeName(E,"iframe")?E.contentDocument||E.contentWindow.document:o.makeArray(E.childNodes)}},function(E,F){o.fn[E]=function(G){var H=o.map(this,F);if(G&&typeof G=="string"){H=o.multiFilter(G,H)}return this.pushStack(o.unique(H),E,G)}});o.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(E,F){o.fn[E]=function(G){var J=[],L=o(G);for(var K=0,H=L.length;K<H;K++){var I=(K>0?this.clone(true):this).get();o.fn[F].apply(o(L[K]),I);J=J.concat(I)}return this.pushStack(J,E,G)}});o.each({removeAttr:function(E){o.attr(this,E,"");if(this.nodeType==1){this.removeAttribute(E)}},addClass:function(E){o.className.add(this,E)},removeClass:function(E){o.className.remove(this,E)},toggleClass:function(F,E){if(typeof E!=="boolean"){E=!o.className.has(this,F)}o.className[E?"add":"remove"](this,F)},remove:function(E){if(!E||o.filter(E,[this]).length){o("*",this).add([this]).each(function(){o.event.remove(this);o.removeData(this)});if(this.parentNode){this.parentNode.removeChild(this)}}},empty:function(){o(this).children().remove();while(this.firstChild){this.removeChild(this.firstChild)}}},function(E,F){o.fn[E]=function(){return this.each(F,arguments)}});function j(E,F){return E[0]&&parseInt(o.curCSS(E[0],F,true),10)||0}var h="jQuery"+e(),v=0,A={};o.extend({cache:{},data:function(F,E,G){F=F==l?A:F;var H=F[h];if(!H){H=F[h]=++v}if(E&&!o.cache[H]){o.cache[H]={}}if(G!==g){o.cache[H][E]=G}return E?o.cache[H][E]:H},removeData:function(F,E){F=F==l?A:F;var H=F[h];if(E){if(o.cache[H]){delete o.cache[H][E];E="";for(E in o.cache[H]){break}if(!E){o.removeData(F)}}}else{try{delete F[h]}catch(G){if(F.removeAttribute){F.removeAttribute(h)}}delete o.cache[H]}},queue:function(F,E,H){if(F){E=(E||"fx")+"queue";var G=o.data(F,E);if(!G||o.isArray(H)){G=o.data(F,E,o.makeArray(H))}else{if(H){G.push(H)}}}return G},dequeue:function(H,G){var E=o.queue(H,G),F=E.shift();if(!G||G==="fx"){F=E[0]}if(F!==g){F.call(H)}}});o.fn.extend({data:function(E,G){var H=E.split(".");H[1]=H[1]?"."+H[1]:"";if(G===g){var F=this.triggerHandler("getData"+H[1]+"!",[H[0]]);if(F===g&&this.length){F=o.data(this[0],E)}return F===g&&H[1]?this.data(H[0]):F}else{return this.trigger("setData"+H[1]+"!",[H[0],G]).each(function(){o.data(this,E,G)})}},removeData:function(E){return this.each(function(){o.removeData(this,E)})},queue:function(E,F){if(typeof E!=="string"){F=E;E="fx"}if(F===g){return o.queue(this[0],E)}return this.each(function(){var G=o.queue(this,E,F);if(E=="fx"&&G.length==1){G[0].call(this)}})},dequeue:function(E){return this.each(function(){o.dequeue(this,E)})}});
+		/*
+		 * Sizzle CSS Selector Engine - v0.9.3
+		 *  Copyright 2009, The Dojo Foundation
+		 *  Released under the MIT, BSD, and GPL Licenses.
+		 *  More information: http://sizzlejs.com/
+		 */
+		(function(){var R=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,L=0,H=Object.prototype.toString;var F=function(Y,U,ab,ac){ab=ab||[];U=U||document;if(U.nodeType!==1&&U.nodeType!==9){return[]}if(!Y||typeof Y!=="string"){return ab}var Z=[],W,af,ai,T,ad,V,X=true;R.lastIndex=0;while((W=R.exec(Y))!==null){Z.push(W[1]);if(W[2]){V=RegExp.rightContext;break}}if(Z.length>1&&M.exec(Y)){if(Z.length===2&&I.relative[Z[0]]){af=J(Z[0]+Z[1],U)}else{af=I.relative[Z[0]]?[U]:F(Z.shift(),U);while(Z.length){Y=Z.shift();if(I.relative[Y]){Y+=Z.shift()}af=J(Y,af)}}}else{var ae=ac?{expr:Z.pop(),set:E(ac)}:F.find(Z.pop(),Z.length===1&&U.parentNode?U.parentNode:U,Q(U));af=F.filter(ae.expr,ae.set);if(Z.length>0){ai=E(af)}else{X=false}while(Z.length){var ah=Z.pop(),ag=ah;if(!I.relative[ah]){ah=""}else{ag=Z.pop()}if(ag==null){ag=U}I.relative[ah](ai,ag,Q(U))}}if(!ai){ai=af}if(!ai){throw"Syntax error, unrecognized expression: "+(ah||Y)}if(H.call(ai)==="[object Array]"){if(!X){ab.push.apply(ab,ai)}else{if(U.nodeType===1){for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&(ai[aa]===true||ai[aa].nodeType===1&&K(U,ai[aa]))){ab.push(af[aa])}}}else{for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&ai[aa].nodeType===1){ab.push(af[aa])}}}}}else{E(ai,ab)}if(V){F(V,U,ab,ac);if(G){hasDuplicate=false;ab.sort(G);if(hasDuplicate){for(var aa=1;aa<ab.length;aa++){if(ab[aa]===ab[aa-1]){ab.splice(aa--,1)}}}}}return ab};F.matches=function(T,U){return F(T,null,null,U)};F.find=function(aa,T,ab){var Z,X;if(!aa){return[]}for(var W=0,V=I.order.length;W<V;W++){var Y=I.order[W],X;if((X=I.match[Y].exec(aa))){var U=RegExp.leftContext;if(U.substr(U.length-1)!=="\\"){X[1]=(X[1]||"").replace(/\\/g,"");Z=I.find[Y](X,T,ab);if(Z!=null){aa=aa.replace(I.match[Y],"");break}}}}if(!Z){Z=T.getElementsByTagName("*")}return{set:Z,expr:aa}};F.filter=function(ad,ac,ag,W){var V=ad,ai=[],aa=ac,Y,T,Z=ac&&ac[0]&&Q(ac[0]);while(ad&&ac.length){for(var ab in I.filter){if((Y=I.match[ab].exec(ad))!=null){var U=I.filter[ab],ah,af;T=false;if(aa==ai){ai=[]}if(I.preFilter[ab]){Y=I.preFilter[ab](Y,aa,ag,ai,W,Z);if(!Y){T=ah=true}else{if(Y===true){continue}}}if(Y){for(var X=0;(af=aa[X])!=null;X++){if(af){ah=U(af,Y,X,aa);var ae=W^!!ah;if(ag&&ah!=null){if(ae){T=true}else{aa[X]=false}}else{if(ae){ai.push(af);T=true}}}}}if(ah!==g){if(!ag){aa=ai}ad=ad.replace(I.match[ab],"");if(!T){return[]}break}}}if(ad==V){if(T==null){throw"Syntax error, unrecognized expression: "+ad}else{break}}V=ad}return aa};var I=F.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF_-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF_-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*_-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF_-]|\\.)+)(?:\((['"]*)((?:\([^\)]+\)|[^\2\(\)]*)+)\2\))?/},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(T){return T.getAttribute("href")}},relative:{"+":function(aa,T,Z){var X=typeof T==="string",ab=X&&!/\W/.test(T),Y=X&&!ab;if(ab&&!Z){T=T.toUpperCase()}for(var W=0,V=aa.length,U;W<V;W++){if((U=aa[W])){while((U=U.previousSibling)&&U.nodeType!==1){}aa[W]=Y||U&&U.nodeName===T?U||false:U===T}}if(Y){F.filter(T,aa,true)}},">":function(Z,U,aa){var X=typeof U==="string";if(X&&!/\W/.test(U)){U=aa?U:U.toUpperCase();for(var V=0,T=Z.length;V<T;V++){var Y=Z[V];if(Y){var W=Y.parentNode;Z[V]=W.nodeName===U?W:false}}}else{for(var V=0,T=Z.length;V<T;V++){var Y=Z[V];if(Y){Z[V]=X?Y.parentNode:Y.parentNode===U}}if(X){F.filter(U,Z,true)}}},"":function(W,U,Y){var V=L++,T=S;if(!U.match(/\W/)){var X=U=Y?U:U.toUpperCase();T=P}T("parentNode",U,V,W,X,Y)},"~":function(W,U,Y){var V=L++,T=S;if(typeof U==="string"&&!U.match(/\W/)){var X=U=Y?U:U.toUpperCase();T=P}T("previousSibling",U,V,W,X,Y)}},find:{ID:function(U,V,W){if(typeof V.getElementById!=="undefined"&&!W){var T=V.getElementById(U[1]);return T?[T]:[]}},NAME:function(V,Y,Z){if(typeof Y.getElementsByName!=="undefined"){var U=[],X=Y.getElementsByName(V[1]);for(var W=0,T=X.length;W<T;W++){if(X[W].getAttribute("name")===V[1]){U.push(X[W])}}return U.length===0?null:U}},TAG:function(T,U){return U.getElementsByTagName(T[1])}},preFilter:{CLASS:function(W,U,V,T,Z,aa){W=" "+W[1].replace(/\\/g,"")+" ";if(aa){return W}for(var X=0,Y;(Y=U[X])!=null;X++){if(Y){if(Z^(Y.className&&(" "+Y.className+" ").indexOf(W)>=0)){if(!V){T.push(Y)}}else{if(V){U[X]=false}}}}return false},ID:function(T){return T[1].replace(/\\/g,"")},TAG:function(U,T){for(var V=0;T[V]===false;V++){}return T[V]&&Q(T[V])?U[1]:U[1].toUpperCase()},CHILD:function(T){if(T[1]=="nth"){var U=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(T[2]=="even"&&"2n"||T[2]=="odd"&&"2n+1"||!/\D/.test(T[2])&&"0n+"+T[2]||T[2]);T[2]=(U[1]+(U[2]||1))-0;T[3]=U[3]-0}T[0]=L++;return T},ATTR:function(X,U,V,T,Y,Z){var W=X[1].replace(/\\/g,"");if(!Z&&I.attrMap[W]){X[1]=I.attrMap[W]}if(X[2]==="~="){X[4]=" "+X[4]+" "}return X},PSEUDO:function(X,U,V,T,Y){if(X[1]==="not"){if(X[3].match(R).length>1||/^\w/.test(X[3])){X[3]=F(X[3],null,null,U)}else{var W=F.filter(X[3],U,V,true^Y);if(!V){T.push.apply(T,W)}return false}}else{if(I.match.POS.test(X[0])||I.match.CHILD.test(X[0])){return true}}return X},POS:function(T){T.unshift(true);return T}},filters:{enabled:function(T){return T.disabled===false&&T.type!=="hidden"},disabled:function(T){return T.disabled===true},checked:function(T){return T.checked===true},selected:function(T){T.parentNode.selectedIndex;return T.selected===true},parent:function(T){return !!T.firstChild},empty:function(T){return !T.firstChild},has:function(V,U,T){return !!F(T[3],V).length},header:function(T){return/h\d/i.test(T.nodeName)},text:function(T){return"text"===T.type},radio:function(T){return"radio"===T.type},checkbox:function(T){return"checkbox"===T.type},file:function(T){return"file"===T.type},password:function(T){return"password"===T.type},submit:function(T){return"submit"===T.type},image:function(T){return"image"===T.type},reset:function(T){return"reset"===T.type},button:function(T){return"button"===T.type||T.nodeName.toUpperCase()==="BUTTON"},input:function(T){return/input|select|textarea|button/i.test(T.nodeName)}},setFilters:{first:function(U,T){return T===0},last:function(V,U,T,W){return U===W.length-1},even:function(U,T){return T%2===0},odd:function(U,T){return T%2===1},lt:function(V,U,T){return U<T[3]-0},gt:function(V,U,T){return U>T[3]-0},nth:function(V,U,T){return T[3]-0==U},eq:function(V,U,T){return T[3]-0==U}},filter:{PSEUDO:function(Z,V,W,aa){var U=V[1],X=I.filters[U];if(X){return X(Z,W,V,aa)}else{if(U==="contains"){return(Z.textContent||Z.innerText||"").indexOf(V[3])>=0}else{if(U==="not"){var Y=V[3];for(var W=0,T=Y.length;W<T;W++){if(Y[W]===Z){return false}}return true}}}},CHILD:function(T,W){var Z=W[1],U=T;switch(Z){case"only":case"first":while(U=U.previousSibling){if(U.nodeType===1){return false}}if(Z=="first"){return true}U=T;case"last":while(U=U.nextSibling){if(U.nodeType===1){return false}}return true;case"nth":var V=W[2],ac=W[3];if(V==1&&ac==0){return true}var Y=W[0],ab=T.parentNode;if(ab&&(ab.sizcache!==Y||!T.nodeIndex)){var X=0;for(U=ab.firstChild;U;U=U.nextSibling){if(U.nodeType===1){U.nodeIndex=++X}}ab.sizcache=Y}var aa=T.nodeIndex-ac;if(V==0){return aa==0}else{return(aa%V==0&&aa/V>=0)}}},ID:function(U,T){return U.nodeType===1&&U.getAttribute("id")===T},TAG:function(U,T){return(T==="*"&&U.nodeType===1)||U.nodeName===T},CLASS:function(U,T){return(" "+(U.className||U.getAttribute("class"))+" ").indexOf(T)>-1},ATTR:function(Y,W){var V=W[1],T=I.attrHandle[V]?I.attrHandle[V](Y):Y[V]!=null?Y[V]:Y.getAttribute(V),Z=T+"",X=W[2],U=W[4];return T==null?X==="!=":X==="="?Z===U:X==="*="?Z.indexOf(U)>=0:X==="~="?(" "+Z+" ").indexOf(U)>=0:!U?Z&&T!==false:X==="!="?Z!=U:X==="^="?Z.indexOf(U)===0:X==="$="?Z.substr(Z.length-U.length)===U:X==="|="?Z===U||Z.substr(0,U.length+1)===U+"-":false},POS:function(X,U,V,Y){var T=U[2],W=I.setFilters[T];if(W){return W(X,V,U,Y)}}}};var M=I.match.POS;for(var O in I.match){I.match[O]=RegExp(I.match[O].source+/(?![^\[]*\])(?![^\(]*\))/.source)}var E=function(U,T){U=Array.prototype.slice.call(U);if(T){T.push.apply(T,U);return T}return U};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(N){E=function(X,W){var U=W||[];if(H.call(X)==="[object Array]"){Array.prototype.push.apply(U,X)}else{if(typeof X.length==="number"){for(var V=0,T=X.length;V<T;V++){U.push(X[V])}}else{for(var V=0;X[V];V++){U.push(X[V])}}}return U}}var G;if(document.documentElement.compareDocumentPosition){G=function(U,T){var V=U.compareDocumentPosition(T)&4?-1:U===T?0:1;if(V===0){hasDuplicate=true}return V}}else{if("sourceIndex" in document.documentElement){G=function(U,T){var V=U.sourceIndex-T.sourceIndex;if(V===0){hasDuplicate=true}return V}}else{if(document.createRange){G=function(W,U){var V=W.ownerDocument.createRange(),T=U.ownerDocument.createRange();V.selectNode(W);V.collapse(true);T.selectNode(U);T.collapse(true);var X=V.compareBoundaryPoints(Range.START_TO_END,T);if(X===0){hasDuplicate=true}return X}}}}(function(){var U=document.createElement("form"),V="script"+(new Date).getTime();U.innerHTML="<input name='"+V+"'/>";var T=document.documentElement;T.insertBefore(U,T.firstChild);if(!!document.getElementById(V)){I.find.ID=function(X,Y,Z){if(typeof Y.getElementById!=="undefined"&&!Z){var W=Y.getElementById(X[1]);return W?W.id===X[1]||typeof W.getAttributeNode!=="undefined"&&W.getAttributeNode("id").nodeValue===X[1]?[W]:g:[]}};I.filter.ID=function(Y,W){var X=typeof Y.getAttributeNode!=="undefined"&&Y.getAttributeNode("id");return Y.nodeType===1&&X&&X.nodeValue===W}}T.removeChild(U)})();(function(){var T=document.createElement("div");T.appendChild(document.createComment(""));if(T.getElementsByTagName("*").length>0){I.find.TAG=function(U,Y){var X=Y.getElementsByTagName(U[1]);if(U[1]==="*"){var W=[];for(var V=0;X[V];V++){if(X[V].nodeType===1){W.push(X[V])}}X=W}return X}}T.innerHTML="<a href='#'></a>";if(T.firstChild&&typeof T.firstChild.getAttribute!=="undefined"&&T.firstChild.getAttribute("href")!=="#"){I.attrHandle.href=function(U){return U.getAttribute("href",2)}}})();if(document.querySelectorAll){(function(){var T=F,U=document.createElement("div");U.innerHTML="<p class='TEST'></p>";if(U.querySelectorAll&&U.querySelectorAll(".TEST").length===0){return}F=function(Y,X,V,W){X=X||document;if(!W&&X.nodeType===9&&!Q(X)){try{return E(X.querySelectorAll(Y),V)}catch(Z){}}return T(Y,X,V,W)};F.find=T.find;F.filter=T.filter;F.selectors=T.selectors;F.matches=T.matches})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){(function(){var T=document.createElement("div");T.innerHTML="<div class='test e'></div><div class='test'></div>";if(T.getElementsByClassName("e").length===0){return}T.lastChild.className="e";if(T.getElementsByClassName("e").length===1){return}I.order.splice(1,0,"CLASS");I.find.CLASS=function(U,V,W){if(typeof V.getElementsByClassName!=="undefined"&&!W){return V.getElementsByClassName(U[1])}}})()}function P(U,Z,Y,ad,aa,ac){var ab=U=="previousSibling"&&!ac;for(var W=0,V=ad.length;W<V;W++){var T=ad[W];if(T){if(ab&&T.nodeType===1){T.sizcache=Y;T.sizset=W}T=T[U];var X=false;while(T){if(T.sizcache===Y){X=ad[T.sizset];break}if(T.nodeType===1&&!ac){T.sizcache=Y;T.sizset=W}if(T.nodeName===Z){X=T;break}T=T[U]}ad[W]=X}}}function S(U,Z,Y,ad,aa,ac){var ab=U=="previousSibling"&&!ac;for(var W=0,V=ad.length;W<V;W++){var T=ad[W];if(T){if(ab&&T.nodeType===1){T.sizcache=Y;T.sizset=W}T=T[U];var X=false;while(T){if(T.sizcache===Y){X=ad[T.sizset];break}if(T.nodeType===1){if(!ac){T.sizcache=Y;T.sizset=W}if(typeof Z!=="string"){if(T===Z){X=true;break}}else{if(F.filter(Z,[T]).length>0){X=T;break}}}T=T[U]}ad[W]=X}}}var K=document.compareDocumentPosition?function(U,T){return U.compareDocumentPosition(T)&16}:function(U,T){return U!==T&&(U.contains?U.contains(T):true)};var Q=function(T){return T.nodeType===9&&T.documentElement.nodeName!=="HTML"||!!T.ownerDocument&&Q(T.ownerDocument)};var J=function(T,aa){var W=[],X="",Y,V=aa.nodeType?[aa]:aa;while((Y=I.match.PSEUDO.exec(T))){X+=Y[0];T=T.replace(I.match.PSEUDO,"")}T=I.relative[T]?T+"*":T;for(var Z=0,U=V.length;Z<U;Z++){F(T,V[Z],W)}return F.filter(X,W)};o.find=F;o.filter=F.filter;o.expr=F.selectors;o.expr[":"]=o.expr.filters;F.selectors.filters.hidden=function(T){return T.offsetWidth===0||T.offsetHeight===0};F.selectors.filters.visible=function(T){return T.offsetWidth>0||T.offsetHeight>0};F.selectors.filters.animated=function(T){return o.grep(o.timers,function(U){return T===U.elem}).length};o.multiFilter=function(V,T,U){if(U){V=":not("+V+")"}return F.matches(V,T)};o.dir=function(V,U){var T=[],W=V[U];while(W&&W!=document){if(W.nodeType==1){T.push(W)}W=W[U]}return T};o.nth=function(X,T,V,W){T=T||1;var U=0;for(;X;X=X[V]){if(X.nodeType==1&&++U==T){break}}return X};o.sibling=function(V,U){var T=[];for(;V;V=V.nextSibling){if(V.nodeType==1&&V!=U){T.push(V)}}return T};return;l.Sizzle=F})();o.event={add:function(I,F,H,K){if(I.nodeType==3||I.nodeType==8){return}if(I.setInterval&&I!=l){I=l}if(!H.guid){H.guid=this.guid++}if(K!==g){var G=H;H=this.proxy(G);H.data=K}var E=o.data(I,"events")||o.data(I,"events",{}),J=o.data(I,"handle")||o.data(I,"handle",function(){return typeof o!=="undefined"&&!o.event.triggered?o.event.handle.apply(arguments.callee.elem,arguments):g});J.elem=I;o.each(F.split(/\s+/),function(M,N){var O=N.split(".");N=O.shift();H.type=O.slice().sort().join(".");var L=E[N];if(o.event.specialAll[N]){o.event.specialAll[N].setup.call(I,K,O)}if(!L){L=E[N]={};if(!o.event.special[N]||o.event.special[N].setup.call(I,K,O)===false){if(I.addEventListener){I.addEventListener(N,J,false)}else{if(I.attachEvent){I.attachEvent("on"+N,J)}}}}L[H.guid]=H;o.event.global[N]=true});I=null},guid:1,global:{},remove:function(K,H,J){if(K.nodeType==3||K.nodeType==8){return}var G=o.data(K,"events"),F,E;if(G){if(H===g||(typeof H==="string"&&H.charAt(0)==".")){for(var I in G){this.remove(K,I+(H||""))}}else{if(H.type){J=H.handler;H=H.type}o.each(H.split(/\s+/),function(M,O){var Q=O.split(".");O=Q.shift();var N=RegExp("(^|\\.)"+Q.slice().sort().join(".*\\.")+"(\\.|$)");if(G[O]){if(J){delete G[O][J.guid]}else{for(var P in G[O]){if(N.test(G[O][P].type)){delete G[O][P]}}}if(o.event.specialAll[O]){o.event.specialAll[O].teardown.call(K,Q)}for(F in G[O]){break}if(!F){if(!o.event.special[O]||o.event.special[O].teardown.call(K,Q)===false){if(K.removeEventListener){K.removeEventListener(O,o.data(K,"handle"),false)}else{if(K.detachEvent){K.detachEvent("on"+O,o.data(K,"handle"))}}}F=null;delete G[O]}}})}for(F in G){break}if(!F){var L=o.data(K,"handle");if(L){L.elem=null}o.removeData(K,"events");o.removeData(K,"handle")}}},trigger:function(I,K,H,E){var G=I.type||I;if(!E){I=typeof I==="object"?I[h]?I:o.extend(o.Event(G),I):o.Event(G);if(G.indexOf("!")>=0){I.type=G=G.slice(0,-1);I.exclusive=true}if(!H){I.stopPropagation();if(this.global[G]){o.each(o.cache,function(){if(this.events&&this.events[G]){o.event.trigger(I,K,this.handle.elem)}})}}if(!H||H.nodeType==3||H.nodeType==8){return g}I.result=g;I.target=H;K=o.makeArray(K);K.unshift(I)}I.currentTarget=H;var J=o.data(H,"handle");if(J){J.apply(H,K)}if((!H[G]||(o.nodeName(H,"a")&&G=="click"))&&H["on"+G]&&H["on"+G].apply(H,K)===false){I.result=false}if(!E&&H[G]&&!I.isDefaultPrevented()&&!(o.nodeName(H,"a")&&G=="click")){this.triggered=true;try{H[G]()}catch(L){}}this.triggered=false;if(!I.isPropagationStopped()){var F=H.parentNode||H.ownerDocument;if(F){o.event.trigger(I,K,F,true)}}},handle:function(K){var J,E;K=arguments[0]=o.event.fix(K||l.event);K.currentTarget=this;var L=K.type.split(".");K.type=L.shift();J=!L.length&&!K.exclusive;var I=RegExp("(^|\\.)"+L.slice().sort().join(".*\\.")+"(\\.|$)");E=(o.data(this,"events")||{})[K.type];for(var G in E){var H=E[G];if(J||I.test(H.type)){K.handler=H;K.data=H.data;var F=H.apply(this,arguments);if(F!==g){K.result=F;if(F===false){K.preventDefault();K.stopPropagation()}}if(K.isImmediatePropagationStopped()){break}}}},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(H){if(H[h]){return H}var F=H;H=o.Event(F);for(var G=this.props.length,J;G;){J=this.props[--G];H[J]=F[J]}if(!H.target){H.target=H.srcElement||document}if(H.target.nodeType==3){H.target=H.target.parentNode}if(!H.relatedTarget&&H.fromElement){H.relatedTarget=H.fromElement==H.target?H.toElement:H.fromElement}if(H.pageX==null&&H.clientX!=null){var I=document.documentElement,E=document.body;H.pageX=H.clientX+(I&&I.scrollLeft||E&&E.scrollLeft||0)-(I.clientLeft||0);H.pageY=H.clientY+(I&&I.scrollTop||E&&E.scrollTop||0)-(I.clientTop||0)}if(!H.which&&((H.charCode||H.charCode===0)?H.charCode:H.keyCode)){H.which=H.charCode||H.keyCode}if(!H.metaKey&&H.ctrlKey){H.metaKey=H.ctrlKey}if(!H.which&&H.button){H.which=(H.button&1?1:(H.button&2?3:(H.button&4?2:0)))}return H},proxy:function(F,E){E=E||function(){return F.apply(this,arguments)};E.guid=F.guid=F.guid||E.guid||this.guid++;return E},special:{ready:{setup:B,teardown:function(){}}},specialAll:{live:{setup:function(E,F){o.event.add(this,F[0],c)},teardown:function(G){if(G.length){var E=0,F=RegExp("(^|\\.)"+G[0]+"(\\.|$)");o.each((o.data(this,"events").live||{}),function(){if(F.test(this.type)){E++}});if(E<1){o.event.remove(this,G[0],c)}}}}}};o.Event=function(E){if(!this.preventDefault){return new o.Event(E)}if(E&&E.type){this.originalEvent=E;this.type=E.type}else{this.type=E}this.timeStamp=e();this[h]=true};function k(){return false}function u(){return true}o.Event.prototype={preventDefault:function(){this.isDefaultPrevented=u;var E=this.originalEvent;if(!E){return}if(E.preventDefault){E.preventDefault()}E.returnValue=false},stopPropagation:function(){this.isPropagationStopped=u;var E=this.originalEvent;if(!E){return}if(E.stopPropagation){E.stopPropagation()}E.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=u;this.stopPropagation()},isDefaultPrevented:k,isPropagationStopped:k,isImmediatePropagationStopped:k};var a=function(F){var E=F.relatedTarget;while(E&&E!=this){try{E=E.parentNode}catch(G){E=this}}if(E!=this){F.type=F.data;o.event.handle.apply(this,arguments)}};o.each({mouseover:"mouseenter",mouseout:"mouseleave"},function(F,E){o.event.special[E]={setup:function(){o.event.add(this,F,a,E)},teardown:function(){o.event.remove(this,F,a)}}});o.fn.extend({bind:function(F,G,E){return F=="unload"?this.one(F,G,E):this.each(function(){o.event.add(this,F,E||G,E&&G)})},one:function(G,H,F){var E=o.event.proxy(F||H,function(I){o(this).unbind(I,E);return(F||H).apply(this,arguments)});return this.each(function(){o.event.add(this,G,E,F&&H)})},unbind:function(F,E){return this.each(function(){o.event.remove(this,F,E)})},trigger:function(E,F){return this.each(function(){o.event.trigger(E,F,this)})},triggerHandler:function(E,G){if(this[0]){var F=o.Event(E);F.preventDefault();F.stopPropagation();o.event.trigger(F,G,this[0]);return F.result}},toggle:function(G){var E=arguments,F=1;while(F<E.length){o.event.proxy(G,E[F++])}return this.click(o.event.proxy(G,function(H){this.lastToggle=(this.lastToggle||0)%F;H.preventDefault();return E[this.lastToggle++].apply(this,arguments)||false}))},hover:function(E,F){return this.mouseenter(E).mouseleave(F)},ready:function(E){B();if(o.isReady){E.call(document,o)}else{o.readyList.push(E)}return this},live:function(G,F){var E=o.event.proxy(F);E.guid+=this.selector+G;o(document).bind(i(G,this.selector),this.selector,E);return this},die:function(F,E){o(document).unbind(i(F,this.selector),E?{guid:E.guid+this.selector+F}:null);return this}});function c(H){var E=RegExp("(^|\\.)"+H.type+"(\\.|$)"),G=true,F=[];o.each(o.data(this,"events").live||[],function(I,J){if(E.test(J.type)){var K=o(H.target).closest(J.data)[0];if(K){F.push({elem:K,fn:J})}}});F.sort(function(J,I){return o.data(J.elem,"closest")-o.data(I.elem,"closest")});o.each(F,function(){if(this.fn.call(this.elem,H,this.fn.data)===false){return(G=false)}});return G}function i(F,E){return["live",F,E.replace(/\./g,"`").replace(/ /g,"|")].join(".")}o.extend({isReady:false,readyList:[],ready:function(){if(!o.isReady){o.isReady=true;if(o.readyList){o.each(o.readyList,function(){this.call(document,o)});o.readyList=null}o(document).triggerHandler("ready")}}});var x=false;function B(){if(x){return}x=true;if(document.addEventListener){document.addEventListener("DOMContentLoaded",function(){document.removeEventListener("DOMContentLoaded",arguments.callee,false);o.ready()},false)}else{if(document.attachEvent){document.attachEvent("onreadystatechange",function(){if(document.readyState==="complete"){document.detachEvent("onreadystatechange",arguments.callee);o.ready()}});if(document.documentElement.doScroll&&l==l.top){(function(){if(o.isReady){return}try{document.documentElement.doScroll("left")}catch(E){setTimeout(arguments.callee,0);return}o.ready()})()}}}o.event.add(l,"load",o.ready)}o.each(("blur,focus,load,resize,scroll,unload,click,dblclick,mousedown,mouseup,mousemove,mouseover,mouseout,mouseenter,mouseleave,change,select,submit,keydown,keypress,keyup,error").split(","),function(F,E){o.fn[E]=function(G){return G?this.bind(E,G):this.trigger(E)}});o(l).bind("unload",function(){for(var E in o.cache){if(E!=1&&o.cache[E].handle){o.event.remove(o.cache[E].handle.elem)}}});(function(){o.support={};var F=document.documentElement,G=document.createElement("script"),K=document.createElement("div"),J="script"+(new Date).getTime();K.style.display="none";K.innerHTML='   <link/><table></table><a href="/a" style="color:red;float:left;opacity:.5;">a</a><select><option>text</option></select><object><param/></object>';var H=K.getElementsByTagName("*"),E=K.getElementsByTagName("a")[0];if(!H||!H.length||!E){return}o.support={leadingWhitespace:K.firstChild.nodeType==3,tbody:!K.getElementsByTagName("tbody").length,objectAll:!!K.getElementsByTagName("object")[0].getElementsByTagName("*").length,htmlSerialize:!!K.getElementsByTagName("link").length,style:/red/.test(E.getAttribute("style")),hrefNormalized:E.getAttribute("href")==="/a",opacity:E.style.opacity==="0.5",cssFloat:!!E.style.cssFloat,scriptEval:false,noCloneEvent:true,boxModel:null};G.type="text/javascript";try{G.appendChild(document.createTextNode("window."+J+"=1;"))}catch(I){}F.insertBefore(G,F.firstChild);if(l[J]){o.support.scriptEval=true;delete l[J]}F.removeChild(G);if(K.attachEvent&&K.fireEvent){K.attachEvent("onclick",function(){o.support.noCloneEvent=false;K.detachEvent("onclick",arguments.callee)});K.cloneNode(true).fireEvent("onclick")}o(function(){var L=document.createElement("div");L.style.width=L.style.paddingLeft="1px";document.body.appendChild(L);o.boxModel=o.support.boxModel=L.offsetWidth===2;document.body.removeChild(L).style.display="none"})})();var w=o.support.cssFloat?"cssFloat":"styleFloat";o.props={"for":"htmlFor","class":"className","float":w,cssFloat:w,styleFloat:w,readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",tabindex:"tabIndex"};o.fn.extend({_load:o.fn.load,load:function(G,J,K){if(typeof G!=="string"){return this._load(G)}var I=G.indexOf(" ");if(I>=0){var E=G.slice(I,G.length);G=G.slice(0,I)}var H="GET";if(J){if(o.isFunction(J)){K=J;J=null}else{if(typeof J==="object"){J=o.param(J);H="POST"}}}var F=this;o.ajax({url:G,type:H,dataType:"html",data:J,complete:function(M,L){if(L=="success"||L=="notmodified"){F.html(E?o("<div/>").append(M.responseText.replace(/<script(.|\s)*?\/script>/g,"")).find(E):M.responseText)}if(K){F.each(K,[M.responseText,L,M])}}});return this},serialize:function(){return o.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?o.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password|search/i.test(this.type))}).map(function(E,F){var G=o(this).val();return G==null?null:o.isArray(G)?o.map(G,function(I,H){return{name:F.name,value:I}}):{name:F.name,value:G}}).get()}});o.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(E,F){o.fn[F]=function(G){return this.bind(F,G)}});var r=e();o.extend({get:function(E,G,H,F){if(o.isFunction(G)){H=G;G=null}return o.ajax({type:"GET",url:E,data:G,success:H,dataType:F})},getScript:function(E,F){return o.get(E,null,F,"script")},getJSON:function(E,F,G){return o.get(E,F,G,"json")},post:function(E,G,H,F){if(o.isFunction(G)){H=G;G={}}return o.ajax({type:"POST",url:E,data:G,success:H,dataType:F})},ajaxSetup:function(E){o.extend(o.ajaxSettings,E)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return l.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest()},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(M){M=o.extend(true,M,o.extend(true,{},o.ajaxSettings,M));var W,F=/=\?(&|$)/g,R,V,G=M.type.toUpperCase();if(M.data&&M.processData&&typeof M.data!=="string"){M.data=o.param(M.data)}if(M.dataType=="jsonp"){if(G=="GET"){if(!M.url.match(F)){M.url+=(M.url.match(/\?/)?"&":"?")+(M.jsonp||"callback")+"=?"}}else{if(!M.data||!M.data.match(F)){M.data=(M.data?M.data+"&":"")+(M.jsonp||"callback")+"=?"}}M.dataType="json"}if(M.dataType=="json"&&(M.data&&M.data.match(F)||M.url.match(F))){W="jsonp"+r++;if(M.data){M.data=(M.data+"").replace(F,"="+W+"$1")}M.url=M.url.replace(F,"="+W+"$1");M.dataType="script";l[W]=function(X){V=X;I();L();l[W]=g;try{delete l[W]}catch(Y){}if(H){H.removeChild(T)}}}if(M.dataType=="script"&&M.cache==null){M.cache=false}if(M.cache===false&&G=="GET"){var E=e();var U=M.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+E+"$2");M.url=U+((U==M.url)?(M.url.match(/\?/)?"&":"?")+"_="+E:"")}if(M.data&&G=="GET"){M.url+=(M.url.match(/\?/)?"&":"?")+M.data;M.data=null}if(M.global&&!o.active++){o.event.trigger("ajaxStart")}var Q=/^(\w+:)?\/\/([^\/?#]+)/.exec(M.url);if(M.dataType=="script"&&G=="GET"&&Q&&(Q[1]&&Q[1]!=location.protocol||Q[2]!=location.host)){var H=document.getElementsByTagName("head")[0];var T=document.createElement("script");T.src=M.url;if(M.scriptCharset){T.charset=M.scriptCharset}if(!W){var O=false;T.onload=T.onreadystatechange=function(){if(!O&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){O=true;I();L();T.onload=T.onreadystatechange=null;H.removeChild(T)}}}H.appendChild(T);return g}var K=false;var J=M.xhr();if(M.username){J.open(G,M.url,M.async,M.username,M.password)}else{J.open(G,M.url,M.async)}try{if(M.data){J.setRequestHeader("Content-Type",M.contentType)}if(M.ifModified){J.setRequestHeader("If-Modified-Since",o.lastModified[M.url]||"Thu, 01 Jan 1970 00:00:00 GMT")}J.setRequestHeader("X-Requested-With","XMLHttpRequest");J.setRequestHeader("Accept",M.dataType&&M.accepts[M.dataType]?M.accepts[M.dataType]+", */*":M.accepts._default)}catch(S){}if(M.beforeSend&&M.beforeSend(J,M)===false){if(M.global&&!--o.active){o.event.trigger("ajaxStop")}J.abort();return false}if(M.global){o.event.trigger("ajaxSend",[J,M])}var N=function(X){if(J.readyState==0){if(P){clearInterval(P);P=null;if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}}else{if(!K&&J&&(J.readyState==4||X=="timeout")){K=true;if(P){clearInterval(P);P=null}R=X=="timeout"?"timeout":!o.httpSuccess(J)?"error":M.ifModified&&o.httpNotModified(J,M.url)?"notmodified":"success";if(R=="success"){try{V=o.httpData(J,M.dataType,M)}catch(Z){R="parsererror"}}if(R=="success"){var Y;try{Y=J.getResponseHeader("Last-Modified")}catch(Z){}if(M.ifModified&&Y){o.lastModified[M.url]=Y}if(!W){I()}}else{o.handleError(M,J,R)}L();if(X){J.abort()}if(M.async){J=null}}}};if(M.async){var P=setInterval(N,13);if(M.timeout>0){setTimeout(function(){if(J&&!K){N("timeout")}},M.timeout)}}try{J.send(M.data)}catch(S){o.handleError(M,J,null,S)}if(!M.async){N()}function I(){if(M.success){M.success(V,R)}if(M.global){o.event.trigger("ajaxSuccess",[J,M])}}function L(){if(M.complete){M.complete(J,R)}if(M.global){o.event.trigger("ajaxComplete",[J,M])}if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}return J},handleError:function(F,H,E,G){if(F.error){F.error(H,E,G)}if(F.global){o.event.trigger("ajaxError",[H,F,G])}},active:0,httpSuccess:function(F){try{return !F.status&&location.protocol=="file:"||(F.status>=200&&F.status<300)||F.status==304||F.status==1223}catch(E){}return false},httpNotModified:function(G,E){try{var H=G.getResponseHeader("Last-Modified");return G.status==304||H==o.lastModified[E]}catch(F){}return false},httpData:function(J,H,G){var F=J.getResponseHeader("content-type"),E=H=="xml"||!H&&F&&F.indexOf("xml")>=0,I=E?J.responseXML:J.responseText;if(E&&I.documentElement.tagName=="parsererror"){throw"parsererror"}if(G&&G.dataFilter){I=G.dataFilter(I,H)}if(typeof I==="string"){if(H=="script"){o.globalEval(I)}if(H=="json"){I=l["eval"]("("+I+")")}}return I},param:function(E){var G=[];function H(I,J){G[G.length]=encodeURIComponent(I)+"="+encodeURIComponent(J)}if(o.isArray(E)||E.jquery){o.each(E,function(){H(this.name,this.value)})}else{for(var F in E){if(o.isArray(E[F])){o.each(E[F],function(){H(F,this)})}else{H(F,o.isFunction(E[F])?E[F]():E[F])}}}return G.join("&").replace(/%20/g,"+")}});var m={},n,d=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];function t(F,E){var G={};o.each(d.concat.apply([],d.slice(0,E)),function(){G[this]=F});return G}o.fn.extend({show:function(J,L){if(J){return this.animate(t("show",3),J,L)}else{for(var H=0,F=this.length;H<F;H++){var E=o.data(this[H],"olddisplay");this[H].style.display=E||"";if(o.css(this[H],"display")==="none"){var G=this[H].tagName,K;if(m[G]){K=m[G]}else{var I=o("<"+G+" />").appendTo("body");K=I.css("display");if(K==="none"){K="block"}I.remove();m[G]=K}o.data(this[H],"olddisplay",K)}}for(var H=0,F=this.length;H<F;H++){this[H].style.display=o.data(this[H],"olddisplay")||""}return this}},hide:function(H,I){if(H){return this.animate(t("hide",3),H,I)}else{for(var G=0,F=this.length;G<F;G++){var E=o.data(this[G],"olddisplay");if(!E&&E!=="none"){o.data(this[G],"olddisplay",o.css(this[G],"display"))}}for(var G=0,F=this.length;G<F;G++){this[G].style.display="none"}return this}},_toggle:o.fn.toggle,toggle:function(G,F){var E=typeof G==="boolean";return o.isFunction(G)&&o.isFunction(F)?this._toggle.apply(this,arguments):G==null||E?this.each(function(){var H=E?G:o(this).is(":hidden");o(this)[H?"show":"hide"]()}):this.animate(t("toggle",3),G,F)},fadeTo:function(E,G,F){return this.animate({opacity:G},E,F)},animate:function(I,F,H,G){var E=o.speed(F,H,G);return this[E.queue===false?"each":"queue"](function(){var K=o.extend({},E),M,L=this.nodeType==1&&o(this).is(":hidden"),J=this;for(M in I){if(I[M]=="hide"&&L||I[M]=="show"&&!L){return K.complete.call(this)}if((M=="height"||M=="width")&&this.style){K.display=o.css(this,"display");K.overflow=this.style.overflow}}if(K.overflow!=null){this.style.overflow="hidden"}K.curAnim=o.extend({},I);o.each(I,function(O,S){var R=new o.fx(J,K,O);if(/toggle|show|hide/.test(S)){R[S=="toggle"?L?"show":"hide":S](I)}else{var Q=S.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),T=R.cur(true)||0;if(Q){var N=parseFloat(Q[2]),P=Q[3]||"px";if(P!="px"){J.style[O]=(N||1)+P;T=((N||1)/R.cur(true))*T;J.style[O]=T+P}if(Q[1]){N=((Q[1]=="-="?-1:1)*N)+T}R.custom(T,N,P)}else{R.custom(T,S,"")}}});return true})},stop:function(F,E){var G=o.timers;if(F){this.queue([])}this.each(function(){for(var H=G.length-1;H>=0;H--){if(G[H].elem==this){if(E){G[H](true)}G.splice(H,1)}}});if(!E){this.dequeue()}return this}});o.each({slideDown:t("show",1),slideUp:t("hide",1),slideToggle:t("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(E,F){o.fn[E]=function(G,H){return this.animate(F,G,H)}});o.extend({speed:function(G,H,F){var E=typeof G==="object"?G:{complete:F||!F&&H||o.isFunction(G)&&G,duration:G,easing:F&&H||H&&!o.isFunction(H)&&H};E.duration=o.fx.off?0:typeof E.duration==="number"?E.duration:o.fx.speeds[E.duration]||o.fx.speeds._default;E.old=E.complete;E.complete=function(){if(E.queue!==false){o(this).dequeue()}if(o.isFunction(E.old)){E.old.call(this)}};return E},easing:{linear:function(G,H,E,F){return E+F*G},swing:function(G,H,E,F){return((-Math.cos(G*Math.PI)/2)+0.5)*F+E}},timers:[],fx:function(F,E,G){this.options=E;this.elem=F;this.prop=G;if(!E.orig){E.orig={}}}});o.fx.prototype={update:function(){if(this.options.step){this.options.step.call(this.elem,this.now,this)}(o.fx.step[this.prop]||o.fx.step._default)(this);if((this.prop=="height"||this.prop=="width")&&this.elem.style){this.elem.style.display="block"}},cur:function(F){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null)){return this.elem[this.prop]}var E=parseFloat(o.css(this.elem,this.prop,F));return E&&E>-10000?E:parseFloat(o.curCSS(this.elem,this.prop))||0},custom:function(I,H,G){this.startTime=e();this.start=I;this.end=H;this.unit=G||this.unit||"px";this.now=this.start;this.pos=this.state=0;var E=this;function F(J){return E.step(J)}F.elem=this.elem;if(F()&&o.timers.push(F)&&!n){n=setInterval(function(){var K=o.timers;for(var J=0;J<K.length;J++){if(!K[J]()){K.splice(J--,1)}}if(!K.length){clearInterval(n);n=g}},13)}},show:function(){this.options.orig[this.prop]=o.attr(this.elem.style,this.prop);this.options.show=true;this.custom(this.prop=="width"||this.prop=="height"?1:0,this.cur());o(this.elem).show()},hide:function(){this.options.orig[this.prop]=o.attr(this.elem.style,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(H){var G=e();if(H||G>=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var E=true;for(var F in this.options.curAnim){if(this.options.curAnim[F]!==true){E=false}}if(E){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(o.css(this.elem,"display")=="none"){this.elem.style.display="block"}}if(this.options.hide){o(this.elem).hide()}if(this.options.hide||this.options.show){for(var I in this.options.curAnim){o.attr(this.elem.style,I,this.options.orig[I])}}this.options.complete.call(this.elem)}return false}else{var J=G-this.startTime;this.state=J/this.options.duration;this.pos=o.easing[this.options.easing||(o.easing.swing?"swing":"linear")](this.state,J,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update()}return true}};o.extend(o.fx,{speeds:{slow:600,fast:200,_default:400},step:{opacity:function(E){o.attr(E.elem.style,"opacity",E.now)},_default:function(E){if(E.elem.style&&E.elem.style[E.prop]!=null){E.elem.style[E.prop]=E.now+E.unit}else{E.elem[E.prop]=E.now}}}});if(document.documentElement.getBoundingClientRect){o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}var G=this[0].getBoundingClientRect(),J=this[0].ownerDocument,F=J.body,E=J.documentElement,L=E.clientTop||F.clientTop||0,K=E.clientLeft||F.clientLeft||0,I=G.top+(self.pageYOffset||o.boxModel&&E.scrollTop||F.scrollTop)-L,H=G.left+(self.pageXOffset||o.boxModel&&E.scrollLeft||F.scrollLeft)-K;return{top:I,left:H}}}else{o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}o.offset.initialized||o.offset.initialize();var J=this[0],G=J.offsetParent,F=J,O=J.ownerDocument,M,H=O.documentElement,K=O.body,L=O.defaultView,E=L.getComputedStyle(J,null),N=J.offsetTop,I=J.offsetLeft;while((J=J.parentNode)&&J!==K&&J!==H){M=L.getComputedStyle(J,null);N-=J.scrollTop,I-=J.scrollLeft;if(J===G){N+=J.offsetTop,I+=J.offsetLeft;if(o.offset.doesNotAddBorder&&!(o.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(J.tagName))){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}F=G,G=J.offsetParent}if(o.offset.subtractsBorderForOverflowNotVisible&&M.overflow!=="visible"){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}E=M}if(E.position==="relative"||E.position==="static"){N+=K.offsetTop,I+=K.offsetLeft}if(E.position==="fixed"){N+=Math.max(H.scrollTop,K.scrollTop),I+=Math.max(H.scrollLeft,K.scrollLeft)}return{top:N,left:I}}}o.offset={initialize:function(){if(this.initialized){return}var L=document.body,F=document.createElement("div"),H,G,N,I,M,E,J=L.style.marginTop,K='<div style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;"><div></div></div><table style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;" cellpadding="0" cellspacing="0"><tr><td></td></tr></table>';M={position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"};for(E in M){F.style[E]=M[E]}F.innerHTML=K;L.insertBefore(F,L.firstChild);H=F.firstChild,G=H.firstChild,I=H.nextSibling.firstChild.firstChild;this.doesNotAddBorder=(G.offsetTop!==5);this.doesAddBorderForTableAndCells=(I.offsetTop===5);H.style.overflow="hidden",H.style.position="relative";this.subtractsBorderForOverflowNotVisible=(G.offsetTop===-5);L.style.marginTop="1px";this.doesNotIncludeMarginInBodyOffset=(L.offsetTop===0);L.style.marginTop=J;L.removeChild(F);this.initialized=true},bodyOffset:function(E){o.offset.initialized||o.offset.initialize();var G=E.offsetTop,F=E.offsetLeft;if(o.offset.doesNotIncludeMarginInBodyOffset){G+=parseInt(o.curCSS(E,"marginTop",true),10)||0,F+=parseInt(o.curCSS(E,"marginLeft",true),10)||0}return{top:G,left:F}}};o.fn.extend({position:function(){var I=0,H=0,F;if(this[0]){var G=this.offsetParent(),J=this.offset(),E=/^body|html$/i.test(G[0].tagName)?{top:0,left:0}:G.offset();J.top-=j(this,"marginTop");J.left-=j(this,"marginLeft");E.top+=j(G,"borderTopWidth");E.left+=j(G,"borderLeftWidth");F={top:J.top-E.top,left:J.left-E.left}}return F},offsetParent:function(){var E=this[0].offsetParent||document.body;while(E&&(!/^body|html$/i.test(E.tagName)&&o.css(E,"position")=="static")){E=E.offsetParent}return o(E)}});o.each(["Left","Top"],function(F,E){var G="scroll"+E;o.fn[G]=function(H){if(!this[0]){return null}return H!==g?this.each(function(){this==l||this==document?l.scrollTo(!F?H:o(l).scrollLeft(),F?H:o(l).scrollTop()):this[G]=H}):this[0]==l||this[0]==document?self[F?"pageYOffset":"pageXOffset"]||o.boxModel&&document.documentElement[G]||document.body[G]:this[0][G]}});o.each(["Height","Width"],function(I,G){var E=I?"Left":"Top",H=I?"Right":"Bottom",F=G.toLowerCase();o.fn["inner"+G]=function(){return this[0]?o.css(this[0],F,false,"padding"):null};o.fn["outer"+G]=function(K){return this[0]?o.css(this[0],F,false,K?"margin":"border"):null};var J=G.toLowerCase();o.fn[J]=function(K){return this[0]==l?document.compatMode=="CSS1Compat"&&document.documentElement["client"+G]||document.body["client"+G]:this[0]==document?Math.max(document.documentElement["client"+G],document.body["scroll"+G],document.documentElement["scroll"+G],document.body["offset"+G],document.documentElement["offset"+G]):K===g?(this.length?o.css(this[0],J):null):this.css(J,typeof K==="string"?K:K+"px")}})})();
+	</script>
+	<!-- plugin -->
+	<script type="text/javascript">
+		/*
+		jQuery.twFile.js
+
+		jQuery plugin for loading a file and saving data to a file
+
+		Copyright (c) UnaMesa Association 2009
+
+		Triple licensed under the BSD, MIT and GPL licenses:
+		  http://www.opensource.org/licenses/bsd-license.php
+		  http://www.opensource.org/licenses/mit-license.php
+		  http://www.gnu.org/licenses/gpl.html
+		*/
+
+
+		(function($) {
+			if(!$.twFile) {
+				$.twFile = {};
+			}
+
+			$.extend($.twFile,{
+				currentDriver: null,
+				driverList: ["activeX", "mozilla", "tiddlySaver", "javaLiveConnect"],
+
+				// Loads the contents of a text file from the local file system
+				// filePath is the path to the file in these formats:
+				//    x:\path\path\path\filename - PC local file
+				//    \\server\share\path\path\path\filename - PC network file
+				//    /path/path/path/filename - Mac/Unix local file
+				// returns the text of the file, or null if the operation cannot be performed or false if there was an error
+				load: function(filePath) {
+					return this.getDriver().loadFile(filePath);
+				},
+				// Saves a string to a text file on the local file system
+				// filePath is the path to the file in the format described above
+				// content is the string to save
+				// returns true if the file was saved successfully, or null if the operation cannot be performed or false if there was an error
+				save: function(filePath,content) {
+					return this.getDriver().saveFile(filePath,content);
+				},
+				// Copies a file on the local file system
+				// dest is the path to the destination file in the format described above
+				// source is the path to the source file in the format described above
+				// returns true if the file was copied successfully, or null if the operation cannot be performed or false if there was an error
+				copy: function(dest,source) {
+					if(this.getDriver().copyFile)
+						return this.currentDriver.copyFile(dest,source);
+					else
+						return null;
+				},
+				// Converts a local file path from the format returned by document.location into the format expected by this plugin
+				// url is the original URL of the file
+				// returns the equivalent local file path
+				convertUriToLocalPath: function (url) {
+					// Remove any location or query part of the URL
+					var originalPath = url.split("#")[0].split("?")[0];
+					// Convert file://localhost/ to file:///
+					if(originalPath.indexOf("file://localhost/") == 0)
+						originalPath = "file://" + originalPath.substr(16);
+					// Convert to a native file format
+					//# "file:///x:/path/path/path..." - pc local file --> "x:\path\path\path..."
+					//# "file://///server/share/path/path/path..." - FireFox pc network file --> "\\server\share\path\path\path..."
+					//# "file:///path/path/path..." - mac/unix local file --> "/path/path/path..."
+					//# "file://server/share/path/path/path..." - pc network file --> "\\server\share\path\path\path..."
+					var localPath;
+					if(originalPath.charAt(9) == ":") // PC local file
+						localPath = unescape(originalPath.substr(8)).replace(new RegExp("/","g"),"\\");
+					else if(originalPath.indexOf("file://///") == 0) // Firefox PC network file
+						localPath = "\\\\" + unescape(originalPath.substr(10)).replace(new RegExp("/","g"),"\\");
+					else if(originalPath.indexOf("file:///") == 0) // Mac/UNIX local file
+						localPath = unescape(originalPath.substr(7));
+					else if(originalPath.indexOf("file:/") == 0) // Mac/UNIX local file
+						localPath = unescape(originalPath.substr(5));
+					else if(originalPath.indexOf("//") == 0) // PC network file
+						localPath = "\\\\" + unescape(originalPath.substr(7)).replace(new RegExp("/","g"),"\\");
+					return localPath || originalPath;
+				},
+
+				// Private functions
+
+				// Returns a reference to the current driver
+				getDriver: function() {
+					if(this.currentDriver === null) {
+						for(var t=0; t<this.driverList.length; t++) {
+							if(this.currentDriver === null && drivers[this.driverList[t]].isAvailable && drivers[this.driverList[t]].isAvailable())
+								this.currentDriver = drivers[this.driverList[t]];
+						}
+					}
+					return this.currentDriver;
+				}
+			});
+
+			// Deferred initialisation for any drivers that need it
+			$(function() {
+				for(var t in drivers) {
+					if(drivers[t].deferredInit)
+						drivers[t].deferredInit();
+				}
+			});
+
+			// Private driver implementations for each browser
+
+			var drivers = {};
+
+			// Internet Explorer driver
+
+			drivers.activeX = {
+				name: "activeX",
+				isAvailable: function() {
+					try {
+						var fso = new ActiveXObject("Scripting.FileSystemObject");
+					} catch(ex) {
+						return false;
+					}
+					return true;
+				},
+				loadFile: function(filePath) {
+					// Returns null if it can't do it, false if there's an error, or a string of the content if successful
+					try {
+						var fso = new ActiveXObject("Scripting.FileSystemObject");
+						var file = fso.OpenTextFile(filePath,1);
+						var content = file.ReadAll();
+						file.Close();
+					} catch(ex) {
+						//# alert("Exception while attempting to load\n\n" + ex.toString());
+						return null;
+					}
+					return content;
+				},
+				createPath: function(path) {
+					//# Remove the filename, if present. Use trailing slash (i.e. "foo\bar\") if no filename.
+					var pos = path.lastIndexOf("\\");
+					if(pos!=-1)
+						path = path.substring(0,pos+1);
+					//# Walk up the path until we find a folder that exists
+					var scan = [path];
+					try {
+						var fso = new ActiveXObject("Scripting.FileSystemObject");
+						var parent = fso.GetParentFolderName(path);
+						while(parent && !fso.FolderExists(parent)) {
+							scan.push(parent);
+							parent = fso.GetParentFolderName(parent);
+						}
+						//# Walk back down the path, creating folders
+						for(i=scan.length-1;i>=0;i--) {
+							if(!fso.FolderExists(scan[i])) {
+								fso.CreateFolder(scan[i]);
+							}
+						}
+						return true;
+					} catch(ex) {
+					}
+					return false;
+				},
+				copyFile: function(dest,source) {
+					drivers.activeX.createPath(dest);
+					try {
+						var fso = new ActiveXObject("Scripting.FileSystemObject");
+						fso.GetFile(source).Copy(dest);
+					} catch(ex) {
+						return false;
+					}
+					return true;
+				},
+				saveFile: function(filePath,content) {
+					// Returns null if it can't do it, false if there's an error, true if it saved OK
+					drivers.activeX.createPath(filePath);
+					try {
+						var fso = new ActiveXObject("Scripting.FileSystemObject");
+						var file = fso.OpenTextFile(filePath,2,-1,0);
+						file.Write(content);
+						file.Close();
+					} catch (ex) {
+						return null;
+					}
+					return true;
+				}
+			};
+
+			// Mozilla driver
+
+			drivers.mozilla = {
+				name: "mozilla",
+				isAvailable: function() {
+					return !!window.Components;
+				},
+				loadFile: function(filePath) {
+					// Returns null if it can't do it, false if there's an error, or a string of the content if successful
+					if(window.Components) {
+						try {
+							netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+							var file = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
+							file.initWithPath(filePath);
+							if(!file.exists())
+								return null;
+							var inputStream = Components.classes["@mozilla.org/network/file-input-stream;1"].createInstance(Components.interfaces.nsIFileInputStream);
+							inputStream.init(file,0x01,00004,null);
+							var sInputStream = Components.classes["@mozilla.org/scriptableinputstream;1"].createInstance(Components.interfaces.nsIScriptableInputStream);
+							sInputStream.init(inputStream);
+							var contents = sInputStream.read(sInputStream.available());
+							sInputStream.close();
+							inputStream.close();
+							return contents;
+						} catch(ex) {
+							//# alert("Exception while attempting to load\n\n" + ex);
+							return false;
+						}
+					}
+					return null;
+				},
+				saveFile: function(filePath,content) {
+					// Returns null if it can't do it, false if there's an error, true if it saved OK
+					if(window.Components) {
+						try {
+							netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+							var file = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
+							file.initWithPath(filePath);
+							if(!file.exists())
+								file.create(0,0664);
+							var out = Components.classes["@mozilla.org/network/file-output-stream;1"].createInstance(Components.interfaces.nsIFileOutputStream);
+							out.init(file,0x20|0x02,00004,null);
+							out.write(content,content.length);
+							out.flush();
+							out.close();
+							return true;
+						} catch(ex) {
+							alert("Exception while attempting to save\n\n" + ex);
+							return false;
+						}
+					}
+					return null;
+				}
+			};
+
+			// TiddlySaver driver
+
+			drivers.tiddlySaver = {
+				name: "tiddlySaver",
+				deferredInit: function() {
+					if(!document.applets["TiddlySaver"] && !$.browser.mozilla && !$.browser.msie && document.location.toString().substr(0,5) == "file:") {
+						$(document.body).append("<applet style='position:absolute;left:-1px' name='TiddlySaver' code='TiddlySaver.class' archive='TiddlySaver.jar' width='1'height='1'></applet>");
+					}
+				},
+				isAvailable: function() {
+					return !!document.applets["TiddlySaver"];
+				},
+				loadFile: function(filePath) {
+					var r;
+					try {
+						if(document.applets["TiddlySaver"]) {
+							r = document.applets["TiddlySaver"].loadFile(javaUrlToFilename(filePath),"UTF-8");
+							return (r === undefined || r === null) ? null : String(r);
+						}
+					} catch(ex) {
+					}
+					return null;
+				},
+				saveFile: function(filePath,content) {
+					try {
+						if(document.applets["TiddlySaver"])
+							return document.applets["TiddlySaver"].saveFile(javaUrlToFilename(filePath),"UTF-8",content);
+					} catch(ex) {
+					}
+					return null;
+				}
+			}
+
+			// Java LiveConnect driver
+
+			drivers.javaLiveConnect = {
+				name: "javaLiveConnect",
+				isAvailable: function() {
+					return !!window.java && !!window.java.io && !!window.java.io.FileReader;
+				},
+				loadFile: function(filePath) {
+					var r;
+					var content = [];
+					try {
+						r = new java.io.BufferedReader(new java.io.FileReader(javaUrlToFilename(filePath)));
+						var line;
+						while((line = r.readLine()) != null)
+							content.push(new String(line));
+						r.close();
+					} catch(ex) {
+						return null;
+					}
+					return content.join("\n") + "\n";
+				},
+				saveFile: function(filePath,content) {
+					try {
+						var s = new java.io.PrintStream(new java.io.FileOutputStream(javaUrlToFilename(filePath)));
+						s.print(content);
+						s.close();
+					} catch(ex) {
+						return null;
+					}
+					return true;
+				}
+			}
+
+			// Private utilities
+
+			function javaUrlToFilename(url) {
+				var f = "//localhost";
+				if(url.indexOf(f) == 0)
+						return url.substring(f.length);
+				var i = url.indexOf(":");
+				return i > 0 ? url.substring(i-1) : url;
+			}
+
+		})(jQuery);
+	</script>
+	<!-- demo code -->
+	<script type="text/javascript">
+		// Run on document load
+		jQuery(function() {
+			var $ = jQuery; // local alias
+			// When the edit button is clicked, open an editing box
+			// over the page to edit the html of the page. On save,
+			// the page reloads with the changes.
+			$('#editButton').click(function() {
+				var filepath = document.location.href; // Get the current file
+				filepath = $.twFile.convertUriToLocalPath(filepath); // Convert the path to a readable format
+				var text = $.twFile.load(filepath); // Load the file
+				// If the file loads succesfully create an editing element
+				if(text){
+					// Create a textarea
+					var textarea = $("<textarea></textarea>").css({
+						margin: "8px auto 0",
+						display: "block",
+						width: "90%",
+						height: "90%"
+					}).text(text);
+					// Create a save button
+					var dButton = $('<input type="button" value="Save">').click(function(){
+						// On click, write the value of the textarea to file
+						$.twFile.save(filepath, textarea.val());
+						// Reload the file
+						box.animate({ opacity: 0 }, function() {
+							window.location.reload();
+						});
+					});
+					// Create a div to contain the text area
+					var box = $("<div></div>").css({
+						position: "fixed",
+						textAlign: "center",
+						top:"0",
+						left: "0",
+						width: "100%",
+						height: "100%",
+						opacity: "0",
+						background: "black"
+					}).append(textarea).append(dButton);
+					$("body").append(box);
+					// Fade in
+					box.animate({ opacity: 1 });
+				} else {
+					// Show an error message on fail
+					$("#error").fadeIn();
+				}
+		})
+	});
+	</script>
+</body>
+
+</html>
diff --git a/test/data/tiddlywiki/jquery/plugins/doc/twStylesheet.html b/test/data/tiddlywiki/jquery/plugins/doc/twStylesheet.html
new file mode 100755
index 000000000..3b8b6a7d6
--- /dev/null
+++ b/test/data/tiddlywiki/jquery/plugins/doc/twStylesheet.html
@@ -0,0 +1,94 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>jQuery.twStylesheet</title>
+	<link rel="stylesheet" type="text/css" href="styles/main.css">
+	<script src="http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js" type="text/javascript"></script>
+	<script src="http://svn.tiddlywiki.org/Trunk/core/jquery/plugins/jQuery.twStylesheet.js" type="text/javascript"></script>
+	<script type="text/javascript">
+		$(function() {
+			var applyCSS = function() {
+				var css = $("#css_code").val();
+				$.twStylesheet(css);
+			};
+
+			var resetCSS = function() {
+				$.twStylesheet.remove();
+			};
+
+			$("#css_apply").click(applyCSS);
+			$("#css_reset").click(resetCSS);
+
+			// initialize
+			$("#css_code").val(
+				"html { background-color: #EEE; }\n" +
+				"body { color: #FFF; background-color: #000; }\n" +
+				"h1, h2 { font-variant: small-caps; }\n" +
+				"ul { list-style-type: square; }\n" +
+				"code { padding: 1px 2px; background-color: #EEE; }\n" +
+				"#css_editor, #css_editor legend { background-color: #888; }\n"
+			);
+		});
+	</script>
+</head>
+
+<body>
+	<h1>jQuery.twStylesheet</h1>
+	<p>
+		This <a href="http://jquery.com">jQuery</a> plugin allows the application
+		of CSS rule sets to the document.
+	</p>
+	<p>
+		In contrast to jQuery's <a href="http://docs.jquery.com/CSS">CSS methods</a>,
+		it applies styles to the document rather than to individual elements (just
+		like defining a static style sheet in the document head).
+	</p>
+	<p>
+		The code is based on <a href="http://tiddlywiki.com">TiddlyWiki</a>'s dynamic
+		style-sheet capabilities, where it is used to allow users to customize their
+		documents on the fly.
+	</p>
+
+	<h2>Source</h2>
+	<p>
+		The source code is currently hosted in TiddlyWiki's
+		<a href="http://svn.tiddlywiki.org/Trunk/core/jquery/plugins/jQuery.twStylesheet.js">Subversion repository</a>.
+	</p>
+	<p>
+		<a href="http://groups.google.com/group/TiddlyWikiDev/">Feedback</a> is welcome.
+	</p>
+
+	<h2>API Summary</h2>
+	<ul>
+		<li>
+			<p><code>$.twStylesheet(css[, options])</code>: adds or replaces a style sheet</p>
+			<p>
+				<code>css</code> is a string containing the CSS rule sets, while
+				<code>options.id</code> is an optional name identifying the style sheet, allowing
+				co-existence of multiple style sheets
+			</p>
+		</li>
+		<li>
+			<p>
+				<code>$.twStylesheet.remove([options])</code>: delete an existing style sheet
+			</p>
+			<p>
+				The <code>options</code> argument is identical to <code>$.twStylesheet</code>'s.
+			</p>
+		</li>
+	</ul>
+	<p>(full documentation in the code comments)</p>
+
+	<h2>Demo</h2>
+	This will apply the CSS rule sets below to the entire document.
+	<fieldset id="css_editor" class="editor">
+		<legend>CSS</legend>
+		<textarea id="css_code" rows="10" cols="70"></textarea>
+		<input id="css_apply" type="button" value="Apply">
+		<input id="css_reset" type="button" value="Reset">
+	</fieldset>
+</body>
+
+</html>
diff --git a/test/data/tiddlywiki/jquery/plugins/doc/update b/test/data/tiddlywiki/jquery/plugins/doc/update
new file mode 100755
index 000000000..1be8cde57
--- /dev/null
+++ b/test/data/tiddlywiki/jquery/plugins/doc/update
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+# Usage:
+#  upload [user]
+
+REMOTE_USER=${1:-$USER}
+HOST="jquery.tiddlywiki.org"
+DIR="/var/www/www.jquery.tiddlywiki.org/htdocs/"
+
+COMMANDS="ssh $REMOTE_USER@$HOST"
+COMMANDS="$COMMANDS cd $DIR;"
+COMMANDS="$COMMANDS sudo svn update;"
+$COMMANDS
diff --git a/test/data/tiddlywiki/jquery/plugins/jQuery.encoding.digests.sha1.js b/test/data/tiddlywiki/jquery/plugins/jQuery.encoding.digests.sha1.js
new file mode 100755
index 000000000..db026415c
--- /dev/null
+++ b/test/data/tiddlywiki/jquery/plugins/jQuery.encoding.digests.sha1.js
@@ -0,0 +1,155 @@
+/*
+jQuery.encoding.digests.sha1.js
+
+SHA-1 digest and associated utility functions
+
+Copyright (c) UnaMesa Association 2009
+
+Dual licensed under the MIT and GPL licenses:
+  http://www.opensource.org/licenses/mit-license.php
+  http://www.gnu.org/licenses/gpl.html
+*/
+
+(function($) {
+
+if(!$.encoding)
+	$.encoding = {};
+	$.extend($.encoding,{
+		strToBe32s: function(str) {
+			// Convert a string to an array of big-endian 32-bit words
+			var be=[];
+			var len=Math.floor(str.length/4);
+			var i, j;
+			for(i=0, j=0; i<len; i++, j+=4) {
+				be[i]=((str.charCodeAt(j)&0xff) << 24)|((str.charCodeAt(j+1)&0xff) << 16)|((str.charCodeAt(j+2)&0xff) << 8)|(str.charCodeAt(j+3)&0xff);
+			}
+			while(j<str.length) {
+				be[j>>2] |= (str.charCodeAt(j)&0xff)<<(24-(j*8)%32);
+				j++;
+			}
+			return be;
+		},
+		be32sToStr: function(be) {
+			// Convert an array of big-endian 32-bit words to a string
+			var str='';
+			for(var i=0;i<be.length*32;i+=8) {
+				str += String.fromCharCode((be[i>>5]>>>(24-i%32)) & 0xff);
+			}
+			return str;
+		},
+		be32sToHex: function(be) {
+			// Convert an array of big-endian 32-bit words to a hex string
+			var hex='0123456789ABCDEF';
+			var str='';
+			for(var i=0;i<be.length*4;i++) {
+				str += hex.charAt((be[i>>2]>>((3-i%4)*8+4))&0xF) + hex.charAt((be[i>>2]>>((3-i%4)*8))&0xF);
+			}
+			return str;
+		}
+	});
+})(jQuery);
+
+
+(function($) {
+
+if(!$.encoding.digests)
+	$.encoding.digests = {};
+	$.extend($.encoding.digests,{
+		hexSha1Str: function(str) {
+			// Return, in hex, the SHA-1 hash of a string
+			return $.encoding.be32sToHex($.encoding.digests.sha1Str(str));
+		},
+		sha1Str: function(str) {
+			// Return the SHA-1 hash of a string
+			return sha1($.encoding.strToBe32s(str),str.length);
+		},
+		sha1: function(x,blen) {
+			// Calculate the SHA-1 hash of an array of blen bytes of big-endian 32-bit words
+			return sha1($.encoding.strToBe32s(str),str.length);
+		}
+	});
+
+	// Private functions.
+	function sha1(x,blen) {
+		// Calculate the SHA-1 hash of an array of blen bytes of big-endian 32-bit words
+		function add32(a,b) {
+			// Add 32-bit integers, wrapping at 32 bits
+			// Uses 16-bit operations internally to work around bugs in some JavaScript interpreters.
+			var lsw=(a&0xFFFF)+(b&0xFFFF);
+			var msw=(a>>16)+(b>>16)+(lsw>>16);
+			return (msw<<16)|(lsw&0xFFFF);
+		}
+		function AA(a,b,c,d,e) {
+			// Cryptographic round helper function. Add five 32-bit integers, wrapping at 32 bits, second parameter is rotated left 5 bits before the addition
+			// Uses 16-bit operations internally to work around bugs in some JavaScript interpreters.
+			b=(b>>>27)|(b<<5);
+			var lsw=(a&0xFFFF)+(b&0xFFFF)+(c&0xFFFF)+(d&0xFFFF)+(e&0xFFFF);
+			var msw=(a>>16)+(b>>16)+(c>>16)+(d>>16)+(e>>16)+(lsw>>16);
+			return (msw<<16)|(lsw&0xFFFF);
+		}
+		function RR(w,j) {
+			// Cryptographic round helper function.
+			var n=w[j-3]^w[j-8]^w[j-14]^w[j-16];
+			return (n>>>31)|(n<<1);
+		}
+
+		var len=blen*8;
+		//# Append padding so length in bits is 448 mod 512
+		x[len>>5] |= 0x80 << (24-len%32);
+		//# Append length
+		x[((len+64>>9)<<4)+15]=len;
+		var w=new Array(80);
+
+		var k1=0x5A827999;
+		var k2=0x6ED9EBA1;
+		var k3=0x8F1BBCDC;
+		var k4=0xCA62C1D6;
+
+		var h0=0x67452301;
+		var h1=0xEFCDAB89;
+		var h2=0x98BADCFE;
+		var h3=0x10325476;
+		var h4=0xC3D2E1F0;
+
+		for(var i=0;i<x.length;i+=16) {
+			var j=0;
+			var t;
+			var a=h0;
+			var b=h1;
+			var c=h2;
+			var d=h3;
+			var e=h4;
+			while(j<16) {
+				w[j]=x[i+j];
+				t=AA(e,a,d^(b&(c^d)),w[j],k1);
+				e=d; d=c; c=(b>>>2)|(b<<30); b=a; a=t; j++;
+			}
+			while(j<20) {
+				w[j]=RR(w,j);
+				t=AA(e,a,d^(b&(c^d)),w[j],k1);
+				e=d; d=c; c=(b>>>2)|(b<<30); b=a; a=t; j++;
+			}
+			while(j<40) {
+				w[j]=RR(w,j);
+				t=AA(e,a,b^c^d,w[j],k2);
+				e=d; d=c; c=(b>>>2)|(b<<30); b=a; a=t; j++;
+			}
+			while(j<60) {
+				w[j]=RR(w,j);
+				t=AA(e,a,(b&c)|(d&(b|c)),w[j],k3);
+				e=d; d=c; c=(b>>>2)|(b<<30); b=a; a=t; j++;
+			}
+			while(j<80) {
+				w[j]=RR(w,j);
+				t=AA(e,a,b^c^d,w[j],k4);
+				e=d; d=c; c=(b>>>2)|(b<<30); b=a; a=t; j++;
+			}
+			h0=add32(h0,a);
+			h1=add32(h1,b);
+			h2=add32(h2,c);
+			h3=add32(h3,d);
+			h4=add32(h4,e);
+		}
+		return [h0,h1,h2,h3,h4];
+	}
+})(jQuery);
diff --git a/test/data/tiddlywiki/jquery/plugins/jQuery.twFile.js b/test/data/tiddlywiki/jquery/plugins/jQuery.twFile.js
new file mode 100755
index 000000000..1967e30c4
--- /dev/null
+++ b/test/data/tiddlywiki/jquery/plugins/jQuery.twFile.js
@@ -0,0 +1,333 @@
+/*
+jQuery.twFile.js
+
+jQuery plugin for loading a file and saving data to a file
+
+Copyright (c) UnaMesa Association 2009
+
+Triple licensed under the BSD, MIT and GPL licenses:
+  http://www.opensource.org/licenses/bsd-license.php
+  http://www.opensource.org/licenses/mit-license.php
+  http://www.gnu.org/licenses/gpl.html
+*/
+
+
+(function($) {
+	if(!$.twFile) {
+		$.twFile = {};
+	}
+
+	$.extend($.twFile,{
+		currentDriver: null,
+		driverList: ["tiddlySaver", "activeX","javaLiveConnect", "mozilla"],
+
+		// Loads the contents of a text file from the local file system
+		// filePath is the path to the file in these formats:
+		//    x:\path\path\path\filename - PC local file
+		//    \\server\share\path\path\path\filename - PC network file
+		//    /path/path/path/filename - Mac/Unix local file
+		// returns the text of the file, or null if the operation cannot be performed or false if there was an error
+		load: function(filePath) {
+			var d = this.getDriver();
+			return d ? d.loadFile(filePath) : null;
+		},
+		// Saves a string to a text file on the local file system
+		// filePath is the path to the file in the format described above
+		// content is the string to save
+		// returns true if the file was saved successfully, or null if the operation cannot be performed or false if there was an error
+		save: function(filePath,content) {
+			var d = this.getDriver();
+			return d ? d.saveFile(filePath,content) : null;
+		},
+		// Copies a file on the local file system
+		// dest is the path to the destination file in the format described above
+		// source is the path to the source file in the format described above
+		// returns true if the file was copied successfully, or null if the operation cannot be performed or false if there was an error
+		copy: function(dest,source) {
+			var d = this.getDriver();
+			if(d && d.copyFile)
+				return d.copyFile(dest,source);
+			else
+				return null;
+		},
+		// Converts a local file path from the format returned by document.location into the format expected by this plugin
+		// url is the original URL of the file
+		// returns the equivalent local file path
+		convertUriToLocalPath: function (url) {
+			// Remove any location or query part of the URL
+			var originalPath = url.split("#")[0].split("?")[0];
+			// Convert file://localhost/ to file:///
+			if(originalPath.indexOf("file://localhost/") == 0)
+				originalPath = "file://" + originalPath.substr(16);
+			// Convert to a native file format
+			//# "file:///x:/path/path/path..." - pc local file --> "x:\path\path\path..."
+			//# "file://///server/share/path/path/path..." - FireFox pc network file --> "\\server\share\path\path\path..."
+			//# "file:///path/path/path..." - mac/unix local file --> "/path/path/path..."
+			//# "file://server/share/path/path/path..." - pc network file --> "\\server\share\path\path\path..."
+			var localPath;
+			if(originalPath.charAt(9) == ":") // PC local file
+				localPath = unescape(originalPath.substr(8)).replace(new RegExp("/","g"),"\\");
+			else if(originalPath.indexOf("file://///") == 0) // Firefox PC network file
+				localPath = "\\\\" + unescape(originalPath.substr(10)).replace(new RegExp("/","g"),"\\");
+			else if(originalPath.indexOf("file:///") == 0) // Mac/UNIX local file
+				localPath = unescape(originalPath.substr(7));
+			else if(originalPath.indexOf("file:/") == 0) // Mac/UNIX local file
+				localPath = unescape(originalPath.substr(5));
+			else if(originalPath.indexOf("//") == 0) // PC network file
+				localPath = "\\\\" + unescape(originalPath.substr(7)).replace(new RegExp("/","g"),"\\");
+			return localPath || originalPath;
+		},
+
+		// Deferred initialization for any drivers that need it
+		// returns a Deferred object so callback that executes as soon
+		// as twFile is ready can be attached
+		initialize: function() {
+			return $.Deferred(function(dfd) {
+				for(var t in drivers) {
+					if(drivers[t].deferredInit)
+						drivers[t].deferredInit();
+				}
+				// Kludge: give the <applet> some time to load
+				setTimeout(dfd.resolve, 0);
+			});
+		},
+
+		// Private functions
+
+		// Returns a reference to the current driver
+		getDriver: function() {
+			if(this.currentDriver === null) {
+				for(var t=0; t<this.driverList.length; t++) {
+					if(this.currentDriver === null && drivers[this.driverList[t]].isAvailable && drivers[this.driverList[t]].isAvailable())
+						this.currentDriver = drivers[this.driverList[t]];
+				}
+			}
+			return this.currentDriver;
+		}
+	});
+
+	// Automatically initialize on document.ready()
+	$(function() {
+		$.twFile.initialize();
+	});
+
+	// Private driver implementations for each browser
+
+	var drivers = {};
+
+	// Internet Explorer driver
+
+	drivers.activeX = {
+		name: "activeX",
+		isAvailable: function() {
+			try {
+				var fso = new ActiveXObject("Scripting.FileSystemObject");
+			} catch(ex) {
+				return false;
+			}
+			return true;
+		},
+		loadFile: function(filePath) {
+			// Returns null if it can't do it, false if there's an error, or a string of the content if successful
+			try {
+				var fso = new ActiveXObject("Scripting.FileSystemObject");
+				var file = fso.OpenTextFile(filePath,1);
+				var content = file.ReadAll();
+				file.Close();
+			} catch(ex) {
+				//# alert("Exception while attempting to load\n\n" + ex.toString());
+				return null;
+			}
+			return content;
+		},
+		createPath: function(path) {
+			//# Remove the filename, if present. Use trailing slash (i.e. "foo\bar\") if no filename.
+			var pos = path.lastIndexOf("\\");
+			if(pos!=-1)
+				path = path.substring(0,pos+1);
+			//# Walk up the path until we find a folder that exists
+			var scan = [path];
+			try {
+				var fso = new ActiveXObject("Scripting.FileSystemObject");
+				var parent = fso.GetParentFolderName(path);
+				while(parent && !fso.FolderExists(parent)) {
+					scan.push(parent);
+					parent = fso.GetParentFolderName(parent);
+				}
+				//# Walk back down the path, creating folders
+				for(i=scan.length-1;i>=0;i--) {
+					if(!fso.FolderExists(scan[i])) {
+						fso.CreateFolder(scan[i]);
+					}
+				}
+				return true;
+			} catch(ex) {
+			}
+			return false;
+		},
+		copyFile: function(dest,source) {
+			drivers.activeX.createPath(dest);
+			try {
+				var fso = new ActiveXObject("Scripting.FileSystemObject");
+				fso.GetFile(source).Copy(dest);
+			} catch(ex) {
+				return false;
+			}
+			return true;
+		},
+		saveFile: function(filePath,content) {
+			// Returns null if it can't do it, false if there's an error, true if it saved OK
+			drivers.activeX.createPath(filePath);
+			try {
+				var fso = new ActiveXObject("Scripting.FileSystemObject");
+				var file = fso.OpenTextFile(filePath,2,-1,0);
+				file.Write(content);
+				file.Close();
+			} catch (ex) {
+				return null;
+			}
+			return true;
+		}
+	};
+
+	// Mozilla driver
+
+	drivers.mozilla = {
+		name: "mozilla",
+		isAvailable: function() {
+			return !!window.Components;
+		},
+		loadFile: function(filePath) {
+			// Returns null if it can't do it, false if there's an error, or a string of the content if successful
+			if(window.Components) {
+				try {
+					netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+					var file = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
+					file.initWithPath(filePath);
+					if(!file.exists())
+						return null;
+					var inputStream = Components.classes["@mozilla.org/network/file-input-stream;1"].createInstance(Components.interfaces.nsIFileInputStream);
+					inputStream.init(file,0x01,00004,null);
+					var sInputStream = Components.classes["@mozilla.org/scriptableinputstream;1"].createInstance(Components.interfaces.nsIScriptableInputStream);
+					sInputStream.init(inputStream);
+					var contents = sInputStream.read(sInputStream.available());
+					sInputStream.close();
+					inputStream.close();
+					return contents;
+				} catch(ex) {
+					//# alert("Exception while attempting to load\n\n" + ex);
+					return false;
+				}
+			}
+			return null;
+		},
+		saveFile: function(filePath,content) {
+			// Returns null if it can't do it, false if there's an error, true if it saved OK
+			if(window.Components) {
+				try {
+					netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+					var file = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
+					file.initWithPath(filePath);
+					if(!file.exists())
+						file.create(0,0664);
+					var out = Components.classes["@mozilla.org/network/file-output-stream;1"].createInstance(Components.interfaces.nsIFileOutputStream);
+					out.init(file,0x20|0x02,00004,null);
+					out.write(content,content.length);
+					out.flush();
+					out.close();
+					return true;
+				} catch(ex) {
+					alert("Exception while attempting to save\n\n" + ex);
+					return false;
+				}
+			}
+			return null;
+		}
+	};
+
+	// TiddlySaver driver
+
+	drivers.tiddlySaver = {
+		name: "tiddlySaver",
+		deferredInit: function() {
+			if(!document.applets["TiddlySaver"] && /* !$.browser.mozilla && !$.browser.msie && */ document.location.toString().substr(0,5) == "file:") {
+				$(document.body).append("<applet style='position:absolute;left:-1px' name='TiddlySaver' code='TiddlySaver.class' archive='TiddlySaver.jar' width='1'height='1'></applet>");
+			}
+		},
+		isAvailable: function() {
+			var isReady = false;
+			try {
+				isReady = !!document.applets["TiddlySaver"] &&
+						  ($.browser.msie || document.applets["TiddlySaver"].isActive) &&
+						  ( document.applets["TiddlySaver"].isActive() );
+			} catch (ex) {
+				isReady = false;
+			}
+			return isReady;
+		},
+		loadFile: function(filePath) {
+			var r;
+			try {
+				if(document.applets["TiddlySaver"]) {
+					r = document.applets["TiddlySaver"].loadFile(javaUrlToFilename(filePath),"UTF-8");
+					return (r === undefined || r === null) ? null : String(r);
+				}
+			} catch(ex) {
+			}
+			return null;
+		},
+		saveFile: function(filePath,content) {
+			try {
+				if(document.applets["TiddlySaver"])
+					return document.applets["TiddlySaver"].saveFile(javaUrlToFilename(filePath),"UTF-8",content);
+			} catch(ex) {
+			}
+			return null;
+		}
+	};
+
+	// Java LiveConnect driver
+
+	drivers.javaLiveConnect = {
+		name: "javaLiveConnect",
+		isAvailable: function() {
+			return !!window.java && !!window.java.io && !!window.java.io.FileReader;
+		},
+		loadFile: function(filePath) {
+			var r;
+			var content = [];
+			try {
+				r = new java.io.BufferedReader(new java.io.FileReader(javaUrlToFilename(filePath)));
+				var line;
+				while((line = r.readLine()) != null)
+					content.push(new String(line));
+				r.close();
+			} catch(ex) {
+				return null;
+			}
+			return content.join("\n") + "\n";
+		},
+		saveFile: function(filePath,content) {
+			try {
+				var s = new java.io.PrintStream(new java.io.FileOutputStream(javaUrlToFilename(filePath)));
+				s.print(content);
+				s.close();
+			} catch(ex) {
+				return null;
+			}
+			return true;
+		}
+	};
+
+	// Private utilities
+
+	function javaUrlToFilename(url) {
+		var f = "//localhost";
+		if(url.indexOf(f) == 0)
+				return url.substring(f.length);
+		var i = url.indexOf(":");
+		return i > 0 ? url.substring(i-1) : url;
+	}
+
+})(jQuery);
+
diff --git a/test/data/tiddlywiki/jquery/plugins/jQuery.twStylesheet.js b/test/data/tiddlywiki/jquery/plugins/jQuery.twStylesheet.js
new file mode 100755
index 000000000..7ef4da4b9
--- /dev/null
+++ b/test/data/tiddlywiki/jquery/plugins/jQuery.twStylesheet.js
@@ -0,0 +1,64 @@
+/*
+jQuery.twStylesheet.js
+
+jQuery plugin to dynamically insert CSS rules into a document
+
+Usage:
+  jQuery.twStylesheet applies style definitions
+  jQuery.twStylesheet.remove neutralizes style definitions
+
+Copyright (c) UnaMesa Association 2009
+
+Triple licensed under the BSD, MIT and GPL licenses:
+  http://www.opensource.org/licenses/bsd-license.php
+  http://www.opensource.org/licenses/mit-license.php
+  http://www.gnu.org/licenses/gpl.html
+*/
+
+(function($) {
+
+var defaultId = "customStyleSheet"; // XXX: rename to dynamicStyleSheet?
+
+// Add or replace a style sheet
+// css argument is a string of CSS rule sets
+// options.id is an optional name identifying the style sheet
+// options.doc is an optional document reference
+// N.B.: Uses DOM methods instead of jQuery to ensure cross-browser comaptibility.
+$.twStylesheet = function(css, options) {
+	options = options || {};
+	var id = options.id || defaultId;
+	var doc = options.doc || document;
+	var el = doc.getElementById(id);
+	if(doc.createStyleSheet) { // IE-specific handling
+		if(el) {
+			el.parentNode.removeChild(el);
+		}
+		doc.getElementsByTagName("head")[0].insertAdjacentHTML("beforeEnd",
+			'&nbsp;<style id="' + id + '" type="text/css">' + css + '</style>'); // fails without &nbsp;
+	} else { // modern browsers
+		if(el) {
+			el.replaceChild(doc.createTextNode(css), el.firstChild);
+		} else {
+			el = doc.createElement("style");
+			el.type = "text/css";
+			el.id = id;
+			el.appendChild(doc.createTextNode(css));
+			doc.getElementsByTagName("head")[0].appendChild(el);
+		}
+	}
+};
+
+// Remove existing style sheet
+// options.id is an optional name identifying the style sheet
+// options.doc is an optional document reference
+$.twStylesheet.remove = function(options) {
+	options = options || {};
+	var id = options.id || defaultId;
+	var doc = options.doc || document;
+	var el = doc.getElementById(id);
+	if(el) {
+		el.parentNode.removeChild(el);
+	}
+};
+
+})(jQuery);
diff --git a/test/data/tiddlywiki/jquery/plugins/jquery.gettext-1.0.4.js b/test/data/tiddlywiki/jquery/plugins/jquery.gettext-1.0.4.js
new file mode 100755
index 000000000..a0d661182
--- /dev/null
+++ b/test/data/tiddlywiki/jquery/plugins/jquery.gettext-1.0.4.js
@@ -0,0 +1,139 @@
+/**
+ * gettext for jQuery
+ * 
+ * Copyright (c) 2008 Sabin Iacob (m0n5t3r) <iacobs@m0n5t3r.info>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details. 
+ *
+ * @license http://www.gnu.org/licenses/gpl.html 
+ * @project jquery.gettext
+ *
+ * Usage:
+ * 
+ * This plugin expects its input data to be a JSON object like 
+ * {"": header, "string": "translation", ...} 
+ *
+ * After getting the server side set up (either as a static file - my choice - or 
+ * as a web service), the client side is simple:
+ *  * add to the head section of the page something like 
+ *    <link href="path/to/translation.json" lang="ro" rel="gettext"/>
+ *  * in your script, use $.gt.gettext(string) or _(string); for plural forms, use
+ *    $.gt.ngettext(sg, pl1[, pl2, ...], count) or n_(sg, pl1[, pl2, ...], count)
+ *  * to extract strings to a .po file, you can use standard gettext utilities like
+ *    xgettext and msgfmt; to generate the JSON, one could use the following Python 
+ *    snippet, assuming a domain.mo file exists under path/lang/LC_MESSAGES:
+ *
+ *    import simplejson as enc
+ * 
+ *    def gettext_json(domain, path, lang = [], indent = False):
+ *        try:
+ *            tr = gettext.translation(domain, path, lang)
+ *            return enc.dumps(tr._catalog, ensure_ascii = False, indent = indent)
+ *        except IOError:
+ *            return None
+ *
+ *    why go through the additional hassle of gettext? well, it's a matter of 
+ *    preference, the main advantags I see are:
+ *     * well known editing tools like KBabel, poEdit, gtranslator, Emacs PO mode, 
+ *       etc.
+ *     * translation memory, fuzzy matches and other features that get really 
+ *       helpful when your application is big and you have hundreds of strings
+ */
+(function($) {
+	$.gt = $.gt || {};
+
+	$.extend($.gt, {
+		messages: {},
+		lang: 'C',
+		setLang: function(code) { $.gt.lang = typeof code == 'string' && code != ' ' ? code : 'C'; },
+		pl_re: /^Plural-Forms:\s*nplurals\s*=\s*(\d+);\s*plural\s*=\s*([^a-zA-Z0-9\$]*([a-zA-Z0-9\$]+).+)$/m,
+		plural: function(n) {return n != 1;},
+		load: function() {
+			$('link[rel=gettext]').each(function(){
+				var lang = this.lang;
+				$.get(this.href, function(data){
+					$.gt.messages[lang] = $.gt.messages[lang] || {};
+					try {
+						var messages = eval('(' + data + ')');
+					} catch(e) {
+						return;
+					}
+
+					$.extend($.gt.messages[lang], messages);
+
+					var pl = $.gt.pl_re.exec($.gt.messages[lang]['']);
+					if(pl){
+						var expr = pl[2];
+						var np = pl[1];
+						var v = pl[3];
+						try {
+							var fn = eval('(function(' + v + ') {return ' + expr + ';})');
+						} catch(e) {
+							return;
+						}
+						$.gt.plural = fn;
+					}
+				});
+			});
+			$.gt.setLang($('html').attr('lang'));
+		},
+		gettext: function(msgstr) {
+			var lang = $.gt.lang;
+			
+			if(lang == 'C' || typeof $.gt.messages[lang] == 'undefined') {
+				return msgstr;
+			}
+
+			var trans = $.gt.messages[lang][msgstr];
+
+			if(typeof trans == 'string') { // regular action
+				return trans;
+			} else if(typeof trans == 'object' && trans.constructor == Array) { // the translation contains plural(s), yet gettext was called
+				return trans[0];
+			}
+			return msgstr;
+		},
+		ngettext: function() {
+			var lang = $.gt.lang;
+			var argv = Array.apply(null, arguments);
+			var cnt = argv[argv.length - 1];
+			var sg = argv[0];
+			var pls = argv.slice(0, -1);
+			
+			var trans = pls;
+
+			if(lang != 'C' && typeof $.gt.messages[lang] != 'undefined') {
+				trans = $.gt.messages[lang][sg];
+			}
+
+			if(typeof trans == 'string') { // called ngettext, but no plural forms available :-?
+				return trans;
+			} else if(typeof trans == 'object' && trans.constructor == Array) {
+				var pl = $.gt.plural(cnt);
+				if(typeof pl == 'boolean' && pls.length == 2) {
+					pl = pl ? 1 : 0;
+				}
+				if(typeof pl == 'number' && pl < trans.length) {
+					return trans[pl];
+				}
+			}
+			return sg;
+		}
+	});
+
+	$('document').ready($.gt.load);
+})(jQuery);
+
+if(typeof _ == 'undefined') {
+	var _ = jQuery.gt.gettext;
+}
+if(typeof n_ == 'undefined') {
+	var n_ = jQuery.gt.ngettext;
+}
diff --git a/test/data/tiddlywiki/jquery/plugins/obsolete/jquery.tw.js b/test/data/tiddlywiki/jquery/plugins/obsolete/jquery.tw.js
new file mode 100755
index 000000000..e15bc079d
--- /dev/null
+++ b/test/data/tiddlywiki/jquery/plugins/obsolete/jquery.tw.js
@@ -0,0 +1,10 @@
+/*
+jquery.tw.js
+addition of tw 'namespace'
+*/
+(function($) {
+	if(!$.tw) {
+		$.tw = {};
+		$.tw.extend = $.extend;
+	}
+})(jQuery);
diff --git a/test/data/tiddlywiki/jquery/plugins/obsolete/jquery.tw.macro.js b/test/data/tiddlywiki/jquery/plugins/obsolete/jquery.tw.macro.js
new file mode 100755
index 000000000..35dc62d7a
--- /dev/null
+++ b/test/data/tiddlywiki/jquery/plugins/obsolete/jquery.tw.macro.js
@@ -0,0 +1,58 @@
+/*
+jquery.tw.macro.js
+macro parameter expansion
+*/
+(function($) {
+	$.tw.extend({
+		expandMacroParams: function(params) {
+			// expand the macro parameters into a name:value hash
+			// all parameters are also given a numeric name, starting at 1
+			var opts = {};
+			var unnamed = 1;
+			var name,val;
+			var t = $.trim(params);
+			var s = 0;
+			var i = findNakedSpace(t,s);
+			var param = i==-1 ? t.substr(s) : t.substring(s,i);
+			while(true) {
+				var ci = param.indexOf(':');
+				if(ci==-1) {
+					// parameter is unnamed
+					name = param ? unnamed++ : null;
+					val = param;
+				} else {
+					name = param.substr(0,ci);
+					val = param.substr(ci+1);
+				}
+				val = $.trim(val);
+				if(val.charAt(0)=='"' && val.charAt(val.length-1)=='"') {
+					val = val.substr(1,val.length-2);
+				}
+				if(name)
+					opts[name] = val;
+				if(i==-1)
+					break;
+				s = i+1;
+				i = findNakedSpace(t,s);
+				param = i==-1 ? t.substr(s) : t.substring(s,i);
+			}
+			return opts;
+		}
+	});
+
+	// Private functions.
+	function findNakedSpace(text,start) {
+		// find the next space not surrounded by quotes
+		var d = text.indexOf(' ',start);
+		if(d==-1)
+			return -1;
+		var qs = text.indexOf('"',start);
+		if(qs==-1 || qs > d)
+			return d;
+		var qe = text.indexOf('"',qs+1);
+		if(qe==-1)
+			return d;
+		return findNakedSpace(text,qe+1);
+	}
+
+})(jQuery);
diff --git a/test/data/tiddlywiki/jquery/plugins/obsolete/jquery.tw.macro.today.js b/test/data/tiddlywiki/jquery/plugins/obsolete/jquery.tw.macro.today.js
new file mode 100755
index 000000000..33b187437
--- /dev/null
+++ b/test/data/tiddlywiki/jquery/plugins/obsolete/jquery.tw.macro.today.js
@@ -0,0 +1,15 @@
+/*
+jquery.tw.macro.today.js
+jQuery TiddlyWiki <<today>> macro
+*/
+(function($) {
+	$.fn.tw_today = function(args) {
+		args.format = args.format || args[1];
+		var opts = $.extend({},$.fn.tw_today.defaults,args);
+		var now = new Date();
+		var text = now.formatString(opts.format.trim());
+		this.append("<span>"+text+"</span>");
+		return this;
+	};
+	$.fn.tw_today.defaults = {format:"ddd mmm 0DD 0hh:0mm:0ss YYYY"};
+})(jQuery);
diff --git a/test/data/tiddlywiki/jquery/plugins/split.recipe b/test/data/tiddlywiki/jquery/plugins/split.recipe
new file mode 100755
index 000000000..363112e06
--- /dev/null
+++ b/test/data/tiddlywiki/jquery/plugins/split.recipe
@@ -0,0 +1,2 @@
+jquery: jQuery.encoding.digests.sha1.js
+jquery: jQuery.twStylesheet.js
diff --git a/test/data/tiddlywiki/jquery/plugins/test/TiddlySaver.jar b/test/data/tiddlywiki/jquery/plugins/test/TiddlySaver.jar
new file mode 100755
index 000000000..7ff2c9da3
Binary files /dev/null and b/test/data/tiddlywiki/jquery/plugins/test/TiddlySaver.jar differ
diff --git a/test/data/tiddlywiki/jquery/plugins/test/jQuery.twFile.html b/test/data/tiddlywiki/jquery/plugins/test/jQuery.twFile.html
new file mode 100755
index 000000000..69c7d0a42
--- /dev/null
+++ b/test/data/tiddlywiki/jquery/plugins/test/jQuery.twFile.html
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>Tests</title>
+	<link rel="stylesheet" type="text/css" href="../../../test/qunit/testsuite.css">
+	<script src="../../jquery-1.3.2.min.js" type="text/javascript"></script>
+	<!-- test suite -->
+	<script src="../../../test/qunit/testrunner.js" type="text/javascript"></script>
+	<script src="../../../test/qunit/raiseAssertion.js" type="text/javascript"></script>
+	<!-- plugin -->
+	<script src="../jQuery.twFile.js" type="text/javascript"></script>
+	<!-- test code -->
+	<script src="js/jQuery.twFile.js" type="text/javascript"></script>
+</head>
+
+<body>
+	<h2 id="banner"></h2>
+	<h2 id="userAgent"></h2>
+	<ol id="tests"></ol>
+	<div id="main"></div>
+</body>
+
+</html>
diff --git a/test/data/tiddlywiki/jquery/plugins/test/jQuery.twStylesheet.html b/test/data/tiddlywiki/jquery/plugins/test/jQuery.twStylesheet.html
new file mode 100755
index 000000000..1eeb2098d
--- /dev/null
+++ b/test/data/tiddlywiki/jquery/plugins/test/jQuery.twStylesheet.html
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>Tests</title>
+	<link rel="stylesheet" type="text/css" href="../../../test/qunit/testsuite.css">
+	<script src="../../jquery-1.3.2.min.js" type="text/javascript"></script>
+	<!-- test suite -->
+	<script src="../../../test/qunit/testrunner.js" type="text/javascript"></script>
+	<script src="../../../test/qunit/raiseAssertion.js" type="text/javascript"></script>
+	<!-- plugin -->
+	<script src="../jQuery.twStylesheet.js" type="text/javascript"></script>
+	<!-- test code -->
+	<script src="js/jQuery.twStylesheet.js" type="text/javascript"></script>
+</head>
+
+<body>
+	<h2 id="banner"></h2>
+	<h2 id="userAgent"></h2>
+	<ol id="tests"></ol>
+	<div id="main"></div>
+</body>
+
+</html>
diff --git a/test/data/tiddlywiki/jquery/plugins/test/js/jQuery.twFile.js b/test/data/tiddlywiki/jquery/plugins/test/js/jQuery.twFile.js
new file mode 100755
index 000000000..f478f887e
--- /dev/null
+++ b/test/data/tiddlywiki/jquery/plugins/test/js/jQuery.twFile.js
@@ -0,0 +1,86 @@
+jQuery(document).ready(function() {
+	module("jQuery.twFile");
+
+	test("load", function() {
+		var actual, expected, filepath;
+
+		actual = jQuery.twFile.load();
+		expected = null;
+		same(actual, expected, "returns null if no argument is specified");
+
+		filepath = getDocumentPath() + "/sample.txt";
+		actual = jQuery.twFile.load(filepath);
+		expected = "lorem ipsum\n" +
+			"dolor sit amet\n" +
+			"\n" +
+			" !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~\n" +
+			"foo bar baz\n";
+		same(actual, expected, "returns contents of specified file");
+
+		filepath = "/null";
+		actual = jQuery.twFile.load(filepath);
+		expected = null;
+		same(actual, expected, "returns null if the specified file does not exist");
+
+		filepath = "sample.txt";
+		actual = jQuery.twFile.load(filepath);
+		expected = null;
+		same(actual, expected, "returns null if specified file path is not absolute");
+	});
+
+	test("save", function() {
+		var actual, expression, expected, str;
+		var filepath = getDocumentPath() + "/savetest.txt";
+
+		/* disabled as browser-level exceptions cannot be trapped
+		expression = function() { jQuery.twFile.save(); };
+		expected = "ReferenceError";
+		raises(expression, expected, "raises exception if no argument is specified");
+		*/
+
+		/* disabled as browser-level exceptions cannot be trapped
+		expression = function() { jQuery.twFile.save(filepath); };
+		expected = "TypeError";
+		raises(expression, expected, "raises exception if no content argument is specified");
+		*/
+
+		/* disabled as browser-level exceptions cannot be trapped
+		expression = function() { jQuery.twFile.save("foo.txt", "sample content"); };
+		expected = "ReferenceError";
+		raises(expression, expected, "raises exception if specified file path is not absolute");
+		*/
+
+		str = "lorem ipsum\n" +
+			"dolor sit amet\n" +
+			"\n" +
+			" !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~\n" +
+			//"\xa9\u010d\u010c\n" +
+			"foo bar baz\n" +
+			(new Date).toString();
+		saveAndLoadString(filepath, str, "writes given ANSI text content to specified file");
+
+		//str = "\xa9\u010d\u010c";
+		//saveAndLoadString(filepath, str, "writes given UTF-8 text content to specified file");
+
+		//jQuery.twFile.save(filepath, ""); // teardown: blank file contents (deletion impossible)
+	});
+
+	// helper function to save and load back a string to a file
+	var saveAndLoadString = function(filepath,str,desc) {
+		jQuery.twFile.save(filepath, str);
+		var actual = jQuery.twFile.load(filepath);
+		same(actual, str, desc);
+	}
+
+	// helper function to retrieve current document's file path
+	var getDocumentPath = function() {
+		var path = document.location.pathname;
+		var startpos = 0;
+		var endpos = path.lastIndexOf("/");
+		if(path.charAt(2) == ":") {
+			startpos = 1;
+			path = path.replace(new RegExp("/","g"),"\\")
+		}
+		return unescape(path.substring(startpos, endpos));
+	};
+});
diff --git a/test/data/tiddlywiki/jquery/plugins/test/js/jQuery.twStylesheet.js b/test/data/tiddlywiki/jquery/plugins/test/js/jQuery.twStylesheet.js
new file mode 100755
index 000000000..56a00cbae
--- /dev/null
+++ b/test/data/tiddlywiki/jquery/plugins/test/js/jQuery.twStylesheet.js
@@ -0,0 +1,69 @@
+jQuery(document).ready(function() {
+	module("jQuery.twStylesheet");
+
+	test("apply", function() {
+		var actual, expected, el;
+
+		el = jQuery('<div />').appendTo(document.body);
+		jQuery.twStylesheet("div { overflow: hidden; }");
+		actual = jQuery(el).css("overflow");
+		expected = "hidden";
+		same(actual, expected, "applies style definitions to document");
+		// teardown
+		jQuery(el).remove();
+		jQuery.twStylesheet.remove();
+
+		el = jQuery('<div />').appendTo(document.body);
+		jQuery.twStylesheet("div { font-style: italic; }");
+		actual = jQuery(el).css("font-style");
+		expected = "italic";
+		same(actual, expected, "applies style definitions to newly-created elements");
+		// teardown
+		jQuery(el).remove();
+		jQuery.twStylesheet.remove();
+
+		jQuery.twStylesheet("", { id: "dummyStyleSheet" });
+		actual = jQuery("#dummyStyleSheet").length;
+		expected = 1;
+		same(actual, expected, "generates style element using given ID");
+		// teardown
+		jQuery.twStylesheet.remove({ id: "dummyStyleSheet" });
+
+		// TODO: test for options.doc argument
+
+	});
+
+	test("remove", function() {
+		var actual, expected;
+
+		// setup
+		el = jQuery('<div />').appendTo(document.body);
+		jQuery.twStylesheet("div { overflow: hidden; }");
+		// test
+		jQuery.twStylesheet.remove();
+		actual = jQuery(el).css("overflow");
+		expected = "visible";
+		same(actual, expected, "neutralizes style definitions");
+		// teardown
+		jQuery(el).remove();
+
+		// setup
+		jQuery.twStylesheet("");
+		// test
+		jQuery.twStylesheet.remove();
+		actual = jQuery("#customStyleSheet").length;
+		expected = 0;
+		same(actual, expected, "removes default style sheet if no ID is given");
+
+		// setup
+		jQuery.twStylesheet("", { id: "dummyStyleSheet" });
+		// test
+		jQuery.twStylesheet.remove({ id: "dummyStyleSheet" });
+		actual = jQuery("#dummyStyleSheet").length;
+		expected = 0;
+		same(actual, expected, "removes style element using given ID");
+
+		// TODO: test for options.doc argument
+
+	});
+});
diff --git a/test/data/tiddlywiki/jquery/plugins/test/sample.txt b/test/data/tiddlywiki/jquery/plugins/test/sample.txt
new file mode 100755
index 000000000..9036986bd
--- /dev/null
+++ b/test/data/tiddlywiki/jquery/plugins/test/sample.txt
@@ -0,0 +1,5 @@
+lorem ipsum
+dolor sit amet
+
+ !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~
+foo bar baz
diff --git a/test/data/tiddlywiki/jquery/split.recipe b/test/data/tiddlywiki/jquery/split.recipe
new file mode 100755
index 000000000..269987a30
--- /dev/null
+++ b/test/data/tiddlywiki/jquery/split.recipe
@@ -0,0 +1,2 @@
+jslib: jquery.js
+recipe: plugins/split.recipe
diff --git a/test/data/tiddlywiki/js/AdaptorBase.js b/test/data/tiddlywiki/js/AdaptorBase.js
new file mode 100755
index 000000000..d63c76b4c
--- /dev/null
+++ b/test/data/tiddlywiki/js/AdaptorBase.js
@@ -0,0 +1,90 @@
+//--
+//-- Server adaptor base class
+//--
+
+function AdaptorBase()
+{
+	this.host = null;
+	this.store = null;
+	return this;
+}
+
+AdaptorBase.prototype.close = function()
+{
+	return true;
+};
+
+AdaptorBase.prototype.fullHostName = function(host)
+{
+	if(!host)
+		return '';
+	host = host.trim();
+	if(!host.match(/:\/\//))
+		host = 'http://' + host;
+	if(host.substr(host.length-1) == '/')
+		host = host.substr(0,host.length-1);
+	return host;
+};
+
+AdaptorBase.minHostName = function(host)
+{
+	return host;
+};
+
+AdaptorBase.prototype.setContext = function(context,userParams,callback)
+{
+	if(!context) context = {};
+	context.userParams = userParams;
+	if(callback) context.callback = callback;
+	context.adaptor = this;
+	if(!context.host)
+		context.host = this.host;
+	context.host = this.fullHostName(context.host);
+	if(!context.workspace)
+		context.workspace = this.workspace;
+	return context;
+};
+
+// Open the specified host
+//#   host - uri of host (eg, "http://www.tiddlywiki.com/" or "www.tiddlywiki.com")
+//#   context is itself passed on as a parameter to the callback function
+//#   userParams - user settable object object that is passed on unchanged to the callback function
+//#   callback - optional function to be called on completion
+//# Return value is true if the request was successfully issued, false if this connector doesn't support openHost(),
+//#   or an error description string if there was a problem
+//# The callback parameters are callback(context)
+//#   context.status - true if OK, string if error
+//#   context.adaptor - reference to this adaptor object
+//#   userParams - parameters as originally passed into the openHost function
+AdaptorBase.prototype.openHost = function(host,context,userParams,callback)
+{
+	this.host = host;
+	context = this.setContext(context,userParams,callback);
+	context.status = true;
+	if(callback)
+		window.setTimeout(function() {context.callback(context,userParams);},10);
+	return true;
+};
+
+// Open the specified workspace
+//#   workspace - name of workspace to open
+//#   context - passed on as a parameter to the callback function
+//#   userParams - user settable object object that is passed on unchanged to the callback function
+//#   callback - function to be called on completion
+//# Return value is true if the request was successfully issued
+//#   or an error description string if there was a problem
+//# The callback parameters are callback(context,userParams)
+//#   context.status - true if OK, false if error
+//#   context.statusText - error message if there was an error
+//#   context.adaptor - reference to this adaptor object
+//#   userParams - parameters as originally passed into the openWorkspace function
+AdaptorBase.prototype.openWorkspace = function(workspace,context,userParams,callback)
+{
+	this.workspace = workspace;
+	context = this.setContext(context,userParams,callback);
+	context.status = true;
+	if(callback)
+		window.setTimeout(function() {callback(context,userParams);},10);
+	return true;
+};
+
diff --git a/test/data/tiddlywiki/js/Animator.js b/test/data/tiddlywiki/js/Animator.js
new file mode 100755
index 000000000..f6263a88c
--- /dev/null
+++ b/test/data/tiddlywiki/js/Animator.js
@@ -0,0 +1,46 @@
+//-
+//- Animation engine
+//-
+
+function Animator()
+{
+	this.running = 0; // Incremented at start of each animation, decremented afterwards. If zero, the interval timer is disabled
+	this.timerID = 0; // ID of the timer used for animating
+	this.animations = []; // List of animations in progress
+	return this;
+}
+
+// Start animation engine
+Animator.prototype.startAnimating = function() //# Variable number of arguments
+{
+	var t;
+	for(t=0; t<arguments.length; t++)
+		this.animations.push(arguments[t]);
+	if(this.running == 0) {
+		var me = this;
+		this.timerID = window.setInterval(function() {me.doAnimate(me);},10);
+	}
+	this.running += arguments.length;
+};
+
+// Perform an animation engine tick, calling each of the known animation modules
+Animator.prototype.doAnimate = function(me)
+{
+	var a = 0;
+	while(a < me.animations.length) {
+		var animation = me.animations[a];
+		if(animation.tick()) {
+			a++;
+		} else {
+			me.animations.splice(a,1);
+			if(--me.running == 0)
+				window.clearInterval(me.timerID);
+		}
+	}
+};
+
+Animator.slowInSlowOut = function(progress)
+{
+	return(1-((Math.cos(progress * Math.PI)+1)/2));
+};
+
diff --git a/test/data/tiddlywiki/js/Backstage.js b/test/data/tiddlywiki/js/Backstage.js
new file mode 100755
index 000000000..0f414dda8
--- /dev/null
+++ b/test/data/tiddlywiki/js/Backstage.js
@@ -0,0 +1,187 @@
+//--
+//-- Backstage
+//--
+// Backstage tasks
+config.tasks.save.action = saveChanges;
+
+var backstage = {
+	area: null,
+	toolbar: null,
+	button: null,
+	showButton: null,
+	hideButton: null,
+	cloak: null,
+	panel: null,
+	panelBody: null,
+	panelFooter: null,
+	currTabName: null,
+	currTabElem: null,
+	content: null,
+
+	init: function() {
+		var cmb = config.messages.backstage;
+		this.area = document.getElementById("backstageArea");
+		this.toolbar = jQuery("#backstageToolbar").empty()[0];
+		this.button = jQuery("#backstageButton").empty()[0];
+		this.button.style.display = "block";
+		var t = cmb.open.text + " " + glyph("bentArrowLeft");
+		this.showButton = createTiddlyButton(this.button,t,cmb.open.tooltip,
+						function(e) {backstage.show(); return false;},null,"backstageShow");
+		t = glyph("bentArrowRight") + " " + cmb.close.text;
+		this.hideButton = createTiddlyButton(this.button,t,cmb.close.tooltip,
+						function(e) {backstage.hide(); return false;},null,"backstageHide");
+		this.cloak = document.getElementById("backstageCloak");
+		this.panel = document.getElementById("backstagePanel");
+		this.panelFooter = createTiddlyElement(this.panel,"div",null,"backstagePanelFooter");
+		this.panelBody = createTiddlyElement(this.panel,"div",null,"backstagePanelBody");
+		this.cloak.onmousedown = function(e) {backstage.switchTab(null);};
+		createTiddlyText(this.toolbar,cmb.prompt);
+		for(t=0; t<config.backstageTasks.length; t++) {
+			var taskName = config.backstageTasks[t];
+			var task = config.tasks[taskName];
+			var handler = task.action ? this.onClickCommand : this.onClickTab;
+			var text = task.text + (task.action ? "" : glyph("downTriangle"));
+			var btn = createTiddlyButton(this.toolbar,text,task.tooltip,handler,"backstageTab");
+			jQuery(btn).addClass(task.action ? "backstageAction" : "backstageTask");
+			btn.setAttribute("task", taskName);
+			}
+		this.content = document.getElementById("contentWrapper");
+		if(config.options.chkBackstage)
+			this.show();
+		else
+			this.hide();
+	},
+
+	isVisible: function() {
+		return this.area ? this.area.style.display == "block" : false;
+	},
+
+	show: function() {
+		this.area.style.display = "block";
+		if(anim && config.options.chkAnimate) {
+			backstage.toolbar.style.left = findWindowWidth() + "px";
+			var p = [{style: "left", start: findWindowWidth(), end: 0, template: "%0px"}];
+			anim.startAnimating(new Morpher(backstage.toolbar,config.animDuration,p));
+		} else {
+			backstage.area.style.left = "0px";
+		}
+		jQuery(this.showButton).hide();
+		jQuery(this.hideButton).show();
+		config.options.chkBackstage = true;
+		saveOption("chkBackstage");
+		jQuery(this.content).addClass("backstageVisible");
+	},
+
+	hide: function() {
+		if(this.currTabElem) {
+			this.switchTab(null);
+		} else {
+			backstage.toolbar.style.left = "0px";
+			if(anim && config.options.chkAnimate) {
+				var p = [{style: "left", start: 0, end: findWindowWidth(), template: "%0px"}];
+				var c = function(element,properties) {backstage.area.style.display = "none";};
+				anim.startAnimating(new Morpher(backstage.toolbar,config.animDuration,p,c));
+			} else {
+				this.area.style.display = "none";
+			}
+			this.showButton.style.display = "block";
+			this.hideButton.style.display = "none";
+			config.options.chkBackstage = false;
+			saveOption("chkBackstage");
+			jQuery(this.content).removeClass("backstageVisible");
+		}
+	},
+
+	onClickCommand: function(e) {
+		var task = config.tasks[this.getAttribute("task")];
+		if(task.action) {
+			backstage.switchTab(null);
+			task.action();
+		}
+		return false;
+	},
+
+	onClickTab: function(e) {
+		backstage.switchTab(this.getAttribute("task"));
+		return false;
+	},
+
+	// Switch to a given tab, or none if null is passed
+	switchTab: function(tabName) {
+		var tabElem = null;
+		var e = this.toolbar.firstChild;
+		while(e) {
+			if(e.getAttribute && e.getAttribute("task") == tabName)
+				tabElem = e;
+			e = e.nextSibling;
+		}
+		if(tabName == backstage.currTabName) {
+			backstage.hidePanel();
+			return;
+		}
+		if(backstage.currTabElem) {
+			jQuery(this.currTabElem).removeClass("backstageSelTab");
+		}
+		if(tabElem && tabName) {
+			backstage.preparePanel();
+			jQuery(tabElem).addClass("backstageSelTab");
+			var task = config.tasks[tabName];
+			wikify(task.content,backstage.panelBody,null,null);
+			backstage.showPanel();
+		} else if(backstage.currTabElem) {
+			backstage.hidePanel();
+		}
+		backstage.currTabName = tabName;
+		backstage.currTabElem = tabElem;
+	},
+
+	isPanelVisible: function() {
+		return backstage.panel ? backstage.panel.style.display == "block" : false;
+	},
+
+	preparePanel: function() {
+		backstage.cloak.style.height = findWindowHeight() + "px";
+		backstage.cloak.style.display = "block";
+		jQuery(backstage.panelBody).empty();
+		return backstage.panelBody;
+	},
+
+	showPanel: function() {
+		backstage.panel.style.display = "block";
+		if(anim && config.options.chkAnimate) {
+			backstage.panel.style.top = (-backstage.panel.offsetHeight) + "px";
+			var p = [{style: "top", start: -backstage.panel.offsetHeight, end: 0, template: "%0px"}];
+			anim.startAnimating(new Morpher(backstage.panel,config.animDuration,p),new Scroller(backstage.panel,false));
+		} else {
+			backstage.panel.style.top = "0px";
+		}
+		return backstage.panelBody;
+	},
+
+	hidePanel: function() {
+		if(backstage.currTabElem)
+			jQuery(backstage.currTabElem).removeClass("backstageSelTab");
+		backstage.currTabElem = null;
+		backstage.currTabName = null;
+		if(anim && config.options.chkAnimate) {
+			var p = [
+				{style: "top", start: 0, end: -(backstage.panel.offsetHeight), template: "%0px"},
+				{style: "display", atEnd: "none"}
+			];
+			var c = function(element,properties) {backstage.cloak.style.display = "none";};
+			anim.startAnimating(new Morpher(backstage.panel,config.animDuration,p,c));
+		} else {
+			jQuery([backstage.panel,backstage.cloak]).hide();
+		}
+	}
+};
+
+config.macros.backstage = {};
+
+config.macros.backstage.handler = function(place,macroName,params)
+{
+	var backstageTask = config.tasks[params[0]];
+	if(backstageTask)
+		createTiddlyButton(place,backstageTask.text,backstageTask.tooltip,function(e) {backstage.switchTab(params[0]); return false;});
+};
+
diff --git a/test/data/tiddlywiki/js/BasicTypes.js b/test/data/tiddlywiki/js/BasicTypes.js
new file mode 100755
index 000000000..e177eec11
--- /dev/null
+++ b/test/data/tiddlywiki/js/BasicTypes.js
@@ -0,0 +1,103 @@
+//--
+//-- Augmented methods for the JavaScript Array() object
+//--
+
+// Add indexOf function if browser does not support it
+if(!Array.indexOf) {
+Array.prototype.indexOf = function(item,from)
+{
+	if(!from)
+		from = 0;
+	var i;
+	for(i=from; i<this.length; i++) {
+		if(this[i] === item)
+			return i;
+	}
+	return -1;
+};}
+
+// Find an entry in a given field of the members of an array
+Array.prototype.findByField = function(field,value)
+{
+	var t;
+	for(t=0; t<this.length; t++) {
+		if(this[t][field] === value)
+			return t;
+	}
+	return null;
+};
+
+// Return whether an entry exists in an array
+Array.prototype.contains = function(item)
+{
+	return this.indexOf(item) != -1;
+};
+
+// Adds, removes or toggles a particular value within an array
+//  value - value to add
+//  mode - +1 to add value, -1 to remove value, 0 to toggle it
+Array.prototype.setItem = function(value,mode)
+{
+	var p = this.indexOf(value);
+	if(mode == 0)
+		mode = (p == -1) ? +1 : -1;
+	if(mode == +1) {
+		if(p == -1)
+			this.push(value);
+	} else if(mode == -1) {
+		if(p != -1)
+			this.splice(p,1);
+	}
+};
+
+// Return whether one of a list of values exists in an array
+Array.prototype.containsAny = function(items)
+{
+	var i;
+	for(i=0; i<items.length; i++) {
+		if(this.indexOf(items[i]) != -1)
+			return true;
+	}
+	return false;
+};
+
+// Return whether all of a list of values exists in an array
+Array.prototype.containsAll = function(items)
+{
+	var i;
+	for(i = 0; i<items.length; i++) {
+		if(this.indexOf(items[i]) == -1)
+			return false;
+	}
+	return true;
+};
+
+// Push a new value into an array only if it is not already present in the array. If the optional unique parameter is false, it reverts to a normal push
+Array.prototype.pushUnique = function(item,unique)
+{
+	if(unique === false) {
+		this.push(item);
+	} else {
+		if(this.indexOf(item) == -1)
+			this.push(item);
+	}
+};
+
+Array.prototype.remove = function(item)
+{
+	var p = this.indexOf(item);
+	if(p != -1)
+		this.splice(p,1);
+};
+
+if(!Array.prototype.map) {
+Array.prototype.map = function(fn,thisObj)
+{
+	var scope = thisObj || window;
+	var i,j,a = [];
+	for(i=0, j=this.length; i < j; ++i) {
+		a.push(fn.call(scope,this[i],i,this));
+	}
+	return a;
+};}
+
diff --git a/test/data/tiddlywiki/js/Commands.js b/test/data/tiddlywiki/js/Commands.js
new file mode 100755
index 000000000..0004d57ad
--- /dev/null
+++ b/test/data/tiddlywiki/js/Commands.js
@@ -0,0 +1,178 @@
+//--
+//-- Menu and toolbar commands
+//--
+
+config.commands.closeTiddler.handler = function(event,src,title)
+{
+	if(story.isDirty(title) && !readOnly) {
+		if(!confirm(config.commands.cancelTiddler.warning.format([title])))
+			return false;
+	}
+	story.setDirty(title,false);
+	story.closeTiddler(title,true);
+	return false;
+};
+
+config.commands.closeOthers.handler = function(event,src,title)
+{
+	story.closeAllTiddlers(title);
+	return false;
+};
+
+config.commands.editTiddler.handler = function(event,src,title)
+{
+	clearMessage();
+	var tiddlerElem = story.getTiddler(title);
+	var fields = tiddlerElem.getAttribute("tiddlyFields");
+	story.displayTiddler(null,title,DEFAULT_EDIT_TEMPLATE,false,null,fields);
+	var e = story.getTiddlerField(title,config.options.txtEditorFocus||"text");
+	if(e) {
+		setCaretPosition(e,0);
+	}
+	return false;
+};
+
+config.commands.saveTiddler.handler = function(event,src,title)
+{
+	var newTitle = story.saveTiddler(title,event.shiftKey);
+	if(newTitle)
+		story.displayTiddler(null,newTitle);
+	return false;
+};
+
+config.commands.cancelTiddler.handler = function(event,src,title)
+{
+	if(story.hasChanges(title) && !readOnly) {
+		if(!confirm(this.warning.format([title])))
+			return false;
+	}
+	story.setDirty(title,false);
+	story.displayTiddler(null,title);
+	return false;
+};
+
+config.commands.deleteTiddler.handler = function(event,src,title)
+{
+	var deleteIt = true;
+	if(config.options.chkConfirmDelete)
+		deleteIt = confirm(this.warning.format([title]));
+	if(deleteIt) {
+		store.removeTiddler(title);
+		story.closeTiddler(title,true);
+		autoSaveChanges();
+	}
+	return false;
+};
+
+config.commands.permalink.handler = function(event,src,title)
+{
+	var t = encodeURIComponent(String.encodeTiddlyLink(title));
+	if(window.location.hash != t)
+		window.location.hash = t;
+	return false;
+};
+
+config.commands.references.handlePopup = function(popup,title)
+{
+	var references = store.getReferringTiddlers(title);
+	var c = false;
+	var r;
+	for(r=0; r<references.length; r++) {
+		if(references[r].title != title && !references[r].isTagged("excludeLists")) {
+			createTiddlyLink(createTiddlyElement(popup,"li"),references[r].title,true);
+			c = true;
+		}
+	}
+	if(!c)
+		createTiddlyElement(popup,"li",null,"disabled",this.popupNone);
+};
+
+config.commands.jump.handlePopup = function(popup,title)
+{
+	story.forEachTiddler(function(title,element) {
+		createTiddlyLink(createTiddlyElement(popup,"li"),title,true,null,false,null,true);
+		});
+};
+
+config.commands.syncing.handlePopup = function(popup,title)
+{
+	var me = config.commands.syncing;
+	var tiddler = store.fetchTiddler(title);
+	if(!tiddler)
+		return;
+	var serverType = tiddler.getServerType();
+	var serverHost = tiddler.fields["server.host"];
+	var serverWorkspace = tiddler.fields["server.workspace"];
+	if(!serverWorkspace)
+		serverWorkspace = "";
+	if(serverType) {
+		var e = createTiddlyElement(popup,"li",null,"popupMessage");
+		e.innerHTML = me.currentlySyncing.format([serverType,serverHost,serverWorkspace]);
+	} else {
+		createTiddlyElement(popup,"li",null,"popupMessage",me.notCurrentlySyncing);
+	}
+	if(serverType) {
+		createTiddlyElement(createTiddlyElement(popup,"li",null,"listBreak"),"div");
+		var btn = createTiddlyButton(createTiddlyElement(popup,"li"),this.captionUnSync,null,me.onChooseServer);
+		btn.setAttribute("tiddler",title);
+		btn.setAttribute("server.type","");
+	}
+	createTiddlyElement(createTiddlyElement(popup,"li",null,"listBreak"),"div");
+	createTiddlyElement(popup,"li",null,"popupMessage",me.chooseServer);
+	var feeds = store.getTaggedTiddlers("systemServer","title");
+	var t;
+	for(t=0; t<feeds.length; t++) {
+		var f = feeds[t];
+		var feedServerType = store.getTiddlerSlice(f.title,"Type");
+		if(!feedServerType)
+			feedServerType = "file";
+		var feedServerHost = store.getTiddlerSlice(f.title,"URL");
+		if(!feedServerHost)
+			feedServerHost = "";
+		var feedServerWorkspace = store.getTiddlerSlice(f.title,"Workspace");
+		if(!feedServerWorkspace)
+			feedServerWorkspace = "";
+		var caption = f.title;
+		if(serverType == feedServerType && serverHost == feedServerHost && serverWorkspace == feedServerWorkspace) {
+			caption = me.currServerMarker + caption;
+		} else {
+			caption = me.notCurrServerMarker + caption;
+		}
+		btn = createTiddlyButton(createTiddlyElement(popup,"li"),caption,null,me.onChooseServer);
+		btn.setAttribute("tiddler",title);
+		btn.setAttribute("server.type",feedServerType);
+		btn.setAttribute("server.host",feedServerHost);
+		btn.setAttribute("server.workspace",feedServerWorkspace);
+	}
+};
+
+config.commands.syncing.onChooseServer = function(e)
+{
+	var tiddler = this.getAttribute("tiddler");
+	var serverType = this.getAttribute("server.type");
+	if(serverType) {
+		store.addTiddlerFields(tiddler,{
+			"server.type": serverType,
+			"server.host": this.getAttribute("server.host"),
+			"server.workspace": this.getAttribute("server.workspace")
+			});
+	} else {
+		store.setValue(tiddler,"server",null);
+	}
+	return false;
+};
+
+config.commands.fields.handlePopup = function(popup,title)
+{
+	var tiddler = store.fetchTiddler(title);
+	if(!tiddler)
+		return;
+	var items = [];
+	store.forEachField(tiddler,function(tiddler,fieldName,value){items.push({field:fieldName,value:value});},true);
+	items.sort(function(a,b) {return a.field < b.field ? -1 : (a.field == b.field ? 0 : +1);});
+	if(items.length > 0)
+		ListView.create(popup,items,this.listViewTemplate);
+	else
+		createTiddlyElement(popup,"div",null,null,this.emptyText);
+};
+
diff --git a/test/data/tiddlywiki/js/Config.js b/test/data/tiddlywiki/js/Config.js
new file mode 100755
index 000000000..23aad000e
--- /dev/null
+++ b/test/data/tiddlywiki/js/Config.js
@@ -0,0 +1,227 @@
+//--
+//-- Configuration repository
+//--
+
+// Miscellaneous options
+var config = {
+	numRssItems: 20, // Number of items in the RSS feed
+	animDuration: 400, // Duration of UI animations in milliseconds
+	cascadeFast: 20, // Speed for cascade animations (higher == slower)
+	cascadeSlow: 60, // Speed for EasterEgg cascade animations
+	cascadeDepth: 5, // Depth of cascade animation
+	locale: "en" // W3C language tag
+};
+
+// Hashmap of alternative parsers for the wikifier
+config.parsers = {};
+
+// Adaptors
+config.adaptors = {};
+config.defaultAdaptor = null;
+
+// Backstage tasks
+config.tasks = {};
+
+// Annotations
+config.annotations = {};
+
+// Custom fields to be automatically added to new tiddlers
+config.defaultCustomFields = {};
+
+// Messages
+config.messages = {
+	messageClose: {},
+	dates: {},
+	tiddlerPopup: {}
+};
+
+// Options that can be set in the options panel and/or cookies
+config.options = {
+	chkRegExpSearch: false,
+	chkCaseSensitiveSearch: false,
+	chkIncrementalSearch: true,
+	chkAnimate: true,
+	chkSaveBackups: true,
+	chkAutoSave: false,
+	chkGenerateAnRssFeed: false,
+	chkSaveEmptyTemplate: false,
+	chkOpenInNewWindow: true,
+	chkToggleLinks: false,
+	chkHttpReadOnly: true,
+	chkForceMinorUpdate: false,
+	chkConfirmDelete: true,
+	chkInsertTabs: false,
+	chkUsePreForStorage: true, // Whether to use <pre> format for storage
+	chkDisplayInstrumentation: false,
+	txtBackupFolder: "",
+	txtEditorFocus: "text",
+	txtMainTab: "tabTimeline",
+	txtMoreTab: "moreTabAll",
+	txtMaxEditRows: "30",
+	txtFileSystemCharSet: "UTF-8",
+	txtTheme: ""
+	};
+config.optionsDesc = {};
+
+//# config.optionSource["chkAnimate"] can be:
+//# 	cookie: the option gets stored in a cookie, with the default value coming from SystemSettings
+//#		volatile: the option isn't persisted at all, and reverts to the default specified in SystemSettings when the document is reloaded
+//#		setting: the option is stored in the SystemSettings tiddler
+//#	The default is "setting"
+config.optionsSource = {};
+
+// Default tiddler templates
+var DEFAULT_VIEW_TEMPLATE = 1;
+var DEFAULT_EDIT_TEMPLATE = 2;
+config.tiddlerTemplates = {
+	1: "ViewTemplate",
+	2: "EditTemplate"
+};
+
+// More messages (rather a legacy layout that should not really be like this)
+config.views = {
+	wikified: {
+		tag: {}
+	},
+	editor: {
+		tagChooser: {}
+	}
+};
+
+// Backstage tasks
+config.backstageTasks = ["save","sync","importTask","tweak","upgrade","plugins"];
+
+// Extensions
+config.extensions = {};
+
+// Macros; each has a 'handler' member that is inserted later
+config.macros = {
+	today: {},
+	version: {},
+	search: {sizeTextbox: 15},
+	tiddler: {},
+	tag: {},
+	tags: {},
+	tagging: {},
+	timeline: {},
+	allTags: {},
+	list: {
+		all: {},
+		missing: {},
+		orphans: {},
+		shadowed: {},
+		touched: {},
+		filter: {}
+	},
+	closeAll: {},
+	permaview: {},
+	saveChanges: {},
+	slider: {},
+	option: {},
+	options: {},
+	newTiddler: {},
+	newJournal: {},
+	tabs: {},
+	gradient: {},
+	message: {},
+	view: {defaultView: "text"},
+	edit: {},
+	tagChooser: {},
+	toolbar: {},
+	plugins: {},
+	refreshDisplay: {},
+	importTiddlers: {},
+	upgrade: {
+		source: "http://tiddlywiki-releases.tiddlyspace.com/upgrade",
+		backupExtension: "pre.core.upgrade"
+	},
+	sync: {},
+	annotations: {}
+};
+
+// Commands supported by the toolbar macro
+config.commands = {
+	closeTiddler: {},
+	closeOthers: {},
+	editTiddler: {},
+	saveTiddler: {hideReadOnly: true},
+	cancelTiddler: {},
+	deleteTiddler: {hideReadOnly: true},
+	permalink: {},
+	references: {type: "popup"},
+	jump: {type: "popup"},
+	syncing: {type: "popup"},
+	fields: {type: "popup"}
+};
+
+// Control of macro parameter evaluation
+config.evaluateMacroParameters = "all";
+
+// Basic regular expressions
+config.textPrimitives = {
+	upperLetter: "[A-Z\u00c0-\u00de\u0150\u0170]",
+	lowerLetter: "[a-z0-9_\\-\u00df-\u00ff\u0151\u0171]",
+	anyLetter:   "[A-Za-z0-9_\\-\u00c0-\u00de\u00df-\u00ff\u0150\u0170\u0151\u0171]",
+	anyLetterStrict: "[A-Za-z0-9\u00c0-\u00de\u00df-\u00ff\u0150\u0170\u0151\u0171]"
+};
+if(!((new RegExp("[\u0150\u0170]","g")).test("\u0150"))) {
+	config.textPrimitives = {
+		upperLetter: "[A-Z\u00c0-\u00de]",
+		lowerLetter: "[a-z0-9_\\-\u00df-\u00ff]",
+		anyLetter:   "[A-Za-z0-9_\\-\u00c0-\u00de\u00df-\u00ff]",
+		anyLetterStrict: "[A-Za-z0-9\u00c0-\u00de\u00df-\u00ff]"
+	};
+}
+config.textPrimitives.sliceSeparator = "::";
+config.textPrimitives.sectionSeparator = "##";
+config.textPrimitives.urlPattern = "(?:file|http|https|mailto|ftp|irc|news|data):[^\\s'\"]+(?:/|\\b)";
+config.textPrimitives.unWikiLink = "~";
+config.textPrimitives.wikiLink = "(?:(?:" + config.textPrimitives.upperLetter + "+" +
+	config.textPrimitives.lowerLetter + "+" +
+	config.textPrimitives.upperLetter +
+	config.textPrimitives.anyLetter + "*)|(?:" +
+	config.textPrimitives.upperLetter + "{2,}" +
+	config.textPrimitives.lowerLetter + "+))";
+
+config.textPrimitives.cssLookahead = "(?:(" + config.textPrimitives.anyLetter + "+)\\(([^\\)\\|\\n]+)(?:\\):))|(?:(" + config.textPrimitives.anyLetter + "+):([^;\\|\\n]+);)";
+config.textPrimitives.cssLookaheadRegExp = new RegExp(config.textPrimitives.cssLookahead,"mg");
+
+config.textPrimitives.brackettedLink = "\\[\\[([^\\]]+)\\]\\]";
+config.textPrimitives.titledBrackettedLink = "\\[\\[([^\\[\\]\\|]+)\\|([^\\[\\]\\|]+)\\]\\]";
+config.textPrimitives.tiddlerForcedLinkRegExp = new RegExp("(?:" + config.textPrimitives.titledBrackettedLink + ")|(?:" +
+	config.textPrimitives.brackettedLink + ")|(?:" +
+	config.textPrimitives.urlPattern + ")","mg");
+config.textPrimitives.tiddlerAnyLinkRegExp = new RegExp("("+ config.textPrimitives.wikiLink + ")|(?:" +
+	config.textPrimitives.titledBrackettedLink + ")|(?:" +
+	config.textPrimitives.brackettedLink + ")|(?:" +
+	config.textPrimitives.urlPattern + ")","mg");
+
+config.glyphs = {
+	currBrowser: null,
+	browsers: [],
+	codes: {}
+};
+
+//--
+//-- Shadow tiddlers
+//--
+
+config.shadowTiddlers = {
+	StyleSheet: "",
+	MarkupPreHead: "",
+	MarkupPostHead: "",
+	MarkupPreBody: "",
+	MarkupPostBody: "",
+	TabTimeline: '<<timeline>>',
+	TabAll: '<<list all>>',
+	TabTags: '<<allTags excludeLists>>',
+	TabMoreMissing: '<<list missing>>',
+	TabMoreOrphans: '<<list orphans>>',
+	TabMoreShadowed: '<<list shadowed>>',
+	AdvancedOptions: '<<options>>',
+	PluginManager: '<<plugins>>',
+	SystemSettings: '',
+	ToolbarCommands: '|~ViewToolbar|closeTiddler closeOthers +editTiddler > fields syncing permalink references jump|\n|~EditToolbar|+saveTiddler -cancelTiddler deleteTiddler|',
+	WindowTitle: '<<tiddler SiteTitle>> - <<tiddler SiteSubtitle>>'
+};
+
diff --git a/test/data/tiddlywiki/js/ConfigBrowser.js b/test/data/tiddlywiki/js/ConfigBrowser.js
new file mode 100755
index 000000000..f995b8da3
--- /dev/null
+++ b/test/data/tiddlywiki/js/ConfigBrowser.js
@@ -0,0 +1,30 @@
+// Browser detection... In a very few places, there's nothing else for it but to know what browser we're using.
+config.userAgent = navigator.userAgent.toLowerCase();
+config.browser = {
+	isIE: config.userAgent.indexOf("msie") != -1 && config.userAgent.indexOf("opera") == -1,
+	isGecko: navigator.product == "Gecko" && config.userAgent.indexOf("WebKit") == -1,
+	ieVersion: /MSIE (\d.\d)/i.exec(config.userAgent), // config.browser.ieVersion[1], if it exists, will be the IE version string, eg "6.0"
+	isSafari: config.userAgent.indexOf("applewebkit") != -1,
+	isBadSafari: !((new RegExp("[\u0150\u0170]","g")).test("\u0150")),
+	firefoxDate: /gecko\/(\d{8})/i.exec(config.userAgent), // config.browser.firefoxDate[1], if it exists, will be Firefox release date as "YYYYMMDD"
+	isOpera: config.userAgent.indexOf("opera") != -1,
+	isChrome: config.userAgent.indexOf('chrome') > -1,
+	isLinux: config.userAgent.indexOf("linux") != -1,
+	isUnix: config.userAgent.indexOf("x11") != -1,
+	isMac: config.userAgent.indexOf("mac") != -1,
+	isWindows: config.userAgent.indexOf("win") != -1
+};
+
+merge(config.glyphs,{
+	browsers: [
+		function() {return config.browser.isIE;},
+		function() {return true;}
+		],
+	codes: {
+		downTriangle: ["\u25BC","\u25BE"],
+		downArrow: ["\u2193","\u2193"],
+		bentArrowLeft: ["\u2190","\u21A9"],
+		bentArrowRight: ["\u2192","\u21AA"]
+	}
+});
+
diff --git a/test/data/tiddlywiki/js/Crypto.js b/test/data/tiddlywiki/js/Crypto.js
new file mode 100755
index 000000000..fed672330
--- /dev/null
+++ b/test/data/tiddlywiki/js/Crypto.js
@@ -0,0 +1,143 @@
+//--
+//-- Crypto functions and associated conversion routines
+//--
+
+// Crypto 'namespace'
+function Crypto() {}
+
+// Convert a string to an array of big-endian 32-bit words
+Crypto.strToBe32s = function(str)
+{
+	var be=[];
+	var len=Math.floor(str.length/4);
+	var i, j;
+	for(i=0, j=0; i<len; i++, j+=4) {
+		be[i]=((str.charCodeAt(j)&0xff) << 24)|((str.charCodeAt(j+1)&0xff) << 16)|((str.charCodeAt(j+2)&0xff) << 8)|(str.charCodeAt(j+3)&0xff);
+	}
+	while(j<str.length) {
+		be[j>>2] |= (str.charCodeAt(j)&0xff)<<(24-(j*8)%32);
+		j++;
+	}
+	return be;
+};
+
+// Convert an array of big-endian 32-bit words to a string
+Crypto.be32sToStr = function(be)
+{
+	var str='';
+	for(var i=0;i<be.length*32;i+=8) {
+		str += String.fromCharCode((be[i>>5]>>>(24-i%32)) & 0xff);
+	}
+	return str;
+};
+
+// Convert an array of big-endian 32-bit words to a hex string
+Crypto.be32sToHex = function(be)
+{
+	var hex='0123456789ABCDEF';
+	var str='';
+	for(var i=0;i<be.length*4;i++) {
+		str += hex.charAt((be[i>>2]>>((3-i%4)*8+4))&0xF) + hex.charAt((be[i>>2]>>((3-i%4)*8))&0xF);
+	}
+	return str;
+};
+
+// Return, in hex, the SHA-1 hash of a string
+Crypto.hexSha1Str = function(str)
+{
+	return Crypto.be32sToHex(Crypto.sha1Str(str));
+};
+
+// Return the SHA-1 hash of a string
+Crypto.sha1Str = function(str)
+{
+	return Crypto.sha1(Crypto.strToBe32s(str),str.length);
+};
+
+// Calculate the SHA-1 hash of an array of blen bytes of big-endian 32-bit words
+Crypto.sha1 = function(x,blen)
+{
+	// Add 32-bit integers, wrapping at 32 bits
+	//# Uses 16-bit operations internally to work around bugs in some JavaScript interpreters.
+	function add32(a,b)
+	{
+		var lsw=(a&0xFFFF)+(b&0xFFFF);
+		var msw=(a>>16)+(b>>16)+(lsw>>16);
+		return (msw<<16)|(lsw&0xFFFF);
+	}
+	//# Cryptographic round helper function. Add five 32-bit integers, wrapping at 32 bits, second parameter is rotated left 5 bits before the addition
+	//# Uses 16-bit operations internally to work around bugs in some JavaScript interpreters.
+	function AA(a,b,c,d,e)
+	{
+		b=(b>>>27)|(b<<5);
+		var lsw=(a&0xFFFF)+(b&0xFFFF)+(c&0xFFFF)+(d&0xFFFF)+(e&0xFFFF);
+		var msw=(a>>16)+(b>>16)+(c>>16)+(d>>16)+(e>>16)+(lsw>>16);
+		return (msw<<16)|(lsw&0xFFFF);
+	}
+	//# Cryptographic round helper function.
+	function RR(w,j)
+	{
+		var n=w[j-3]^w[j-8]^w[j-14]^w[j-16];
+		return (n>>>31)|(n<<1);
+	}
+
+	var len=blen*8;
+	//# Append padding so length in bits is 448 mod 512
+	x[len>>5] |= 0x80 << (24-len%32);
+	//# Append length
+	x[((len+64>>9)<<4)+15]=len;
+	var w=new Array(80);
+
+	var k1=0x5A827999;
+	var k2=0x6ED9EBA1;
+	var k3=0x8F1BBCDC;
+	var k4=0xCA62C1D6;
+
+	var h0=0x67452301;
+	var h1=0xEFCDAB89;
+	var h2=0x98BADCFE;
+	var h3=0x10325476;
+	var h4=0xC3D2E1F0;
+
+	for(var i=0;i<x.length;i+=16) {
+		var j=0;
+		var t;
+		var a=h0;
+		var b=h1;
+		var c=h2;
+		var d=h3;
+		var e=h4;
+		while(j<16) {
+			w[j]=x[i+j];
+			t=AA(e,a,d^(b&(c^d)),w[j],k1);
+			e=d; d=c; c=(b>>>2)|(b<<30); b=a; a=t; j++;
+		}
+		while(j<20) {
+			w[j]=RR(w,j);
+			t=AA(e,a,d^(b&(c^d)),w[j],k1);
+			e=d; d=c; c=(b>>>2)|(b<<30); b=a; a=t; j++;
+		}
+		while(j<40) {
+			w[j]=RR(w,j);
+			t=AA(e,a,b^c^d,w[j],k2);
+			e=d; d=c; c=(b>>>2)|(b<<30); b=a; a=t; j++;
+		}
+		while(j<60) {
+			w[j]=RR(w,j);
+			t=AA(e,a,(b&c)|(d&(b|c)),w[j],k3);
+			e=d; d=c; c=(b>>>2)|(b<<30); b=a; a=t; j++;
+		}
+		while(j<80) {
+			w[j]=RR(w,j);
+			t=AA(e,a,b^c^d,w[j],k4);
+			e=d; d=c; c=(b>>>2)|(b<<30); b=a; a=t; j++;
+		}
+		h0=add32(h0,a);
+		h1=add32(h1,b);
+		h2=add32(h2,c);
+		h3=add32(h3,d);
+		h4=add32(h4,e);
+	}
+	return [h0,h1,h2,h3,h4];
+};
+
diff --git a/test/data/tiddlywiki/js/Dates.js b/test/data/tiddlywiki/js/Dates.js
new file mode 100755
index 000000000..8cb2179e4
--- /dev/null
+++ b/test/data/tiddlywiki/js/Dates.js
@@ -0,0 +1,119 @@
+//--
+//-- Augmented methods for the JavaScript Date() object
+//--
+
+// Substitute date components into a string
+Date.prototype.formatString = function(template)
+{
+	var t = template.replace(/0hh12/g,String.zeroPad(this.getHours12(),2));
+	t = t.replace(/hh12/g,this.getHours12());
+	t = t.replace(/0hh/g,String.zeroPad(this.getHours(),2));
+	t = t.replace(/hh/g,this.getHours());
+	t = t.replace(/mmm/g,config.messages.dates.shortMonths[this.getMonth()]);
+	t = t.replace(/0mm/g,String.zeroPad(this.getMinutes(),2));
+	t = t.replace(/mm/g,this.getMinutes());
+	t = t.replace(/0ss/g,String.zeroPad(this.getSeconds(),2));
+	t = t.replace(/ss/g,this.getSeconds());
+	t = t.replace(/[ap]m/g,this.getAmPm().toLowerCase());
+	t = t.replace(/[AP]M/g,this.getAmPm().toUpperCase());
+	t = t.replace(/wYYYY/g,this.getYearForWeekNo());
+	t = t.replace(/wYY/g,String.zeroPad(this.getYearForWeekNo()-2000,2));
+	t = t.replace(/YYYY/g,this.getFullYear());
+	t = t.replace(/YY/g,String.zeroPad(this.getFullYear()-2000,2));
+	t = t.replace(/MMM/g,config.messages.dates.months[this.getMonth()]);
+	t = t.replace(/0MM/g,String.zeroPad(this.getMonth()+1,2));
+	t = t.replace(/MM/g,this.getMonth()+1);
+	t = t.replace(/0WW/g,String.zeroPad(this.getWeek(),2));
+	t = t.replace(/WW/g,this.getWeek());
+	t = t.replace(/DDD/g,config.messages.dates.days[this.getDay()]);
+	t = t.replace(/ddd/g,config.messages.dates.shortDays[this.getDay()]);
+	t = t.replace(/0DD/g,String.zeroPad(this.getDate(),2));
+	t = t.replace(/DDth/g,this.getDate()+this.daySuffix());
+	t = t.replace(/DD/g,this.getDate());
+	var tz = this.getTimezoneOffset();
+	var atz = Math.abs(tz);
+	t = t.replace(/TZD/g,(tz < 0 ? '+' : '-') + String.zeroPad(Math.floor(atz / 60),2) + ':' + String.zeroPad(atz % 60,2));
+	t = t.replace(/\\/g,"");
+	return t;
+};
+
+Date.prototype.getWeek = function()
+{
+	var dt = new Date(this.getTime());
+	var d = dt.getDay();
+	if(d==0) d=7;// JavaScript Sun=0, ISO Sun=7
+	dt.setTime(dt.getTime()+(4-d)*86400000);// shift day to Thurs of same week to calculate weekNo
+	var n = Math.floor((dt.getTime()-new Date(dt.getFullYear(),0,1)+3600000)/86400000);
+	return Math.floor(n/7)+1;
+};
+
+Date.prototype.getYearForWeekNo = function()
+{
+	var dt = new Date(this.getTime());
+	var d = dt.getDay();
+	if(d==0) d=7;// JavaScript Sun=0, ISO Sun=7
+	dt.setTime(dt.getTime()+(4-d)*86400000);// shift day to Thurs of same week
+	return dt.getFullYear();
+};
+
+Date.prototype.getHours12 = function()
+{
+	var h = this.getHours();
+	return h > 12 ? h-12 : ( h > 0 ? h : 12 );
+};
+
+Date.prototype.getAmPm = function()
+{
+	return this.getHours() >= 12 ? config.messages.dates.pm : config.messages.dates.am;
+};
+
+Date.prototype.daySuffix = function()
+{
+	return config.messages.dates.daySuffixes[this.getDate()-1];
+};
+
+// Convert a date to local YYYYMMDDHHMM string format
+Date.prototype.convertToLocalYYYYMMDDHHMM = function()
+{
+	return this.getFullYear() + String.zeroPad(this.getMonth()+1,2) + String.zeroPad(this.getDate(),2) + String.zeroPad(this.getHours(),2) + String.zeroPad(this.getMinutes(),2);
+};
+
+// Convert a date to UTC YYYYMMDDHHMM string format
+Date.prototype.convertToYYYYMMDDHHMM = function()
+{
+	return this.getUTCFullYear() + String.zeroPad(this.getUTCMonth()+1,2) + String.zeroPad(this.getUTCDate(),2) + String.zeroPad(this.getUTCHours(),2) + String.zeroPad(this.getUTCMinutes(),2);
+};
+
+// Convert a date to UTC YYYYMMDD.HHMMSSMMM string format
+Date.prototype.convertToYYYYMMDDHHMMSSMMM = function()
+{
+	return this.getUTCFullYear() + String.zeroPad(this.getUTCMonth()+1,2) + String.zeroPad(this.getUTCDate(),2) + "." + String.zeroPad(this.getUTCHours(),2) + String.zeroPad(this.getUTCMinutes(),2) + String.zeroPad(this.getUTCSeconds(),2) + String.zeroPad(this.getUTCMilliseconds(),3) +"0";
+};
+
+// Static method to create a date from a UTC YYYYMMDDHHMM format string
+Date.convertFromYYYYMMDDHHMM = function(d)
+{
+	d = d?d.replace(/[^0-9]/g, ""):"";
+	return Date.convertFromYYYYMMDDHHMMSSMMM(d.substr(0,12));
+};
+
+// Static method to create a date from a UTC YYYYMMDDHHMMSS format string
+Date.convertFromYYYYMMDDHHMMSS = function(d)
+{
+	d = d?d.replace(/[^0-9]/g, ""):"";
+	return Date.convertFromYYYYMMDDHHMMSSMMM(d.substr(0,14));
+};
+
+// Static method to create a date from a UTC YYYYMMDDHHMMSSMMM format string
+Date.convertFromYYYYMMDDHHMMSSMMM = function(d)
+{
+	d = d ? d.replace(/[^0-9]/g, "") : "";
+	return new Date(Date.UTC(parseInt(d.substr(0,4),10),
+			parseInt(d.substr(4,2),10)-1,
+			parseInt(d.substr(6,2),10),
+			parseInt(d.substr(8,2)||"00",10),
+			parseInt(d.substr(10,2)||"00",10),
+			parseInt(d.substr(12,2)||"00",10),
+			parseInt(d.substr(14,3)||"000",10)));
+};
+
diff --git a/test/data/tiddlywiki/js/Dom.js b/test/data/tiddlywiki/js/Dom.js
new file mode 100755
index 000000000..d288d34de
--- /dev/null
+++ b/test/data/tiddlywiki/js/Dom.js
@@ -0,0 +1,264 @@
+//--
+//-- DOM utilities - many derived from www.quirksmode.org
+//--
+
+function drawGradient(place,horiz,locolors,hicolors)
+{
+	if(!hicolors)
+		hicolors = locolors;
+	var t;
+	for(t=0; t<= 100; t+=2) {
+		var bar = document.createElement("div");
+		place.appendChild(bar);
+		bar.style.position = "absolute";
+		bar.style.left = horiz ? t + "%" : 0;
+		bar.style.top = horiz ? 0 : t + "%";
+		bar.style.width = horiz ? (101-t) + "%" : "100%";
+		bar.style.height = horiz ? "100%" : (101-t) + "%";
+		bar.style.zIndex = -1;
+		var p = t/100*(locolors.length-1);
+		var hc = hicolors[Math.floor(p)];
+		if(typeof hc == "string")
+			hc = new RGB(hc);
+		var lc = locolors[Math.ceil(p)];
+		if(typeof lc == "string")
+			lc = new RGB(lc);
+		bar.style.backgroundColor = hc.mix(lc,p-Math.floor(p)).toString();
+	}
+}
+
+//# Add an event handler
+//# Thanks to John Resig, via QuirksMode
+function addEvent(obj,type,fn)
+{
+	if(obj.attachEvent) {
+		obj["e"+type+fn] = fn;
+		obj[type+fn] = function(){obj["e"+type+fn](window.event);};
+		obj.attachEvent("on"+type,obj[type+fn]);
+	} else {
+		obj.addEventListener(type,fn,false);
+	}
+}
+
+//# Remove an event handler
+//# Thanks to John Resig, via QuirksMode
+function removeEvent(obj,type,fn)
+{
+	if(obj.detachEvent) {
+		obj.detachEvent("on"+type,obj[type+fn]);
+		obj[type+fn] = null;
+	} else {
+		obj.removeEventListener(type,fn,false);
+	}
+}
+
+// Find the closest relative with a given property value (property defaults to tagName, relative defaults to parentNode)
+function findRelated(e,value,name,relative)
+{
+	name = name || "tagName";
+	relative = relative || "parentNode";
+	if(name == "className") {
+		while(e && !jQuery(e).hasClass(value)) {
+			e = e[relative];
+		}
+	} else {
+		while(e && e[name] != value) {
+			e = e[relative];
+		}
+	}
+	return e;
+}
+
+// Get the scroll position for window.scrollTo necessary to scroll a given element into view
+function ensureVisible(e)
+{
+	var posTop = findPosY(e);
+	var posBot = posTop + e.offsetHeight;
+	var winTop = findScrollY();
+	var winHeight = findWindowHeight();
+	var winBot = winTop + winHeight;
+	if(posTop < winTop) {
+		return posTop;
+	} else if(posBot > winBot) {
+		if(e.offsetHeight < winHeight)
+			return posTop - (winHeight - e.offsetHeight);
+		else
+			return posTop;
+	} else {
+		return winTop;
+	}
+}
+
+// Get the current width of the display window
+function findWindowWidth()
+{
+	return window.innerWidth || document.documentElement.clientWidth;
+}
+
+// Get the current height of the display window
+function findWindowHeight()
+{
+	return window.innerHeight || document.documentElement.clientHeight;
+}
+
+// Get the current horizontal page scroll position
+function findScrollX()
+{
+	return window.scrollX || document.documentElement.scrollLeft;
+}
+
+// Get the current vertical page scroll position
+function findScrollY()
+{
+	return window.scrollY || document.documentElement.scrollTop;
+}
+
+function findPosX(obj)
+{
+	var curleft = 0;
+	while(obj.offsetParent) {
+		curleft += obj.offsetLeft;
+		obj = obj.offsetParent;
+	}
+	return curleft;
+}
+
+function findPosY(obj)
+{
+	var curtop = 0;
+	while(obj.offsetParent) {
+		curtop += obj.offsetTop;
+		obj = obj.offsetParent;
+	}
+	return curtop;
+}
+
+// Blur a particular element
+function blurElement(e)
+{
+	if(e && e.focus && e.blur) {
+		e.focus();
+		e.blur();
+	}
+}
+
+// Create a non-breaking space
+function insertSpacer(place)
+{
+	var e = document.createTextNode(String.fromCharCode(160));
+	if(place)
+		place.appendChild(e);
+	return e;
+}
+
+// Replace the current selection of a textarea or text input and scroll it into view
+function replaceSelection(e,text)
+{
+	if(e.setSelectionRange) {
+		var oldpos = e.selectionStart;
+		var isRange = e.selectionEnd > e.selectionStart;
+		e.value = e.value.substr(0,e.selectionStart) + text + e.value.substr(e.selectionEnd);
+		e.setSelectionRange(isRange ? oldpos : oldpos + text.length,oldpos + text.length);
+		var linecount = e.value.split("\n").length;
+		var thisline = e.value.substr(0,e.selectionStart).split("\n").length-1;
+		e.scrollTop = Math.floor((thisline - e.rows / 2) * e.scrollHeight / linecount);
+	} else if(document.selection) {
+		var range = document.selection.createRange();
+		if(range.parentElement() == e) {
+			var isCollapsed = range.text == "";
+			range.text = text;
+			if(!isCollapsed) {
+				range.moveStart("character", -text.length);
+				range.select();
+			}
+		}
+	}
+}
+
+// Set the caret position in a text area
+function setCaretPosition(e,pos)
+{
+	if(e.selectionStart || e.selectionStart == '0') {
+		e.selectionStart = pos;
+		e.selectionEnd = pos;
+		e.focus();
+	} else if(document.selection) {
+		// IE support
+		e.focus ();
+		var sel = document.selection.createRange();
+		sel.moveStart('character', -e.value.length);
+		sel.moveStart('character',pos);
+		sel.moveEnd('character',0);
+		sel.select();
+	}
+}
+
+// Returns the text of the given (text) node, possibly merging subsequent text nodes
+function getNodeText(e)
+{
+	var t = "";
+	while(e && e.nodeName == "#text") {
+		t += e.nodeValue;
+		e = e.nextSibling;
+	}
+	return t;
+}
+
+// Returns true if the element e has a given ancestor element
+function isDescendant(e,ancestor)
+{
+	while(e) {
+		if(e === ancestor)
+			return true;
+		e = e.parentNode;
+	}
+	return false;
+}
+
+
+// deprecate the following...
+
+// Prevent an event from bubbling
+function stopEvent(e)
+{
+	var ev = e || window.event;
+	ev.cancelBubble = true;
+	if(ev.stopPropagation) ev.stopPropagation();
+	return false;
+}
+
+// Remove any event handlers or non-primitve custom attributes
+function scrubNode(e)
+{
+	if(!config.browser.isIE)
+		return;
+	var att = e.attributes;
+	if(att) {
+		var t;
+		for(t=0; t<att.length; t++) {
+			var n = att[t].name;
+			if(n !== "style" && (typeof e[n] === "function" || (typeof e[n] === "object" && e[n] != null))) {
+				try {
+					e[n] = null;
+				} catch(ex) {
+				}
+			}
+		}
+	}
+	var c = e.firstChild;
+	while(c) {
+		scrubNode(c);
+		c = c.nextSibling;
+	}
+}
+
+function setStylesheet(s,id,doc)
+{
+	jQuery.twStylesheet(s,{id:id,doc:doc});
+}
+
+function removeStyleSheet(id)
+{
+	jQuery.twStylesheet.remove({id:id});
+}
+
diff --git a/test/data/tiddlywiki/js/FileAdaptor.js b/test/data/tiddlywiki/js/FileAdaptor.js
new file mode 100755
index 000000000..0dec8ca55
--- /dev/null
+++ b/test/data/tiddlywiki/js/FileAdaptor.js
@@ -0,0 +1,185 @@
+//--
+//-- Server adaptor for talking to static TiddlyWiki files
+//--
+
+function FileAdaptor()
+{
+}
+
+FileAdaptor.prototype = new AdaptorBase();
+
+FileAdaptor.serverType = 'file';
+FileAdaptor.serverLabel = 'TiddlyWiki';
+
+FileAdaptor.loadTiddlyWikiSuccess = function(context,jqXHR)
+{
+	context.status = true;
+	//# Load the content into a TiddlyWiki() object
+	context.adaptor.store = new TiddlyWiki();
+	if(!context.adaptor.store.importTiddlyWiki(jqXHR.responseText)) {
+		context.statusText = config.messages.invalidFileError.format([context.host]);
+		context.status = false;
+	}
+	context.complete(context,context.userParams);
+};
+
+FileAdaptor.loadTiddlyWikiError = function(context,jqXHR)
+{
+	context.status = false;
+	context.statusText = jqXHR.message;
+	context.complete(context,context.userParams);
+};
+
+// Get the list of workspaces on a given server
+//#   context - passed on as a parameter to the callback function
+//#   userParams - user settable object object that is passed on unchanged to the callback function
+//#   callback - function to be called on completion
+//# Return value is true if the request was successfully issued, false if this connector doesn't support getWorkspaceList(),
+//#   or an error description string if there was a problem
+//# The callback parameters are callback(context,userParams)
+//#   context.status - true if OK, false if error
+//#   context.statusText - error message if there was an error
+//#   context.adaptor - reference to this adaptor object
+//#   userParams - parameters as originally passed into the getWorkspaceList function
+FileAdaptor.prototype.getWorkspaceList = function(context,userParams,callback)
+{
+	context = this.setContext(context,userParams,callback);
+	context.workspaces = [{title:"(default)"}];
+	context.status = true;
+	if(callback)
+		window.setTimeout(function() {callback(context,userParams);},10);
+	return true;
+};
+
+// Gets the list of tiddlers within a given workspace
+//#   context - passed on as a parameter to the callback function
+//#   userParams - user settable object object that is passed on unchanged to the callback function
+//#   callback - function to be called on completion
+//#   filter - filter expression
+//# Return value is true if the request was successfully issued,
+//#   or an error description string if there was a problem
+//# The callback parameters are callback(context,userParams)
+//#   context.status - true if OK, false if error
+//#   context.statusText - error message if there was an error
+//#   context.adaptor - reference to this adaptor object
+//#   context.tiddlers - array of tiddler objects
+//#   userParams - parameters as originally passed into the getTiddlerList function
+FileAdaptor.prototype.getTiddlerList = function(context,userParams,callback,filter)
+{
+	context = this.setContext(context,userParams,callback);
+	if(!context.filter)
+		context.filter = filter;
+	context.complete = FileAdaptor.getTiddlerListComplete;
+	if(this.store) {
+		return context.complete(context,context.userParams);
+	}
+	var options = {
+		type:"GET",
+		url:context.host,
+		processData:false,
+		success:function(data,textStatus,jqXHR) {
+			FileAdaptor.loadTiddlyWikiSuccess(context,jqXHR);
+		},
+		error:function(jqXHR,textStatus,errorThrown) {
+			context.xhr = jqXHR;
+			FileAdaptor.loadTiddlyWikiError(context,jqXHR);
+		}
+	};
+	return ajaxReq(options);
+};
+
+FileAdaptor.getTiddlerListComplete = function(context,userParams)
+{
+	if(context.status) {
+		if(context.filter) {
+			context.tiddlers = context.adaptor.store.filterTiddlers(context.filter);
+		} else {
+			context.tiddlers = [];
+			context.adaptor.store.forEachTiddler(function(title,tiddler) {context.tiddlers.push(tiddler);});
+		}
+		var i;
+		for(i=0; i<context.tiddlers.length; i++) {
+			context.tiddlers[i].fields['server.type'] = FileAdaptor.serverType;
+			context.tiddlers[i].fields['server.host'] = AdaptorBase.minHostName(context.host);
+			context.tiddlers[i].fields['server.page.revision'] = context.tiddlers[i].modified.convertToYYYYMMDDHHMM();
+		}
+		context.status = true;
+	}
+	if(context.callback) {
+		window.setTimeout(function() {context.callback(context,userParams);},10);
+	}
+	return true;
+};
+
+FileAdaptor.prototype.generateTiddlerInfo = function(tiddler)
+{
+	var info = {};
+	info.uri = tiddler.fields['server.host'] + "#" + tiddler.title;
+	return info;
+};
+
+// Retrieve a tiddler from a given workspace on a given server
+//#   title - title of the tiddler to get
+//#   context - passed on as a parameter to the callback function
+//#   userParams - user settable object object that is passed on unchanged to the callback function
+//#   callback - function to be called on completion
+//# Return value is true if the request was successfully issued,
+//#   or an error description string if there was a problem
+//# The callback parameters are callback(context,userParams)
+//#   context.status - true if OK, false if error
+//#   context.statusText - error message if there was an error
+//#   context.adaptor - reference to this adaptor object
+//#   context.tiddler - the retrieved tiddler, or null if it cannot be found
+//#   userParams - parameters as originally passed into the getTiddler function
+FileAdaptor.prototype.getTiddler = function(title,context,userParams,callback)
+{
+	context = this.setContext(context,userParams,callback);
+	context.title = title;
+	context.complete = FileAdaptor.getTiddlerComplete;
+	if(context.adaptor.store) {
+		return context.complete(context,context.userParams);
+	}
+	var options = {
+		type:"GET",
+		url:context.host,
+		processData:false,
+		success:function(data,textStatus,jqXHR) {
+			FileAdaptor.loadTiddlyWikiSuccess(context,jqXHR);
+		},
+		error:function(jqXHR,textStatus,errorThrown) {
+			FileAdaptor.loadTiddlyWikiError(context,jqXHR);
+		}
+	};
+	return ajaxReq(options);
+};
+
+FileAdaptor.getTiddlerComplete = function(context,userParams)
+{
+	var t = context.adaptor.store.fetchTiddler(context.title);
+	if(t) {
+		t.fields['server.type'] = FileAdaptor.serverType;
+		t.fields['server.host'] = AdaptorBase.minHostName(context.host);
+		t.fields['server.page.revision'] = t.modified.convertToYYYYMMDDHHMM();
+		context.tiddler = t;
+		context.status = true;
+	} else { //# tiddler does not exist in document
+		context.status = false;
+	}
+	if(context.allowSynchronous) {
+		context.isSynchronous = true;
+		context.callback(context,userParams);
+	} else {
+		window.setTimeout(function() {context.callback(context,userParams);},10);
+	}
+	return true;
+};
+
+FileAdaptor.prototype.close = function()
+{
+	this.store = null;
+};
+
+config.adaptors[FileAdaptor.serverType] = FileAdaptor;
+
+config.defaultAdaptor = FileAdaptor.serverType;
+
diff --git a/test/data/tiddlywiki/js/FileSystem.js b/test/data/tiddlywiki/js/FileSystem.js
new file mode 100755
index 000000000..05c65436b
--- /dev/null
+++ b/test/data/tiddlywiki/js/FileSystem.js
@@ -0,0 +1,212 @@
+//--
+//-- Filesystem code
+//--
+//#
+//# This code is designed to be reusable, but please take care,
+//# there are some intricacies that make it tricky to use these
+//# functions with full UTF-8 files. For more details, see:
+//#
+//# http://trac.tiddlywiki.org/ticket/99
+//#
+//#
+
+function copyFile(dest,source)
+{
+	return config.browser.isIE ? ieCopyFile(dest,source) : false;
+}
+
+function saveFile(fileUrl,content)
+{
+	var r = mozillaSaveFile(fileUrl,content);
+	if(!r)
+		r = ieSaveFile(fileUrl,content);
+	if(!r)
+		r = javaSaveFile(fileUrl,content);
+	return r;
+}
+
+function loadFile(fileUrl)
+{
+	var r = mozillaLoadFile(fileUrl);
+	if((r == null) || (r == false))
+		r = ieLoadFile(fileUrl);
+	if((r == null) || (r == false))
+		r = javaLoadFile(fileUrl);
+	return r;
+}
+
+function ieCreatePath(path)
+{
+	try {
+		var fso = new ActiveXObject("Scripting.FileSystemObject");
+	} catch(ex) {
+		return null;
+	}
+
+	//# Remove the filename, if present. Use trailing slash (i.e. "foo\bar\") if no filename.
+	var pos = path.lastIndexOf("\\");
+	if(pos==-1)
+		pos = path.lastIndexOf("/");
+	if(pos!=-1)
+		path = path.substring(0,pos+1);
+
+	//# Walk up the path until we find a folder that exists
+	var scan = [path];
+	var parent = fso.GetParentFolderName(path);
+	while(parent && !fso.FolderExists(parent)) {
+		scan.push(parent);
+		parent = fso.GetParentFolderName(parent);
+	}
+
+	//# Walk back down the path, creating folders
+	for(i=scan.length-1;i>=0;i--) {
+		if(!fso.FolderExists(scan[i])) {
+			fso.CreateFolder(scan[i]);
+		}
+	}
+	return true;
+}
+
+// Returns null if it can't do it, false if there's an error, true if it saved OK
+function ieSaveFile(filePath,content)
+{
+	ieCreatePath(filePath);
+	try {
+		var fso = new ActiveXObject("Scripting.FileSystemObject");
+	} catch(ex) {
+		//# alert("Exception while attempting to save\n\n" + ex.toString());
+		return null;
+	}
+	var file = fso.OpenTextFile(filePath,2,-1,0);
+	file.Write(content);
+	file.Close();
+	return true;
+}
+
+// Returns null if it can't do it, false if there's an error, or a string of the content if successful
+function ieLoadFile(filePath)
+{
+	try {
+		var fso = new ActiveXObject("Scripting.FileSystemObject");
+		var file = fso.OpenTextFile(filePath,1);
+		var content = file.ReadAll();
+		file.Close();
+	} catch(ex) {
+		//# alert("Exception while attempting to load\n\n" + ex.toString());
+		return null;
+	}
+	return content;
+}
+
+function ieCopyFile(dest,source)
+{
+	ieCreatePath(dest);
+	try {
+		var fso = new ActiveXObject("Scripting.FileSystemObject");
+		fso.GetFile(source).Copy(dest);
+	} catch(ex) {
+		return false;
+	}
+	return true;
+}
+
+// Returns null if it can't do it, false if there's an error, true if it saved OK
+function mozillaSaveFile(filePath,content)
+{
+	if(window.Components) {
+		try {
+			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+			var file = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
+			file.initWithPath(filePath);
+			if(!file.exists())
+				file.create(0,0x01B4);// 0x01B4 = 0664
+			var out = Components.classes["@mozilla.org/network/file-output-stream;1"].createInstance(Components.interfaces.nsIFileOutputStream);
+			out.init(file,0x22,0x04,null);
+			out.write(content,content.length);
+			out.flush();
+			out.close();
+			return true;
+		} catch(ex) {
+			//# alert("Exception while attempting to save\n\n" + ex);
+			return false;
+		}
+	}
+	return null;
+}
+
+// Returns null if it can't do it, false if there's an error, or a string of the content if successful
+function mozillaLoadFile(filePath)
+{
+	if(window.Components) {
+		try {
+			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+			var file = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
+			file.initWithPath(filePath);
+			if(!file.exists())
+				return null;
+			var inputStream = Components.classes["@mozilla.org/network/file-input-stream;1"].createInstance(Components.interfaces.nsIFileInputStream);
+			inputStream.init(file,0x01,0x04,null);
+			var sInputStream = Components.classes["@mozilla.org/scriptableinputstream;1"].createInstance(Components.interfaces.nsIScriptableInputStream);
+			sInputStream.init(inputStream);
+			var contents = sInputStream.read(sInputStream.available());
+			sInputStream.close();
+			inputStream.close();
+			return contents;
+		} catch(ex) {
+			//# alert("Exception while attempting to load\n\n" + ex);
+			return false;
+		}
+	}
+	return null;
+}
+
+function javaUrlToFilename(url)
+{
+	var f = "//localhost";
+	if(url.indexOf(f) == 0)
+		return url.substring(f.length);
+	var i = url.indexOf(":");
+	return i > 0 ? url.substring(i-1) : url;
+}
+
+function javaSaveFile(filePath,content)
+{
+	try {
+		if(document.applets["TiddlySaver"])
+			return document.applets["TiddlySaver"].saveFile(javaUrlToFilename(filePath),"UTF-8",content);
+	} catch(ex) {
+	}
+	try {
+		var s = new java.io.PrintStream(new java.io.FileOutputStream(javaUrlToFilename(filePath)));
+		s.print(content);
+		s.close();
+	} catch(ex2) {
+		return null;
+	}
+	return true;
+}
+
+function javaLoadFile(filePath)
+{
+	try {
+		if(document.applets["TiddlySaver"]) {
+			var ret = document.applets["TiddlySaver"].loadFile(javaUrlToFilename(filePath),"UTF-8");
+			if(!ret)
+				return null;
+			return String(ret);
+		}
+	} catch(ex) {
+	}
+	var content = [];
+	try {
+		var r = new java.io.BufferedReader(new java.io.FileReader(javaUrlToFilename(filePath)));
+		var line;
+		while((line = r.readLine()) != null)
+			content.push(String(line));
+		r.close();
+	} catch(ex2) {
+		return null;
+	}
+	return content.join("\n");
+}
+
diff --git a/test/data/tiddlywiki/js/FileSystemUtils.js b/test/data/tiddlywiki/js/FileSystemUtils.js
new file mode 100755
index 000000000..605836a7e
--- /dev/null
+++ b/test/data/tiddlywiki/js/FileSystemUtils.js
@@ -0,0 +1,103 @@
+//--
+//-- Filesystem utilities
+//--
+
+function convertUTF8ToUnicode(u)
+{
+	return config.browser.isOpera || !window.netscape ? manualConvertUTF8ToUnicode(u) : mozConvertUTF8ToUnicode(u);
+}
+
+//# UTF-8 encoding rules:
+//# 0x0000 - 0x007F:  0xxxxxxx
+//# 0x0080 - 0x07FF:  110xxxxx 10xxxxxx
+//# 0x0800 - 0xFFFF:  1110xxxx 10xxxxxx 10xxxxxx
+
+function manualConvertUTF8ToUnicode(utf)
+{
+	var uni = utf;
+	var src = 0;
+	var dst = 0;
+	var b1, b2, b3;
+	var c;
+	while(src < utf.length) {
+		b1 = utf.charCodeAt(src++);
+		if(b1 < 0x80) {
+			dst++;
+		} else if(b1 < 0xE0) {
+			b2 = utf.charCodeAt(src++);
+			c = String.fromCharCode(((b1 & 0x1F) << 6) | (b2 & 0x3F));
+			uni = uni.substring(0,dst++).concat(c,utf.substr(src));
+		} else {
+			b2 = utf.charCodeAt(src++);
+			b3 = utf.charCodeAt(src++);
+			c = String.fromCharCode(((b1 & 0xF) << 12) | ((b2 & 0x3F) << 6) | (b3 & 0x3F));
+			uni = uni.substring(0,dst++).concat(c,utf.substr(src));
+		}
+	}
+	return uni;
+}
+
+function mozConvertUTF8ToUnicode(u)
+{
+	try {
+		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+		var converter = Components.classes["@mozilla.org/intl/scriptableunicodeconverter"].createInstance(Components.interfaces.nsIScriptableUnicodeConverter);
+		converter.charset = "UTF-8";
+	} catch(ex) {
+		return manualConvertUTF8ToUnicode(u);
+	} // fallback
+	var s = converter.ConvertToUnicode(u);
+	var fin = converter.Finish();
+	return fin.length > 0 ? s+fin : s;
+}
+
+//# convert unicode string to a format suitable for saving to file
+//# this should be UTF8, unless the browser does not support saving non-ASCII characters
+function convertUnicodeToFileFormat(s)
+{
+	return config.browser.isOpera || !window.netscape ? (config.browser.isIE ? convertUnicodeToHtmlEntities(s) : s) : mozConvertUnicodeToUTF8(s);
+}
+
+function convertUnicodeToHtmlEntities(s)
+{
+	var re = /[^\u0000-\u007F]/g;
+	return s.replace(re,function($0) {return "&#" + $0.charCodeAt(0).toString() + ";";});
+}
+
+function convertUnicodeToUTF8(s)
+{
+// return convertUnicodeToFileFormat to allow plugin migration
+	return convertUnicodeToFileFormat(s);
+}
+
+function manualConvertUnicodeToUTF8(s)
+{
+	return unescape(encodeURIComponent(s));
+}
+
+function mozConvertUnicodeToUTF8(s)
+{
+	try {
+		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+		var converter = Components.classes["@mozilla.org/intl/scriptableunicodeconverter"].createInstance(Components.interfaces.nsIScriptableUnicodeConverter);
+		converter.charset = "UTF-8";
+	} catch(ex) {
+		return manualConvertUnicodeToUTF8(s);
+	} // fallback
+	var u = converter.ConvertFromUnicode(s);
+	var fin = converter.Finish();
+	return fin.length > 0 ? u + fin : u;
+}
+
+function convertUriToUTF8(uri,charSet)
+{
+	if(window.netscape == undefined || charSet == undefined || charSet == "")
+		return uri;
+	try {
+		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+		var converter = Components.classes["@mozilla.org/intl/utf8converterservice;1"].getService(Components.interfaces.nsIUTF8ConverterService);
+	} catch(ex) {
+		return uri;
+	}
+	return converter.convertURISpecToUTF8(uri,charSet);
+}
diff --git a/test/data/tiddlywiki/js/Filters.js b/test/data/tiddlywiki/js/Filters.js
new file mode 100755
index 000000000..ad285d363
--- /dev/null
+++ b/test/data/tiddlywiki/js/Filters.js
@@ -0,0 +1,61 @@
+//--
+//-- Filter a list of tiddlers
+//--
+
+//# Extensible filter functions
+config.filters = {
+	tiddler: function(results,match) {
+		var title = match[1]||match[4];
+		var tiddler = this.fetchTiddler(title);
+		if(tiddler) {
+			results.pushUnique(tiddler);
+		} else if(this.isShadowTiddler(title)) {
+			tiddler = new Tiddler();
+			tiddler.set(title,this.getTiddlerText(title));
+			results.pushUnique(tiddler);
+		} else {
+			results.pushUnique(new Tiddler(title));
+		}
+		return results;
+	},
+	tag: function(results,match) {
+		var m,matched = this.getTaggedTiddlers(match[3]);
+		for(m=0; m<matched.length; m++) {
+			results.pushUnique(matched[m]);
+		}
+		return results;
+	},
+	sort: function(results,match) {
+		return this.sortTiddlers(results,match[3]);
+	},
+	limit: function(results,match) {
+		return results.slice(0,parseInt(match[3],10));
+	},
+	field: function(results,match) {
+		var m,matched = this.getValueTiddlers(match[2],match[3]);
+		for (m = 0; m < matched.length; m++) {
+			results.pushUnique(matched[m]);
+		}
+		return results;
+	}
+};
+
+// Filter a list of tiddlers
+//#   filter - filter expression (eg "tidlertitle [[multi word tiddler title]] [tag[systemConfig]]")
+//# Returns an array of Tiddler() objects that match the filter expression
+TiddlyWiki.prototype.filterTiddlers = function(filter)
+{
+	//# text or [[tiddler title]] or [foo[bar]]
+	var re = /([^\s\[\]]+)|(?:\[([ \w\.\-]+)\[([^\]]+)\]\])|(?:\[\[([^\]]+)\]\])/mg;
+
+	var results = [];
+	if(filter) {
+		var match = re.exec(filter);
+		while(match) {
+			var handler = (match[1]||match[4])?'tiddler':config.filters[match[2]]?match[2]:'field';
+			results = config.filters[handler].call(this,results,match);
+			match = re.exec(filter);
+		}
+	}
+	return results;
+};
diff --git a/test/data/tiddlywiki/js/Formatter.js b/test/data/tiddlywiki/js/Formatter.js
new file mode 100755
index 000000000..5fd14258a
--- /dev/null
+++ b/test/data/tiddlywiki/js/Formatter.js
@@ -0,0 +1,529 @@
+//--
+//-- Standard formatters
+//--
+
+config.formatters = [
+{
+	name: "table",
+	match: "^\\|(?:[^\\n]*)\\|(?:[fhck]?)$",
+	lookaheadRegExp: /^\|([^\n]*)\|([fhck]?)$/mg,
+	rowTermRegExp: /(\|(?:[fhck]?)$\n?)/mg,
+	cellRegExp: /(?:\|([^\n\|]*)\|)|(\|[fhck]?$\n?)/mg,
+	cellTermRegExp: /((?:\x20*)\|)/mg,
+	rowTypes: {"c":"caption", "h":"thead", "":"tbody", "f":"tfoot"},
+	handler: function(w)
+	{
+		var table = createTiddlyElement(w.output,"table",null,"twtable");
+		var prevColumns = [];
+		var currRowType = null;
+		var rowContainer;
+		var rowCount = 0;
+		var onmouseover = function() {jQuery(this).addClass("hoverRow");};
+		var onmouseout = function() {jQuery(this).removeClass("hoverRow");};
+		w.nextMatch = w.matchStart;
+		this.lookaheadRegExp.lastIndex = w.nextMatch;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		while(lookaheadMatch && lookaheadMatch.index == w.nextMatch) {
+			var nextRowType = lookaheadMatch[2];
+			if(nextRowType == "k") {
+				table.className = lookaheadMatch[1];
+				w.nextMatch += lookaheadMatch[0].length+1;
+			} else {
+				if(nextRowType != currRowType) {
+					rowContainer = createTiddlyElement(table,this.rowTypes[nextRowType]);
+					currRowType = nextRowType;
+				}
+				if(currRowType == "c") {
+					// Caption
+					w.nextMatch++;
+					if(rowContainer != table.firstChild)
+						table.insertBefore(rowContainer,table.firstChild);
+					rowContainer.setAttribute("align",rowCount == 0?"top":"bottom");
+					w.subWikifyTerm(rowContainer,this.rowTermRegExp);
+				} else {
+					var theRow = createTiddlyElement(rowContainer,"tr",null,rowCount%2?"oddRow":"evenRow");
+					theRow.onmouseover = onmouseover;
+					theRow.onmouseout = onmouseout;
+					this.rowHandler(w,theRow,prevColumns);
+					rowCount++;
+				}
+			}
+			this.lookaheadRegExp.lastIndex = w.nextMatch;
+			lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		}
+	},
+	rowHandler: function(w,e,prevColumns)
+	{
+		var col = 0;
+		var colSpanCount = 1;
+		var prevCell = null;
+		this.cellRegExp.lastIndex = w.nextMatch;
+		var cellMatch = this.cellRegExp.exec(w.source);
+		while(cellMatch && cellMatch.index == w.nextMatch) {
+			if(cellMatch[1] == "~") {
+				// Rowspan
+				var last = prevColumns[col];
+				if(last) {
+					last.rowSpanCount++;
+					last.element.setAttribute("rowspan",last.rowSpanCount);
+					last.element.setAttribute("rowSpan",last.rowSpanCount); // Needed for IE
+					last.element.valign = "center";
+					if(colSpanCount > 1) {
+						last.element.setAttribute("colspan",colSpanCount);
+						last.element.setAttribute("colSpan",colSpanCount); // Needed for IE
+						colSpanCount = 1;
+					}
+				}
+				w.nextMatch = this.cellRegExp.lastIndex-1;
+			} else if(cellMatch[1] == ">") {
+				// Colspan
+				colSpanCount++;
+				w.nextMatch = this.cellRegExp.lastIndex-1;
+			} else if(cellMatch[2]) {
+				// End of row
+				if(prevCell && colSpanCount > 1) {
+					prevCell.setAttribute("colspan",colSpanCount);
+					prevCell.setAttribute("colSpan",colSpanCount); // Needed for IE
+				}
+				w.nextMatch = this.cellRegExp.lastIndex;
+				break;
+			} else {
+				// Cell
+				w.nextMatch++;
+				var styles = config.formatterHelpers.inlineCssHelper(w);
+				var spaceLeft = false;
+				var chr = w.source.substr(w.nextMatch,1);
+				while(chr == " ") {
+					spaceLeft = true;
+					w.nextMatch++;
+					chr = w.source.substr(w.nextMatch,1);
+				}
+				var cell;
+				if(chr == "!") {
+					cell = createTiddlyElement(e,"th");
+					w.nextMatch++;
+				} else {
+					cell = createTiddlyElement(e,"td");
+				}
+				prevCell = cell;
+				prevColumns[col] = {rowSpanCount:1,element:cell};
+				if(colSpanCount > 1) {
+					cell.setAttribute("colspan",colSpanCount);
+					cell.setAttribute("colSpan",colSpanCount); // Needed for IE
+					colSpanCount = 1;
+				}
+				config.formatterHelpers.applyCssHelper(cell,styles);
+				w.subWikifyTerm(cell,this.cellTermRegExp);
+				if(w.matchText.substr(w.matchText.length-2,1) == " ") // spaceRight
+					cell.align = spaceLeft ? "center" : "left";
+				else if(spaceLeft)
+					cell.align = "right";
+				w.nextMatch--;
+			}
+			col++;
+			this.cellRegExp.lastIndex = w.nextMatch;
+			cellMatch = this.cellRegExp.exec(w.source);
+		}
+	}
+},
+
+{
+	name: "heading",
+	match: "^!{1,6}",
+	termRegExp: /(\n)/mg,
+	handler: function(w)
+	{
+		w.subWikifyTerm(createTiddlyElement(w.output,"h" + w.matchLength),this.termRegExp);
+	}
+},
+
+{
+	name: "list",
+	match: "^(?:[\\*#;:]+)",
+	lookaheadRegExp: /^(?:(?:(\*)|(#)|(;)|(:))+)/mg,
+	termRegExp: /(\n)/mg,
+	handler: function(w)
+	{
+		var stack = [w.output];
+		var currLevel = 0, currType = null;
+		var listLevel, listType, itemType, baseType;
+		w.nextMatch = w.matchStart;
+		this.lookaheadRegExp.lastIndex = w.nextMatch;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		while(lookaheadMatch && lookaheadMatch.index == w.nextMatch) {
+			if(lookaheadMatch[1]) {
+				listType = "ul";
+				itemType = "li";
+			} else if(lookaheadMatch[2]) {
+				listType = "ol";
+				itemType = "li";
+			} else if(lookaheadMatch[3]) {
+				listType = "dl";
+				itemType = "dt";
+			} else if(lookaheadMatch[4]) {
+				listType = "dl";
+				itemType = "dd";
+			}
+			if(!baseType)
+				baseType = listType;
+			listLevel = lookaheadMatch[0].length;
+			w.nextMatch += lookaheadMatch[0].length;
+			var t;
+			if(listLevel > currLevel) {
+				for(t=currLevel; t<listLevel; t++) {
+					var target = (currLevel == 0) ? stack[stack.length-1] : stack[stack.length-1].lastChild;
+					stack.push(createTiddlyElement(target,listType));
+				}
+			} else if(listType!=baseType && listLevel==1) {
+				w.nextMatch -= lookaheadMatch[0].length;
+				return;
+			} else if(listLevel < currLevel) {
+				for(t=currLevel; t>listLevel; t--)
+					stack.pop();
+			} else if(listLevel == currLevel && listType != currType) {
+				stack.pop();
+				stack.push(createTiddlyElement(stack[stack.length-1].lastChild,listType));
+			}
+			currLevel = listLevel;
+			currType = listType;
+			var e = createTiddlyElement(stack[stack.length-1],itemType);
+			w.subWikifyTerm(e,this.termRegExp);
+			this.lookaheadRegExp.lastIndex = w.nextMatch;
+			lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		}
+	}
+},
+
+{
+	name: "quoteByBlock",
+	match: "^<<<\\n",
+	termRegExp: /(^<<<(\n|$))/mg,
+	element: "blockquote",
+	handler: config.formatterHelpers.createElementAndWikify
+},
+
+{
+	name: "quoteByLine",
+	match: "^>+",
+	lookaheadRegExp: /^>+/mg,
+	termRegExp: /(\n)/mg,
+	element: "blockquote",
+	handler: function(w)
+	{
+		var stack = [w.output];
+		var currLevel = 0;
+		var newLevel = w.matchLength;
+		var t,matched;
+		do {
+			if(newLevel > currLevel) {
+				for(t=currLevel; t<newLevel; t++)
+					stack.push(createTiddlyElement(stack[stack.length-1],this.element));
+			} else if(newLevel < currLevel) {
+				for(t=currLevel; t>newLevel; t--)
+					stack.pop();
+			}
+			currLevel = newLevel;
+			w.subWikifyTerm(stack[stack.length-1],this.termRegExp);
+			createTiddlyElement(stack[stack.length-1],"br");
+			this.lookaheadRegExp.lastIndex = w.nextMatch;
+			var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+			matched = lookaheadMatch && lookaheadMatch.index == w.nextMatch;
+			if(matched) {
+				newLevel = lookaheadMatch[0].length;
+				w.nextMatch += lookaheadMatch[0].length;
+			}
+		} while(matched);
+	}
+},
+
+{
+	name: "rule",
+	match: "^----+$\\n?|<hr ?/?>\\n?",
+	handler: function(w)
+	{
+		createTiddlyElement(w.output,"hr");
+	}
+},
+
+{
+	name: "monospacedByLine",
+	match: "^(?:/\\*\\{\\{\\{\\*/|\\{\\{\\{|//\\{\\{\\{|<!--\\{\\{\\{-->)\\n",
+	element: "pre",
+	handler: function(w)
+	{
+		switch(w.matchText) {
+		case "/*{{{*/\n": // CSS
+			this.lookaheadRegExp = /\/\*\{\{\{\*\/\n*((?:^[^\n]*\n)+?)(\n*^\f*\/\*\}\}\}\*\/$\n?)/mg;
+			break;
+		case "{{{\n": // monospaced block
+			this.lookaheadRegExp = /^\{\{\{\n((?:^[^\n]*\n)+?)(^\f*\}\}\}$\n?)/mg;
+			break;
+		case "//{{{\n": // plugin
+			this.lookaheadRegExp = /^\/\/\{\{\{\n\n*((?:^[^\n]*\n)+?)(\n*^\f*\/\/\}\}\}$\n?)/mg;
+			break;
+		case "<!--{{{-->\n": //template
+			this.lookaheadRegExp = /<!--\{\{\{-->\n*((?:^[^\n]*\n)+?)(\n*^\f*<!--\}\}\}-->$\n?)/mg;
+			break;
+		default:
+			break;
+		}
+		config.formatterHelpers.enclosedTextHelper.call(this,w);
+	}
+},
+
+{
+	name: "wikifyComment",
+	match: "^(?:/\\*\\*\\*|<!---)\\n",
+	handler: function(w)
+	{
+		var termRegExp = (w.matchText == "/***\n") ? (/(^\*\*\*\/\n)/mg) : (/(^--->\n)/mg);
+		w.subWikifyTerm(w.output,termRegExp);
+	}
+},
+
+{
+	name: "macro",
+	match: "<<",
+	lookaheadRegExp: /<<([^>\s]+)(?:\s*)((?:[^>]|(?:>(?!>)))*)>>/mg,
+	handler: function(w)
+	{
+		this.lookaheadRegExp.lastIndex = w.matchStart;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		if(lookaheadMatch && lookaheadMatch.index == w.matchStart && lookaheadMatch[1]) {
+			w.nextMatch = this.lookaheadRegExp.lastIndex;
+			invokeMacro(w.output,lookaheadMatch[1],lookaheadMatch[2],w,w.tiddler);
+		}
+	}
+},
+
+{
+	name: "prettyLink",
+	match: "\\[\\[",
+	lookaheadRegExp: /\[\[(.*?)(?:\|(~)?(.*?))?\]\]/mg,
+	handler: function(w)
+	{
+		this.lookaheadRegExp.lastIndex = w.matchStart;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		if(lookaheadMatch && lookaheadMatch.index == w.matchStart) {
+			var e;
+			var text = lookaheadMatch[1];
+			if(lookaheadMatch[3]) {
+				// Pretty bracketted link
+				var link = lookaheadMatch[3];
+				e = (!lookaheadMatch[2] && config.formatterHelpers.isExternalLink(link)) ?
+						createExternalLink(w.output,link) : createTiddlyLink(w.output,link,false,null,w.isStatic,w.tiddler);
+			} else {
+				// Simple bracketted link
+				e = createTiddlyLink(w.output,text,false,null,w.isStatic,w.tiddler);
+			}
+			createTiddlyText(e,text);
+			w.nextMatch = this.lookaheadRegExp.lastIndex;
+		}
+	}
+},
+
+{
+	name: "wikiLink",
+	match: config.textPrimitives.unWikiLink+"?"+config.textPrimitives.wikiLink,
+	handler: function(w)
+	{
+		if(w.matchText.substr(0,1) == config.textPrimitives.unWikiLink) {
+			w.outputText(w.output,w.matchStart+1,w.nextMatch);
+			return;
+		}
+		if(w.matchStart > 0) {
+			var preRegExp = new RegExp(config.textPrimitives.anyLetterStrict,"mg");
+			preRegExp.lastIndex = w.matchStart-1;
+			var preMatch = preRegExp.exec(w.source);
+			if(preMatch.index == w.matchStart-1) {
+				w.outputText(w.output,w.matchStart,w.nextMatch);
+				return;
+			}
+		}
+		if(w.autoLinkWikiWords || store.isShadowTiddler(w.matchText)) {
+			var link = createTiddlyLink(w.output,w.matchText,false,null,w.isStatic,w.tiddler);
+			w.outputText(link,w.matchStart,w.nextMatch);
+		} else {
+			w.outputText(w.output,w.matchStart,w.nextMatch);
+		}
+	}
+},
+
+{
+	name: "urlLink",
+	match: config.textPrimitives.urlPattern,
+	handler: function(w)
+	{
+		w.outputText(createExternalLink(w.output,w.matchText),w.matchStart,w.nextMatch);
+	}
+},
+
+{
+	name: "image",
+	match: "\\[[<>]?[Ii][Mm][Gg]\\[",
+	//# [<] sequence below is to avoid lessThan-questionMark sequence so TiddlyWikis can be included in PHP files
+	lookaheadRegExp: /\[([<]?)(>?)[Ii][Mm][Gg]\[(?:([^\|\]]+)\|)?([^\[\]\|]+)\](?:\[([^\]]*)\])?\]/mg,
+	handler: function(w)
+	{
+		this.lookaheadRegExp.lastIndex = w.matchStart;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		if(lookaheadMatch && lookaheadMatch.index == w.matchStart) {
+			var e = w.output;
+			if(lookaheadMatch[5]) {
+				var link = lookaheadMatch[5];
+				e = config.formatterHelpers.isExternalLink(link) ? createExternalLink(w.output,link) : createTiddlyLink(w.output,link,false,null,w.isStatic,w.tiddler);
+				jQuery(e).addClass("imageLink");
+			}
+			var img = createTiddlyElement(e,"img");
+			if(lookaheadMatch[1])
+				img.align = "left";
+			else if(lookaheadMatch[2])
+				img.align = "right";
+			if(lookaheadMatch[3]) {
+				img.title = lookaheadMatch[3];
+				img.setAttribute("alt",lookaheadMatch[3]);
+			}
+			img.src = lookaheadMatch[4];
+			w.nextMatch = this.lookaheadRegExp.lastIndex;
+		}
+	}
+},
+
+{
+	name: "html",
+	match: "<[Hh][Tt][Mm][Ll]>",
+	lookaheadRegExp: /<[Hh][Tt][Mm][Ll]>((?:.|\n)*?)<\/[Hh][Tt][Mm][Ll]>/mg,
+	handler: function(w)
+	{
+		this.lookaheadRegExp.lastIndex = w.matchStart;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		if(lookaheadMatch && lookaheadMatch.index == w.matchStart) {
+			createTiddlyElement(w.output,"span").innerHTML = lookaheadMatch[1];
+			w.nextMatch = this.lookaheadRegExp.lastIndex;
+		}
+	}
+},
+
+{
+	name: "commentByBlock",
+	match: "/%",
+	lookaheadRegExp: /\/%((?:.|\n)*?)%\//mg,
+	handler: function(w)
+	{
+		this.lookaheadRegExp.lastIndex = w.matchStart;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		if(lookaheadMatch && lookaheadMatch.index == w.matchStart)
+			w.nextMatch = this.lookaheadRegExp.lastIndex;
+	}
+},
+
+{
+	name: "characterFormat",
+	match: "''|//|__|\\^\\^|~~|--(?!\\s|$)|\\{\\{\\{",
+	handler: function(w)
+	{
+		switch(w.matchText) {
+		case "''":
+			w.subWikifyTerm(w.output.appendChild(document.createElement("strong")),/('')/mg);
+			break;
+		case "//":
+			w.subWikifyTerm(createTiddlyElement(w.output,"em"),/(\/\/)/mg);
+			break;
+		case "__":
+			w.subWikifyTerm(createTiddlyElement(w.output,"u"),/(__)/mg);
+			break;
+		case "^^":
+			w.subWikifyTerm(createTiddlyElement(w.output,"sup"),/(\^\^)/mg);
+			break;
+		case "~~":
+			w.subWikifyTerm(createTiddlyElement(w.output,"sub"),/(~~)/mg);
+			break;
+		case "--":
+			w.subWikifyTerm(createTiddlyElement(w.output,"strike"),/(--)/mg);
+			break;
+		case "{{{":
+			var lookaheadRegExp = /\{\{\{((?:.|\n)*?)\}\}\}/mg;
+			lookaheadRegExp.lastIndex = w.matchStart;
+			var lookaheadMatch = lookaheadRegExp.exec(w.source);
+			if(lookaheadMatch && lookaheadMatch.index == w.matchStart) {
+				createTiddlyElement(w.output,"code",null,null,lookaheadMatch[1]);
+				w.nextMatch = lookaheadRegExp.lastIndex;
+			}
+			break;
+		}
+	}
+},
+
+{
+	name: "customFormat",
+	match: "@@|\\{\\{",
+	handler: function(w)
+	{
+		switch(w.matchText) {
+		case "@@":
+			var e = createTiddlyElement(w.output,"span");
+			var styles = config.formatterHelpers.inlineCssHelper(w);
+			if(styles.length == 0)
+				e.className = "marked";
+			else
+				config.formatterHelpers.applyCssHelper(e,styles);
+			w.subWikifyTerm(e,/(@@)/mg);
+			break;
+		case "{{":
+			var lookaheadRegExp = /\{\{[\s]*([\w]+[\s\w]*)[\s]*\{(\n?)/mg;
+			lookaheadRegExp.lastIndex = w.matchStart;
+			var lookaheadMatch = lookaheadRegExp.exec(w.source);
+			if(lookaheadMatch) {
+				w.nextMatch = lookaheadRegExp.lastIndex;
+				e = createTiddlyElement(w.output,lookaheadMatch[2] == "\n" ? "div" : "span",null,lookaheadMatch[1]);
+				w.subWikifyTerm(e,/(\}\}\})/mg);
+			}
+			break;
+		}
+	}
+},
+
+{
+	name: "mdash",
+	match: "--",
+	handler: function(w)
+	{
+		createTiddlyElement(w.output,"span").innerHTML = "&mdash;";
+	}
+},
+
+{
+	name: "lineBreak",
+	match: "\\n|<br ?/?>",
+	handler: function(w)
+	{
+		createTiddlyElement(w.output,"br");
+	}
+},
+
+{
+	name: "rawText",
+	match: "\"{3}|<nowiki>",
+	lookaheadRegExp: /(?:\"{3}|<nowiki>)((?:.|\n)*?)(?:\"{3}|<\/nowiki>)/mg,
+	handler: function(w)
+	{
+		this.lookaheadRegExp.lastIndex = w.matchStart;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		if(lookaheadMatch && lookaheadMatch.index == w.matchStart) {
+			createTiddlyElement(w.output,"span",null,null,lookaheadMatch[1]);
+			w.nextMatch = this.lookaheadRegExp.lastIndex;
+		}
+	}
+},
+
+{
+	name: "htmlEntitiesEncoding",
+	match: "(?:(?:&#?[a-zA-Z0-9]{2,8};|.)(?:&#?(?:x0*(?:3[0-6][0-9a-fA-F]|1D[c-fC-F][0-9a-fA-F]|20[d-fD-F][0-9a-fA-F]|FE2[0-9a-fA-F])|0*(?:76[89]|7[7-9][0-9]|8[0-7][0-9]|761[6-9]|76[2-7][0-9]|84[0-3][0-9]|844[0-7]|6505[6-9]|6506[0-9]|6507[0-1]));)+|&#?[a-zA-Z0-9]{2,8};)",
+	handler: function(w)
+	{
+		createTiddlyElement(w.output,"span").innerHTML = w.matchText;
+	}
+}
+
+];
+
diff --git a/test/data/tiddlywiki/js/FormatterHelpers.js b/test/data/tiddlywiki/js/FormatterHelpers.js
new file mode 100755
index 000000000..b48b96429
--- /dev/null
+++ b/test/data/tiddlywiki/js/FormatterHelpers.js
@@ -0,0 +1,94 @@
+//--
+//-- Formatter helpers
+//--
+
+function Formatter(formatters)
+{
+	var n;
+	this.formatters = [];
+	var pattern = [];
+	for(n=0; n<formatters.length; n++) {
+		pattern.push("(" + formatters[n].match + ")");
+		this.formatters.push(formatters[n]);
+	}
+	this.formatterRegExp = new RegExp(pattern.join("|"),"mg");
+}
+
+config.formatterHelpers = {
+
+	createElementAndWikify: function(w)
+	{
+		w.subWikifyTerm(createTiddlyElement(w.output,this.element),this.termRegExp);
+	},
+
+	inlineCssHelper: function(w)
+	{
+		var styles = [];
+		config.textPrimitives.cssLookaheadRegExp.lastIndex = w.nextMatch;
+		var lookaheadMatch = config.textPrimitives.cssLookaheadRegExp.exec(w.source);
+		while(lookaheadMatch && lookaheadMatch.index == w.nextMatch) {
+			var s,v;
+			if(lookaheadMatch[1]) {
+				s = lookaheadMatch[1].unDash();
+				v = lookaheadMatch[2];
+			} else {
+				s = lookaheadMatch[3].unDash();
+				v = lookaheadMatch[4];
+			}
+			if(s=="bgcolor")
+				s = "backgroundColor";
+			if(s=="float")
+				s = "cssFloat";
+			styles.push({style: s, value: v});
+			w.nextMatch = lookaheadMatch.index + lookaheadMatch[0].length;
+			config.textPrimitives.cssLookaheadRegExp.lastIndex = w.nextMatch;
+			lookaheadMatch = config.textPrimitives.cssLookaheadRegExp.exec(w.source);
+		}
+		return styles;
+	},
+
+	applyCssHelper: function(e,styles)
+	{
+		var t;
+		for(t=0; t< styles.length; t++) {
+			try {
+				e.style[styles[t].style] = styles[t].value;
+			} catch (ex) {
+			}
+		}
+	},
+
+	enclosedTextHelper: function(w)
+	{
+		this.lookaheadRegExp.lastIndex = w.matchStart;
+		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
+		if(lookaheadMatch && lookaheadMatch.index == w.matchStart) {
+			var text = lookaheadMatch[1];
+			if(config.browser.isIE)
+				text = text.replace(/\n/g,"\r");
+			createTiddlyElement(w.output,this.element,null,null,text);
+			w.nextMatch = lookaheadMatch.index + lookaheadMatch[0].length;
+		}
+	},
+
+	isExternalLink: function(link)
+	{
+		if(store.tiddlerExists(link) || store.isShadowTiddler(link)) {
+			//# Definitely not an external link
+			return false;
+		}
+		var urlRegExp = new RegExp(config.textPrimitives.urlPattern,"mg");
+		if(urlRegExp.exec(link)) {
+			//# Definitely an external link
+			return true;
+		}
+		if(link.indexOf(".")!=-1 || link.indexOf("\\")!=-1 || link.indexOf("/")!=-1 || link.indexOf("#")!=-1) {
+			//# Link contains . / \ or # so is probably an external link
+			return true;
+		}
+		//# Otherwise assume it is not an external link
+		return false;
+	}
+
+};
+
diff --git a/test/data/tiddlywiki/js/Guide.js b/test/data/tiddlywiki/js/Guide.js
new file mode 100755
index 000000000..c90f7c761
--- /dev/null
+++ b/test/data/tiddlywiki/js/Guide.js
@@ -0,0 +1,12 @@
+//
+// Please note:
+//
+// * This code is designed to be readable but for compactness it only includes brief comments. You can see fuller comments
+//   in the project repository at https://github.com/TiddlyWiki/tiddlywiki
+//
+// * You should never need to modify this source code directly. TiddlyWiki is carefully designed to allow deep customisation
+//   without changing the core code. Please consult the development group at http://groups.google.com/group/TiddlyWikiDev
+//
+// JSLint directives
+/*global jQuery:false, version:false */
+/*jslint bitwise:true, browser:true, confusion:true, eqeq:true, evil:true, forin:true, maxerr:100, plusplus:true, regexp:true, sloppy:true, sub:true, undef:true, unparam:true, vars:true, white:true */
diff --git a/test/data/tiddlywiki/js/Http.js b/test/data/tiddlywiki/js/Http.js
new file mode 100755
index 000000000..c1fe6b17e
--- /dev/null
+++ b/test/data/tiddlywiki/js/Http.js
@@ -0,0 +1,75 @@
+//--
+//-- HTTP request code
+//--
+
+//# Perform an http request using the jQuery ajax function
+function ajaxReq(args)
+{
+	if(window.Components && window.netscape && window.netscape.security && document.location.protocol.indexOf("http") == -1)
+		window.netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
+	return jQuery.ajax(args);
+}
+
+//# Perform an http request
+//#   type - GET/POST/PUT/DELETE
+//#   url - the source url
+//#   data - optional data for POST and PUT
+//#   contentType - optionalContent type for the data (defaults to application/x-www-form-urlencoded)
+//#   username - optional username for basic authentication
+//#   password - optional password for basic authentication
+//#   callback - function to call when there is a response
+//#   params - parameter object that gets passed to the callback for storing it's state
+//#   headers - optional hashmap of additional headers
+//#   allowCache - unless true, adds a "nocache=" parameter to the URL
+//# Return value is the underlying XMLHttpRequest object, or a string if there was an error
+//# Callback function is called like this:
+//#   callback(status,params,responseText,url,xhr)
+//#     status - true if OK, false if error
+//#     params - the parameter object provided to loadRemoteFile()
+//#     responseText - the text of the file
+//#     url - requested URL
+//#     xhr - the underlying XMLHttpRequest object
+function httpReq(type,url,callback,params,headers,data,contentType,username,password,allowCache)
+{
+	var httpSuccess = function(xhr) {
+		try {
+			// IE error sometimes returns 1223 when it should be 204 so treat it as success, see #1450
+			return (!xhr.status && location.protocol === "file:") ||
+				(xhr.status >= 200 && xhr.status < 300) ||
+				xhr.status === 304 || xhr.status === 1223;
+		} catch(e) {}
+		return false;
+	};
+
+	var options = {
+		type:type,
+		url:url,
+		processData:false,
+		data:data,
+		cache:!!allowCache,
+		beforeSend: function(xhr) {
+			var i;
+			for(i in headers)
+				xhr.setRequestHeader(i,headers[i]);
+			xhr.setRequestHeader("X-Requested-With", "TiddlyWiki " + formatVersion());
+		}
+	};
+
+	if(callback) {
+		options.complete = function(xhr,textStatus) {
+			if(httpSuccess(xhr))
+				callback(true,params,xhr.responseText,url,xhr);
+			else
+				callback(false,params,null,url,xhr);
+		};
+	}
+	if(contentType)
+		options.contentType = contentType;
+	if(username)
+		options.username = username;
+	if(password)
+		options.password = password;
+	if(window.Components && window.netscape && window.netscape.security && document.location.protocol.indexOf("http") == -1)
+		window.netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
+	return jQuery.ajax(options);
+}
diff --git a/test/data/tiddlywiki/js/Import.js b/test/data/tiddlywiki/js/Import.js
new file mode 100755
index 000000000..005a57642
--- /dev/null
+++ b/test/data/tiddlywiki/js/Import.js
@@ -0,0 +1,390 @@
+//--
+//-- ImportTiddlers macro
+//--
+
+config.macros.importTiddlers.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	if(readOnly) {
+		createTiddlyElement(place,"div",null,"marked",this.readOnlyWarning);
+		return;
+	}
+	var w = new Wizard();
+	w.createWizard(place,this.wizardTitle);
+	this.restart(w);
+};
+
+config.macros.importTiddlers.onCancel = function(e)
+{
+	var wizard = new Wizard(this);
+	wizard.clear();
+	config.macros.importTiddlers.restart(wizard);
+	return false;
+};
+
+config.macros.importTiddlers.onClose = function(e)
+{
+	backstage.hidePanel();
+	return false;
+};
+
+config.macros.importTiddlers.restart = function(wizard)
+{
+	var me = config.macros.importTiddlers;
+	wizard.addStep(this.step1Title,this.step1Html);
+	var t,s = wizard.getElement("selTypes");
+	for(t in config.adaptors) {
+		var e = createTiddlyElement(s,"option",null,null,config.adaptors[t].serverLabel || t);
+		e.value = t;
+	}
+	if(config.defaultAdaptor)
+		s.value = config.defaultAdaptor;
+	s = wizard.getElement("selFeeds");
+	var feeds = this.getFeeds();
+	for(t in feeds) {
+		e = createTiddlyElement(s,"option",null,null,t);
+		e.value = t;
+	}
+	wizard.setValue("feeds",feeds);
+	s.onchange = me.onFeedChange;
+	var fileInput = wizard.getElement("txtBrowse");
+	fileInput.onchange = me.onBrowseChange;
+	fileInput.onkeyup = me.onBrowseChange;
+	wizard.setButtons([{caption: this.openLabel, tooltip: this.openPrompt, onClick: me.onOpen}]);
+	wizard.formElem.action = "javascript:;";
+	wizard.formElem.onsubmit = function() {
+		if(!this.txtPath || this.txtPath.value.length) //# check for manually entered path in first step
+			this.lastChild.firstChild.onclick();
+	};
+};
+
+config.macros.importTiddlers.getFeeds = function()
+{
+	var feeds = {};
+	var t,tagged = store.getTaggedTiddlers("systemServer","title");
+	for(t=0; t<tagged.length; t++) {
+		var title = tagged[t].title;
+		var serverType = store.getTiddlerSlice(title,"Type");
+		if(!serverType)
+			serverType = "file";
+		feeds[title] = {title: title,
+						url: store.getTiddlerSlice(title,"URL"),
+						workspace: store.getTiddlerSlice(title,"Workspace"),
+						workspaceList: store.getTiddlerSlice(title,"WorkspaceList"),
+						tiddlerFilter: store.getTiddlerSlice(title,"TiddlerFilter"),
+						serverType: serverType,
+						description: store.getTiddlerSlice(title,"Description")};
+	}
+	return feeds;
+};
+
+config.macros.importTiddlers.onFeedChange = function(e)
+{
+	var wizard = new Wizard(this);
+	var selTypes = wizard.getElement("selTypes");
+	var fileInput = wizard.getElement("txtPath");
+	var feeds = wizard.getValue("feeds");
+	var f = feeds[this.value];
+	if(f) {
+		selTypes.value = f.serverType;
+		fileInput.value = f.url;
+		wizard.setValue("feedName",f.serverType);
+		wizard.setValue("feedHost",f.url);
+		wizard.setValue("feedWorkspace",f.workspace);
+		wizard.setValue("feedWorkspaceList",f.workspaceList);
+		wizard.setValue("feedTiddlerFilter",f.tiddlerFilter);
+	}
+	return false;
+};
+
+config.macros.importTiddlers.onBrowseChange = function(e)
+{
+	var wizard = new Wizard(this);
+	var file = this.value;
+	if(this.files && this.files[0]) {
+		file = this.files[0].fileName;
+		try {
+			if(typeof(netscape) !== "undefined") {
+				netscape.security.PrivilegeManager.enablePrivilege("UniversalFileRead");
+			}
+		} catch (ex) {
+			showException(ex);
+		}
+	}
+	var fileInput = wizard.getElement("txtPath");
+	fileInput.value = config.macros.importTiddlers.getURLFromLocalPath(file);
+	var serverType = wizard.getElement("selTypes");
+	serverType.value = "file";
+	return true;
+};
+
+config.macros.importTiddlers.getURLFromLocalPath = function(v)
+{
+	if(!v || !v.length)
+		return v;
+	v = v.replace(/\\/g,"/"); // use "/" for cross-platform consistency
+	var u;
+	var t = v.split(":");
+	var p = t[1] || t[0]; // remove drive letter (if any)
+	if(t[1] && (t[0] == "http" || t[0] == "https" || t[0] == "file")) {
+		//# input is already a URL
+		u = v;
+	} else if(p.substr(0,1)=="/") {
+		//# path is absolute, add protocol+domain+extra slash (if drive letter)
+		u = document.location.protocol + "//" + document.location.hostname + (t[1] ? "/" : "") + v;
+	} else {
+		//# path is relative, add current document protocol+domain+path
+		var c = document.location.href.replace(/\\/g,"/");
+		var pos = c.lastIndexOf("/");
+		if(pos!=-1)
+			c = c.substr(0,pos); // remove filename
+		u = c + "/" + p;
+	}
+	return u;
+};
+
+config.macros.importTiddlers.onOpen = function(e)
+{
+	var me = config.macros.importTiddlers;
+	var wizard = new Wizard(this);
+	var fileInput = wizard.getElement("txtPath");
+	var url = fileInput.value;
+	var serverType = wizard.getElement("selTypes").value || config.defaultAdaptor;
+	var adaptor = new config.adaptors[serverType]();
+	wizard.setValue("adaptor",adaptor);
+	wizard.setValue("serverType",serverType);
+	wizard.setValue("host",url);
+	adaptor.openHost(url,null,wizard,me.onOpenHost);
+	wizard.setButtons([{caption: me.cancelLabel, tooltip: me.cancelPrompt, onClick: me.onCancel}],me.statusOpenHost);
+	return false;
+};
+
+config.macros.importTiddlers.onOpenHost = function(context,wizard)
+{
+	var me = config.macros.importTiddlers;
+	var adaptor = wizard.getValue("adaptor");
+	if(context.status !== true)
+		displayMessage("Error in importTiddlers.onOpenHost: " + context.statusText);
+	adaptor.getWorkspaceList(context,wizard,me.onGetWorkspaceList);
+	wizard.setButtons([{caption: me.cancelLabel, tooltip: me.cancelPrompt, onClick: me.onCancel}],me.statusGetWorkspaceList);
+};
+
+config.macros.importTiddlers.onGetWorkspaceList = function(context,wizard)
+{
+	var me = config.macros.importTiddlers;
+	if(context.status !== true)
+		displayMessage("Error in importTiddlers.onGetWorkspaceList: " + context.statusText);
+	wizard.setValue("context",context);
+	var workspace = wizard.getValue("feedWorkspace");
+	if(!workspace && context.workspaces.length==1)
+		workspace = context.workspaces[0].title;
+	if(workspace) {
+		//# if there is only one workspace, then open it directly
+		context.adaptor.openWorkspace(workspace,context,wizard,me.onOpenWorkspace);
+		wizard.setValue("workspace",workspace);
+		wizard.setButtons([{caption: me.cancelLabel, tooltip: me.cancelPrompt, onClick: me.onCancel}],me.statusOpenWorkspace);
+		return;
+	}
+	wizard.addStep(me.step2Title,me.step2Html);
+	var t,s = wizard.getElement("selWorkspace");
+	s.onchange = me.onWorkspaceChange;
+	for(t=0; t<context.workspaces.length; t++) {
+		var e = createTiddlyElement(s,"option",null,null,context.workspaces[t].title);
+		e.value = context.workspaces[t].title;
+	}
+	var workspaceList = wizard.getValue("feedWorkspaceList");
+	if(workspaceList) {
+		var n,list = workspaceList.parseParams("workspace",null,false,true);
+		for(n=1; n<list.length; n++) {
+			if(context.workspaces.findByField("title",list[n].value) == null) {
+				e = createTiddlyElement(s,"option",null,null,list[n].value);
+				e.value = list[n].value;
+			}
+		}
+	}
+	if(workspace) {
+		t = wizard.getElement("txtWorkspace");
+		t.value = workspace;
+	}
+	wizard.setButtons([{caption: me.openLabel, tooltip: me.openPrompt, onClick: me.onChooseWorkspace}]);
+};
+
+config.macros.importTiddlers.onWorkspaceChange = function(e)
+{
+	var wizard = new Wizard(this);
+	var t = wizard.getElement("txtWorkspace");
+	t.value = this.value;
+	this.selectedIndex = 0;
+	return false;
+};
+
+config.macros.importTiddlers.onChooseWorkspace = function(e)
+{
+	var me = config.macros.importTiddlers;
+	var wizard = new Wizard(this);
+	var adaptor = wizard.getValue("adaptor");
+	var workspace = wizard.getElement("txtWorkspace").value;
+	wizard.setValue("workspace",workspace);
+	var context = wizard.getValue("context");
+	adaptor.openWorkspace(workspace,context,wizard,me.onOpenWorkspace);
+	wizard.setButtons([{caption: me.cancelLabel, tooltip: me.cancelPrompt, onClick: me.onCancel}],me.statusOpenWorkspace);
+	return false;
+};
+
+config.macros.importTiddlers.onOpenWorkspace = function(context,wizard)
+{
+	var me = config.macros.importTiddlers;
+	if(context.status !== true)
+		displayMessage("Error in importTiddlers.onOpenWorkspace: " + context.statusText);
+	var adaptor = wizard.getValue("adaptor");
+	adaptor.getTiddlerList(context,wizard,me.onGetTiddlerList,wizard.getValue("feedTiddlerFilter"));
+	wizard.setButtons([{caption: me.cancelLabel, tooltip: me.cancelPrompt, onClick: me.onCancel}],me.statusGetTiddlerList);
+};
+
+config.macros.importTiddlers.onGetTiddlerList = function(context,wizard)
+{
+	var me = config.macros.importTiddlers;
+	if(context.status !== true) {
+		var error = context.statusText||me.errorGettingTiddlerList;
+		if(context.host.indexOf("file://") === 0) {
+			error = me.errorGettingTiddlerListFile;
+		} else {
+			error = context.xhr && context.xhr.status == 404 ? me.errorGettingTiddlerListHttp404 :
+				me.errorGettingTiddlerListHttp;
+		}
+		wizard.setButtons([{caption: me.cancelLabel, tooltip: me.cancelPrompt, onClick: me.onCancel}],"");
+		jQuery("span.status", wizard.footerEl).html(error); // so error message can be html
+		return;
+	}
+	// Extract data for the listview
+	var listedTiddlers = [];
+	if(context.tiddlers) {
+		var n;
+		for(n=0; n<context.tiddlers.length; n++) {
+			var tiddler = context.tiddlers[n];
+			listedTiddlers.push({
+				title: tiddler.title,
+				modified: tiddler.modified,
+				modifier: tiddler.modifier,
+				text: tiddler.text ? wikifyPlainText(tiddler.text,100) : "",
+				tags: tiddler.tags,
+				size: tiddler.text ? tiddler.text.length : 0,
+				tiddler: tiddler
+			});
+		}
+	}
+	listedTiddlers.sort(function(a,b) {return a.title < b.title ? -1 : (a.title == b.title ? 0 : +1);});
+	// Display the listview
+	wizard.addStep(me.step3Title,me.step3Html);
+	var markList = wizard.getElement("markList");
+	var listWrapper = document.createElement("div");
+	markList.parentNode.insertBefore(listWrapper,markList);
+	var listView = ListView.create(listWrapper,listedTiddlers,me.listViewTemplate);
+	wizard.setValue("listView",listView);
+	wizard.setValue("context",context);
+	var txtSaveTiddler = wizard.getElement("txtSaveTiddler");
+	txtSaveTiddler.value = me.generateSystemServerName(wizard);
+	wizard.setButtons([
+			{caption: me.cancelLabel, tooltip: me.cancelPrompt, onClick: me.onCancel},
+			{caption: me.importLabel, tooltip: me.importPrompt, onClick: me.doImport}
+		]);
+};
+
+config.macros.importTiddlers.generateSystemServerName = function(wizard)
+{
+	var serverType = wizard.getValue("serverType");
+	var host = wizard.getValue("host");
+	var workspace = wizard.getValue("workspace");
+	var pattern = config.macros.importTiddlers[workspace ? "systemServerNamePattern" : "systemServerNamePatternNoWorkspace"];
+	return pattern.format([serverType,host,workspace]);
+};
+
+config.macros.importTiddlers.saveServerTiddler = function(wizard)
+{
+	var me = config.macros.importTiddlers;
+	var txtSaveTiddler = wizard.getElement("txtSaveTiddler").value;
+	if(store.tiddlerExists(txtSaveTiddler)) {
+		if(!confirm(me.confirmOverwriteSaveTiddler.format([txtSaveTiddler])))
+			return;
+		store.suspendNotifications();
+		store.removeTiddler(txtSaveTiddler);
+		store.resumeNotifications();
+	}
+	var serverType = wizard.getValue("serverType");
+	var host = wizard.getValue("host");
+	var workspace = wizard.getValue("workspace");
+	var text = me.serverSaveTemplate.format([serverType,host,workspace]);
+	store.saveTiddler(txtSaveTiddler,txtSaveTiddler,text,me.serverSaveModifier,new Date(),["systemServer"]);
+};
+
+config.macros.importTiddlers.doImport = function(e)
+{
+	var me = config.macros.importTiddlers;
+	var wizard = new Wizard(this);
+	if(wizard.getElement("chkSave").checked)
+		me.saveServerTiddler(wizard);
+	var chkSync = wizard.getElement("chkSync").checked;
+	wizard.setValue("sync",chkSync);
+	var listView = wizard.getValue("listView");
+	var rowNames = ListView.getSelectedRows(listView);
+	var adaptor = wizard.getValue("adaptor");
+	var overwrite = [];
+	var t;
+	for(t=0; t<rowNames.length; t++) {
+		if(store.tiddlerExists(rowNames[t]))
+			overwrite.push(rowNames[t]);
+	}
+	if(overwrite.length > 0) {
+		if(!confirm(me.confirmOverwriteText.format([overwrite.join(", ")])))
+			return false;
+	}
+	wizard.addStep(me.step4Title.format([rowNames.length]),me.step4Html);
+	for(t=0; t<rowNames.length; t++) {
+		var link = document.createElement("div");
+		createTiddlyLink(link,rowNames[t],true);
+		var place = wizard.getElement("markReport");
+		place.parentNode.insertBefore(link,place);
+	}
+	wizard.setValue("remainingImports",rowNames.length);
+	wizard.setButtons([
+			{caption: me.cancelLabel, tooltip: me.cancelPrompt, onClick: me.onCancel}
+		],me.statusDoingImport);
+	var wizardContext = wizard.getValue("context");
+	var tiddlers = wizardContext ? wizardContext.tiddlers : [];
+	for(t=0; t<rowNames.length; t++) {
+		var context = {
+			allowSynchronous:true,
+			tiddler:tiddlers[tiddlers.findByField("title",rowNames[t])]
+		};
+		adaptor.getTiddler(rowNames[t],context,wizard,me.onGetTiddler);
+	}
+	return false;
+};
+
+config.macros.importTiddlers.onGetTiddler = function(context,wizard)
+{
+	var me = config.macros.importTiddlers;
+	if(!context.status)
+		displayMessage("Error in importTiddlers.onGetTiddler: " + context.statusText);
+	var tiddler = context.tiddler;
+	store.suspendNotifications();
+	store.saveTiddler(tiddler.title, tiddler.title, tiddler.text, tiddler.modifier, tiddler.modified, tiddler.tags, tiddler.fields, true, tiddler.created);
+	if(!wizard.getValue("sync")) {
+		store.setValue(tiddler.title,'server',null);
+	}
+	store.resumeNotifications();
+	if(!context.isSynchronous)
+		store.notify(tiddler.title,true);
+	var remainingImports = wizard.getValue("remainingImports")-1;
+	wizard.setValue("remainingImports",remainingImports);
+	if(remainingImports == 0) {
+		if(context.isSynchronous) {
+			store.notifyAll();
+			refreshDisplay();
+		}
+		wizard.setButtons([
+				{caption: me.doneLabel, tooltip: me.donePrompt, onClick: me.onClose}
+			],me.statusDoneImport);
+		autoSaveChanges();
+	}
+};
+
diff --git a/test/data/tiddlywiki/js/Lingo.js b/test/data/tiddlywiki/js/Lingo.js
new file mode 100755
index 000000000..0be846751
--- /dev/null
+++ b/test/data/tiddlywiki/js/Lingo.js
@@ -0,0 +1,500 @@
+//--
+//-- Translateable strings
+//--
+
+// Strings in "double quotes" should be translated; strings in 'single quotes' should be left alone
+
+merge(config.options,{
+	txtUserName: "YourName"});
+
+merge(config.tasks,{
+	save: {text: "save", tooltip: "Save your changes to this TiddlyWiki"},
+	sync: {text: "sync", tooltip: "Synchronise changes with other TiddlyWiki files and servers", content: '<<sync>>'},
+	importTask: {text: "import", tooltip: "Import tiddlers and plugins from other TiddlyWiki files and servers", content: '<<importTiddlers>>'},
+	tweak: {text: "tweak", tooltip: "Tweak the appearance and behaviour of TiddlyWiki", content: '<<options>>'},
+	upgrade: {text: "upgrade", tooltip: "Upgrade TiddlyWiki core code", content: '<<upgrade>>'},
+	plugins: {text: "plugins", tooltip: "Manage installed plugins", content: '<<plugins>>'}
+});
+
+// Options that can be set in the options panel and/or cookies
+merge(config.optionsDesc,{
+	txtUserName: "Username for signing your edits",
+	chkRegExpSearch: "Enable regular expressions for searches",
+	chkCaseSensitiveSearch: "Case-sensitive searching",
+	chkIncrementalSearch: "Incremental key-by-key searching",
+	chkAnimate: "Enable animations",
+	chkSaveBackups: "Keep backup file when saving changes",
+	chkAutoSave: "Automatically save changes",
+	chkGenerateAnRssFeed: "Generate an RSS feed when saving changes",
+	chkSaveEmptyTemplate: "Generate an empty template when saving changes",
+	chkOpenInNewWindow: "Open external links in a new window",
+	chkToggleLinks: "Clicking on links to open tiddlers causes them to close",
+	chkHttpReadOnly: "Hide editing features when viewed over HTTP",
+	chkForceMinorUpdate: "Don't update modifier username and date when editing tiddlers",
+	chkConfirmDelete: "Require confirmation before deleting tiddlers",
+	chkInsertTabs: "Use the tab key to insert tab characters instead of moving between fields",
+	txtBackupFolder: "Name of folder to use for backups",
+	txtMaxEditRows: "Maximum number of rows in edit boxes",
+	txtTheme: "Name of the theme to use",
+	txtFileSystemCharSet: "Default character set for saving changes (Firefox/Mozilla only)"});
+
+merge(config.messages,{
+	customConfigError: "Problems were encountered loading plugins. See PluginManager for details",
+	pluginError: "Error: %0",
+	pluginDisabled: "Not executed because disabled via 'systemConfigDisable' tag",
+	pluginForced: "Executed because forced via 'systemConfigForce' tag",
+	pluginVersionError: "Not executed because this plugin needs a newer version of TiddlyWiki",
+	nothingSelected: "Nothing is selected. You must select one or more items first",
+	savedSnapshotError: "It appears that this TiddlyWiki has been incorrectly saved. Please see http://www.tiddlywiki.com/#Download for details",
+	subtitleUnknown: "(unknown)",
+	undefinedTiddlerToolTip: "The tiddler '%0' doesn't yet exist",
+	shadowedTiddlerToolTip: "The tiddler '%0' doesn't yet exist, but has a pre-defined shadow value",
+	tiddlerLinkTooltip: "%0 - %1, %2",
+	externalLinkTooltip: "External link to %0",
+	noTags: "There are no tagged tiddlers",
+	notFileUrlError: "You need to save this TiddlyWiki to a file before you can save changes",
+	cantSaveError: "It's not possible to save changes. Possible reasons include:\n- your browser doesn't support saving (Firefox, Internet Explorer, Safari and Opera all work if properly configured)\n- the pathname to your TiddlyWiki file contains illegal characters\n- the TiddlyWiki HTML file has been moved or renamed",
+	invalidFileError: "The original file '%0' does not appear to be a valid TiddlyWiki",
+	backupSaved: "Backup saved",
+	backupFailed: "Failed to save backup file",
+	rssSaved: "RSS feed saved",
+	rssFailed: "Failed to save RSS feed file",
+	emptySaved: "Empty template saved",
+	emptyFailed: "Failed to save empty template file",
+	mainSaved: "Main TiddlyWiki file saved",
+	mainFailed: "Failed to save main TiddlyWiki file. Your changes have not been saved",
+	macroError: "Error in macro <<%0>>",
+	macroErrorDetails: "Error while executing macro <<%0>>:\n%1",
+	missingMacro: "No such macro",
+	overwriteWarning: "A tiddler named '%0' already exists. Choose OK to overwrite it",
+	unsavedChangesWarning: "WARNING! There are unsaved changes in TiddlyWiki\n\nChoose OK to save\nChoose CANCEL to discard",
+	confirmExit: "--------------------------------\n\nThere are unsaved changes in TiddlyWiki. If you continue you will lose those changes\n\n--------------------------------",
+	saveInstructions: "SaveChanges",
+	unsupportedTWFormat: "Unsupported TiddlyWiki format '%0'",
+	tiddlerSaveError: "Error when saving tiddler '%0'",
+	tiddlerLoadError: "Error when loading tiddler '%0'",
+	wrongSaveFormat: "Cannot save with storage format '%0'. Using standard format for save.",
+	invalidFieldName: "Invalid field name %0",
+	fieldCannotBeChanged: "Field '%0' cannot be changed",
+	loadingMissingTiddler: "Attempting to retrieve the tiddler '%0' from the '%1' server at:\n\n'%2' in the workspace '%3'",
+	upgradeDone: "The upgrade to version %0 is now complete\n\nClick 'OK' to reload the newly upgraded TiddlyWiki",
+	invalidCookie: "Invalid cookie '%0'"});
+
+merge(config.messages.messageClose,{
+	text: "close",
+	tooltip: "close this message area"});
+
+config.messages.backstage = {
+	open: {text: "backstage", tooltip: "Open the backstage area to perform authoring and editing tasks"},
+	close: {text: "close", tooltip: "Close the backstage area"},
+	prompt: "backstage: ",
+	decal: {
+		edit: {text: "edit", tooltip: "Edit the tiddler '%0'"}
+	}
+};
+
+config.messages.listView = {
+	tiddlerTooltip: "Click for the full text of this tiddler",
+	previewUnavailable: "(preview not available)"
+};
+
+config.messages.dates.months = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November","December"];
+config.messages.dates.days = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"];
+config.messages.dates.shortMonths = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
+config.messages.dates.shortDays = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
+// suffixes for dates, eg "1st","2nd","3rd"..."30th","31st"
+config.messages.dates.daySuffixes = ["st","nd","rd","th","th","th","th","th","th","th",
+		"th","th","th","th","th","th","th","th","th","th",
+		"st","nd","rd","th","th","th","th","th","th","th",
+		"st"];
+config.messages.dates.am = "am";
+config.messages.dates.pm = "pm";
+
+merge(config.messages.tiddlerPopup,{
+	});
+
+merge(config.views.wikified.tag,{
+	labelNoTags: "no tags",
+	labelTags: "tags: ",
+	openTag: "Open tag '%0'",
+	tooltip: "Show tiddlers tagged with '%0'",
+	openAllText: "Open all",
+	openAllTooltip: "Open all of these tiddlers",
+	popupNone: "No other tiddlers tagged with '%0'"});
+
+merge(config.views.wikified,{
+	defaultText: "The tiddler '%0' doesn't yet exist. Double-click to create it",
+	defaultModifier: "(missing)",
+	shadowModifier: "(built-in shadow tiddler)",
+	dateFormat: "DD MMM YYYY",
+	createdPrompt: "created"});
+
+merge(config.views.editor,{
+	tagPrompt: "Type tags separated with spaces, [[use double square brackets]] if necessary, or add existing",
+	defaultText: "Type the text for '%0'"});
+
+merge(config.views.editor.tagChooser,{
+	text: "tags",
+	tooltip: "Choose existing tags to add to this tiddler",
+	popupNone: "There are no tags defined",
+	tagTooltip: "Add the tag '%0'"});
+
+merge(config.messages,{
+	sizeTemplates:
+		[
+		{unit: 1024*1024*1024, template: "%0\u00a0GB"},
+		{unit: 1024*1024, template: "%0\u00a0MB"},
+		{unit: 1024, template: "%0\u00a0KB"},
+		{unit: 1, template: "%0\u00a0B"}
+		]});
+
+merge(config.macros.search,{
+	label: "search",
+	prompt: "Search this TiddlyWiki",
+	placeholder: "",
+	accessKey: "F",
+	successMsg: "%0 tiddlers found matching %1",
+	failureMsg: "No tiddlers found matching %0"});
+
+merge(config.macros.tagging,{
+	label: "tagging: ",
+	labelNotTag: "not tagging",
+	tooltip: "List of tiddlers tagged with '%0'"});
+
+merge(config.macros.timeline,{
+	dateFormat: "DD MMM YYYY"});
+
+merge(config.macros.allTags,{
+	tooltip: "Show tiddlers tagged with '%0'",
+	noTags: "There are no tagged tiddlers"});
+
+config.macros.list.all.prompt = "All tiddlers in alphabetical order";
+config.macros.list.missing.prompt = "Tiddlers that have links to them but are not defined";
+config.macros.list.orphans.prompt = "Tiddlers that are not linked to from any other tiddlers";
+config.macros.list.shadowed.prompt = "Tiddlers shadowed with default contents";
+config.macros.list.touched.prompt = "Tiddlers that have been modified locally";
+
+merge(config.macros.closeAll,{
+	label: "close all",
+	prompt: "Close all displayed tiddlers (except any that are being edited)"});
+
+merge(config.macros.permaview,{
+	label: "permaview",
+	prompt: "Link to an URL that retrieves all the currently displayed tiddlers"});
+
+merge(config.macros.saveChanges,{
+	label: "save changes",
+	prompt: "Save all tiddlers to create a new TiddlyWiki",
+	accessKey: "S"});
+
+merge(config.macros.newTiddler,{
+	label: "new tiddler",
+	prompt: "Create a new tiddler",
+	title: "New Tiddler",
+	accessKey: "N"});
+
+merge(config.macros.newJournal,{
+	label: "new journal",
+	prompt: "Create a new tiddler from the current date and time",
+	accessKey: "J"});
+
+merge(config.macros.options,{
+	wizardTitle: "Tweak advanced options",
+	step1Title: "These options are saved in cookies in your browser",
+	step1Html: "<input type='hidden' name='markList'></input><br><input type='checkbox' checked='false' name='chkUnknown'>Show unknown options</input>",
+	unknownDescription: "//(unknown)//",
+	listViewTemplate: {
+		columns: [
+			{name: 'Option', field: 'option', title: "Option", type: 'String'},
+			{name: 'Description', field: 'description', title: "Description", type: 'WikiText'},
+			{name: 'Name', field: 'name', title: "Name", type: 'String'}
+			],
+		rowClasses: [
+			{className: 'lowlight', field: 'lowlight'}
+			]}
+	});
+
+merge(config.macros.plugins,{
+	wizardTitle: "Manage plugins",
+	step1Title: "Currently loaded plugins",
+	step1Html: "<input type='hidden' name='markList'></input>", // DO NOT TRANSLATE
+	skippedText: "(This plugin has not been executed because it was added since startup)",
+	noPluginText: "There are no plugins installed",
+	confirmDeleteText: "Are you sure you want to delete these plugins:\n\n%0",
+	removeLabel: "remove systemConfig tag",
+	removePrompt: "Remove systemConfig tag",
+	deleteLabel: "delete",
+	deletePrompt: "Delete these tiddlers forever",
+	listViewTemplate: {
+		columns: [
+			{name: 'Selected', field: 'Selected', rowName: 'title', type: 'Selector'},
+			{name: 'Tiddler', field: 'tiddler', title: "Tiddler", type: 'Tiddler'},
+			{name: 'Description', field: 'Description', title: "Description", type: 'String'},
+			{name: 'Version', field: 'Version', title: "Version", type: 'String'},
+			{name: 'Size', field: 'size', tiddlerLink: 'size', title: "Size", type: 'Size'},
+			{name: 'Forced', field: 'forced', title: "Forced", tag: 'systemConfigForce', type: 'TagCheckbox'},
+			{name: 'Disabled', field: 'disabled', title: "Disabled", tag: 'systemConfigDisable', type: 'TagCheckbox'},
+			{name: 'Executed', field: 'executed', title: "Loaded", type: 'Boolean', trueText: "Yes", falseText: "No"},
+			{name: 'Startup Time', field: 'startupTime', title: "Startup Time", type: 'String'},
+			{name: 'Error', field: 'error', title: "Status", type: 'Boolean', trueText: "Error", falseText: "OK"},
+			{name: 'Log', field: 'log', title: "Log", type: 'StringList'}
+			],
+		rowClasses: [
+			{className: 'error', field: 'error'},
+			{className: 'warning', field: 'warning'}
+			]},
+	listViewTemplateReadOnly: {
+		columns: [
+			{name: 'Tiddler', field: 'tiddler', title: "Tiddler", type: 'Tiddler'},
+			{name: 'Description', field: 'Description', title: "Description", type: 'String'},
+			{name: 'Version', field: 'Version', title: "Version", type: 'String'},
+			{name: 'Size', field: 'size', tiddlerLink: 'size', title: "Size", type: 'Size'},
+			{name: 'Executed', field: 'executed', title: "Loaded", type: 'Boolean', trueText: "Yes", falseText: "No"},
+			{name: 'Startup Time', field: 'startupTime', title: "Startup Time", type: 'String'},
+			{name: 'Error', field: 'error', title: "Status", type: 'Boolean', trueText: "Error", falseText: "OK"},
+			{name: 'Log', field: 'log', title: "Log", type: 'StringList'}
+			],
+		rowClasses: [
+			{className: 'error', field: 'error'},
+			{className: 'warning', field: 'warning'}
+			]}
+	});
+
+merge(config.macros.toolbar,{
+	moreLabel: "more",
+	morePrompt: "Show additional commands",
+	lessLabel: "less",
+	lessPrompt: "Hide additional commands",
+	separator: "|"
+	});
+
+merge(config.macros.refreshDisplay,{
+	label: "refresh",
+	prompt: "Redraw the entire TiddlyWiki display"
+	});
+
+merge(config.macros.importTiddlers,{
+	readOnlyWarning: "You cannot import into a read-only TiddlyWiki file. Try opening it from a file:// URL",
+	wizardTitle: "Import tiddlers from another file or server",
+	step1Title: "Step 1: Locate the server or TiddlyWiki file",
+	step1Html: "Specify the type of the server: <select name='selTypes'><option value=''>Choose...</option></select><br>Enter the URL or pathname here: <input type='text' size=50 name='txtPath'><br>...or browse for a file: <input type='file' size=50 name='txtBrowse'><br><hr>...or select a pre-defined feed: <select name='selFeeds'><option value=''>Choose...</option></select>",
+	openLabel: "open",
+	openPrompt: "Open the connection to this file or server",
+	statusOpenHost: "Opening the host",
+	statusGetWorkspaceList: "Getting the list of available workspaces",
+	step2Title: "Step 2: Choose the workspace",
+	step2Html: "Enter a workspace name: <input type='text' size=50 name='txtWorkspace'><br>...or select a workspace: <select name='selWorkspace'><option value=''>Choose...</option></select>",
+	cancelLabel: "cancel",
+	cancelPrompt: "Cancel this import",
+	statusOpenWorkspace: "Opening the workspace",
+	statusGetTiddlerList: "Getting the list of available tiddlers",
+	errorGettingTiddlerList: "Error getting list of tiddlers, click Cancel to try again",
+	errorGettingTiddlerListHttp404: "Error retrieving tiddlers from url, please ensure the url exists. Click Cancel to try again.",
+	errorGettingTiddlerListHttp: "Error retrieving tiddlers from url, please ensure this url exists and is <a href='http://enable-cors.org/'>CORS</a> enabled",
+	errorGettingTiddlerListFile: "Error retrieving tiddlers from local file, please make sure the file is in the same directory as your TiddlyWiki. Click Cancel to try again.",
+	step3Title: "Step 3: Choose the tiddlers to import",
+	step3Html: "<input type='hidden' name='markList'></input><br><input type='checkbox' checked='true' name='chkSync'>Keep these tiddlers linked to this server so that you can synchronise subsequent changes</input><br><input type='checkbox' name='chkSave'>Save the details of this server in a 'systemServer' tiddler called:</input> <input type='text' size=25 name='txtSaveTiddler'>",
+	importLabel: "import",
+	importPrompt: "Import these tiddlers",
+	confirmOverwriteText: "Are you sure you want to overwrite these tiddlers:\n\n%0",
+	step4Title: "Step 4: Importing %0 tiddler(s)",
+	step4Html: "<input type='hidden' name='markReport'></input>", // DO NOT TRANSLATE
+	doneLabel: "done",
+	donePrompt: "Close this wizard",
+	statusDoingImport: "Importing tiddlers",
+	statusDoneImport: "All tiddlers imported",
+	systemServerNamePattern: "%2 on %1",
+	systemServerNamePatternNoWorkspace: "%1",
+	confirmOverwriteSaveTiddler: "The tiddler '%0' already exists. Click 'OK' to overwrite it with the details of this server, or 'Cancel' to leave it unchanged",
+	serverSaveTemplate: "|''Type:''|%0|\n|''URL:''|%1|\n|''Workspace:''|%2|\n\nThis tiddler was automatically created to record the details of this server",
+	serverSaveModifier: "(System)",
+	listViewTemplate: {
+		columns: [
+			{name: 'Selected', field: 'Selected', rowName: 'title', type: 'Selector'},
+			{name: 'Tiddler', field: 'tiddler', title: "Tiddler", type: 'Tiddler'},
+			{name: 'Size', field: 'size', tiddlerLink: 'size', title: "Size", type: 'Size'},
+			{name: 'Tags', field: 'tags', title: "Tags", type: 'Tags'}
+			],
+		rowClasses: [
+			]}
+	});
+
+merge(config.macros.upgrade,{
+	wizardTitle: "Upgrade TiddlyWiki core code",
+	step1Title: "Update or repair this TiddlyWiki to the latest release",
+	step1Html: "You are about to upgrade to the latest release of the TiddlyWiki core code (from <a href='%0' class='externalLink' target='_blank'>%1</a>). Your content will be preserved across the upgrade.<br><br>Note that core upgrades have been known to interfere with older plugins. If you run into problems with the upgraded file, see <a href='http://www.tiddlywiki.org/wiki/CoreUpgrades' class='externalLink' target='_blank'>http://www.tiddlywiki.org/wiki/CoreUpgrades</a>",
+	errorCantUpgrade: "Unable to upgrade this TiddlyWiki. You can only perform upgrades on TiddlyWiki files stored locally",
+	errorNotSaved: "You must save changes before you can perform an upgrade",
+	step2Title: "Confirm the upgrade details",
+	step2Html_downgrade: "You are about to downgrade to TiddlyWiki version %0 from %1.<br><br>Downgrading to an earlier version of the core code is not recommended",
+	step2Html_restore: "This TiddlyWiki appears to be already using the latest version of the core code (%0).<br><br>You can continue to upgrade anyway to ensure that the core code hasn't been corrupted or damaged",
+	step2Html_upgrade: "You are about to upgrade to TiddlyWiki version %0 from %1",
+	upgradeLabel: "upgrade",
+	upgradePrompt: "Prepare for the upgrade process",
+	statusPreparingBackup: "Preparing backup",
+	statusSavingBackup: "Saving backup file",
+	errorSavingBackup: "There was a problem saving the backup file",
+	statusLoadingCore: "Loading core code",
+	errorLoadingCore: "Error loading the core code",
+	errorCoreFormat: "Error with the new core code",
+	statusSavingCore: "Saving the new core code",
+	statusReloadingCore: "Reloading the new core code",
+	startLabel: "start",
+	startPrompt: "Start the upgrade process",
+	cancelLabel: "cancel",
+	cancelPrompt: "Cancel the upgrade process",
+	step3Title: "Upgrade cancelled",
+	step3Html: "You have cancelled the upgrade process"
+	});
+
+merge(config.macros.sync,{
+	listViewTemplate: {
+		columns: [
+			{name: 'Selected', field: 'selected', rowName: 'title', type: 'Selector'},
+			{name: 'Tiddler', field: 'tiddler', title: "Tiddler", type: 'Tiddler'},
+			{name: 'Server Type', field: 'serverType', title: "Server type", type: 'String'},
+			{name: 'Server Host', field: 'serverHost', title: "Server host", type: 'String'},
+			{name: 'Server Workspace', field: 'serverWorkspace', title: "Server workspace", type: 'String'},
+			{name: 'Status', field: 'status', title: "Synchronisation status", type: 'String'},
+			{name: 'Server URL', field: 'serverUrl', title: "Server URL", text: "View", type: 'Link'}
+			],
+		rowClasses: [
+			],
+		buttons: [
+			{caption: "Sync these tiddlers", name: 'sync'}
+			]},
+	wizardTitle: "Synchronize with external servers and files",
+	step1Title: "Choose the tiddlers you want to synchronize",
+	step1Html: "<input type='hidden' name='markList'></input>", // DO NOT TRANSLATE
+	syncLabel: "sync",
+	syncPrompt: "Sync these tiddlers",
+	hasChanged: "Changed while unplugged",
+	hasNotChanged: "Unchanged while unplugged",
+	syncStatusList: {
+		none: {text: "...", display:'none', className:'notChanged'},
+		changedServer: {text: "Changed on server", display:null, className:'changedServer'},
+		changedLocally: {text: "Changed while unplugged", display:null, className:'changedLocally'},
+		changedBoth: {text: "Changed while unplugged and on server", display:null, className:'changedBoth'},
+		notFound: {text: "Not found on server", display:null, className:'notFound'},
+		putToServer: {text: "Saved update on server", display:null, className:'putToServer'},
+		gotFromServer: {text: "Retrieved update from server", display:null, className:'gotFromServer'}
+		}
+	});
+
+merge(config.macros.annotations,{
+	});
+
+merge(config.commands.closeTiddler,{
+	text: "close",
+	tooltip: "Close this tiddler"});
+
+merge(config.commands.closeOthers,{
+	text: "close others",
+	tooltip: "Close all other tiddlers"});
+
+merge(config.commands.editTiddler,{
+	text: "edit",
+	tooltip: "Edit this tiddler",
+	readOnlyText: "view",
+	readOnlyTooltip: "View the source of this tiddler"});
+
+merge(config.commands.saveTiddler,{
+	text: "done",
+	tooltip: "Save changes to this tiddler"});
+
+merge(config.commands.cancelTiddler,{
+	text: "cancel",
+	tooltip: "Undo changes to this tiddler",
+	warning: "Are you sure you want to abandon your changes to '%0'?",
+	readOnlyText: "done",
+	readOnlyTooltip: "View this tiddler normally"});
+
+merge(config.commands.deleteTiddler,{
+	text: "delete",
+	tooltip: "Delete this tiddler",
+	warning: "Are you sure you want to delete '%0'?"});
+
+merge(config.commands.permalink,{
+	text: "permalink",
+	tooltip: "Permalink for this tiddler"});
+
+merge(config.commands.references,{
+	text: "references",
+	tooltip: "Show tiddlers that link to this one",
+	popupNone: "No references"});
+
+merge(config.commands.jump,{
+	text: "jump",
+	tooltip: "Jump to another open tiddler"});
+
+merge(config.commands.syncing,{
+	text: "syncing",
+	tooltip: "Control synchronisation of this tiddler with a server or external file",
+	currentlySyncing: "<div>Currently syncing via <span class='popupHighlight'>'%0'</span> to:</"+"div><div>host: <span class='popupHighlight'>%1</span></"+"div><div>workspace: <span class='popupHighlight'>%2</span></"+"div>", // Note escaping of closing <div> tag
+	notCurrentlySyncing: "Not currently syncing",
+	captionUnSync: "Stop synchronising this tiddler",
+	chooseServer: "Synchronise this tiddler with another server:",
+	currServerMarker: "\u25cf ",
+	notCurrServerMarker: "  "});
+
+merge(config.commands.fields,{
+	text: "fields",
+	tooltip: "Show the extended fields of this tiddler",
+	emptyText: "There are no extended fields for this tiddler",
+	listViewTemplate: {
+		columns: [
+			{name: 'Field', field: 'field', title: "Field", type: 'String'},
+			{name: 'Value', field: 'value', title: "Value", type: 'String'}
+			],
+		rowClasses: [
+			],
+		buttons: [
+			]}});
+
+merge(config.shadowTiddlers,{
+	DefaultTiddlers: "[[GettingStarted]]",
+	MainMenu: "[[GettingStarted]]",
+	SiteTitle: "My TiddlyWiki",
+	SiteSubtitle: "a reusable non-linear personal web notebook",
+	SiteUrl: "",
+	SideBarOptions: '<<search>><<closeAll>><<permaview>><<newTiddler>><<newJournal "DD MMM YYYY" "journal">><<saveChanges>><<slider chkSliderOptionsPanel OptionsPanel "options \u00bb" "Change TiddlyWiki advanced options">>',
+	SideBarTabs: '<<tabs txtMainTab "Timeline" "Timeline" TabTimeline "All" "All tiddlers" TabAll "Tags" "All tags" TabTags "More" "More lists" TabMore>>',
+	TabMore: '<<tabs txtMoreTab "Missing" "Missing tiddlers" TabMoreMissing "Orphans" "Orphaned tiddlers" TabMoreOrphans "Shadowed" "Shadowed tiddlers" TabMoreShadowed>>'
+	});
+
+merge(config.annotations,{
+	AdvancedOptions: "This shadow tiddler provides access to several advanced options",
+	ColorPalette: "These values in this shadow tiddler determine the colour scheme of the ~TiddlyWiki user interface",
+	DefaultTiddlers: "The tiddlers listed in this shadow tiddler will be automatically displayed when ~TiddlyWiki starts up",
+	EditTemplate: "The HTML template in this shadow tiddler determines how tiddlers look while they are being edited",
+	GettingStarted: "This shadow tiddler provides basic usage instructions",
+	ImportTiddlers: "This shadow tiddler provides access to importing tiddlers",
+	MainMenu: "This shadow tiddler is used as the contents of the main menu in the left-hand column of the screen",
+	MarkupPreHead: "This tiddler is inserted at the top of the <head> section of the TiddlyWiki HTML file",
+	MarkupPostHead: "This tiddler is inserted at the bottom of the <head> section of the TiddlyWiki HTML file",
+	MarkupPreBody: "This tiddler is inserted at the top of the <body> section of the TiddlyWiki HTML file",
+	MarkupPostBody: "This tiddler is inserted at the end of the <body> section of the TiddlyWiki HTML file immediately after the script block",
+	OptionsPanel: "This shadow tiddler is used as the contents of the options panel slider in the right-hand sidebar",
+	PageTemplate: "The HTML template in this shadow tiddler determines the overall ~TiddlyWiki layout",
+	PluginManager: "This shadow tiddler provides access to the plugin manager",
+	SideBarOptions: "This shadow tiddler is used as the contents of the option panel in the right-hand sidebar",
+	SideBarTabs: "This shadow tiddler is used as the contents of the tabs panel in the right-hand sidebar",
+	SiteSubtitle: "This shadow tiddler is used as the second part of the page title",
+	SiteTitle: "This shadow tiddler is used as the first part of the page title",
+	SiteUrl: "This shadow tiddler should be set to the full target URL for publication",
+	StyleSheetColors: "This shadow tiddler contains CSS definitions related to the color of page elements. ''DO NOT EDIT THIS TIDDLER'', instead make your changes in the StyleSheet shadow tiddler",
+	StyleSheet: "This tiddler can contain custom CSS definitions",
+	StyleSheetLayout: "This shadow tiddler contains CSS definitions related to the layout of page elements. ''DO NOT EDIT THIS TIDDLER'', instead make your changes in the StyleSheet shadow tiddler",
+	StyleSheetLocale: "This shadow tiddler contains CSS definitions related to the translation locale",
+	StyleSheetPrint: "This shadow tiddler contains CSS definitions for printing",
+	SystemSettings: "This tiddler is used to store configuration options for this TiddlyWiki document",
+	TabAll: "This shadow tiddler contains the contents of the 'All' tab in the right-hand sidebar",
+	TabMore: "This shadow tiddler contains the contents of the 'More' tab in the right-hand sidebar",
+	TabMoreMissing: "This shadow tiddler contains the contents of the 'Missing' tab in the right-hand sidebar",
+	TabMoreOrphans: "This shadow tiddler contains the contents of the 'Orphans' tab in the right-hand sidebar",
+	TabMoreShadowed: "This shadow tiddler contains the contents of the 'Shadowed' tab in the right-hand sidebar",
+	TabTags: "This shadow tiddler contains the contents of the 'Tags' tab in the right-hand sidebar",
+	TabTimeline: "This shadow tiddler contains the contents of the 'Timeline' tab in the right-hand sidebar",
+	ToolbarCommands: "This shadow tiddler determines which commands are shown in tiddler toolbars",
+	ViewTemplate: "The HTML template in this shadow tiddler determines how tiddlers look"
+	});
diff --git a/test/data/tiddlywiki/js/ListView.js b/test/data/tiddlywiki/js/ListView.js
new file mode 100755
index 000000000..f48950543
--- /dev/null
+++ b/test/data/tiddlywiki/js/ListView.js
@@ -0,0 +1,275 @@
+//--
+//-- ListView gadget
+//--
+
+var ListView = {};
+
+// Create a listview
+//#   place - where in the DOM tree to insert the listview
+//#   listObject - array of objects to be included in the listview
+//#   listTemplate - template for the listview
+//#   callback - callback for a command being selected
+//#   className - optional classname for the <table> element
+ListView.create = function(place,listObject,listTemplate,callback,className)
+{
+	var table = createTiddlyElement(place,"table",null,className || "listView twtable");
+	var thead = createTiddlyElement(table,"thead");
+	var t,r = createTiddlyElement(thead,"tr");
+	for(t=0; t<listTemplate.columns.length; t++) {
+		var columnTemplate = listTemplate.columns[t];
+		var c = createTiddlyElement(r,"th");
+		var colType = ListView.columnTypes[columnTemplate.type];
+		if(colType && colType.createHeader) {
+			colType.createHeader(c,columnTemplate,t);
+			if(columnTemplate.className)
+				jQuery(c).addClass(columnTemplate.className);
+		}
+	}
+	var rc,tbody = createTiddlyElement(table,"tbody");
+	for(rc=0; rc<listObject.length; rc++) {
+		var rowObject = listObject[rc];
+		r = createTiddlyElement(tbody,"tr");
+		for(c=0; c<listTemplate.rowClasses.length; c++) {
+			if(rowObject[listTemplate.rowClasses[c].field])
+				jQuery(r).addClass(listTemplate.rowClasses[c].className);
+		}
+		rowObject.rowElement = r;
+		rowObject.colElements = {};
+		var cc;
+		for(cc=0; cc<listTemplate.columns.length; cc++) {
+			c = createTiddlyElement(r,"td");
+			columnTemplate = listTemplate.columns[cc];
+			var field = columnTemplate.field;
+			colType = ListView.columnTypes[columnTemplate.type];
+			if(colType && colType.createItem) {
+				colType.createItem(c,rowObject,field,columnTemplate,cc,rc);
+				if(columnTemplate.className)
+					jQuery(c).addClass(columnTemplate.className);
+			}
+			rowObject.colElements[field] = c;
+		}
+	}
+	if(callback && listTemplate.actions)
+		createTiddlyDropDown(place,ListView.getCommandHandler(callback),listTemplate.actions);
+	if(callback && listTemplate.buttons) {
+		for(t=0; t<listTemplate.buttons.length; t++) {
+			var a = listTemplate.buttons[t];
+			if(a && a.name != "")
+				createTiddlyButton(place,a.caption,null,ListView.getCommandHandler(callback,a.name,a.allowEmptySelection));
+		}
+	}
+	return table;
+};
+
+ListView.getCommandHandler = function(callback,name,allowEmptySelection)
+{
+	return function(e) {
+		var view = findRelated(this,"TABLE",null,"previousSibling");
+		var tiddlers = [];
+		ListView.forEachSelector(view,function(e,rowName) {
+					if(e.checked)
+						tiddlers.push(rowName);
+					});
+		if(tiddlers.length == 0 && !allowEmptySelection) {
+			alert(config.messages.nothingSelected);
+		} else {
+			if(this.nodeName.toLowerCase() == "select") {
+				callback(view,this.value,tiddlers);
+				this.selectedIndex = 0;
+			} else {
+				callback(view,name,tiddlers);
+			}
+		}
+	};
+};
+
+// Invoke a callback for each selector checkbox in the listview
+//#   view - <table> element of listView
+//#   callback(checkboxElement,rowName)
+//#     where
+//#       checkboxElement - DOM element of checkbox
+//#       rowName - name of this row as assigned by the column template
+//#   result: true if at least one selector was checked
+ListView.forEachSelector = function(view,callback)
+{
+	var checkboxes = view.getElementsByTagName("input");
+	var t,hadOne = false;
+	for(t=0; t<checkboxes.length; t++) {
+		var cb = checkboxes[t];
+		if(cb.getAttribute("type") == "checkbox") {
+			var rn = cb.getAttribute("rowName");
+			if(rn) {
+				callback(cb,rn);
+				hadOne = true;
+			}
+		}
+	}
+	return hadOne;
+};
+
+ListView.getSelectedRows = function(view)
+{
+	var rowNames = [];
+	ListView.forEachSelector(view,function(e,rowName) {
+				if(e.checked)
+					rowNames.push(rowName);
+				});
+	return rowNames;
+};
+
+ListView.columnTypes = {};
+
+ListView.columnTypes.String = {
+	createHeader: function(place,columnTemplate,col)
+		{
+			createTiddlyText(place,columnTemplate.title);
+		},
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var v = listObject[field];
+			if(v != undefined)
+				createTiddlyText(place,v);
+		}
+};
+
+ListView.columnTypes.WikiText = {
+	createHeader: ListView.columnTypes.String.createHeader,
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var v = listObject[field];
+			if(v != undefined)
+				wikify(v,place,null,null);
+		}
+};
+
+ListView.columnTypes.Tiddler = {
+	createHeader: ListView.columnTypes.String.createHeader,
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var v = listObject[field];
+			if(v != undefined && v.title)
+				createTiddlyPopup(place,v.title,config.messages.listView.tiddlerTooltip,v);
+		}
+};
+
+ListView.columnTypes.Size = {
+	createHeader: ListView.columnTypes.String.createHeader,
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var msg = config.messages.sizeTemplates;
+			var v = listObject[field];
+			if(v != undefined) {
+				var t = 0;
+				while(t<msg.length-1 && v<msg[t].unit)
+					t++;
+				createTiddlyText(place,msg[t].template.format([Math.round(v/msg[t].unit)]));
+			}
+		}
+};
+
+ListView.columnTypes.Link = {
+	createHeader: ListView.columnTypes.String.createHeader,
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var v = listObject[field];
+			var c = columnTemplate.text;
+			if(v != undefined)
+				createExternalLink(place,v,c || v);
+		}
+};
+
+ListView.columnTypes.Date = {
+	createHeader: ListView.columnTypes.String.createHeader,
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var v = listObject[field];
+			if(v != undefined)
+				createTiddlyText(place,v.formatString(columnTemplate.dateFormat));
+		}
+};
+
+ListView.columnTypes.StringList = {
+	createHeader: ListView.columnTypes.String.createHeader,
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var v = listObject[field];
+			if(v != undefined) {
+				var t;
+				for(t=0; t<v.length; t++) {
+					createTiddlyText(place,v[t]);
+					createTiddlyElement(place,"br");
+				}
+			}
+		}
+};
+
+ListView.columnTypes.Selector = {
+	createHeader: function(place,columnTemplate,col)
+		{
+			createTiddlyCheckbox(place,null,false,this.onHeaderChange);
+		},
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var e = createTiddlyCheckbox(place,null,listObject[field],null);
+			e.setAttribute("rowName",listObject[columnTemplate.rowName]);
+		},
+	onHeaderChange: function(e)
+		{
+			var state = this.checked;
+			var view = findRelated(this,"TABLE");
+			if(!view)
+				return;
+			ListView.forEachSelector(view,function(e,rowName) {
+								e.checked = state;
+							});
+		}
+};
+
+ListView.columnTypes.Tags = {
+	createHeader: ListView.columnTypes.String.createHeader,
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var tags = listObject[field];
+			createTiddlyText(place,String.encodeTiddlyLinkList(tags));
+		}
+};
+
+ListView.columnTypes.Boolean = {
+	createHeader: ListView.columnTypes.String.createHeader,
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			if(listObject[field] == true)
+				createTiddlyText(place,columnTemplate.trueText);
+			if(listObject[field] == false)
+				createTiddlyText(place,columnTemplate.falseText);
+		}
+};
+
+ListView.columnTypes.TagCheckbox = {
+	createHeader: ListView.columnTypes.String.createHeader,
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var e = createTiddlyCheckbox(place,null,listObject[field],this.onChange);
+			e.setAttribute("tiddler",listObject.title);
+			e.setAttribute("tag",columnTemplate.tag);
+		},
+	onChange : function(e)
+		{
+			var tag = this.getAttribute("tag");
+			var tiddler = this.getAttribute("tiddler");
+			store.setTiddlerTag(tiddler,this.checked,tag);
+		}
+};
+
+ListView.columnTypes.TiddlerLink = {
+	createHeader: ListView.columnTypes.String.createHeader,
+	createItem: function(place,listObject,field,columnTemplate,col,row)
+		{
+			var v = listObject[field];
+			if(v != undefined) {
+				var link = createTiddlyLink(place,listObject[columnTemplate.tiddlerLink],false,null);
+				createTiddlyText(link,listObject[field]);
+			}
+		}
+};
+
diff --git a/test/data/tiddlywiki/js/LoaderSaver.js b/test/data/tiddlywiki/js/LoaderSaver.js
new file mode 100755
index 000000000..82411c612
--- /dev/null
+++ b/test/data/tiddlywiki/js/LoaderSaver.js
@@ -0,0 +1,59 @@
+//--
+//-- LoaderBase and SaverBase
+//--
+
+//# LoaderBase: A (abstract) storage loader that loads the tiddlers from a list of HTML elements.
+//# The format of the elements is defined by subclasses of this loader through the internalizeTiddler implementation.
+//# Subclasses must implement:
+//#			function getTitle(store,node)
+//#			function internalizeTiddler(store,tiddler,title,node)
+//#
+//# store must implement:
+//#			function createTiddler(title)
+function LoaderBase() {}
+
+LoaderBase.prototype.loadTiddler = function(store,node,tiddlers)
+{
+	var title = this.getTitle(store,node);
+	if(safeMode && store.isShadowTiddler(title))
+		return;
+	if(title) {
+		var tiddler = store.createTiddler(title);
+		this.internalizeTiddler(store,tiddler,title,node);
+		tiddlers.push(tiddler);
+	}
+};
+
+LoaderBase.prototype.loadTiddlers = function(store,nodes)
+{
+	var t,tiddlers = [];
+	for(t = 0; t < nodes.length; t++) {
+		try {
+			this.loadTiddler(store,nodes[t],tiddlers);
+		} catch(ex) {
+			showException(ex,config.messages.tiddlerLoadError.format([this.getTitle(store,nodes[t])]));
+		}
+	}
+	return tiddlers;
+};
+
+//# SaverBase: a (abstract) storage saver that externalizes all tiddlers into a string,
+//# with every tiddler individually externalized (using this.externalizeTiddler) and joined with newlines
+//# Subclasses must implement:
+//#			function externalizeTiddler(store,tiddler)
+//#
+//# store must implement:
+//#			function getTiddlers(sortByFieldName)
+function SaverBase() {}
+
+SaverBase.prototype.externalize = function(store)
+{
+	var results = [];
+	var t,tiddlers = store.getTiddlers("title");
+	for(t = 0; t < tiddlers.length; t++) {
+		if(!tiddlers[t].doNotSave())
+			results.push(this.externalizeTiddler(store, tiddlers[t]));
+	}
+	return results.join("\n");
+};
+
diff --git a/test/data/tiddlywiki/js/Macros.js b/test/data/tiddlywiki/js/Macros.js
new file mode 100755
index 000000000..3161339bb
--- /dev/null
+++ b/test/data/tiddlywiki/js/Macros.js
@@ -0,0 +1,567 @@
+//--
+//-- Macro definitions
+//--
+
+function invokeMacro(place,macro,params,wikifier,tiddler)
+{
+	try {
+		var m = config.macros[macro];
+		if(m && m.handler) {
+			var tiddlerElem = story.findContainingTiddler(place);
+			//# Provide context for evaluated macro parameters (eg <<myMacro {{tiddler.title}}>>)
+			window.tiddler = tiddlerElem ? store.getTiddler(tiddlerElem.getAttribute("tiddler")) : null;
+			window.place = place;
+			var allowEval = true;
+			if(config.evaluateMacroParameters=="system") {
+				if(!tiddler || tiddler.tags.indexOf("systemAllowEval") == -1) {
+					allowEval = false;
+				}
+			}
+			m.handler(place,macro,m.noPreParse?null:params.readMacroParams(!allowEval),wikifier,params,tiddler);
+		} else {
+			createTiddlyError(place,config.messages.macroError.format([macro]),config.messages.macroErrorDetails.format([macro,config.messages.missingMacro]));
+		}
+	} catch(ex) {
+		createTiddlyError(place,config.messages.macroError.format([macro]),config.messages.macroErrorDetails.format([macro,ex.toString()]));
+	}
+}
+
+config.macros.version.handler = function(place)
+{
+	jQuery("<span/>").text(formatVersion()).appendTo(place);
+};
+
+config.macros.today.handler = function(place,macroName,params)
+{
+	var now = new Date();
+	var text = params[0] ? now.formatString(params[0].trim()) : now.toLocaleString();
+	jQuery("<span/>").text(text).appendTo(place);
+};
+
+config.macros.list.template = "<<view title link>>";
+config.macros.list.handler = function(place,macroName,params,wikifier,paramString)
+{
+	var list = document.createElement("ul");
+	jQuery(list).attr({ refresh: "macro", macroName: macroName }).data("params", paramString);
+	place.appendChild(list);
+	this.refresh(list);
+};
+
+config.macros.list.refresh = function(list) {
+	var paramString = jQuery(list).data("params");
+	var params = paramString.readMacroParams();
+	var args = paramString.parseParams("anon", null, null)[0];
+	var type = args.anon ? args.anon[0] : "all";
+	jQuery(list).empty().addClass("list list-" + type);
+	var template = args.template ? store.getTiddlerText(args.template[0]) : false;
+	if(!template) {
+		template = config.macros.list.template;
+	}
+	if(this[type].prompt)
+		createTiddlyElement(list,"li",null,"listTitle",this[type].prompt);
+	var results;
+	if(this[type].handler)
+		results = this[type].handler(params);
+	var t;
+	for(t = 0; t < results.length; t++) {
+		var li = document.createElement("li");
+		list.appendChild(li);
+		var tiddler = results[t];
+		if(typeof(tiddler) == 'string') { // deal with missing etc..
+				tiddler = store.getTiddler(tiddler) || new Tiddler(tiddler);
+		}
+		wikify(template, li, null, tiddler);
+	}
+	if(results.length === 0 && args.emptyMessage) {
+		jQuery(list).addClass("emptyList");
+		jQuery("<li />").text(args.emptyMessage[0]).appendTo(list);
+	}
+};
+
+config.macros.list.all.handler = function(params)
+{
+	return store.reverseLookup("tags","excludeLists",false,"title");
+};
+
+config.macros.list.missing.handler = function(params)
+{
+	return store.getMissingLinks();
+};
+
+config.macros.list.orphans.handler = function(params)
+{
+	return store.getOrphans();
+};
+
+config.macros.list.shadowed.handler = function(params)
+{
+	return store.getShadowed();
+};
+
+config.macros.list.touched.handler = function(params)
+{
+	return store.getTouched();
+};
+
+config.macros.list.filter.handler = function(params)
+{
+	var filter = params[1];
+	var results = [];
+	if(filter) {
+		var tiddlers = store.filterTiddlers(filter);
+		var t;
+		for(t=0; t<tiddlers.length; t++)
+			results.push(tiddlers[t].title);
+	}
+	return results;
+};
+
+config.macros.allTags.handler = function(place,macroName,params)
+{
+	var tags = store.getTags(params[0]);
+	var ul = createTiddlyElement(place,"ul");
+	if(tags.length == 0)
+		createTiddlyElement(ul,"li",null,"listTitle",this.noTags);
+	var t;
+	for(t=0; t<tags.length; t++) {
+		var title = tags[t][0];
+		var info = getTiddlyLinkInfo(title);
+		var li = createTiddlyElement(ul,"li");
+		var btn = createTiddlyButton(li,title + " (" + tags[t][1] + ")",this.tooltip.format([title]),onClickTag,info.classes);
+		btn.setAttribute("tag",title);
+		btn.setAttribute("refresh","link");
+		btn.setAttribute("tiddlyLink",title);
+		if(params[1]) {
+			btn.setAttribute("sortby",params[1]);
+		}
+	}
+};
+
+var macro = config.macros.timeline;
+merge(macro, {
+	handler: function(place,macroName,params, wikifier, paramString, tiddler) {
+		var container = jQuery("<div />").attr("params", paramString).
+			attr("macroName", macroName).appendTo(place)[0];
+		macro.refresh(container);
+	},
+	refresh: function(container) {
+		jQuery(container).attr("refresh", "macro").empty();
+		var paramString = jQuery(container).attr("params");
+		var args = paramString.parseParams("anon", null, null)[0];
+		var params = args.anon || [];
+
+		var field = params[0] || "modified";
+		var dateFormat = params[2] || this.dateFormat;
+		var groupTemplate = macro.groupTemplate.format(field, dateFormat);
+		groupTemplate = args.groupTemplate ? store.getTiddlerText(args.groupTemplate[0]) || groupTemplate :
+			groupTemplate;
+
+		var itemTemplate = macro.itemTemplate;
+		itemTemplate = args.template ? store.getTiddlerText(args.template[0]) || itemTemplate :
+			itemTemplate;
+
+		var tiddlers = args.filter ? store.sortTiddlers(store.filterTiddlers(args.filter[0]), field) :
+			store.reverseLookup("tags", "excludeLists", false, field);
+		var lastGroup = "", ul;
+		var last = params[1] ? tiddlers.length-Math.min(tiddlers.length,parseInt(params[1],10)) : 0;
+		var t;
+		for(t=tiddlers.length-1; t>=last; t--) {
+			var tiddler = tiddlers[t];
+			var theGroup = wikifyPlainText(groupTemplate,0,tiddler);
+			if(typeof(ul) == "undefined" || theGroup != lastGroup) {
+				ul = document.createElement("ul");
+				jQuery(ul).addClass("timeline");
+				container.appendChild(ul);
+				createTiddlyElement(ul,"li",null,"listTitle",theGroup);
+				lastGroup = theGroup;
+			}
+			var item = createTiddlyElement(ul,"li",null,"listLink");
+			wikify(itemTemplate,item,null,tiddler);
+		}
+	},
+	groupTemplate: "<<view %0 date '%1'>>", 
+	itemTemplate: "<<view title link>>"
+});
+
+config.macros.tiddler.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	var allowEval = true;
+	var stack = config.macros.tiddler.tiddlerStack;
+	if(stack.length > 0 && config.evaluateMacroParameters == "system") {
+		// included tiddler and "system" evaluation required, so check tiddler tagged appropriately
+		var title = stack[stack.length-1];
+		var pos = title.indexOf(config.textPrimitives.sectionSeparator);
+		if(pos != -1) {
+			title = title.substr(0,pos); // get the base tiddler title
+		}
+		var t = store.getTiddler(title);
+		if(!t || t.tags.indexOf("systemAllowEval") == -1) {
+			allowEval = false;
+		}
+	}
+	params = paramString.parseParams("name",null,allowEval,false,true);
+	var names = params[0]["name"];
+	var tiddlerName = names[0];
+	var className = names[1] || null;
+	var args = params[0]["with"];
+	var wrapper = createTiddlyElement(place,"span",null,className,null,{
+		refresh: "content", tiddler: tiddlerName
+	});
+	if(args!==undefined)
+		wrapper.setAttribute("args","[["+args.join("]] [[")+"]]");
+	this.transclude(wrapper,tiddlerName,args);
+};
+
+config.macros.tiddler.transclude = function(wrapper,tiddlerName,args)
+{
+	var text = store.getTiddlerText(tiddlerName);
+	if(!text)
+		return;
+	var stack = config.macros.tiddler.tiddlerStack;
+	if(stack.indexOf(tiddlerName) !== -1)
+		return;
+	stack.push(tiddlerName);
+	try {
+		if(typeof args == "string")
+			args = args.readBracketedList();
+		var n = args ? Math.min(args.length,9) : 0;
+		var i;
+		for(i=0; i<n; i++) {
+			var placeholderRE = new RegExp("\\$" + (i + 1),"mg");
+			text = text.replace(placeholderRE,args[i]);
+		}
+		config.macros.tiddler.renderText(wrapper,text,tiddlerName);
+	} finally {
+		stack.pop();
+	}
+};
+
+config.macros.tiddler.renderText = function(place,text,tiddlerName)
+{
+	wikify(text,place,null,store.getTiddler(tiddlerName));
+};
+
+config.macros.tiddler.tiddlerStack = [];
+
+//# params[0] - tag
+//# params[1] - title (optional)
+//# params[2] - tooltip (optional)
+//# params[3] - sortby (optional)
+config.macros.tag.handler = function(place,macroName,params)
+{
+	var btn = createTagButton(place,params[0],null,params[1],params[2]);
+	if(params[3]) {
+		btn.setAttribute('sortby',params[3]);
+	}
+};
+
+config.macros.tags.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	params = paramString.parseParams("anon",null,true,false,false);
+	var ul = createTiddlyElement(place,"ul");
+	var title = getParam(params,"anon","");
+	if(title && store.tiddlerExists(title))
+		tiddler = store.getTiddler(title);
+	var sep = getParam(params,"sep"," ");
+	var lingo = config.views.wikified.tag;
+	var label = null;
+	var t;
+	for(t=0; t<tiddler.tags.length; t++) {
+		var tag = store.getTiddler(tiddler.tags[t]);
+		if(!tag || !tag.tags.contains("excludeLists")) {
+			if(!label)
+				label = createTiddlyElement(ul,"li",null,"listTitle",lingo.labelTags.format([tiddler.title]));
+			createTagButton(createTiddlyElement(ul,"li"),tiddler.tags[t],tiddler.title);
+			if(t<tiddler.tags.length-1)
+				createTiddlyText(ul,sep);
+		}
+	}
+	if(!label)
+		createTiddlyElement(ul,"li",null,"listTitle",lingo.labelNoTags.format([tiddler.title]));
+};
+
+config.macros.tagging.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	params = paramString.parseParams("anon",null,true,false,false);
+	var ul = createTiddlyElement(place,"ul");
+	var title = getParam(params,"anon","");
+	if(title == "" && tiddler instanceof Tiddler)
+		title = tiddler.title;
+	var sep = getParam(params,"sep"," ");
+	ul.setAttribute("title",this.tooltip.format([title]));
+	var sortby = getParam(params,"sortBy",false);
+	var tagged = store.getTaggedTiddlers(title,sortby);
+	var prompt = tagged.length == 0 ? this.labelNotTag : this.label;
+	createTiddlyElement(ul,"li",null,"listTitle",prompt.format([title,tagged.length]));
+	var t;
+	for(t=0; t<tagged.length; t++) {
+		createTiddlyLink(createTiddlyElement(ul,"li"),tagged[t].title,true);
+		if(t<tagged.length-1)
+			createTiddlyText(ul,sep);
+	}
+};
+
+config.macros.closeAll.handler = function(place)
+{
+	createTiddlyButton(place,this.label,this.prompt,this.onClick);
+};
+
+config.macros.closeAll.onClick = function(e)
+{
+	story.closeAllTiddlers();
+	return false;
+};
+
+config.macros.permaview.handler = function(place)
+{
+	createTiddlyButton(place,this.label,this.prompt,this.onClick);
+};
+
+config.macros.permaview.onClick = function(e)
+{
+	story.permaView();
+	return false;
+};
+
+config.macros.saveChanges.handler = function(place,macroName,params)
+{
+	if(!readOnly)
+		createTiddlyButton(place,params[0] || this.label,params[1] || this.prompt,this.onClick,null,null,this.accessKey);
+};
+
+config.macros.saveChanges.onClick = function(e)
+{
+	saveChanges();
+	return false;
+};
+
+config.macros.slider.onClickSlider = function(ev)
+{
+	var n = this.nextSibling;
+	var cookie = n.getAttribute("cookie");
+	var isOpen = n.style.display != "none";
+	if(config.options.chkAnimate && anim && typeof Slider == "function")
+		anim.startAnimating(new Slider(n,!isOpen,null,"none"));
+	else
+		n.style.display = isOpen ? "none" : "block";
+	config.options[cookie] = !isOpen;
+	saveOption(cookie);
+	return false;
+};
+
+config.macros.slider.createSlider = function(place,cookie,title,tooltip)
+{
+	var c = cookie || "";
+	createTiddlyButton(place,title,tooltip,this.onClickSlider);
+	var panel = createTiddlyElement(null,"div",null,"sliderPanel");
+	panel.setAttribute("cookie",c);
+	panel.style.display = config.options[c] ? "block" : "none";
+	place.appendChild(panel);
+	return panel;
+};
+
+config.macros.slider.handler = function(place,macroName,params)
+{
+	var panel = this.createSlider(place,params[0],params[2],params[3]);
+	var text = store.getTiddlerText(params[1]);
+	panel.setAttribute("refresh","content");
+	panel.setAttribute("tiddler",params[1]);
+	if(text)
+		wikify(text,panel,null,store.getTiddler(params[1]));
+};
+
+// <<gradient [[tiddler name]] vert|horiz rgb rgb rgb rgb... >>
+config.macros.gradient.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	var panel = wikifier ? createTiddlyElement(place,"div",null,"gradient") : place;
+	panel.style.position = "relative";
+	panel.style.overflow = "hidden";
+	panel.style.zIndex = "0";
+	if(wikifier) {
+		var styles = config.formatterHelpers.inlineCssHelper(wikifier);
+		config.formatterHelpers.applyCssHelper(panel,styles);
+	}
+	params = paramString.parseParams("color");
+	var locolors = [], hicolors = [];
+	var t;
+	for(t=2; t<params.length; t++) {
+		var c = params[t].value;
+		if(params[t].name == "snap") {
+			hicolors[hicolors.length-1] = c;
+		} else {
+			locolors.push(c);
+			hicolors.push(c);
+		}
+	}
+	drawGradient(panel,params[1].value != "vert",locolors,hicolors);
+	if(wikifier)
+		wikifier.subWikify(panel,">>");
+	if(document.all) {
+		panel.style.height = "100%";
+		panel.style.width = "100%";
+	}
+};
+
+config.macros.message.handler = function(place,macroName,params)
+{
+	if(params[0]) {
+		var names = params[0].split(".");
+		var lookupMessage = function(root,nameIndex) {
+				if(root[names[nameIndex]]) {
+					if(nameIndex < names.length-1)
+						return (lookupMessage(root[names[nameIndex]],nameIndex+1));
+					else
+						return root[names[nameIndex]];
+				} else
+					return null;
+			};
+		var m = lookupMessage(config,0);
+		if(m == null)
+			m = lookupMessage(window,0);
+		createTiddlyText(place,m.toString().format(params.splice(1)));
+	}
+};
+
+
+config.macros.view.depth = 0;
+config.macros.view.values = [];
+config.macros.view.views = {
+	text: function(value,place,params,wikifier,paramString,tiddler) {
+		highlightify(value,place,highlightHack,tiddler);
+	},
+	link: function(value,place,params,wikifier,paramString,tiddler) {
+		createTiddlyLink(place,value,true);
+	},
+	wikified: function(value,place,params,wikifier,paramString,tiddler) {
+		if(config.macros.view.depth>50)
+			return;
+		if(config.macros.view.depth>0) {
+			if (value==config.macros.view.values[config.macros.view.depth-1]) {
+				return;
+			}
+		}
+		config.macros.view.values[config.macros.view.depth] = value;
+		config.macros.view.depth++;
+		if(params[2])
+			value=params[2].unescapeLineBreaks().format([value]);
+		wikify(value,place,highlightHack,tiddler);
+		config.macros.view.depth--;
+		config.macros.view.values[config.macros.view.depth] = null;
+	},
+	date: function(value,place,params,wikifier,paramString,tiddler) {
+		value = Date.convertFromYYYYMMDDHHMM(value);
+		createTiddlyText(place,value.formatString(params[2] || config.views.wikified.dateFormat));
+	}
+};
+
+config.macros.view.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	if((tiddler instanceof Tiddler) && params[0]) {
+		var value = store.getValue(tiddler,params[0]);
+		if(value) {
+			var type = params[1] || config.macros.view.defaultView;
+			var handler = config.macros.view.views[type];
+			if(handler)
+				handler(value,place,params,wikifier,paramString,tiddler);
+		}
+	}
+};
+
+config.macros.edit.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	var field = params[0];
+	var rows = params[1] || 0;
+	var defVal = params[2] || '';
+	if((tiddler instanceof Tiddler) && field) {
+		story.setDirty(tiddler.title,true);
+		var e,v;
+		if(field != "text" && !rows) {
+			e = createTiddlyElement(null,"input",null,null,null,{
+				type: "text", edit: field, size: "40", autocomplete: "off"
+			});
+			e.value = store.getValue(tiddler,field) || defVal;
+			place.appendChild(e);
+		} else {
+			var wrapper1 = createTiddlyElement(null,"fieldset",null,"fieldsetFix");
+			var wrapper2 = createTiddlyElement(wrapper1,"div");
+			e = createTiddlyElement(wrapper2,"textarea");
+			e.value = v = store.getValue(tiddler,field) || defVal;
+			rows = rows || 10;
+			var lines = v.match(/\n/mg);
+			var maxLines = Math.max(parseInt(config.options.txtMaxEditRows,10),5);
+			if(lines != null && lines.length > rows)
+				rows = lines.length + 5;
+			rows = Math.min(rows,maxLines);
+			e.setAttribute("rows",rows);
+			e.setAttribute("edit",field);
+			place.appendChild(wrapper1);
+		}
+		if(tiddler.isReadOnly()) {
+			e.setAttribute("readOnly","readOnly");
+			jQuery(e).addClass("readOnly");
+		}
+		return e;
+	}
+};
+
+config.macros.tagChooser.onClick = function(ev)
+{
+	var e = ev || window.event;
+	var lingo = config.views.editor.tagChooser;
+	var popup = Popup.create(this);
+	var tags = store.getTags(this.getAttribute("tags"));
+	if(tags.length == 0)
+		jQuery("<li/>").text(lingo.popupNone).appendTo(popup);
+	var t;
+	for(t=0; t<tags.length; t++) {
+		var tag = createTiddlyButton(createTiddlyElement(popup,"li"),tags[t][0],lingo.tagTooltip.format([tags[t][0]]),config.macros.tagChooser.onTagClick);
+		tag.setAttribute("tag",tags[t][0]);
+		tag.setAttribute("tiddler",this.getAttribute("tiddler"));
+	}
+	Popup.show();
+	e.cancelBubble = true;
+	if(e.stopPropagation) e.stopPropagation();
+	return false;
+};
+
+config.macros.tagChooser.onTagClick = function(ev)
+{
+	var e = ev || window.event;
+	if(e.metaKey || e.ctrlKey) stopEvent(e); //# keep popup open on CTRL-click
+	var tag = this.getAttribute("tag");
+	var title = this.getAttribute("tiddler");
+	if(!readOnly)
+		story.setTiddlerTag(title,tag,0);
+	return false;
+};
+
+config.macros.tagChooser.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	if(tiddler instanceof Tiddler) {
+		var lingo = config.views.editor.tagChooser;
+		var btn = createTiddlyButton(place,lingo.text,lingo.tooltip,this.onClick);
+		btn.setAttribute("tiddler",tiddler.title);
+		btn.setAttribute("tags",params[0]);
+	}
+};
+
+config.macros.refreshDisplay.handler = function(place)
+{
+	createTiddlyButton(place,this.label,this.prompt,this.onClick);
+};
+
+config.macros.refreshDisplay.onClick = function(e)
+{
+	refreshAll();
+	return false;
+};
+
+config.macros.annotations.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	var title = tiddler ? tiddler.title : null;
+	var a = title ? config.annotations[title] : null;
+	if(!tiddler || !title || !a)
+		return;
+	var text = a.format([title]);
+	wikify(text,createTiddlyElement(place,"div",null,"annotation"),null,tiddler);
+};
diff --git a/test/data/tiddlywiki/js/Manager.js b/test/data/tiddlywiki/js/Manager.js
new file mode 100755
index 000000000..ae0313e36
--- /dev/null
+++ b/test/data/tiddlywiki/js/Manager.js
@@ -0,0 +1,99 @@
+//--
+//-- Manager UI for groups of tiddlers
+//--
+
+config.macros.plugins.handler = function(place,macroName,params,wikifier,paramString)
+{
+	var wizard = new Wizard();
+	wizard.createWizard(place,this.wizardTitle);
+	wizard.addStep(this.step1Title,this.step1Html);
+	var markList = wizard.getElement("markList");
+	var listWrapper = document.createElement("div");
+	markList.parentNode.insertBefore(listWrapper,markList);
+	listWrapper.setAttribute("refresh","macro");
+	listWrapper.setAttribute("macroName","plugins");
+	listWrapper.setAttribute("params",paramString);
+	this.refresh(listWrapper,paramString);
+};
+
+config.macros.plugins.refresh = function(listWrapper,params)
+{
+	var me = config.macros.plugins;
+	var wizard = new Wizard(listWrapper);
+	var selectedRows = [];
+	ListView.forEachSelector(listWrapper,function(e,rowName) {
+			if(e.checked)
+				selectedRows.push(e.getAttribute("rowName"));
+		});
+	jQuery(listWrapper).empty();
+	params = params.parseParams("anon");
+	var plugins = installedPlugins.slice(0);
+	var t,tiddler,p;
+	var configTiddlers = store.getTaggedTiddlers("systemConfig");
+	for(t=0; t<configTiddlers.length; t++) {
+		tiddler = configTiddlers[t];
+		if(plugins.findByField("title",tiddler.title) == null) {
+			p = getPluginInfo(tiddler);
+			p.executed = false;
+			p.log.splice(0,0,this.skippedText);
+			plugins.push(p);
+		}
+	}
+	for(t=0; t<plugins.length; t++) {
+		p = plugins[t];
+		p.size = p.tiddler.text ? p.tiddler.text.length : 0;
+		p.forced = p.tiddler.isTagged("systemConfigForce");
+		p.disabled = p.tiddler.isTagged("systemConfigDisable");
+		p.Selected = selectedRows.indexOf(plugins[t].title) != -1;
+	}
+	if(plugins.length == 0) {
+		createTiddlyElement(listWrapper,"em",null,null,this.noPluginText);
+		wizard.setButtons([]);
+	} else {
+		var template = readOnly ? this.listViewTemplateReadOnly : this.listViewTemplate;
+		var listView = ListView.create(listWrapper,plugins,template,this.onSelectCommand);
+		wizard.setValue("listView",listView);
+		if(!readOnly) {
+			wizard.setButtons([
+				{caption: me.removeLabel, tooltip: me.removePrompt, onClick: me.doRemoveTag},
+				{caption: me.deleteLabel, tooltip: me.deletePrompt, onClick: me.doDelete}
+			]);
+		}
+	}
+};
+
+config.macros.plugins.doRemoveTag = function(e)
+{
+	var wizard = new Wizard(this);
+	var listView = wizard.getValue("listView");
+	var rowNames = ListView.getSelectedRows(listView);
+	if(rowNames.length == 0) {
+		alert(config.messages.nothingSelected);
+	} else {
+		var t;
+		for(t=0; t<rowNames.length; t++) {
+			store.setTiddlerTag(rowNames[t],false,"systemConfig");
+		}
+		autoSaveChanges();
+	}
+};
+
+config.macros.plugins.doDelete = function(e)
+{
+	var wizard = new Wizard(this);
+	var listView = wizard.getValue("listView");
+	var rowNames = ListView.getSelectedRows(listView);
+	if(rowNames.length == 0) {
+		alert(config.messages.nothingSelected);
+	} else {
+		if(confirm(config.macros.plugins.confirmDeleteText.format([rowNames.join(", ")]))) {
+			var t;
+			for(t=0; t<rowNames.length; t++) {
+				store.removeTiddler(rowNames[t]);
+				story.closeTiddler(rowNames[t],true);
+			}
+		}
+		autoSaveChanges();
+	}
+};
+
diff --git a/test/data/tiddlywiki/js/Messages.js b/test/data/tiddlywiki/js/Messages.js
new file mode 100755
index 000000000..664cfe92b
--- /dev/null
+++ b/test/data/tiddlywiki/js/Messages.js
@@ -0,0 +1,44 @@
+//--
+//-- Message area
+//--
+
+function getMessageDiv()
+{
+	var msgArea = document.getElementById("messageArea");
+	if(!msgArea)
+		return null;
+	if(!msgArea.hasChildNodes())
+		createTiddlyButton(createTiddlyElement(msgArea,"div",null,"messageToolbar"),
+			config.messages.messageClose.text,
+			config.messages.messageClose.tooltip,
+			clearMessage);
+	msgArea.style.display = "block";
+	return createTiddlyElement(msgArea,"div");
+}
+
+function displayMessage(text,linkText)
+{
+	var e = getMessageDiv();
+	if(!e) {
+		alert(text);
+		return;
+	}
+	if(linkText) {
+		var link = createTiddlyElement(e,"a",null,null,text);
+		link.href = linkText;
+		link.target = "_blank";
+	} else {
+		e.appendChild(document.createTextNode(text));
+	}
+}
+
+function clearMessage()
+{
+	var msgArea = document.getElementById("messageArea");
+	if(msgArea) {
+		jQuery(msgArea).empty();
+		msgArea.style.display = "none";
+	}
+	return false;
+}
+
diff --git a/test/data/tiddlywiki/js/Morpher.js b/test/data/tiddlywiki/js/Morpher.js
new file mode 100755
index 000000000..e41785658
--- /dev/null
+++ b/test/data/tiddlywiki/js/Morpher.js
@@ -0,0 +1,85 @@
+//--
+//-- Morpher animation
+//--
+
+// Animate a set of properties of an element
+//#   element - the element to be moved (optional
+//#   duration - duration of animation
+//#   properties - an array of objects describing each property that is to be modified:
+//#       format - one of:
+//#         "style" for numeric styles (default)
+//#         "color" for #RRGGBB format colour styles
+//#       style - name of the style being animated. Includes pseudo-styles:
+//#         "-tw-scrollVert" - controls vertical scrolling
+//#         "-tw-scrollHoriz" - controls horizontal scrolling
+//#       start - starting value to animate from
+//#       end - ending value to animation from
+//#       atEnd - final value (taking priority over the end value) (eg, for switching style.display)
+//#       template - template for formatString() for setting the property (eg "%0em", or "#%0")
+//#       callback - function to call when the animation has completed as callback(element,properties);
+function Morpher(element,duration,properties,callback)
+{
+	this.element = element;
+	this.duration = duration;
+	this.properties = properties;
+	this.startTime = new Date();
+	this.endTime = Number(this.startTime) + duration;
+	this.callback = callback;
+	this.tick();
+	return this;
+}
+
+Morpher.prototype.assignStyle = function(element,style,value)
+{
+	switch(style) {
+	case "-tw-vertScroll":
+		window.scrollTo(findScrollX(),value);
+		break;
+	case "-tw-horizScroll":
+		window.scrollTo(value,findScrollY());
+		break;
+	default:
+		element.style[style] = value;
+		break;
+	}
+};
+
+Morpher.prototype.stop = function()
+{
+	var t;
+	for(t=0; t<this.properties.length; t++) {
+		var p = this.properties[t];
+		if(p.atEnd !== undefined) {
+			this.assignStyle(this.element,p.style,p.atEnd);
+		}
+	}
+	if(this.callback)
+		this.callback(this.element,this.properties);
+};
+
+Morpher.prototype.tick = function()
+{
+	var currTime = Number(new Date());
+	var t,progress = Animator.slowInSlowOut(Math.min(1,(currTime-this.startTime)/this.duration));
+	for(t=0; t<this.properties.length; t++) {
+		var p = this.properties[t];
+		if(p.start !== undefined && p.end !== undefined) {
+			var template = p.template || "%0";
+			switch(p.format) {
+			case undefined:
+			case "style":
+				var v = p.start + (p.end-p.start) * progress;
+				this.assignStyle(this.element,p.style,template.format([v]));
+				break;
+			case "color":
+				break;
+			}
+		}
+	}
+	if(currTime >= this.endTime) {
+		this.stop();
+		return false;
+	}
+	return true;
+};
+
diff --git a/test/data/tiddlywiki/js/NewTiddler.js b/test/data/tiddlywiki/js/NewTiddler.js
new file mode 100755
index 000000000..0fe8584e2
--- /dev/null
+++ b/test/data/tiddlywiki/js/NewTiddler.js
@@ -0,0 +1,81 @@
+//--
+//-- NewTiddler and NewJournal macros
+//--
+
+config.macros.newTiddler.createNewTiddlerButton = function(place,title,params,label,prompt,accessKey,newFocus,isJournal)
+{
+	var tags = [];
+	var t;
+	for(t=1; t<params.length; t++) {
+		if((params[t].name == "anon" && t != 1) || (params[t].name == "tag"))
+			tags.push(params[t].value);
+	}
+	label = getParam(params,"label",label);
+	prompt = getParam(params,"prompt",prompt);
+	accessKey = getParam(params,"accessKey",accessKey);
+	newFocus = getParam(params,"focus",newFocus);
+	var customFields = getParam(params,"fields","");
+	if(!customFields && !store.isShadowTiddler(title))
+		customFields = String.encodeHashMap(config.defaultCustomFields);
+	var btn = createTiddlyButton(place,label,prompt,this.onClickNewTiddler,null,null,accessKey);
+	btn.setAttribute("newTitle",title);
+	btn.setAttribute("isJournal",isJournal ? "true" : "false");
+	if(tags.length > 0)
+		btn.setAttribute("params",tags.join("|"));
+	btn.setAttribute("newFocus",newFocus);
+	btn.setAttribute("newTemplate",getParam(params,"template",DEFAULT_EDIT_TEMPLATE));
+	if(customFields !== "")
+		btn.setAttribute("customFields",customFields);
+	var text = getParam(params,"text");
+	if(text !== undefined)
+		btn.setAttribute("newText",text);
+	return btn;
+};
+
+config.macros.newTiddler.onClickNewTiddler = function()
+{
+	var title = this.getAttribute("newTitle");
+	if(this.getAttribute("isJournal") == "true") {
+		title = new Date().formatString(title.trim());
+	}
+	var params = this.getAttribute("params");
+	var tags = params ? params.split("|") : [];
+	var focus = this.getAttribute("newFocus");
+	var template = this.getAttribute("newTemplate");
+	var customFields = this.getAttribute("customFields");
+	if(!customFields && !store.isShadowTiddler(title))
+		customFields = String.encodeHashMap(config.defaultCustomFields);
+	story.displayTiddler(null,title,template,false,null,null);
+	var tiddlerElem = story.getTiddler(title);
+	if(customFields)
+		story.addCustomFields(tiddlerElem,customFields);
+	var text = this.getAttribute("newText");
+	if(typeof text == "string" && story.getTiddlerField(title,"text"))
+		story.getTiddlerField(title,"text").value = text.format([title]);
+	var t;
+	for(t=0;t<tags.length;t++)
+		story.setTiddlerTag(title,tags[t],+1);
+	story.focusTiddler(title,focus);
+	return false;
+};
+
+config.macros.newTiddler.handler = function(place,macroName,params,wikifier,paramString)
+{
+	if(!readOnly) {
+		params = paramString.parseParams("anon",null,true,false,false);
+		var title = params[1] && params[1].name == "anon" ? params[1].value : this.title;
+		title = getParam(params,"title",title);
+		this.createNewTiddlerButton(place,title,params,this.label,this.prompt,this.accessKey,"title",false);
+	}
+};
+
+config.macros.newJournal.handler = function(place,macroName,params,wikifier,paramString)
+{
+	if(!readOnly) {
+		params = paramString.parseParams("anon",null,true,false,false);
+		var title = params[1] && params[1].name == "anon" ? params[1].value : config.macros.timeline.dateFormat;
+		title = getParam(params,"title",title);
+		config.macros.newTiddler.createNewTiddlerButton(place,title,params,this.label,this.prompt,this.accessKey,"text",true);
+	}
+};
+
diff --git a/test/data/tiddlywiki/js/Numbers.js b/test/data/tiddlywiki/js/Numbers.js
new file mode 100755
index 000000000..59d9e427f
--- /dev/null
+++ b/test/data/tiddlywiki/js/Numbers.js
@@ -0,0 +1,15 @@
+//--
+//-- Augmented methods for the JavaScript Number() object
+//--
+
+// Clamp a number to a range
+Number.prototype.clamp = function(min,max)
+{
+	var c = this;
+	if(c < min)
+		c = min;
+	if(c > max)
+		c = max;
+	return Number(c);
+};
+
diff --git a/test/data/tiddlywiki/js/Options.js b/test/data/tiddlywiki/js/Options.js
new file mode 100755
index 000000000..f2903a520
--- /dev/null
+++ b/test/data/tiddlywiki/js/Options.js
@@ -0,0 +1,312 @@
+//--
+//-- Option handling
+//--
+
+config.optionHandlers = {
+	'txt': {
+		get: function(name) {return encodeCookie(config.options[name].toString());},
+		set: function(name,value) {config.options[name] = decodeCookie(value);}
+	},
+	'chk': {
+		get: function(name) {return config.options[name] ? 'true' : 'false';},
+		set: function(name,value) {config.options[name] = value == 'true';}
+	}
+};
+
+function setOption(name,value)
+{
+	var optType = name.substr(0,3);
+	if(config.optionHandlers[optType] && config.optionHandlers[optType].set)
+		config.optionHandlers[optType].set(name,value);
+}
+
+// Gets the value of an option as a string. Most code should just read from config.options.* directly
+function getOption(name)
+{
+	var optType = name.substr(0,3);
+	return config.optionHandlers[optType] && config.optionHandlers[optType].get ? config.optionHandlers[optType].get(name) : null;
+}
+
+//# Loads config.options from cookies and SystemSettings
+function loadOptions()
+{
+	if(safeMode)
+		return;
+	loadCookies();
+	loadSystemSettings();
+}
+// @Deprecated; retained for backwards compatibility
+var loadOptionsCookie = loadOptions;
+
+function getCookies()
+{
+	var cookieList = document.cookie.split(';');
+	var i,cookies = {};
+	for(i=0; i<cookieList.length; i++) {
+		var p = cookieList[i].indexOf('=');
+		if(p != -1) {
+			var name = cookieList[i].substr(0,p).trim();
+			var value = cookieList[i].substr(p+1).trim();
+			cookies[name] = value;
+		}
+	}
+	return cookies;
+}
+
+function loadCookies()
+{
+	var i,cookies = getCookies();
+	if(cookies['TiddlyWiki']) {
+		cookies = cookies['TiddlyWiki'].decodeHashMap();
+	}
+	for(i in cookies) {
+		if(config.optionsSource[i] != 'setting') {
+			setOption(i,cookies[i]);
+		}
+	}
+}
+
+function loadSystemSettings()
+{
+	var key,settings = store.calcAllSlices('SystemSettings');
+	config.optionsSource = {};
+	for(key in settings) {
+		setOption(key,settings[key]);
+		config.optionsSource[key] = 'setting';
+	}
+}
+
+//# called back from SystemSettings notifier
+function onSystemSettingsChange()
+{
+	if(!startingUp) {
+		loadSystemSettings();
+	}
+}
+
+function saveOption(name)
+{
+	if(safeMode)
+		return;
+	if(name.match(/[()\s]/g, '_')) {
+		alert(config.messages.invalidCookie.format([name]));
+		return;
+	}
+	saveCookie(name);
+	if(config.optionsSource[name] == 'setting') {
+		saveSystemSetting(name,true);
+	}
+}
+// @Deprecated; retained for backwards compatibility
+var saveOptionCookie = saveOption;
+
+function removeCookie(name)
+{
+	document.cookie = name + '=; expires=Thu, 01-Jan-1970 00:00:01 UTC; path=/;';
+}
+
+function saveCookie(name)
+{
+	var key,cookies = {};
+	for(key in config.options) {
+		var value = getOption(key);
+		value = value == null ? 'false' : value;
+		cookies[key] = value;
+	}
+	document.cookie = 'TiddlyWiki=' + String.encodeHashMap(cookies) + '; expires=Fri, 1 Jan 2038 12:00:00 UTC; path=/';
+	cookies = getCookies();
+	var c;
+	for(c in cookies) {
+		var optType = c.substr(0,3);
+		if(config.optionHandlers[optType])
+			removeCookie(c);
+	}
+}
+
+var systemSettingSave;
+function commitSystemSettings(storeWasDirty)
+{
+	if(systemSettingSave) {
+		window.clearTimeout(systemSettingSave);
+	}
+	systemSettingSave = window.setTimeout(function() {
+		var tiddler = store.getTiddler('SystemSettings');
+		if(storeWasDirty == false && story.areAnyDirty() == false) {
+			//# nothing has changed except the options, so we can force a save
+			saveChanges(null,[tiddler]);
+		} else {
+			autoSaveChanges(null,[tiddler]);
+		}
+	}, 1000);
+}
+
+function saveSystemSetting(name,saveFile)
+{
+	var title = 'SystemSettings';
+	var slice = store.getTiddlerSlice(title,name);
+	if(readOnly || slice === getOption(name)) {
+		return; //# don't save if read-only or the option hasn't changed
+	}
+	var slices = store.calcAllSlices(title);
+	var key;
+	for(key in config.optionsSource) {
+		var value = getOption(key) || '';
+		if(slices[key] !== value) {
+			slices[key] = value;
+		}
+	}
+	var text = [];
+	for(key in slices) {
+		text.push('%0: %1'.format([key,slices[key]]));
+	}
+	text = text.sort().join('\n');
+	var storeWasDirty = store.isDirty();
+	var tiddler = store.getTiddler(title);
+	if(tiddler) {
+		tiddler.text = text;
+		tiddler = store.saveTiddler(tiddler);
+	} else {
+		tiddler = store.saveTiddler(title,title,text,'System',new Date(),['excludeLists'],config.defaultCustomFields);
+	}
+	if(saveFile) {
+		commitSystemSettings(storeWasDirty);
+	}
+}
+
+//# Flatten cookies to ANSI character set by substituting html character entities for non-ANSI characters
+function encodeCookie(s)
+{
+	return escape(convertUnicodeToHtmlEntities(s));
+}
+
+//# Decode any html character entities to their unicode equivalent
+function decodeCookie(s)
+{
+	s = unescape(s);
+	var re = /&#[0-9]{1,5};/g;
+	return s.replace(re,function($0) {return String.fromCharCode(eval($0.replace(/[&#;]/g,'')));});
+}
+
+config.macros.option.genericCreate = function(place,type,opt,className,desc)
+{
+	var typeInfo = config.macros.option.types[type];
+	var c = document.createElement(typeInfo.elementType);
+	if(typeInfo.typeValue)
+		c.setAttribute('type',typeInfo.typeValue);
+	c[typeInfo.eventName] = typeInfo.onChange;
+	c.setAttribute('option',opt);
+	c.className = className || typeInfo.className;
+	if(config.optionsDesc[opt])
+		c.setAttribute('title',config.optionsDesc[opt]);
+	place.appendChild(c);
+	if(desc != 'no')
+		createTiddlyText(place,config.optionsDesc[opt] || opt);
+	c[typeInfo.valueField] = config.options[opt];
+	return c;
+};
+
+config.macros.option.genericOnChange = function(e)
+{
+	var opt = this.getAttribute('option');
+	if(opt) {
+		var optType = opt.substr(0,3);
+		var handler = config.macros.option.types[optType];
+		if(handler.elementType && handler.valueField)
+			config.macros.option.propagateOption(opt,handler.valueField,this[handler.valueField],handler.elementType,this);
+	}
+	return true;
+};
+
+config.macros.option.types = {
+	'txt': {
+		elementType: 'input',
+		valueField: 'value',
+		eventName: 'onchange',
+		className: 'txtOptionInput',
+		create: config.macros.option.genericCreate,
+		onChange: config.macros.option.genericOnChange
+	},
+	'chk': {
+		elementType: 'input',
+		valueField: 'checked',
+		eventName: 'onclick',
+		className: 'chkOptionInput',
+		typeValue: 'checkbox',
+		create: config.macros.option.genericCreate,
+		onChange: config.macros.option.genericOnChange
+	}
+};
+
+config.macros.option.propagateOption = function(opt,valueField,value,elementType,elem)
+{
+	config.options[opt] = value;
+	saveOption(opt);
+	var t,nodes = document.getElementsByTagName(elementType);
+	for(t=0; t<nodes.length; t++) {
+		var optNode = nodes[t].getAttribute('option');
+		if(opt == optNode && nodes[t]!=elem)
+			nodes[t][valueField] = value;
+	}
+};
+
+config.macros.option.handler = function(place,macroName,params,wikifier,paramString)
+{
+	params = paramString.parseParams('anon',null,true,false,false);
+	var opt = (params[1] && params[1].name == 'anon') ? params[1].value : getParam(params,'name',null);
+	var className = (params[2] && params[2].name == 'anon') ? params[2].value : getParam(params,'class',null);
+	var desc = getParam(params,'desc','no');
+	var type = opt.substr(0,3);
+	var h = config.macros.option.types[type];
+	if(h && h.create)
+		h.create(place,type,opt,className,desc);
+};
+
+config.macros.options.handler = function(place,macroName,params,wikifier,paramString)
+{
+	params = paramString.parseParams('anon',null,true,false,false);
+	var showUnknown = getParam(params,'showUnknown','no');
+	var wizard = new Wizard();
+	wizard.createWizard(place,this.wizardTitle);
+	wizard.addStep(this.step1Title,this.step1Html);
+	var markList = wizard.getElement('markList');
+	var chkUnknown = wizard.getElement('chkUnknown');
+	chkUnknown.checked = showUnknown == 'yes';
+	chkUnknown.onchange = this.onChangeUnknown;
+	var listWrapper = document.createElement('div');
+	markList.parentNode.insertBefore(listWrapper,markList);
+	wizard.setValue('listWrapper',listWrapper);
+	this.refreshOptions(listWrapper,showUnknown == 'yes');
+};
+
+config.macros.options.refreshOptions = function(listWrapper,showUnknown)
+{
+	var n,opts = [];
+	for(n in config.options) {
+		var opt = {};
+		opt.option = '';
+		opt.name = n;
+		opt.lowlight = !config.optionsDesc[n];
+		opt.description = opt.lowlight ? this.unknownDescription : config.optionsDesc[n];
+		if(!opt.lowlight || showUnknown)
+			opts.push(opt);
+	}
+	opts.sort(function(a,b) {return a.name.substr(3) < b.name.substr(3) ? -1 : (a.name.substr(3) == b.name.substr(3) ? 0 : +1);});
+	ListView.create(listWrapper,opts,this.listViewTemplate);
+	for(n=0; n<opts.length; n++) {
+		var type = opts[n].name.substr(0,3);
+		var h = config.macros.option.types[type];
+		if(h && h.create) {
+			h.create(opts[n].colElements['option'],type,opts[n].name,null,'no');
+		}
+	}
+};
+
+config.macros.options.onChangeUnknown = function(e)
+{
+	var wizard = new Wizard(this);
+	var listWrapper = wizard.getValue('listWrapper');
+	jQuery(listWrapper).empty();
+	config.macros.options.refreshOptions(listWrapper,this.checked);
+	return false;
+};
+
diff --git a/test/data/tiddlywiki/js/Paramifiers.js b/test/data/tiddlywiki/js/Paramifiers.js
new file mode 100755
index 000000000..b4a354600
--- /dev/null
+++ b/test/data/tiddlywiki/js/Paramifiers.js
@@ -0,0 +1,135 @@
+//--
+//-- Paramifiers
+//--
+
+function getParameters()
+{
+	var p = null;
+	if(window.location.hash) {
+		p = decodeURIComponent(window.location.hash.substr(1));
+		if(config.browser.firefoxDate != null && config.browser.firefoxDate[1] < "20051111")
+			p = convertUTF8ToUnicode(p);
+	}
+	return p;
+}
+
+function invokeParamifier(params,handler)
+{
+	if(!params || params.length == undefined || params.length <= 1)
+		return;
+	var i;
+	for(i=1; i<params.length; i++) {
+		var p = config.paramifiers[params[i].name];
+		if(p && p[handler] instanceof Function)
+			p[handler](params[i].value);
+		else {
+			//# not a paramifier with handler()... check for an 'option' prefix
+			var h = config.optionHandlers[params[i].name.substr(0,3)];
+			if(h && h.set instanceof Function)
+				h.set(params[i].name,params[i].value);
+		}
+	}
+}
+
+config.paramifiers = {};
+
+config.paramifiers.start = {
+	oninit: function(v) {
+		safeMode = v.toLowerCase() == "safe";
+	}
+};
+
+config.paramifiers.open = {
+	onstart: function(v) {
+		if(!readOnly || store.tiddlerExists(v) || store.isShadowTiddler(v))
+			story.displayTiddler("bottom",v,null,false,null);
+	}
+};
+
+config.paramifiers.story = {
+	onstart: function(v) {
+		var list = store.getTiddlerText(v,"").parseParams("open",null,false);
+		invokeParamifier(list,"onstart");
+	}
+};
+
+config.paramifiers.search = {
+	onstart: function(v) {
+		story.search(v,false,false);
+	}
+};
+
+config.paramifiers.searchRegExp = {
+	onstart: function(v) {
+		story.prototype.search(v,false,true);
+	}
+};
+
+config.paramifiers.tag = {
+	onstart: function(v) {
+		story.displayTiddlers(null,store.filterTiddlers("[tag["+v+"]]"),null,false,null);
+	}
+};
+
+config.paramifiers.newTiddler = {
+	onstart: function(v) {
+		var args = v.parseParams("anon", null, null)[0];
+		var title = args.title ? args.title[0] : v;
+		var customFields = args.fields ? args.fields[0] : null;
+		if(!readOnly) {
+			story.displayTiddler(null,title,DEFAULT_EDIT_TEMPLATE,false,null,customFields);
+			story.focusTiddler(title,"text");
+			var i,tags = args.tag || [];
+			for(i=0;i<tags.length;i++) {
+				story.setTiddlerTag(title,tags[i],+1);
+			}
+		}
+	}
+};
+
+config.paramifiers.newJournal = {
+	onstart: function(v) {
+		if(!readOnly) {
+			var now = new Date();
+			var title = now.formatString(v.trim());
+			story.displayTiddler(null,title,DEFAULT_EDIT_TEMPLATE);
+			story.focusTiddler(title,"text");
+		}
+	}
+};
+
+config.paramifiers.readOnly = {
+	onconfig: function(v) {
+		var p = v.toLowerCase();
+		readOnly = p == "yes" ? true : (p == "no" ? false : readOnly);
+	}
+};
+
+config.paramifiers.theme = {
+	onconfig: function(v) {
+		story.switchTheme(v);
+	}
+};
+
+config.paramifiers.upgrade = {
+	onstart: function(v) {
+		upgradeFrom(v);
+	}
+};
+
+config.paramifiers.recent= {
+	onstart: function(v) {
+		var titles=[];
+		var i,tiddlers=store.getTiddlers("modified","excludeLists").reverse();
+		for(i=0; i<v && i<tiddlers.length; i++)
+			titles.push(tiddlers[i].title);
+		story.displayTiddlers(null,titles);
+	}
+};
+
+config.paramifiers.filter = {
+	onstart: function(v) {
+		story.displayTiddlers(null,store.filterTiddlers(v),null,false);
+	}
+};
+
diff --git a/test/data/tiddlywiki/js/Popup.js b/test/data/tiddlywiki/js/Popup.js
new file mode 100755
index 000000000..28a7fb7c2
--- /dev/null
+++ b/test/data/tiddlywiki/js/Popup.js
@@ -0,0 +1,104 @@
+//--
+//-- Popup menu
+//--
+
+var Popup = {
+	stack: [] // Array of objects with members root: and popup:
+	};
+
+Popup.create = function(root,elem,className)
+{
+	var stackPosition = this.find(root,"popup");
+	Popup.remove(stackPosition+1);
+	var popup = createTiddlyElement(document.body,elem || "ol","popup",className || "popup");
+	popup.stackPosition = stackPosition;
+	Popup.stack.push({root: root, popup: popup});
+	return popup;
+};
+
+Popup.onDocumentClick = function(ev)
+{
+	var e = ev || window.event;
+	if(e.eventPhase == undefined)
+		Popup.remove();
+	else if(e.eventPhase == Event.BUBBLING_PHASE || e.eventPhase == Event.AT_TARGET)
+		Popup.remove();
+	return true;
+};
+
+//# valign : "top" or "bottom" (optional)
+//#   defaults to "bottom" for regular popups, "top" for nested popups
+//# halign : "left" or "right" (optional)
+//#   defaults to "left" for regular popups, "right" for nested popups
+//# offset : {x: number, y: number} (optional)
+//#   defaults to {x:0,y:0}
+Popup.show = function(valign,halign,offset)
+{
+	var curr = Popup.stack[Popup.stack.length-1];
+	this.place(curr.root,curr.popup,valign,halign,offset);
+	jQuery(curr.root).addClass("highlight");
+	if(config.options.chkAnimate && anim && typeof Scroller == "function")
+		anim.startAnimating(new Scroller(curr.popup));
+	else
+		window.scrollTo(0,ensureVisible(curr.popup));
+};
+
+Popup.place = function(root,popup,valign,halign,offset)
+{
+	if(!offset)
+		offset = {x:0,y:0};
+	if(popup.stackPosition >= 0 && !valign && !halign) {
+		offset.x = offset.x + root.offsetWidth;
+	} else {
+		offset.x = (halign == "right") ? offset.x + root.offsetWidth : offset.x;
+		offset.y = (valign == "top") ? offset.y : offset.y + root.offsetHeight;
+	}
+	var rootLeft = findPosX(root);
+	var rootTop = findPosY(root);
+	var popupLeft = rootLeft + offset.x;
+	var popupTop = rootTop + offset.y;
+	var winWidth = findWindowWidth();
+	if(popup.offsetWidth > winWidth*0.75)
+		popup.style.width = winWidth*0.75 + "px";
+	var popupWidth = popup.offsetWidth;
+	var scrollWidth = winWidth - document.body.offsetWidth;
+	if(popupLeft + popupWidth > winWidth - scrollWidth - 1) {
+		if(halign == "right")
+			popupLeft = popupLeft - root.offsetWidth - popupWidth;
+		else
+			popupLeft = winWidth - popupWidth - scrollWidth - 1;
+	}
+	popup.style.left = popupLeft + "px";
+	popup.style.top = popupTop + "px";
+	popup.style.display = "block";
+};
+
+Popup.find = function(e)
+{
+	var t,pos = -1;
+	for(t=this.stack.length-1; t>=0; t--) {
+		if(isDescendant(e,this.stack[t].popup))
+			pos = t;
+	}
+	return pos;
+};
+
+Popup.remove = function(pos)
+{
+	if(!pos) pos = 0;
+	if(Popup.stack.length > pos) {
+		Popup.removeFrom(pos);
+	}
+};
+
+Popup.removeFrom = function(from)
+{
+	var t;
+	for(t=Popup.stack.length-1; t>=from; t--) {
+		var p = Popup.stack[t];
+		jQuery(p.root).removeClass("highlight");
+		jQuery(p.popup).remove();
+	}
+	Popup.stack = Popup.stack.slice(0,from);
+};
+
diff --git a/test/data/tiddlywiki/js/RGB.js b/test/data/tiddlywiki/js/RGB.js
new file mode 100755
index 000000000..672b84d20
--- /dev/null
+++ b/test/data/tiddlywiki/js/RGB.js
@@ -0,0 +1,59 @@
+//--
+//-- RGB colour object
+//--
+
+// Construct an RGB colour object from a '#rrggbb', '#rgb' or 'rgb(n,n,n)' string or from separate r,g,b values
+function RGB(r,g,b)
+{
+	this.r = 0;
+	this.g = 0;
+	this.b = 0;
+	if(typeof r == "string") {
+		if(r.substr(0,1) == "#") {
+			if(r.length == 7) {
+				this.r = parseInt(r.substr(1,2),16)/255;
+				this.g = parseInt(r.substr(3,2),16)/255;
+				this.b = parseInt(r.substr(5,2),16)/255;
+			} else {
+				this.r = parseInt(r.substr(1,1),16)/15;
+				this.g = parseInt(r.substr(2,1),16)/15;
+				this.b = parseInt(r.substr(3,1),16)/15;
+			}
+		} else {
+			var rgbPattern = /rgb\s*\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*\)/;
+			var c = r.match(rgbPattern);
+			if(c) {
+				this.r = parseInt(c[1],10)/255;
+				this.g = parseInt(c[2],10)/255;
+				this.b = parseInt(c[3],10)/255;
+			}
+		}
+	} else {
+		this.r = r;
+		this.g = g;
+		this.b = b;
+	}
+	return this;
+}
+
+// Mixes this colour with another in a specified proportion
+// c = other colour to mix
+// f = 0..1 where 0 is this colour and 1 is the new colour
+// Returns an RGB object
+RGB.prototype.mix = function(c,f)
+{
+	return new RGB(this.r + (c.r-this.r) * f,this.g + (c.g-this.g) * f,this.b + (c.b-this.b) * f);
+};
+
+// Return an rgb colour as a #rrggbb format hex string
+RGB.prototype.toString = function()
+{
+	var clamp = function(x,min,max) {
+		return x < min ? min : (x > max ? max : x);
+	};
+	return "#" +
+			("0" + Math.floor(clamp(this.r,0,1) * 255).toString(16)).right(2) +
+			("0" + Math.floor(clamp(this.g,0,1) * 255).toString(16)).right(2) +
+			("0" + Math.floor(clamp(this.b,0,1) * 255).toString(16)).right(2);
+};
+
diff --git a/test/data/tiddlywiki/js/Refresh.js b/test/data/tiddlywiki/js/Refresh.js
new file mode 100755
index 000000000..5857aa16f
--- /dev/null
+++ b/test/data/tiddlywiki/js/Refresh.js
@@ -0,0 +1,192 @@
+//--
+//-- Refresh mechanism
+//--
+
+//# List of notification functions to be called when certain tiddlers are changed or deleted
+config.notifyTiddlers = [
+	{name: "SystemSettings", notify: onSystemSettingsChange},
+	{name: "StyleSheetLayout", notify: refreshStyles},
+	{name: "StyleSheetColors", notify: refreshStyles},
+	{name: "StyleSheet", notify: refreshStyles},
+	{name: "StyleSheetPrint", notify: refreshStyles},
+	{name: "PageTemplate", notify: refreshPageTemplate},
+	{name: "SiteTitle", notify: refreshPageTitle},
+	{name: "SiteSubtitle", notify: refreshPageTitle},
+	{name: "WindowTitle", notify: refreshPageTitle},
+	{name: "ColorPalette", notify: refreshColorPalette},
+	{name: null, notify: refreshDisplay}
+];
+
+//# refresher functions
+config.refreshers = {
+	link: function(e,changeList)
+		{
+		var title = e.getAttribute("tiddlyLink");
+		refreshTiddlyLink(e,title);
+		return true;
+		},
+
+	tiddler: function(e,changeList)
+		{
+		var title = e.getAttribute("tiddler");
+		var template = e.getAttribute("template");
+		if(changeList && (changeList.indexOf && changeList.indexOf(title) != -1) && !story.isDirty(title))
+			story.refreshTiddler(title,template,true);
+		else
+			refreshElements(e,changeList);
+		return true;
+		},
+
+	content: function(e,changeList)
+		{
+		var title = e.getAttribute("tiddler");
+		var force = e.getAttribute("force");
+		var args = e.getAttribute("args");
+		if(force != null || changeList == null || (changeList.indexOf && changeList.indexOf(title) != -1)) {
+			jQuery(e).empty();
+			config.macros.tiddler.transclude(e,title,args);
+			return true;
+		} else
+			return false;
+		},
+
+	macro: function(e,changeList)
+		{
+		var macro = e.getAttribute("macroName");
+		var params = e.getAttribute("params");
+		if(macro)
+			macro = config.macros[macro];
+		if(macro && macro.refresh)
+			macro.refresh(e,params);
+		return true;
+		}
+};
+
+config.refresherData = {
+	styleSheet: "StyleSheet",
+	defaultStyleSheet: "StyleSheet",
+	pageTemplate: "PageTemplate",
+	defaultPageTemplate: "PageTemplate",
+	colorPalette: "ColorPalette",
+	defaultColorPalette: "ColorPalette"
+};
+
+function refreshElements(root,changeList)
+{
+	var c,nodes = root.childNodes;
+	for(c=0; c<nodes.length; c++) {
+		var e = nodes[c], type = null;
+		if(e.getAttribute && (e.tagName ? e.tagName != "IFRAME" : true))
+			type = e.getAttribute("refresh");
+		var refresher = config.refreshers[type];
+		var refreshed = false;
+		if(refresher != undefined)
+			refreshed = refresher(e,changeList);
+		if(e.hasChildNodes() && !refreshed)
+			refreshElements(e,changeList);
+	}
+}
+
+function applyHtmlMacros(root,tiddler)
+{
+	var e = root.firstChild;
+	while(e) {
+		var nextChild = e.nextSibling;
+		if(e.getAttribute) {
+			var macro = e.getAttribute("macro");
+			if(macro) {
+				e.removeAttribute("macro");
+				var params = "";
+				var p = macro.indexOf(" ");
+				if(p != -1) {
+					params = macro.substr(p+1);
+					macro = macro.substr(0,p);
+				}
+				invokeMacro(e,macro,params,null,tiddler);
+			}
+		}
+		if(e.hasChildNodes())
+			applyHtmlMacros(e,tiddler);
+		e = nextChild;
+	}
+}
+
+function refreshPageTemplate(title)
+{
+	var stash = jQuery("<div/>").appendTo("body").hide()[0];
+	var display = story.getContainer();
+	var nodes,t;
+	if(display) {
+		nodes = display.childNodes;
+		for(t=nodes.length-1; t>=0; t--)
+			stash.appendChild(nodes[t]);
+	}
+	var wrapper = document.getElementById("contentWrapper");
+
+	var isAvailable = function(title) {
+		var s = title ? title.indexOf(config.textPrimitives.sectionSeparator) : -1;
+		if(s!=-1)
+			title = title.substr(0,s);
+		return store.tiddlerExists(title) || store.isShadowTiddler(title);
+	};
+	//# protect against non-existent pageTemplate
+	if(!title || !isAvailable(title))
+		title = config.refresherData.pageTemplate;
+	if(!isAvailable(title))
+		title = config.refresherData.defaultPageTemplate; //# this one is always avaialable
+	wrapper.innerHTML = store.getRecursiveTiddlerText(title,null,10);
+	applyHtmlMacros(wrapper);
+	refreshElements(wrapper);
+	display = story.getContainer();
+	jQuery(display).empty();
+	if(!display)
+		display = createTiddlyElement(wrapper,"div",story.containerId());
+	nodes = stash.childNodes;
+	for(t=nodes.length-1; t>=0; t--)
+		display.appendChild(nodes[t]);
+	jQuery(stash).remove();
+}
+
+function refreshDisplay(hint)
+{
+	if(typeof hint == "string")
+		hint = [hint];
+	var e = document.getElementById("contentWrapper");
+	refreshElements(e,hint);
+	if(backstage.isPanelVisible()) {
+		e = document.getElementById("backstage");
+		refreshElements(e,hint);
+	}
+}
+
+function refreshPageTitle()
+{
+	document.title = getPageTitle();
+}
+
+function getPageTitle()
+{
+	return wikifyPlainText(store.getTiddlerText("WindowTitle",""),null,tiddler);
+}
+
+function refreshStyles(title,doc)
+{
+	setStylesheet(title == null ? "" : store.getRecursiveTiddlerText(title,"",10),title,doc || document);
+}
+
+function refreshColorPalette(title)
+{
+	if(!startingUp)
+		refreshAll();
+}
+
+function refreshAll()
+{
+	refreshPageTemplate();
+	refreshDisplay();
+	refreshStyles("StyleSheetLayout");
+	refreshStyles("StyleSheetColors");
+	refreshStyles(config.refresherData.styleSheet);
+	refreshStyles("StyleSheetPrint");
+}
+
diff --git a/test/data/tiddlywiki/js/Saving.js b/test/data/tiddlywiki/js/Saving.js
new file mode 100755
index 000000000..1051c99ef
--- /dev/null
+++ b/test/data/tiddlywiki/js/Saving.js
@@ -0,0 +1,248 @@
+//--
+//-- Saving
+//--
+
+var saveUsingSafari = false;
+
+var startSaveArea = '<div id="' + 'storeArea">'; // Split up into two so that indexOf() of this source doesn't find it
+var startSaveAreaRE = /<((div)|(DIV)) ((id)|(ID))=["']?storeArea['"]?>/; // Used for IE6
+var endSaveArea = '</d' + 'iv>';
+var endSaveAreaCaps = '</D' + 'IV>';
+
+// If there are unsaved changes, force the user to confirm before exitting
+function confirmExit()
+{
+	hadConfirmExit = true;
+	if((store && store.isDirty && store.isDirty()) || (story && story.areAnyDirty && story.areAnyDirty()))
+		return config.messages.confirmExit;
+}
+
+// Give the user a chance to save changes before exitting
+function checkUnsavedChanges()
+{
+	if(store && store.isDirty && store.isDirty() && window.hadConfirmExit === false) {
+		if(confirm(config.messages.unsavedChangesWarning))
+			saveChanges();
+	}
+}
+
+function updateLanguageAttribute(s)
+{
+	if(config.locale) {
+		var mRE = /(<html(?:.*?)?)(?: xml:lang\="([a-z]+)")?(?: lang\="([a-z]+)")?>/;
+		var m = mRE.exec(s);
+		if(m) {
+			var t = m[1];
+			if(m[2])
+				t += ' xml:lang="' + config.locale + '"';
+			if(m[3])
+				t += ' lang="' + config.locale + '"';
+			t += ">";
+			s = s.substr(0,m.index) + t + s.substr(m.index+m[0].length);
+		}
+	}
+	return s;
+}
+
+function updateMarkupBlock(s,blockName,tiddlerName)
+{
+	return s.replaceChunk(
+			"<!--%0-START-->".format([blockName]),
+			"<!--%0-END-->".format([blockName]),
+			"\n" + convertUnicodeToFileFormat(store.getRecursiveTiddlerText(tiddlerName,"")) + "\n");
+}
+
+function updateOriginal(original,posDiv,localPath)
+{
+	if(!posDiv)
+		posDiv = locateStoreArea(original);
+	if(!posDiv) {
+		alert(config.messages.invalidFileError.format([localPath]));
+		return null;
+	}
+	var revised = original.substr(0,posDiv[0] + startSaveArea.length) + "\n" +
+				convertUnicodeToFileFormat(store.allTiddlersAsHtml()) + "\n" +
+				original.substr(posDiv[1]);
+	var newSiteTitle = convertUnicodeToFileFormat(getPageTitle()).htmlEncode();
+	revised = revised.replaceChunk("<title"+">","</title"+">"," " + newSiteTitle + " ");
+	revised = updateLanguageAttribute(revised);
+	revised = updateMarkupBlock(revised,"PRE-HEAD","MarkupPreHead");
+	revised = updateMarkupBlock(revised,"POST-HEAD","MarkupPostHead");
+	revised = updateMarkupBlock(revised,"PRE-BODY","MarkupPreBody");
+	revised = updateMarkupBlock(revised,"POST-SCRIPT","MarkupPostBody");
+	return revised;
+}
+
+function locateStoreArea(original)
+{
+	// Locate the storeArea divs
+	if(!original)
+		return null;
+	var posOpeningDiv = original.search(startSaveAreaRE);
+	var limitClosingDiv = original.indexOf("<"+"!--POST-STOREAREA--"+">");
+	if(limitClosingDiv == -1)
+		limitClosingDiv = original.indexOf("<"+"!--POST-BODY-START--"+">");
+	var start = limitClosingDiv == -1 ? original.length : limitClosingDiv;
+	var posClosingDiv = original.lastIndexOf(endSaveArea,start);
+	if(posClosingDiv == -1)
+		posClosingDiv = original.lastIndexOf(endSaveAreaCaps,start);
+	return (posOpeningDiv != -1 && posClosingDiv != -1) ? [posOpeningDiv,posClosingDiv] : null;
+}
+
+function autoSaveChanges(onlyIfDirty,tiddlers)
+{
+	if(config.options.chkAutoSave)
+		saveChanges(onlyIfDirty,tiddlers);
+}
+
+function loadOriginal(localPath)
+{
+	return loadFile(localPath);
+}
+
+// Save this tiddlywiki with the pending changes
+function saveChanges(onlyIfDirty,tiddlers)
+{
+	if(onlyIfDirty && !store.isDirty())
+		return;
+	clearMessage();
+	var t0 = new Date();
+	var msg = config.messages;
+	//# Get the URL of the document
+	var originalPath = document.location.toString();
+	//# Check we were loaded from a file URL
+	if(originalPath.substr(0,5) != "file:") {
+		alert(msg.notFileUrlError);
+		if(store.tiddlerExists(msg.saveInstructions))
+			story.displayTiddler(null,msg.saveInstructions);
+		return;
+	}
+	var localPath = getLocalPath(originalPath);
+	//# Load the original file
+	var original = loadOriginal(localPath);
+	if(original == null) {
+		alert(msg.cantSaveError);
+		if(store.tiddlerExists(msg.saveInstructions))
+			story.displayTiddler(null,msg.saveInstructions);
+		return;
+	}
+	//# Locate the storeArea div's
+	var posDiv = locateStoreArea(original);
+	if(!posDiv) {
+		alert(msg.invalidFileError.format([localPath]));
+		return;
+	}
+	saveMain(localPath,original,posDiv);
+	if(config.options.chkSaveBackups)
+		saveBackup(localPath,original);
+	if(config.options.chkSaveEmptyTemplate)
+		saveEmpty(localPath,original,posDiv);
+	if(config.options.chkGenerateAnRssFeed && saveRss instanceof Function)
+		saveRss(localPath);
+	if(config.options.chkDisplayInstrumentation)
+		displayMessage("saveChanges " + (new Date()-t0) + " ms");
+}
+
+function saveMain(localPath,original,posDiv)
+{
+	var save;
+	try {
+		//# Save new file
+		var revised = updateOriginal(original,posDiv,localPath);
+		save = saveFile(localPath,revised);
+	} catch (ex) {
+		showException(ex);
+	}
+	if(save) {
+		displayMessage(config.messages.mainSaved,"file://" + localPath);
+		store.setDirty(false);
+	} else {
+		alert(config.messages.mainFailed);
+	}
+}
+
+function saveBackup(localPath,original)
+{
+	//# Save the backup
+	var backupPath = getBackupPath(localPath);
+	var backup = copyFile(backupPath,localPath);
+	//# Browser does not support copy, so use save instead
+	if(!backup)
+		backup = saveFile(backupPath,original);
+	if(backup)
+		displayMessage(config.messages.backupSaved,"file://" + backupPath);
+	else
+		alert(config.messages.backupFailed);
+}
+
+function saveEmpty(localPath,original,posDiv)
+{
+	//# Save empty template
+	var emptyPath,p;
+	if((p = localPath.lastIndexOf("/")) != -1)
+		emptyPath = localPath.substr(0,p) + "/";
+	else if((p = localPath.lastIndexOf("\\")) != -1)
+		emptyPath = localPath.substr(0,p) + "\\";
+	else
+		emptyPath = localPath + ".";
+	emptyPath += "empty.html";
+	var empty = original.substr(0,posDiv[0] + startSaveArea.length) + original.substr(posDiv[1]);
+	var emptySave = saveFile(emptyPath,empty);
+	if(emptySave)
+		displayMessage(config.messages.emptySaved,"file://" + emptyPath);
+	else
+		alert(config.messages.emptyFailed);
+}
+
+function getLocalPath(origPath)
+{
+	var originalPath = convertUriToUTF8(origPath,config.options.txtFileSystemCharSet);
+	// Remove any location or query part of the URL
+	var argPos = originalPath.indexOf("?");
+	if(argPos != -1)
+		originalPath = originalPath.substr(0,argPos);
+	var hashPos = originalPath.indexOf("#");
+	if(hashPos != -1)
+		originalPath = originalPath.substr(0,hashPos);
+	// Convert file://localhost/ to file:///
+	if(originalPath.indexOf("file://localhost/") == 0)
+		originalPath = "file://" + originalPath.substr(16);
+	// Convert to a native file format
+	//# "file:///x:/path/path/path..." - pc local file --> "x:\path\path\path..."
+	//# "file://///server/share/path/path/path..." - FireFox pc network file --> "\\server\share\path\path\path..."
+	//# "file:///path/path/path..." - mac/unix local file --> "/path/path/path..."
+	//# "file://server/share/path/path/path..." - pc network file --> "\\server\share\path\path\path..."
+	var localPath;
+	if(originalPath.charAt(9) == ":") // pc local file
+		localPath = unescape(originalPath.substr(8)).replace(new RegExp("/","g"),"\\");
+	else if(originalPath.indexOf("file://///") == 0) // FireFox pc network file
+		localPath = "\\\\" + unescape(originalPath.substr(10)).replace(new RegExp("/","g"),"\\");
+	else if(originalPath.indexOf("file:///") == 0) // mac/unix local file
+		localPath = unescape(originalPath.substr(7));
+	else if(originalPath.indexOf("file:/") == 0) // mac/unix local file
+		localPath = unescape(originalPath.substr(5));
+	else // pc network file
+		localPath = "\\\\" + unescape(originalPath.substr(7)).replace(new RegExp("/","g"),"\\");
+	return localPath;
+}
+
+function getBackupPath(localPath,title,extension)
+{
+	var slash = "\\";
+	var dirPathPos = localPath.lastIndexOf("\\");
+	if(dirPathPos == -1) {
+		dirPathPos = localPath.lastIndexOf("/");
+		slash = "/";
+	}
+	var backupFolder = config.options.txtBackupFolder;
+	if(!backupFolder || backupFolder == "")
+		backupFolder = ".";
+	var backupPath = localPath.substr(0,dirPathPos) + slash + backupFolder + localPath.substr(dirPathPos);
+	backupPath = backupPath.substr(0,backupPath.lastIndexOf(".")) + ".";
+	//# replace illegal filename characters(// \/:*?"<>|) and space with underscore
+	if(title)
+		backupPath += title.replace(/[\\\/\*\?\":<> ]/g,"_") + ".";
+	backupPath += (new Date()).convertToYYYYMMDDHHMMSSMMM() + "." + (extension || "html");
+	return backupPath;
+}
+
diff --git a/test/data/tiddlywiki/js/SavingRSS.js b/test/data/tiddlywiki/js/SavingRSS.js
new file mode 100755
index 000000000..9f144d3c8
--- /dev/null
+++ b/test/data/tiddlywiki/js/SavingRSS.js
@@ -0,0 +1,57 @@
+//--
+//-- RSS Saving
+//--
+
+function saveRss(localPath)
+{
+	var rssPath = localPath.substr(0,localPath.lastIndexOf(".")) + ".xml";
+	if(saveFile(rssPath,convertUnicodeToFileFormat(generateRss())))
+		displayMessage(config.messages.rssSaved,"file://" + rssPath);
+	else
+		alert(config.messages.rssFailed);
+}
+
+tiddlerToRssItem = function(tiddler,uri)
+{
+	var s = "<title" + ">" + tiddler.title.htmlEncode() + "</title" + ">\n";
+	s += "<description>" + wikifyStatic(tiddler.text,null,tiddler).htmlEncode() + "</description>\n";
+	var i;
+	for(i=0; i<tiddler.tags.length; i++)
+		s += "<category>" + tiddler.tags[i] + "</category>\n";
+	s += "<link>" + uri + "#" + encodeURIComponent(String.encodeTiddlyLink(tiddler.title)) + "</link>\n";
+	s +="<pubDate>" + tiddler.modified.toGMTString() + "</pubDate>\n";
+	return s;
+};
+
+function generateRss()
+{
+	var s = [];
+	var d = new Date();
+	var u = store.getTiddlerText("SiteUrl");
+	// Assemble the header
+	s.push("<" + "?xml version=\"1.0\"?" + ">");
+	s.push("<rss version=\"2.0\">");
+	s.push("<channel>");
+	s.push("<title" + ">" + wikifyPlainText(store.getTiddlerText("SiteTitle",""),null,tiddler).htmlEncode() + "</title" + ">");
+	if(u)
+		s.push("<link>" + u.htmlEncode() + "</link>");
+	s.push("<description>" + wikifyPlainText(store.getTiddlerText("SiteSubtitle",""),null,tiddler).htmlEncode() + "</description>");
+	s.push("<language>" + config.locale + "</language>");
+	s.push("<copyright>Copyright " + d.getFullYear() + " " + config.options.txtUserName.htmlEncode() + "</copyright>");
+	s.push("<pubDate>" + d.toGMTString() + "</pubDate>");
+	s.push("<lastBuildDate>" + d.toGMTString() + "</lastBuildDate>");
+	s.push("<docs>http://blogs.law.harvard.edu/tech/rss</docs>");
+	s.push("<generator>TiddlyWiki " + formatVersion() + "</generator>");
+	// The body
+	var tiddlers = store.getTiddlers("modified","excludeLists");
+	var i,n = config.numRssItems > tiddlers.length ? 0 : tiddlers.length-config.numRssItems;
+	for(i=tiddlers.length-1; i>=n; i--) {
+		s.push("<item>\n" + tiddlerToRssItem(tiddlers[i],u) + "\n</item>");
+	}
+	// And footer
+	s.push("</channel>");
+	s.push("</rss>");
+	// Save it all
+	return s.join("\n");
+}
+
diff --git a/test/data/tiddlywiki/js/Scroller.js b/test/data/tiddlywiki/js/Scroller.js
new file mode 100755
index 000000000..ef7c004e9
--- /dev/null
+++ b/test/data/tiddlywiki/js/Scroller.js
@@ -0,0 +1,10 @@
+//--
+//-- Scroller animation
+//--
+
+function Scroller(targetElement)
+{
+	var p = [{style: '-tw-vertScroll', start: findScrollY(), end: ensureVisible(targetElement)}];
+	return new Morpher(targetElement,config.animDuration,p);
+}
+
diff --git a/test/data/tiddlywiki/js/Search.js b/test/data/tiddlywiki/js/Search.js
new file mode 100755
index 000000000..55fbd8e5c
--- /dev/null
+++ b/test/data/tiddlywiki/js/Search.js
@@ -0,0 +1,81 @@
+//--
+//-- Search macro
+//--
+
+config.macros.search.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	params = paramString.parseParams("anon",null,false,false,false);
+	createTiddlyButton(place,this.label,this.prompt,this.onClick,"searchButton");
+	var txt = createTiddlyElement(null,"input",null,"txtOptionInput searchField");
+	txt.value = getParam(params,"anon","");
+	if(config.browser.isSafari) {
+		txt.setAttribute("type","search");
+		txt.setAttribute("results","5");
+	} else {
+		txt.setAttribute("type","text");
+	}
+	place.appendChild(txt);
+	txt.onkeyup = this.onKeyPress;
+	txt.onfocus = this.onFocus;
+	txt.setAttribute("size",this.sizeTextbox);
+	txt.setAttribute("accessKey",getParam(params,"accesskey",this.accessKey));
+	txt.setAttribute("autocomplete","off");
+	txt.setAttribute("lastSearchText","");
+	txt.setAttribute("placeholder",getParam(params,"placeholder",this.placeholder));
+};
+
+// Global because there's only ever one outstanding incremental search timer
+config.macros.search.timeout = null;
+
+config.macros.search.doSearch = function(txt)
+{
+	if(txt.value.length > 0) {
+		story.search(txt.value,config.options.chkCaseSensitiveSearch,config.options.chkRegExpSearch);
+		txt.setAttribute("lastSearchText",txt.value);
+	}
+};
+
+config.macros.search.onClick = function(e)
+{
+	config.macros.search.doSearch(this.nextSibling);
+	return false;
+};
+
+config.macros.search.onKeyPress = function(ev)
+{
+	var me = config.macros.search;
+	var e = ev || window.event;
+	switch(e.keyCode) {
+		case 9: // Tab
+			return;
+		case 13: // Ctrl-Enter
+		case 10: // Ctrl-Enter on IE PC
+			me.doSearch(this);
+			break;
+		case 27: // Escape
+			this.value = "";
+			clearMessage();
+			break;
+	}
+	if(config.options.chkIncrementalSearch) {
+		if(this.value.length > 2) {
+			if(this.value != this.getAttribute("lastSearchText")) {
+				if(me.timeout) {
+					clearTimeout(me.timeout);
+				}
+				var txt = this;
+				me.timeout = setTimeout(function() {me.doSearch(txt);},500);
+			}
+		} else {
+			if(me.timeout) {
+				clearTimeout(me.timeout);
+			}
+		}
+	}
+};
+
+config.macros.search.onFocus = function(e)
+{
+	this.select();
+};
+
diff --git a/test/data/tiddlywiki/js/Slider.js b/test/data/tiddlywiki/js/Slider.js
new file mode 100755
index 000000000..9871dbbb3
--- /dev/null
+++ b/test/data/tiddlywiki/js/Slider.js
@@ -0,0 +1,35 @@
+//--
+//-- Slider animation
+//--
+
+// deleteMode - "none", "all" [delete target element and it's children], [only] "children" [but not the target element]
+function Slider(element,opening,unused,deleteMode)
+{
+	element.style.overflow = 'hidden';
+	if(opening)
+		element.style.height = '0px'; // Resolves a Firefox flashing bug
+	element.style.display = 'block';
+	var height = element.scrollHeight;
+	var p = [];
+	var c = null;
+	if(opening) {
+		p.push({style: 'height', start: 0, end: height, template: '%0px', atEnd: 'auto'});
+		p.push({style: 'opacity', start: 0, end: 1, template: '%0'});
+		p.push({style: 'filter', start: 0, end: 100, template: 'alpha(opacity:%0)'});
+	} else {
+		p.push({style: 'height', start: height, end: 0, template: '%0px'});
+		p.push({style: 'display', atEnd: 'none'});
+		p.push({style: 'opacity', start: 1, end: 0, template: '%0'});
+		p.push({style: 'filter', start: 100, end: 0, template: 'alpha(opacity:%0)'});
+		switch(deleteMode) {
+		case "all":
+			c = function(element,properties) {jQuery(element).remove();};
+			break;
+		case "children":
+			c = function(element,properties) {jQuery(element).empty();};
+			break;
+		}
+	}
+	return new Morpher(element,config.animDuration,p,c);
+}
+
diff --git a/test/data/tiddlywiki/js/Sparkline.js b/test/data/tiddlywiki/js/Sparkline.js
new file mode 100755
index 000000000..3bb5235fe
--- /dev/null
+++ b/test/data/tiddlywiki/js/Sparkline.js
@@ -0,0 +1,56 @@
+//--
+//-- Sparklines
+//--
+
+config.macros.sparkline = {};
+
+config.shadowTiddlers.StyleSheetSparklines = "/*{{{*/\n" +
+	".sparkline {\n" +
+	"\tline-height: 1em;\n" +
+	"\tborder: 0;\n" +
+	"\tbackground: [[ColorPalette::PrimaryPale]];\n" +
+	"}\n\n" +
+	".sparktick {\n" +
+	"\toutline: 0;\n" +
+	"\tbackground: [[ColorPalette::PrimaryDark]];\n" +
+	"}\n" +
+	"/*}}}*/";
+store.addNotification("StyleSheetSparklines", refreshStyles);
+
+config.macros.sparkline.handler = function(place,macroName,params)
+{
+	var data = [];
+	var min = 0;
+	var max = 0;
+	var v;
+	for(var t=0; t<params.length; t++) {
+		v = parseInt(params[t],10);
+		if(v < min)
+			min = v;
+		if(v > max)
+			max = v;
+		data.push(v);
+	}
+	if(data.length < 1)
+		return;
+	var box = createTiddlyElement(place,"span",null,"sparkline",String.fromCharCode(160));
+	box.title = data.join(",");
+	var w = box.offsetWidth;
+	var h = box.offsetHeight;
+	box.style.paddingRight = (data.length * 2 - w) + "px";
+	box.style.position = "relative";
+	for(var d=0; d<data.length; d++) {
+		var tick = document.createElement("img");
+		tick.border = 0;
+		tick.className = "sparktick";
+		tick.style.position = "absolute";
+		tick.src = "data:image/gif,GIF89a%01%00%01%00%91%FF%00%FF%FF%FF%00%00%00%C0%C0%C0%00%00%00!%F9%04%01%00%00%02%00%2C%00%00%00%00%01%00%01%00%40%02%02T%01%00%3B";
+		tick.style.left = d*2 + "px";
+		tick.style.width = "2px";
+		v = Math.floor(((data[d] - min)/(max-min)) * h);
+		tick.style.top = (h-v) + "px";
+		tick.style.height = v + "px";
+		box.appendChild(tick);
+	}
+};
+
diff --git a/test/data/tiddlywiki/js/Story.js b/test/data/tiddlywiki/js/Story.js
new file mode 100755
index 000000000..0293f24a8
--- /dev/null
+++ b/test/data/tiddlywiki/js/Story.js
@@ -0,0 +1,717 @@
+//--
+//-- Story functions
+//--
+
+//# A story is a HTML div containing a sequence of tiddlers that can be manipulated
+//# container - id of containing element
+//# idPrefix - string prefix prepended to title to make ids for tiddlers in this story
+function Story(containerId,idPrefix)
+{
+	this.container = containerId;
+	this.idPrefix = idPrefix;
+	this.highlightRegExp = null;
+	//# generate tiddler ID
+	this.tiddlerId = function(title) {
+		//# replace spaces in titles to ensure valid element IDs
+		title = title.replace(/_/g, "__").replace(/ /g, "_");
+		var id = this.idPrefix + title;
+		return id==this.container ? this.idPrefix + "_" + title : id;
+	};
+	this.containerId = function() {
+		return this.container;
+	};
+}
+
+//# retrieve tiddler element
+Story.prototype.getTiddler = function(title)
+{
+	return document.getElementById(this.tiddlerId(title));
+};
+
+Story.prototype.getContainer = function()
+{
+	return document.getElementById(this.containerId());
+};
+
+//# Iterate through all the tiddlers currently opened in a story
+//# fn - callback function to be called for each tiddler. Arguments are:
+//#      tiddlerTitle - title of the tiddler
+//#      element - reference to tiddler display element
+Story.prototype.forEachTiddler = function(fn)
+{
+	var place = this.getContainer();
+	if(!place)
+		return;
+	var e = place.firstChild;
+	while(e) {
+		var n = e.nextSibling;
+		var title = e.getAttribute("tiddler");
+		if(title) {
+			fn.call(this,title,e);
+		}
+		e = n;
+	}
+};
+
+Story.prototype.displayDefaultTiddlers = function()
+{
+	this.displayTiddlers(null,store.filterTiddlers(store.getTiddlerText("DefaultTiddlers")));
+};
+
+//# Display several tiddlers given their titles in an array. Parameters same as displayTiddler(), except:
+//# titles - array of tiddlers or string titles
+Story.prototype.displayTiddlers = function(srcElement,titles,template,animate,unused,customFields,toggle)
+{
+	var t;
+	for(t = titles.length-1;t>=0;t--)
+		this.displayTiddler(srcElement,titles[t],template,animate,unused,customFields);
+};
+
+//# Display a given tiddler with a given template. If the tiddler is already displayed but with a different
+//# template, it is switched to the specified template. If the tiddler does not exist, and if server hosting
+//# custom fields were provided, then an attempt is made to retrieve the tiddler from the server
+//# srcElement - reference to element from which this one is being opened -or-
+//#              special positions "top", "bottom"
+//# tiddler - tiddler or title of tiddler to display
+//# template - the name of the tiddler containing the template -or-
+//#            one of the constants DEFAULT_VIEW_TEMPLATE and DEFAULT_EDIT_TEMPLATE -or-
+//#            null or undefined to indicate the current template if there is one, DEFAULT_VIEW_TEMPLATE if not
+//# animate - whether to perform animations
+//# customFields - an optional list of name:"value" pairs to be assigned as tiddler fields (for edit templates)
+//# toggle - if true, causes the tiddler to be closed if it is already opened
+//# animationSrc - optional. If provided, this will specify the element which is to act as the start of the animation -or-
+//#                the source of the animation will be the srcElement.
+Story.prototype.displayTiddler = function(srcElement,tiddler,template,animate,unused,customFields,toggle,animationSrc)
+{
+	var title = (tiddler instanceof Tiddler) ? tiddler.title : tiddler;
+	var tiddlerElem = this.getTiddler(title);
+	if(tiddlerElem) {
+		if(toggle) {
+			if(tiddlerElem.getAttribute("dirty") != "true")
+				this.closeTiddler(title,true);
+		} else {
+			this.refreshTiddler(title,template,false,customFields);
+		}
+	} else {
+		var place = this.getContainer();
+		var before = this.positionTiddler(srcElement);
+		tiddlerElem = this.createTiddler(place,before,title,template,customFields);
+	}
+	if(animationSrc && typeof animationSrc !== "string") {
+		srcElement = animationSrc;
+	}
+	if(srcElement && typeof srcElement !== "string") {
+		if(config.options.chkAnimate && (animate == undefined || animate == true) && anim && typeof Zoomer == "function" && typeof Scroller == "function")
+			anim.startAnimating(new Zoomer(title,srcElement,tiddlerElem),new Scroller(tiddlerElem));
+		else
+			window.scrollTo(0,ensureVisible(tiddlerElem));
+	}
+	return tiddlerElem;
+};
+
+//# Figure out the appropriate position for a newly opened tiddler
+//# srcElement - reference to the element containing the link to the tiddler -or-
+//#              special positions "top", "bottom"
+//# returns - reference to the tiddler that the new one should appear before (null for the bottom of the story)
+Story.prototype.positionTiddler = function(srcElement)
+{
+	var place = this.getContainer();
+	var before = null;
+	if(typeof srcElement == "string") {
+		switch(srcElement) {
+		case "top":
+			before = place.firstChild;
+			break;
+		case "bottom":
+			before = null;
+			break;
+		}
+	} else {
+		var after = this.findContainingTiddler(srcElement);
+		if(after == null) {
+			before = place.firstChild;
+		} else if(after.nextSibling) {
+			before = after.nextSibling;
+			if(before.nodeType != 1)
+				before = null;
+		}
+	}
+	return before;
+};
+
+//# Create a tiddler frame at the appropriate place in a story column. If the tiddler doesn't exist,
+//# triggers an attempt to load it as a missing tiddler
+//# place - reference to parent element
+//# before - null, or reference to element before which to insert new tiddler
+//# title - title of new tiddler
+//# template - the name of the tiddler containing the template or one of the constants DEFAULT_VIEW_TEMPLATE and DEFAULT_EDIT_TEMPLATE
+//# customFields - an optional list of name:"value" pairs to be assigned as tiddler fields
+Story.prototype.createTiddler = function(place,before,title,template,customFields)
+{
+	var tiddlerElem = createTiddlyElement(null,"div",this.tiddlerId(title),"tiddler");
+	tiddlerElem.setAttribute("refresh","tiddler");
+	if(customFields)
+		tiddlerElem.setAttribute("tiddlyFields",customFields);
+	place.insertBefore(tiddlerElem,before);
+	var defaultText = null;
+	if(!store.tiddlerExists(title) && !store.isShadowTiddler(title))
+		defaultText = this.loadMissingTiddler(title,customFields);
+	this.refreshTiddler(title,template,false,customFields,defaultText);
+	return tiddlerElem;
+};
+
+//# Attempts to load a missing tiddler from the server specified in the custom fields
+//#   title - title of the missing tiddler
+//#   fields - string of name:"value" pairs or hashmap
+//#   callback - optional function invoked with context argument upon completion; context provides context.tiddler if successful
+Story.prototype.loadMissingTiddler = function(title,fields,callback)
+{
+	var getTiddlerCallback = function(context)
+	{
+		if(context.status) {
+			var t = context.tiddler;
+			if(!t.created)
+				t.created = new Date();
+			if(!t.modified)
+				t.modified = t.created;
+			var dirty = store.isDirty();
+			context.tiddler = store.saveTiddler(t.title,t.title,t.text,t.modifier,t.modified,t.tags,t.fields,true,t.created,t.creator);
+			if(window.location.protocol != "file:")
+				store.setDirty(dirty);
+			autoSaveChanges();
+		} else {
+			story.refreshTiddler(context.title,null,true);
+		}
+		context.adaptor.close();
+		if(callback) {
+			callback(context);
+		}
+	};
+	var tiddler = new Tiddler(title);
+	tiddler.fields = typeof fields == "string" ? fields.decodeHashMap() : fields||{};
+	var context = {serverType:tiddler.getServerType()};
+	if(!context.serverType)
+		return "";
+	context.host = tiddler.fields['server.host'];
+	context.workspace = tiddler.fields['server.workspace'];
+	var adaptor = new config.adaptors[context.serverType]();
+	adaptor.getTiddler(title,context,null,getTiddlerCallback);
+	return config.messages.loadingMissingTiddler.format([title,context.serverType,context.host,context.workspace]);
+};
+
+//# Overridable for choosing the name of the template to apply for a tiddler
+Story.prototype.chooseTemplateForTiddler = function(title,template)
+{
+	if(!template)
+		template = DEFAULT_VIEW_TEMPLATE;
+	if(template == DEFAULT_VIEW_TEMPLATE || template == DEFAULT_EDIT_TEMPLATE)
+		template = config.tiddlerTemplates[template];
+	return template;
+};
+
+//# Overridable for extracting the text of a template from a tiddler
+Story.prototype.getTemplateForTiddler = function(title,template,tiddler)
+{
+	return store.getRecursiveTiddlerText(template,null,10);
+};
+
+//# Apply a template to an existing tiddler if it is not already displayed using that template
+//# title - title of tiddler to update
+//# template - the name of the tiddler containing the template or one of the constants DEFAULT_VIEW_TEMPLATE and DEFAULT_EDIT_TEMPLATE
+//# force - if true, forces the refresh even if the template hasn't changed
+//# customFields - an optional list of name/value pairs to be assigned as tiddler fields (for edit templates)
+//# defaultText - an optional string to replace the default text for non-existent tiddlers
+Story.prototype.refreshTiddler = function(title,template,force,customFields,defaultText)
+{
+	var tiddlerElem = this.getTiddler(title);
+	if(tiddlerElem) {
+		if(tiddlerElem.getAttribute("dirty") == "true" && !force)
+			return tiddlerElem;
+		template = this.chooseTemplateForTiddler(title,template);
+		var currTemplate = tiddlerElem.getAttribute("template");
+		if((template != currTemplate) || force) {
+			var tiddler = store.getTiddler(title);
+			if(!tiddler) {
+				tiddler = new Tiddler();
+				if(store.isShadowTiddler(title)) {
+					var tags = [];
+					tiddler.set(title,store.getTiddlerText(title),config.views.wikified.shadowModifier,version.date,tags,version.date);
+				} else {
+					var text = template=="EditTemplate" ?
+								config.views.editor.defaultText.format([title]) :
+								config.views.wikified.defaultText.format([title]);
+					text = defaultText || text;
+					var fields = customFields ? customFields.decodeHashMap() : null;
+					tiddler.set(title,text,config.views.wikified.defaultModifier,version.date,[],version.date,fields);
+				}
+			}
+			tiddlerElem.setAttribute("tags",tiddler.tags.join(" "));
+			tiddlerElem.setAttribute("tiddler",title);
+			tiddlerElem.setAttribute("template",template);
+			tiddlerElem.onmouseover = this.onTiddlerMouseOver;
+			tiddlerElem.onmouseout = this.onTiddlerMouseOut;
+			tiddlerElem.ondblclick = this.onTiddlerDblClick;
+			tiddlerElem[window.event?"onkeydown":"onkeypress"] = this.onTiddlerKeyPress;
+			tiddlerElem.innerHTML = this.getTemplateForTiddler(title,template,tiddler);
+			applyHtmlMacros(tiddlerElem,tiddler);
+			if(store.getTaggedTiddlers(title).length > 0)
+				jQuery(tiddlerElem).addClass("isTag");
+			else
+				jQuery(tiddlerElem).removeClass("isTag");
+			if(store.tiddlerExists(title)) {
+				jQuery(tiddlerElem).removeClass("shadow");
+				jQuery(tiddlerElem).removeClass("missing");
+			} else {
+				jQuery(tiddlerElem).addClass(store.isShadowTiddler(title) ? "shadow" : "missing");
+			}
+			if(customFields)
+				this.addCustomFields(tiddlerElem,customFields);
+		}
+	}
+	return tiddlerElem;
+};
+
+//# Add hidden input elements for the custom fields of a tiddler
+Story.prototype.addCustomFields = function(place,customFields)
+{
+	var fields = customFields.decodeHashMap();
+	var w = createTiddlyElement(place,"div",null,"customFields");
+	w.style.display = "none";
+	var t;
+	for(t in fields) {
+		var e = document.createElement("input");
+		e.setAttribute("type","text");
+		e.setAttribute("value",fields[t]);
+		w.appendChild(e);
+		e.setAttribute("edit",t);
+	}
+};
+
+//# Refresh all tiddlers in the Story
+Story.prototype.refreshAllTiddlers = function(force)
+{
+	var e = this.getContainer().firstChild;
+	while(e) {
+		var template = e.getAttribute("template");
+		if(template && e.getAttribute("dirty") != "true") {
+			this.refreshTiddler(e.getAttribute("tiddler"),force ? null : template,true);
+		}
+		e = e.nextSibling;
+	}
+};
+
+//# Default tiddler onmouseover/out event handlers
+Story.prototype.onTiddlerMouseOver = function(e)
+{
+	jQuery(this).addClass("selected");
+};
+
+Story.prototype.onTiddlerMouseOut = function(e)
+{
+	jQuery(this).removeClass("selected");
+};
+
+//# Default tiddler ondblclick event handler
+Story.prototype.onTiddlerDblClick = function(ev)
+{
+	var e = ev || window.event;
+	var target = resolveTarget(e);
+	if(target && target.nodeName.toLowerCase() != "input" && target.nodeName.toLowerCase() != "textarea") {
+		if(document.selection && document.selection.empty)
+			document.selection.empty();
+		config.macros.toolbar.invokeCommand(this,"defaultCommand",e);
+		e.cancelBubble = true;
+		if(e.stopPropagation) e.stopPropagation();
+		return true;
+	}
+	return false;
+};
+
+Story.prototype.onTiddlerKeyPress = function(ev)
+{
+	var e = ev || window.event;
+	clearMessage();
+	var consume = false;
+	var title = this.getAttribute("tiddler");
+	var target = resolveTarget(e);
+	switch(e.keyCode) {
+	case 9: // Tab
+		var ed = story.getTiddlerField(title,"text");
+		if(target.tagName.toLowerCase() == "input" && ed.value==config.views.editor.defaultText.format([title])) {
+			// moving from input field and editor still contains default text, so select it
+			ed.focus();
+			ed.select();
+			consume = true;
+		}
+		if(config.options.chkInsertTabs && target.tagName.toLowerCase() == "textarea") {
+			replaceSelection(target,String.fromCharCode(9));
+			consume = true;
+		}
+		if(config.isOpera) {
+			target.onblur = function() {
+				this.focus();
+				this.onblur = null;
+			};
+		}
+		break;
+	case 13: // Ctrl-Enter
+	case 10: // Ctrl-Enter on IE PC
+	case 77: // Ctrl-Enter is "M" on some platforms
+		if(e.ctrlKey) {
+			blurElement(this);
+			config.macros.toolbar.invokeCommand(this,"defaultCommand",e);
+			consume = true;
+		}
+		break;
+	case 27: // Escape
+		blurElement(this);
+		config.macros.toolbar.invokeCommand(this,"cancelCommand",e);
+		consume = true;
+		break;
+	}
+	e.cancelBubble = consume;
+	if(consume) {
+		if(e.stopPropagation) e.stopPropagation(); // Stop Propagation
+		e.returnValue = true; // Cancel The Event in IE
+		if(e.preventDefault ) e.preventDefault(); // Cancel The Event in Moz
+	}
+	return !consume;
+};
+
+//# Returns the specified field (input or textarea element) in a tiddler, otherwise the first edit field it finds
+//# or null if it found no edit field at all
+Story.prototype.getTiddlerField = function(title,field)
+{
+	var tiddlerElem = this.getTiddler(title);
+	var e = null;
+	if(tiddlerElem) {
+		var t,children = tiddlerElem.getElementsByTagName("*");
+		for(t=0; t<children.length; t++) {
+			var c = children[t];
+			if(c.tagName.toLowerCase() == "input" || c.tagName.toLowerCase() == "textarea") {
+				if(!e)
+					e = c;
+				if(c.getAttribute("edit") == field)
+					e = c;
+			}
+		}
+	}
+	return e;
+};
+
+//# Focus a specified tiddler. Attempts to focus the specified field, otherwise the first edit field it finds
+Story.prototype.focusTiddler = function(title,field)
+{
+	var e = this.getTiddlerField(title,field);
+	if(e) {
+		e.focus();
+		e.select();
+	}
+};
+
+//# Ensures that a specified tiddler does not have the focus
+Story.prototype.blurTiddler = function(title)
+{
+	var tiddlerElem = this.getTiddler(title);
+	if(tiddlerElem && tiddlerElem.focus && tiddlerElem.blur) {
+		tiddlerElem.focus();
+		tiddlerElem.blur();
+	}
+};
+
+//# Adds a specified value to the edit controls (if any) of a particular
+//# array-formatted field of a particular tiddler (eg "tags")
+//#  title - name of tiddler
+//#  tag - value of field, without any [[brackets]]
+//#  mode - +1 to add the tag, -1 to remove it, 0 to toggle it
+//#  field - name of field (eg "tags")
+Story.prototype.setTiddlerField = function(title,tag,mode,field)
+{
+	var c = this.getTiddlerField(title,field);
+	var tags = c.value.readBracketedList();
+	tags.setItem(tag,mode);
+	c.value = String.encodeTiddlyLinkList(tags);
+};
+
+//# The same as setTiddlerField but preset to the "tags" field
+Story.prototype.setTiddlerTag = function(title,tag,mode)
+{
+	this.setTiddlerField(title,tag,mode,"tags");
+};
+
+//# Close a specified tiddler
+//# title - name of tiddler to close
+//# animate - whether to perform animations
+Story.prototype.closeTiddler = function(title,animate,unused)
+{
+	var tiddlerElem = this.getTiddler(title);
+	if(tiddlerElem) {
+		clearMessage();
+		this.scrubTiddler(tiddlerElem);
+		if(config.options.chkAnimate && animate && anim && typeof Slider == "function")
+			anim.startAnimating(new Slider(tiddlerElem,false,null,"all"));
+		else {
+			jQuery(tiddlerElem).remove();
+		}
+	}
+};
+
+//# Scrub IDs from a tiddler. This is so that the 'ghost' of a tiddler while it is being closed
+//# does not interfere with things
+//# tiddlerElem - reference to the tiddler element
+Story.prototype.scrubTiddler = function(tiddlerElem)
+{
+	tiddlerElem.id = null;
+};
+
+//# Set the 'dirty' flag of a tiddler
+//# title - title of tiddler to change
+//# dirty - new boolean status of flag
+Story.prototype.setDirty = function(title,dirty)
+{
+	var tiddlerElem = this.getTiddler(title);
+	if(tiddlerElem)
+		tiddlerElem.setAttribute("dirty",dirty ? "true" : "false");
+};
+
+//# Is a particular tiddler dirty (with unsaved changes)?
+Story.prototype.isDirty = function(title)
+{
+	var tiddlerElem = this.getTiddler(title);
+	if(tiddlerElem)
+		return tiddlerElem.getAttribute("dirty") == "true";
+	return null;
+};
+
+//# Determine whether any open tiddler are dirty
+Story.prototype.areAnyDirty = function()
+{
+	var r = false;
+	this.forEachTiddler(function(title,element) {
+		if(this.isDirty(title))
+			r = true;
+	});
+	return r;
+};
+
+//# Close all tiddlers in the story
+Story.prototype.closeAllTiddlers = function(exclude)
+{
+	clearMessage();
+	this.forEachTiddler(function(title,element) {
+		if((title != exclude) && element.getAttribute("dirty") != "true")
+			this.closeTiddler(title);
+	});
+	window.scrollTo(0,ensureVisible(this.container));
+};
+
+//# Check if there are any tiddlers in the story
+Story.prototype.isEmpty = function()
+{
+	var place = this.getContainer();
+	return place && place.firstChild == null;
+};
+
+//# Perform a search and display the result
+//# text - text to search for
+//# useCaseSensitive - true for case sensitive matching
+//# useRegExp - true to interpret text as a RegExp
+Story.prototype.search = function(text,useCaseSensitive,useRegExp)
+{
+	this.closeAllTiddlers();
+	highlightHack = new RegExp(useRegExp ? text : text.escapeRegExp(),useCaseSensitive ? "mg" : "img");
+	var matches = store.search(highlightHack,"title","excludeSearch");
+	this.displayTiddlers(null,matches);
+	highlightHack = null;
+	var q = useRegExp ? "/" : "'";
+	if(matches.length > 0)
+		displayMessage(config.macros.search.successMsg.format([matches.length.toString(),q + text + q]));
+	else
+		displayMessage(config.macros.search.failureMsg.format([q + text + q]));
+};
+
+//# Determine if the specified element is within a tiddler in this story
+//# e - reference to an element
+//# returns: reference to a tiddler element or null if none
+Story.prototype.findContainingTiddler = function(e)
+{
+	while(e && !jQuery(e).hasClass("tiddler")) {
+		e = jQuery(e).hasClass("popup") && Popup.stack[0] ? Popup.stack[0].root : e.parentNode;
+	}
+	return e;
+};
+
+//# Gather any saveable fields from a tiddler element
+//# e - reference to an element to scan recursively
+//# fields - object to contain gathered field values
+Story.prototype.gatherSaveFields = function(e,fields)
+{
+	if(e && e.getAttribute) {
+		var f = e.getAttribute("edit");
+		if(f)
+			fields[f] = e.value.replace(/\r/mg,"");
+		if(e.hasChildNodes()) {
+			var t,c = e.childNodes;
+			for(t=0; t<c.length; t++)
+				this.gatherSaveFields(c[t],fields);
+		}
+	}
+};
+
+//# Determine whether a tiddler has any edit fields, and if so if their values have been changed
+//# title - name of tiddler
+Story.prototype.hasChanges = function(title)
+{
+	var e = this.getTiddler(title);
+	if(e) {
+		var fields = {};
+		this.gatherSaveFields(e,fields);
+		if(store.fetchTiddler(title)) {
+		    var n;
+			for(n in fields) {
+				if(store.getValue(title,n) != fields[n]) //# tiddler changed
+					return true;
+			}
+		} else {
+			if(store.isShadowTiddler(title) && store.getShadowTiddlerText(title) == fields.text) { //# not checking for title or tags
+				return false;
+			} else { //# changed shadow or new tiddler
+				return true;
+			}
+		}
+	}
+	return false;
+};
+
+//# Save any open edit fields of a tiddler and updates the display as necessary
+//# title - name of tiddler
+//# minorUpdate - true if the modified date shouldn't be updated
+//# returns: title of saved tiddler, or null if not saved
+Story.prototype.saveTiddler = function(title,minorUpdate)
+{
+	var tiddlerElem = this.getTiddler(title);
+	if(tiddlerElem) {
+		var fields = {};
+		this.gatherSaveFields(tiddlerElem,fields);
+		var newTitle = fields.title || title;
+		if(!store.tiddlerExists(newTitle)) {
+			newTitle = newTitle.trim();
+			var creator = config.options.txtUserName;
+		}
+		if(store.tiddlerExists(newTitle) && newTitle != title) {
+			if(!confirm(config.messages.overwriteWarning.format([newTitle.toString()])))
+				return null;
+				title = newTitle;
+		}
+		if(newTitle != title)
+			this.closeTiddler(newTitle,false);
+		tiddlerElem.id = this.tiddlerId(newTitle);
+		tiddlerElem.setAttribute("tiddler",newTitle);
+		tiddlerElem.setAttribute("template",DEFAULT_VIEW_TEMPLATE);
+		tiddlerElem.setAttribute("dirty","false");
+		if(config.options.chkForceMinorUpdate)
+			minorUpdate = !minorUpdate;
+		if(!store.tiddlerExists(newTitle))
+			minorUpdate = false;
+		var newDate = new Date();
+		if(store.tiddlerExists(title)) {
+			var t = store.fetchTiddler(title);
+			var extendedFields = t.fields;
+			creator = t.creator;
+		} else {
+			extendedFields = merge({},config.defaultCustomFields);
+		}
+		var n;
+		for(n in fields) {
+			if(!TiddlyWiki.isStandardField(n))
+				extendedFields[n] = fields[n];
+		}
+		var tiddler = store.saveTiddler(title,newTitle,fields.text,minorUpdate ? undefined : config.options.txtUserName,minorUpdate ? undefined : newDate,fields.tags,extendedFields,null,null,creator);
+		autoSaveChanges(null,[tiddler]);
+		return newTitle;
+	}
+	return null;
+};
+
+Story.prototype.permaView = function()
+{
+	var links = [];
+	this.forEachTiddler(function(title,element) {
+		links.push(String.encodeTiddlyLink(title));
+	});
+	var t = encodeURIComponent(links.join(" "));
+	if(t == "")
+		t = "#";
+	if(window.location.hash != t)
+		window.location.hash = t;
+};
+
+Story.prototype.switchTheme = function(theme)
+{
+	if(safeMode)
+		return;
+
+	var isAvailable = function(title) {
+		var s = title ? title.indexOf(config.textPrimitives.sectionSeparator) : -1;
+		if(s!=-1)
+			title = title.substr(0,s);
+		return store.tiddlerExists(title) || store.isShadowTiddler(title);
+	};
+
+	var getSlice = function(theme,slice) {
+		var r;
+		if(readOnly)
+			r = store.getTiddlerSlice(theme,slice+"ReadOnly") || store.getTiddlerSlice(theme,"Web"+slice);
+		r = r || store.getTiddlerSlice(theme,slice);
+		if(r && r.indexOf(config.textPrimitives.sectionSeparator)==0)
+			r = theme + r;
+		return isAvailable(r) ? r : slice;
+	};
+
+	var replaceNotification = function(i,name,theme,slice) {
+		var newName = getSlice(theme,slice);
+		if(name!=newName && store.namedNotifications[i].name==name) {
+			store.namedNotifications[i].name = newName;
+			return newName;
+		}
+		return name;
+	};
+
+	var pt = config.refresherData.pageTemplate;
+	var vi = DEFAULT_VIEW_TEMPLATE;
+	var vt = config.tiddlerTemplates[vi];
+	var ei = DEFAULT_EDIT_TEMPLATE;
+	var et = config.tiddlerTemplates[ei];
+
+	var i;
+	for(i=0; i<config.notifyTiddlers.length; i++) {
+		var name = config.notifyTiddlers[i].name;
+		switch(name) {
+		case "PageTemplate":
+			config.refresherData.pageTemplate = replaceNotification(i,config.refresherData.pageTemplate,theme,name);
+			break;
+		case "StyleSheet":
+			removeStyleSheet(config.refresherData.styleSheet);
+			config.refresherData.styleSheet = replaceNotification(i,config.refresherData.styleSheet,theme,name);
+			break;
+		case "ColorPalette":
+			config.refresherData.colorPalette = replaceNotification(i,config.refresherData.colorPalette,theme,name);
+			break;
+		default:
+			break;
+		}
+	}
+	config.tiddlerTemplates[vi] = getSlice(theme,"ViewTemplate");
+	config.tiddlerTemplates[ei] = getSlice(theme,"EditTemplate");
+	if(!startingUp) {
+		if(config.refresherData.pageTemplate!=pt || config.tiddlerTemplates[vi]!=vt || config.tiddlerTemplates[ei]!=et) {
+			refreshAll();
+			this.refreshAllTiddlers(true);
+		} else {
+			setStylesheet(store.getRecursiveTiddlerText(config.refresherData.styleSheet,"",10),config.refreshers.styleSheet);
+		}
+		config.options.txtTheme = theme;
+		saveOption("txtTheme");
+	}
+};
+
diff --git a/test/data/tiddlywiki/js/Strings.js b/test/data/tiddlywiki/js/Strings.js
new file mode 100755
index 000000000..3b50ec257
--- /dev/null
+++ b/test/data/tiddlywiki/js/Strings.js
@@ -0,0 +1,298 @@
+//--
+//-- Augmented methods for the JavaScript String() object
+//--
+
+// Get characters from the right end of a string
+String.prototype.right = function(n)
+{
+	return n < this.length ? this.slice(this.length-n) : this;
+};
+
+// Trim whitespace from both ends of a string
+String.prototype.trim = function()
+{
+	return this.replace(/^\s*|\s*$/g,"");
+};
+
+// Convert a string from a CSS style property name to a JavaScript style name ("background-color" -> "backgroundColor")
+String.prototype.unDash = function()
+{
+	var t,s = this.split("-");
+	if(s.length > 1) {
+		for(t=1; t<s.length; t++)
+			s[t] = s[t].substr(0,1).toUpperCase() + s[t].substr(1);
+	}
+	return s.join("");
+};
+
+// Substitute substrings from an array into a format string that includes '%1'-type specifiers
+String.prototype.format = function(s)
+{
+	var substrings = s && s.constructor == Array ? s : arguments;
+	var subRegExp = /(?:%(\d+))/mg;
+	var currPos = 0;
+	var match,r = [];
+	do {
+		match = subRegExp.exec(this);
+		if(match && match[1]) {
+			if(match.index > currPos)
+				r.push(this.substring(currPos,match.index));
+			r.push(substrings[parseInt(match[1],10)]);
+			currPos = subRegExp.lastIndex;
+		}
+	} while(match);
+	if(currPos < this.length)
+		r.push(this.substring(currPos,this.length));
+	return r.join("");
+};
+
+// Escape any special RegExp characters with that character preceded by a backslash
+String.prototype.escapeRegExp = function()
+{
+	var s = "\\^$*+?()=!|,{}[].";
+	var t,c = this;
+	for(t=0; t<s.length; t++)
+		c = c.replace(new RegExp("\\" + s.substr(t,1),"g"),"\\" + s.substr(t,1));
+	return c;
+};
+
+// Convert "\" to "\s", newlines to "\n" (and remove carriage returns)
+String.prototype.escapeLineBreaks = function()
+{
+	return this.replace(/\\/mg,"\\s").replace(/\n/mg,"\\n").replace(/\r/mg,"");
+};
+
+// Convert "\n" to newlines, "\b" to " ", "\s" to "\" (and remove carriage returns)
+String.prototype.unescapeLineBreaks = function()
+{
+	return this.replace(/\\n/mg,"\n").replace(/\\b/mg," ").replace(/\\s/mg,"\\").replace(/\r/mg,"");
+};
+
+// Convert & to "&amp;", < to "&lt;", > to "&gt;" and " to "&quot;"
+String.prototype.htmlEncode = function()
+{
+	return this.replace(/&/mg,"&amp;").replace(/</mg,"&lt;").replace(/>/mg,"&gt;").replace(/\"/mg,"&quot;");
+};
+
+// Convert "&amp;" to &, "&lt;" to <, "&gt;" to > and "&quot;" to "
+String.prototype.htmlDecode = function()
+{
+	return this.replace(/&lt;/mg,"<").replace(/&gt;/mg,">").replace(/&quot;/mg,"\"").replace(/&amp;/mg,"&");
+};
+
+// Parse a space-separated string of name:value parameters
+//# where:
+//#   - the name or the value can be optional (in which case separate defaults are used instead)
+//#     - in case of ambiguity, a lone word is taken to be a value
+//#     - if 'cascadeDefaults' is set to true, then the defaults are modified by updated by each specified name or value
+//#     - name prefixes are not allowed if the 'noNames' parameter is true
+//#   - if both the name and value are present they must be separated by a colon
+//#   - the name and the value may both be quoted with single- or double-quotes, double-square brackets
+//#   - names or values quoted with {{double-curly braces}} are evaluated as a JavaScript expression
+//#     - as long as the 'allowEval' parameter is true
+// The result is an array of objects:
+//   result[0] = object with a member for each parameter name, value of that member being an array of values
+//   result[1..n] = one object for each parameter, with 'name' and 'value' members
+String.prototype.parseParams = function(defaultName,defaultValue,allowEval,noNames,cascadeDefaults)
+{
+	var parseToken = function(match,p) {
+		var n;
+		if(match[p]) // Double quoted
+			n = match[p];
+		else if(match[p+1]) // Single quoted
+			n = match[p+1];
+		else if(match[p+2]) // Double-square-bracket quoted
+			n = match[p+2];
+		else if(match[p+3]) // Double-brace quoted
+			try {
+				n = match[p+3];
+				if(allowEval && config.evaluateMacroParameters != "none") {
+					if(config.evaluateMacroParameters == "restricted") {
+						if(window.restrictedEval) {
+							n = window.restrictedEval(n);
+						}
+					} else {
+						n = window.eval(n);
+					}
+				}
+			} catch(ex) {
+				throw "Unable to evaluate {{" + match[p+3] + "}}: " + exceptionText(ex);
+			}
+		else if(match[p+4]) // Unquoted
+			n = match[p+4];
+		else if(match[p+5]) // empty quote
+			n = "";
+		return n;
+	};
+	var r = [{}];
+	var dblQuote = "(?:\"((?:(?:\\\\\")|[^\"])+)\")";
+	var sngQuote = "(?:'((?:(?:\\\\\')|[^'])+)')";
+	var dblSquare = "(?:\\[\\[((?:\\s|\\S)*?)\\]\\])";
+	var dblBrace = "(?:\\{\\{((?:\\s|\\S)*?)\\}\\})";
+	var unQuoted = noNames ? "([^\"'\\s]\\S*)" : "([^\"':\\s][^\\s:]*)";
+	var emptyQuote = "((?:\"\")|(?:''))";
+	var skipSpace = "(?:\\s*)";
+	var token = "(?:" + dblQuote + "|" + sngQuote + "|" + dblSquare + "|" + dblBrace + "|" + unQuoted + "|" + emptyQuote + ")";
+	var re = noNames ? new RegExp(token,"mg") : new RegExp(skipSpace + token + skipSpace + "(?:(\\:)" + skipSpace + token + ")?","mg");
+	var match;
+	do {
+		match = re.exec(this);
+		if(match) {
+			var n = parseToken(match,1);
+			if(noNames) {
+				r.push({name:"",value:n});
+			} else {
+				var v = parseToken(match,8);
+				if(v == null && defaultName) {
+					v = n;
+					n = defaultName;
+				} else if(v == null && defaultValue) {
+					v = defaultValue;
+				}
+				r.push({name:n,value:v});
+				if(cascadeDefaults) {
+					defaultName = n;
+					defaultValue = v;
+				}
+			}
+		}
+	} while(match);
+	// Summarise parameters into first element
+	var t;
+	for(t=1; t<r.length; t++) {
+		if(r[0][r[t].name])
+			r[0][r[t].name].push(r[t].value);
+		else
+			r[0][r[t].name] = [r[t].value];
+	}
+	return r;
+};
+
+// Process a string list of macro parameters into an array. Parameters can be quoted with "", '',
+// [[]], {{ }} or left unquoted (and therefore space-separated). Double-braces {{}} results in
+// an *evaluated* parameter: e.g. {{config.options.txtUserName}} results in the current user's name.
+String.prototype.readMacroParams = function(notAllowEval)
+{
+	var p = this.parseParams("list",null,!notAllowEval,true);
+	var t,n = [];
+	for(t=1; t<p.length; t++)
+		n.push(p[t].value);
+	return n;
+};
+
+// Process a string list of unique tiddler names into an array. Tiddler names that have spaces in them must be [[bracketed]]
+String.prototype.readBracketedList = function(unique)
+{
+	var p = this.parseParams("list",null,false,true);
+	var t,n = [];
+	for(t=1; t<p.length; t++) {
+		if(p[t].value)
+			n.pushUnique(p[t].value,unique);
+	}
+	return n;
+};
+
+// Returns array with start and end index of chunk between given start and end marker, or undefined.
+String.prototype.getChunkRange = function(start,end)
+{
+	var s = this.indexOf(start);
+	if(s != -1) {
+		s += start.length;
+		var e = this.indexOf(end,s);
+		if(e != -1)
+			return [s,e];
+	}
+};
+
+// Replace a chunk of a string given start and end markers
+String.prototype.replaceChunk = function(start,end,sub)
+{
+	var r = this.getChunkRange(start,end);
+	return r ? this.substring(0,r[0]) + sub + this.substring(r[1]) : this;
+};
+
+// Returns a chunk of a string between start and end markers, or undefined
+String.prototype.getChunk = function(start,end)
+{
+	var r = this.getChunkRange(start,end);
+	if(r)
+		return this.substring(r[0],r[1]);
+};
+
+
+// Static method to bracket a string with double square brackets if it contains a space
+String.encodeTiddlyLink = function(title)
+{
+	return title.indexOf(" ") == -1 ? title : "[[" + title + "]]";
+};
+
+// Static method to encodeTiddlyLink for every item in an array and join them with spaces
+String.encodeTiddlyLinkList = function(list)
+{
+	if(list) {
+		var t,results = [];
+		for(t=0; t<list.length; t++)
+			results.push(String.encodeTiddlyLink(list[t]));
+		return results.join(" ");
+	} else {
+		return "";
+	}
+};
+
+// Convert a string as a sequence of name:"value" pairs into a hashmap
+String.prototype.decodeHashMap = function()
+{
+	var fields = this.parseParams("anon","",false);
+	var t,r = {};
+	for(t=1; t<fields.length; t++)
+		r[fields[t].name] = fields[t].value;
+	return r;
+};
+
+// Static method to encode a hashmap into a name:"value"... string
+String.encodeHashMap = function(hashmap)
+{
+	var t,r = [];
+	for(t in hashmap)
+		r.push(t + ':"' + hashmap[t] + '"');
+	return r.join(" ");
+};
+
+// Static method to left-pad a string with 0s to a certain width
+String.zeroPad = function(n,d)
+{
+	var s = n.toString();
+	if(s.length < d)
+		s = "000000000000000000000000000".substr(0,d-s.length) + s;
+	return s;
+};
+
+String.prototype.startsWith = function(prefix)
+{
+	return !prefix || this.substring(0,prefix.length) == prefix;
+};
+
+// Returns the first value of the given named parameter.
+//#
+//# @param params
+//#         as returned by parseParams or null/undefined
+//# @return [may be null/undefined]
+//#
+function getParam(params,name,defaultValue)
+{
+	if(!params)
+		return defaultValue;
+	var p = params[0][name];
+	return p ? p[0] : defaultValue;
+}
+
+// Returns the first value of the given boolean named parameter.
+//#
+//# @param params
+//#         as returned by parseParams or null/undefined
+//#
+function getFlag(params,name,defaultValue)
+{
+	return !!getParam(params,name,defaultValue);
+}
+
diff --git a/test/data/tiddlywiki/js/Sync.js b/test/data/tiddlywiki/js/Sync.js
new file mode 100755
index 000000000..4b35b2099
--- /dev/null
+++ b/test/data/tiddlywiki/js/Sync.js
@@ -0,0 +1,222 @@
+//--
+//-- Sync macro
+//--
+
+// Synchronisation handlers
+config.syncers = {};
+
+// Sync state.
+//# Members:
+//#	syncList - List of sync objects (title, tiddler, server, workspace, page, revision)
+//#	wizard - reference to wizard object
+//#	listView - DOM element of the listView table
+var currSync = null;
+
+// sync macro
+config.macros.sync.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	if(!wikifier.isStatic)
+		this.startSync(place);
+};
+
+config.macros.sync.cancelSync = function()
+{
+	currSync = null;
+};
+
+config.macros.sync.startSync = function(place)
+{
+	if(currSync)
+		config.macros.sync.cancelSync();
+	currSync = {};
+	currSync.syncList = this.getSyncableTiddlers();
+	currSync.syncTasks = this.createSyncTasks(currSync.syncList);
+	this.preProcessSyncableTiddlers(currSync.syncList);
+	var wizard = new Wizard();
+	currSync.wizard = wizard;
+	wizard.createWizard(place,this.wizardTitle);
+	wizard.addStep(this.step1Title,this.step1Html);
+	var markList = wizard.getElement("markList");
+	var listWrapper = document.createElement("div");
+	markList.parentNode.insertBefore(listWrapper,markList);
+	currSync.listView = ListView.create(listWrapper,currSync.syncList,this.listViewTemplate);
+	this.processSyncableTiddlers(currSync.syncList);
+	wizard.setButtons([{caption: this.syncLabel, tooltip: this.syncPrompt, onClick: this.doSync}]);
+};
+
+config.macros.sync.getSyncableTiddlers = function()
+{
+	var list = [];
+	store.forEachTiddler(function(title,tiddler) {
+		var syncItem = {};
+		syncItem.serverType = tiddler.getServerType();
+		syncItem.serverHost = tiddler.fields['server.host'];
+		if(syncItem.serverType && syncItem.serverHost) {
+			syncItem.adaptor = new config.adaptors[syncItem.serverType]();
+			syncItem.serverHost = syncItem.adaptor.fullHostName(syncItem.serverHost);
+			syncItem.serverWorkspace = tiddler.fields['server.workspace'];
+			syncItem.tiddler = tiddler;
+			syncItem.title = tiddler.title;
+			syncItem.isTouched = tiddler.isTouched();
+			syncItem.selected = syncItem.isTouched;
+			syncItem.syncStatus = config.macros.sync.syncStatusList[syncItem.isTouched ? "changedLocally" : "none"];
+			syncItem.status = syncItem.syncStatus.text;
+			list.push(syncItem);
+		}
+		});
+	list.sort(function(a,b) {return a.title < b.title ? -1 : (a.title == b.title ? 0 : +1);});
+	return list;
+};
+
+config.macros.sync.preProcessSyncableTiddlers = function(syncList)
+{
+	var i;
+	for(i=0; i<syncList.length; i++) {
+		var si = syncList[i];
+		si.serverUrl = si.adaptor.generateTiddlerInfo(si.tiddler).uri;
+	}
+};
+
+config.macros.sync.processSyncableTiddlers = function(syncList)
+{
+	var i;
+	for(i=0; i<syncList.length; i++) {
+		var si = syncList[i];
+		if(si.syncStatus.display)
+			si.rowElement.style.display = si.syncStatus.display;
+		if(si.syncStatus.className)
+			si.rowElement.className = si.syncStatus.className;
+	}
+};
+
+config.macros.sync.createSyncTasks = function(syncList)
+{
+	var i,syncTasks = [];
+	for(i=0; i<syncList.length; i++) {
+		var si = syncList[i];
+		var j,r = null;
+		for(j=0; j<syncTasks.length; j++) {
+			var cst = syncTasks[j];
+			if(si.serverType == cst.serverType && si.serverHost == cst.serverHost && si.serverWorkspace == cst.serverWorkspace)
+				r = cst;
+		}
+		if(r) {
+			si.syncTask = r;
+			r.syncItems.push(si);
+		} else {
+			si.syncTask = this.createSyncTask(si);
+			syncTasks.push(si.syncTask);
+		}
+	}
+	return syncTasks;
+};
+
+config.macros.sync.createSyncTask = function(syncItem)
+{
+	var st = {};
+	st.serverType = syncItem.serverType;
+	st.serverHost = syncItem.serverHost;
+	st.serverWorkspace = syncItem.serverWorkspace;
+	st.syncItems = [syncItem];
+
+	var getTiddlerListCallback = function(context,sycnItems) {
+		var me = config.macros.sync;
+		if(!context.status) {
+			displayMessage(context.statusText);
+			return false;
+		}
+		syncItems = context.userParams;
+		var i,tiddlers = context.tiddlers;
+		for(i=0; i<syncItems.length; i++) {
+			var si = syncItems[i];
+			var f = tiddlers.findByField("title",si.title);
+			if(f !== null) {
+				if(tiddlers[f].fields['server.page.revision'] > si.tiddler.fields['server.page.revision']) {
+					si.syncStatus = me.syncStatusList[si.isTouched ? 'changedBoth' : 'changedServer'];
+				}
+			} else {
+				si.syncStatus = me.syncStatusList.notFound;
+			}
+			me.updateSyncStatus(si);
+		}
+		return true;
+	};
+
+	var openWorkspaceCallback = function(context,syncItems) {
+		if(context.status) {
+			context.adaptor.getTiddlerList(context,syncItems,getTiddlerListCallback);
+			return true;
+		}
+		displayMessage(context.statusText);
+		return false;
+	};
+
+	var context = {host:st.serverHost,workspace:st.serverWorkspace};
+	syncItem.adaptor.openHost(st.serverHost);
+	syncItem.adaptor.openWorkspace(st.serverWorkspace,context,st.syncItems,openWorkspaceCallback);
+	return st;
+};
+
+config.macros.sync.updateSyncStatus = function(syncItem)
+{
+	var e = syncItem.colElements["status"];
+	jQuery(e).empty();
+	createTiddlyText(e,syncItem.syncStatus.text);
+	syncItem.rowElement.style.display = syncItem.syncStatus.display;
+	if(syncItem.syncStatus.className)
+		syncItem.rowElement.className = syncItem.syncStatus.className;
+};
+
+config.macros.sync.doSync = function(e)
+{
+	var me = config.macros.sync;
+	var getTiddlerCallback = function(context,syncItem) {
+		if(syncItem) {
+			var tiddler = context.tiddler;
+			store.saveTiddler(tiddler.title,tiddler.title,tiddler.text,tiddler.modifier,tiddler.modified,tiddler.tags,tiddler.fields,true,tiddler.created);
+			syncItem.syncStatus = me.syncStatusList.gotFromServer;
+			me.updateSyncStatus(syncItem);
+		}
+	};
+	var putTiddlerCallback = function(context,syncItem) {
+		if(syncItem) {
+			store.resetTiddler(context.title);
+			syncItem.syncStatus = me.syncStatusList.putToServer;
+			me.updateSyncStatus(syncItem);
+		}
+	};
+
+	var rowNames = ListView.getSelectedRows(currSync.listView);
+	var i,sl = me.syncStatusList;
+	for(i=0; i<currSync.syncList.length; i++) {
+		var si = currSync.syncList[i];
+		if(rowNames.indexOf(si.title) != -1) {
+			var errorMsg = "Error in doSync: ";
+			try {
+				var r = true;
+				switch(si.syncStatus) {
+				case sl.changedServer:
+					var context = {"workspace": si.serverWorkspace};
+					r = si.adaptor.getTiddler(si.title,context,si,getTiddlerCallback);
+					break;
+				case sl.notFound:
+				case sl.changedLocally:
+				case sl.changedBoth:
+					r = si.adaptor.putTiddler(si.tiddler,null,si,putTiddlerCallback);
+					break;
+				default:
+					break;
+				}
+				if(!r)
+					displayMessage(errorMsg + r);
+			} catch(ex) {
+				if(ex.name == "TypeError")
+					displayMessage("sync operation unsupported: " + ex.message);
+				else
+					displayMessage(errorMsg + ex.message);
+			}
+		}
+	}
+	return false;
+};
+
diff --git a/test/data/tiddlywiki/js/TW21Loader.js b/test/data/tiddlywiki/js/TW21Loader.js
new file mode 100755
index 000000000..312259b97
--- /dev/null
+++ b/test/data/tiddlywiki/js/TW21Loader.js
@@ -0,0 +1,55 @@
+//--
+//-- TW21Loader (inherits from LoaderBase)
+//--
+
+function TW21Loader() {}
+
+TW21Loader.prototype = new LoaderBase();
+
+TW21Loader.prototype.getTitle = function(store,node)
+{
+	var title = null;
+	if(node.getAttribute) {
+		title = node.getAttribute("title");
+		if(!title)
+			title = node.getAttribute("tiddler");
+	}
+	if(!title && node.id) {
+		var lenPrefix = store.idPrefix.length;
+		if(node.id.substr(0,lenPrefix) == store.idPrefix)
+			title = node.id.substr(lenPrefix);
+	}
+	return title;
+};
+
+TW21Loader.prototype.internalizeTiddler = function(store,tiddler,title,node)
+{
+	var e = node.firstChild;
+	var text = null;
+	if(node.getAttribute("tiddler")) {
+		text = getNodeText(e).unescapeLineBreaks();
+	} else {
+		while(e.nodeName!="PRE" && e.nodeName!="pre") {
+			e = e.nextSibling;
+		}
+		text = e.innerHTML.replace(/\r/mg,"").htmlDecode();
+	}
+	var creator = node.getAttribute("creator");
+	var modifier = node.getAttribute("modifier");
+	var c = node.getAttribute("created");
+	var m = node.getAttribute("modified");
+	var created = c ? Date.convertFromYYYYMMDDHHMMSS(c) : version.date;
+	var modified = m ? Date.convertFromYYYYMMDDHHMMSS(m) : created;
+	var tags = node.getAttribute("tags");
+	var fields = {};
+	var i,attrs = node.attributes;
+	for(i = attrs.length-1; i >= 0; i--) {
+		var name = attrs[i].name;
+		if(attrs[i].specified && !TiddlyWiki.isStandardField(name)) {
+			fields[name] = attrs[i].value.unescapeLineBreaks();
+		}
+	}
+	tiddler.assign(title,text,modifier,modified,tags,created,fields,creator);
+	return tiddler;
+};
+
diff --git a/test/data/tiddlywiki/js/TW21Saver.js b/test/data/tiddlywiki/js/TW21Saver.js
new file mode 100755
index 000000000..294a82e75
--- /dev/null
+++ b/test/data/tiddlywiki/js/TW21Saver.js
@@ -0,0 +1,42 @@
+//--
+//-- TW21Saver (inherits from SaverBase)
+//--
+
+function TW21Saver() {}
+
+TW21Saver.prototype = new SaverBase();
+
+TW21Saver.prototype.externalizeTiddler = function(store,tiddler)
+{
+	try {
+		var extendedAttributes = "";
+		var usePre = config.options.chkUsePreForStorage;
+		store.forEachField(tiddler,
+			function(tiddler,fieldName,value) {
+				// don't store stuff from the temp namespace
+				if(typeof value != "string")
+					value = "";
+				if(!fieldName.match(/^temp\./))
+					extendedAttributes += ' %0="%1"'.format([fieldName,value.escapeLineBreaks().htmlEncode()]);
+			},true);
+		var created = tiddler.created;
+		var modified = tiddler.modified;
+		var attributes = tiddler.creator ? ' creator="' + tiddler.creator.htmlEncode() + '"' : "";
+		attributes += tiddler.modifier ? ' modifier="' + tiddler.modifier.htmlEncode() + '"' : "";
+		attributes += (usePre && created == version.date) ? "" :' created="' + created.convertToYYYYMMDDHHMM() + '"';
+		attributes += (usePre && modified == created) ? "" : ' modified="' + modified.convertToYYYYMMDDHHMM() +'"';
+		var tags = tiddler.getTags();
+		if(!usePre || tags)
+			attributes += ' tags="' + tags.htmlEncode() + '"';
+		return ('<div %0="%1"%2%3>%4</'+'div>').format([
+				usePre ? "title" : "tiddler",
+				tiddler.title.htmlEncode(),
+				attributes,
+				extendedAttributes,
+				usePre ? "\n<pre>" + tiddler.text.htmlEncode() + "</pre>\n" : tiddler.text.escapeLineBreaks().htmlEncode()
+			]);
+	} catch (ex) {
+		throw exceptionText(ex,config.messages.tiddlerSaveError.format([tiddler.title]));
+	}
+};
+
diff --git a/test/data/tiddlywiki/js/Tabs.js b/test/data/tiddlywiki/js/Tabs.js
new file mode 100755
index 000000000..cc9aebc03
--- /dev/null
+++ b/test/data/tiddlywiki/js/Tabs.js
@@ -0,0 +1,65 @@
+//--
+//-- Tabs macro
+//--
+
+config.macros.tabs.handler = function(place,macroName,params)
+{
+	var cookie = params[0];
+	var numTabs = (params.length-1)/3;
+	var wrapper = createTiddlyElement(null,"div",null,"tabsetWrapper " + cookie);
+	var tabset = createTiddlyElement(wrapper,"div",null,"tabset");
+	tabset.setAttribute("cookie",cookie);
+	var validTab = false;
+	var t;
+	for(t=0; t<numTabs; t++) {
+		var label = params[t*3+1];
+		var prompt = params[t*3+2];
+		var content = params[t*3+3];
+		var tab = createTiddlyButton(tabset,label,prompt,this.onClickTab,"tab tabUnselected");
+		createTiddlyElement(tab,"span",null,null," ",{style:"font-size:0pt;line-height:0px"});
+		tab.setAttribute("tab",label);
+		tab.setAttribute("content",content);
+		tab.title = prompt;
+		if(config.options[cookie] == label)
+			validTab = true;
+	}
+	if(!validTab)
+		config.options[cookie] = params[1];
+	place.appendChild(wrapper);
+	this.switchTab(tabset,config.options[cookie]);
+};
+
+config.macros.tabs.onClickTab = function(e)
+{
+	config.macros.tabs.switchTab(this.parentNode,this.getAttribute("tab"));
+	return false;
+};
+
+config.macros.tabs.switchTab = function(tabset,tab)
+{
+	var cookie = tabset.getAttribute("cookie");
+	var theTab = null;
+	var nodes = tabset.childNodes;
+	var t;
+	for(t=0; t<nodes.length; t++) {
+		if(nodes[t].getAttribute && nodes[t].getAttribute("tab") == tab) {
+			theTab = nodes[t];
+			theTab.className = "tab tabSelected";
+		} else {
+			nodes[t].className = "tab tabUnselected";
+		}
+	}
+	if(theTab) {
+		if(tabset.nextSibling && tabset.nextSibling.className == "tabContents")
+			jQuery(tabset.nextSibling).remove();
+		var tabContent = createTiddlyElement(null,"div",null,"tabContents");
+		tabset.parentNode.insertBefore(tabContent,tabset.nextSibling);
+		var contentTitle = theTab.getAttribute("content");
+		wikify(store.getTiddlerText(contentTitle),tabContent,null,store.getTiddler(contentTitle));
+		if(cookie) {
+			config.options[cookie] = tab;
+			saveOption(cookie);
+		}
+	}
+};
+
diff --git a/test/data/tiddlywiki/js/Tiddler.js b/test/data/tiddlywiki/js/Tiddler.js
new file mode 100755
index 000000000..39e3e3df3
--- /dev/null
+++ b/test/data/tiddlywiki/js/Tiddler.js
@@ -0,0 +1,207 @@
+//--
+//-- Tiddler() object
+//--
+
+function Tiddler(title)
+{
+	this.title = title;
+	this.text = "";
+	this.creator = null;
+	this.modifier = null;
+	this.created = new Date();
+	this.modified = this.created;
+	this.links = [];
+	this.linksUpdated = false;
+	this.tags = [];
+	this.fields = {};
+	return this;
+}
+
+Tiddler.prototype.getLinks = function()
+{
+	if(this.linksUpdated==false)
+		this.changed();
+	return this.links;
+};
+
+// Returns the fields that are inherited in string field:"value" field2:"value2" format
+Tiddler.prototype.getInheritedFields = function()
+{
+	var f = {};
+	var i;
+	for(i in this.fields) {
+		if(i=="server.host" || i=="server.workspace" || i=="wikiformat"|| i=="server.type") {
+			f[i] = this.fields[i];
+		}
+	}
+	return String.encodeHashMap(f);
+};
+
+// Increment the changeCount of a tiddler
+Tiddler.prototype.incChangeCount = function()
+{
+	var c = this.fields['changecount'];
+	c = c ? parseInt(c,10) : 0;
+	this.fields['changecount'] = String(c+1);
+};
+
+// Clear the changeCount of a tiddler
+Tiddler.prototype.clearChangeCount = function()
+{
+	if(this.fields['changecount']) {
+		delete this.fields['changecount'];
+	}
+};
+
+//# returns true when this tiddler has the field 'temporary', meaning it is a temporary tiddler (i.e. must not be saved).
+Tiddler.prototype.doNotSave = function()
+{
+	return this.fields['doNotSave'];
+};
+
+// Returns true if the tiddler has been updated since the tiddler was created or downloaded
+Tiddler.prototype.isTouched = function()
+{
+	var changecount = this.fields.changecount || 0;
+	return changecount > 0;
+};
+
+// Change the text and other attributes of a tiddler
+Tiddler.prototype.set = function(title,text,modifier,modified,tags,created,fields,creator)
+{
+	this.assign(title,text,modifier,modified,tags,created,fields,creator);
+	this.changed();
+	return this;
+};
+
+// Change the text and other attributes of a tiddler without triggered a tiddler.changed() call
+Tiddler.prototype.assign = function(title,text,modifier,modified,tags,created,fields,creator)
+{
+	if(title != undefined)
+		this.title = title;
+	if(text != undefined)
+		this.text = text;
+	if(modifier != undefined)
+		this.modifier = modifier;
+	if(modified != undefined)
+		this.modified = modified;
+	if(creator != undefined)
+		this.creator = creator;
+	if(created != undefined)
+		this.created = created;
+	if(fields != undefined)
+		this.fields = fields;
+	if(tags != undefined)
+		this.tags = (typeof tags == "string") ? tags.readBracketedList() : tags;
+	else if(this.tags == undefined)
+		this.tags = [];
+	return this;
+};
+
+// Get the tags for a tiddler as a string (space delimited, using [[brackets]] for tags containing spaces)
+Tiddler.prototype.getTags = function()
+{
+	return String.encodeTiddlyLinkList(this.tags);
+};
+
+// Test if a tiddler carries a tag
+Tiddler.prototype.isTagged = function(tag)
+{
+	return this.tags.indexOf(tag) != -1;
+};
+
+// Static method to convert "\n" to newlines, "\s" to "\"
+Tiddler.unescapeLineBreaks = function(text)
+{
+	return text ? text.unescapeLineBreaks() : "";
+};
+
+// Convert newlines to "\n", "\" to "\s"
+Tiddler.prototype.escapeLineBreaks = function()
+{
+	return this.text.escapeLineBreaks();
+};
+
+// Updates the secondary information (like links[] array) after a change to a tiddler
+Tiddler.prototype.changed = function()
+{
+	this.links = [];
+	var text = this.text;
+	// remove 'quoted' text before scanning tiddler source
+	text = text.replace(/\/%((?:.|\n)*?)%\//g,"").
+		replace(/\{{3}((?:.|\n)*?)\}{3}/g,"").
+		replace(/"""((?:.|\n)*?)"""/g,"").
+		replace(/<nowiki\>((?:.|\n)*?)<\/nowiki\>/g,"").
+		replace(/<html\>((?:.|\n)*?)<\/html\>/g,"").
+		replace(/<script((?:.|\n)*?)<\/script\>/g,"");
+	var t = this.autoLinkWikiWords() ? 0 : 1;
+	var tiddlerLinkRegExp = t==0 ? config.textPrimitives.tiddlerAnyLinkRegExp : config.textPrimitives.tiddlerForcedLinkRegExp;
+	tiddlerLinkRegExp.lastIndex = 0;
+	var formatMatch = tiddlerLinkRegExp.exec(text);
+	while(formatMatch) {
+		var lastIndex = tiddlerLinkRegExp.lastIndex;
+		if(t==0 && formatMatch[1] && formatMatch[1] != this.title) {
+			// wikiWordLink
+			if(formatMatch.index > 0) {
+				var preRegExp = new RegExp(config.textPrimitives.unWikiLink+"|"+config.textPrimitives.anyLetter,"mg");
+				preRegExp.lastIndex = formatMatch.index-1;
+				var preMatch = preRegExp.exec(text);
+				if(preMatch.index != formatMatch.index-1)
+					this.links.pushUnique(formatMatch[1]);
+			} else {
+				this.links.pushUnique(formatMatch[1]);
+			}
+		}
+		else if(formatMatch[2-t] && !config.formatterHelpers.isExternalLink(formatMatch[3-t])) // titledBrackettedLink
+			this.links.pushUnique(formatMatch[3-t]);
+		else if(formatMatch[4-t] && formatMatch[4-t] != this.title) // brackettedLink
+			this.links.pushUnique(formatMatch[4-t]);
+		//# Do not add link if match urlPattern (formatMatch[5-t])
+		tiddlerLinkRegExp.lastIndex = lastIndex;
+		formatMatch = tiddlerLinkRegExp.exec(text);
+	}
+	this.linksUpdated = true;
+};
+
+Tiddler.prototype.getSubtitle = function()
+{
+	var modifier = this.modifier;
+	if(!modifier)
+		modifier = config.messages.subtitleUnknown || "";
+	var modified = this.modified;
+	if(modified)
+		modified = modified.toLocaleString();
+	else
+		modified = config.messages.subtitleUnknown || "";
+	var f = config.messages.tiddlerLinkTooltip || "%0 - %1, %2";
+	return f.format([this.title,modifier,modified]);
+};
+
+Tiddler.prototype.isReadOnly = function()
+{
+	return readOnly;
+};
+
+Tiddler.prototype.autoLinkWikiWords = function()
+{
+	return !(this.isTagged("systemConfig") || this.isTagged("excludeMissing"));
+};
+
+Tiddler.prototype.getServerType = function()
+{
+	var serverType = null;
+	if(this.fields['server.type'])
+		serverType = this.fields['server.type'];
+	if(!serverType)
+		serverType = this.fields['wikiformat'];
+	if(serverType && !config.adaptors[serverType])
+		serverType = null;
+	return serverType;
+};
+
+Tiddler.prototype.getAdaptor = function()
+{
+	var serverType = this.getServerType();
+	return serverType ? new config.adaptors[serverType]() : null;
+};
+
diff --git a/test/data/tiddlywiki/js/TiddlerFields.js b/test/data/tiddlywiki/js/TiddlerFields.js
new file mode 100755
index 000000000..338475459
--- /dev/null
+++ b/test/data/tiddlywiki/js/TiddlerFields.js
@@ -0,0 +1,173 @@
+// Returns true if path is a valid field name (path),
+// i.e. a sequence of identifiers, separated by "."
+TiddlyWiki.isValidFieldName = function(name)
+{
+	var match = /[a-zA-Z_]\w*(\.[a-zA-Z_]\w*)*/.exec(name);
+	return match && (match[0] == name);
+};
+
+// Throws an exception when name is not a valid field name.
+TiddlyWiki.checkFieldName = function(name)
+{
+	if(!TiddlyWiki.isValidFieldName(name))
+		throw config.messages.invalidFieldName.format([name]);
+};
+
+function StringFieldAccess(n,readOnly)
+{
+	this.set = readOnly ?
+			function(t,v) {if(v != t[n]) throw config.messages.fieldCannotBeChanged.format([n]);} :
+			function(t,v) {if(v != t[n]) {t[n] = v; return true;}};
+	this.get = function(t) {return t[n];};
+}
+
+function DateFieldAccess(n)
+{
+	this.set = function(t,v) {
+		var d = v instanceof Date ? v : Date.convertFromYYYYMMDDHHMM(v);
+		if(d != t[n]) {
+			t[n] = d; return true;
+		}
+	};
+	this.get = function(t) {return t[n].convertToYYYYMMDDHHMM();};
+}
+
+function LinksFieldAccess(n)
+{
+	this.set = function(t,v) {
+		var s = (typeof v == "string") ? v.readBracketedList() : v;
+		if(s.toString() != t[n].toString()) {
+			t[n] = s; return true;
+		}
+	};
+	this.get = function(t) {return String.encodeTiddlyLinkList(t[n]);};
+}
+
+TiddlyWiki.standardFieldAccess = {
+	// The set functions return true when setting the data has changed the value.
+	"title":    new StringFieldAccess("title",true),
+	// Handle the "tiddler" field name as the title
+	"tiddler":  new StringFieldAccess("title",true),
+	"text":     new StringFieldAccess("text"),
+	"modifier": new StringFieldAccess("modifier"),
+	"modified": new DateFieldAccess("modified"),
+	"creator":  new StringFieldAccess("creator"),
+	"created":  new DateFieldAccess("created"),
+	"tags":     new LinksFieldAccess("tags")
+};
+
+TiddlyWiki.isStandardField = function(name)
+{
+	return TiddlyWiki.standardFieldAccess[name] != undefined;
+};
+
+// Sets the value of the given field of the tiddler to the value.
+// Setting an ExtendedField's value to null or undefined removes the field.
+// Setting a namespace to undefined removes all fields of that namespace.
+// The fieldName is case-insensitive.
+// All values will be converted to a string value.
+TiddlyWiki.prototype.setValue = function(tiddler,fieldName,value)
+{
+	TiddlyWiki.checkFieldName(fieldName);
+	var t = this.resolveTiddler(tiddler);
+	if(!t)
+		return;
+	fieldName = fieldName.toLowerCase();
+	var isRemove = (value === undefined) || (value === null);
+	var accessor = TiddlyWiki.standardFieldAccess[fieldName];
+	if(accessor) {
+		if(isRemove)
+			// don't remove StandardFields
+			return;
+		var h = TiddlyWiki.standardFieldAccess[fieldName];
+		if(!h.set(t,value))
+			return;
+	} else {
+		var oldValue = t.fields[fieldName];
+		if(isRemove) {
+			if(oldValue !== undefined) {
+				// deletes a single field
+				delete t.fields[fieldName];
+			} else {
+				// no concrete value is defined for the fieldName
+				// so we guess this is a namespace path.
+				// delete all fields in a namespace
+				var re = new RegExp("^"+fieldName+"\\.");
+				var dirty = false;
+				var n;
+				for(n in t.fields) {
+					if(n.match(re)) {
+						delete t.fields[n];
+						dirty = true;
+					}
+				}
+				if(!dirty)
+					return;
+			}
+		} else {
+			// the "normal" set case. value is defined (not null/undefined)
+			// For convenience provide a nicer conversion Date->String
+			value = value instanceof Date ? value.convertToYYYYMMDDHHMMSSMMM() : String(value);
+			if(oldValue == value)
+				return;
+			t.fields[fieldName] = value;
+		}
+	}
+	// When we are here the tiddler/store really was changed.
+	this.notify(t.title,true);
+	if(!fieldName.match(/^temp\./))
+		this.setDirty(true);
+};
+
+// Returns the value of the given field of the tiddler.
+// The fieldName is case-insensitive.
+// Will only return String values (or undefined).
+TiddlyWiki.prototype.getValue = function(tiddler,fieldName)
+{
+	var t = this.resolveTiddler(tiddler);
+	if(!t)
+		return undefined;
+	if(fieldName.indexOf(config.textPrimitives.sectionSeparator) === 0 || fieldName.indexOf(config.textPrimitives.sliceSeparator) === 0) {
+		var sliceType = fieldName.substr(0, 2);
+		var sliceName = fieldName.substring(2);
+		return store.getTiddlerText("%0%1%2".format(t.title,sliceType,sliceName));
+	} else {
+		fieldName = fieldName.toLowerCase();
+		var accessor = TiddlyWiki.standardFieldAccess[fieldName];
+		if(accessor) {
+			return accessor.get(t);
+		}
+	}
+	return t.fields[fieldName];
+};
+
+// Calls the callback function for every field in the tiddler.
+// When callback function returns a non-false value the iteration stops
+// and that value is returned.
+// The order of the fields is not defined.
+// @param callback a function(tiddler,fieldName,value).
+TiddlyWiki.prototype.forEachField = function(tiddler,callback,onlyExtendedFields)
+{
+	var t = this.resolveTiddler(tiddler);
+	if(!t)
+		return undefined;
+	var n,result;
+	for(n in t.fields) {
+		result = callback(t,n,t.fields[n]);
+		if(result)
+			return result;
+		}
+	if(onlyExtendedFields)
+		return undefined;
+	for(n in TiddlyWiki.standardFieldAccess) {
+		if(n != "tiddler") {
+			// even though the "title" field can also be referenced through the name "tiddler"
+			// we only visit this field once.
+			result = callback(t,n,TiddlyWiki.standardFieldAccess[n].get(t));
+			if(result)
+				return result;
+		}
+	}
+	return undefined;
+};
+
diff --git a/test/data/tiddlywiki/js/TiddlyWiki.js b/test/data/tiddlywiki/js/TiddlyWiki.js
new file mode 100755
index 000000000..1adc24836
--- /dev/null
+++ b/test/data/tiddlywiki/js/TiddlyWiki.js
@@ -0,0 +1,643 @@
+//--
+//-- TiddlyWiki instance contains TiddlerS
+//--
+
+function TiddlyWiki(params)
+{
+	var tiddlers = {}; // Hashmap by name of tiddlers
+	if(params && params.config) {
+		this.config = config;
+	}
+	this.tiddlersUpdated = false;
+	this.namedNotifications = []; // Array of {name:,notify:} of notification functions
+	this.notificationLevel = 0;
+	this.slices = {}; // map tiddlerName->(map sliceName->sliceValue). Lazy.
+	this.clear = function() {
+		tiddlers = {};
+		this.setDirty(false);
+	};
+	this.fetchTiddler = function(title) {
+		var t = tiddlers[title];
+		return t instanceof Tiddler ? t : null;
+	};
+	this.deleteTiddler = function(title) {
+		delete this.slices[title];
+		delete tiddlers[title];
+	};
+	this.addTiddler = function(tiddler) {
+		delete this.slices[tiddler.title];
+		tiddlers[tiddler.title] = tiddler;
+	};
+	this.forEachTiddler = function(callback) {
+		var t;
+		for(t in tiddlers) {
+			var tiddler = tiddlers[t];
+			if(tiddler instanceof Tiddler)
+				callback.call(this,t,tiddler);
+		}
+	};
+}
+
+//# Set the dirty flag
+TiddlyWiki.prototype.setDirty = function(dirty)
+{
+	this.dirty = dirty;
+};
+
+TiddlyWiki.prototype.isDirty = function()
+{
+	return this.dirty;
+};
+
+TiddlyWiki.prototype.tiddlerExists = function(title)
+{
+	var t = this.fetchTiddler(title);
+	return t != undefined;
+};
+
+TiddlyWiki.prototype.isShadowTiddler = function(title)
+{
+	return config.shadowTiddlers[title] === undefined ? false : true;
+};
+
+TiddlyWiki.prototype.createTiddler = function(title)
+{
+	var tiddler = this.fetchTiddler(title);
+	if(!tiddler) {
+		tiddler = new Tiddler(title);
+		this.addTiddler(tiddler);
+		this.setDirty(true);
+	}
+	return tiddler;
+};
+
+TiddlyWiki.prototype.getTiddler = function(title)
+{
+	var t = this.fetchTiddler(title);
+	if(t != undefined)
+		return t;
+	else
+		return null;
+};
+
+TiddlyWiki.prototype.getShadowTiddlerText = function(title)
+{
+	if(typeof config.shadowTiddlers[title] == "string")
+		return config.shadowTiddlers[title];
+	else
+		return "";
+};
+
+// Retrieve tiddler contents
+//# Supports tiddler slices or sections, encoded in {{{title}}} argument using
+//# the respective separator characters ({{{::}}} or {{{##}}}).
+TiddlyWiki.prototype.getTiddlerText = function(title,defaultText)
+{
+	if(!title)
+		return defaultText;
+	var pos = title.indexOf(config.textPrimitives.sectionSeparator);
+	var section = null;
+	if(pos != -1) {
+		section = title.substr(pos + config.textPrimitives.sectionSeparator.length);
+		title = title.substr(0,pos);
+	}
+	pos = title.indexOf(config.textPrimitives.sliceSeparator);
+	if(pos != -1) {
+		var slice = this.getTiddlerSlice(title.substr(0,pos),title.substr(pos + config.textPrimitives.sliceSeparator.length));
+		if(slice)
+			return slice;
+	}
+	var tiddler = this.fetchTiddler(title);
+	var text = tiddler ? tiddler.text : null;
+	if(!tiddler && this.isShadowTiddler(title)) {
+		text = this.getShadowTiddlerText(title);
+	}
+	if(text) {
+		if(!section)
+			return text;
+		var re = new RegExp("(^!{1,6}[ \t]*" + section.escapeRegExp() + "[ \t]*\n)","mg");
+		re.lastIndex = 0;
+		var match = re.exec(text);
+		if(match) {
+			var t = text.substr(match.index+match[1].length);
+			var re2 = /^!/mg;
+			re2.lastIndex = 0;
+			match = re2.exec(t); //# search for the next heading
+			if(match)
+				t = t.substr(0,match.index-1);//# don't include final \n
+			return t;
+		}
+		return defaultText;
+	}
+	if(defaultText != undefined)
+		return defaultText;
+	return null;
+};
+
+TiddlyWiki.prototype.getRecursiveTiddlerText = function(title,defaultText,depth)
+{
+	var bracketRegExp = new RegExp("(?:\\[\\[([^\\]]+)\\]\\])","mg");
+	var text = this.getTiddlerText(title,null);
+	if(text == null)
+		return defaultText;
+	var textOut = [];
+	var match,lastPos = 0;
+	do {
+		match = bracketRegExp.exec(text);
+		if(match) {
+			textOut.push(text.substr(lastPos,match.index-lastPos));
+			if(match[1]) {
+				if(depth <= 0)
+					textOut.push(match[1]);
+				else
+					textOut.push(this.getRecursiveTiddlerText(match[1],"",depth-1));
+			}
+			lastPos = match.index + match[0].length;
+		} else {
+			textOut.push(text.substr(lastPos));
+		}
+	} while(match);
+	return textOut.join("");
+};
+
+//TiddlyWiki.prototype.slicesRE = /(?:^([\'\/]{0,2})~?([\.\w]+)\:\1[\t\x20]*([^\n]+)[\t\x20]*$)|(?:^\|([\'\/]{0,2})~?([\.\w]+)\:?\4\|[\t\x20]*([^\n]+)[\t\x20]*\|$)/gm;
+TiddlyWiki.prototype.slicesRE = /(?:^([\'\/]{0,2})~?([\.\w]+)\:\1[\t\x20]*([^\n]*)[\t\x20]*$)|(?:^\|([\'\/]{0,2})~?([\.\w]+)\:?\4\|[\t\x20]*([^\|\n]*)[\t\x20]*\|$)/gm;
+// @internal
+TiddlyWiki.prototype.calcAllSlices = function(title)
+{
+	var slices = {};
+	var text = this.getTiddlerText(title,"");
+	this.slicesRE.lastIndex = 0;
+	var m = this.slicesRE.exec(text);
+	while(m) {
+		if(m[2])
+			slices[m[2]] = m[3];
+		else
+			slices[m[5]] = m[6];
+		m = this.slicesRE.exec(text);
+	}
+	return slices;
+};
+
+// Returns the slice of text of the given name
+//#
+//# A text slice is a substring in the tiddler's text that is defined
+//# either like this
+//#    aName:  textSlice
+//# or
+//#    |aName:| textSlice |
+//# or
+//#    |aName| textSlice |
+//#
+//# In the text the name (or name:) may be decorated with '' or //
+//# ie this would also a valid text slice:
+//#
+//#    |''aName:''| textSlice |
+//#
+//# @param name should only contain "word characters" (i.e. "a-ZA-Z_0-9")
+//# @return [may be undefined] the (trimmed) text of the specified slice.
+TiddlyWiki.prototype.getTiddlerSlice = function(title,sliceName)
+{
+	var slices = this.slices[title];
+	if(!slices) {
+		slices = this.calcAllSlices(title);
+		this.slices[title] = slices;
+	}
+	return slices[sliceName];
+};
+
+// Build an hashmap of the specified named slices of a tiddler
+TiddlyWiki.prototype.getTiddlerSlices = function(title,sliceNames)
+{
+	var t,r = {};
+	for(t=0; t<sliceNames.length; t++) {
+		var slice = this.getTiddlerSlice(title,sliceNames[t]);
+		if(slice)
+			r[sliceNames[t]] = slice;
+	}
+	return r;
+};
+
+TiddlyWiki.prototype.suspendNotifications = function()
+{
+	this.notificationLevel--;
+};
+
+TiddlyWiki.prototype.resumeNotifications = function()
+{
+	this.notificationLevel++;
+};
+
+// Invoke the notification handlers for a particular tiddler
+TiddlyWiki.prototype.notify = function(title,doBlanket)
+{
+	if(!this.notificationLevel) {
+	    var t;
+		for(t=0; t<this.namedNotifications.length; t++) {
+			var n = this.namedNotifications[t];
+			if((n.name == null && doBlanket) || (n.name == title))
+				n.notify(title);
+		}
+	}
+};
+
+// Invoke the notification handlers for all tiddlers
+TiddlyWiki.prototype.notifyAll = function()
+{
+	if(!this.notificationLevel) {
+	    var t;
+		for(t=0; t<this.namedNotifications.length; t++) {
+			var n = this.namedNotifications[t];
+			if(n.name)
+				n.notify(n.name);
+		}
+	}
+};
+
+// Add a notification handler to a tiddler
+TiddlyWiki.prototype.addNotification = function(title,fn)
+{
+	var i;
+	for(i=0; i<this.namedNotifications.length; i++) {
+		if((this.namedNotifications[i].name == title) && (this.namedNotifications[i].notify == fn))
+			return this;
+	}
+	this.namedNotifications.push({name: title, notify: fn});
+	return this;
+};
+
+TiddlyWiki.prototype.removeTiddler = function(title)
+{
+	var tiddler = this.fetchTiddler(title);
+	if(tiddler) {
+		this.deleteTiddler(title);
+		this.notify(title,true);
+		this.setDirty(true);
+	}
+};
+
+// Reset the sync status of a freshly synced tiddler
+TiddlyWiki.prototype.resetTiddler = function(title)
+{
+	var tiddler = this.fetchTiddler(title);
+	if(tiddler) {
+		tiddler.clearChangeCount();
+		this.notify(title,true);
+		this.setDirty(true);
+	}
+};
+
+TiddlyWiki.prototype.setTiddlerTag = function(title,status,tag)
+{
+	var tiddler = this.fetchTiddler(title);
+	if(tiddler) {
+		var t = tiddler.tags.indexOf(tag);
+		if(t != -1)
+			tiddler.tags.splice(t,1);
+		if(status)
+			tiddler.tags.push(tag);
+		tiddler.changed();
+		tiddler.incChangeCount();
+		this.notify(title,true);
+		this.setDirty(true);
+	}
+};
+
+TiddlyWiki.prototype.addTiddlerFields = function(title,fields)
+{
+	var tiddler = this.fetchTiddler(title);
+	if(!tiddler)
+		return;
+	merge(tiddler.fields,fields);
+	tiddler.changed();
+	tiddler.incChangeCount();
+	this.notify(title,true);
+	this.setDirty(true);
+};
+
+// Store tiddler in TiddlyWiki instance
+//#
+//# optionally accepts a Tiddler instance as first argument, rendering
+//# subsequent arguments obsolete
+//#
+//# existing tiddlers can be renamed using the newTitle argument
+//#
+//# created and modified arguments are Date objects,
+//# tags argument is an array of strings
+//#
+//# fields should retain existing tiddler's extended fields
+//#
+//# NB: Does not trigger autoSaveChanges.
+TiddlyWiki.prototype.saveTiddler = function(title,newTitle,newBody,modifier,modified,tags,fields,clearChangeCount,created,creator)
+{
+	var tiddler;
+	if(title instanceof Tiddler) {
+		tiddler = title;
+		title = tiddler.title;
+		newTitle = title;
+	} else {
+		tiddler = this.fetchTiddler(title);
+		if(tiddler) {
+			created = created || tiddler.created; // Preserve created date
+			creator = creator || tiddler.creator;
+			this.deleteTiddler(title);
+		} else {
+			created = created || modified;
+			tiddler = new Tiddler();
+		}
+		fields = merge(merge({},fields),config.defaultCustomFields,true);
+		tiddler.set(newTitle,newBody,modifier,modified,tags,created,fields,creator);
+	}
+	this.addTiddler(tiddler);
+	if(clearChangeCount)
+		tiddler.clearChangeCount();
+	else
+		tiddler.incChangeCount();
+	if(title != newTitle)
+		this.notify(title,true);
+	this.notify(newTitle,true);
+	this.setDirty(true);
+	return tiddler;
+};
+
+TiddlyWiki.prototype.incChangeCount = function(title)
+{
+	var tiddler = this.fetchTiddler(title);
+	if(tiddler)
+		tiddler.incChangeCount();
+};
+
+TiddlyWiki.prototype.getLoader = function()
+{
+	if(!this.loader)
+		this.loader = new TW21Loader();
+	return this.loader;
+};
+
+TiddlyWiki.prototype.getSaver = function()
+{
+	if(!this.saver)
+		this.saver = new TW21Saver();
+	return this.saver;
+};
+
+// Return all tiddlers formatted as an HTML string
+TiddlyWiki.prototype.allTiddlersAsHtml = function()
+{
+	return this.getSaver().externalize(store);
+};
+
+// Load contents of a TiddlyWiki from an HTML DIV
+TiddlyWiki.prototype.loadFromDiv = function(src,idPrefix,noUpdate)
+{
+	this.idPrefix = idPrefix;
+	var storeElem = (typeof src == "string") ? document.getElementById(src) : src;
+	if(!storeElem)
+		return;
+	var tiddlers = this.getLoader().loadTiddlers(this,storeElem.childNodes);
+	this.setDirty(false);
+	if(!noUpdate) {
+		var i;
+		for(i = 0;i<tiddlers.length; i++)
+			tiddlers[i].changed();
+	}
+	jQuery(document).trigger("loadTiddlers");
+};
+
+// Load contents of a TiddlyWiki from a string
+// Returns null if there's an error
+TiddlyWiki.prototype.importTiddlyWiki = function(text)
+{
+	var posDiv = locateStoreArea(text);
+	if(!posDiv)
+		return null;
+	var content = "<" + "html><" + "body>" + text.substring(posDiv[0],posDiv[1] + endSaveArea.length) + "<" + "/body><" + "/html>";
+	// Create the iframe
+	var iframe = document.createElement("iframe");
+	iframe.style.display = "none";
+	document.body.appendChild(iframe);
+	var doc = iframe.document;
+	if(iframe.contentDocument)
+		doc = iframe.contentDocument; // For NS6
+	else if(iframe.contentWindow)
+		doc = iframe.contentWindow.document; // For IE5.5 and IE6
+	// Put the content in the iframe
+	doc.open();
+	doc.writeln(content);
+	doc.close();
+	// Load the content into a TiddlyWiki() object
+	var storeArea = doc.getElementById("storeArea");
+	this.loadFromDiv(storeArea,"store");
+	// Get rid of the iframe
+	iframe.parentNode.removeChild(iframe);
+	return this;
+};
+
+TiddlyWiki.prototype.updateTiddlers = function()
+{
+	this.tiddlersUpdated = true;
+	this.forEachTiddler(function(title,tiddler) {
+		tiddler.changed();
+	});
+};
+
+// Return an array of tiddlers matching a search regular expression
+TiddlyWiki.prototype.search = function(searchRegExp,sortField,excludeTag,match)
+{
+	var candidates = this.reverseLookup("tags",excludeTag,!!match);
+	var t,results = [];
+	for(t=0; t<candidates.length; t++) {
+		if((candidates[t].title.search(searchRegExp) != -1) || (candidates[t].text.search(searchRegExp) != -1))
+			results.push(candidates[t]);
+	}
+	if(!sortField)
+		sortField = "title";
+	results.sort(function(a,b) {return a[sortField] < b[sortField] ? -1 : (a[sortField] == b[sortField] ? 0 : +1);});
+	return results;
+};
+
+// Returns a list of all tags in use
+//   excludeTag - if present, excludes tags that are themselves tagged with excludeTag
+// Returns an array of arrays where [tag][0] is the name of the tag and [tag][1] is the number of occurances
+TiddlyWiki.prototype.getTags = function(excludeTag)
+{
+	var results = [];
+	this.forEachTiddler(function(title,tiddler) {
+	    var g,c;
+		for(g=0; g<tiddler.tags.length; g++) {
+			var tag = tiddler.tags[g];
+			var n = true;
+			for(c=0; c<results.length; c++) {
+				if(results[c][0] == tag) {
+					n = false;
+					results[c][1]++;
+				}
+			}
+			if(n && excludeTag) {
+				var t = this.fetchTiddler(tag);
+				if(t && t.isTagged(excludeTag))
+					n = false;
+			}
+			if(n)
+				results.push([tag,1]);
+		}
+	});
+	results.sort(function(a,b) {return a[0].toLowerCase() < b[0].toLowerCase() ? -1 : (a[0].toLowerCase() == b[0].toLowerCase() ? 0 : +1);});
+	return results;
+};
+
+// Return an array of the tiddlers that are tagged with a given tag
+TiddlyWiki.prototype.getTaggedTiddlers = function(tag,sortField)
+{
+	return this.reverseLookup("tags",tag,true,sortField);
+};
+
+TiddlyWiki.prototype.getValueTiddlers = function(field,value,sortField)
+{
+	return this.reverseLookup(field,value,true,sortField);
+};
+
+// Return an array of the tiddlers that link to a given tiddler
+TiddlyWiki.prototype.getReferringTiddlers = function(title,unusedParameter,sortField)
+{
+	if(!this.tiddlersUpdated)
+		this.updateTiddlers();
+	return this.reverseLookup("links",title,true,sortField);
+};
+
+// Return an array of the tiddlers that do or do not have a specified entry in the specified storage array (ie, "links" or "tags")
+// lookupMatch == true to match tiddlers, false to exclude tiddlers
+TiddlyWiki.prototype.reverseLookup = function(lookupField,lookupValue,lookupMatch,sortField)
+{
+	var results = [];
+	this.forEachTiddler(function(title,tiddler) {
+		var f = !lookupMatch;
+		var values;
+		if(["links", "tags"].contains(lookupField)) {
+			values = tiddler[lookupField];
+		} else {
+			var accessor = TiddlyWiki.standardFieldAccess[lookupField];
+			if(accessor) {
+				values = [ accessor.get(tiddler) ];
+			} else {
+				values = tiddler.fields[lookupField] ? [tiddler.fields[lookupField]] : [];
+			}
+		}
+		var lookup;
+		for(lookup=0; lookup<values.length; lookup++) {
+			if(values[lookup] == lookupValue)
+				f = lookupMatch;
+		}
+		if(f)
+			results.push(tiddler);
+	});
+	if(!sortField)
+		sortField = "title";
+	return this.sortTiddlers(results,sortField);
+};
+
+// Return the tiddlers as a sorted array
+TiddlyWiki.prototype.getTiddlers = function(field,excludeTag)
+{
+	var results = [];
+	this.forEachTiddler(function(title,tiddler) {
+		if(excludeTag == undefined || !tiddler.isTagged(excludeTag))
+			results.push(tiddler);
+	});
+	if(field)
+		results.sort(function(a,b) {return a[field] < b[field] ? -1 : (a[field] == b[field] ? 0 : +1);});
+	return results;
+};
+
+// Return array of names of tiddlers that are referred to but not defined
+TiddlyWiki.prototype.getMissingLinks = function()
+{
+	if(!this.tiddlersUpdated)
+		this.updateTiddlers();
+	var results = [];
+	this.forEachTiddler(function (title,tiddler) {
+		if(tiddler.isTagged("excludeMissing") || tiddler.isTagged("systemConfig"))
+			return;
+		var n;
+		for(n=0; n<tiddler.links.length;n++) {
+			var link = tiddler.links[n];
+			if(this.getTiddlerText(link,null) == null && !this.isShadowTiddler(link) && !config.macros[link])
+				results.pushUnique(link);
+		}
+	});
+	results.sort();
+	return results;
+};
+
+// Return an array of names of tiddlers that are defined but not referred to
+TiddlyWiki.prototype.getOrphans = function()
+{
+	var results = [];
+	this.forEachTiddler(function (title,tiddler) {
+		if(this.getReferringTiddlers(title).length == 0 && !tiddler.isTagged("excludeLists"))
+			results.push(title);
+	});
+	results.sort();
+	return results;
+};
+
+// Return an array of names of all the shadow tiddlers
+TiddlyWiki.prototype.getShadowed = function()
+{
+	var t,results = [];
+	for(t in config.shadowTiddlers) {
+		if(this.isShadowTiddler(t))
+			results.push(t);
+	}
+	results.sort();
+	return results;
+};
+
+// Return an array of tiddlers that have been touched since they were downloaded or created
+TiddlyWiki.prototype.getTouched = function()
+{
+	var results = [];
+	this.forEachTiddler(function(title,tiddler) {
+		if(tiddler.isTouched())
+			results.push(tiddler);
+		});
+	results.sort();
+	return results;
+};
+
+// Resolves a Tiddler reference or tiddler title into a Tiddler object, or null if it doesn't exist
+TiddlyWiki.prototype.resolveTiddler = function(tiddler)
+{
+	var t = (typeof tiddler == "string") ? this.getTiddler(tiddler) : tiddler;
+	return t instanceof Tiddler ? t : null;
+};
+
+// Sort a list of tiddlers
+//# tiddlers - array of Tiddler() objects to be sorted
+//# field - name of field (or extended field) to sort by;
+//#         precede with "+" for ascending sort (the default)
+//#			or "-" for descending sort
+TiddlyWiki.prototype.sortTiddlers = function(tiddlers,field)
+{
+	var asc = +1;
+	switch(field.substr(0,1)) {
+	case "-":
+		asc = -1;
+		field = field.substr(1);
+		break;
+	case "+":
+		field = field.substr(1);
+		break;
+	}
+	if(TiddlyWiki.standardFieldAccess[field]) {
+		if(field=="title") {
+			tiddlers.sort(function(a,b) {return a[field].toLowerCase() < b[field].toLowerCase() ? -asc : (a[field].toLowerCase() == b[field].toLowerCase() ? 0 : asc);});
+		} else {
+			tiddlers.sort(function(a,b) {return a[field] < b[field] ? -asc : (a[field] == b[field] ? 0 : asc);});
+		}
+	} else {
+		tiddlers.sort(function(a,b) {return a.fields[field] < b.fields[field] ? -asc : (a.fields[field] == b.fields[field] ? 0 : +asc);});
+	}
+	return tiddlers;
+};
+
diff --git a/test/data/tiddlywiki/js/Toolbar.js b/test/data/tiddlywiki/js/Toolbar.js
new file mode 100755
index 000000000..25f405500
--- /dev/null
+++ b/test/data/tiddlywiki/js/Toolbar.js
@@ -0,0 +1,161 @@
+//--
+//-- Tiddler toolbar
+//--
+
+// Create a toolbar command button
+//#  place - parent DOM element
+//#  command - reference to config.commands[] member -or- name of member
+//#  tiddler - reference to tiddler that toolbar applies to
+//#  className - the class to give the button
+config.macros.toolbar.createCommand = function(place,commandName,tiddler,className)
+{
+	if(typeof commandName != "string") {
+		var c = null;
+		var t;
+		for(t in config.commands) {
+			if(config.commands[t] == commandName)
+				c = t;
+		}
+		commandName = c;
+	}
+	if((tiddler instanceof Tiddler) && (typeof commandName == "string")) {
+		var command = config.commands[commandName];
+		if(command.isEnabled ? command.isEnabled(tiddler) : this.isCommandEnabled(command,tiddler)) {
+			var text = command.getText ? command.getText(tiddler) : this.getCommandText(command,tiddler);
+			var tooltip = command.getTooltip ? command.getTooltip(tiddler) : this.getCommandTooltip(command,tiddler);
+			var cmd = command.type == "popup" ? this.onClickPopup : this.onClickCommand;
+			var btn = createTiddlyButton(null,text,tooltip,cmd);
+			btn.setAttribute("commandName",commandName);
+			btn.setAttribute("tiddler",tiddler.title);
+			jQuery(btn).addClass("command_" + commandName);
+			if(className)
+				jQuery(btn).addClass(className);
+			place.appendChild(btn);
+		}
+	}
+};
+
+config.macros.toolbar.isCommandEnabled = function(command,tiddler)
+{
+	var title = tiddler.title;
+	var ro = tiddler.isReadOnly();
+	var shadow = store.isShadowTiddler(title) && !store.tiddlerExists(title);
+	return (!ro || (ro && !command.hideReadOnly)) && !(shadow && command.hideShadow);
+};
+
+config.macros.toolbar.getCommandText = function(command,tiddler)
+{
+	return (tiddler.isReadOnly() && command.readOnlyText) || command.text;
+};
+
+config.macros.toolbar.getCommandTooltip = function(command,tiddler)
+{
+	return (tiddler.isReadOnly() && command.readOnlyTooltip) || command.tooltip;
+};
+
+config.macros.toolbar.onClickCommand = function(ev)
+{
+	var e = ev || window.event;
+	e.cancelBubble = true;
+	if(e.stopPropagation) e.stopPropagation();
+	var command = config.commands[this.getAttribute("commandName")];
+	return command.handler(e,this,this.getAttribute("tiddler"));
+};
+
+config.macros.toolbar.onClickPopup = function(ev)
+{
+	var e = ev || window.event;
+	e.cancelBubble = true;
+	if(e.stopPropagation) e.stopPropagation();
+	var popup = Popup.create(this);
+	var command = config.commands[this.getAttribute("commandName")];
+	var title = this.getAttribute("tiddler");
+	popup.setAttribute("tiddler",title);
+	command.handlePopup(popup,title);
+	Popup.show();
+	return false;
+};
+
+// Invoke the first command encountered from a given place that is tagged with a specified class
+config.macros.toolbar.invokeCommand = function(place,className,event)
+{
+	var children = place.getElementsByTagName("a");
+	var t;
+	for(t=0; t<children.length; t++) {
+		var c = children[t];
+		if(jQuery(c).hasClass(className) && c.getAttribute && c.getAttribute("commandName")) {
+			if(c.onclick instanceof Function)
+				c.onclick.call(c,event);
+			break;
+		}
+	}
+};
+
+config.macros.toolbar.onClickMore = function(ev)
+{
+	var e = this.nextSibling;
+	e.style.display = "inline";
+	this.style.display = "none";
+	return false;
+};
+
+config.macros.toolbar.onClickLess = function(ev)
+{
+	var e = this.parentNode;
+	var m = e.previousSibling;
+	e.style.display = "none";
+	m.style.display = "inline";
+	return false;
+};
+
+config.macros.toolbar.handler = function(place,macroName,params,wikifier,paramString,tiddler)
+{
+	var t;
+	for(t=0; t<params.length; t++) {
+		var btn;
+		var c = params[t];
+		switch(c) {
+		case "!":
+			createTiddlyText(place,this.separator);
+			break;
+		case "*":
+			createTiddlyElement(place,"br");
+			break;
+		case "<":
+			btn = createTiddlyButton(place,this.lessLabel,this.lessPrompt,config.macros.toolbar.onClickLess);
+			jQuery(btn).addClass("lessCommand");
+			break;
+		case ">":
+			btn = createTiddlyButton(place,this.moreLabel,this.morePrompt,config.macros.toolbar.onClickMore);
+			jQuery(btn).addClass("moreCommand");
+			var e = createTiddlyElement(place,"span",null,"moreCommand");
+			e.style.display = "none";
+			place = e;
+			break;
+		default:
+			var className = "";
+			switch(c.substr(0,1)) {
+			case "+":
+				className = "defaultCommand";
+				c = c.substr(1);
+				break;
+			case "-":
+				className = "cancelCommand";
+				c = c.substr(1);
+				break;
+			}
+			if(config.commands[c]) {
+				this.createCommand(place,c,tiddler,className);
+			} else {
+				this.customCommand(place,c,wikifier,tiddler);
+			}
+			break;
+		}
+	}
+};
+
+// Overrideable function to extend toolbar handler
+config.macros.toolbar.customCommand = function(place,command,wikifier,tiddler)
+{
+};
+
diff --git a/test/data/tiddlywiki/js/Upgrade.js b/test/data/tiddlywiki/js/Upgrade.js
new file mode 100755
index 000000000..7399d5b30
--- /dev/null
+++ b/test/data/tiddlywiki/js/Upgrade.js
@@ -0,0 +1,117 @@
+//--
+//-- Upgrade macro
+//--
+
+config.macros.upgrade.handler = function(place)
+{
+	var w = new Wizard();
+	w.createWizard(place,this.wizardTitle);
+	w.addStep(this.step1Title,this.step1Html.format([this.source,this.source]));
+	w.setButtons([{caption: this.upgradeLabel, tooltip: this.upgradePrompt, onClick: this.onClickUpgrade}]);
+};
+
+config.macros.upgrade.onClickUpgrade = function(e)
+{
+	var me = config.macros.upgrade;
+	var w = new Wizard(this);
+	if(window.location.protocol != "file:") {
+		alert(me.errorCantUpgrade);
+		return false;
+	}
+	if(story.areAnyDirty() || store.isDirty()) {
+		alert(me.errorNotSaved);
+		return false;
+	}
+	var localPath = getLocalPath(document.location.toString());
+	var backupPath = getBackupPath(localPath,me.backupExtension);
+	w.setValue("backupPath",backupPath);
+	w.setButtons([],me.statusPreparingBackup);
+	var original = loadOriginal(localPath);
+	w.setButtons([],me.statusSavingBackup);
+	var backup = copyFile(backupPath,localPath);
+	if(!backup)
+		backup = saveFile(backupPath,original);
+	if(!backup) {
+		w.setButtons([],me.errorSavingBackup);
+		alert(me.errorSavingBackup);
+		return false;
+	}
+	w.setButtons([],me.statusLoadingCore);
+	var options = {
+		type:"GET",
+		url:me.source,
+		processData:false,
+		success:function(data,textStatus,jqXHR) {
+			me.onLoadCore(true,w,jqXHR.responseText,me.source,jqXHR);
+		},
+		error:function(jqXHR,textStatus,errorThrown) {
+			me.onLoadCore(false,w,null,me.source,jqXHR);
+		}
+	};
+	ajaxReq(options);
+	return false;
+};
+
+config.macros.upgrade.onLoadCore = function(status,params,responseText,url,xhr)
+{
+	var me = config.macros.upgrade;
+	var w = params;
+	var errMsg;
+	if(!status)
+		errMsg = me.errorLoadingCore;
+	var newVer = me.extractVersion(responseText);
+	if(!newVer)
+		errMsg = me.errorCoreFormat;
+	if(errMsg) {
+		w.setButtons([],errMsg);
+		alert(errMsg);
+		return;
+	}
+	var onStartUpgrade = function(e) {
+		w.setButtons([],me.statusSavingCore);
+		var localPath = getLocalPath(document.location.toString());
+		saveFile(localPath,responseText);
+		w.setButtons([],me.statusReloadingCore);
+		var backupPath = w.getValue("backupPath");
+		var newLoc = document.location.toString() + "?time=" + new Date().convertToYYYYMMDDHHMM() + "#upgrade:[[" + encodeURI(backupPath) + "]]";
+		window.setTimeout(function () {window.location = newLoc;},10);
+	};
+	var step2 = [me.step2Html_downgrade,me.step2Html_restore,me.step2Html_upgrade][compareVersions(version,newVer) + 1];
+	w.addStep(me.step2Title,step2.format([formatVersion(newVer),formatVersion(version)]));
+	w.setButtons([{caption: me.startLabel, tooltip: me.startPrompt, onClick: onStartUpgrade},{caption: me.cancelLabel, tooltip: me.cancelPrompt, onClick: me.onCancel}]);
+};
+
+config.macros.upgrade.onCancel = function(e)
+{
+	var me = config.macros.upgrade;
+	var w = new Wizard(this);
+	w.addStep(me.step3Title,me.step3Html);
+	w.setButtons([]);
+	return false;
+};
+
+config.macros.upgrade.extractVersion = function(upgradeFile)
+{
+	var re = /^var version = \{title: "([^"]+)", major: (\d+), minor: (\d+), revision: (\d+)(, beta: (\d+)){0,1}, date: new Date\("([^"]+)"\)/mg;
+	var m = re.exec(upgradeFile);
+	return m ? {title: m[1], major: m[2], minor: m[3], revision: m[4], beta: m[6], date: new Date(m[7])} : null;
+};
+
+function upgradeFrom(path)
+{
+	var importStore = new TiddlyWiki();
+	var tw = loadFile(path);
+	if(window.netscape !== undefined)
+		tw = convertUTF8ToUnicode(tw);
+	importStore.importTiddlyWiki(tw);
+	importStore.forEachTiddler(function(title,tiddler) {
+		if(!store.getTiddler(title)) {
+			store.addTiddler(tiddler);
+		}
+	});
+	refreshDisplay();
+	saveChanges(); //# To create appropriate Markup* sections
+	alert(config.messages.upgradeDone.format([formatVersion()]));
+	window.location = window.location.toString().substr(0,window.location.toString().lastIndexOf("?"));
+}
+
diff --git a/test/data/tiddlywiki/js/Utilities.js b/test/data/tiddlywiki/js/Utilities.js
new file mode 100755
index 000000000..f97569d1f
--- /dev/null
+++ b/test/data/tiddlywiki/js/Utilities.js
@@ -0,0 +1,285 @@
+//--
+//-- TiddlyWiki-specific utility functions
+//--
+
+// Returns TiddlyWiki version string
+function formatVersion(v)
+{
+	v = v || version;
+	return v.major + "." + v.minor + "." + v.revision +
+		(v.alpha ? " (alpha " + v.alpha + ")" : "") +
+		(v.beta ? " (beta " + v.beta + ")" : "");
+}
+
+//# Compares two TiddlyWiki version objects
+//# Returns +1 if v2 is later than v1
+//#          0 if v2 is the same as v1
+//#         -1 if v2 is earlier than v1
+//# version without a beta number is later than a version with a beta number
+function compareVersions(v1,v2)
+{
+	var x1,x2,i,a = ["major","minor","revision"];
+	for(i = 0; i<a.length; i++) {
+		x1 = v1[a[i]] || 0;
+		x2 = v2[a[i]] || 0;
+		if(x1<x2)
+			return 1;
+		if(x1>x2)
+			return -1;
+	}
+	x1 = v1.beta || 9999;
+	x2 = v2.beta || 9999;
+	if(x1<x2)
+		return 1;
+	return x1 > x2 ? -1 : 0;
+}
+
+function merge(dst,src,preserveExisting)
+{
+	var i;
+	for(i in src) {
+		if(!preserveExisting || dst[i] === undefined)
+			dst[i] = src[i];
+	}
+	return dst;
+}
+
+// Resolve the target object of an event
+function resolveTarget(e)
+{
+	var obj;
+	if(e.target)
+		obj = e.target;
+	else if(e.srcElement)
+		obj = e.srcElement;
+	if(obj.nodeType == 3) // defeat Safari bug
+		obj = obj.parentNode;
+	return obj;
+}
+
+// Returns a string containing the description of an exception, optionally prepended by a message
+function exceptionText(e,message)
+{
+	var s = e.description || e.toString();
+	return message ? "%0:\n%1".format([message,s]) : s;
+}
+
+// Displays an alert of an exception description with optional message
+function showException(e,message)
+{
+	alert(exceptionText(e,message));
+}
+
+function alertAndThrow(m)
+{
+	alert(m);
+	throw(m);
+}
+
+function glyph(name)
+{
+	var g = config.glyphs;
+	var b = g.currBrowser;
+	if(b == null) {
+		b = 0;
+		while(b < g.browsers.length-1 && !g.browsers[b]())
+			b++;
+		g.currBrowser = b;
+	}
+	if(!g.codes[name])
+		return "";
+	return g.codes[name][b];
+}
+
+function createTiddlyText(parent,text)
+{
+	return parent.appendChild(document.createTextNode(text));
+}
+
+function createTiddlyCheckbox(parent,caption,checked,onChange)
+{
+	var cb = document.createElement("input");
+	cb.setAttribute("type","checkbox");
+	cb.onclick = onChange;
+	parent.appendChild(cb);
+	cb.checked = checked;
+	cb.className = "chkOptionInput";
+	if(caption)
+		wikify(caption,parent);
+	return cb;
+}
+
+function createTiddlyElement(parent,element,id,className,text,attribs)
+{
+	var n,e = document.createElement(element);
+	if(className != null)
+		e.className = className;
+	if(id != null)
+		e.setAttribute("id",id);
+	if(text != null)
+		e.appendChild(document.createTextNode(text));
+	if(attribs) {
+		for(n in attribs) {
+			e.setAttribute(n,attribs[n]);
+		}
+	}
+	if(parent != null)
+		parent.appendChild(e);
+	return e;
+}
+
+function createTiddlyButton(parent,text,tooltip,action,className,id,accessKey,attribs)
+{
+	var i,btn = document.createElement("a");
+	btn.setAttribute("href","javascript:;");
+	if(action) {
+		btn.onclick = action;
+	}
+	if(tooltip)
+		btn.setAttribute("title",tooltip);
+	if(text)
+		btn.appendChild(document.createTextNode(text));
+	btn.className = className || "button";
+	if(id)
+		btn.id = id;
+	if(attribs) {
+		for(i in attribs) {
+			btn.setAttribute(i,attribs[i]);
+		}
+	}
+	if(parent)
+		parent.appendChild(btn);
+	if(accessKey)
+		btn.setAttribute("accessKey",accessKey);
+	return btn;
+}
+
+//# Create a link to an external resource
+//#   place - element where the link should be created
+//#   url - link target
+//#   label - link text (optional)
+function createExternalLink(place,url,label)
+{
+	var link = document.createElement("a");
+	link.className = "externalLink";
+	link.href = url;
+	var f = config.messages.externalLinkTooltip;
+	link.title = f ? f.format([url]) : url;
+	if(config.options.chkOpenInNewWindow)
+		link.target = "_blank";
+	place.appendChild(link);
+	if(label)
+		createTiddlyText(link, label);
+	return link;
+}
+
+function getTiddlyLinkInfo(title,currClasses)
+{
+	var classes = currClasses ? currClasses.split(" ") : [];
+	classes.pushUnique("tiddlyLink");
+	var tiddler = store.fetchTiddler(title);
+	var subTitle;
+	if(tiddler) {
+		subTitle = tiddler.getSubtitle();
+		classes.pushUnique("tiddlyLinkExisting");
+		classes.remove("tiddlyLinkNonExisting");
+		classes.remove("shadow");
+	} else {
+	    var f;
+		classes.remove("tiddlyLinkExisting");
+		classes.pushUnique("tiddlyLinkNonExisting");
+		if(store.isShadowTiddler(title)) {
+			f = config.messages.shadowedTiddlerToolTip;
+			classes.pushUnique("shadow");
+		} else {
+			f = config.messages.undefinedTiddlerToolTip;
+			classes.remove("shadow");
+		}
+		subTitle = f ? f.format([title]) : "";
+	}
+	if(typeof config.annotations[title]=="string")
+		subTitle = config.annotations[title];
+	return {classes: classes.join(" "),subTitle: subTitle};
+}
+
+// Event handler for clicking on a tiddly link
+function onClickTiddlerLink(ev)
+{
+	var e = ev || window.event;
+	var target = resolveTarget(e);
+	var link = target;
+	var title = null;
+	var fields = null;
+	var noToggle = null;
+	do {
+		title = link.getAttribute("tiddlyLink");
+		fields = link.getAttribute("tiddlyFields");
+		noToggle = link.getAttribute("noToggle");
+		link = link.parentNode;
+	} while(title == null && link != null);
+	if(!store.isShadowTiddler(title)) {
+		var f = fields ? fields.decodeHashMap() : {};
+		fields = String.encodeHashMap(merge(f,config.defaultCustomFields,true));
+	}
+	if(title) {
+		var toggling = e.metaKey || e.ctrlKey;
+		if(config.options.chkToggleLinks)
+			toggling = !toggling;
+		if(noToggle)
+			toggling = false;
+		if(store.getTiddler(title))
+			fields = null;
+		story.displayTiddler(target,title,null,true,null,fields,toggling);
+	}
+	clearMessage();
+	return false;
+}
+
+//# Create a link to a particular tiddler
+//#   place - element where the link should be created
+//#   title - title of target tiddler
+//#   includeText - flag for whether to include the title as the text of the link
+//#   className - custom CSS class for the link
+//#   linkedFromTiddler - tiddler from which to inherit extended fields
+//#   noToggle - flag to force the link to open the target, even if chkToggleLinks is on
+function createTiddlyLink(place,title,includeText,className,isStatic,linkedFromTiddler,noToggle)
+{
+	var title = jQuery.trim(title);
+	var text = includeText ? title : null;
+	var i = getTiddlyLinkInfo(title,className);
+	var btn = isStatic ? createExternalLink(place,store.getTiddlerText("SiteUrl",null) + "#" + title) : createTiddlyButton(place,text,i.subTitle,onClickTiddlerLink,i.classes);
+	if(isStatic)
+		btn.className += ' ' + className;
+	btn.setAttribute("refresh","link");
+	btn.setAttribute("tiddlyLink",title);
+	if(noToggle)
+		btn.setAttribute("noToggle","true");
+	if(linkedFromTiddler) {
+		var fields = linkedFromTiddler.getInheritedFields();
+		if(fields)
+			btn.setAttribute("tiddlyFields",fields);
+	}
+	return btn;
+}
+
+function refreshTiddlyLink(e,title)
+{
+	var i = getTiddlyLinkInfo(title,e.className);
+	e.className = i.classes;
+	e.title = i.subTitle;
+}
+
+function createTiddlyDropDown(place,onchange,options,defaultValue)
+{
+	var sel = createTiddlyElement(place,"select");
+	sel.onchange = onchange;
+	var t;
+	for(t=0; t<options.length; t++) {
+		var e = createTiddlyElement(sel,"option",null,null,options[t].caption);
+		e.value = options[t].name;
+		if(options[t].name == defaultValue)
+			e.selected = true;
+	}
+	return sel;
+}
+
diff --git a/test/data/tiddlywiki/js/UtilitiesPopup.js b/test/data/tiddlywiki/js/UtilitiesPopup.js
new file mode 100755
index 000000000..4d3346e4a
--- /dev/null
+++ b/test/data/tiddlywiki/js/UtilitiesPopup.js
@@ -0,0 +1,113 @@
+//--
+//-- TiddlyWiki-specific popup utility functions
+//--
+
+// Event handler for 'open all' on a tiddler popup
+function onClickTagOpenAll(ev)
+{
+	var tiddlers = store.getTaggedTiddlers(this.getAttribute("tag"));
+	var sortby = this.getAttribute("sortby");
+	if(sortby&&sortby.length) {
+		store.sortTiddlers(tiddlers,sortby);
+	}
+	story.displayTiddlers(this,tiddlers);
+	return false;
+}
+
+// Event handler for clicking on a tiddler tag
+function onClickTag(ev)
+{
+	var e = ev || window.event;
+	var popup = Popup.create(this);
+	jQuery(popup).addClass("taggedTiddlerList");
+	var tag = this.getAttribute("tag");
+	var title = this.getAttribute("tiddler");
+	if(popup && tag) {
+		var tagged = tag.indexOf("[")==-1 ? store.getTaggedTiddlers(tag) : store.filterTiddlers(tag);
+		var sortby = this.getAttribute("sortby");
+		if(sortby&&sortby.length) {
+			store.sortTiddlers(tagged,sortby);
+		}
+		var titles = [];
+		var r;
+		for(r=0;r<tagged.length;r++) {
+			if(tagged[r].title != title)
+				titles.push(tagged[r].title);
+		}
+		var lingo = config.views.wikified.tag;
+		if(titles.length > 0) {
+			var openAll = createTiddlyButton(createTiddlyElement(popup,"li"),lingo.openAllText.format([tag]),lingo.openAllTooltip,onClickTagOpenAll);
+			openAll.setAttribute("tag",tag);
+			openAll.setAttribute("sortby",sortby);
+			createTiddlyElement(createTiddlyElement(popup,"li",null,"listBreak"),"div");
+			for(r=0; r<titles.length; r++) {
+				createTiddlyLink(createTiddlyElement(popup,"li"),titles[r],true);
+			}
+		} else {
+			createTiddlyElement(popup,"li",null,"disabled",lingo.popupNone.format([tag]));
+		}
+		createTiddlyElement(createTiddlyElement(popup,"li",null,"listBreak"),"div");
+		var h = createTiddlyLink(createTiddlyElement(popup,"li"),tag,false);
+		createTiddlyText(h,lingo.openTag.format([tag]));
+	}
+	Popup.show();
+	e.cancelBubble = true;
+	if(e.stopPropagation) e.stopPropagation();
+	return false;
+}
+
+// Create a button for a tag with a popup listing all the tiddlers that it tags
+//# title and tooltip arguments are optional
+function createTagButton(place,tag,excludeTiddler,title,tooltip)
+{
+	var btn = createTiddlyButton(place,title||tag,(tooltip||config.views.wikified.tag.tooltip).format([tag]),onClickTag);
+	btn.setAttribute("tag",tag);
+	if(excludeTiddler)
+		btn.setAttribute("tiddler",excludeTiddler);
+	return btn;
+}
+
+function onClickTiddlyPopup(ev)
+{
+	var e = ev || window.event;
+	var tiddler = this.tiddler;
+	if(tiddler.text) {
+		var popup = Popup.create(this,"div","popupTiddler");
+		wikify(tiddler.text,popup,null,tiddler);
+		Popup.show();
+	}
+	if(e) e.cancelBubble = true;
+	if(e && e.stopPropagation) e.stopPropagation();
+	return false;
+}
+
+function createTiddlyPopup(place,caption,tooltip,tiddler)
+{
+	if(tiddler.text) {
+		createTiddlyLink(place,caption,true);
+		var btn = createTiddlyButton(place,glyph("downArrow"),tooltip,onClickTiddlyPopup,"tiddlerPopupButton");
+		btn.tiddler = tiddler;
+	} else {
+		createTiddlyText(place,caption);
+	}
+}
+
+function onClickError(ev)
+{
+	var e = ev || window.event;
+	var popup = Popup.create(this);
+	var lines = this.getAttribute("errorText").split("\n");
+	var t;
+	for(t=0; t<lines.length; t++)
+		createTiddlyElement(popup,"li",null,null,lines[t]);
+	Popup.show();
+	e.cancelBubble = true;
+	if(e.stopPropagation) e.stopPropagation();
+	return false;
+}
+
+function createTiddlyError(place,title,text)
+{
+	var btn = createTiddlyButton(place,title,null,onClickError,"errorButton");
+	if(text) btn.setAttribute("errorText",text);
+}
diff --git a/test/data/tiddlywiki/js/Version.js b/test/data/tiddlywiki/js/Version.js
new file mode 100755
index 000000000..75cc1a350
--- /dev/null
+++ b/test/data/tiddlywiki/js/Version.js
@@ -0,0 +1 @@
+var version = {title: "TiddlyWiki", major: 2, minor: 6, revision: 5, date: new Date("October 6, 2011"), extensions: {}};
diff --git a/test/data/tiddlywiki/js/Wikifier.js b/test/data/tiddlywiki/js/Wikifier.js
new file mode 100755
index 000000000..07bb52893
--- /dev/null
+++ b/test/data/tiddlywiki/js/Wikifier.js
@@ -0,0 +1,237 @@
+//--
+//-- Wikifier
+//--
+
+function getParser(tiddler,format)
+{
+	if(tiddler) {
+		if(!format)
+			format = tiddler.fields["wikiformat"];
+		var i;
+		if(format) {
+			//# format field takes precedence over format tag
+			for(i in config.parsers) {
+				if(format == config.parsers[i].format)
+					return config.parsers[i];
+			}
+		} else {
+			for(i in config.parsers) {
+				if(tiddler.isTagged(config.parsers[i].formatTag))
+					return config.parsers[i];
+			}
+		}
+	}
+	return formatter;
+}
+
+//# Construct a wikifier object
+//# source - source string that's going to be wikified
+//# formatter - Formatter() object containing the list of formatters to be used
+//# highlightRegExp - regular expression of the text string to highlight
+//# tiddler - reference to the tiddler that's taken to be the container for this wikification
+function Wikifier(source,formatter,highlightRegExp,tiddler)
+{
+	this.source = source;
+	this.output = null;
+	this.formatter = formatter;
+	this.nextMatch = 0;
+	this.autoLinkWikiWords = tiddler && tiddler.autoLinkWikiWords() == false ? false : true;
+	this.highlightRegExp = highlightRegExp;
+	this.highlightMatch = null;
+	this.isStatic = false;
+	if(highlightRegExp) {
+		highlightRegExp.lastIndex = 0;
+		this.highlightMatch = highlightRegExp.exec(source);
+	}
+	this.tiddler = tiddler;
+}
+
+Wikifier.prototype.wikifyPlain = function()
+{
+	var e = createTiddlyElement(document.body,"div");
+	e.style.display = "none";
+	this.subWikify(e);
+	var text = jQuery(e).text();
+	jQuery(e).remove();
+	return text;
+};
+
+Wikifier.prototype.subWikify = function(output,terminator)
+{
+	//# Handle the terminated and unterminated cases separately, this speeds up wikifikation by about 30%
+	try {
+		if(terminator)
+			this.subWikifyTerm(output,new RegExp("(" + terminator + ")","mg"));
+		else
+			this.subWikifyUnterm(output);
+	} catch(ex) {
+		showException(ex);
+	}
+};
+
+Wikifier.prototype.subWikifyUnterm = function(output)
+{
+	//# subWikify can be indirectly recursive, so we need to save the old output pointer
+	var oldOutput = this.output;
+	this.output = output;
+	//# Get the first match
+	this.formatter.formatterRegExp.lastIndex = this.nextMatch;
+	var formatterMatch = this.formatter.formatterRegExp.exec(this.source);
+	while(formatterMatch) {
+		// Output any text before the match
+		if(formatterMatch.index > this.nextMatch)
+			this.outputText(this.output,this.nextMatch,formatterMatch.index);
+		// Set the match parameters for the handler
+		this.matchStart = formatterMatch.index;
+		this.matchLength = formatterMatch[0].length;
+		this.matchText = formatterMatch[0];
+		this.nextMatch = this.formatter.formatterRegExp.lastIndex;
+		//# Figure out which formatter matched and call its handler
+		var t;
+		for(t=1; t<formatterMatch.length; t++) {
+			if(formatterMatch[t]) {
+				this.formatter.formatters[t-1].handler(this);
+				this.formatter.formatterRegExp.lastIndex = this.nextMatch;
+				break;
+			}
+		}
+		//# Get the next match
+		formatterMatch = this.formatter.formatterRegExp.exec(this.source);
+	}
+	//# Output any text after the last match
+	if(this.nextMatch < this.source.length) {
+		this.outputText(this.output,this.nextMatch,this.source.length);
+		this.nextMatch = this.source.length;
+	}
+	//# Restore the output pointer
+	this.output = oldOutput;
+};
+
+Wikifier.prototype.subWikifyTerm = function(output,terminatorRegExp)
+{
+	//# subWikify can be indirectly recursive, so we need to save the old output pointer
+	var oldOutput = this.output;
+	this.output = output;
+	//# Get the first matches for the formatter and terminator RegExps
+	terminatorRegExp.lastIndex = this.nextMatch;
+	var terminatorMatch = terminatorRegExp.exec(this.source);
+	this.formatter.formatterRegExp.lastIndex = this.nextMatch;
+	var formatterMatch = this.formatter.formatterRegExp.exec(terminatorMatch ? this.source.substr(0,terminatorMatch.index) : this.source);
+	while(terminatorMatch || formatterMatch) {
+		//# Check for a terminator match before the next formatter match
+		if(terminatorMatch && (!formatterMatch || terminatorMatch.index <= formatterMatch.index)) {
+			//# Output any text before the match
+			if(terminatorMatch.index > this.nextMatch)
+				this.outputText(this.output,this.nextMatch,terminatorMatch.index);
+			//# Set the match parameters
+			this.matchText = terminatorMatch[1];
+			this.matchLength = terminatorMatch[1].length;
+			this.matchStart = terminatorMatch.index;
+			this.nextMatch = this.matchStart + this.matchLength;
+			//# Restore the output pointer
+			this.output = oldOutput;
+			return;
+		}
+		//# It must be a formatter match; output any text before the match
+		if(formatterMatch.index > this.nextMatch)
+			this.outputText(this.output,this.nextMatch,formatterMatch.index);
+		//# Set the match parameters
+		this.matchStart = formatterMatch.index;
+		this.matchLength = formatterMatch[0].length;
+		this.matchText = formatterMatch[0];
+		this.nextMatch = this.formatter.formatterRegExp.lastIndex;
+		//# Figure out which formatter matched and call its handler
+		var t;
+		for(t=1; t<formatterMatch.length; t++) {
+			if(formatterMatch[t]) {
+				this.formatter.formatters[t-1].handler(this);
+				this.formatter.formatterRegExp.lastIndex = this.nextMatch;
+				break;
+			}
+		}
+		//# Get the next match
+		terminatorRegExp.lastIndex = this.nextMatch;
+		terminatorMatch = terminatorRegExp.exec(this.source);
+		formatterMatch = this.formatter.formatterRegExp.exec(terminatorMatch ? this.source.substr(0,terminatorMatch.index) : this.source);
+	}
+	//# Output any text after the last match
+	if(this.nextMatch < this.source.length) {
+		this.outputText(this.output,this.nextMatch,this.source.length);
+		this.nextMatch = this.source.length;
+	}
+	//# Restore the output pointer
+	this.output = oldOutput;
+};
+
+Wikifier.prototype.outputText = function(place,startPos,endPos)
+{
+	//# Check for highlights
+	while(this.highlightMatch && (this.highlightRegExp.lastIndex > startPos) && (this.highlightMatch.index < endPos) && (startPos < endPos)) {
+		//# Deal with any plain text before the highlight
+		if(this.highlightMatch.index > startPos) {
+			createTiddlyText(place,this.source.substring(startPos,this.highlightMatch.index));
+			startPos = this.highlightMatch.index;
+		}
+		//# Deal with the highlight
+		var highlightEnd = Math.min(this.highlightRegExp.lastIndex,endPos);
+		createTiddlyElement(place,"span",null,"highlight",this.source.substring(startPos,highlightEnd));
+		startPos = highlightEnd;
+		//# Nudge along to the next highlight if we're done with this one
+		if(startPos >= this.highlightRegExp.lastIndex)
+			this.highlightMatch = this.highlightRegExp.exec(this.source);
+	}
+	//# Do the unhighlighted text left over
+	if(startPos < endPos) {
+		createTiddlyText(place,this.source.substring(startPos,endPos));
+	}
+};
+
+function wikify(source,output,highlightRegExp,tiddler)
+{
+	if(source) {
+		var wikifier = new Wikifier(source,getParser(tiddler),highlightRegExp,tiddler);
+		var t0 = new Date();
+		wikifier.subWikify(output);
+		if(tiddler && config.options.chkDisplayInstrumentation)
+			displayMessage("wikify:" +tiddler.title+ " in " + (new Date()-t0) + " ms");
+	}
+}
+
+function wikifyStatic(source,highlightRegExp,tiddler,format)
+{
+	var e = createTiddlyElement(document.body,"pre");
+	e.style.display = "none";
+	var html = "";
+	if(source && source != "") {
+		if(!tiddler)
+			tiddler = new Tiddler("temp");
+		var wikifier = new Wikifier(source,getParser(tiddler,format),highlightRegExp,tiddler);
+		wikifier.isStatic = true;
+		wikifier.subWikify(e);
+		html = e.innerHTML;
+		jQuery(e).remove();
+	}
+	return html;
+}
+
+//# Wikify a string to plain text
+//#   text - text to wikify
+//#   limit - maximum number of characters to generate
+//#   tiddler - optional reference to the tiddler containing this text
+function wikifyPlainText(text,limit,tiddler)
+{
+	if(limit > 0)
+		text = text.substr(0,limit);
+	var wikifier = new Wikifier(text,formatter,null,tiddler);
+	return wikifier.wikifyPlain();
+}
+
+//# Highlight plain text into an element
+function highlightify(source,output,highlightRegExp,tiddler)
+{
+	if(source) {
+		var wikifier = new Wikifier(source,formatter,highlightRegExp,tiddler);
+		wikifier.outputText(output,0,source.length);
+	}
+}
+
diff --git a/test/data/tiddlywiki/js/Wizard.js b/test/data/tiddlywiki/js/Wizard.js
new file mode 100755
index 000000000..db2243056
--- /dev/null
+++ b/test/data/tiddlywiki/js/Wizard.js
@@ -0,0 +1,69 @@
+//--
+//-- Wizard support
+//--
+
+function Wizard(elem)
+{
+	if(elem) {
+		this.formElem = findRelated(elem,"wizard","className");
+		this.bodyElem = findRelated(this.formElem.firstChild,"wizardBody","className","nextSibling");
+		this.footElem = findRelated(this.formElem.firstChild,"wizardFooter","className","nextSibling");
+	} else {
+		this.formElem = null;
+		this.bodyElem = null;
+		this.footElem = null;
+	}
+}
+
+Wizard.prototype.setValue = function(name,value)
+{
+	jQuery(this.formElem).data(name, value);
+};
+
+Wizard.prototype.getValue = function(name)
+{
+	return this.formElem ? jQuery(this.formElem).data(name) : null;
+};
+
+Wizard.prototype.createWizard = function(place,title)
+{
+	this.formElem = createTiddlyElement(place,"form",null,"wizard");
+	createTiddlyElement(this.formElem,"h1",null,null,title);
+	this.bodyElem = createTiddlyElement(this.formElem,"div",null,"wizardBody");
+	this.footElem = createTiddlyElement(this.formElem,"div",null,"wizardFooter");
+	return this.formElem;
+};
+
+Wizard.prototype.clear = function()
+{
+	jQuery(this.bodyElem).empty();
+};
+
+Wizard.prototype.setButtons = function(buttonInfo,status)
+{
+	jQuery(this.footElem).empty();
+	var t;
+	for(t=0; t<buttonInfo.length; t++) {
+		createTiddlyButton(this.footElem,buttonInfo[t].caption,buttonInfo[t].tooltip,buttonInfo[t].onClick);
+		insertSpacer(this.footElem);
+		}
+	if(typeof status == "string") {
+		createTiddlyElement(this.footElem,"span",null,"status",status);
+	}
+};
+
+Wizard.prototype.addStep = function(stepTitle,html)
+{
+	jQuery(this.bodyElem).empty();
+	var w = createTiddlyElement(this.bodyElem,"div");
+	createTiddlyElement(w,"h2",null,null,stepTitle);
+	var step = createTiddlyElement(w,"div",null,"wizardStep");
+	step.innerHTML = html;
+	applyHtmlMacros(step,tiddler);
+};
+
+Wizard.prototype.getElement = function(name)
+{
+	return this.formElem.elements[name];
+};
+
diff --git a/test/data/tiddlywiki/js/Zoomer.js b/test/data/tiddlywiki/js/Zoomer.js
new file mode 100755
index 000000000..3a3cbeaeb
--- /dev/null
+++ b/test/data/tiddlywiki/js/Zoomer.js
@@ -0,0 +1,21 @@
+//--
+//-- Zoomer animation
+//--
+
+function Zoomer(text,startElement,targetElement,unused)
+{
+	var e = createTiddlyElement(document.body,"div",null,"zoomer");
+	createTiddlyElement(e,"div",null,null,text);
+	var winWidth = findWindowWidth();
+	var winHeight = findWindowHeight();
+	var p = [
+		{style: 'left', start: findPosX(startElement), end: findPosX(targetElement), template: '%0px'},
+		{style: 'top', start: findPosY(startElement), end: findPosY(targetElement), template: '%0px'},
+		{style: 'width', start: Math.min(startElement.scrollWidth,winWidth), end: Math.min(targetElement.scrollWidth,winWidth), template: '%0px', atEnd: 'auto'},
+		{style: 'height', start: Math.min(startElement.scrollHeight,winHeight), end: Math.min(targetElement.scrollHeight,winHeight), template: '%0px', atEnd: 'auto'},
+		{style: 'fontSize', start: 8, end: 24, template: '%0pt'}
+	];
+	var c = function(element,properties) {jQuery(element).remove();};
+	return new Morpher(e,config.animDuration,p,c);
+}
+
diff --git a/test/data/tiddlywiki/js/main.js b/test/data/tiddlywiki/js/main.js
new file mode 100755
index 000000000..097c74f96
--- /dev/null
+++ b/test/data/tiddlywiki/js/main.js
@@ -0,0 +1,236 @@
+//--
+//-- Main
+//--
+
+var params = null; // Command line parameters
+var store = null; // TiddlyWiki storage
+var story = null; // Main story
+var formatter = null; // Default formatters for the wikifier
+var anim = typeof Animator == "function" ? new Animator() : null; // Animation engine
+var readOnly = false; // Whether we're in readonly mode
+var highlightHack = null; // Embarrassing hack department...
+var hadConfirmExit = false; // Don't warn more than once
+var safeMode = false; // Disable all plugins and cookies
+var showBackstage; // Whether to include the backstage area
+var installedPlugins = []; // Information filled in when plugins are executed
+var startingUp = false; // Whether we're in the process of starting up
+var pluginInfo,tiddler; // Used to pass information to plugins in loadPlugins()
+
+// Whether to use the JavaSaver applet
+var useJavaSaver = (config.browser.isSafari || config.browser.isOpera) && (document.location.toString().substr(0,4) != "http");
+
+if(!window || !window.console) {
+	console = {tiddlywiki:true,log:function(message) {displayMessage(message);}};
+}
+
+// Starting up
+function main()
+{
+	var t10,t9,t8,t7,t6,t5,t4,t3,t2,t1,t0 = new Date();
+	startingUp = true;
+	var doc = jQuery(document);
+	jQuery.noConflict();
+	window.onbeforeunload = function(e) {if(window.confirmExit) return confirmExit();};
+	params = getParameters();
+	if(params)
+		params = params.parseParams("open",null,false);
+	store = new TiddlyWiki({config:config});
+	invokeParamifier(params,"oninit");
+	story = new Story("tiddlerDisplay","tiddler");
+	addEvent(document,"click",Popup.onDocumentClick);
+	saveTest();
+	var s;
+	for(s=0; s<config.notifyTiddlers.length; s++)
+		store.addNotification(config.notifyTiddlers[s].name,config.notifyTiddlers[s].notify);
+	t1 = new Date();
+	loadShadowTiddlers();
+	doc.trigger("loadShadows");
+	t2 = new Date();
+	store.loadFromDiv("storeArea","store",true);
+	doc.trigger("loadTiddlers");
+	loadOptions();
+	t3 = new Date();
+	invokeParamifier(params,"onload");
+	t4 = new Date();
+	readOnly = (window.location.protocol == "file:") ? false : config.options.chkHttpReadOnly;
+	var pluginProblem = loadPlugins("systemConfig");
+	doc.trigger("loadPlugins");
+	t5 = new Date();
+	formatter = new Formatter(config.formatters);
+	invokeParamifier(params,"onconfig");
+	story.switchTheme(config.options.txtTheme);
+	showBackstage = showBackstage !== undefined ? showBackstage : !readOnly;
+	t6 = new Date();
+	var m;
+	for(m in config.macros) {
+		if(config.macros[m].init)
+			config.macros[m].init();
+	}
+	t7 = new Date();
+	store.notifyAll();
+	t8 = new Date();
+	restart();
+	refreshDisplay();
+	t9 = new Date();
+	if(pluginProblem) {
+		story.displayTiddler(null,"PluginManager");
+		displayMessage(config.messages.customConfigError);
+	}
+	if(showBackstage)
+		backstage.init();
+	t10 = new Date();
+	if(config.options.chkDisplayInstrumentation) {
+		displayMessage("LoadShadows " + (t2-t1) + " ms");
+		displayMessage("LoadFromDiv " + (t3-t2) + " ms");
+		displayMessage("LoadPlugins " + (t5-t4) + " ms");
+		displayMessage("Macro init " + (t7-t6) + " ms");
+		displayMessage("Notify " + (t8-t7) + " ms");
+		displayMessage("Restart " + (t9-t8) + " ms");
+		displayMessage("Total: " + (t10-t0) + " ms");
+	}
+	startingUp = false;
+	doc.trigger("startup");
+}
+
+// Called on unload. All functions called conditionally since they themselves may have been unloaded.
+function unload()
+{
+	if(window.checkUnsavedChanges)
+		checkUnsavedChanges();
+	if(window.scrubNodes)
+		scrubNodes(document.body);
+}
+
+// Restarting
+function restart()
+{
+	invokeParamifier(params,"onstart");
+	if(story.isEmpty()) {
+		story.displayDefaultTiddlers();
+	}
+	window.scrollTo(0,0);
+}
+
+function saveTest()
+{
+	var s = document.getElementById("saveTest");
+	if(s.hasChildNodes())
+		alert(config.messages.savedSnapshotError);
+	s.appendChild(document.createTextNode("savetest"));
+}
+
+function loadShadowTiddlers()
+{
+	var shadows = new TiddlyWiki();
+	shadows.loadFromDiv("shadowArea","shadows",true);
+	shadows.forEachTiddler(function(title,tiddler){config.shadowTiddlers[title] = tiddler.text;});
+}
+
+function loadPlugins(tag)
+{
+	if(safeMode)
+		return false;
+	var tiddlers = store.getTaggedTiddlers(tag);
+	//# ensure the plugins are sorted into case sensitive order
+	tiddlers.sort(function(a,b) {return a.title < b.title ? -1 : (a.title == b.title ? 0 : 1);});
+	var toLoad = [];
+	var nLoaded = 0;
+	var map = {};
+	var nPlugins = tiddlers.length;
+	installedPlugins = [];
+	var i;
+	for(i=0; i<nPlugins; i++) {
+		var p = getPluginInfo(tiddlers[i]);
+		installedPlugins[i] = p;
+		var n = p.Name || p.title;
+		if(n)
+			map[n] = p;
+		n = p.Source;
+		if(n)
+			map[n] = p;
+	}
+	var visit = function(p) {
+		if(!p || p.done)
+			return;
+		p.done = 1;
+		var reqs = p.Requires;
+		if(reqs) {
+			reqs = reqs.readBracketedList();
+			var i;
+			for(i=0; i<reqs.length; i++)
+				visit(map[reqs[i]]);
+		}
+		toLoad.push(p);
+	};
+	for(i=0; i<nPlugins; i++)
+		visit(installedPlugins[i]);
+	for(i=0; i<toLoad.length; i++) {
+		p = toLoad[i];
+		pluginInfo = p;
+		tiddler = p.tiddler;
+		if(isPluginExecutable(p)) {
+			if(isPluginEnabled(p)) {
+				p.executed = true;
+				var startTime = new Date();
+				try {
+					if(tiddler.text)
+						window.eval(tiddler.text);
+					nLoaded++;
+				} catch(ex) {
+					p.log.push(config.messages.pluginError.format([exceptionText(ex)]));
+					p.error = true;
+					if(!console.tiddlywiki) {
+						console.log("error evaluating " + tiddler.title, ex);
+					}
+				}
+				pluginInfo.startupTime = String((new Date()) - startTime) + "ms";
+			} else {
+				nPlugins--;
+			}
+		} else {
+			p.warning = true;
+		}
+	}
+	return nLoaded != nPlugins;
+}
+
+function getPluginInfo(tiddler)
+{
+	var p = store.getTiddlerSlices(tiddler.title,["Name","Description","Version","Requires","CoreVersion","Date","Source","Author","License","Browsers"]);
+	p.tiddler = tiddler;
+	p.title = tiddler.title;
+	p.log = [];
+	return p;
+}
+
+// Check that a particular plugin is valid for execution
+function isPluginExecutable(plugin)
+{
+	if(plugin.tiddler.isTagged("systemConfigForce")) {
+		plugin.log.push(config.messages.pluginForced);
+		return true;
+	}
+	if(plugin["CoreVersion"]) {
+		var coreVersion = plugin["CoreVersion"].split(".");
+		var w = parseInt(coreVersion[0],10) - version.major;
+		if(w == 0 && coreVersion[1])
+			w = parseInt(coreVersion[1],10) - version.minor;
+		if(w == 0 && coreVersion[2])
+			w = parseInt(coreVersion[2],10) - version.revision;
+		if(w > 0) {
+			plugin.log.push(config.messages.pluginVersionError);
+			return false;
+		}
+	}
+	return true;
+}
+
+function isPluginEnabled(plugin)
+{
+	if(plugin.tiddler.isTagged("systemConfigDisable")) {
+		plugin.log.push(config.messages.pluginDisabled);
+		return false;
+	}
+	return true;
+}
+
diff --git a/test/data/tiddlywiki/js/split.recipe b/test/data/tiddlywiki/js/split.recipe
new file mode 100755
index 000000000..dbc407a84
--- /dev/null
+++ b/test/data/tiddlywiki/js/split.recipe
@@ -0,0 +1,55 @@
+version: Version.js
+js: Guide.js
+js: Config.js
+js: ConfigBrowser.js
+js: Lingo.js
+js: main.js
+js: Paramifiers.js
+js: FormatterHelpers.js
+js: Formatter.js
+js: Wikifier.js
+js: Macros.js
+js: NewTiddler.js
+js: Search.js
+js: Tabs.js
+js: Toolbar.js
+js: Commands.js
+js: Tiddler.js
+js: TiddlyWiki.js
+js: Filters.js
+js: TiddlerFields.js
+js: Story.js
+js: Backstage.js
+js: Import.js
+js: Upgrade.js
+js: Sync.js
+js: Manager.js
+js: Messages.js
+js: Refresh.js
+js: Options.js
+js: Saving.js
+js: SavingRSS.js
+js: FileSystem.js
+js: FileSystemUtils.js
+js: AdaptorBase.js
+js: FileAdaptor.js
+js: Http.js
+js: Utilities.js
+js: UtilitiesPopup.js
+js: Animator.js
+js: Morpher.js
+js: Zoomer.js
+js: Scroller.js
+js: Slider.js
+js: Popup.js
+js: Wizard.js
+js: ListView.js
+js: BasicTypes.js
+js: Strings.js
+js: Dates.js
+js: RGB.js
+js: Dom.js
+js: LoaderSaver.js
+js: TW21Loader.js
+js: TW21Saver.js
+
diff --git a/test/data/tiddlywiki/recipes/empty.2.0.11.html.recipe b/test/data/tiddlywiki/recipes/empty.2.0.11.html.recipe
new file mode 100755
index 000000000..1f569b101
--- /dev/null
+++ b/test/data/tiddlywiki/recipes/empty.2.0.11.html.recipe
@@ -0,0 +1,2 @@
+recipe: ../../../Tags/2.0.11/core/tiddlywiki.html.recipe
+title: ../../../Tags/2.0.11/core/html/title.html
diff --git a/test/data/tiddlywiki/recipes/empty.2.1.0.html.recipe b/test/data/tiddlywiki/recipes/empty.2.1.0.html.recipe
new file mode 100755
index 000000000..22cfaa37c
--- /dev/null
+++ b/test/data/tiddlywiki/recipes/empty.2.1.0.html.recipe
@@ -0,0 +1,3 @@
+recipe: ../../../Tags/REL-2.1.0_Final/core/tiddlywiki.html.recipe
+title: ../../../Tags/REL-2.1.0_Final/core/html/title.html
+tiddler: ../../association/plugins/LegacyStrikeThroughPlugin/LegacyStrikeThroughPlugin.js
\ No newline at end of file
diff --git a/test/data/tiddlywiki/recipes/empty.2.1.3.html.recipe b/test/data/tiddlywiki/recipes/empty.2.1.3.html.recipe
new file mode 100755
index 000000000..e583b92f5
--- /dev/null
+++ b/test/data/tiddlywiki/recipes/empty.2.1.3.html.recipe
@@ -0,0 +1,3 @@
+recipe: ../../../Tags/REL-2.1.3_Final/core/tiddlywiki.html.recipe
+title: ../../../Tags/REL-2.1.3_Final/core/html/title.html
+tiddler: ../../association/plugins/LegacyStrikeThroughPlugin/LegacyStrikeThroughPlugin.js
\ No newline at end of file
diff --git a/test/data/tiddlywiki/recipes/empty.2.2.0.html.recipe b/test/data/tiddlywiki/recipes/empty.2.2.0.html.recipe
new file mode 100755
index 000000000..e8343f8f4
--- /dev/null
+++ b/test/data/tiddlywiki/recipes/empty.2.2.0.html.recipe
@@ -0,0 +1,3 @@
+recipe: ../../../Tags/REL-2.2.0_Final/core/tiddlywiki.html.recipe
+title: ../../../Tags/REL-2.2.0_Final/core/html/title.html
+tiddler: ../../association/plugins/LegacyStrikeThroughPlugin/LegacyStrikeThroughPlugin.js
\ No newline at end of file
diff --git a/test/data/tiddlywiki/recipes/empty.2.2.5.html.recipe b/test/data/tiddlywiki/recipes/empty.2.2.5.html.recipe
new file mode 100755
index 000000000..dba25b175
--- /dev/null
+++ b/test/data/tiddlywiki/recipes/empty.2.2.5.html.recipe
@@ -0,0 +1,3 @@
+recipe: ../../../Tags/REL-2.2.5_Final/core/tiddlywiki.html.recipe
+title: ../../../Tags/REL-2.2.5_Final/core/html/title.txt
+tiddler: ../../association/plugins/LegacyStrikeThroughPlugin/LegacyStrikeThroughPlugin.js
\ No newline at end of file
diff --git a/test/data/tiddlywiki/recipes/empty.2.2.6.html.recipe b/test/data/tiddlywiki/recipes/empty.2.2.6.html.recipe
new file mode 100755
index 000000000..5743657a6
--- /dev/null
+++ b/test/data/tiddlywiki/recipes/empty.2.2.6.html.recipe
@@ -0,0 +1,3 @@
+recipe: ../../../Tags/core/REL-2.2.6_Final/tiddlywiki.html.recipe
+title: ../../../Tags/core/REL-2.2.6_Final/html/title.txt
+tiddler: ../../association/plugins/LegacyStrikeThroughPlugin/LegacyStrikeThroughPlugin.js
\ No newline at end of file
diff --git a/test/data/tiddlywiki/recipes/empty.2.3.0.html.recipe b/test/data/tiddlywiki/recipes/empty.2.3.0.html.recipe
new file mode 100755
index 000000000..db123623c
--- /dev/null
+++ b/test/data/tiddlywiki/recipes/empty.2.3.0.html.recipe
@@ -0,0 +1,3 @@
+recipe: ../../../Tags/core/REL-2.3.0_Final/tiddlywiki.html.recipe
+title: ../../../Tags/core/REL-2.3.0_Final/html/title.txt
+tiddler: ../../association/plugins/LegacyStrikeThroughPlugin/LegacyStrikeThroughPlugin.js
\ No newline at end of file
diff --git a/test/data/tiddlywiki/recipes/empty.2.4.0.html.recipe b/test/data/tiddlywiki/recipes/empty.2.4.0.html.recipe
new file mode 100755
index 000000000..422d0f505
--- /dev/null
+++ b/test/data/tiddlywiki/recipes/empty.2.4.0.html.recipe
@@ -0,0 +1 @@
+recipe: ../../../Tags/core/REL-2.4.0_Final/tiddlywiki.html.recipe
diff --git a/test/data/tiddlywiki/recipes/empty.2.4.1.html.recipe b/test/data/tiddlywiki/recipes/empty.2.4.1.html.recipe
new file mode 100755
index 000000000..54def12d0
--- /dev/null
+++ b/test/data/tiddlywiki/recipes/empty.2.4.1.html.recipe
@@ -0,0 +1 @@
+recipe: ../../../Tags/core/REL-2.4.1_Final/tiddlywiki.html.recipe
diff --git a/test/data/tiddlywiki/recipes/empty.2.4.2.html.recipe b/test/data/tiddlywiki/recipes/empty.2.4.2.html.recipe
new file mode 100755
index 000000000..468a5fe71
--- /dev/null
+++ b/test/data/tiddlywiki/recipes/empty.2.4.2.html.recipe
@@ -0,0 +1 @@
+recipe: ../../../Tags/core/REL-2.4.2_Final/tiddlywiki.html.recipe
diff --git a/test/data/tiddlywiki/recipes/empty.2.4.3.html.recipe b/test/data/tiddlywiki/recipes/empty.2.4.3.html.recipe
new file mode 100755
index 000000000..7ded46a4f
--- /dev/null
+++ b/test/data/tiddlywiki/recipes/empty.2.4.3.html.recipe
@@ -0,0 +1 @@
+recipe: ../../../Tags/core/REL-2.4.3_Final/tiddlywiki.html.recipe
diff --git a/test/data/tiddlywiki/recipes/empty.2.5.0.html.recipe b/test/data/tiddlywiki/recipes/empty.2.5.0.html.recipe
new file mode 100755
index 000000000..af37f99ae
--- /dev/null
+++ b/test/data/tiddlywiki/recipes/empty.2.5.0.html.recipe
@@ -0,0 +1 @@
+recipe: ../../../Tags/core/REL-2.5.0_Final/tiddlywiki.html.recipe
diff --git a/test/data/tiddlywiki/recipes/empty.2.5.1.html.recipe b/test/data/tiddlywiki/recipes/empty.2.5.1.html.recipe
new file mode 100755
index 000000000..6ed11d004
--- /dev/null
+++ b/test/data/tiddlywiki/recipes/empty.2.5.1.html.recipe
@@ -0,0 +1 @@
+recipe: ../../../Tags/core/REL-2.5.1_Final/tiddlywiki.html.recipe
diff --git a/test/data/tiddlywiki/recipes/empty.2.5.2.html.recipe b/test/data/tiddlywiki/recipes/empty.2.5.2.html.recipe
new file mode 100755
index 000000000..e0e9f2a94
--- /dev/null
+++ b/test/data/tiddlywiki/recipes/empty.2.5.2.html.recipe
@@ -0,0 +1 @@
+recipe: ../../../Tags/core/REL-2.5.2_Final/tiddlywiki.html.recipe
diff --git a/test/data/tiddlywiki/recipes/empty.2.5.3.html.recipe b/test/data/tiddlywiki/recipes/empty.2.5.3.html.recipe
new file mode 100755
index 000000000..a2c4d43a5
--- /dev/null
+++ b/test/data/tiddlywiki/recipes/empty.2.5.3.html.recipe
@@ -0,0 +1 @@
+recipe: ../../../Tags/core/REL-2.5.3_Final/tiddlywiki.html.recipe
diff --git a/test/data/tiddlywiki/recipes/empty.2.6.0.html.recipe b/test/data/tiddlywiki/recipes/empty.2.6.0.html.recipe
new file mode 100755
index 000000000..9493a5f37
--- /dev/null
+++ b/test/data/tiddlywiki/recipes/empty.2.6.0.html.recipe
@@ -0,0 +1 @@
+recipe: ../../../Tags/core/REL-2.6.0_Final/tiddlywiki.html.recipe
diff --git a/test/data/tiddlywiki/shadows/ColorPalette.tid b/test/data/tiddlywiki/shadows/ColorPalette.tid
new file mode 100755
index 000000000..c15cf4c9f
--- /dev/null
+++ b/test/data/tiddlywiki/shadows/ColorPalette.tid
@@ -0,0 +1,17 @@
+title: ColorPalette
+
+Background: #fff
+Foreground: #000
+PrimaryPale: #8cf
+PrimaryLight: #18f
+PrimaryMid: #04b
+PrimaryDark: #014
+SecondaryPale: #ffc
+SecondaryLight: #fe8
+SecondaryMid: #db4
+SecondaryDark: #841
+TertiaryPale: #eee
+TertiaryLight: #ccc
+TertiaryMid: #999
+TertiaryDark: #666
+Error: #f88
diff --git a/test/data/tiddlywiki/shadows/EditTemplate.tid b/test/data/tiddlywiki/shadows/EditTemplate.tid
new file mode 100755
index 000000000..49f8997aa
--- /dev/null
+++ b/test/data/tiddlywiki/shadows/EditTemplate.tid
@@ -0,0 +1,10 @@
+title: EditTemplate
+
+<!--{{{-->
+<div class='toolbar' macro='toolbar [[ToolbarCommands::EditToolbar]]'></div>
+<div class='title' macro='view title'></div>
+<div class='editor' macro='edit title'></div>
+<div macro='annotations'></div>
+<div class='editor' macro='edit text'></div>
+<div class='editor' macro='edit tags'></div><div class='editorFooter'><span macro='message views.editor.tagPrompt'></span><span macro='tagChooser excludeLists'></span></div>
+<!--}}}-->
diff --git a/test/data/tiddlywiki/shadows/GettingStarted.tid b/test/data/tiddlywiki/shadows/GettingStarted.tid
new file mode 100755
index 000000000..5ad7b469d
--- /dev/null
+++ b/test/data/tiddlywiki/shadows/GettingStarted.tid
@@ -0,0 +1,7 @@
+title: GettingStarted
+
+To get started with this blank [[TiddlyWiki]], you'll need to modify the following tiddlers:
+* [[SiteTitle]] & [[SiteSubtitle]]: The title and subtitle of the site, as shown above (after saving, they will also appear in the browser title bar)
+* [[MainMenu]]: The menu (usually on the left)
+* [[DefaultTiddlers]]: Contains the names of the tiddlers that you want to appear when the TiddlyWiki is opened
+You'll also need to enter your username for signing your edits: <<option txtUserName>>
diff --git a/test/data/tiddlywiki/shadows/ImportTiddlers.tid b/test/data/tiddlywiki/shadows/ImportTiddlers.tid
new file mode 100755
index 000000000..0f9896f1c
--- /dev/null
+++ b/test/data/tiddlywiki/shadows/ImportTiddlers.tid
@@ -0,0 +1,3 @@
+title: ImportTiddlers
+
+<<importTiddlers>>
diff --git a/test/data/tiddlywiki/shadows/MarkupPreHead.tid b/test/data/tiddlywiki/shadows/MarkupPreHead.tid
new file mode 100755
index 000000000..38cc6b446
--- /dev/null
+++ b/test/data/tiddlywiki/shadows/MarkupPreHead.tid
@@ -0,0 +1,5 @@
+title: MarkupPreHead
+
+<!--{{{-->
+<link rel='alternate' type='application/rss+xml' title='RSS' href='index.xml' />
+<!--}}}-->
diff --git a/test/data/tiddlywiki/shadows/OptionsPanel.tid b/test/data/tiddlywiki/shadows/OptionsPanel.tid
new file mode 100755
index 000000000..1e1a00789
--- /dev/null
+++ b/test/data/tiddlywiki/shadows/OptionsPanel.tid
@@ -0,0 +1,15 @@
+title: OptionsPanel
+
+These [[InterfaceOptions]] for customising [[TiddlyWiki]] are saved in your browser
+
+Your username for signing your edits. Write it as a [[WikiWord]] (eg [[JoeBloggs]])
+
+<<option txtUserName>>
+<<option chkSaveBackups>> [[SaveBackups]]
+<<option chkAutoSave>> [[AutoSave]]
+<<option chkRegExpSearch>> [[RegExpSearch]]
+<<option chkCaseSensitiveSearch>> [[CaseSensitiveSearch]]
+<<option chkAnimate>> [[EnableAnimations]]
+
+----
+Also see [[AdvancedOptions]]
diff --git a/test/data/tiddlywiki/shadows/PageTemplate.tid b/test/data/tiddlywiki/shadows/PageTemplate.tid
new file mode 100755
index 000000000..828d677a1
--- /dev/null
+++ b/test/data/tiddlywiki/shadows/PageTemplate.tid
@@ -0,0 +1,23 @@
+title: PageTemplate
+
+<!--{{{-->
+<div class='header' macro='gradient vert [[ColorPalette::PrimaryLight]] [[ColorPalette::PrimaryMid]]'>
+<div class='headerShadow'>
+<span class='siteTitle' refresh='content' tiddler='SiteTitle'></span>&nbsp;
+<span class='siteSubtitle' refresh='content' tiddler='SiteSubtitle'></span>
+</div>
+<div class='headerForeground'>
+<span class='siteTitle' refresh='content' tiddler='SiteTitle'></span>&nbsp;
+<span class='siteSubtitle' refresh='content' tiddler='SiteSubtitle'></span>
+</div>
+</div>
+<div id='mainMenu' refresh='content' tiddler='MainMenu'></div>
+<div id='sidebar'>
+<div id='sidebarOptions' refresh='content' tiddler='SideBarOptions'></div>
+<div id='sidebarTabs' refresh='content' force='true' tiddler='SideBarTabs'></div>
+</div>
+<div id='displayArea'>
+<div id='messageArea'></div>
+<div id='tiddlerDisplay'></div>
+</div>
+<!--}}}-->
diff --git a/test/data/tiddlywiki/shadows/StyleSheetColors.tid b/test/data/tiddlywiki/shadows/StyleSheetColors.tid
new file mode 100755
index 000000000..de29a5b5c
--- /dev/null
+++ b/test/data/tiddlywiki/shadows/StyleSheetColors.tid
@@ -0,0 +1,136 @@
+title: StyleSheetColors
+
+/*{{{*/
+body {background:[[ColorPalette::Background]]; color:[[ColorPalette::Foreground]];}
+
+a {color:[[ColorPalette::PrimaryMid]];}
+a:hover {background-color:[[ColorPalette::PrimaryMid]]; color:[[ColorPalette::Background]];}
+a img {border:0;}
+
+h1,h2,h3,h4,h5,h6 {color:[[ColorPalette::SecondaryDark]]; background:transparent;}
+h1 {border-bottom:2px solid [[ColorPalette::TertiaryLight]];}
+h2,h3 {border-bottom:1px solid [[ColorPalette::TertiaryLight]];}
+
+.button {color:[[ColorPalette::PrimaryDark]]; border:1px solid [[ColorPalette::Background]];}
+.button:hover {color:[[ColorPalette::PrimaryDark]]; background:[[ColorPalette::SecondaryLight]]; border-color:[[ColorPalette::SecondaryMid]];}
+.button:active {color:[[ColorPalette::Background]]; background:[[ColorPalette::SecondaryMid]]; border:1px solid [[ColorPalette::SecondaryDark]];}
+
+.header {background:[[ColorPalette::PrimaryMid]];}
+.headerShadow {color:[[ColorPalette::Foreground]];}
+.headerShadow a {font-weight:normal; color:[[ColorPalette::Foreground]];}
+.headerForeground {color:[[ColorPalette::Background]];}
+.headerForeground a {font-weight:normal; color:[[ColorPalette::PrimaryPale]];}
+
+.tabSelected {color:[[ColorPalette::PrimaryDark]];
+	background:[[ColorPalette::TertiaryPale]];
+	border-left:1px solid [[ColorPalette::TertiaryLight]];
+	border-top:1px solid [[ColorPalette::TertiaryLight]];
+	border-right:1px solid [[ColorPalette::TertiaryLight]];
+}
+.tabUnselected {color:[[ColorPalette::Background]]; background:[[ColorPalette::TertiaryMid]];}
+.tabContents {color:[[ColorPalette::PrimaryDark]]; background:[[ColorPalette::TertiaryPale]]; border:1px solid [[ColorPalette::TertiaryLight]];}
+.tabContents .button {border:0;}
+
+#sidebar {}
+#sidebarOptions input {border:1px solid [[ColorPalette::PrimaryMid]];}
+#sidebarOptions .sliderPanel {background:[[ColorPalette::PrimaryPale]];}
+#sidebarOptions .sliderPanel a {border:none;color:[[ColorPalette::PrimaryMid]];}
+#sidebarOptions .sliderPanel a:hover {color:[[ColorPalette::Background]]; background:[[ColorPalette::PrimaryMid]];}
+#sidebarOptions .sliderPanel a:active {color:[[ColorPalette::PrimaryMid]]; background:[[ColorPalette::Background]];}
+
+.wizard {background:[[ColorPalette::PrimaryPale]]; border:1px solid [[ColorPalette::PrimaryMid]];}
+.wizard h1 {color:[[ColorPalette::PrimaryDark]]; border:none;}
+.wizard h2 {color:[[ColorPalette::Foreground]]; border:none;}
+.wizardStep {background:[[ColorPalette::Background]]; color:[[ColorPalette::Foreground]];
+	border:1px solid [[ColorPalette::PrimaryMid]];}
+.wizardStep.wizardStepDone {background:[[ColorPalette::TertiaryLight]];}
+.wizardFooter {background:[[ColorPalette::PrimaryPale]];}
+.wizardFooter .status {background:[[ColorPalette::PrimaryDark]]; color:[[ColorPalette::Background]];}
+.wizard .button {color:[[ColorPalette::Foreground]]; background:[[ColorPalette::SecondaryLight]]; border: 1px solid;
+	border-color:[[ColorPalette::SecondaryPale]] [[ColorPalette::SecondaryDark]] [[ColorPalette::SecondaryDark]] [[ColorPalette::SecondaryPale]];}
+.wizard .button:hover {color:[[ColorPalette::Foreground]]; background:[[ColorPalette::Background]];}
+.wizard .button:active {color:[[ColorPalette::Background]]; background:[[ColorPalette::Foreground]]; border: 1px solid;
+	border-color:[[ColorPalette::PrimaryDark]] [[ColorPalette::PrimaryPale]] [[ColorPalette::PrimaryPale]] [[ColorPalette::PrimaryDark]];}
+
+.wizard .notChanged {background:transparent;}
+.wizard .changedLocally {background:#80ff80;}
+.wizard .changedServer {background:#8080ff;}
+.wizard .changedBoth {background:#ff8080;}
+.wizard .notFound {background:#ffff80;}
+.wizard .putToServer {background:#ff80ff;}
+.wizard .gotFromServer {background:#80ffff;}
+
+#messageArea {border:1px solid [[ColorPalette::SecondaryMid]]; background:[[ColorPalette::SecondaryLight]]; color:[[ColorPalette::Foreground]];}
+#messageArea .button {color:[[ColorPalette::PrimaryMid]]; background:[[ColorPalette::SecondaryPale]]; border:none;}
+
+.popupTiddler {background:[[ColorPalette::TertiaryPale]]; border:2px solid [[ColorPalette::TertiaryMid]];}
+
+.popup {background:[[ColorPalette::TertiaryPale]]; color:[[ColorPalette::TertiaryDark]]; border-left:1px solid [[ColorPalette::TertiaryMid]]; border-top:1px solid [[ColorPalette::TertiaryMid]]; border-right:2px solid [[ColorPalette::TertiaryDark]]; border-bottom:2px solid [[ColorPalette::TertiaryDark]];}
+.popup hr {color:[[ColorPalette::PrimaryDark]]; background:[[ColorPalette::PrimaryDark]]; border-bottom:1px;}
+.popup li.disabled {color:[[ColorPalette::TertiaryMid]];}
+.popup li a, .popup li a:visited {color:[[ColorPalette::Foreground]]; border: none;}
+.popup li a:hover {background:[[ColorPalette::SecondaryLight]]; color:[[ColorPalette::Foreground]]; border: none;}
+.popup li a:active {background:[[ColorPalette::SecondaryPale]]; color:[[ColorPalette::Foreground]]; border: none;}
+.popupHighlight {background:[[ColorPalette::Background]]; color:[[ColorPalette::Foreground]];}
+.listBreak div {border-bottom:1px solid [[ColorPalette::TertiaryDark]];}
+
+.tiddler .defaultCommand {font-weight:bold;}
+
+.shadow .title {color:[[ColorPalette::TertiaryDark]];}
+
+.title {color:[[ColorPalette::SecondaryDark]];}
+.subtitle {color:[[ColorPalette::TertiaryDark]];}
+
+.toolbar {color:[[ColorPalette::PrimaryMid]];}
+.toolbar a {color:[[ColorPalette::TertiaryLight]];}
+.selected .toolbar a {color:[[ColorPalette::TertiaryMid]];}
+.selected .toolbar a:hover {color:[[ColorPalette::Foreground]];}
+
+.tagging, .tagged {border:1px solid [[ColorPalette::TertiaryPale]]; background-color:[[ColorPalette::TertiaryPale]];}
+.selected .tagging, .selected .tagged {background-color:[[ColorPalette::TertiaryLight]]; border:1px solid [[ColorPalette::TertiaryMid]];}
+.tagging .listTitle, .tagged .listTitle {color:[[ColorPalette::PrimaryDark]];}
+.tagging .button, .tagged .button {border:none;}
+
+.footer {color:[[ColorPalette::TertiaryLight]];}
+.selected .footer {color:[[ColorPalette::TertiaryMid]];}
+
+.error, .errorButton {color:[[ColorPalette::Foreground]]; background:[[ColorPalette::Error]];}
+.warning {color:[[ColorPalette::Foreground]]; background:[[ColorPalette::SecondaryPale]];}
+.lowlight {background:[[ColorPalette::TertiaryLight]];}
+
+.zoomer {background:none; color:[[ColorPalette::TertiaryMid]]; border:3px solid [[ColorPalette::TertiaryMid]];}
+
+.imageLink, #displayArea .imageLink {background:transparent;}
+
+.annotation {background:[[ColorPalette::SecondaryLight]]; color:[[ColorPalette::Foreground]]; border:2px solid [[ColorPalette::SecondaryMid]];}
+
+.viewer .listTitle {list-style-type:none; margin-left:-2em;}
+.viewer .button {border:1px solid [[ColorPalette::SecondaryMid]];}
+.viewer blockquote {border-left:3px solid [[ColorPalette::TertiaryDark]];}
+
+.viewer table, table.twtable {border:2px solid [[ColorPalette::TertiaryDark]];}
+.viewer th, .viewer thead td, .twtable th, .twtable thead td {background:[[ColorPalette::SecondaryMid]]; border:1px solid [[ColorPalette::TertiaryDark]]; color:[[ColorPalette::Background]];}
+.viewer td, .viewer tr, .twtable td, .twtable tr {border:1px solid [[ColorPalette::TertiaryDark]];}
+
+.viewer pre {border:1px solid [[ColorPalette::SecondaryLight]]; background:[[ColorPalette::SecondaryPale]];}
+.viewer code {color:[[ColorPalette::SecondaryDark]];}
+.viewer hr {border:0; border-top:dashed 1px [[ColorPalette::TertiaryDark]]; color:[[ColorPalette::TertiaryDark]];}
+
+.highlight, .marked {background:[[ColorPalette::SecondaryLight]];}
+
+.editor input {border:1px solid [[ColorPalette::PrimaryMid]];}
+.editor textarea {border:1px solid [[ColorPalette::PrimaryMid]]; width:100%;}
+.editorFooter {color:[[ColorPalette::TertiaryMid]];}
+.readOnly {background:[[ColorPalette::TertiaryPale]];}
+
+#backstageArea {background:[[ColorPalette::Foreground]]; color:[[ColorPalette::TertiaryMid]];}
+#backstageArea a {background:[[ColorPalette::Foreground]]; color:[[ColorPalette::Background]]; border:none;}
+#backstageArea a:hover {background:[[ColorPalette::SecondaryLight]]; color:[[ColorPalette::Foreground]]; }
+#backstageArea a.backstageSelTab {background:[[ColorPalette::Background]]; color:[[ColorPalette::Foreground]];}
+#backstageButton a {background:none; color:[[ColorPalette::Background]]; border:none;}
+#backstageButton a:hover {background:[[ColorPalette::Foreground]]; color:[[ColorPalette::Background]]; border:none;}
+#backstagePanel {background:[[ColorPalette::Background]]; border-color: [[ColorPalette::Background]] [[ColorPalette::TertiaryDark]] [[ColorPalette::TertiaryDark]] [[ColorPalette::TertiaryDark]];}
+.backstagePanelFooter .button {border:none; color:[[ColorPalette::Background]];}
+.backstagePanelFooter .button:hover {color:[[ColorPalette::Foreground]];}
+#backstageCloak {background:[[ColorPalette::Foreground]]; opacity:0.6; filter:alpha(opacity=60);}
+/*}}}*/
diff --git a/test/data/tiddlywiki/shadows/StyleSheetLayout.tid b/test/data/tiddlywiki/shadows/StyleSheetLayout.tid
new file mode 100755
index 000000000..d2882ade2
--- /dev/null
+++ b/test/data/tiddlywiki/shadows/StyleSheetLayout.tid
@@ -0,0 +1,171 @@
+title: StyleSheetLayout
+
+/*{{{*/
+* html .tiddler {height:1%;}
+
+body {font-size:.75em; font-family:arial,helvetica; margin:0; padding:0;}
+
+h1,h2,h3,h4,h5,h6 {font-weight:bold; text-decoration:none;}
+h1,h2,h3 {padding-bottom:1px; margin-top:1.2em;margin-bottom:0.3em;}
+h4,h5,h6 {margin-top:1em;}
+h1 {font-size:1.35em;}
+h2 {font-size:1.25em;}
+h3 {font-size:1.1em;}
+h4 {font-size:1em;}
+h5 {font-size:.9em;}
+
+hr {height:1px;}
+
+a {text-decoration:none;}
+
+dt {font-weight:bold;}
+
+ol {list-style-type:decimal;}
+ol ol {list-style-type:lower-alpha;}
+ol ol ol {list-style-type:lower-roman;}
+ol ol ol ol {list-style-type:decimal;}
+ol ol ol ol ol {list-style-type:lower-alpha;}
+ol ol ol ol ol ol {list-style-type:lower-roman;}
+ol ol ol ol ol ol ol {list-style-type:decimal;}
+
+.txtOptionInput {width:11em;}
+
+#contentWrapper .chkOptionInput {border:0;}
+
+.externalLink {text-decoration:underline;}
+
+.indent {margin-left:3em;}
+.outdent {margin-left:3em; text-indent:-3em;}
+code.escaped {white-space:nowrap;}
+
+.tiddlyLinkExisting {font-weight:bold;}
+.tiddlyLinkNonExisting {font-style:italic;}
+
+/* the 'a' is required for IE, otherwise it renders the whole tiddler in bold */
+a.tiddlyLinkNonExisting.shadow {font-weight:bold;}
+
+#mainMenu .tiddlyLinkExisting,
+	#mainMenu .tiddlyLinkNonExisting,
+	#sidebarTabs .tiddlyLinkNonExisting {font-weight:normal; font-style:normal;}
+#sidebarTabs .tiddlyLinkExisting {font-weight:bold; font-style:normal;}
+
+.header {position:relative;}
+.header a:hover {background:transparent;}
+.headerShadow {position:relative; padding:4.5em 0 1em 1em; left:-1px; top:-1px;}
+.headerForeground {position:absolute; padding:4.5em 0 1em 1em; left:0; top:0;}
+
+.siteTitle {font-size:3em;}
+.siteSubtitle {font-size:1.2em;}
+
+#mainMenu {position:absolute; left:0; width:10em; text-align:right; line-height:1.6em; padding:1.5em 0.5em 0.5em 0.5em; font-size:1.1em;}
+
+#sidebar {position:absolute; right:3px; width:16em; font-size:.9em;}
+#sidebarOptions {padding-top:0.3em;}
+#sidebarOptions a {margin:0 0.2em; padding:0.2em 0.3em; display:block;}
+#sidebarOptions input {margin:0.4em 0.5em;}
+#sidebarOptions .sliderPanel {margin-left:1em; padding:0.5em; font-size:.85em;}
+#sidebarOptions .sliderPanel a {font-weight:bold; display:inline; padding:0;}
+#sidebarOptions .sliderPanel input {margin:0 0 0.3em 0;}
+#sidebarTabs .tabContents {width:15em; overflow:hidden;}
+
+.wizard {padding:0.1em 1em 0 2em;}
+.wizard h1 {font-size:2em; font-weight:bold; background:none; padding:0; margin:0.4em 0 0.2em;}
+.wizard h2 {font-size:1.2em; font-weight:bold; background:none; padding:0; margin:0.4em 0 0.2em;}
+.wizardStep {padding:1em 1em 1em 1em;}
+.wizard .button {margin:0.5em 0 0; font-size:1.2em;}
+.wizardFooter {padding:0.8em 0.4em 0.8em 0;}
+.wizardFooter .status {padding:0 0.4em; margin-left:1em;}
+.wizard .button {padding:0.1em 0.2em;}
+
+#messageArea {position:fixed; top:2em; right:0; margin:0.5em; padding:0.5em; z-index:2000; _position:absolute;}
+.messageToolbar {display:block; text-align:right; padding:0.2em;}
+#messageArea a {text-decoration:underline;}
+
+.tiddlerPopupButton {padding:0.2em;}
+.popupTiddler {position: absolute; z-index:300; padding:1em; margin:0;}
+
+.popup {position:absolute; z-index:300; font-size:.9em; padding:0; list-style:none; margin:0;}
+.popup .popupMessage {padding:0.4em;}
+.popup hr {display:block; height:1px; width:auto; padding:0; margin:0.2em 0;}
+.popup li.disabled {padding:0.4em;}
+.popup li a {display:block; padding:0.4em; font-weight:normal; cursor:pointer;}
+.listBreak {font-size:1px; line-height:1px;}
+.listBreak div {margin:2px 0;}
+
+.tabset {padding:1em 0 0 0.5em;}
+.tab {margin:0 0 0 0.25em; padding:2px;}
+.tabContents {padding:0.5em;}
+.tabContents ul, .tabContents ol {margin:0; padding:0;}
+.txtMainTab .tabContents li {list-style:none;}
+.tabContents li.listLink { margin-left:.75em;}
+
+#contentWrapper {display:block;}
+#splashScreen {display:none;}
+
+#displayArea {margin:1em 17em 0 14em;}
+
+.toolbar {text-align:right; font-size:.9em;}
+
+.tiddler {padding:1em 1em 0;}
+
+.missing .viewer,.missing .title {font-style:italic;}
+
+.title {font-size:1.6em; font-weight:bold;}
+
+.missing .subtitle {display:none;}
+.subtitle {font-size:1.1em;}
+
+.tiddler .button {padding:0.2em 0.4em;}
+
+.tagging {margin:0.5em 0.5em 0.5em 0; float:left; display:none;}
+.isTag .tagging {display:block;}
+.tagged {margin:0.5em; float:right;}
+.tagging, .tagged {font-size:0.9em; padding:0.25em;}
+.tagging ul, .tagged ul {list-style:none; margin:0.25em; padding:0;}
+.tagClear {clear:both;}
+
+.footer {font-size:.9em;}
+.footer li {display:inline;}
+
+.annotation {padding:0.5em; margin:0.5em;}
+
+* html .viewer pre {width:99%; padding:0 0 1em 0;}
+.viewer {line-height:1.4em; padding-top:0.5em;}
+.viewer .button {margin:0 0.25em; padding:0 0.25em;}
+.viewer blockquote {line-height:1.5em; padding-left:0.8em;margin-left:2.5em;}
+.viewer ul, .viewer ol {margin-left:0.5em; padding-left:1.5em;}
+
+.viewer table, table.twtable {border-collapse:collapse; margin:0.8em 1.0em;}
+.viewer th, .viewer td, .viewer tr,.viewer caption,.twtable th, .twtable td, .twtable tr,.twtable caption {padding:3px;}
+table.listView {font-size:0.85em; margin:0.8em 1.0em;}
+table.listView th, table.listView td, table.listView tr {padding:0 3px 0 3px;}
+
+.viewer pre {padding:0.5em; margin-left:0.5em; font-size:1.2em; line-height:1.4em; overflow:auto;}
+.viewer code {font-size:1.2em; line-height:1.4em;}
+
+.editor {font-size:1.1em;}
+.editor input, .editor textarea {display:block; width:100%; font:inherit;}
+.editorFooter {padding:0.25em 0; font-size:.9em;}
+.editorFooter .button {padding-top:0; padding-bottom:0;}
+
+.fieldsetFix {border:0; padding:0; margin:1px 0px;}
+
+.zoomer {font-size:1.1em; position:absolute; overflow:hidden;}
+.zoomer div {padding:1em;}
+
+* html #backstage {width:99%;}
+* html #backstageArea {width:99%;}
+#backstageArea {display:none; position:relative; overflow: hidden; z-index:150; padding:0.3em 0.5em;}
+#backstageToolbar {position:relative;}
+#backstageArea a {font-weight:bold; margin-left:0.5em; padding:0.3em 0.5em;}
+#backstageButton {display:none; position:absolute; z-index:175; top:0; right:0;}
+#backstageButton a {padding:0.1em 0.4em; margin:0.1em;}
+#backstage {position:relative; width:100%; z-index:50;}
+#backstagePanel {display:none; z-index:100; position:absolute; width:90%; margin-left:3em; padding:1em;}
+.backstagePanelFooter {padding-top:0.2em; float:right;}
+.backstagePanelFooter a {padding:0.2em 0.4em;}
+#backstageCloak {display:none; z-index:20; position:absolute; width:100%; height:100px;}
+
+.whenBackstage {display:none;}
+.backstageVisible .whenBackstage {display:block;}
+/*}}}*/
diff --git a/test/data/tiddlywiki/shadows/StyleSheetLocale.tid b/test/data/tiddlywiki/shadows/StyleSheetLocale.tid
new file mode 100755
index 000000000..3cda53a94
--- /dev/null
+++ b/test/data/tiddlywiki/shadows/StyleSheetLocale.tid
@@ -0,0 +1,14 @@
+title: StyleSheetLocale
+
+/***
+StyleSheet for use when a translation requires any css style changes.
+This StyleSheet can be used directly by languages such as Chinese, Japanese and Korean which need larger font sizes.
+***/
+/*{{{*/
+body {font-size:0.8em;}
+#sidebarOptions {font-size:1.05em;}
+#sidebarOptions a {font-style:normal;}
+#sidebarOptions .sliderPanel {font-size:0.95em;}
+.subtitle {font-size:0.8em;}
+.viewer table.listView {font-size:0.95em;}
+/*}}}*/
diff --git a/test/data/tiddlywiki/shadows/StyleSheetPrint.tid b/test/data/tiddlywiki/shadows/StyleSheetPrint.tid
new file mode 100755
index 000000000..d5e718965
--- /dev/null
+++ b/test/data/tiddlywiki/shadows/StyleSheetPrint.tid
@@ -0,0 +1,9 @@
+title: StyleSheetPrint
+
+/*{{{*/
+@media print {
+#mainMenu, #sidebar, #messageArea, .toolbar, #backstageButton, #backstageArea {display: none !important;}
+#displayArea {margin: 1em 1em 0em;}
+noscript {display:none;} /* Fixes a feature in Firefox 1.5.0.2 where print preview displays the noscript content */
+}
+/*}}}*/
diff --git a/test/data/tiddlywiki/shadows/ViewTemplate.tid b/test/data/tiddlywiki/shadows/ViewTemplate.tid
new file mode 100755
index 000000000..84b34ca0d
--- /dev/null
+++ b/test/data/tiddlywiki/shadows/ViewTemplate.tid
@@ -0,0 +1,11 @@
+title: ViewTemplate
+
+<!--{{{-->
+<div class='toolbar' macro='toolbar [[ToolbarCommands::ViewToolbar]]'></div>
+<div class='title' macro='view title'></div>
+<div class='subtitle'><span macro='view modifier link'></span>, <span macro='view modified date'></span> (<span macro='message views.wikified.createdPrompt'></span> <span macro='view created date'></span>)</div>
+<div class='tagging' macro='tagging'></div>
+<div class='tagged' macro='tags'></div>
+<div class='viewer' macro='view text wikified'></div>
+<div class='tagClear'></div>
+<!--}}}-->
diff --git a/test/data/tiddlywiki/shadows/split.recipe b/test/data/tiddlywiki/shadows/split.recipe
new file mode 100755
index 000000000..675fa2b05
--- /dev/null
+++ b/test/data/tiddlywiki/shadows/split.recipe
@@ -0,0 +1,13 @@
+prehead: MarkupPreHead.tid
+shadow: MarkupPreHead.tid
+shadow: ColorPalette.tid
+shadow: StyleSheetColors.tid
+shadow: StyleSheetLayout.tid
+shadow: StyleSheetLocale.tid
+shadow: StyleSheetPrint.tid
+shadow: PageTemplate.tid
+shadow: ViewTemplate.tid
+shadow: EditTemplate.tid
+shadow: GettingStarted.tid
+shadow: OptionsPanel.tid
+shadow: ImportTiddlers.tid
diff --git a/test/data/tiddlywiki/test/README b/test/data/tiddlywiki/test/README
new file mode 100755
index 000000000..2feb764f5
--- /dev/null
+++ b/test/data/tiddlywiki/test/README
@@ -0,0 +1,12 @@
+This directory contains the test suite for the TiddlyWiki core.
+The framework being used is QUnit (http://docs.jquery.com/QUnit).
+
+N.B.:
+The use of JSSpec is gradually being phased out in favor of QUnit.
+Existing JSSpec-based tests are contained in the core/tests directory.
+cf. http://trac.tiddlywiki.org/ticket/963
+
+/html       required HTML components
+/js         actual test code for core modules
+/qunit      testing framework
+/recipes    recipes to build test suite
diff --git a/test/data/tiddlywiki/test/html/qunitpostscript.txt b/test/data/tiddlywiki/test/html/qunitpostscript.txt
new file mode 100755
index 000000000..59a36a872
--- /dev/null
+++ b/test/data/tiddlywiki/test/html/qunitpostscript.txt
@@ -0,0 +1,4 @@
+<h1 id="qunit-header">QUnit tests</h1>
+<h2 id="qunit-banner"></h2>
+<h2 id="qunit-userAgent"></h2>
+<ol id="qunit-tests"></ol>
diff --git a/test/data/tiddlywiki/test/html/split.recipe b/test/data/tiddlywiki/test/html/split.recipe
new file mode 100755
index 000000000..8294cf806
--- /dev/null
+++ b/test/data/tiddlywiki/test/html/split.recipe
@@ -0,0 +1 @@
+postscript: qunitpostscript.txt
diff --git a/test/data/tiddlywiki/test/html/testpostscript.txt b/test/data/tiddlywiki/test/html/testpostscript.txt
new file mode 100755
index 000000000..41c5c928f
--- /dev/null
+++ b/test/data/tiddlywiki/test/html/testpostscript.txt
@@ -0,0 +1,4 @@
+<h2 id="banner"></h2>
+<h2 id="userAgent"></h2>
+<ol id="tests"></ol>
+<div id="main"></div>
diff --git a/test/data/tiddlywiki/test/jqMock/jqMock.html b/test/data/tiddlywiki/test/jqMock/jqMock.html
new file mode 100755
index 000000000..2c6cfee06
--- /dev/null
+++ b/test/data/tiddlywiki/test/jqMock/jqMock.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "xhtml1-transitional.dtd">
+<html>
+<head>
+<title>jqMock Test Suite</title>
+    <link rel="Stylesheet" media="screen" href="../qunit/testsuite.css" type="text/css"/>
+	<script type="text/javascript" src="../../jquery/jquery-1.3.2.min.js"></script>
+	<script type="text/javascript" src="../qunit/testrunner.js"></script>
+	<script type="text/javascript" src="jqMock.js"></script>
+	<script type="text/javascript" src="jqMockTest.js"></script>
+</head>
+<body id="body">
+
+	<h1>jqMock Test Suite</h1>
+	<h2 id="banner"></h2>
+	<h2 id="userAgent"></h2>
+	
+	<!-- Test HTML -->
+	<div id="main" style="display: none;">
+	</div>
+	
+	<ol id="tests"></ol>
+	
+</body>
+</html>
+
diff --git a/test/data/tiddlywiki/test/jqMock/jqMock.js b/test/data/tiddlywiki/test/jqMock/jqMock.js
new file mode 100755
index 000000000..97f96a2c8
--- /dev/null
+++ b/test/data/tiddlywiki/test/jqMock/jqMock.js
@@ -0,0 +1,590 @@
+/*
+ * jqMock - The JavaScript Mock framework for jQuery / jqUnit 
+ * http://code.google.com/p/jqmock/
+ * version 1.1
+ * 
+ * Copyright 2008 Kenneth Ko, under the GNU Lesser General Public License
+ *
+ * By Kenneth Ko
+ * http://longgoldenears.blogspot.com/
+ * 
+ * ==================================================================
+ * Release Notes:
+ * --------------
+ * version 1.1
+ *  - [3] change behaviour of verify() to NOT check unexpected invocations
+ *        (note: it does check unexpected invocations of calls which were setup as expectations)
+ *  - [3] added verifyAll() method which will check unexpected invocations
+ *  - [4] added new assertion method to check for exceptions being thrown, expectThatExceptionThrown()
+ *  - [4] added new expression to help assert the exception, is.exception({name: ... , message: ..., type: ...})
+ *  - refactoring, ArgExpectation has been internally renamed to Expression
+ *
+ * version 1.01
+ *  - [1] [2] bug fixes: circular references
+ *
+ * version 1.0
+ *  - initial release
+* 
+ */
+ 
+var jqMock = jqMock || {};
+
+(function ($) {
+	//======== Utils =============
+	function _isObjExpected(actual, expected, oneway, rchain) {					
+		oneway = oneway || false;
+		rchain = rchain || [] ; // holds elements already compared in the recursion, to prevent circular references
+		if (actual === expected) {
+			return true;
+		} else if (expected instanceof Expression) {
+			return expected.assert(actual);
+		} else if (actual===null || expected===null) {
+			return false;
+		} else if (actual instanceof Array && expected instanceof Array) {
+			// array compare
+			if (actual.length != expected.length)
+				return false;
+			for(var i=0; i<actual.length; i++) {
+				var result = _recurseIsObjExpected(actual[i], expected[i], oneway, rchain, expected[i]);
+				if (!result) return false;
+			
+				//if (!_isObjExpected(actual[i],expected[i]))
+				//	return false;
+			}
+			return true;
+		} else if (typeof actual == "object" && typeof expected == "object") {
+			// object compare, both ways
+			for(var i in expected) {
+				var result = _recurseIsObjExpected(actual[i], expected[i], oneway, rchain, expected[i]);
+				if (!result) return false;
+				//	if ( !_isObjExpected(actual[i], expected[i]))
+				//		return false;				
+			}
+			if (!oneway) {
+				for(var i in actual) {
+					if ( !_isObjExpected(actual[i], expected[i]))
+						return false;
+				}
+			}
+			return true;
+		} else {
+			return false;
+		}
+	};
+	
+	function _recurseIsObjExpected(actual, expected, oneway, rchain, loopvar) {
+		if (typeof loopvar == "object") {
+			for(var i=0; i<rchain.length; i++) {
+				if (loopvar===rchain[i])
+					throw new Error("Circular Reference detected in the object!");
+			}
+			var chainCount = rchain.length;			
+			rchain.push(loopvar);		
+			var result = _isObjExpected(actual, expected, oneway, rchain);
+			rchain.splice(chainCount);
+			return result;	
+		} else {
+			return _isObjExpected(actual, expected, oneway, rchain);
+		}
+	}
+	
+	function assertThat(actual, expected, msg) {
+		var result = actual===expected || _isObjExpected(actual, expected);
+		msg = (msg ? msg + ": " : "");
+		msg += (result ? "actual matched expectation" : "object did not match expectation, actual: " + tostring(actual) + ", expected: " + tostring(expected));
+		ok(result, msg);
+	};
+	var MAX_DEPTH = 100;
+	function tostring(obj, rchain) {
+		
+		rchain = rchain || [];
+		if (rchain.length > MAX_DEPTH)
+			return ".....";
+		if (typeof obj=="object") {
+			for(var a=0; a<rchain.length; a++) {
+				if (obj==rchain[a]) {
+					return "...";					
+				}
+			}
+		}
+		rchain.push(obj);
+		var rchainCount = rchain.length;
+		
+		var result = [];
+		if (obj === null) {
+			return "null";
+		} else if (obj === undefined) {
+			return "undefined";
+		} else if (obj instanceof Array) {
+			result.push("[");
+			for(var j=0; j<obj.length; j++) {
+				result.push(tostring(obj[j], rchain));
+				result.push(",");
+			}
+			if (obj.length>0)
+				result[result.length-1] = "]";
+			else
+				result.push("]");
+		} else if (obj instanceof Expression) {
+			return obj.tostring();
+		} else if (obj instanceof Error) {
+			// for errors, only print name and message (don't want stack)
+			var err = {};
+			if ("name" in obj) err.name = obj.name;
+			if ("message" in obj) err.message = obj.message;
+			return tostring(err, rchain);
+		} else if ($.isFunction(obj)) {
+		//} else if (typeof obj == "function") {
+			return "function()";
+		} else if (typeof obj == "object") {
+			result.push("{");
+			for(var i in obj) {
+				if (/^__/.test(i)) continue;
+				result.push(i);
+				result.push(":");
+				result.push(tostring(obj[i], rchain));
+				result.push(",");
+			}
+			result[result.length==1 ? result.length : result.length-1] = "}";
+		} else {
+			result.push(typeof obj == "string" ? "'" : "");		
+			result.push(obj);
+			result.push(typeof obj == "string" ? "'" : "");		
+		}
+		rchain.splice(rchainCount);
+		return result.join("");					
+	};	
+	function _getClassName(clz) {
+		return $.trim(clz.toString()).match(/^function\s(.*)\(/)[1];
+	}
+	function expectThatExceptionThrown(fn, expression) {
+		try {
+			fn();
+			ok(false, "The expected exception was never thrown. Expression was: " + tostring(expression)); 
+		} catch(ex) {
+			assertThat(ex, expression, "expected exception matching " + tostring(expression) + " to be thrown"); 
+		}
+	};
+	//======== Modifier =============
+	function Modifier(fnName, _origFn) {
+		this._fnName = fnName;
+		this._origFn = _origFn;
+		this._args = [];  // default no arg
+		this._multiplicity = MultiplicityFactory.exactly(1); // default of 1
+		this._returnValue = undefined;
+		this._returnValueSpecified = false;
+		this._exception = null;
+		this._matchCount = 0;
+	}
+	Modifier.prototype.args = function() {
+		var expectedArgs = Array.prototype.slice.call(arguments);
+		this._args = expectedArgs; 
+		return this;
+	};
+	Modifier.prototype.multiplicity = function(m) {
+		if (m instanceof Multiplicity)
+			this._multiplicity = m;
+		else if (typeof m == "number")
+			this._multiplicity = MultiplicityFactory.exactly(m);
+		else
+			throw new Error("Invalid argument for multiplicity()");
+		return this;
+	};	
+	Modifier.prototype.returnValue = function(rv) {
+		this._returnValueSpecified = true;
+		if (typeof rv != "undefined")
+			this._returnValue = rv;
+	};
+	Modifier.prototype.throwException = function(ex) {
+		this._exception = ex;
+	};
+	var MATCHRESULT_does_not_match = -1;
+	var MATCHRESULT_matched_but_disabled = 0;
+	var MATCHRESULT_matched = 1;
+	Modifier.prototype.matches = function(actualArgs) {
+		var b = true;
+		var expectedArgs = this._args;
+		if (expectedArgs.length==0) {
+			// handle no argument
+			b = (actualArgs.length==0);
+		} else if (expectedArgs.length == actualArgs.length) {
+			for(var i=0; i<expectedArgs.length; i++) {
+				if (!_isObjExpected(actualArgs[i], expectedArgs[i])) {
+					b = false;
+					break;
+				}
+			}
+		} else {
+			b = false;
+		}
+		if(!b)
+			return MATCHRESULT_does_not_match; // does not match args
+		else if (this._multiplicity.isDisabled)
+			return MATCHRESULT_matched_but_disabled; // matches args, but disabled
+		else {
+			this._multiplicity.verify(++this._matchCount);
+			return MATCHRESULT_matched; // matches args, and still enabled.
+		}
+	};
+	Modifier.prototype.doAction = function(scope, args) {
+		if (this._returnValueSpecified) {
+			return this._returnValue;
+		} else if (this._exception) {
+			throw this._exception;
+		} else {
+			return this._origFn.apply(scope, args);
+		}	
+	};	
+	Modifier.prototype.satisfied = function() {
+		return this._multiplicity.satisfied;
+	};	
+	Modifier.prototype.tostring = function() {
+		return [
+			(this._multiplicity.satisfied ? "&nbsp;&nbsp;&nbsp;" : "&rarr;"),
+			this._matchCount, " ",
+			this._multiplicity.tostring(), " ",
+			this._fnName, "(",
+			tostring(this._args).replace(/^\[(.*)\]$/, "$1"), 
+			")"
+		].join("");
+	};
+	// ======= Multiplicity ===============
+	var MultiplicityType = {
+		EXACTLY:0,
+		ATLEAST:1,
+		ATMOST:2,
+		RANGE:3		
+	};
+	function Multiplicity(type, lower, upper, initiallySatisfied) {
+		this.type = type;
+		this.lower = lower;
+		this.upper = upper;
+		this.satisfied = initiallySatisfied;
+		this.isDisabled = false;
+	};
+	Multiplicity.prototype.verify = function(count) {
+		this.satisfied = (count >= this.lower & count <= this.upper);
+		this.isDisabled = (count >= this.upper);
+	};
+	Multiplicity.prototype.tostring = function() {
+		if (this.type==MultiplicityType.EXACTLY) {
+			return "(" + this.lower + ")";
+		} else {
+			return [
+				"(", this.lower, "..", 
+				(this.upper==Infinity ? "*" : this.upper),")"
+			].join("");
+		}
+	};
+	var MultiplicityFactory = {	
+		exactly : function(n) {
+			if (n==0) {
+				// zero is actually atMost(0)
+				return new Multiplicity(MultiplicityType.ATMOST, 0, 0, true);
+			} else {
+				return new Multiplicity(MultiplicityType.EXACTLY, n, n, false);
+			}
+		},	
+		times : function(n,m) {
+			if (arguments.length == 1) {
+				return new Multiplicity(MultiplicityType.EXACTLY, n, n, false);
+			} else {
+				if (n==0)
+					// (0..m) is actually atMost(m)
+					return new Multiplicity(MultiplicityType.ATMOST, 0, m, true);
+				else
+					return new Multiplicity(MultiplicityType.RANGE, n, m, false);
+			}
+		},
+		atLeast : function(n) {
+			return new Multiplicity(MultiplicityType.ATLEAST, n, Infinity, false);
+		},
+		atMost : function(n) {
+			return new Multiplicity(MultiplicityType.ATMOST, 0, n, true);
+		}
+	};	
+	// ======= Expression ===============
+	var ExpressionType = {
+		ANYTHING:0,
+		NOT:1,
+		INSTANCEOF:2,
+		SUPERSET:3,
+		REGEX:4,
+		ANYOF:5,
+		ALLOF:6,
+		CUSTOM: 7,
+		ERROR:8
+	};
+	function Expression(type, param) {
+		this.type = type;
+		this.param = param;
+	};	
+	Expression.prototype.assert = function(actual) {
+		switch(this.type) {
+			case ExpressionType.ANYTHING:
+				return true;
+			case ExpressionType.NOT:
+				return !_isObjExpected(actual, this.param);
+			case ExpressionType.INSTANCEOF:
+				return actual instanceof this.param;				
+			case ExpressionType.SUPERSET:
+				return _isObjExpected(actual, this.param, true);
+			case ExpressionType.REGEX:
+				return this.param.test(actual);
+			case ExpressionType.ANYOF:
+				for(var i=0; i<this.param.length; i++) {
+					if (_isObjExpected(actual, this.param[i]))
+						return true;
+				}
+				return false;
+			case ExpressionType.ALLOF:
+				for(var i=0; i<this.param.length; i++) {
+					if (!_isObjExpected(actual, this.param[i]))
+						return false;
+				}
+				return true;	
+			case ExpressionType.CUSTOM:	
+				return this.param(actual);
+			case ExpressionType.ERROR:
+				var exOk = true;
+				if ("name" in this.param)
+					exOk = exOk && (this.param.name === actual.name);
+				if ("message" in this.param)
+					exOk = exOk && (this.param.message === actual.message);
+				if ("type" in this.param)  // type= is.instanceOf(Class)
+					exOk = exOk && (_isObjExpected(actual, this.param.type));
+				return exOk;
+		}	
+	};
+	Expression.prototype.tostring = function() {
+		switch(this.type) {
+			case ExpressionType.ANYTHING:
+				return "is.anything";
+			case ExpressionType.NOT:
+				return "is.not(" + tostring(this.param) +")";
+			case ExpressionType.INSTANCEOF:
+				//return "is.instanceOf(" + $.trim(this.param.toString()).match(/^function\s(.*)\(/)[1] +")";
+				return "is.instanceOf(" + _getClassName(this.param) +")";
+			case ExpressionType.SUPERSET:
+				return "is.objectThatIncludes(" + tostring(this.param) +")";
+			case ExpressionType.REGEX:
+				return "is.regex(" + this.param.toString() +")";
+			case ExpressionType.ANYOF:
+				return "is.anyOf(" + tostring(this.param) +")";		
+			case ExpressionType.ALLOF:
+				return "is.allOf(" + tostring(this.param) +")";					
+			case ExpressionType.CUSTOM:
+				return "is.custom(function)";
+			case ExpressionType.ERROR:
+				if (_isObjExpected(this.param, {}))
+					return "is.exception()";
+				else
+					return "is.exception(" + tostring(this.param) +")";		
+		}
+	};
+	var ExpressionFactory = {
+		anything : new Expression(ExpressionType.ANYTHING),
+		not: function(param) {
+			return new Expression(ExpressionType.NOT, param);
+		},
+		instanceOf: function(param) {
+			if (!$.isFunction(param))
+				throw new Error("Invalid argument to is.instanceOf() , argument must be a Class");
+			return new Expression(ExpressionType.INSTANCEOF, param);
+		},
+		objectThatIncludes: function(param) {
+			return new Expression(ExpressionType.SUPERSET, param);
+		},
+		regex: function(param) {
+			if (!(param instanceof RegExp))
+				throw new Error("Invalid argument to is.regex() , argument must be regex");
+			return new Expression(ExpressionType.REGEX, param);
+		},
+		anyOf: function(param) {
+			if (!(param instanceof Array))
+				throw new Error("Invalid argument to is.anyOf() , argument must be an Array");
+			return new Expression(ExpressionType.ANYOF, param);
+		},
+		allOf: function(param) {
+			if (!(param instanceof Array))
+				throw new Error("Invalid argument to is.allOf() , argument must be an Array");
+			return new Expression(ExpressionType.ALLOF, param);
+		},
+		custom: function(param) {
+			if (!$.isFunction(param))
+				throw new Error("Invalid argument to is.custom() , argument must be a Function that returns a boolean value");
+			return new Expression(ExpressionType.CUSTOM, param);
+		},
+		exception: function(param) {
+			if (typeof param == "string")
+				return new Expression(ExpressionType.ERROR, {message: param});
+			if (typeof param == "undefined")
+				param = {};
+			if (typeof param != "object")
+				throw new Error("Invalid argument to is.exception() , argument must be an object or string");
+			if ("type" in param && !$.isFunction(param["type"]))
+				throw new Error("Invalid argument to is.exception() , the type attribute of the parameter must be a Class");
+			if ("type" in param)  // convert type to is.instanceof()
+				param.type = new Expression(ExpressionType.INSTANCEOF, param.type);
+			return new Expression(ExpressionType.ERROR, param);
+		}
+	};
+	// ======= Mock ==============
+	function Mock(obj, fnName) {
+		var _unmatched = [];
+		var _modifiers = [];
+		var _obj = obj;
+		var _fnName = fnName;	
+		var _isOrdered = false;
+		var _oep = 0; // ordered expectation pointer
+		var _oef = false;  // ordered expectation has failed
+		
+		if (obj ==undefined || obj[fnName] == undefined) {
+			throw new Error("Could not create Mock: the object or function you specified is not defined, obj." + fnName);
+		}
+		if (!$.isFunction(obj[fnName])) {
+			throw new Error("Could not create Mock: " + fnName + " is not a function");
+		}
+		var intercept = function() {
+			var matchedModifier;
+			var matchResult;
+			// ordered expectations
+			if (_isOrdered) {
+				if (!_oef) {
+					matchResult = _modifiers[_oep].matches(arguments);
+					if (matchResult == MATCHRESULT_matched) {
+						matchedModifier = _modifiers[_oep];
+					} else {
+						_oep++;						
+						if (_modifiers.length > _oep) {
+							matchResult = _modifiers[_oep].matches(arguments);
+							if (matchResult == MATCHRESULT_matched) {
+								matchedModifier = _modifiers[_oep];
+							}
+						}
+					}
+				}
+				if (matchedModifier === undefined)
+					_oef = true;	
+			} else {
+				// unordered expectations, matches first one
+				for(var i=0; i<_modifiers.length; i++) {
+					matchResult = _modifiers[i].matches(arguments);
+					if (matchResult == MATCHRESULT_matched) {
+						matchedModifier = _modifiers[i];
+						break;
+					}
+				}
+			}
+			
+			if (matchedModifier)
+				return matchedModifier.doAction(this, arguments);
+				
+			// store the unmatched expectation as an error string
+			var actualArgs = Array.prototype.slice.call(arguments);
+			var unmatchedMsg = fnName + "(" + tostring(actualArgs).replace(/^\[(.*)\]$/, "$1") + ")";
+			_unmatched.push( {'matchResult': matchResult, 'msg': unmatchedMsg} );
+		};
+		if (!obj[fnName].isMock) {
+			var _origFn = obj[fnName];
+			obj[fnName] = intercept;		
+			obj[fnName].isMock = true;
+		} else {
+			throw new Error("Could not create Mock: you tried to overwrite a function which is already a mock!");
+		}
+		this.reset = function() {
+			_oep = 0;
+			_oef = false;		
+			for(var i=0; i<_modifiers.length; i++)
+				delete _modifiers[i];
+			_modifiers = [];
+			for(var i=0; i<_unmatched.length; i++)
+				delete _unmatched[i];
+			_unmatched = [];			
+		};
+		this.restore = function() {
+			this.reset();
+			_obj[_fnName] = _origFn;
+		};
+		this.modify = function() {
+			_modifiers.push(new Modifier(_fnName, _origFn));
+			return _modifiers[_modifiers.length-1];
+		};
+		this.setOrdered = function(b) {
+			_isOrdered = b;
+		};
+		// check that all expectations satisfied
+		var _verify = function(verifyUnmatched) {
+			if (_modifiers.length > 0) {
+				var b = true;
+				for(var i=0; i<_modifiers.length; i++) {
+					if (!_modifiers[i].satisfied()){
+						b = false;
+						break;					
+					}
+				}
+				// unsatisfied expectations
+				var msg = "";				
+				if (!b) {
+					msg += (_isOrdered ? "Ordered" : "Unordered") + " expectations have not yet been satisfied:<br/>";
+					for(var i=0; i<_modifiers.length; i++) {
+						msg += _modifiers[i].tostring() + "<br/>";
+					}
+				}
+				
+				if (_unmatched.length>0) {
+					// unmatched expectations, when using verifyAll()
+					if (verifyUnmatched) {
+						b = false;
+						msg += "No expectation matched for the following calls:<br/>"
+						for(var i=0; i<_unmatched.length; i++) {
+							msg += _unmatched[i].msg + "<br/>";
+						}
+					// unmatched expectations, when using verify()
+					} else {
+						var msg1 = "";
+						for(var i=0; i<_unmatched.length; i++) {
+							if (_unmatched[i].matchResult == MATCHRESULT_matched_but_disabled)
+								msg1 += _unmatched[i].msg + "<br/>";
+						}
+						if (msg1.length>0) {
+							msg += "No expectation matched for the following calls which were setup as expectations:<br/>" + msg1;
+							b = false;
+						}
+					}
+				}
+				
+				if (msg=="")
+					msg = _modifiers.length + " expectations were satisfied";
+				
+				ok(b, msg);
+			} else {
+				throw new Error("Expectation setup error. You must set up some expectations");
+			}
+		};
+		this.verify = function() {
+			_verify(false);
+		};
+		this.verifyAll = function() {
+			_verify(true);
+		};		
+	};
+	//=====changed expect to expects as window.expect exists in qunit==============
+	function addShortcut() {
+		if (window.expects || window.is)
+			throw new Error("Cannot add shortcuts, expect() or is() already exists in global scope!");
+		expects = jqMock.expects;
+		is = jqMock.is;
+	};
+	//===================
+	$.extend(jqMock, {
+		assertThat: assertThat,
+		tostring: tostring,
+		expectThatExceptionThrown: expectThatExceptionThrown,
+		Mock: Mock,
+		// changed expect to expects
+		expects: MultiplicityFactory,
+		is: ExpressionFactory,
+		addShortcut: addShortcut
+	});	
+}) (jQuery);
diff --git a/test/data/tiddlywiki/test/jqMock/jqMockTest.js b/test/data/tiddlywiki/test/jqMock/jqMockTest.js
new file mode 100755
index 000000000..b0fd1148e
--- /dev/null
+++ b/test/data/tiddlywiki/test/jqMock/jqMockTest.js
@@ -0,0 +1,927 @@
+jQuery(document).ready(function(){
+	
+	module("PASS");
+	
+	test("without shortcut", function() {    
+		var myObj = {sayHello:function(){}};
+	    var mock = new jqMock.Mock(myObj, "sayHello");
+	    mock.modify().args(jqMock.is.anyOf(["Lisa","Bart","Maggie"]));
+	    mock.modify().args("Homer").multiplicity(jqMock.expects.atLeast(1));    
+	    myObj.sayHello("Lisa");    
+	    myObj.sayHello("Homer");    
+	    mock.verifyAll();
+	});
+	
+	jqMock.addShortcut();
+	
+	test("mocking native dialog", function() {
+		var confirmMock = new jqMock.Mock(window, "confirm");
+		confirmMock.modify().args("are you sure?").returnValue(true);
+		confirmMock.modify().args("are you sure 2?").returnValue(false);
+		var b1 = confirm("are you sure?");
+		ok(b1, "should be true");
+		var b2 = confirm("are you sure 2?");
+		ok(!b2, "should be true (2)");	
+		confirmMock.verifyAll();
+		confirmMock.restore();
+		
+		var alertMock = new jqMock.Mock(window, "alert");
+		alertMock.modify().args("are you sure?").returnValue();
+		alert("are you sure?");
+		alertMock.verifyAll();
+		alertMock.restore();
+	});
+	
+	test("args() expectation", function() {
+	
+		var myobj = {fn:function(){}};
+		var mock = new jqMock.Mock(myobj, "fn");
+		
+		mock.modify().args(16);
+		mock.modify().args([4,5,6]);
+		var obj = {a:'a', b: ['x', 'y'], func : function() {}};
+		mock.modify().args(obj);
+		mock.modify().args(null);
+		mock.modify().args(undefined);
+		mock.modify().args(16,[4,5,6], obj);
+		mock.modify(); // default no arg, multiplicity 1
+		
+		var objActual = {a:3, fn:function(){}, b:{x:'x',y:'y'}};
+		var objExpect = {b:{x:'x',y:'y'}, a:3, fn:is.anything};
+		mock.modify().args(objExpect);
+		myobj.fn(objActual);
+		
+		myobj.fn(16);
+		myobj.fn([4,5,6]);
+		myobj.fn(obj);
+		myobj.fn(null);
+		myobj.fn();
+		var b;
+		myobj.fn(b);
+		myobj.fn(16,[4,5,6], obj);
+		
+		mock.verifyAll();
+	});
+	
+	test("Expression is()", function() {
+		var myobj = {fn:function(){}};
+		var mock = new jqMock.Mock(myobj, "fn");
+		
+		mock.modify().args(is.anything).multiplicity(4);
+		myobj.fn("a");
+		myobj.fn(3);
+		myobj.fn([1,2,3]);
+		myobj.fn({a:[1,2,3],b:{c:'c'}});
+		mock.verifyAll();
+		mock.reset();
+		
+		mock.modify().args({a:'apple', x: is.anything, b:'banana'}).multiplicity(2);
+		myobj.fn({a:'apple', x: 'xxx', b:'banana'});
+		myobj.fn({a:'apple', b:'banana'});
+		mock.verifyAll();
+		mock.reset();
+		
+		mock.modify().args(is.not('x')).multiplicity(4);
+		myobj.fn("y");
+		myobj.fn(1);
+		myobj.fn(['x','y']);
+		myobj.fn({x:'x', y:'y'});
+		mock.verifyAll();
+		mock.reset();
+		
+		var MyObject = function MyObject(){};
+		mock.modify().args(is.instanceOf(MyObject));
+		mock.modify().args(is.instanceOf(Array));
+		myobj.fn(new MyObject());
+		myobj.fn([1,2,3]);
+		mock.verifyAll();
+		mock.reset();
+		
+		mock.modify().args(is.not(null));
+		mock.modify().args(is.not(undefined));	
+		myobj.fn("something");
+		myobj.fn(null);
+		mock.verifyAll();
+		mock.reset();	
+		
+		mock.modify().args(is.objectThatIncludes({a:'apple', b:'banana'}));
+		myobj.fn({a:'apple', fn:function(){}, b:'banana'});
+		mock.verifyAll();
+		mock.reset();
+		
+		mock.modify().args(is.regex(/^abc[0-9]*xyz$/));
+		mock.modify().args(is.not(is.regex(/[0-9]/)));
+		myobj.fn("abc12345xyz");
+		myobj.fn("abc");
+		mock.verifyAll();
+		mock.reset();
+		
+		mock.modify().args(is.anyOf(["a", "b", "c",null, undefined])).multiplicity(5);
+		myobj.fn("a");
+		myobj.fn(null);
+		myobj.fn("c");
+		myobj.fn(undefined);
+		myobj.fn("b");
+		mock.verifyAll();
+		mock.reset();	
+		
+		mock.modify().args(is.allOf([is.not("a"), is.not("b")])).multiplicity(2);
+		mock.modify().args(is.allOf([is.not(null), is.not(undefined)]));
+		myobj.fn("x");
+		myobj.fn("y");
+		myobj.fn("z");
+		mock.verifyAll();
+		mock.reset();
+			
+		var isEven = function(arg) {
+			return arg % 2 == 0 ;
+		};
+		mock.modify().args(is.custom(isEven)).multiplicity(3);
+		myobj.fn(2);
+		myobj.fn(4);
+		myobj.fn(6);
+		mock.verifyAll();
+		mock.reset();	
+	});
+	
+	test("expectation resolution", function() {
+		var myobj = {fn:function(){}};
+		var mock = new jqMock.Mock(myobj, "fn");
+		
+		mock.modify().args(is.not('x'));
+		mock.modify().args(is.not('y')); 
+		mock.modify().args(is.anything);
+		myobj.fn(1);
+		myobj.fn(2);
+		myobj.fn(3);
+		mock.verifyAll();
+		mock.reset();
+		
+		// this is an RMock behaviour.
+		mock.modify().multiplicity(2).args(is.not("y"));
+		mock.modify().multiplicity(expects.atLeast(2)).args("x");
+		for(var i=0; i<4; i++) myobj.fn("x");
+		mock.verifyAll();
+		mock.reset();
+		
+		mock.modify().multiplicity(expects.times(2,3)).args("x");
+		mock.modify().multiplicity(expects.exactly(1)).args(is.not("y"));
+		mock.modify().multiplicity(expects.atMost(1)).args("x");
+		for(var i=0; i<5; i++) myobj.fn("x");
+		mock.verifyAll();
+		mock.reset();	
+	});
+	
+	test("ordered expectations", function() {
+	
+		var myobj = {fn:function(){}};
+		var mock = new jqMock.Mock(myobj, "fn");
+		mock.setOrdered(true);
+		
+		mock.modify().args(1);
+		mock.modify().args(2);
+		mock.modify().args(3);
+		myobj.fn(1);
+		myobj.fn(2);
+		myobj.fn(3);
+		mock.verifyAll();
+		mock.reset();	
+		
+		mock.modify().args(4);
+		myobj.fn(4);
+		mock.verifyAll();
+		mock.reset();	
+		
+		mock.modify().args('x');
+		mock.modify().args('y');
+		mock.modify().args('x');
+		myobj.fn('x');
+		myobj.fn('y');
+		myobj.fn('x');
+		mock.verifyAll();
+		mock.reset();
+		
+		mock.modify().args(is.anything);
+		mock.modify().args(is.not('y'));
+		mock.modify().args(is.instanceOf(Array));
+		myobj.fn({});
+		myobj.fn('x');
+		myobj.fn([1,2,3]);
+		mock.verifyAll();
+		mock.reset();		
+	});
+	
+	test("unexpected invocation, but using verify() only", function() {
+		var myobj = {fn:function(){}};
+		var mock = new jqMock.Mock(myobj, "fn");	
+		mock.modify().args(1);
+		mock.modify().args(2);
+		mock.modify().args(3);
+		myobj.fn(3);
+		myobj.fn(2);
+		myobj.fn(5);  // unexpected, but we dont check
+		myobj.fn(4);  // unexpected, but we dont check
+		myobj.fn(1);
+		mock.verify();
+	});
+	
+	test("returnValue and intercepting", function() {
+		var myobj = {sum:function(a,b){return a+b;}};
+		var mock = new jqMock.Mock(myobj, "sum");
+		mock.modify().args(5,6).returnValue(100);  // change the returnValue
+		mock.modify().args(5,6); // don't intercept
+		equals(myobj.sum(5,6) , 100);
+		equals(myobj.sum(5,6) , 11);
+		mock.restore();
+		equals(myobj.sum(11,12) , 23);
+	});
+	
+	test("throwException", function() {
+		expect(2);
+		var myobj = {fn:function(){}};
+		var mock = new jqMock.Mock(myobj, "fn");
+		mock.modify().args().throwException("my exception");
+		var myError = new Error("some error");
+		mock.modify().args(1).throwException(myError);	
+		try {
+			myobj.fn();
+		} catch (ex) {
+			equals(ex, "my exception");
+		}
+		try {
+			myobj.fn(1);
+		} catch (ex) {
+			equals(ex.message, "some error");
+		}	
+	});
+	
+	test("multiplicity", function() {
+		var myobj = {fn:function(){}};
+		var mock = new jqMock.Mock(myobj, "fn");
+	
+		mock.modify().args().multiplicity(expects.exactly(1));
+		mock.modify().args('a').multiplicity(expects.times(3));
+		mock.modify().args('c').multiplicity(2);
+		mock.modify().args('b','bbb').multiplicity(expects.times(2,3));
+		mock.modify().args({p:'p'},[7,8]);
+		mock.modify().args('y').multiplicity(expects.atLeast(1));
+		mock.modify().args('z').multiplicity(expects.atMost(4));	
+		mock.modify().args('foo').multiplicity(expects.atMost(0));
+		mock.modify().args('zero1').multiplicity(0);
+		mock.modify().args('zero2').multiplicity(expects.exactly(0));
+		mock.modify().args('zero3').multiplicity(expects.times(0,2));
+	
+		myobj.fn({p:'p'},[7,8]);
+		myobj.fn('a');
+		myobj.fn();
+		myobj.fn('a');		
+		myobj.fn('a');
+		myobj.fn('c');
+		myobj.fn('c');
+		myobj.fn('b','bbb');
+		myobj.fn('z');	
+		myobj.fn('y');	
+		myobj.fn('y');	
+		myobj.fn('b','bbb');
+		myobj.fn('z');	
+		myobj.fn('z');	
+		myobj.fn('z');	
+		mock.verifyAll();
+		mock.reset();
+	});
+	
+	test("tostring", function() {
+		equals(jqMock.tostring(3), "3");
+		equals(jqMock.tostring("a"), "'a'");
+		equals(jqMock.tostring([]), "[]");
+		equals(jqMock.tostring([1,2,3]), "[1,2,3]");
+		equals(jqMock.tostring([1,2,"x"]), "[1,2,'x']");	
+		equals(jqMock.tostring(function(){}), "function()");
+		equals(jqMock.tostring({}), "{}");
+		equals(jqMock.tostring({a:1,b:2,c:'cc'}), "{a:1,b:2,c:'cc'}");
+		var x;
+		equals(jqMock.tostring(x), "undefined");
+		equals(jqMock.tostring(null), "null");
+	
+		equals(jqMock.tostring(is.anything), "is.anything");
+		equals(jqMock.tostring(is.not('x')), "is.not('x')");
+		equals(jqMock.tostring(is.instanceOf(Array)), "is.instanceOf(Array)");
+		equals(jqMock.tostring(is.objectThatIncludes({a:'a'})), "is.objectThatIncludes({a:'a'})");
+		equals(jqMock.tostring(is.regex(/^[0-9]*/)), "is.regex(/^[0-9]*/)");
+		equals(jqMock.tostring(is.anyOf([is.not('a'), is.not('b')])), "is.anyOf([is.not('a'),is.not('b')])");
+		equals(jqMock.tostring(is.allOf([is.not(null), is.not(undefined)])), "is.allOf([is.not(null),is.not(undefined)])");
+		equals(jqMock.tostring(is.exception({name: "ReferenceError", message: "blah is not defined", type: ReferenceError})), "is.exception({name:'ReferenceError',message:'blah is not defined',type:is.instanceOf(ReferenceError)})");
+		equals(jqMock.tostring(is.exception("foo")), "is.exception({message:'foo'})");
+		
+		// NOTE: rhino has error during for(var i : obj) which returns the wrong ordering due to HashMap implementation
+		var obj = {c:{x:'x',y:['xx',99]}, d:[1,2,{p:'p',q:5}], fn:function(){}, a:3, b:'bob'};
+		var objStr = "{c:{x:'x',y:['xx',99]},d:[1,2,{p:'p',q:5}],fn:function(),a:3,b:'bob'}"
+		equals(jqMock.tostring(obj), objStr);
+	});
+	
+	test("circular reference", function() {
+		var a={}; 
+		var b={};
+		var x1={'x':a};
+		var x2={'x':b};
+		a['x'] = x1;		 
+		b['x'] = x2;
+	
+		var aa=[]; 
+		var bb=[];
+		var xx1=[aa];
+		var xx2=[bb];
+		aa[0] = xx1;		 
+		bb[0] = xx2;			
+				
+		expect(6);
+	
+		equals(jqMock.tostring(a), "{x:{x:...}}");
+		equals(jqMock.tostring(aa), "[[...]]");
+			
+		try {
+			jqMock.assertThat(a,b);
+		} catch (ex) {
+			equals(ex.message, "Circular Reference detected in the object!", "ciruclar ref in object");
+		}
+		try {
+			jqMock.assertThat(a,b);
+		} catch (ex) {
+			equals(ex.message, "Circular Reference detected in the object!", "ciruclar ref in object");
+		}
+		try {
+			var myobj = {fn:function(){}};
+			var mock = new jqMock.Mock(myobj, "fn");
+			mock.modify().args(a).multiplicity(1);
+			myobj.fn(b);
+		} catch (ex) {
+			equals(ex.message, "Circular Reference detected in the object!", "ciruclar ref in object");
+		}
+		try {
+			var myobj = {fn:function(){}};
+			var mock = new jqMock.Mock(myobj, "fn");
+			mock.modify().args(aa).multiplicity(1);
+			myobj.fn(bb);
+		} catch (ex) {
+			equals(ex.message, "Circular Reference detected in the object!", "ciruclar ref in object");
+		}
+	});
+	
+	test("object assertion", function() {
+		jqMock.assertThat(window, window, "assertThat(window), reference equality");
+		jqMock.assertThat(3,3);
+		jqMock.assertThat("a","a");
+		jqMock.assertThat([1,2,3],[1,2,3]);	
+		jqMock.assertThat({},{}, "{}");
+		jqMock.assertThat([{a:'a'},{b:'b',d:'d'}],[{a:'a'},{d:'d', b:'b'}]);
+		jqMock.assertThat({b:'b',x:[1,2,3],d:'d'},{d:'d',x:[1,2,3],b:'b'});
+		var fn = function(n) {return n+1;};
+		jqMock.assertThat(fn, fn);
+		
+		var objActual = {a:3, b:{x:'x',y:'y'}, c:[7,8,9]};
+		var objExpect = {b:{x:'x',y:'y'}, c:[7,8,9], a:3};
+		jqMock.assertThat(objActual,objExpect);
+		
+		jqMock.assertThat([1,2,3], is.instanceOf(Array));
+		jqMock.assertThat("foo", is.anyOf(['foo','bar']));
+		jqMock.assertThat({x:'x', a:'a', y:'y'}, is.objectThatIncludes({a:'a'}));
+		
+		jqMock.assertThat(new Error("booya"), is.exception("booya"), "is.exception");
+	});
+	
+	test("expectThatExceptionThrown", function() {
+		// simple compare
+		jqMock.expectThatExceptionThrown(function() {
+			throw "blah";
+		}, "blah");
+		// using expression
+		jqMock.expectThatExceptionThrown(function() {
+			throw new Error("booya");
+		}, is.allOf([is.instanceOf(Error), is.objectThatIncludes({'message':'booya'})]));	
+		// using is.exception expression
+		jqMock.expectThatExceptionThrown(function() {
+			throw {"message":"bad exception"};
+		}, is.exception({message: "bad exception"}));	
+		jqMock.expectThatExceptionThrown(function() {
+			throw new Error("bad exception 2");
+		}, is.exception("bad exception 2"));		
+		jqMock.expectThatExceptionThrown(function() {
+			eval("blah");
+		}, is.exception({name: "ReferenceError", message: "blah is not defined", type: ReferenceError}));
+		function MyUserException (message) {
+		  this.message=message;
+		  this.name="UserException";
+		}
+		jqMock.expectThatExceptionThrown(function() {
+			throw new MyUserException("booya");
+		}, is.exception({name: "UserException", message: "booya", type: MyUserException}));
+		// just that some expression is thrown
+		jqMock.expectThatExceptionThrown(function() {
+			throw new Error("anything");
+		}, is.exception());	
+	});
+	
+	test("error handling", function() {
+		expect(15);
+		var obj = {x:'x'};
+		try {
+			new jqMock.Mock(obj, "x");
+		} catch(ex) {
+			equals(ex.message, "Could not create Mock: x is not a function", "exception should be thrown");
+		}
+		var obj2;
+		try {
+			new jqMock.Mock(obj2, "x");
+		} catch(ex) {
+			equals( ex.message, "Could not create Mock: the object or function you specified is not defined, obj.x", "exception should be thrown");
+		}	
+		var obj3 = {};
+		try {
+			new jqMock.Mock(obj3, "x");
+		} catch(ex) {
+			equals(ex.message, "Could not create Mock: the object or function you specified is not defined, obj.x", "exception should be thrown");
+		}
+		var obj4 = {fn:function(){}};
+		try {
+			var mock = new jqMock.Mock(obj4, "fn");
+			mock.verify();
+		} catch(ex) {
+			equals(ex.message, "Expectation setup error. You must set up some expectations", "exception should be thrown");
+		}
+		var alertMock = new jqMock.Mock(window, "alert");
+		try {		
+			ok(window.alert.isMock, "flag should be set");
+			new jqMock.Mock(window, "alert");		
+		} catch(ex) {
+			equals(ex.message, "Could not create Mock: you tried to overwrite a function which is already a mock!", "exception should be thrown");
+		}
+		alertMock.restore();
+		
+		var obj5 = {fn:function(){}};
+		var mock5 = new jqMock.Mock(obj5, "fn");
+		try {
+			mock5.modify().args(is.instanceOf('x'));
+		} catch(ex) {
+			equals(ex.message, "Invalid argument to is.instanceOf() , argument must be a Class", "exception should be thrown");
+		}
+		try {
+			mock5.modify().args(is.regex('x'));
+		} catch(ex) {
+			equals(ex.message, "Invalid argument to is.regex() , argument must be regex", "exception should be thrown");
+		}
+		try {
+			mock5.modify().args(is.anyOf('x'));
+		} catch(ex) {
+			equals(ex.message, "Invalid argument to is.anyOf() , argument must be an Array", "exception should be thrown");
+		}
+		try {
+			mock5.modify().args(is.allOf('x'));
+		} catch(ex) {
+			equals(ex.message, "Invalid argument to is.allOf() , argument must be an Array", "exception should be thrown");
+		}
+		try {
+			mock5.modify().args(is.custom('x'));
+		} catch(ex) {
+			equals(ex.message, "Invalid argument to is.custom() , argument must be a Function that returns a boolean value", "exception should be thrown");
+		}
+		try {
+			mock5.modify().multiplicity("x");
+		} catch(ex) {
+			equals(ex.message, "Invalid argument for multiplicity()", "exception should be thrown");
+		}
+			
+		try {
+			jqMock.addShortcut();
+		} catch(ex) {
+			equals(ex.message, "Cannot add shortcuts, expect() or is() already exists in global scope!", "exception should be thrown");	
+		}	
+	
+		try {
+			is.exception(0);
+		} catch(ex) {
+			equals(ex.message, "Invalid argument to is.exception() , argument must be an object or string");
+		}
+		
+		try {
+			is.exception({type:'foo'});
+		} catch(ex) {
+			equals(ex.message, "Invalid argument to is.exception() , the type attribute of the parameter must be a Class");
+		}
+	});
+	
+	//====================================================================
+	// The following tests check the failure behaviour of jqMock.
+	// After running tests that record failures through the framework,
+	// this code will scrape the resulting HTML to check the failures.
+	// Note: does not support the drilldown doubleclick view
+	//====================================================================
+	
+	var counter = 15; // number of tests in PASS module above
+	
+	var assertFailureCallbacks = []
+	function assertFailure(callback) {
+		assertFailureCallbacks.push(callback);
+	}
+	function assertFailMessages(expectedMessages) {
+		var allAssertionsPassed = true;
+		var createSpan = function(passes) {
+			return $("<span></span>")
+				.css("color", passes ? "green" : "#FF6E1F")
+				.text(passes? " [PASS]" : " [FAIL]");
+		};
+		var testResult = $('ol#tests>li').eq(counter++);	
+		var assertionResults = testResult.find("ol>li");
+		assertionResults.each(function(i,x) {
+			var tmp = document.createElement("div");
+			tmp.innerHTML = expectedMessages[i];  // because of HTML entities
+			var ok = (x.innerHTML==tmp.innerHTML);
+			if (!ok) {
+				allAssertionsPassed = false;
+				if (console && console.error) {
+					console.error("[" + counter + "] Actual:\n" + x.innerHTML);
+					console.error("[" + counter + "] Expected:\n" + tmp.innerHTML);
+				}
+			}
+			$(x).append(createSpan(ok));
+			tmp = null;
+		});
+		createSpan(allAssertionsPassed).appendTo(testResult.find("strong"));
+	}
+	$(function() {
+		for(var i=0; i<assertFailureCallbacks.length; i++) {
+			assertFailureCallbacks[i]();
+		}
+		// scrape HTML to find fails, ignoring expected failures
+		var failed = $('ol#tests>li.fail').filter(function(){
+			return $(this).find('strong').text().indexOf(") [PASS]")<0;
+		});
+		$('h2#banner')[0].className = (failed.length>0 ? "fail" : "pass");
+	});
+	
+	
+	var unos = "Unordered expectations have not yet been satisfied:<br>";
+	var onos = "Ordered expectations have not yet been satisfied:<br>";
+	var noex = "No expectation matched for the following calls:<br>";
+	var noex2 = "No expectation matched for the following calls which were setup as expectations:<br>"
+	var br = "<br>";
+	var s3 = "&nbsp;&nbsp;&nbsp;";
+	
+	
+	// ----------------------  run the tests ----------------------
+	module("FAIL");
+	
+	test("mocking native dialog", function() {
+		var alertMock = new jqMock.Mock(window, "alert");
+		alertMock.modify().args("some alert");
+		window.alert("some other value");		
+		alertMock.verifyAll();
+		alertMock.restore();
+	});
+	assertFailure(function() {
+		var expected = [];
+		expected[0] = unos +
+			"&rarr;0 (1) alert('some alert')" + br +
+			noex +
+			"alert('some other value')" + br;
+		assertFailMessages(expected);
+	});
+	
+	
+	test("args() expectation", function() {
+		var myobj = {fn:function(){}};
+		var mock = new jqMock.Mock(myobj, "fn");
+		
+		var objActual = {a:3, fn:function(){}, b:{x:'x',y:'y'}};
+		var objExpect = {b:{x:'x',y:'zzzzz'}, a:3};
+		mock.modify().args(objExpect);
+		mock.modify().args(1,2,3);
+		mock.modify().args();
+		
+		myobj.fn(objActual);
+		myobj.fn(1,2);
+		myobj.fn('foo');
+				
+		mock.verifyAll();
+	});
+	assertFailure(function() {
+		var expected = [];
+		expected[0] = unos +
+			"&rarr;0 (1) fn({b:{x:'x',y:'zzzzz'},a:3})" +br+
+			"&rarr;0 (1) fn(1,2,3)"+br+
+			"&rarr;0 (1) fn()"+br+		
+			noex+
+			"fn({a:3,fn:function(),b:{x:'x',y:'y'}})"+br+
+			"fn(1,2)"+br+
+			"fn('foo')"+br;
+		assertFailMessages(expected);
+	});
+	
+	
+	test("Expression is()", function() {
+		var myobj = {fn:function(){}};
+		var mock = new jqMock.Mock(myobj, "fn");
+	
+		mock.modify().args(is.not('x'));
+		mock.verifyAll();
+		mock.reset();
+		
+		var MyObject = function MyObject(){};
+		mock.modify().args(is.instanceOf(MyObject));
+		mock.modify().args(is.instanceOf(Array));
+		mock.verifyAll();
+		mock.reset();
+		
+		mock.modify().args(is.objectThatIncludes({a:'apple', b:'banana'}));
+		myobj.fn({a:'apple'});
+		mock.verifyAll();
+		mock.reset();
+		
+		mock.modify().args(is.regex(/^[0-9]+/));
+		myobj.fn("abc");
+		mock.verifyAll();
+		mock.reset();
+		
+		mock.modify().args(is.anyOf(["a", "b", "c"]));
+		myobj.fn("d");
+		mock.verifyAll();
+		mock.reset();	
+		
+		mock.modify().args(is.allOf([is.not(null), is.not(undefined)]));
+		myobj.fn(null);
+		myobj.fn(undefined);
+		mock.verifyAll();
+		mock.reset();
+			
+		var isEven = function(arg) {
+			return arg % 2 == 0 ;
+		};
+		mock.modify().args(is.custom(isEven)).multiplicity(2);
+		myobj.fn(3);
+		myobj.fn(2);
+		mock.verifyAll();
+		mock.reset();
+			
+	});
+	assertFailure(function() {
+		var expected = [];
+		expected[0] = unos +
+			"&rarr;0 (1) fn(is.not('x'))" +br;
+		expected[1] = unos +		
+			"&rarr;0 (1) fn(is.instanceOf(MyObject))" +br+
+			"&rarr;0 (1) fn(is.instanceOf(Array))" +br;	
+		expected[2] = unos +	
+			"&rarr;0 (1) fn(is.objectThatIncludes({a:'apple',b:'banana'}))" + br+
+			noex+
+			"fn({a:'apple'})"+ br;
+		expected[3] = unos +	
+			"&rarr;0 (1) fn(is.regex(/^[0-9]+/))" + br +
+			noex+
+			"fn('abc')" + br;
+		expected[4] = unos +
+			"&rarr;0 (1) fn(is.anyOf(['a','b','c']))" + br + 
+			noex+
+			"fn('d')" + br;
+		expected[5] = unos +
+			"&rarr;0 (1) fn(is.allOf([is.not(null),is.not(undefined)]))" + br + 
+			noex+
+			"fn(null)" + br +
+			"fn(undefined)" + br;		
+		expected[6] = unos +
+			"&rarr;1 (2) fn(is.custom(function))" + br + 
+			noex+
+			"fn(3)" + br;			
+		assertFailMessages(expected);
+	});
+	
+	test("expectation resolution", function() {
+		var myobj = {fn:function(){}};
+		var mock = new jqMock.Mock(myobj, "fn");
+		
+		// this is RMock behaviour
+		mock.modify().multiplicity(expects.atLeast(2)).args("x"); // atLeast will always match...
+		mock.modify().multiplicity(2).args(is.not("y"));         // meaning this will never get matched
+		myobj.fn("x");
+		myobj.fn("x");
+		myobj.fn("x");
+		myobj.fn("x");
+		mock.verifyAll();
+		mock.reset();
+		
+		// even without verifying unexpected invocations, should fail
+		mock.modify().args("x").multiplicity(2);
+		myobj.fn("x");
+		myobj.fn("x");
+		myobj.fn("x");  // 3rd invoc, should fail
+		myobj.fn("y");  // since using verify(), should ignore this one
+		mock.verify();	
+	});
+	assertFailure(function() {
+		var expected = [];
+		expected[0] = unos +
+			s3 + "4 (2..*) fn('x')" + br +
+			"&rarr;0 (2) fn(is.not('y'))" + br;
+		expected[1] = noex2 + "fn('x')" + br;
+		assertFailMessages(expected);
+	});
+	
+	
+	
+	
+	test("ordered expectations", function() {
+	
+		var myobj = {fn:function(){}};
+		var mock = new jqMock.Mock(myobj, "fn");
+		mock.setOrdered(true);
+		
+		mock.modify().args(1);
+		mock.modify().args(2);
+		mock.modify().args(3);
+		myobj.fn(1);
+		myobj.fn(3);
+		myobj.fn(2);
+		mock.verifyAll();
+		mock.reset();
+		
+		mock.modify().args('x');
+		mock.modify().args('y');
+		mock.modify().args('x');
+		myobj.fn('x');
+		myobj.fn('x');
+		myobj.fn('y');
+		mock.verifyAll();
+		mock.reset();
+		
+		mock.modify().args(1);
+		mock.modify().args(2);
+		mock.modify().args(3);
+		myobj.fn(1);
+		myobj.fn(3);
+		myobj.fn(2);
+		mock.verify();  // verify() only
+		mock.reset();			
+	});
+	assertFailure(function() {
+		var expected = [];
+		expected[0] = onos +
+			s3 + "1 (1) fn(1)" + br +
+			"&rarr;0 (1) fn(2)" + br+
+			"&rarr;0 (1) fn(3)" + br+
+			noex+
+			"fn(3)" + br+
+			"fn(2)" + br;
+		expected[1] = onos +
+			s3 + "1 (1) fn('x')" + br +
+			"&rarr;0 (1) fn('y')" + br+
+			"&rarr;0 (1) fn('x')" + br+
+			noex+
+			"fn('x')" + br+
+			"fn('y')" + br;		
+		expected[2] = onos +
+			s3 + "1 (1) fn(1)" + br +
+			"&rarr;0 (1) fn(2)" + br+
+			"&rarr;0 (1) fn(3)" + br;	
+		assertFailMessages(expected);
+	});
+	
+	
+	test("using verify() does not print out unexpected section", function() {
+		var myobj = {fn:function(){}};
+		var mock = new jqMock.Mock(myobj, "fn");
+		
+		var objActual = {a:3, fn:function(){}, b:{x:'x',y:'y'}};
+		var objExpect = {b:{x:'x',y:'zzzzz'}, a:3};
+		mock.modify().args(objExpect);
+		mock.modify().args(1,2,3);
+		mock.modify().args();
+		
+		myobj.fn(objActual);
+		myobj.fn(1,2);
+		myobj.fn('foo');
+				
+		mock.verify();
+	});
+	assertFailure(function() {
+		var expected = [];
+		expected[0] = unos +
+			"&rarr;0 (1) fn({b:{x:'x',y:'zzzzz'},a:3})" +br+
+			"&rarr;0 (1) fn(1,2,3)"+br+
+			"&rarr;0 (1) fn()"+br;
+		assertFailMessages(expected);
+	});
+	
+	
+	test("object assertion", function() {
+		jqMock.assertThat(1,3);
+		jqMock.assertThat(3,"3");
+		jqMock.assertThat("b","a");
+		jqMock.assertThat([1,2,3],[1,2]);
+		jqMock.assertThat([1,2,3],[3,2,1]);
+		jqMock.assertThat([1,2,3],[1,2,"x"]);	
+		jqMock.assertThat([1,2,3,4,5,6,7],[1,2,"x",4,5,6,7]);
+		jqMock.assertThat([1,2,3,4,5,6,7],[1,2,"3",4,5,6,7]);
+		jqMock.assertThat({a:'a',b:'b',c:'c'},{a:'a',b:'b'});
+		var objActual = {a:3, fn:function(){}, b:{x:'x',y:'y'}};
+		var objExpect = {b:{x:'x',y:'zzzzz'}, a:3};
+		jqMock.assertThat(objActual,objExpect);
+		jqMock.assertThat(3, is.instanceOf(Array));
+	});
+	assertFailure(function() {
+		var expected = [
+			"object did not match expectation, actual: 1, expected: 3",
+			"object did not match expectation, actual: 3, expected: '3'",
+			"object did not match expectation, actual: 'b', expected: 'a'",
+			"object did not match expectation, actual: [1,2,3], expected: [1,2]",
+			"object did not match expectation, actual: [1,2,3], expected: [3,2,1]",
+			"object did not match expectation, actual: [1,2,3], expected: [1,2,'x']",
+			"object did not match expectation, actual: [1,2,3,4,5,6,7], expected: [1,2,'x',4,5,6,7]",
+			"object did not match expectation, actual: [1,2,3,4,5,6,7], expected: [1,2,'3',4,5,6,7]",
+			"object did not match expectation, actual: {a:'a',b:'b',c:'c'}, expected: {a:'a',b:'b'}",
+			"object did not match expectation, actual: {a:3,fn:function(),b:{x:'x',y:'y'}}, expected: {b:{x:'x',y:'zzzzz'},a:3}",
+			"object did not match expectation, actual: 3, expected: is.instanceOf(Array)"
+		];
+		assertFailMessages(expected);
+	});	
+	
+	
+	  
+	  
+	test("multiplicity", function() {
+		var myobj = {fn:function(){}};
+		var mock = new jqMock.Mock(myobj, "fn");
+	
+		mock.modify().args('x');
+		mock.modify().args('y');
+		myobj.fn('x');
+		myobj.fn('x');
+		myobj.fn('y');
+		mock.verifyAll();
+		mock.reset();
+		
+		mock.modify().args({a:'alice',b:'bob'});
+		mock.modify().args("foobar").multiplicity(expects.atLeast(3));
+		mock.modify().args("foo").multiplicity(expects.atMost(1));
+		mock.modify().args('a','b', 'c').multiplicity(expects.times(2,3));
+		mock.modify().args(123).multiplicity(0);
+		
+		for (var i=0; i<2; i++) myobj.fn({a:'alice',b:'bob'});
+		for (var i=0; i<2; i++) myobj.fn('foobar');
+		for (var i=0; i<2; i++) myobj.fn('foo');
+		for (var i=0; i<4; i++) myobj.fn('a','b', 'c');
+		myobj.fn(123);
+		mock.verifyAll();
+		mock.reset();
+			
+	});
+	assertFailure(function() {
+		var expected = [];
+		expected[0] = noex+
+			"fn('x')" + br;
+		expected[1] = unos +
+			s3 + "1 (1) fn({a:'alice',b:'bob'})" + br +
+			"&rarr;2 (3..*) fn('foobar')" + br+
+			s3 + "1 (0..1) fn('foo')" + br +
+			s3 + "3 (2..3) fn('a','b','c')" + br +
+			"&rarr;1 (0..0) fn(123)" + br +
+			noex+
+			"fn({a:'alice',b:'bob'})" + br+
+			"fn('foo')" + br +		
+			"fn('a','b','c')" + br;
+		assertFailMessages(expected);
+	});
+	
+	
+	test("expectThatExceptionThrown", function() {
+		jqMock.expectThatExceptionThrown(function() {
+			//noop
+		}, "something");
+		
+		jqMock.expectThatExceptionThrown(function() {
+			throw "foo";
+		}, "bar");
+		
+		jqMock.expectThatExceptionThrown(function() {
+			throw new Error("bad exception 2");
+		}, is.exception("bad exception 3"));
+		
+		jqMock.expectThatExceptionThrown(function() {
+			eval("blah");
+		}, is.exception({type: RangeError}));
+		
+		// just that some expression is thrown
+		jqMock.expectThatExceptionThrown(function() {
+			//noop
+		}, is.exception());		
+	});
+	assertFailure(function() {
+		var expected = [
+			"The expected exception was never thrown. Expression was: 'something'",
+			"expected exception matching 'bar' to be thrown: object did not match expectation, actual: 'foo', expected: 'bar'",
+			"expected exception matching is.exception({message:'bad exception 3'}) to be thrown: object did not match expectation, actual: {name:'Error',message:'bad exception 2'}, expected: is.exception({message:'bad exception 3'})",
+			"expected exception matching is.exception({type:is.instanceOf(RangeError)}) to be thrown: object did not match expectation, actual: {name:'ReferenceError',message:'blah is not defined'}, expected: is.exception({type:is.instanceOf(RangeError)})",
+			"The expected exception was never thrown. Expression was: is.exception()"
+		];
+		assertFailMessages(expected);
+	});
+
+
+});
diff --git a/test/data/tiddlywiki/test/jqMock/split.recipe b/test/data/tiddlywiki/test/jqMock/split.recipe
new file mode 100755
index 000000000..32c603fc7
--- /dev/null
+++ b/test/data/tiddlywiki/test/jqMock/split.recipe
@@ -0,0 +1 @@
+jslib: jqMock.js
\ No newline at end of file
diff --git a/test/data/tiddlywiki/test/js/Animator.js b/test/data/tiddlywiki/test/js/Animator.js
new file mode 100755
index 000000000..8cc383435
--- /dev/null
+++ b/test/data/tiddlywiki/test/js/Animator.js
@@ -0,0 +1,32 @@
+jQuery(document).ready(function(){
+
+	module("Animator");
+
+	test("Animator : constructor", function() {
+
+	var a = new Animator();
+
+	same(typeof a,'object','the Animator() constructor should return an object');
+
+	same(a.running,0,'the object returned by the Animator() constructor should contain a \'running\' integer with a value of 0 ');
+
+	same(a.timerID,0,'the object returned by the Animator() constructor should contain a \'timerID\' integer with a value of 0 ');
+
+	same(a.animations.length,0,'the object returned by the Animator() constructor should contain an empty \'animations\' array');
+
+	});
+
+	test("Animator : functions", function() {
+
+	var expected = ".2061";
+	var actual = Animator.slowInSlowOut(0.3);
+	actual = actual.toString().substr(1,5);
+	same(actual,expected,'given a float value, Animator.slowInSlowOut() returns the result of the correct mathematical transformation.');
+
+	expected = 0;
+	actual = Animator.slowInSlowOut(2);
+	same(actual,expected,'given a value above the max of valid input, Animator.slowInSlowOut() clamps its output appropriately.');
+
+	});
+});
+
diff --git a/test/data/tiddlywiki/test/js/Arrays.js b/test/data/tiddlywiki/test/js/Arrays.js
new file mode 100755
index 000000000..df6b5f4ae
--- /dev/null
+++ b/test/data/tiddlywiki/test/js/Arrays.js
@@ -0,0 +1,220 @@
+jQuery(document).ready(function() {
+	module("Arrays");
+
+	test("Array indexOf", function() {
+		var actual, expected;
+
+		actual = typeof [].indexOf;
+		expected = "function";
+		same(actual, expected, "method exists");
+
+		actual = ["foo", "bar", "baz"].indexOf("bar");
+		expected = 1;
+		same(actual, expected, "returns element postion");
+
+		actual = ["foo", "bar"].indexOf("baz");
+		expected = -1;
+		same(actual, expected, "returns -1 if element not present");
+
+		actual = ["foo", "bar", "baz"].indexOf("baz", 1);
+		expected = 2;
+		same(actual, expected, "returns element position if element is present within given range");
+
+		actual = ["foo", "bar", "baz"].indexOf("foo", 1);
+		expected = -1;
+		same(actual, expected, "returns -1 if element is not present within given range");
+	});
+
+	test("Array findByField", function() {
+		var actual, expected;
+
+		var L = [{ foo: "lorem", bar: "ipsum" }, { bar: "dolor", baz: "sit" }, { bar: "dolor" }];
+
+		actual = L.findByField();
+		expected = 0;
+		same(actual, expected, "returns 0 if no arguments are specified"); // XXX: not actually desired; cf. ticket #964
+
+		actual = L.findByField("bar", "dolor");
+		expected = 1;
+		same(actual, expected, "returns position of first matching element");
+
+		actual = L.findByField("bar", "xxx");
+		expected = null;
+		same(actual, expected, "returns null if no match was found"); // XXX: not actually desired; cf. ticket #966
+
+	});
+
+	test("Array contains", function() {
+		var actual, expected;
+
+		var L = ["foo", "bar", "baz", "bar"];
+
+		actual = L.contains();
+		expected = false;
+		same(actual, expected, "returns false if no arguments are specified");
+
+		actual = L.contains("bar");
+		expected = true;
+		same(actual, expected, "returns true if a matching element was found");
+
+		actual = L.contains("xxx");
+		expected = false;
+		same(actual, expected, "returns false if no matching element was found");
+	});
+
+	test("Array containsAny", function() {
+		var actual, expression, expected;
+
+		var L = ["foo", "bar", "baz"];
+
+		expression = function() { L.containsAny(); };
+		expected = "TypeError";
+		raises(expression, expected, "raises exception if no arguments are specified");
+
+		actual = L.containsAny("foo");
+		expected = false;
+		same(actual, expected, "returns false if argument is not an array"); // XXX: not actually desired!?
+
+		actual = L.containsAny(["lorem", "bar"]);
+		expected = true;
+		same(actual, expected, "returns true if a matching item has been found");
+
+		actual = L.containsAny(["lorem", "ipsum"]);
+		expected = false;
+		same(actual, expected, "returns false if no matching item has been found");
+	});
+
+	test("Array containsAll", function() {
+		var actual, expression, expected;
+
+		var L = ["foo", "bar", "baz"];
+
+		expression = function() { L.containsAll(); };
+		expected = "TypeError";
+		raises(expression, expected, "raises exception if no arguments are specified");
+
+		actual = L.containsAll("foo");
+		expected = false;
+		same(actual, expected, "returns false if argument is not an array"); // XXX: not actually desired!?
+
+		actual = L.containsAll(["foo", "bar"]);
+		expected = true;
+		same(actual, expected, "returns true if all given items have been found");
+
+		actual = L.containsAll(["lorem", "bar"]);
+		expected = false;
+		same(actual, expected, "returns false if not all given items have been found");
+	});
+
+	test("Array pushUnique", function() {
+		var actual, expected;
+
+		/* XXX: behavior currently undefined
+		actual = ["foo", "bar"];
+		actual.pushUnique();
+		expected = ["foo", "bar"];
+		same(actual, expected, "does not modify array if no arguments are specified");
+		*/
+
+		actual = ["foo", "bar"];
+		actual.pushUnique("baz");
+		expected = ["foo", "bar", "baz"];
+		same(actual, expected, "appends given item to original array, provided an identical element is not present yet");
+
+		actual = ["foo", "bar", "baz"];
+		actual.pushUnique("baz");
+		expected = ["foo", "bar", "baz"];
+		same(actual, expected, "does not modify original array if given item is already present");
+
+		actual = [{ foo: "lorem" }, { bar: "ipsum" }];
+		actual.pushUnique({ bar: "ipsum" });
+		expected = [{ foo: "lorem" }, { bar: "ipsum" }, { bar: "ipsum" }];
+		same(actual, expected, "appends given item to original array if it is an object (deep comparison is not supported)"); // XXX: not actually desired!? -- cf. #606
+	});
+
+	test("Array remove", function() {
+		var actual, expected, L;
+
+		actual = ["foo", "bar", "baz"];
+		actual.remove();
+		expected = ["foo", "bar", "baz"];
+		same(actual, expected, "does not modify original array if no arguments are specified");
+
+		actual = ["foo", "bar", "baz"];
+		actual.remove("bar");
+		expected = ["foo", "baz"];
+		same(actual, expected, "removes given item from original array, provided such an element is present");
+
+		actual = ["foo", "bar", "baz"];
+		actual.remove("lorem");
+		expected = ["foo", "bar", "baz"];
+		same(actual, expected, "does not modify original array if given item is not present");
+
+		actual = [{ foo: "lorem" }, { bar: "ipsum" }];
+		actual.remove({ bar: "ipsum" });
+		expected = [{ foo: "lorem" }, { bar: "ipsum" }];
+		same(actual, expected, "does not modify original array if given item is an object (deep comparison is not supported)"); // XXX: not actually desired!? -- cf. #606
+	});
+
+	test("Array setItem", function() {
+		var actual, expected;
+
+		actual = ["foo", "bar", "baz"];
+		actual.setItem();
+		expected = ["foo", "bar", "baz"];
+		same(actual, expected, "does not modify array if no arguments are specified");
+
+		actual = ["foo", "bar", "baz"];
+		actual.setItem("foo");
+		expected = ["foo", "bar", "baz"];
+		same(actual, expected, "does not modify original array if mode is not specified");
+
+		actual = ["foo", "bar"];
+		actual.setItem("baz", 0);
+		expected = ["foo", "bar", "baz"];
+		same(actual, expected, "appends given item to original array if mode is 0 and element is not present");
+
+		actual = ["foo", "bar", "baz"];
+		actual.setItem("bar", 0);
+		expected = ["foo", "baz"];
+		same(actual, expected, "removes given item from original array if mode 0 and element is present");
+
+		actual = ["foo", "bar"];
+		actual.setItem("baz", +1);
+		expected = ["foo", "bar", "baz"];
+		same(actual, expected, "appends given item to original array if mode is +1 and element is not present");
+
+		actual = ["foo", "bar"];
+		actual.setItem("bar", +1);
+		expected = ["foo", "bar"];
+		same(actual, expected, "does not modify original array if mode is +1 and element is present");
+
+		actual = ["foo", "bar", "baz"];
+		actual.setItem("bar", -1);
+		expected = ["foo", "baz"];
+		same(actual, expected, "removes given item from original array if mode is -1 and element is present");
+
+		actual = ["foo", "bar"];
+		actual.setItem("baz", -1);
+		expected = ["foo", "bar"];
+		same(actual, expected, "does not modify original array if mode is -1 and element is not present");
+	});
+
+	test("Array map", function() {
+		var actual, expected, L;
+
+		L = ["foo", "lorem", "amet"];
+
+		actual = L.map(function(item, i) {
+			return item.substr(2, 1);
+		});
+		expected = ["o", "r", "e"];
+		same(actual, expected, "returns an array of elements defined by the specified callback");
+
+		actual = L.map(function(item, i) {
+			return item.length + i;
+		});
+		expected = [3, 6, 6];
+		same(actual, expected, "passes element value and index to the callback");
+	});
+});
diff --git a/test/data/tiddlywiki/test/js/BasicTypes.js b/test/data/tiddlywiki/test/js/BasicTypes.js
new file mode 100755
index 000000000..60276947a
--- /dev/null
+++ b/test/data/tiddlywiki/test/js/BasicTypes.js
@@ -0,0 +1,244 @@
+jQuery(document).ready(function() {
+	module("Basic Types");
+
+	test("Number clamp", function() {
+		var actual, expected;
+
+		actual = (99).clamp();
+		expected = 99;
+		same(actual, expected, "returns original number if no arguments are specified");
+
+		actual = (11).clamp(20);
+		expected = 20;
+		same(actual, expected, "if only one argument is specified, uses it as minimum");
+
+		actual = (55).clamp(20, 80);
+		expected = 55;
+		same(actual, expected, "returns original number if it is between minimum and maximum");
+
+		actual = (11).clamp(20, 80);
+		expected = 20;
+		same(actual, expected, "returns minimum if number is smaller than minimum");
+
+		actual = (99).clamp(20, 80);
+		expected = 80;
+		same(actual, expected, "returns maximum if number is greater than maximum");
+	});
+
+	test("Array indexOf", function() {
+		var actual, expected;
+
+		actual = typeof [].indexOf;
+		expected = "function";
+		same(actual, expected, "method exists");
+
+		actual = ["foo", "bar", "baz"].indexOf("bar");
+		expected = 1;
+		same(actual, expected, "returns element postion");
+
+		actual = ["foo", "bar"].indexOf("baz");
+		expected = -1;
+		same(actual, expected, "returns -1 if element not present");
+
+		actual = ["foo", "bar", "baz"].indexOf("baz", 1);
+		expected = 2;
+		same(actual, expected, "returns element position if element is present within given range");
+
+		actual = ["foo", "bar", "baz"].indexOf("foo", 1);
+		expected = -1;
+		same(actual, expected, "returns -1 if element is not present within given range");
+	});
+
+	test("Array findByField", function() {
+		var actual, expected;
+
+		var L = [{ foo: "lorem", bar: "ipsum" }, { bar: "dolor", baz: "sit" }, { bar: "dolor" }];
+
+		actual = L.findByField();
+		expected = 0;
+		same(actual, expected, "returns 0 if no arguments are specified"); // XXX: not actually desired; cf. ticket #964
+
+		actual = L.findByField("bar", "dolor");
+		expected = 1;
+		same(actual, expected, "returns position of first matching element");
+
+		actual = L.findByField("bar", "xxx");
+		expected = null;
+		same(actual, expected, "returns null if no match was found"); // XXX: not actually desired; cf. ticket #966
+
+	});
+
+	test("Array contains", function() {
+		var actual, expected;
+
+		var L = ["foo", "bar", "baz", "bar"];
+
+		actual = L.contains();
+		expected = false;
+		same(actual, expected, "returns false if no arguments are specified");
+
+		actual = L.contains("bar");
+		expected = true;
+		same(actual, expected, "returns true if a matching element was found");
+
+		actual = L.contains("xxx");
+		expected = false;
+		same(actual, expected, "returns false if no matching element was found");
+	});
+
+	test("Array containsAny", function() {
+		var actual, expression, expected;
+
+		var L = ["foo", "bar", "baz"];
+
+		expression = function() { L.containsAny(); };
+		expected = "TypeError";
+		raises(expression, expected, "raises exception if no arguments are specified");
+
+		actual = L.containsAny("foo");
+		expected = false;
+		same(actual, expected, "returns false if argument is not an array"); // XXX: not actually desired!?
+
+		actual = L.containsAny(["lorem", "bar"]);
+		expected = true;
+		same(actual, expected, "returns true if a matching item has been found");
+
+		actual = L.containsAny(["lorem", "ipsum"]);
+		expected = false;
+		same(actual, expected, "returns false if no matching item has been found");
+	});
+
+	test("Array containsAll", function() {
+		var actual, expression, expected;
+
+		var L = ["foo", "bar", "baz"];
+
+		expression = function() { L.containsAll(); };
+		expected = "TypeError";
+		raises(expression, expected, "raises exception if no arguments are specified");
+
+		actual = L.containsAll("foo");
+		expected = false;
+		same(actual, expected, "returns false if argument is not an array"); // XXX: not actually desired!?
+
+		actual = L.containsAll(["foo", "bar"]);
+		expected = true;
+		same(actual, expected, "returns true if all given items have been found");
+
+		actual = L.containsAll(["lorem", "bar"]);
+		expected = false;
+		same(actual, expected, "returns false if not all given items have been found");
+	});
+
+	test("Array pushUnique", function() {
+		var actual, expected;
+
+		/* XXX: behavior currently undefined
+		actual = ["foo", "bar"];
+		actual.pushUnique();
+		expected = ["foo", "bar"];
+		same(actual, expected, "does not modify array if no arguments are specified");
+		*/
+
+		actual = ["foo", "bar"];
+		actual.pushUnique("baz");
+		expected = ["foo", "bar", "baz"];
+		same(actual, expected, "appends given item to original array, provided an identical element is not present yet");
+
+		actual = ["foo", "bar", "baz"];
+		actual.pushUnique("baz");
+		expected = ["foo", "bar", "baz"];
+		same(actual, expected, "does not modify original array if given item is already present");
+
+		actual = [{ foo: "lorem" }, { bar: "ipsum" }];
+		actual.pushUnique({ bar: "ipsum" });
+		expected = [{ foo: "lorem" }, { bar: "ipsum" }, { bar: "ipsum" }];
+		same(actual, expected, "appends given item to original array if it is an object (deep comparison is not supported)"); // XXX: not actually desired!? -- cf. #606
+	});
+
+	test("Array remove", function() {
+		var actual, expected, L;
+
+		actual = ["foo", "bar", "baz"];
+		actual.remove();
+		expected = ["foo", "bar", "baz"];
+		same(actual, expected, "does not modify original array if no arguments are specified");
+
+		actual = ["foo", "bar", "baz"];
+		actual.remove("bar");
+		expected = ["foo", "baz"];
+		same(actual, expected, "removes given item from original array, provided such an element is present");
+
+		actual = ["foo", "bar", "baz"];
+		actual.remove("lorem");
+		expected = ["foo", "bar", "baz"];
+		same(actual, expected, "does not modify original array if given item is not present");
+
+		actual = [{ foo: "lorem" }, { bar: "ipsum" }];
+		actual.remove({ bar: "ipsum" });
+		expected = [{ foo: "lorem" }, { bar: "ipsum" }];
+		same(actual, expected, "does not modify original array if given item is an object (deep comparison is not supported)"); // XXX: not actually desired!? -- cf. #606
+	});
+
+	test("Array setItem", function() {
+		var actual, expected;
+
+		actual = ["foo", "bar", "baz"];
+		actual.setItem();
+		expected = ["foo", "bar", "baz"];
+		same(actual, expected, "does not modify array if no arguments are specified");
+
+		actual = ["foo", "bar", "baz"];
+		actual.setItem("foo");
+		expected = ["foo", "bar", "baz"];
+		same(actual, expected, "does not modify original array if mode is not specified");
+
+		actual = ["foo", "bar"];
+		actual.setItem("baz", 0);
+		expected = ["foo", "bar", "baz"];
+		same(actual, expected, "appends given item to original array if mode is 0 and element is not present");
+
+		actual = ["foo", "bar", "baz"];
+		actual.setItem("bar", 0);
+		expected = ["foo", "baz"];
+		same(actual, expected, "removes given item from original array if mode 0 and element is present");
+
+		actual = ["foo", "bar"];
+		actual.setItem("baz", +1);
+		expected = ["foo", "bar", "baz"];
+		same(actual, expected, "appends given item to original array if mode is +1 and element is not present");
+
+		actual = ["foo", "bar"];
+		actual.setItem("bar", +1);
+		expected = ["foo", "bar"];
+		same(actual, expected, "does not modify original array if mode is +1 and element is present");
+
+		actual = ["foo", "bar", "baz"];
+		actual.setItem("bar", -1);
+		expected = ["foo", "baz"];
+		same(actual, expected, "removes given item from original array if mode is -1 and element is present");
+
+		actual = ["foo", "bar"];
+		actual.setItem("baz", -1);
+		expected = ["foo", "bar"];
+		same(actual, expected, "does not modify original array if mode is -1 and element is not present");
+	});
+
+	test("Array map", function() {
+		var actual, expected, L;
+
+		L = ["foo", "lorem", "amet"];
+
+		actual = L.map(function(item, i) {
+			return item.substr(2, 1);
+		});
+		expected = ["o", "r", "e"];
+		same(actual, expected, "returns an array of elements defined by the specified callback");
+
+		actual = L.map(function(item, i) {
+			return item.length + i;
+		});
+		expected = [3, 6, 6];
+		same(actual, expected, "passes element value and index to the callback");
+	});
+});
diff --git a/test/data/tiddlywiki/test/js/Crypto.js b/test/data/tiddlywiki/test/js/Crypto.js
new file mode 100755
index 000000000..a3f7d8f64
--- /dev/null
+++ b/test/data/tiddlywiki/test/js/Crypto.js
@@ -0,0 +1,27 @@
+jQuery(document).ready(function(){
+
+	module("Crypto");
+
+	test("SHA-1 functions", function() {
+		var actual = jQuery.encoding.digests.hexSha1Str("").toLowerCase();
+		var expected = "da39a3ee5e6b4b0d3255bfef95601890afd80709";
+		same(actual,expected,'SHA-1 hash of empty string should be correct');
+
+		actual = jQuery.encoding.digests.hexSha1Str("The quick brown fox jumps over the lazy dog").toLowerCase();
+		expected = "2fd4e1c67a2d28fced849ee1bb76e7391b93eb12";
+		same(actual,expected,'SHA-1 hash of test vector 1 should be correct');
+
+		actual = jQuery.encoding.digests.hexSha1Str("abc").toLowerCase();
+		expected = "a9993e364706816aba3e25717850c26c9cd0d89d";
+		same(actual,expected,'SHA-1 hash of test vector 2 should be correct');
+
+		actual = jQuery.encoding.digests.hexSha1Str("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq");
+		expected = "84983E441C3BD26EBAAE4AA1F95129E5E54670F1";
+		same(actual,expected,'SHA-1 hash of test vector 3 should be correct');
+
+		actual = jQuery.encoding.digests.hexSha1Str("12345678901234567890123456789012345678901234567890123456789012345678901234567890");
+		expected = "50ABF5706A150990A08B2C5EA40FA0E585554732";
+		same(actual,expected,'SHA-1 hash of test vector 4 should be correct');
+	});
+
+});
diff --git a/test/data/tiddlywiki/test/js/DOM.js b/test/data/tiddlywiki/test/js/DOM.js
new file mode 100755
index 000000000..91e0241e5
--- /dev/null
+++ b/test/data/tiddlywiki/test/js/DOM.js
@@ -0,0 +1,81 @@
+(function($) {
+
+var makeTestNode = function() {
+	var ele = $('<div id="testElement" class="testClass"></div>');
+	ele.appendTo('body');
+	return ele.get(0);
+};
+
+var removeTestNode = function() {
+	$('#testElement').remove();
+};
+
+$(document).ready(function(){
+
+	module("DOM.js");
+
+	test("resolveTarget", function() {
+		expect(1);
+		var ele = makeTestNode();
+
+		var target;
+		$(ele).click(function(ev){
+			target = $(ev.target)[0];
+		});
+		$(ele).click();
+		equals(target, ele, "resolveTarget correctly identifies the target of a click event");
+
+		removeTestNode();
+	});
+
+
+	test('getPlainText', function(){
+		expect(1);
+
+		$('body').append("<div id='text_test'>foo bar baz</div>");
+		var d = $('#text_test').get(0);
+		equals(getPlainText(d), "foo bar baz", "getPlainText() returns the plain text of an element.");
+		$("#text_test").remove();
+	});
+
+
+	test("findWindowHeight", function() {
+			expect(2);
+			equals(typeof findWindowHeight(), "number", "returns a number value");
+			equals($(window).height(), findWindowHeight(), "return the current height of the display window");
+	});
+
+	test("findWindowWidth", function() {
+			expect(1);
+			equals(typeof findWindowWidth(), "number", "returns a number value");
+			// XXX: following test does not work
+			// equals($(window).width(), findWindowWidth(), "return the current width of the display window");
+	});
+
+
+	test("findScrollX", function() {
+
+		var scroll = 10;
+
+		$('<div id="wiiide">wide</div>').css({width: '9999px'}).appendTo('body');
+		$().scrollLeft(scroll);
+
+		equals(typeof findScrollX(), "number", "returns a number value");
+		//equals(findScrollX(), scroll, "returns the correct horizontal scroll position of the window");
+
+		$('#wiiide').remove();
+	});
+
+	test("findScrollY", function() {
+		expect(1);
+		var scroll = 200;
+		$().scrollTop(scroll);
+
+		equals(typeof findScrollY(), "number", "returns a number value");
+		// XXX: following test does not work
+		// equals(findScrollY(), scroll, "returns the correct vertical scroll position of the window");
+
+	});
+}); // document ready.
+
+})(jQuery);
diff --git a/test/data/tiddlywiki/test/js/Dates.js b/test/data/tiddlywiki/test/js/Dates.js
new file mode 100755
index 000000000..5a44cd804
--- /dev/null
+++ b/test/data/tiddlywiki/test/js/Dates.js
@@ -0,0 +1,477 @@
+jQuery(document).ready(function(){
+
+	module("Dates");
+
+	test("Date functions", function() {
+
+		var actual = new Date(2008,11,31,9,48).formatString("0hh12");
+		var expected = "09";
+		same(actual,expected,'12-hour format (with zero-padding) should return correct result for AM times');
+		actual = new Date(2008,11,31,21,48).formatString("0hh12");
+		expected = "09";
+		same(actual,expected,'12-hour format (with zero-padding) should return correct result for PM times');
+		actual = new Date(2008,11,31,9,48).formatString("hh12");
+		expected = "9";
+		same(actual,expected,'12-hour format (without zero-padding) should return correct result for AM times');
+		actual = new Date(2008,11,31,21,48).formatString("hh12");
+		expected = "9";
+		same(actual,expected,'12-hour format (without zero-padding) should return correct result for PM times');
+
+		actual = new Date(2008,11,31,9,48).formatString("0hh");
+		expected = "09";
+		same(actual,expected,'24-hour format (with zero-padding) should return correct result for AM times');
+		actual = new Date(2008,11,31,21,48).formatString("0hh");
+		expected = "21";
+		same(actual,expected,'24-hour format (with zero-padding) should return correct result for PM times');
+		actual = new Date(2008,11,31,9,48).formatString("hh");
+		expected = "9";
+		same(actual,expected,'24-hour format (without zero-padding) should return correct result for AM times');
+		actual = new Date(2008,11,31,21,48).formatString("hh");
+		expected = "21";
+		same(actual,expected,'24-hour format (without zero-padding) should return correct result for PM times');
+
+		actual = new Date(2008,0).formatString("mmm");
+		expected = "Jan";
+		same(actual,expected,'short-month format should return "Jan" for month 0');
+		actual = new Date(2008,1).formatString("mmm");
+		expected = "Feb";
+		same(actual,expected,'short-month format should return "Feb" for month 1');
+		actual = new Date(2008,2).formatString("mmm");
+		expected = "Mar";
+		same(actual,expected,'short-month format should return "Mar" for month 2');
+		actual = new Date(2008,3).formatString("mmm");
+		expected = "Apr";
+		same(actual,expected,'short-month format should return "Apr" for month 3');
+		actual = new Date(2008,4).formatString("mmm");
+		expected = "May";
+		same(actual,expected,'short-month format should return "May" for month 4');
+		actual = new Date(2008,5).formatString("mmm");
+		expected = "Jun";
+		same(actual,expected,'short-month format should return "Jun" for month 5');
+		actual = new Date(2008,6).formatString("mmm");
+		expected = "Jul";
+		same(actual,expected,'short-month format should return "Jul" for month 6');
+		actual = new Date(2008,7).formatString("mmm");
+		expected = "Aug";
+		same(actual,expected,'short-month format should return "Aug" for month 7');
+		actual = new Date(2008,8).formatString("mmm");
+		expected = "Sep";
+		same(actual,expected,'short-month format should return "Sep" for month 8');
+		actual = new Date(2008,9).formatString("mmm");
+		expected = "Oct";
+		same(actual,expected,'short-month format should return "Oct" for month 9');
+		actual = new Date(2008,10).formatString("mmm");
+		expected = "Nov";
+		same(actual,expected,'short-month format should return "Nov" for month 10');
+		actual = new Date(2008,11).formatString("mmm");
+		expected = "Dec";
+		same(actual,expected,'short-month format should return "Dec" for month 12');
+
+		actual = new Date(2008,11,15,11,0).formatString("0mm");
+		expected = "00";
+		same(actual,expected,'minutes format (with zero-padding) should return "00" for minute 0');
+		actual = new Date(2008,11,15,11,5).formatString("0mm");
+		expected = "05";
+		same(actual,expected,'minutes format (with zero-padding) should return "05" for minute 5');
+		actual = new Date(2008,11,15,11,30).formatString("0mm");
+		expected = "30";
+		same(actual,expected,'minutes format (with zero-padding) should return "30" for minute 30');
+		actual = new Date(2008,11,15,11,60).formatString("0mm");
+		expected = "00";
+		same(actual,expected,'minutes format (with zero-padding) should return "00" for minute 60');
+		actual = new Date(2008,11,15,11,0).formatString("mm");
+		expected = "0";
+		same(actual,expected,'minutes format (without zero-padding) should return "0" for minute 0');
+		actual = new Date(2008,11,15,11,5).formatString("mm");
+		expected = "5";
+		same(actual,expected,'minutes format (without zero-padding) should return "5" for minute 5');
+		actual = new Date(2008,11,15,11,30).formatString("mm");
+		expected = "30";
+		same(actual,expected,'minutes format (without zero-padding) should return "30" for minute 30');
+		actual = new Date(2008,11,15,11,60).formatString("mm");
+		expected = "0";
+		same(actual,expected,'minutes format (without zero-padding) should return "0" for minute 60');
+
+		actual = new Date(2008,11,15,11,1,0).formatString("0ss");
+		expected = "00";
+		same(actual,expected,'seconds format (with zero-padding) should return "00" for second 0');
+		actual = new Date(2008,11,15,11,1,5).formatString("0ss");
+		expected = "05";
+		same(actual,expected,'seconds format (with zero-padding) should return "05" for second 5');
+		actual = new Date(2008,11,15,11,1,30).formatString("0ss");
+		expected = "30";
+		same(actual,expected,'seconds format (with zero-padding) should return "30" for second 30');
+		actual = new Date(2008,11,15,11,1,60).formatString("0ss");
+		expected = "00";
+		same(actual,expected,'seconds format (with zero-padding) should return "00" for second 60');
+		actual = new Date(2008,11,15,11,1,0).formatString("ss");
+		expected = "0";
+		same(actual,expected,'seconds format (without zero-padding) should return "0" for second 0');
+		actual = new Date(2008,11,15,11,1,5).formatString("ss");
+		expected = "5";
+		same(actual,expected,'seconds format (without zero-padding) should return "5" for second 5');
+		actual = new Date(2008,11,15,11,1,30).formatString("ss");
+		expected = "30";
+		same(actual,expected,'seconds format (without zero-padding) should return "30" for second 30');
+		actual = new Date(2008,11,15,11,1,60).formatString("ss");
+		expected = "0";
+		same(actual,expected,'seconds format (without zero-padding) should return "0" for second 60');
+
+		actual = new Date(2008,11,15,0).formatString("am");
+		expected = "am";
+		same(actual,expected,'am format should return "am" for pre-noon times (00:00:00)');
+		actual = new Date(2008,11,15,8).formatString("am");
+		expected = "am";
+		same(actual,expected,'am format should return "am" for pre-noon times (08:00:00)');
+		actual = new Date(2008,11,15,11,59,59).formatString("am");
+		expected = "am";
+		same(actual,expected,'am format should return "am" for pre-noon times (11:59:59)');
+		actual = new Date(2008,11,15,0).formatString("pm");
+		expected = "am";
+		same(actual,expected,'pm format should return "am" for pre-noon times (00:00:00)');
+		actual = new Date(2008,11,15,8).formatString("pm");
+		expected = "am";
+		same(actual,expected,'pm format should return "am" for pre-noon times (08:00:00)');
+		actual = new Date(2008,11,15,11,59,59).formatString("pm");
+		expected = "am";
+		same(actual,expected,'pm format should return "am" for pre-noon times (11:59:59)');
+		actual = new Date(2008,11,15,12).formatString("am");
+		expected = "pm";
+		same(actual,expected,'am format should return "pm" for pre-midnight times (12:00:00)');
+		actual = new Date(2008,11,15,20).formatString("am");
+		expected = "pm";
+		same(actual,expected,'am format should return "pm" for pre-midnight times (20:00:00)');
+		actual = new Date(2008,11,15,23,59,59).formatString("am");
+		expected = "pm";
+		same(actual,expected,'am format should return "pm" for pre-midnight times (23:59:59)');
+		actual = new Date(2008,11,15,12).formatString("pm");
+		expected = "pm";
+		same(actual,expected,'pm format should return "pm" for pre-midnight times (12:00:00)');
+		actual = new Date(2008,11,15,20).formatString("pm");
+		expected = "pm";
+		same(actual,expected,'pm format should return "pm" for pre-midnight times (20:00:00)');
+		actual = new Date(2008,11,15,23,59,59).formatString("pm");
+		expected = "pm";
+		same(actual,expected,'pm format should return "pm" for pre-midnight times (23:59:59)');
+
+		actual = new Date(2008,11,15,0).formatString("AM");
+		expected = "AM";
+		same(actual,expected,'AM format should return "AM" for pre-noon times (00:00:00)');
+		actual = new Date(2008,11,15,8).formatString("AM");
+		expected = "AM";
+		same(actual,expected,'AM format should return "AM" for pre-noon times (08:00:00)');
+		actual = new Date(2008,11,15,11,59,59).formatString("AM");
+		expected = "AM";
+		same(actual,expected,'AM format should return "AM" for pre-noon times (11:59:59)');
+		actual = new Date(2008,11,15,0).formatString("PM");
+		expected = "AM";
+		same(actual,expected,'PM format should return "AM" for pre-noon times (00:00:00)');
+		actual = new Date(2008,11,15,8).formatString("PM");
+		expected = "AM";
+		same(actual,expected,'PM format should return "AM" for pre-noon times (08:00:00)');
+		actual = new Date(2008,11,15,11,59,59).formatString("PM");
+		expected = "AM";
+		same(actual,expected,'PM format should return "AM" for pre-noon times (11:59:59)');
+		actual = new Date(2008,11,15,12).formatString("AM");
+		expected = "PM";
+		same(actual,expected,'AM format should return "PM" for pre-midnight times (12:00:00)');
+		actual = new Date(2008,11,15,20).formatString("AM");
+		expected = "PM";
+		same(actual,expected,'AM format should return "PM" for pre-midnight times (20:00:00)');
+		actual = new Date(2008,11,15,23,59,59).formatString("AM");
+		expected = "PM";
+		same(actual,expected,'AM format should return "PM" for pre-midnight times (23:59:59)');
+		actual = new Date(2008,11,15,12).formatString("PM");
+		expected = "PM";
+		same(actual,expected,'PM format should return "PM" for pre-midnight times (12:00:00)');
+		actual = new Date(2008,11,15,20).formatString("PM");
+		expected = "PM";
+		same(actual,expected,'PM format should return "PM" for pre-midnight times (20:00:00)');
+		actual = new Date(2008,11,15,23,59,59).formatString("PM");
+		expected = "PM";
+		same(actual,expected,'PM format should return "PM" for pre-midnight times (23:59:59)');
+
+		actual = new Date(2007,11,31).formatString("wYYYY");
+		expected = "2008";
+		same(actual,expected,'week-based four-digit year format should return the year based on the week number');
+		actual = new Date(2007,11,31).formatString("wYY");
+		expected = "08";
+		same(actual,expected,'week-based two-digit year format should return the year based on the week number');
+		actual = new Date(2007,11,31).formatString("YYYY");
+		expected = "2007";
+		same(actual,expected,'four-digit year format should return the correct year');
+		actual = new Date(7,11,31).formatString("YYYY");
+		expected = "1907";
+		same(actual,expected,'four-digit year format should return the correct year based on 20th century');
+		actual = new Date(2007,11,31).formatString("YY");
+		expected = "07";
+		same(actual,expected,'two-digit year format should return the correct year');
+
+		actual = new Date(2008,0).formatString("MMM");
+		expected = "January";
+		same(actual,expected,'full-month format should return "January" for month 0');
+		actual = new Date(2008,1).formatString("MMM");
+		expected = "February";
+		same(actual,expected,'full-month format should return "February" for month 1');
+		actual = new Date(2008,2).formatString("MMM");
+		expected = "March";
+		same(actual,expected,'full-month format should return "March" for month 2');
+		actual = new Date(2008,3).formatString("MMM");
+		expected = "April";
+		same(actual,expected,'full-month format should return "April" for month 3');
+		actual = new Date(2008,4).formatString("MMM");
+		expected = "May";
+		same(actual,expected,'full-month format should return "May" for month 4');
+		actual = new Date(2008,5).formatString("MMM");
+		expected = "June";
+		same(actual,expected,'full-month format should return "June" for month 5');
+		actual = new Date(2008,6).formatString("MMM");
+		expected = "July";
+		same(actual,expected,'full-month format should return "July" for month 6');
+		actual = new Date(2008,7).formatString("MMM");
+		expected = "August";
+		same(actual,expected,'full-month format should return "August" for month 7');
+		actual = new Date(2008,8).formatString("MMM");
+		expected = "September";
+		same(actual,expected,'full-month format should return "September" for month 8');
+		actual = new Date(2008,9).formatString("MMM");
+		expected = "October";
+		same(actual,expected,'full-month format should return "October" for month 9');
+		actual = new Date(2008,10).formatString("MMM");
+		expected = "November";
+		same(actual,expected,'full-month format should return "November" for month 10');
+		actual = new Date(2008,11).formatString("MMM");
+		expected = "December";
+		same(actual,expected,'full-month format should return "December" for month 12');
+
+		actual = new Date(2008,0).formatString("0MM");
+		expected = "01";
+		same(actual,expected,'months format (with zero-padding) should return "01" for January');
+		actual = new Date(2008,11).formatString("0MM");
+		expected = "12";
+		same(actual,expected,'months format (with zero-padding) should return "12" for December');
+		actual = new Date(2008,12).formatString("0MM");
+		expected = "01";
+		same(actual,expected,'months format (with zero-padding) should return "01" for month 13');
+		actual = new Date(2008,0).formatString("MM");
+		expected = "1";
+		same(actual,expected,'months format (without zero-padding) should return "1" for January');
+		actual = new Date(2008,11).formatString("MM");
+		expected = "12";
+		same(actual,expected,'months format (without zero-padding) should return "12" for December');
+		actual = new Date(2008,12).formatString("MM");
+		expected = "1";
+		same(actual,expected,'months format (without zero-padding) should return "1" for month 13');
+
+		actual = new Date(2008,0,3).formatString("0WW");
+		expected = "01";
+		same(actual,expected,'weeks format (with zero-padding) should return "01" for the first Thursday of the year');
+		actual = new Date(2008,11,28).formatString("0WW");
+		expected = "52";
+		same(actual,expected,'weeks format (with zero-padding) should return "52" for the last Sunday of the year');
+		actual = new Date(2008,0,1).formatString("WW");
+		expected = "1";
+		same(actual,expected,'weeks format (without zero-padding) should return "1" for the first day of the year');
+		actual = new Date(2008,11,28).formatString("WW");
+		expected = "52";
+		same(actual,expected,'weeks format (without zero-padding) should return "52" for the last Sunday of the year');
+
+		actual = new Date(2008,0,7).formatString("DDD");
+		expected = "Monday";
+		same(actual,expected,'full-day format should return "Monday" for the first day of the week');
+		actual = new Date(2008,0,8).formatString("DDD");
+		expected = "Tuesday";
+		same(actual,expected,'full-day format should return "Tuesday" for the second day of the week');
+		actual = new Date(2008,0,9).formatString("DDD");
+		expected = "Wednesday";
+		same(actual,expected,'full-day format should return "Wednesday" for the third day of the week');
+		actual = new Date(2008,0,10).formatString("DDD");
+		expected = "Thursday";
+		same(actual,expected,'full-day format should return "Thursday" for the fourth day of the week');
+		actual = new Date(2008,0,11).formatString("DDD");
+		expected = "Friday";
+		same(actual,expected,'full-day format should return "Friday" for the fifth day of the week');
+		actual = new Date(2008,0,12).formatString("DDD");
+		expected = "Saturday";
+		same(actual,expected,'full-day format should return "Saturday" for the sixth day of the week');
+		actual = new Date(2008,0,13).formatString("DDD");
+		expected = "Sunday";
+		same(actual,expected,'full-day format should return "Sunday" for the seventh day of the week');
+
+		actual = new Date(2008,0,7).formatString("ddd");
+		expected = "Mon";
+		same(actual,expected,'short-day format should return "Mon" for the first day of the week');
+		actual = new Date(2008,0,8).formatString("ddd");
+		expected = "Tue";
+		same(actual,expected,'short-day format should return "Tue" for the second day of the week');
+		actual = new Date(2008,0,9).formatString("ddd");
+		expected = "Wed";
+		same(actual,expected,'short-day format should return "Wed" for the third day of the week');
+		actual = new Date(2008,0,10).formatString("ddd");
+		expected = "Thu";
+		same(actual,expected,'short-day format should return "Thu" for the fourth day of the week');
+		actual = new Date(2008,0,11).formatString("ddd");
+		expected = "Fri";
+		same(actual,expected,'short-day format should return "Fri" for the fifth day of the week');
+		actual = new Date(2008,0,12).formatString("ddd");
+		expected = "Sat";
+		same(actual,expected,'short-day format should return "Sat" for the sixth day of the week');
+		actual = new Date(2008,0,13).formatString("ddd");
+		expected = "Sun";
+		same(actual,expected,'short-day format should return "Sun" for the seventh day of the week');
+
+		actual = new Date(2008,5,1).formatString("0DD");
+		expected = "01";
+		same(actual,expected,'days format (with zero-padding) should return "01" for the first day of the month');
+		actual = new Date(2008,0,31).formatString("0DD");
+		expected = "31";
+		same(actual,expected,'days format (with zero-padding) should return "31" for January 31');
+		actual = new Date(2008,0,32).formatString("0DD");
+		expected = "01";
+		same(actual,expected,'days format (with zero-padding) should return "01" for January 32 [sic]');
+		actual = new Date(2008,1,29).formatString("0DD");
+		expected = "29";
+		same(actual,expected,'days format (with zero-padding) should return "29" for February 29, 2008');
+		actual = new Date(2009,1,29).formatString("0DD");
+		expected = "01";
+		same(actual,expected,'days format (with zero-padding) should return "01" for February 29 [sic], 2009');
+
+		actual = new Date(2008,5,1).formatString("DD");
+		expected = "1";
+		same(actual,expected,'days format (without zero-padding) should return "1" for the first day of the month');
+		actual = new Date(2008,0,31).formatString("DD");
+		expected = "31";
+		same(actual,expected,'days format (without zero-padding) should return "31" for January 31');
+		actual = new Date(2008,0,32).formatString("DD");
+		expected = "1";
+		same(actual,expected,'days format (without zero-padding) should return "1" for January 32 [sic]');
+		actual = new Date(2008,1,29).formatString("DD");
+		expected = "29";
+		same(actual,expected,'days format (without zero-padding) should return "29" for February 29, 2008');
+		actual = new Date(2009,1,29).formatString("DD");
+		expected = "1";
+		same(actual,expected,'days format (without zero-padding) should return "1" for February 29 [sic], 2009');
+
+		actual = new Date(2008,5,1).formatString("DDth");
+		expected = "1st";
+		same(actual,expected,'day-with-suffix format should return "1st" for the first day of the month');
+		actual = new Date(2008,5,2).formatString("DDth");
+		expected = "2nd";
+		same(actual,expected,'day-with-suffix format should return "2nd" for the second day of the month');
+		actual = new Date(2008,5,3).formatString("DDth");
+		expected = "3rd";
+		same(actual,expected,'day-with-suffix format should return "3rd" for the third day of the month');
+		actual = new Date(2008,5,4).formatString("DDth");
+		expected = "4th";
+		same(actual,expected,'day-with-suffix format should return "4th" for the fourth day of the month');
+		actual = new Date(2008,5,11).formatString("DDth");
+		expected = "11th";
+		same(actual,expected,'day-with-suffix format should return "11th" for the eleventh day of the month');
+		actual = new Date(2008,5,21).formatString("DDth");
+		expected = "21st";
+		same(actual,expected,'day-with-suffix format should return "21st" for the twenty-first day of the month');
+		actual = new Date(2008,5,22).formatString("DDth");
+		expected = "22nd";
+		same(actual,expected,'day-with-suffix format should return "22nd" for the twenty-second day of the month');
+		actual = new Date(2008,5,23).formatString("DDth");
+		expected = "23rd";
+		same(actual,expected,'day-with-suffix format should return "23rd" for the twenty-third day of the month');
+		actual = new Date(2008,5,24).formatString("DDth");
+		expected = "24th";
+		same(actual,expected,'day-with-suffix format should return "24th" for the twenty-fourth day of the month');
+		actual = new Date(2008,0,32).formatString("DDth");
+		expected = "1st";
+		same(actual,expected,'day-with-suffix format should return "1st" for the January 32 [sic]');
+	});
+
+
+	test("Date: formatting", function() {
+		var actual = new Date(2007,2,1).formatString("YYYY MMM DD");
+		var expected = "2007 March 1";
+		same(actual,expected,'Date formatting YYYY MMM DD');
+		actual = new Date(2007,2,1).formatString("DD of MMM, YYYY");
+		expected = "1 of March, 2007";
+		same(actual,expected,'Given a format string including text (such as DD of MMM, YYYY) the date format outputs accordingly.');
+		actual = new Date(2008,11,31,23,48,59).formatString("YYYY MMM DD hh:mm ss");
+		expected = "2008 December 31 23:48 59";
+		same(actual,expected,'Date formatting YYYY MMM DD hh:mm ss');
+		actual = new Date(2008,11,31,3,8,9).formatString("0hh hh 0mm mm 0ss ss");
+		expected = "03 3 08 8 09 9";
+		same(actual,expected,'Date formatting hours, minutes & seconds');
+		actual = new Date(2008,11,31,3,8,9).formatString("hh12 0hh12 AM am PM pm");
+		expected = "3 03 AM am AM am";
+		same(actual,expected,'Date formatting 12-hour (AM)');
+		actual = new Date(2008,11,31,15,8,9).formatString("hh12 0hh12 AM am PM pm");
+		expected = "3 03 PM pm PM pm";
+		same(actual,expected,'Date formatting 12-hour (PM)');
+		actual = Date.convertFromYYYYMMDDHHMM("200812312348").toString();
+		expected = new Date(2008,11,31,23,48,0,0).toString();
+		same(actual,expected,'Date convertFromYYYYMMDDHHMM');
+	});
+
+
+	test("Date: information", function() {
+		var actual = new Date(2007,2,1,10,0).getAmPm();
+		var expected = "am";
+		same(actual,expected,'Given an AM time, getAmPm returns am');
+		actual = new Date(2007,2,1,13,0).getAmPm();
+		expected = "pm";
+		same(actual,expected,'Given an PM time, getAmPm returns pm');
+		actual = new Date(2007,2,1).daySuffix();
+		expected = "st";
+		same(actual,expected,'Give a valid date (1st), daySuffix returns the correct day Suffix ');
+	});
+
+
+	test("Date: escaping", function() {
+		var actual = new Date(2008,0,31,1,2,3).formatString("Y\\Y\\Y\\Y");
+		var expected = "YYYY";
+		same(actual,expected,'should not convert escaped four-digit year format');
+		actual = new Date(2008,0,31,1,2,3).formatString("Y\\Y");
+		expected = "YY";
+		same(actual,expected,'should not convert escaped two-digit year format');
+	});
+
+	test("Date: conversions", function() {
+		same(typeof Date.convertFromYYYYMMDDHHMMSSMMM,"function",'should parse define a function');
+		same(typeof Date.convertFromYYYYMMDDHHMMSSMMM("20070228"),"object",'should return an object');
+
+		var actual = Date.convertFromYYYYMMDDHHMMSSMMM();
+		ok(actual=="Invalid Date"||isNaN(actual),'should parse null value should be invalid');
+		actual = Date.convertFromYYYYMMDDHHMMSSMMM("2006"),
+		ok(actual=="Invalid Date"||isNaN(actual),'should parse year only should be invalid');
+		actual = Date.convertFromYYYYMMDDHHMMSSMMM("20061"),
+		ok(actual=="Invalid Date"||isNaN(actual),'should parse year, short month only should be invalid');
+		actual = Date.convertFromYYYYMMDDHHMMSSMMM("200601")
+		ok(actual=="Invalid Date"||isNaN(actual),'should parse year,month only should be invalid');
+
+		same(Date.convertFromYYYYMMDDHHMMSSMMM("20070228"),new Date(Date.UTC(2007,1,28)),'should parse date only');
+		same(Date.convertFromYYYYMMDDHHMMSSMMM("19691103"),new Date(Date.UTC(1969,10,3)),'should parse 1969 date only');
+		same(Date.convertFromYYYYMMDDHHMMSSMMM("2006011"),new Date(Date.UTC(2006,0,1)),'should parse year,month, short day');
+		same(Date.convertFromYYYYMMDDHHMMSSMMM("199912079"),new Date(Date.UTC(1999,11,7,9)),'should parse year,month,day short hour');
+		same(Date.convertFromYYYYMMDDHHMMSSMMM("1999121712"),new Date(Date.UTC(1999,11,17,12)),'should parse year,month,day,hour');
+		same(Date.convertFromYYYYMMDDHHMMSSMMM("199912598"),new Date(Date.UTC(1999,11,59,8)),'should parse year,month,day,hour short mins');
+		same(Date.convertFromYYYYMMDDHHMMSSMMM("199912150257"),new Date(Date.UTC(1999,11,15,2,57)),'should parse year,month,day,hour,mins');
+		same(Date.convertFromYYYYMMDDHHMMSSMMM("1999121512579"),new Date(Date.UTC(1999,11,15,12,57,9)),'should parse year,month,day,hour,mins,short secs');
+		same(Date.convertFromYYYYMMDDHHMMSSMMM("19991215125719"),new Date(Date.UTC(1999,11,15,12,57,19)),'should parse year,month,day,hour,mins,secs');
+		same(Date.convertFromYYYYMMDDHHMMSSMMM("199912151257198"),new Date(Date.UTC(1999,11,15,12,57,19,8)),'should parse year,month,day,hour,mins,secs,short milliseconds');
+		same(Date.convertFromYYYYMMDDHHMMSSMMM("1999121512571978"),new Date(Date.UTC(1999,11,15,12,57,19,78)),'should parse year,month,day,hour,mins,secs,medium milliseconds');
+		same(Date.convertFromYYYYMMDDHHMMSSMMM("19991215125719678"),new Date(Date.UTC(1999,11,15,12,57,19,678)),'should parse year,month,day,hour,mins,secs,long milliseconds');
+		same(Date.convertFromYYYYMMDDHHMMSSMMM("1999-12-15.12:57:19.678"),new Date(Date.UTC(1999,11,15,12,57,19,678)),'should parse ignoring punctuation');
+		same(Date.convertFromYYYYMMDDHHMMSSMMM("  1999/12/15   12:57:19  678    "),new Date(Date.UTC(1999,11,15,12,57,19,678)),'should parse ignoring whitespace');
+		same(Date.convertFromYYYYMMDDHHMMSSMMM("  1999/12/15   12:57:19  678  GMT (BST)  "),new Date(Date.UTC(1999,11,15,12,57,19,678)),'should parse ignoring trailing text');
+		same(Date.convertFromYYYYMMDDHHMM("  1999/12/15   12:57:19  678  GMT (BST)  "),new Date(Date.UTC(1999,11,15,12,57,0,0)),'should parse ignoring whitespace, punctuation and trailing text');
+		same(Date.convertFromYYYYMMDDHHMM("  1999/12/15   12:57:xx  "),new Date(Date.UTC(1999,11,15,12,57,0,0)),'should parse ignoring whitespace, punctuation and trailing text');
+		same(Date.convertFromYYYYMMDDHHMMSS("199912151257xx"),new Date(Date.UTC(1999,11,15,12,57,0,0)),'should parse ignoring trailing text');
+		same(Date.convertFromYYYYMMDDHHMMSS("19991215125719"),new Date(Date.UTC(1999,11,15,12,57,19,0)),'should parse including seconds');
+		same(Date.convertFromYYYYMMDDHHMMSS("19991215125709"),new Date(Date.UTC(1999,11,15,12,57,9,0)),'should parse including seconds');
+		same(Date.convertFromYYYYMMDDHHMMSS("1999121512571"),new Date(Date.UTC(1999,11,15,12,57,1,0)),'should parse including partial seconds');
+		var d1 = new Date(Date.UTC(1987,9,29,21,43,57,678));
+		var s1 = d1.convertToYYYYMMDDHHMMSSMMM();
+		var d2 = Date.convertFromYYYYMMDDHHMMSSMMM(s1);
+		var s2 = d2.convertToYYYYMMDDHHMMSSMMM();
+		same(s2,s1,'should roundtrip current date from Date.convertToYYYYMMDDHHMMSSMMM');
+		same(d1,d2,'should roundtrip current date from Date.convertToYYYYMMDDHHMMSSMMM');
+	});
+});
+
diff --git a/test/data/tiddlywiki/test/js/Encoding.js b/test/data/tiddlywiki/test/js/Encoding.js
new file mode 100755
index 000000000..91f03de7b
--- /dev/null
+++ b/test/data/tiddlywiki/test/js/Encoding.js
@@ -0,0 +1,29 @@
+jQuery(document).ready(function(){
+
+	module("jQuery.encoding.digests.sha1.js");
+
+	test("SHA-1 digest", function() {
+		expect(5);
+
+		var actual = jQuery.encoding.digests.hexSha1Str("").toLowerCase();
+		var expected = "da39a3ee5e6b4b0d3255bfef95601890afd80709";
+		ok(actual==expected,'SHA-1 hash of empty string should be correct');
+
+		actual = jQuery.encoding.digests.hexSha1Str("The quick brown fox jumps over the lazy dog").toLowerCase();
+		expected = "2fd4e1c67a2d28fced849ee1bb76e7391b93eb12";
+		ok(actual==expected,'SHA-1 hash of test vector 1 should be correct');
+
+		actual = jQuery.encoding.digests.hexSha1Str("abc").toLowerCase();
+		expected = "a9993e364706816aba3e25717850c26c9cd0d89d";
+		ok(actual==expected,'SHA-1 hash of test vector 2 should be correct');
+
+		actual = jQuery.encoding.digests.hexSha1Str("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq");
+		expected = "84983E441C3BD26EBAAE4AA1F95129E5E54670F1";
+		ok(actual==expected,'SHA-1 hash of test vector 3 should be correct');
+
+		actual = jQuery.encoding.digests.hexSha1Str("12345678901234567890123456789012345678901234567890123456789012345678901234567890");
+		expected = "50ABF5706A150990A08B2C5EA40FA0E585554732";
+		ok(actual==expected,'SHA-1 hash of test vector 4 should be correct');
+
+	});
+});
diff --git a/test/data/tiddlywiki/test/js/FileSystem.js b/test/data/tiddlywiki/test/js/FileSystem.js
new file mode 100755
index 000000000..c96761f52
--- /dev/null
+++ b/test/data/tiddlywiki/test/js/FileSystem.js
@@ -0,0 +1,55 @@
+jQuery(document).ready(function() {
+	module("File System");
+
+	test("convertUTF8ToUnicode", function() {
+		var actual, expected, str;
+
+		str = " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~";
+
+		actual = convertUTF8ToUnicode(str);
+		expected = str;
+		same(actual, expected, "ASCII characters should remain unchanged when converted from UTF8 to Unicode using convert");
+	});
+
+	test("manualConvertUTF8ToUnicode", function() {
+		var actual, expected, str;
+
+		str = " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~";
+
+		actual = manualConvertUTF8ToUnicode(str);
+		expected = str;
+		same(actual, expected, "ASCII characters should remain unchanged when converted from UTF8 to Unicode manually");
+	});
+
+	test("convertUnicodeToUTF8", function() {
+		var actual, expected, str;
+
+		str = " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~";
+
+		actual = convertUnicodeToUTF8(str);
+		expected = str;
+		same(actual, expected, "ASCII characters should remain unchanged when converted from Unicode to UTF8 using convert");
+	});
+
+	test("manualConvertUnicodeToUTF8", function() {
+		var actual, expected, str;
+
+		str = " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~";
+
+		actual = manualConvertUnicodeToUTF8(str);
+		expected = str;
+		same(actual, expected, "ASCII characters should remain unchanged when converted from Unicode to UTF8 manually");
+	});
+
+	/* XXX: this test does not work
+	test("round trip conversion from UTF8 to Unicode and back", function() {
+		var actual, expected, str;
+
+		str = "\u007f\u0080";
+
+		actual = convertUTF8ToUnicode(convertUnicodeToUTF8(str));
+		expected = str;
+		same(actual, expected, "characters should remain unchanged when converted from Unicode to UTF8 and back to Unicode");
+	});
+	*/
+});
diff --git a/test/data/tiddlywiki/test/js/Filters.js b/test/data/tiddlywiki/test/js/Filters.js
new file mode 100755
index 000000000..77a0c0a5d
--- /dev/null
+++ b/test/data/tiddlywiki/test/js/Filters.js
@@ -0,0 +1,158 @@
+/*global story, jQuery, document, module, test, same strictEqual store */
+(function ($) {
+    jQuery(document).ready(function () {
+        module("Filters.js");
+
+		/*
+		 *	tiddler
+		 */
+		test("filterTiddlers: 'tiddler' should be one tiddlers named foo", function () {
+			var tiddlers = store.filterTiddlers("foo");
+			strictEqual(tiddlers.length, 1, 'one tiddlers');
+			strictEqual(tiddlers[0].title, "foo");
+		});
+
+		/*
+		 *	[[tiddler]]
+		 */
+		test("filterTiddlers: '[[foo]]' should be one tiddlers named foo", function () {
+			var tiddlers = store.filterTiddlers("[[foo]]");
+			strictEqual(tiddlers.length, 1, 'one tiddlers');
+			strictEqual(tiddlers[0].title, "foo");
+		});
+
+		/*
+		 *	[[tiddler]][[tiddler]]
+		 */
+		test("filterTiddlers: '[[foo]][[foo]]' should be two tiddlers named foo", function () {
+			var tiddlers = store.filterTiddlers("[[foo]][[foo]]");
+			strictEqual(tiddlers.length, 2, 'two tiddlers');
+			strictEqual(tiddlers[0].title, "foo");
+			strictEqual(tiddlers[1].title, "foo");
+		});
+
+		/*
+		 *	[tag[value]]
+		 */
+		test("filterTiddlers: '[tag[testTag]]' should be three tiddlers tagged testTag", function () {
+			var tiddlers = store.filterTiddlers("[tag[testTag]]");
+			strictEqual(tiddlers.length, 3, 'three tiddlers');
+			strictEqual(tiddlers[0].title, "testTiddler1");
+			strictEqual(tiddlers[1].title, "testTiddler2");
+			strictEqual(tiddlers[2].title, "testTiddler3");
+		});
+
+		test("filterTiddlers: '[tag[oneTag]]' should be one tiddlers tagged oneTag", function () {
+			var tiddlers = store.filterTiddlers("[tag[oneTag]]");
+			strictEqual(tiddlers.length, 1, 'one tiddlers');
+			strictEqual(tiddlers[0].title, "testTiddler1");
+		});
+
+		/*
+		 *	combined tags
+		 */
+		test("filterTiddlers: '[tag[testTag]][tag[twoTag]]' should be three tiddlers tagged testTag and twoTag", function () {
+			var tiddlers = store.filterTiddlers("[tag[testTag]][tag[twoTag]]");
+			strictEqual(tiddlers.length, 3, 'three tiddlers');
+			strictEqual(tiddlers[0].title, "testTiddler1");
+			strictEqual(tiddlers[1].title, "testTiddler2");
+			strictEqual(tiddlers[2].title, "testTiddler3");
+		});
+
+		/*
+		 *	[limit[n]]
+		 */
+		test("filterTiddlers: '[tag[testTag]][limit[1]]' should be one tiddlers tagged testTag limited with 1", function () {
+			var tiddlers = store.filterTiddlers("[tag[testTag]][limit[1]]");
+			strictEqual(tiddlers.length, 1, 'one tiddlers');
+			strictEqual(tiddlers[0].title, "testTiddler1");
+		});
+
+		test("filterTiddlers: '[tag[testTag]][limit[2]]' should be two tiddlers tagged testTag limited with 2", function () {
+			var tiddlers = store.filterTiddlers("[tag[testTag]][limit[2]]");
+			strictEqual(tiddlers.length, 2, 'two tiddlers');
+			strictEqual(tiddlers[0].title, "testTiddler1");
+			strictEqual(tiddlers[1].title, "testTiddler2");
+		});
+
+		test("filterTiddlers: '[tag[testTag]][limit[3]]' should be three tiddlers tagged testTag limited with 3", function () {
+			var tiddlers = store.filterTiddlers("[tag[testTag]][limit[3]]");
+			strictEqual(tiddlers.length, 3, 'three tiddlers');
+			strictEqual(tiddlers[0].title, "testTiddler1");
+			strictEqual(tiddlers[1].title, "testTiddler2");
+			strictEqual(tiddlers[2].title, "testTiddler3");
+		});
+
+		test("filterTiddlers: '[tag[testTag]][limit[50]]' should be three tiddlers tagged testTag limited with 50", function () {
+			var tiddlers = store.filterTiddlers("[tag[testTag]][limit[50]]");
+			strictEqual(tiddlers.length, 3, 'three tiddlers');
+			strictEqual(tiddlers[0].title, "testTiddler1");
+			strictEqual(tiddlers[1].title, "testTiddler2");
+			strictEqual(tiddlers[2].title, "testTiddler3");
+		});
+
+		/*
+		 *	[field[value]]
+		 */
+		test("filterTiddlers: '[fieldvalue[two]]' should return the tiddler with a fieldvalue 'two'", function () {
+			var tiddlers = store.filterTiddlers("[fieldvalue[two]]");
+			strictEqual(tiddlers.length, 1, 'one tiddlers');
+			strictEqual(tiddlers[0].title, "testTiddler2");
+		});
+
+		test("filterTiddlers: '[fieldvalue[three]]' should return the tiddler with a fieldvalue 'three'", function () {
+			var tiddlers = store.filterTiddlers("[fieldvalue[three]]");
+			strictEqual(tiddlers.length, 1, 'one tiddlers');
+			strictEqual(tiddlers[0].title, "testTiddler3");
+		});
+
+		test("filterTiddlers: '[server.bag[foo]]' should return the tiddler with a fieldvalue 'three'", function () {
+			var tiddlers = store.filterTiddlers("[server.bag[foo]]");
+			strictEqual(tiddlers.length, 1, 'one tiddler');
+			strictEqual(tiddlers[0].title, "testTiddler3");
+		});
+
+		test("filterTiddlers: '[field-thing[bar]]' should return the tiddler with a fieldvalue 'three'", function () {
+			var tiddlers = store.filterTiddlers("[field-thing[bar]]");
+			strictEqual(tiddlers.length, 1, 'one tiddler');
+			strictEqual(tiddlers[0].title, "testTiddler3");
+		});
+
+		/*
+		 *	[tag[value]][sort[+title]]
+		 */
+		test("filterTiddlers: '[tag[testTag]][sort[+title]]' should return three tiddlers tagged testTag, sorted", function () {
+			var tiddlers = store.filterTiddlers("[tag[testTag]][sort[+title]]");
+			strictEqual(tiddlers.length, 3, 'three tiddlers');
+			strictEqual(tiddlers[0].title, "testTiddler1");
+			strictEqual(tiddlers[1].title, "testTiddler2");
+			strictEqual(tiddlers[2].title, "testTiddler3");
+		});
+
+		/*
+		 *	[tag[value]][sort[-title]]
+		 */
+		test("filterTiddlers: '[tag[testTag]][sort[-title]]' should return three tiddlers tagged testTag, reverse sorted", function () {
+			var tiddlers = store.filterTiddlers("[tag[testTag]][sort[-title]]");
+			strictEqual(tiddlers.length, 3, 'three tiddlers');
+			strictEqual(tiddlers[2].title, "testTiddler1");
+			strictEqual(tiddlers[1].title, "testTiddler2");
+			strictEqual(tiddlers[0].title, "testTiddler3");
+		});
+
+		/*
+		 *	errors ..
+		 */
+		test("filterTiddlers: '[[]]' should return no tiddlers", function () {
+			var tiddlers = store.filterTiddlers("[[]]");
+			strictEqual(tiddlers.length, 0, 'no tiddlers');
+		});
+
+		test("filterTiddlers: '[tag[]]' seems to return a tiddler called tag", function () {
+			var tiddlers = store.filterTiddlers("[tag[]]");
+			strictEqual(tiddlers.length, 1, 'one tiddlers');
+			strictEqual(tiddlers[0].title, "tag");
+		});
+
+	});
+}(jQuery));
diff --git a/test/data/tiddlywiki/test/js/LoadingSaving.js b/test/data/tiddlywiki/test/js/LoadingSaving.js
new file mode 100755
index 000000000..e91551a48
--- /dev/null
+++ b/test/data/tiddlywiki/test/js/LoadingSaving.js
@@ -0,0 +1,99 @@
+jQuery(document).ready(function() {
+	module("LoadingSaving");
+
+
+	test("load", function() {
+		var actual, expected, filepath;
+
+		actual = loadFile();
+		expected = null;
+		same(actual, expected, "returns null if no argument is specified");
+
+		filepath = getDocumentPath() + "/sample.txt";
+		var s = loadFile(filepath);
+		// if the java saver was used then it will have done the unicode conversion.
+		actual = window.netscape ? convertUTF8ToUnicode(s) : s;
+		expected = "lorem ipsum\n" +
+			"dolor sit amet\n" +
+			"\n" +
+			' !"#$%&' + "'()*+,-./0123456789:;<=>?\n" +
+			"@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\n" +
+			"\xa9\u010d\u010c\n" +
+			"foo bar baz\n";
+		//if(!config.browser.isOpera && window.netscape)
+		if(!(config.browser.isChrome && config.browser.isMac))
+			same(actual, expected, "returns contents of specified file");
+
+		filepath = "/null";
+		actual = loadFile(filepath);
+		ok(actual==null || actual=="undefined", "returns null if the specified file does not exist");
+
+		filepath = "sample.txt";
+		actual = loadFile(filepath);
+		ok(actual==null || actual=="undefined", "returns null if specified file path is not absolute");
+	});
+
+	test("save", function() {
+		var actual, expression, expected, str;
+		var filepath = getDocumentPath() + "/savetest.txt";
+
+		/* disabled as browser-level exceptions cannot be trapped
+		expression = function() { saveFile(); };
+		expected = "ReferenceError";
+		raises(expression, expected, "raises exception if no argument is specified");
+		*/
+
+		/* disabled as browser-level exceptions cannot be trapped
+		expression = function() { saveFile(filepath); };
+		expected = "TypeError";
+		raises(expression, expected, "raises exception if no content argument is specified");
+		*/
+
+		/* disabled as browser-level exceptions cannot be trapped
+		expression = function() { saveFile("foo.txt", "sample content"); };
+		expected = "ReferenceError";
+		raises(expression, expected, "raises exception if specified file path is not absolute");
+		*/
+
+		str = "lorem ipsum\n" +
+			"dolor sit amet\n" +
+			"\n" +
+			" !#$%&'\"()*+,-./0123456789:;<=>?\n" +
+			"@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\n" +
+			"\xa9\u010d\u010c\n" +
+			"foo bar baz\n" +
+			(new Date).toString();
+		saveAndLoadString(filepath, str, "X writes given ANSI text content to specified file");
+
+		var str2 = "\xa9\u010d\u010c";
+		saveAndLoadString(filepath, str2, "Y writes given UTF-8 text content to specified file");
+
+		//saveFile(filepath, ""); // teardown: blank file contents (deletion impossible)
+	});
+
+	// helper function to save and load back a string to a file
+	var saveAndLoadString = function(filepath,str,desc) {
+		if(config.browser.isChrome && config.browser.isMac) {
+		    return true;
+		}
+		saveFile(filepath, convertUnicodeToUTF8(str)); // => entities if IE
+		var s = loadFile(filepath);
+		// if the java saver was used then it will have done the unicode conversion.
+		var actual = window.netscape ? convertUTF8ToUnicode(s) : s;
+		//var expected = config.browser.isOpera || !window.netscape ? convertUnicodeToHtmlEntities(str) : str;
+		var expected = config.browser.isIE ? convertUnicodeToHtmlEntities(str) : str;
+		same(actual, expected, desc);
+	}
+
+	// helper function to retrieve current document's file path
+	var getDocumentPath = function() {
+		var path = document.location.pathname;
+		var startpos = 0;
+		var endpos = path.lastIndexOf("/");
+		if(path.charAt(2) == ":") {
+			startpos = 1;
+			path = path.replace(new RegExp("/","g"),"\\")
+		}
+		return unescape(path.substring(startpos, endpos));
+	};
+});
diff --git a/test/data/tiddlywiki/test/js/Macros.js b/test/data/tiddlywiki/test/js/Macros.js
new file mode 100755
index 000000000..7a52f9748
--- /dev/null
+++ b/test/data/tiddlywiki/test/js/Macros.js
@@ -0,0 +1,359 @@
+/*global story, jQuery, document, module, test, same strictEqual store */
+(function ($) {
+	$(document).ready(function () {
+		module("Macros.js", {});
+	/*
+	 * list
+	 */
+	test("list all", function () {
+		var place = $("<div />")[0];
+		var params = ["all"];
+		var paramString = "all";
+		config.macros.list.handler(place,"list",params,null,paramString);
+		strictEqual($("li", place).length, 4,
+			"there are 3 tiddlers defined in testdata at time of writing these should all be listed. also a prompt");
+		strictEqual($($("li", place)[0]).text(), config.macros.list.all.prompt, "make sure prompt in place.")
+		strictEqual($("li .tiddlyLink", place).length, 3, "3 tiddly links should have been created");
+	});
+
+	test("list missing - nothing missing", function () {
+		var place = $("<div />")[0];
+		var params = ["missing"];
+		var paramString = "missing";
+		config.macros.list.handler(place,"list",params,null,paramString);
+		strictEqual($("li", place).length, 1,"no missing tiddlers only header");
+		strictEqual($($("li", place)[0]).text(), config.macros.list.missing.prompt, "make sure prompt in place.")
+		strictEqual($("li .tiddlyLink", place).length, 0, "no tiddly links should have been created");
+	});
+
+	test("NEW: list missing - test emptyMessage", function () {
+		var place = $("<div />")[0];
+		var params = ["missing"];
+		var paramString = "missing emptyMessage:nothing";
+		config.macros.list.handler(place,"list",params,null,paramString);
+		strictEqual($("li", place).length, 2,"no missing tiddlers only header and empty message");
+		strictEqual($($("li", place)[1]).text(), "nothing", "check the empty message was printed");
+	});
+
+	test("list shadows", function () {
+		var place = $("<div />")[0];
+		var params = ["shadowed"];
+		var paramString = "shadowed";
+		var numShadows = 0;
+		for(var i in config.shadowTiddlers) {
+			numShadows += 1;
+		}
+		config.macros.list.handler(place,"list",params,null,paramString);
+		strictEqual($("li", place).length, numShadows + 1,"all shadows and the header");
+		var items = $("li", place);
+		strictEqual($("li .tiddlyLink", place).length, items.length - 1,
+			"everything but header should be tiddlylink")
+		strictEqual($(items[1]).text(), "AdvancedOptions",
+			"the first in the list should be the shadow AdvancedOptions");
+		strictEqual($(items[items.length - 1]).text(), "WindowTitle",
+			"the first in the list should be the shadow WindowTitle");
+	});
+	
+	test("list orphans", function () {
+		var place = $("<div />")[0];
+		var params = ["orphans"];
+		var paramString = "orphans";
+		config.macros.list.handler(place,"list",params,null,paramString);
+		strictEqual($("li", place).length, 3,"header plus 2 dummy tiddlers");
+		var items = $("li", place);
+		strictEqual($(items[1]).text(), "testTiddler1",
+			"check alphabetical order");
+		strictEqual($(items[2]).text(), "testTiddler3",
+			"check alphabetical order");
+	});
+
+	test("list touched", function () {
+		var place = $("<div />")[0];
+		var params = ["touched"];
+		var paramString = "touched";
+		config.macros.list.handler(place,"list",params,null,paramString);
+		strictEqual($("li", place).length, 1,"just header");
+	});
+
+	test("list filter", function () {
+		var place = $("<div />")[0];
+		var params = ["filter", "[tag[twoTag]]"];
+		var paramString = "filter [tag[twoTag]]";
+		config.macros.list.handler(place,"list",params,null,paramString);
+		var item = $("li .tiddlyLink", place);
+		strictEqual(item.length, 1,"just the tiddler matched");
+		strictEqual(item.text(), "testTiddler2")
+	});
+	
+	test("NEW: list filter emptyMessage", function () {
+		var place = $("<div />")[0];
+		var params = ["filter", "[tag[badtag]]"];
+		var paramString = "filter [tag[badtag]] emptyMessage:what";
+		config.macros.list.handler(place,"list",params,null,paramString);
+		var item = $("li", place);
+		strictEqual(item.length, 1,"just the empty message");
+		strictEqual(item.text(), "what")
+	});
+	
+	test("dateFormat default", function() {
+		strictEqual(config.macros.timeline.dateFormat, "DD MMM YYYY");
+	});
+
+	test("&lt;&lt;timeline&gt;&gt;", function () {
+		var place = $("<div />")[0];
+		var params = [];
+		var paramString = "";
+		var tiddler = store.getTiddler("testTiddler1");
+		config.macros.timeline.handler(place,"timeline",params, null, paramString, tiddler);
+		var lists = $("ul", place);
+		var items = $("li", place);
+		strictEqual($(lists[0]).hasClass("timeline"), true, "timeline class set");
+		strictEqual(lists.length, 2, "01/12/2010 (1&3), 01/12/1995 (2)");
+		strictEqual(items.length, 5, "headings plus three tiddlers");
+		var list1 = $("li", lists[0]);
+		var heading1 = $(list1[0]);
+		strictEqual(heading1.text(), "1 December 2010", "the most recent");
+		strictEqual(heading1.hasClass("listTitle"), true, "has listTitle class set");
+		var item1 = $("a", list1[1]);
+		strictEqual(item1.hasClass("tiddlyLink tiddlyLinkExisting"), true, "a tiddly link created");
+		strictEqual(item1.text(), "testTiddler3", "the timestamp is more recent so this appears at the top");
+		strictEqual($("a", list1[2]).text(), "testTiddler1");
+		
+		strictEqual($("li:first", lists[1]).text(), "1 December 1995", "2nd heading");
+	});
+
+	test("&lt;&lt;timeline created&gt;&gt;", function () {
+		var place = $("<div />")[0];
+		var params = ["created"];
+		var paramString = "created";
+		var tiddler = store.getTiddler("testTiddler1");
+		config.macros.timeline.handler(place,"timeline",params, null, paramString, tiddler);
+		var lists = $("ul", place);
+		var items = $("li", place);
+		strictEqual($(lists[0]).hasClass("timeline"), true, "timeline class set");
+		strictEqual(lists.length, 3, "21/10/2009, 22/07/1994 and 19/10/2009");
+		strictEqual(items.length, 6, "headings plus three tiddlers");
+		var list1 = $("li", lists[0]);
+		var heading1 = $(list1[0]);
+		strictEqual(heading1.text(), "21 October 2009", "the most recent");
+		strictEqual(heading1.hasClass("listTitle"), true, "has listTitle class set");
+		var item1 = $("a", list1[1]);
+		strictEqual(item1.hasClass("tiddlyLink tiddlyLinkExisting"), true, "a tiddly link created");
+		strictEqual(item1.text(), "testTiddler1");
+		strictEqual($("li:first", lists[1]).text(), "19 October 2009", "2nd heading");
+		strictEqual($("li:first", lists[2]).text(), "22 July 1994", "3rd heading");
+	});
+
+	test("&lt;&lt;timeline '' 1&gt;&gt;", function () {
+		var place = $("<div />")[0];
+		var params = ["", "1"];
+		var paramString = "'' 1";
+		var tiddler = store.getTiddler("testTiddler1");
+		config.macros.timeline.handler(place,"timeline",params, null, paramString, tiddler);
+		var lists = $("ul", place);
+		var items = $("li", place);
+		strictEqual($(lists[0]).hasClass("timeline"), true, "timeline class set");
+		strictEqual(lists.length, 1, "the 2nd parameter defines a cutoff limitting the results to 1");
+		strictEqual(items.length, 2, "heading plus the latest tiddler");
+		var list1 = $("li", lists[0]);
+		var heading1 = $(list1[0]);
+		strictEqual(heading1.text(), "1 December 2010", "the most recent");
+		strictEqual($("a", list1[1]).text(), "testTiddler3", "the timestamp is more recent so this appears at the top");
+	});
+
+	test("test date format &lt;&lt;timeline '' 1 '0hh:0mm' &gt;&gt;", function () {
+		var place = $("<div />")[0];
+		var params = [null, "1", "0hh:0mm"];
+		var paramString = "'' 1 '0hh:0mm'";
+		var tiddler = store.getTiddler("testTiddler1");
+		config.macros.timeline.handler(place,"timeline",params, null, paramString, tiddler);
+		strictEqual($("ul .listTitle", place).text(), "09:40", "check dateFormat parameter has propagated");
+		strictEqual($("ul .listLink", place).text(), "testTiddler3", "the timestamp is more recent so this appears at the top");
+	});
+
+	test("tagging macro (tagging nothing)", function() {
+		var place = $("<div />")[0];
+		var paramString = "";
+		var tiddler = store.getTiddler("I tag nothing");
+		config.macros.tagging.handler(place, null, [], null, paramString, tiddler);
+
+		strictEqual($("ul", place).length, 1, "a list was created in the container");
+		strictEqual($("ul li.listTitle", place).length, 1, "a list title was created");
+		strictEqual($("ul li.listTitle", place).text(), config.macros.tagging.labelNotTag,
+			"the text says this tiddler is tagging nothing");
+	});
+
+	test("tagging macro (tagging something)", function() {
+		var place = $("<div />")[0];
+		var paramString = "";
+		var tiddler = new Tiddler("testTag");
+		config.macros.tagging.handler(place, null, [], null, paramString, tiddler);
+
+		strictEqual($("ul", place).length, 1, "a list was created in the container");
+		strictEqual($("ul li.listTitle", place).length, 1, "a list title was created");
+		strictEqual($("ul li.listTitle", place).text(), config.macros.tagging.label,
+			"the text says this tiddler is tagging things");
+		strictEqual($("ul li", place).length, 4,
+			"3 tiddlers are tagged with testTag and the list title makes 4 items");
+		strictEqual($("ul li a.tiddlyLink", place).length, 3,
+			"3 tiddlers link to testTag");
+	});
+
+	//<<tagging sortBy:title>>;
+	test("tagging macro (sortby parameter)", function() {
+		var place = $("<div />")[0];
+		var paramString = "sortBy:-title"
+		var tiddler = new Tiddler("testTag");
+		config.macros.tagging.handler(place, null, [], null, paramString, tiddler);
+
+		strictEqual($("ul", place).length, 1, "a list was created in the container");
+		strictEqual($("ul li a.tiddlyLink", place).length, 3,
+			"3 tiddlers link to testTag");
+		strictEqual($($("li a", place)[0]).attr("tiddlyLink"), "testTiddler3",
+			"testing testTiddler3 is at the top of the list");
+		strictEqual($($("li a", place)[2]).attr("tiddlyLink"), "testTiddler1",
+			"testing testTiddler1 is at the bottom of the list");
+	});
+
+	test("tagging macro (tagging something title parameter passed)", function() {
+		// note this test is identical to above but uses a parameter rather than the current tiddler.
+		var place = $("<div />")[0];
+		var paramString = "testTag";
+		config.macros.tagging.handler(place, null, [], null, paramString, null);
+
+		strictEqual($("ul", place).length, 1, "a list was created in the container");
+		strictEqual($("ul li.listTitle", place).length, 1, "a list title was created");
+		strictEqual($("ul li.listTitle", place).text(), config.macros.tagging.label,
+			"the text says this tiddler is tagging things");
+		strictEqual($("ul li", place).length, 4,
+			"3 tiddlers are tagged with testTag and the list title makes 4 items");
+		strictEqual($("ul li a.tiddlyLink", place).length, 3,
+			"3 tiddlers link to testTag");
+	});
+
+	test("tagging macro (sep parameter)", function() {
+		// note this test is identical to above but uses a parameter rather than the current tiddler.
+		var place = $("<div />")[0];
+		var paramString = "testTag sep:','";
+		config.macros.tagging.handler(place, null, [], null, paramString, null);
+
+		var text = $("ul", place).text();
+		strictEqual(text, config.macros.tagging.label + "testTiddler1,testTiddler2,testTiddler3",
+			"The sep parameter adds separators between each item");
+	});
+
+	module("Macros.js - additional scenarios", {
+		setup: function() {
+			var text = "[[Foo is a missing tiddler]] test";
+			store.saveTiddler("MissingExample", "MissingExample", text);
+			var templateText = "<<view title link>> hello world";
+			store.saveTiddler("MyTemplate", "MyTemplate", templateText);
+		},
+		teardown: function() {
+			store.removeTiddler("MissingExample");
+			store.removeTiddler("MyTemplate");
+		}
+	});
+
+	test("list missing - where something missing", function () {
+		var place = $("<div />")[0];
+		var params = ["missing"];
+		var paramString = "missing";
+		config.macros.list.handler(place,"list",params,null,paramString);
+		strictEqual($("li", place).length, 2, "prompt and one match");
+		strictEqual($("li .tiddlyLink", place).text(), "Foo is a missing tiddler","check missing tiddler link created.");
+	});
+
+	test("NEW: missing with template parameter", function () {
+		var place = $("<div />")[0];
+		var params = ["missing"];
+		var paramString = "missing template:MyTemplate";
+		config.macros.list.handler(place,"list",params,null,paramString);
+		var items = $("li", place);
+		strictEqual(items.length, 2, "prompt and one match");
+		strictEqual($(items[0]).text(), config.macros.list.missing.prompt, "prompt in place and immune from templating");
+		strictEqual($(items[1]).text(),
+			"Foo is a missing tiddler hello world","check missing tiddler link created.");
+	});
+
+	test("list touched", function () {
+		var place = $("<div />")[0];
+		var params = ["touched"];
+		var paramString = "touched";
+		config.macros.list.handler(place,"list",params,null,paramString);
+		strictEqual($("li", place).length, 3, "just header and MissingExample and MyTemplate");
+		var links = $("li .tiddlyLink", place);
+		strictEqual($(links[0]).text(), "MissingExample", "should have noticed it was touched");
+	});
+
+	test("NEW: list filter with new template", function () {
+		var place = $("<div />")[0];
+		var params = ["filter", "[tag[testTag]][sort[-title]]"];
+		var paramString = "filter [tag[testTag]][sort[-title]] template:MyTemplate";
+		config.macros.list.handler(place,"list",params,null,paramString);
+		var items = $("li", place);
+		strictEqual(items.length, 3, "should match 3 tiddlers");
+		strictEqual($(items[0]).text(), "testTiddler3 hello world", "the template has hello world in it.");
+		strictEqual($(".tiddlyLink", items[0]).text(), "testTiddler3", "filter sorts by descending title");
+	});
+
+	module("Macros.js - timeline templating", {
+		setup: function() {
+			config.shadowTiddlers["TestTemplates"] = ["!Group",
+				"Modified at <<view modified date '0hh'>>hrs on <<view modified date '0DD/0MM/YYYY'>>",
+				"!Item", "hello world <<view title text>>!"].join("\n");
+		},
+		teardown: function() {
+			delete config.shadowTiddlers["TestTemplates"];
+		}
+	});
+
+	test("&lt;&lt;timeline created groupTemplate:TestTemplates##Group template:TestTemplates##Item&gt;&gt;", function () {
+		var place = $("<div />")[0];
+		var params = ["created", "groupTemplate:TestTemplates##Group", "template:TestTemplates##Item"];
+		var paramString = "created groupTemplate:TestTemplates##Group template:TestTemplates##Item";
+		var tiddler = store.getTiddler("testTiddler1");
+		config.macros.timeline.handler(place,"timeline",params, null, paramString, tiddler);
+		var lists = $("ul", place);
+		var items = $("li", place);
+		strictEqual($(lists[0]).hasClass("timeline"), true, "timeline class set");
+		strictEqual(lists.length, 3, "21/10/2009, 22/07/1994 and 19/10/2009");
+		strictEqual(items.length, 6, "headings plus three tiddlers");
+	});
+	
+	test("NEW: test templating &lt;&lt;timeline '' 1 groupTemplate:TestTemplates##Group template:TestTemplates##Item&gt;&gt; ",
+		function () {
+		var place = $("<div />")[0];
+		var params = ["", "1", "groupTemplate:TestTemplates##Group", "template:TestTemplates##Item"];
+		var paramString = "'' 1 groupTemplate:TestTemplates##Group template:TestTemplates##Item";
+		var tiddler = store.getTiddler("testTiddler1");
+		config.macros.timeline.handler(place, "timeline", params, null, paramString, tiddler);
+		strictEqual($("ul .listTitle", place).text(), "Modified at 09hrs on 01/12/2010",
+			"check group template was applied");
+		strictEqual($("ul .listLink", place).text(), "hello world testTiddler3!", "the item template was applied");
+		strictEqual($("ul .listLink a", place).length, 0, "no link created");
+	});
+
+	test("NEW: test group templating vs timestamp &lt;&lt;timeline '' 1 0hh:0mm groupTemplate:TestTemplates##Group&gt;&gt; ",
+		function () {
+		var place = $("<div />")[0];
+		var params = ["", "1", "0hh:0mm", "groupTemplate:TestTemplates##Group"];
+		var paramString = "'' 1 0hh:0mm groupTemplate:TestTemplates##Group template:TestTemplates##Item";
+		var tiddler = store.getTiddler("testTiddler1");
+		config.macros.timeline.handler(place, "timeline", params, null, paramString, tiddler);
+		strictEqual($("ul .listTitle", place).text(), "Modified at 09hrs on 01/12/2010", "check group template was applied and timestamp ignored");
+	});
+
+	test("NEW: test filtering &lt;&lt;timeline filter:[tag[twoTag]]&gt;&gt; ",
+		function () {
+		var place = $("<div />")[0];
+		var params = ["filter:[tag[twoTag]]"];
+		var paramString = "filter:[tag[twoTag]]";
+		var tiddler = store.getTiddler("testTiddler1");
+		config.macros.timeline.handler(place,"timeline",params, null, paramString, tiddler);
+		strictEqual($("ul", place).length, 1, "1 timeline created");
+		strictEqual($("ul li", place).length, 2, "heading and tiddler");
+		strictEqual($("ul .listLink a", place).text(), "testTiddler2", "only testTiddler2 has the tag twoTag");
+	});
+});
+}(jQuery));
diff --git a/test/data/tiddlywiki/test/js/Numbers.js b/test/data/tiddlywiki/test/js/Numbers.js
new file mode 100755
index 000000000..4ab77e726
--- /dev/null
+++ b/test/data/tiddlywiki/test/js/Numbers.js
@@ -0,0 +1,28 @@
+jQuery(document).ready(function() {
+	module("Numbers");
+
+	test("Number clamp", function() {
+		var actual, expected;
+
+		actual = (99).clamp();
+		expected = 99;
+		same(actual, expected, "returns original number if no arguments are specified");
+
+		actual = (11).clamp(20);
+		expected = 20;
+		same(actual, expected, "if only one argument is specified, uses it as minimum");
+
+		actual = (55).clamp(20, 80);
+		expected = 55;
+		same(actual, expected, "returns original number if it is between minimum and maximum");
+
+		actual = (11).clamp(20, 80);
+		expected = 20;
+		same(actual, expected, "returns minimum if number is smaller than minimum");
+
+		actual = (99).clamp(20, 80);
+		expected = 80;
+		same(actual, expected, "returns maximum if number is greater than maximum");
+	});
+
+});
diff --git a/test/data/tiddlywiki/test/js/Options.js b/test/data/tiddlywiki/test/js/Options.js
new file mode 100755
index 000000000..0eef9136a
--- /dev/null
+++ b/test/data/tiddlywiki/test/js/Options.js
@@ -0,0 +1,29 @@
+jQuery(document).ready(function(){
+	var numSaves, _autoSaveChanges;
+	module("TiddlyWiki options", {
+		setup: function() {
+			config.options.chkAutoSave = true;
+			systemSettingSave = 0;
+			_autoSaveChanges = autoSaveChanges;
+			numSaves = 0;
+			autoSaveChanges = function() {
+				numSaves += 1;
+				return _autoSaveChanges.apply(this, arguments);
+			}
+		},
+		teardown: function() {
+			numSaves = null;
+			config.options.chkAutoSave = false;
+			autoSaveChanges = _autoSaveChanges;
+		}
+	});
+
+	test("save multiple system settings", function() {
+		saveSystemSetting("foo", true);
+		saveSystemSetting("foo", false);
+		saveSystemSetting("foo", true);
+		strictEqual(numSaves, 0, "The save is asynchronous so no saves have yet been made");
+		strictEqual(systemSettingSave > 0, true, "However there should be a timeout in progress");
+	});
+	
+});
\ No newline at end of file
diff --git a/test/data/tiddlywiki/test/js/RGB.js b/test/data/tiddlywiki/test/js/RGB.js
new file mode 100755
index 000000000..ab11b1d44
--- /dev/null
+++ b/test/data/tiddlywiki/test/js/RGB.js
@@ -0,0 +1,43 @@
+jQuery(document).ready(function(){
+
+	module("TiddlyWiki core");
+
+	test("RGB tests", function() {
+		expect(4);
+
+		var actual = new RGB(1,0,1).toString();
+		var expected = "#ff00ff";
+		ok(actual==expected,'RGB(1,0,1) is the same as #ff00ff');
+
+		actual = new RGB("#f00").toString();
+		expected = "#ff0000";
+		ok(actual==expected,'#ff0000 is the same as #f00');
+
+		actual = new RGB("#123").toString();
+		console.log("actual",actual);
+		expected = "#112233";
+		ok(actual==expected,'#112233 is the same as #123');
+
+		actual = new RGB("#abc").toString();
+		console.log("actual",actual);
+		expected = "#aabbcc";
+		ok(actual==expected,'#aabbcc is the same as #abc');
+
+		actual = new RGB("#123456").toString();
+		expected = "#123456";
+		ok(actual==expected,'#123456 is the same as #123456');
+
+		actual = new RGB("rgb(0,255,0)").toString();
+		expected = "#00ff00";
+		ok(actual==expected,'RGB object created from rgb value > toString method gives hex');
+
+		actual = new RGB("rgb(120,0,0)").mix(new RGB("#00ff00"),0.5).toString();
+
+		//120 + (0 - 120) *0.5 and 0 + (255-0) * 0.5
+		expected = new RGB("rgb(60,127,0)").toString();
+		ok(actual==expected,'RGB mix function proportion 0.5');
+
+	});
+
+
+});
diff --git a/test/data/tiddlywiki/test/js/SavingRSS.js b/test/data/tiddlywiki/test/js/SavingRSS.js
new file mode 100755
index 000000000..6144dc6b2
--- /dev/null
+++ b/test/data/tiddlywiki/test/js/SavingRSS.js
@@ -0,0 +1,117 @@
+// carried over from jsspec testing
+// TBD: refactor out
+tests_xml = {
+
+	parse: function(text) {
+		var doc;
+		if(window.ActiveXObject) {
+			doc = new ActiveXObject("Microsoft.XMLDOM");
+			doc.async = "false";
+			doc.loadXML(text);
+		} else {
+			var parser = new DOMParser();
+			doc = parser.parseFromString(text,"text/xml");
+		}
+		if(!doc) {
+			return null;
+		}
+
+		doc.xpath = function(expression, type) {
+			var t;
+
+			if(type == "string") { t = XPathResult.STRING_TYPE; }
+			if(type == "number") { t = XPathResult.NUMBER_TYPE; }
+			if(type == "boolean") { t = XPathResult.BOOLEAN_TYPE; }
+			if(type == "singlenode") { t = XPathResult.SINGLENODE_TYPE; }
+
+			var res = this.evaluate(expression, this, null, t, null);
+
+			if(type == "string") { return res.stringValue; }
+			if(type == "number") { return res.numberValue; }
+			if(type == "boolean") { return res.booleanValue; }
+			if(type == "singleNode") { return this.singleNodeValue; }
+			return null;
+		};
+
+		return doc;
+	}
+};
+
+jQuery(document).ready(function(){
+
+	var _username;
+	module("GenerateRss", {
+		setup: function() {
+			_username = config.options.txtUserName;
+			config.options.txtUserName = "YourName";
+		},
+		teardown: function() {
+			config.options.txtUserName = _username;
+		}
+	});
+
+	/*
+		<rss version="2.0">
+		<channel>
+			<title>My TiddlyWiki</title>
+			<link>http://www.tiddlywiki.com/</link>
+			<description>a reusable non-linear personal web notebook</description>
+			<language>en-us</language>
+			<copyright>Copyright 2008 YourName</copyright>
+			<pubDate>Tue, 15 Apr 2008 11:11:50 GMT</pubDate>
+			<lastBuildDate>Tue, 15 Apr 2008 11:11:50 GMT</lastBuildDate>
+			<docs>http://blogs.law.harvard.edu/tech/rss</docs>
+			<generator>TiddlyWiki 2.4.0</generator>
+		</channel>
+		</rss>
+	*/
+	test("generateRss: feed for an empty store", function() {
+
+		var actual, expected;
+		var rss = generateRss();
+
+		actual = (typeof rss);
+		expected = 'string';
+		same(actual, expected, 'produces a string value');
+
+		// <?xml version='1.0'?>
+		// <?xml version="1.0" ?>
+		// <?xml version="1.0" encoding='utf-8' ?>
+		actual = rss.match(new RegExp(/^<\?xml\s+version=(["'])1.0\1\s*(encoding=(["'])utf-8\2)?\s*\?>/));
+		ok(actual, 'should start with an XML 1.0 declaration');
+
+		xml = tests_xml.parse(rss);
+		actual = typeof xml;
+		expected = 'object';
+		same(actual, expected, 'should be well-formed XML');
+
+		actual = xml.documentElement.nodeName;
+		expected = "rss";
+		same(actual, expected, 'document node should be "rss"');
+
+		actual = xml.documentElement.getAttribute("version");
+		expected = "2.0";
+		same(actual, expected, 'rss version should be "2.0"');
+
+		actual = xml.xpath("count(/rss/channel)", "number");
+		expected = 1;
+		same(actual, expected, 'document should have a single channel element');
+
+		actual = xml.xpath("/rss/channel/title", "string");
+		expected = 'My TiddlyWiki';
+		same(actual, expected, 'channel title should be the default TiddlyWiki title');
+
+		actual = xml.xpath("/rss/channel/description", "string");
+		expected = 'a reusable non-linear personal web notebook';
+		same(actual, expected, 'channel description should be the default TiddlyWiki subtitle');
+
+		actual = xml.xpath("/rss/channel/language", "string");
+		expected = 'en';
+		same(actual, expected, 'channel language should be "en"');
+
+		// Y2K+99 issue
+		var message = xml.xpath("/rss/channel/copyright", "string");
+		actual = message.match(new RegExp(/Copyright 20[0-9]{2,2} YourName/));
+		ok(actual, 'channel copyright should be "TiddlyWiki YYYY YourName"');
+	});
+});
diff --git a/test/data/tiddlywiki/test/js/Shadows.js b/test/data/tiddlywiki/test/js/Shadows.js
new file mode 100755
index 000000000..32688358a
--- /dev/null
+++ b/test/data/tiddlywiki/test/js/Shadows.js
@@ -0,0 +1,21 @@
+jQuery(document).ready(function(){
+
+	module("TiddlyWiki core");
+
+	test("Shadow tiddler existence", function() {
+		expect(2);
+
+		var actual = config.shadowTiddlers["EditTemplate"];
+		ok(actual,'EditTemplate shadow tiddler should exist');
+
+		loadShadowTiddlers();
+		actual = config.shadowTiddlers["StyleSheetColors"];
+		ok(actual,'StyleSheetColors shadow tiddler should exist');
+
+		actual = config.shadowTiddlers["SystemSettings"];
+		strictEqual(typeof(actual) !== 'undefined',true,'SystemSettings shadow tiddler should exist');
+
+	});
+
+
+});
diff --git a/test/data/tiddlywiki/test/js/Strings.js b/test/data/tiddlywiki/test/js/Strings.js
new file mode 100755
index 000000000..e40183817
--- /dev/null
+++ b/test/data/tiddlywiki/test/js/Strings.js
@@ -0,0 +1,70 @@
+jQuery(document).ready(function(){
+
+	module("TiddlyWiki core");
+
+	test("String functions", function() {
+		expect(4);
+
+		var actual = "abcdef".right(3);
+		var expected = "def";
+		ok(actual==expected,'String right');
+
+		actual = " abcdef ".trim();
+		expected = "abcdef";
+		ok(actual==expected,'String trim');
+
+		actual = " abc def ".trim();
+		expected = "abc def";
+		ok(actual==expected,'String trim');
+
+		actual = "background-color".unDash();
+		expected = "backgroundColor";
+		ok(actual==expected,'String undash');
+
+	});
+
+	test("readMacroParams", function() {
+		var params = "foo bar dum".readMacroParams(false);
+		var params2 = "foo bar 'tweedle de' dum".readMacroParams(false);
+		var params3 = "foo bar 'tweedle dum' dum test:foo test: 'bar' [[check brackets]]".readMacroParams(false);
+
+		strictEqual(params.length, 3, "There are 3 parameters");
+		strictEqual(params2.length, 4, "There are 4 parameters");
+		strictEqual(params2[2], "tweedle de", "Check parameter in brackets");
+		strictEqual(params3[4], "test:foo");
+		strictEqual(params3[5], "test:");
+		strictEqual(params3[6], "bar");
+		strictEqual(params3[7], "check brackets");
+	});
+
+	test("parseParams", function() {
+		var args = "foo [[bar dum]] test:foo test: bar hello:[[goodbye]] x: [[bar dum]] what:[['fun']] why:'[[test]]'".
+			parseParams();
+		var args2 = "foo [[bar dum]] test:foo test: bar hello:[[goodbye]] x: [[bar dum]] what:[['fun']] why:'[[test]]'".
+			parseParams("anon");
+		var map = args[0];
+		var map2 = args2[0];
+
+		strictEqual(map.anon, undefined, "no unnamed parameters matched");
+		strictEqual(map.what.length, 1, "what only matched once");
+		strictEqual(map.test.length, 2, "test is a named parameter twice");
+		strictEqual(args[2].name, "bar dum", "unnamed parameters are collected in resulting array");
+		strictEqual(args[2].value, undefined, "no value for unnamed parameters");
+		strictEqual(args[3].value, "foo", "test matches foo");
+		strictEqual(args[4].value, "bar", "test matches bar the leading whitespace ignored");
+		strictEqual(args[5].value, "goodbye", "checking [[ ]]");
+		strictEqual(args[6].value, "bar dum", "checking [[ ]] and ignored leading space");
+		strictEqual(args[7].value, "'fun'", "checking the quotes are kept");
+		strictEqual(args[8].value, "[[test]]", "checking the brackets are kept in this special case");
+
+		strictEqual(map2.anon.length, 2, "foo and bar dum matched");
+		strictEqual(args2[1].name, "anon",
+			"unnamed parameters collect as anonymous");
+		strictEqual(args2[1].value, "foo",
+			"unnamed parameters collect as anonymous");
+		strictEqual(args2[2].name, "anon",
+			"unnamed parameters collect as anonymous");
+		strictEqual(args2[2].value, "bar dum", "unnamed parameters collect as anonymous");
+		strictEqual(args2[3].name, "test", "named parameters collected as normal");
+	});
+});
diff --git a/test/data/tiddlywiki/test/js/TW21Saver.js b/test/data/tiddlywiki/test/js/TW21Saver.js
new file mode 100755
index 000000000..389b9b5bd
--- /dev/null
+++ b/test/data/tiddlywiki/test/js/TW21Saver.js
@@ -0,0 +1,51 @@
+jQuery(document).ready(function(){
+
+	module("TW21Saver");
+
+	test("Saving tests", function() {
+		var store = new TiddlyWiki();
+		var saver = store.getSaver();
+
+		var tiddler = new Tiddler("test");
+		tiddler.text = "";
+		tiddler.created = version.date;
+		tiddler.modified = tiddler.created;
+
+		var actual = saver.externalizeTiddler(store,tiddler);
+		var expected = "<div title=\"test\">\n<pre></pre>\n</div>";
+		ok(actual==expected,'Saving empty tiddler with no dates');
+
+		delete tiddler;
+		tiddler = new Tiddler("test");
+		tiddler.text = "";
+		tiddler.created = new Date(Date.UTC(2008,3,16,12,34));
+		tiddler.modified = tiddler.created;
+
+		actual = saver.externalizeTiddler(store,tiddler);
+		expected = "<div title=\"test\" created=\"200804161234\">\n<pre></pre>\n</div>";
+		ok(actual==expected,'Saving empty tiddler with created date');
+
+		delete tiddler;
+		tiddler = new Tiddler("test");
+		tiddler.text = "";
+		tiddler.created = new Date(Date.UTC(2008,3,16,12,34));
+		tiddler.modified = new Date(Date.UTC(2008,3,17,12,34));
+
+		actual = saver.externalizeTiddler(store,tiddler);
+		expected = "<div title=\"test\" created=\"200804161234\" modified=\"200804171234\">\n<pre></pre>\n</div>";
+		ok(actual==expected,'Saving empty tiddler with created and modified dates');
+
+		delete tiddler;
+		tiddler = new Tiddler("test");
+		tiddler.text = "text";
+		tiddler.created = version.date;
+		tiddler.modified = tiddler.created;
+
+		actual = saver.externalizeTiddler(store,tiddler);
+		expected = "<div title=\"test\">\n<pre>text</pre>\n</div>";
+		ok(actual==expected,'Saving tiddler with text');
+
+	});
+
+
+});
diff --git a/test/data/tiddlywiki/test/js/Tiddler.js b/test/data/tiddlywiki/test/js/Tiddler.js
new file mode 100755
index 000000000..6a98a4e63
--- /dev/null
+++ b/test/data/tiddlywiki/test/js/Tiddler.js
@@ -0,0 +1,90 @@
+jQuery(document).ready(function(){
+
+	module("Tiddler");
+
+	test('constructor', function() {
+		var tiddler = new Tiddler("temp");
+		var empty = "";
+		same(tiddler.text,"",'Newly created tiddler should have empty string as content');
+		tiddler = new Tiddler("temp");
+		same(tiddler.created,tiddler.modified,'Created and modified dates should be equal for newly created tiddler');
+		tiddler = new Tiddler("temp");
+		same(tiddler.getTags(),"",'Newly created tiddler should not have any tags');
+	});
+
+	test('tiddler.isTouched()', function() {
+		var tiddler = new Tiddler("temp");
+		same(tiddler.isTouched(),false,'it should return true if the tiddler has been updated since the tiddler was created or downloaded');
+		if(!tiddler.fields['changecount'])
+			tiddler.fields['changecount'] = 0;
+		tiddler.fields['changecount']++;
+		same(tiddler.isTouched(),true,'it should return true if the tiddler has been updated since the tiddler was created or downloaded');
+	});
+
+	test('tiddler.incChangeCount()', function() {
+		var tiddler = new Tiddler("temp");
+		same(tiddler.isTouched(),false,'Tiddler changecount should increment by 1 when incChangeCount is called 1');
+		tiddler.incChangeCount();
+		same(tiddler.isTouched(),true,'Tiddler changecount should increment by 1 when incChangeCount is called 2');
+	});
+
+	test('tiddler.clearChangeCount()', function() {
+		var tiddler = new Tiddler("temp");
+		same(tiddler.isTouched(),false,'Tiddler changecount should be set to 0 when clearChangeCount is called 1');
+		tiddler.incChangeCount();
+		same(tiddler.isTouched(),true,'Tiddler changecount should be set to 0 when clearChangeCount is called 2');
+		tiddler.clearChangeCount();
+		same(tiddler.isTouched(),false,'Tiddler changecount should be set to 0 when clearChangeCount is called 3');
+	});
+
+	test('tiddler.assign()', function() {
+		function newTiddler() {
+			var tiddler = new Tiddler("temp");
+			tiddler.text = "some text";
+			tiddler.modifier = "a modifier";
+			tiddler.created = new Date(2008,04,21,01,02,03);
+			tiddler.modified = new Date(2009,05,22,12,13,14);
+			return tiddler;
+		}
+
+		var tiddler = newTiddler();
+		tiddler.assign("NewTitle");
+		same(tiddler.title,"NewTitle",'Assigning value to tiddler title should override old title 1');
+		same(tiddler.text,"some text",'Assigning value to tiddler title should override old title 2');
+		same(tiddler.modifier,"a modifier",'Assigning value to tiddler title should override old title 3');
+		same(tiddler.created,new Date(2008,04,21,01,02,03),'Assigning value to tiddler title should override old title 4');
+		same(tiddler.modified,new Date(2009,05,22,12,13,14),'Assigning value to tiddler title should override old title 5');
+
+		tiddler = newTiddler();
+		tiddler.assign(null,"new text");
+		same(tiddler.title,"temp",'Assigning value to tiddler text should override old text 1');
+		same(tiddler.text,"new text",'Assigning value to tiddler text should override old text 2');
+		same(tiddler.modifier,"a modifier",'Assigning value to tiddler text should override old text 3');
+		same(tiddler.created,new Date(2008,04,21,01,02,03),'Assigning value to tiddler text should override old text 4');
+		same(tiddler.modified,new Date(2009,05,22,12,13,14),'Assigning value to tiddler text should override old text 5');
+
+		tiddler = newTiddler();
+		tiddler.assign(null,null,"new modifier");
+		same(tiddler.title,"temp",'Assigning value to tiddler modifier should override old modifier 1');
+		same(tiddler.text,"some text",'Assigning value to tiddler modifier should override old modifier 2');
+		same(tiddler.modifier,"new modifier",'Assigning value to tiddler modifier should override old modifier 3');
+		same(tiddler.created,new Date(2008,04,21,01,02,03),'Assigning value to tiddler modifier should override old modifier 4');
+		same(tiddler.modified,new Date(2009,05,22,12,13,14),'Assigning value to tiddler modifier should override old modifier 5');
+
+		tiddler = newTiddler();
+		tiddler.assign(null,null,null,null,null,new Date(2007,03,20,00,01,02));
+		same(tiddler.title,"temp",'Assigning value to tiddler created date should override old created date 1');
+		same(tiddler.text,"some text",'Assigning value to tiddler created date should override old created date 2');
+		same(tiddler.modifier,"a modifier",'Assigning value to tiddler created date should override old created date 3');
+		same(tiddler.created,new Date(2007,03,20,00,01,02),'Assigning value to tiddler created date should override old created date 4');
+		same(tiddler.modified,new Date(2009,05,22,12,13,14),'Assigning value to tiddler created date should override old created date 5');
+
+		tiddler = newTiddler();
+		tiddler.assign(null,null,null,new Date(2010,06,23,13,14,15));
+		same(tiddler.title,"temp",'Assigning value to tiddler modified date should override old modified date 1');
+		same(tiddler.text,"some text",'Assigning value to tiddler modified date should override old modified date 2');
+		same(tiddler.modifier,"a modifier",'Assigning value to tiddler modified date should override old modified date 3');
+		same(tiddler.created,new Date(2008,04,21,01,02,03),'Assigning value to tiddler modified date should override old modified date 4');
+		same(tiddler.modified,new Date(2010,06,23,13,14,15),'Assigning value to tiddler modified date should override old modified date 5');
+	});
+});
diff --git a/test/data/tiddlywiki/test/js/TiddlerFields.js b/test/data/tiddlywiki/test/js/TiddlerFields.js
new file mode 100755
index 000000000..5094fbf07
--- /dev/null
+++ b/test/data/tiddlywiki/test/js/TiddlerFields.js
@@ -0,0 +1,23 @@
+jQuery(document).ready(function(){
+
+	module("TiddlerFields");
+
+	test("getValue", function() {
+		var val = store.getValue("testTiddler2","fieldvalue");
+		var val2 = store.getValue("testTiddler2","modified");
+		var val3 = store.getValue("testTiddler2","tags");
+		var val4 = store.getValue("testTiddler2","::slice");
+		var val5 = store.getValue("testTiddler2","##section");
+		var val6 = store.getValue("testTiddler2","##section2");
+		var val7 = store.getValue("testTiddler2","##Section3");
+		var val8 = store.getValue("testTiddler2","FieldValue");
+		strictEqual(val, "two");
+		strictEqual(val2, "199512010340");
+		strictEqual(val3, "testTag twoTag");
+		strictEqual(val4, "4t");
+		strictEqual(val5, "bar\n");
+		strictEqual(val6, "test\n");
+		strictEqual(val7, "welcome\n");
+		strictEqual(val8, "two");
+	});
+});
diff --git a/test/data/tiddlywiki/test/js/TiddlyWiki.js b/test/data/tiddlywiki/test/js/TiddlyWiki.js
new file mode 100755
index 000000000..e6c71c109
--- /dev/null
+++ b/test/data/tiddlywiki/test/js/TiddlyWiki.js
@@ -0,0 +1,470 @@
+jQuery(document).ready(function(){
+	var _numTiddlers;
+	var module_tiddlers = [{title: "tvalue1", tags: ["twtesthello"], fields: {xyz:"bar"}},
+		{title: "tvalue2", tags: []},
+		{title: "tvalue3", tags: ["twtesthello", "goodbye"], fields: {xyz: "bar"}},
+		{title: "tvalue4", tags: ["what"], fields:{xyz:"bar"}},
+		{title: "tvalue5", tags: [], fields:{xyz:"barz"}}
+	];
+	module("TiddlyWiki.js", {
+		setup: function() {
+			for(var i = 0; i < module_tiddlers.length; i++) {
+				var tid = module_tiddlers[i];
+				store.saveTiddler(tid.title, tid.title, tid.text, null, null, tid.tags, tid.fields);
+			}
+			_numTiddlers = store.getTiddlers().length;
+		},
+		teardown: function() {
+			_numTiddlers = false;
+			for(var i = 0; i < module_tiddlers.length; i++) {
+				var tid = module_tiddlers[i];
+				store.removeTiddler(tid.title);
+			}
+		}
+	});
+
+	test("saveTiddler() fields", function() {
+
+		var store = new TiddlyWiki();
+
+		var title = "tiddler";
+		var text = "text";
+		var fields = {a:"aa", b:"bb"};
+		config.defaultCustomFields = {};
+		var tiddler = store.saveTiddler(title, title, text, null, null, null, fields);
+		tiddler.clearChangeCount();
+		actual = tiddler.fields;
+		expected = {a:"aa", b:"bb"};
+		same(actual,expected,'fields should be unchanged when defaultCustomFields empty');
+
+		config.defaultCustomFields = {dcf1:"d1", dcf2:"d2"};
+		tiddler = store.saveTiddler(title, title, text, null, null, null, fields);
+		tiddler.clearChangeCount();
+		actual = tiddler.fields;
+		expected = {a:"aa", b:"bb", dcf1:"d1", dcf2:"d2"};
+		same(actual,expected,'fields should be merged with defaultCustomFields');
+
+		config.defaultCustomFields = {a:"xx", b:"yy", dcf1:"d1", dcf2:"d2"};
+		tiddler = store.saveTiddler(title, title, text, null, null, null, fields);
+		tiddler.clearChangeCount();
+		actual = tiddler.fields;
+		expected = {a:"aa", b:"bb", dcf1:"d1", dcf2:"d2"};
+		same(actual,expected,'defaultCustomFields should not overwrite fields');
+	});
+
+	test("Slices: calcAllSlices()", function() {
+
+		var store = new TiddlyWiki();
+
+		var actual = typeof store.calcAllSlices();
+		var expected = "object";
+		same(actual,expected,'should return an object when not passed any arguments');
+
+		actual = typeof store.calcAllSlices("");
+		expected = "object";
+		same(actual,expected,'should return an object when passed an empty string');
+
+		actual = typeof store.calcAllSlices("MissingTiddler");
+		expected = "object";
+		same(actual,expected,'should return an object when pointed to a non-existing tiddler');
+
+		var title = "tiddler";
+		var text = "foo: bar";
+		store.saveTiddler(title, title, text);
+		actual = store.calcAllSlices(title);
+		expected = { "foo": "bar" };
+		same(actual,expected,'should return an existing slice (colon notation) as a label/value pair');
+
+		title = "tiddler";
+		text = "foo: bar\nlorem: ipsum";
+		store.saveTiddler(title, title, text);
+		actual = store.calcAllSlices(title);
+		expected = { foo: "bar", lorem: "ipsum" };
+		same(actual,expected,'should return existing slices (colon notation) as label/value pairs');
+
+		title = "tiddler";
+		text = "|foo|bar|";
+		store.saveTiddler(title, title, text);
+		actual = store.calcAllSlices(title);
+		expected = { foo: "bar" };
+		same(actual,expected,'should return an existing slice (table notation) as a label/value pair');
+
+		title = "tiddler";
+		text = "|foo|bar|\n|lorem|ipsum|";
+		store.saveTiddler(title, title, text);
+		actual = store.calcAllSlices(title);
+		expected = { foo: "bar", lorem: "ipsum" };
+		same(actual,expected,'should return existing slices (table notation) as label/value pairs');
+
+		title = "tiddler";
+		text = "|''foo''|bar|";
+		store.saveTiddler(title, title, text);
+		actual = store.calcAllSlices(title);
+		expected = { foo: "bar" };
+		same(actual,expected,'should strip bold markup from slice labels');
+
+		title = "tiddler";
+		text = "|//foo//|bar|";
+		store.saveTiddler(title, title, text);
+		actual = store.calcAllSlices(title);
+		expected = { foo: "bar" };
+		same(actual,expected,'should strip italic markup from slice labels');
+
+		title = "tiddler";
+		text = "|foo|''bar''|";
+		store.saveTiddler(title, title, text);
+		actual = store.calcAllSlices(title);
+		expected = { foo: "''bar''" };
+		same(actual,expected,'should not strip markup from slice values');
+
+		title = "tiddler";
+		text = "|~FooBar|baz|";
+		store.saveTiddler(title, title, text);
+		actual = store.calcAllSlices(title);
+		expected = { FooBar: "baz" };
+		same(actual,expected,'should ignore the escaping character for WikiWords in slice labels');
+
+		title = "tiddler";
+		text = "|~foo|bar|";
+		store.saveTiddler(title, title, text);
+		actual = store.calcAllSlices(title);
+		expected = { foo: "bar" };
+		same(actual,expected,'should ignore the escaping character for non-WikiWords in slice labels');
+
+		title = "tiddler";
+		text = "|foo|~BarBaz|";
+		store.saveTiddler(title, title, text);
+		actual = store.calcAllSlices(title);
+		expected = { foo: "~BarBaz" };
+		same(actual,expected,'should not ignore the escaping character for WikiWords in slice values');
+
+		title = "tiddler";
+		text = "|foo|~bar|";
+		store.saveTiddler(title, title, text);
+		actual = store.calcAllSlices(title);
+		expected = { foo: "~bar" };
+		same(actual,expected,'should not ignore the escaping character for non-WikiWords in slice values');
+
+		title = "tiddler";
+		text = "|foo bar|baz|";
+		store.saveTiddler(title, title, text);
+		actual = store.calcAllSlices(title);
+		expected = {};
+		same(actual,expected,'should ignore slices whose label contains spaces');
+
+		title = "tiddler";
+		text = "|foo|bar baz|";
+		store.saveTiddler(title, title, text);
+		actual = store.calcAllSlices(title);
+		expected = { foo: "bar baz" };
+		same(actual,expected,'should not ignore slices whose value contains spaces');
+
+		title = "tiddler";
+		text = "|foo:|bar|";
+		store.saveTiddler(title, title, text);
+		actual = store.calcAllSlices(title);
+		expected = { foo: "bar" };
+		same(actual,expected,'should strip trailing colons from slice labels (table notation)');
+
+		title = "tiddler";
+		text = "''~FooBar:'' baz";
+		store.saveTiddler(title, title, text);
+		actual = store.calcAllSlices(title);
+		expected = { FooBar: "baz" };
+		same(actual,expected,'should strip bold markup from slice labels (colon notation)');
+
+		title = "tiddler";
+		text = "//~FooBar:// baz";
+		store.saveTiddler(title, title, text);
+		actual = store.calcAllSlices(title);
+		expected = { FooBar: "baz" };
+		same(actual,expected,'should strip italic markup from slice labels (colon notation)');
+
+		title = "tiddler";
+		text = "|''~FooBar:''|baz|";
+		store.saveTiddler(title, title, text);
+		actual = store.calcAllSlices(title);
+		expected = { FooBar: "baz" };
+		same(actual,expected,'should strip bold markup from slice labels (table notation)');
+
+		title = "tiddler";
+		text = "|//~FooBar://|baz|";
+		store.saveTiddler(title, title, text);
+		actual = store.calcAllSlices(title);
+		expected = { FooBar: "baz" };
+		same(actual,expected,'should strip italic markup from slice labels (table notation)');
+
+		title = "tiddler";
+		text = "foo: bar: baz";
+		store.saveTiddler(title, title, text);
+		actual = store.calcAllSlices(title);
+		expected = { foo: "bar: baz" };
+		same(actual,expected,'should ignore colons in slice values (colon notation)');
+
+		title = "tiddler";
+		text = "foo.bar: baz";
+		store.saveTiddler(title, title, text);
+		actual = store.calcAllSlices(title);
+		expected = { "foo.bar": "baz" };
+		same(actual,expected,'should allow dots in slice labels');
+
+		title = "tiddler";
+		text = "foo: bar|baz";
+		store.saveTiddler(title, title, text);
+		actual = store.calcAllSlices(title);
+		expected = { "foo": "bar|baz" };
+		same(actual,expected,'should allow pipes in slice values (colon notation)');
+
+		title = "tiddler";
+		text = "|foo|bar|baz|";
+		store.saveTiddler(title, title, text);
+		actual = store.calcAllSlices(title);
+		expected = { "foo": "bar|baz" };
+//		same(actual,expected,'should allow pipes in slice values (table notation)');
+
+		title = "tiddler";
+		text = "foo: lorem [[bar|baz]] ipsum";
+		store.saveTiddler(title, title, text);
+		actual = store.calcAllSlices(title);
+		expected = { foo: "lorem [[bar|baz]] ipsum" };
+		same(actual,expected,'should retrieve slices containing PrettyLinks (colon notation)');
+
+		title = "tiddler";
+		text = "foo: lorem [img[qux|bar.baz]] ipsum";
+		store.saveTiddler(title, title, text);
+		actual = store.calcAllSlices(title);
+		expected = { foo: "lorem [img[qux|bar.baz]] ipsum" };
+		same(actual,expected,'should retrieve slices containing image markup (colon notation)');
+
+	/*
+		// FAILURE
+		// ticket #522 (http://trac.tiddlywiki.org/ticket/522)
+		title = "tiddler";
+		text = "//{{{\nfoo: bar;\n//}}}";
+		store.saveTiddler(title, title, text);
+		actual = store.calcAllSlices(title);
+		expected = {};
+		same(actual,expected,'should disregard apparent slices within code sections');
+	*/
+		title = "tiddler";
+		text = "{\n\tfoo: 'bar'\n}\n";
+		store.saveTiddler(title, title, text);
+		actual = store.calcAllSlices(title);
+		expected = {};
+		same(actual,expected,'should disregard slices within JSON structures');
+	});
+
+	test("Slices: getTiddlerSlice()", function() {
+		var store = new TiddlyWiki();
+
+		var actual = store.getTiddlerSlice();
+		var expected = undefined;
+		same(actual,expected,'should return undefined when not passed any arguments');
+
+		actual = store.getTiddlerSlice("tiddler", "foo");
+		expected = undefined;
+		same(actual,expected,'should return undefined when pointed to non-existing tiddler');
+
+		title = "tiddler";
+		text = "foo bar\nbaz";
+		store.saveTiddler(title, title, text);
+		actual = store.getTiddlerSlice(title, "foo");
+		expected = undefined;
+		same(actual,expected,'should return undefined when pointed to non-existing slice');
+
+		title = "tiddler";
+		text = "foo: bar";
+		store.saveTiddler(title, title, text);
+		actual = store.getTiddlerSlice(title, "foo");
+		expected = "bar";
+		same(actual,expected,'should return slice value when given slice label (colon notation)');
+
+		title = "tiddler";
+		text = "|foo|bar|";
+		store.saveTiddler(title, title, text);
+		actual = store.getTiddlerSlice(title, "foo");
+		expected = "bar";
+		same(actual,expected,'should return slice value when given slice label (table notation)');
+
+	/*
+		// FAILURE
+		// ticket #370 (http://trac.tiddlywiki.org/ticket/370)
+		title = "tiddler";
+		text = "|!foo|bar|";
+		store.saveTiddler(title, title, text);
+		actual = store.calcAllSlices(title);
+		expected = { foo: "bar" };
+		same(actual,expected,'should strip heading markup from slice labels (table notation)');
+
+		// FAILURE
+		// ticket #370 (http://trac.tiddlywiki.org/ticket/370)
+		title = "tiddler";
+		text = "[[foo]]: bar";
+		store.saveTiddler(title, title, text);
+		actual = store.calcAllSlices(title);
+		expected = { "foo": "bar" };
+		same(actual,expected,'should strip double brackets (PrettyLinks) from slice labels');
+
+		// FAILURE
+		// ticket #370 (http://trac.tiddlywiki.org/ticket/370)
+		title = "tiddler";
+		text = "[foo]: bar";
+		store.saveTiddler(title, title, text);
+		actual = store.calcAllSlices(title);
+		expected = { "[foo]": "bar" };
+		same(actual,expected,'should allow brackets in slice labels');
+	*/
+
+	});
+
+
+	test("getTaggedTiddlers", function() {
+		var tiddlers = store.getTaggedTiddlers("twtesthello");
+		strictEqual(tiddlers.length, 2, 'No message');
+	});
+
+	test("getValueTiddlers", function() {
+		var tiddlers = store.getValueTiddlers("xyz", "bar");
+		var tiddlers2 = store.getValueTiddlers("tags", "twtesthello");
+		strictEqual(tiddlers.length, 3, 'No message');
+	});
+
+	test("filterTiddlers", function() {
+		var tiddlers = store.filterTiddlers("[tag[twtesthello]]");
+		var tiddlers2 = store.filterTiddlers("[xyz[bar]]");
+		var tiddlers3 = store.filterTiddlers("[tag[twtesthello]][limit[1]]");
+		var tiddlers4 = store.filterTiddlers("[xyz[bar]][limit[2]]");
+		strictEqual(tiddlers.length, 2, 'No message');
+		strictEqual(tiddlers2.length, 3, 'No message');
+		strictEqual(tiddlers3.length, 1, 'No message');
+		strictEqual(tiddlers4.length, 2, 'No message');
+	});
+
+	test("reverseLookup (custom fields)", function() {
+		var lookupField = "server.bag";
+		var lookupValue = "foo";
+		var sortField = "modified";
+		var tiddlers = store.reverseLookup(lookupField,lookupValue,true,sortField);
+		var tiddlers2 = store.reverseLookup(lookupField,lookupValue,false,sortField);
+		strictEqual(tiddlers.length, 1);
+		strictEqual(tiddlers[0].title, "testTiddler3");
+		strictEqual(tiddlers2.length, _numTiddlers - 1, "returns all the tiddlers minus the one with this field match");
+	});
+
+	test("reverseLookup (tags)", function() {
+		var lookupField = "tags";
+		var lookupValue = "testTag";
+		var sortField = "title";
+		var tiddlers = store.reverseLookup(lookupField,lookupValue,true,sortField);
+		var tiddlers2 = store.reverseLookup(lookupField,lookupValue,false,sortField);
+		strictEqual(tiddlers.length, 3);
+		strictEqual(tiddlers[0].title, "testTiddler1");
+		strictEqual(tiddlers[1].title, "testTiddler2");
+		strictEqual(tiddlers[2].title, "testTiddler3");
+		strictEqual(tiddlers2.length, _numTiddlers - 3, "returns all the tiddlers minus the three tiddler with this tag");
+	});
+
+	test("reverseLookup (links)", function() {
+		var lookupField = "links";
+		var lookupValue = "testTiddler2";
+		var sortField = "title";
+		var tiddlers = store.reverseLookup(lookupField,lookupValue,true,sortField);
+		var tiddlers2 = store.reverseLookup(lookupField,lookupValue,false,sortField);
+		strictEqual(tiddlers.length, 1);
+		strictEqual(tiddlers[0].title, "testTiddler3");
+		strictEqual(tiddlers2.length, _numTiddlers - 1, "returns all the tiddlers minus the one tiddler with this link");
+	});
+
+	test("reverseLookup (attribute)", function() {
+		var lookupField = "creator";
+		var lookupValue = "martin";
+		var sortField = "title";
+		var tiddlers = store.reverseLookup(lookupField,lookupValue,true,sortField);
+		var tiddlers2 = store.reverseLookup(lookupField,lookupValue,false,sortField);
+		strictEqual(tiddlers.length, 1);
+		strictEqual(tiddlers[0].title, "testTiddler3");
+		strictEqual(tiddlers2.length, _numTiddlers - 1, "returns all the tiddlers minus the one tiddler created by martin");
+	});
+
+	var _loadFromDiv, storeArea;
+	module("TiddlyWiki.js - importTiddlyWiki", {
+		setup: function() {
+			_loadFromDiv = TiddlyWiki.prototype.loadFromDiv;
+			TiddlyWiki.prototype.loadFromDiv = function(area) {
+				storeArea = area;
+			};
+		},
+		teardown: function() {
+			TiddlyWiki.prototype.loadFromDiv = _loadFromDiv;
+			storeArea = null;
+		}
+	});
+
+	test("importTiddlyWiki empty store", function() {
+		var html = ['<html><head></head><body>', '<!--POST-SHADOWAREA-->',
+			'<div id="storeArea">', '</div>',
+			'<!--POST-STOREAREA-->', '</body></html>'].join("\n");
+		store.importTiddlyWiki(html);
+		strictEqual($(storeArea).attr("id"), "storeArea", "make sure a storeArea was found");
+	});
+
+	test("importTiddlyWiki empty store (post body start)", function() {
+		var html = ['<html><head></head><body>',
+			'<!--POST-SHADOWAREA-->',
+			'<div id="storeArea">', '</div>',
+			,'<!--POST-BODY-START-->','</body></html>'].join("\n");
+		store.importTiddlyWiki(html);
+		strictEqual($(storeArea).attr("id"), "storeArea", "make sure a storeArea was found");
+	});
+
+	test("importTiddlyWiki empty store (minified test)", function() {
+		var html = ['<html><head></head><body>',
+			'<!--POST-SHADOWAREA-->',
+			'<div id="storeArea">', '</div>',
+			,'<!--POST-BODY-START-->','</body></html>'].join(""); // join without newlines
+		store.importTiddlyWiki(html);
+		strictEqual($(storeArea).attr("id"), "storeArea", "make sure a storeArea was found");
+	});
+
+	test("importTiddlyWiki empty store (minified test)", function() {
+		var html = ['<html><head></head><body>',
+			'<!--POST-SHADOWAREA-->',
+			'<div id="storeArea"><div class="tiddler">hello</div>', '</div>',
+			,'<!--POST-BODY-START-->','</body></html>'].join(""); // join without newlines
+		store.importTiddlyWiki(html);
+		strictEqual($(storeArea).attr("id"), "storeArea", "make sure a storeArea was found");
+		strictEqual($(".tiddler", storeArea).length, 1, "there is one element with class tiddler within the element");
+	});
+
+	test("importTiddlyWiki empty store (no comments)", function() {
+		var html = ['<html><head></head><body>','<div id="storeArea"><div class="tiddler">hello</div></div>',
+			'</body></html>'].join(""); // join without newlines
+		store.importTiddlyWiki(html);
+		strictEqual($(storeArea).attr("id"), "storeArea", "make sure a storeArea was found");
+		strictEqual($(".tiddler", storeArea).length, 1, "there is one element with class tiddler within the element");
+	});
+
+	test("importTiddlyWiki empty store (upper case tags)", function() {
+		var html = ['<HTML><HEAD></HEAD><BODY>','<DIV ID="storeArea"><DIV class="tiddler">hello</DIV></DIV>',
+			'</BODY></HTML>'].join("\n"); // join with newlines
+		store.importTiddlyWiki(html);
+		strictEqual($(storeArea).attr("id"), "storeArea", "make sure a storeArea was found");
+		strictEqual($(".tiddler", storeArea).length, 1, "there is one element with class tiddler within the element");
+	});
+
+	test("importTiddlyWiki empty store (storeArea in single quotes)", function() {
+		var html = ["<HTML><HEAD></HEAD><BODY>","<DIV ID='storeArea'>",'<DIV class="tiddler">hello</DIV></DIV>',
+			'</BODY></HTML>'].join("\n"); // join with newlines
+		store.importTiddlyWiki(html);
+		strictEqual($(storeArea).attr("id"), "storeArea", "make sure a storeArea was found");
+		strictEqual($(".tiddler", storeArea).length, 1, "there is one element with class tiddler within the element");
+	});
+
+	test("importTiddlyWiki empty store (storeArea with no quotes)", function() {
+		var html = ["<HTML><HEAD></HEAD><BODY>","<DIV id=storeArea>",'<DIV class="tiddler">hello</DIV></DIV>',
+			'</BODY></HTML>'].join("\n"); // join with newlines
+		store.importTiddlyWiki(html);
+		strictEqual($(storeArea).attr("id"), "storeArea", "make sure a storeArea was found");
+		strictEqual($(".tiddler", storeArea).length, 1, "there is one element with class tiddler within the element");
+	});
+});
diff --git a/test/data/tiddlywiki/test/js/Utilities.js b/test/data/tiddlywiki/test/js/Utilities.js
new file mode 100755
index 000000000..c4f7be08c
--- /dev/null
+++ b/test/data/tiddlywiki/test/js/Utilities.js
@@ -0,0 +1,572 @@
+jQuery(document).ready(function() {
+
+	function makeTestNode() {
+		return $("<div />")[0];
+	}
+
+	function removeTestNode() {}
+
+	module("Utilities");
+
+	test("Utilities: formatVersion", function() {
+
+	var actual, expected;
+
+		v = {
+			major:1,
+			minor:2,
+			revision:3
+		};
+		v_beta = {
+			major:1,
+			minor:2,
+			revision:3,
+			beta:true
+		};
+		v_alpha = {
+			major:1,
+			minor:2,
+			revision:3,
+			alpha:true
+		};
+
+		actual = formatVersion(v);
+		expected = v.major+"."+v.minor+"."+v.revision;
+		same(actual, expected, "it should use a version object if one is passed as a parameter, which has properties: major, minor, revision, beta (optional) and format the output as 'major.minor.revision'");
+
+		actual = formatVersion();
+		expected = version.major+"."+version.minor+"."+version.revision+(version.beta?" (beta "+version.beta+")" : "")+(version.alpha?" (alpha "+version.alpha+")" : "");
+		same(actual, expected, 'it doesn\'t need to take an argument, in which case it will use the global "version" variable');
+
+	actual = typeof formatVersion();
+	expected = "string";
+	same(actual, expected, 'it should return a string');
+
+	actual = formatVersion(v_beta).indexOf("beta "+v_beta.beta) != -1;
+	same(actual, true, 'it should append the string " (beta #)", where # is the beta number if the beta number is set');
+
+	actual = formatVersion(v_alpha).indexOf("alpha "+v_alpha.alpha) != -1;
+	same(actual, true, 'it should append the string " (alpha #)", where # is the alpha number if the alpha number is set');
+
+  });
+
+
+	test("Utilities functions: compareVersions", function() {
+
+	var v1, v1_beta, v2, message;
+	function setUp(_message) {
+	  message = _message;
+	  v1 = {
+		major:1,
+		minor:2,
+		revision:3
+	  };
+	  v1_beta = {
+		major:1,
+		minor:2,
+		revision:3,
+		beta:true
+	  };
+	  v2 = {
+		major:v1.major,
+		minor:v1.minor,
+		revision:v1.revision
+	  };
+	}
+
+	setUp('it should return +1 if the second version is later than the first');
+		v2.major = v1.major+1;
+		var actual = compareVersions(v1,v2);
+		var expected = 1;
+		same(actual,expected,message);
+		v2.major--;
+		v2.minor = v1.minor+1;
+		actual = compareVersions(v1,v2);
+		expected = 1;
+		same(actual,expected,message);
+		v2.minor--;
+		v2.revision = v1.revision+1;
+		actual = compareVersions(v1,v2);
+		expected = 1;
+		same(actual,expected,message);
+
+	setUp('it should return 0 if the second version is the same as the first');
+		actual = compareVersions(v1,v2);
+		expected = 0;
+		same(actual,expected,message);
+
+	setUp('it should return -1 if the second version is earlier than the first');
+		v2.major = v1.major-1;
+		actual = compareVersions(v1,v2);
+		expected = -1;
+		same(actual,expected,message);
+		v2.major++;
+		v2.minor = v1.minor-1;
+		actual = compareVersions(v1,v2);
+		expected = -1;
+		same(actual,expected,message);
+		v2.minor++;
+		v2.revision = v1.revision-1;
+		actual = compareVersions(v1,v2);
+		expected = -1;
+		same(actual,expected,message);
+
+	setUp('it should treat versions without a beta number as later than a version without a beta number');
+		actual = compareVersions(v1,v1_beta);
+		expected = -1;
+		same(actual,expected,message);
+
+	});
+
+
+	test("createTiddlyText", function() {
+		expect(1);
+
+		var parent = makeTestNode();
+		createTiddlyText(parent, "<div>");
+		createTiddlyText(parent, "a");
+		createTiddlyText(parent, "</div>");
+		equals(parent.innerHTML, "&lt;div&gt;a&lt;/div&gt;", "createTiddlyText should append text node, not html element");
+
+		removeTestNode();
+	});
+
+
+	test("createTiddlyElement", function() {
+		expect(4);
+
+		ok(createTiddlyElement(null,"div"), "Element creation should create the DOM element");
+
+		createTiddlyElement( makeTestNode(),"div");
+		ok($('#testElement div'), 'Setting the parent parameter should append the new DOM element to the parent');
+		removeTestNode();
+
+		createTiddlyElement(null,"div",'testID');
+		ok($('#testID'), 'Setting the element id parameter should set the id on the DOM element');
+
+		createTiddlyElement(null,"div", null, 'testClass');
+		ok($('div.testClass'), 'Setting the element class parameter should set the class on the DOM element');
+
+	});
+
+
+	test("Utilities: createTiddlyButton(parent,text,tooltip,action,className,id,accessKey,attribs)", function() {
+
+	function setUp(_message) {
+	  message = _message;
+	  parent = document.body;
+	  text = "hi!";
+	  tooltip = "a tooltip";
+	  action = function() { alert('clicked!'); };
+	  className = "testButton";
+	  id = "testButtonId";
+	  accessKey = "b";
+	  attribs = {
+		style:"display:none;"
+	  };
+	  btn = createTiddlyButton(parent,text,tooltip,action,className,id,accessKey,attribs);
+	}
+
+	setUp('it should create an anchor element as a child of the parent element provided');
+	var before = document.body.childNodes.length;
+	btn = createTiddlyButton(parent,text,tooltip,action,className,id,accessKey,attribs);
+	var after = document.body.childNodes.length;
+	var actual = after-before;
+	var expected = 1;
+	same(actual,expected,message);
+	actual = document.body.childNodes[after-1].nodeName;
+	expected = "A";
+	same(actual,expected,message);
+
+	setUp('it should set the onclick function to the provided action parameter');
+		actual = btn.onclick;
+		expected = action;
+		same(actual,expected,message);
+
+	setUp('it should set the anchor href to null if no action parameter is provided');
+		actual = btn.href;
+		expected = "javascript:;";
+		same(actual,expected,message);
+
+	setUp('it should set the anchor title to the provided tooltip paramater');
+		actual = btn.title;
+		expected = tooltip;
+		same(actual,expected,message);
+
+	setUp('it should set the contained text to the provided text parameter');
+		actual = btn.innerText || btn.textContent;
+		expected = text;
+		same(actual,expected,message);
+
+	setUp('it should set the anchor class to the provdided className parameter');
+		actual = btn.className;
+		expected = className;
+
+	setUp('it should set the anchor class to "button" if no className parameter is provided');
+		var btn2 = createTiddlyButton(parent,text,tooltip,action,null,id,accessKey,attribs);
+		actual = btn2.className;
+		expected = "button";
+		same(actual,expected,message);
+
+	setUp('it should set the anchor id to the provided id parameter');
+		actual = btn.id;
+		expected = id;
+		same(actual,expected,message);
+
+	setUp('it should set any attributes on the anchor that are provided in the attribs object');
+		for(i in attribs) {
+			same(btn.i, attribs.i, message);
+	  }
+
+  // No tests in jsspec
+	// 'it should set the anchor accessKey attribute to the provided accessKey parameter': function() {}
+
+	setUp('it should return the anchor element');
+		actual = btn.nodeName;
+		expected = "A";
+		same(actual,expected,message);
+
+	setUp('it should not require any parameters and still return an anchor element');
+		actual = createTiddlyButton().nodeName;
+		expected = "A";
+		same(actual,expected,message);
+  });
+
+	test("Utilities: createTiddlyLink trailing whitespace", function() {
+		var place = $("<div />")[0]
+		var link = createTiddlyLink(place," testTiddler1 ");
+		strictEqual($(link).attr("tiddlylink"), "testTiddler1", "attribute has been set without leading or trailing whitespace");
+		strictEqual($(link).hasClass("tiddlyLinkExisting"), true,
+			"has matched testTiddler1 not a tiddler with leading and trailing whitespace")
+	});
+
+	test("Utilities: createTiddlyLink(place,title,includeText,className,isStatic,linkedFromTiddler,noToggle)", function() {
+
+	function setUp(_message) {
+	  message = _message;
+	  store = new TiddlyWiki();
+	  title = "test";
+	  t = new Tiddler(title);
+	  t_linked_from = new Tiddler("linkedFrom");
+	  t_linked_from.fields = {
+		"server.host":"host",
+		"server.workspace":"workspace",
+		"wikiformat":"wikiformat",
+		"server.type":"type"
+	  };
+	  place = document.body;
+	  includeText = true;
+	  className = "testLink";
+	  isStatic = "true";
+	  linkedFromTiddler = t_linked_from;
+	  noToggle = "true";
+	  btn = createTiddlyLink(place,title,includeText,className,false,linkedFromTiddler,noToggle);
+	  btn_external = createTiddlyLink(place,title,includeText,className,isStatic,linkedFromTiddler,noToggle);
+	}
+
+	  setUp('it should add a link as child of the "place" DOM element (internal)');
+		var before = place.childNodes;
+		var expected = before.length+1;
+		createTiddlyLink(place,title);
+		var actual = place.childNodes.length;
+		same(actual,expected,message);
+		actual = place.childNodes[place.childNodes.length-1].nodeName;
+		expected = "A";
+		same(actual,expected,message);
+
+	  setUp('it should set the "tiddlyLink" attribute on the link to the provided "title" parameter (internal)');
+		actual = btn.getAttribute("tiddlyLink");
+		expected = title;
+		same(actual,expected,message);
+
+	  setUp('it should set the "tiddlyLink" attribute on the link to the provided "title" parameter (external)');
+		actual = btn_external.getAttribute("tiddlyLink");
+		expected = title;
+		same(actual,expected,message);
+
+	  setUp('it should include the title as the text of this link if the "includeText" parameter is set to true (internal)');
+		actual = btn.innerText || btn.textContent;
+		expected = title;
+		same(actual,expected,message);
+
+	  setUp('it should include the title as the text of this link if the "includeText" parameter is set to true (external)');
+		actual = btn_external.innerText || btn.textContent;
+		expected = title;
+		same(actual,expected,message);
+
+	  setUp('it should not include any text in the link if the "includeText" parameter is not set or false');
+		btn = createTiddlyLink(place,title);
+		actual = btn.innerText || btn.textContent;
+		expected = "";
+		same(actual,expected,message);
+
+	  setUp('it should add the provided "className" parameter to the class of the link (internal)');
+		actual = btn.className.indexOf(className) != -1;
+		same(actual,true,message);
+
+	/* BUG IN DOCS: THIS IS ONLY TRUE IF THE LINK IS INTERNAL */
+	/* see http://groups.google.com/group/TiddlyWikiDev/browse_thread/thread/3e8c2de8d7b0fbfa */
+	  setUp('it should add the provided "className" parameter to the class of the link (external)');
+		actual = btn_external.className.indexOf(className) != -1;
+		same(actual,true,message);
+
+	  setUp('it should set the "tiddlyFields" attribute on the link to be the fields from any tiddler referred to in the provided "linkedFromTiddler" parameter (internal)');
+		actual = btn.getAttribute("tiddlyFields");
+		expected = linkedFromTiddler.getInheritedFields();
+		same(actual,expected,message);
+
+	  setUp('it should set the "tiddlyFields" attribute on the link to be the fields from any tiddler referred to in the provided "linkedFromTiddler" parameter (external)');
+		actual = btn_external.getAttribute("tiddlyFields");
+		expected = linkedFromTiddler.getInheritedFields();
+		same(actual,expected,message);
+
+	  setUp('it should set the "noToggle" attribute on the link to "true" if the provided "noToggle" parameter is set (internal)');
+		actual = btn.getAttribute("noToggle");
+		expected = "true";
+		same(actual,expected,message);
+
+	  setUp('it should set the "noToggle" attribute on the link to "true" if the provided "noToggle" parameter is set (external)');
+		actual = btn_external.getAttribute("noToggle");
+		expected = "true";
+		same(actual,expected,message);
+
+	  setUp('it should set the "refresh" attribute on the link to "link" (internal)');
+		actual = btn.getAttribute("refresh");
+		expected = "link";
+		same(actual,expected,message);
+
+	  setUp('it should set the "refresh" attribute on the link to "link" (external)');
+		actual = btn_external.getAttribute("refresh");
+		expected = "link";
+		same(actual,expected,message);
+
+	// BROKEN
+	  // setUp('it should create a permalink if the "isStatic" parameter is set (internal)');
+		// actual = btn.href.indexOf("#") != -1;
+		// same(actual,true,message);
+
+	  setUp('it should create a permalink if the "isStatic" parameter is set (external)');
+		actual = btn_external.href.indexOf("#") != -1;
+		same(actual,true,message);
+
+	  setUp('it should return a reference to the link (internal)');
+		actual = btn.nodeName;
+		expected = "A";
+		same(actual,expected,message);
+
+	  setUp('it should return a reference to the link (external)');
+		actual = btn_external.nodeName;
+		expected = "A";
+		same(actual,expected,message);
+
+  });
+
+
+  test('Utilities: refreshTiddlyLink(e,title)', function() {
+
+	function setUp(_message) {
+	  message = _message;
+	  store = new TiddlyWiki();
+	  loadShadowTiddlers();
+	  not_a_tiddler = null;
+	  store.saveTiddler("a_tiddler","a_tiddler");
+	  store.saveTiddler("another_tiddler","another_tiddler");
+	  place = document.body;
+	  btn = createTiddlyLink(place,"a_tiddler");
+	}
+
+	  setUp('it should update the className attribute of the "e" element if "title" is the name of a non-existant tiddler');
+		refreshTiddlyLink(btn,not_a_tiddler);
+		expected = ["tiddlyLink","tiddlyLinkNonExisting"];
+		actual = btn.className.readBracketedList();
+		for(var i=0;i<expected.length;i++) {
+			same(actual.contains(expected[i]), true, message);
+		}
+		same(actual.length, expected.length, message);
+
+	  setUp('it should update the className attribute of the "e" element if "title" is the name of a tiddler');
+		refreshTiddlyLink(btn,"another_tiddler");
+		expected = ["tiddlyLink","tiddlyLinkExisting"];
+		actual = btn.className.readBracketedList();
+		for(i=0;i<expected.length;i++) {
+			same(actual.contains(expected[i]), true, message);
+		}
+		same(actual.length, expected.length, message);
+
+	  setUp('it should update the className attribute of the "e" element if "title" is the name of a shadow tiddler');
+		same(store.isShadowTiddler("SiteTitle"), true, message);
+		refreshTiddlyLink(btn,"SiteTitle");
+		expected = ["tiddlyLink", "tiddlyLinkNonExisting", "shadow"];
+		actual = btn.className.readBracketedList();
+		for(i=0;i<expected.length;i++) {
+			same(actual.contains(expected[i]), true, message);
+		}
+		same(actual.length, expected.length);
+
+	  setUp('it should update the title attribute of the "e" element if "title" is the name of a non-existant tiddler');
+		refreshTiddlyLink(btn,"not_a_tiddler");
+		expected = config.messages.undefinedTiddlerToolTip.format(["not_a_tiddler"]);
+		actual = btn.title;
+		same(actual,expected,message);
+
+	// BROKEN
+	  // setUp('it should update the title attribute of the "e" element if "title" is the name of a tiddler');
+		// expected = store.getTiddler("another_tiddler").getSubtitle();
+		// actual = btn.title;
+		// same(actual,expected,message);
+
+	  setUp('it should update the title attribute of the "e" element if "title" is the name of a shadow tiddler with an annotation');
+		var title = "SiteTitle";
+		same(store.isShadowTiddler(title), true, message);
+		refreshTiddlyLink(btn,title);
+		expected = config.annotations[title];
+		actual = btn.title;
+		same(actual,expected,message);
+
+	  setUp('it should update the title attribute of the "e" element if "title" is the name of a shadow tiddler without an annotation');
+		merge(config.shadowTiddlers,{
+			testShadow: "some test text"
+		});
+		title = "testShadow";
+		same(store.isShadowTiddler(title), true, message);
+		refreshTiddlyLink(btn,title);
+		var expected = config.messages.shadowedTiddlerToolTip.format([title]);
+		var actual = btn.title;
+		same(actual,expected,message);
+		delete config.shadowTiddlers.testShadow;
+
+  });
+
+
+  test('Utilities: getTiddlyLinkInfo(title,currClasses)', function() {
+
+	function setUp(_message) {
+	  message = _message;
+	  store = new TiddlyWiki();
+	  loadShadowTiddlers();
+	  title = "test";
+	  store.createTiddler(title);
+	  currClasses = "test test2";
+	  obj = getTiddlyLinkInfo(title,currClasses);
+	}
+
+	setUp('it should return an object with two named properties - the first a string named "classes" and the second a string named "subTitle"');
+	var expected = "string";
+	var actual = typeof obj["classes"];
+	same(actual,expected,message);
+
+	setUp('it should add "shadow" to the classes string if the tiddler is a shadow tiddler');
+	title = "SiteTitle";
+	obj = getTiddlyLinkInfo(title,null);
+	actual = obj.classes.split(" ").contains("shadow");
+	same(actual, true, message);
+
+	setUp('it should add "tiddlyLinkExisting" to the classes string if the tiddler is in the store');
+	actual = obj.classes.split(" ").contains("tiddlyLinkExisting");
+	same(actual, true, message);
+
+	setUp('it should add "tiddlyLinkNonExisting" to the classes string if the tiddler is not in the store');
+	title = "not_in_the_store";
+	obj = getTiddlyLinkInfo(title,null);
+	actual = obj.classes.split(" ").contains("tiddlyLinkNonExisting");
+	same(actual, true, message);
+
+	setUp('it should add "tiddlyLink" to the classes string whether the tiddler is a shadow, in the store or not');
+	actual = obj.classes.split(" ").contains("tiddlyLink");
+	same(actual, true, message);
+	title = "not_in_the_store";
+	obj = getTiddlyLinkInfo(title,null);
+	actual = obj.classes.split(" ").contains("tiddlyLink");
+	same(actual, true, message);
+	title = "SiteTitle";
+	obj = getTiddlyLinkInfo(title,null);
+	actual = obj.classes.split(" ").contains("tiddlyLink");
+	same(actual, true, message);
+
+	setUp('it should maintain any classes passed in, through the currClasses string, in the classes string');
+	actual = currClasses.split(" ");
+	expected = obj.classes.split(" ");
+	for(var i=0;i<actual.length;i++) {
+	  same(expected.contains(actual[i]) != -1, true, message);
+	}
+	title = "not_in_the_store";
+	obj = getTiddlyLinkInfo(title,null);
+	actual = obj.classes.split(" ");
+	for(i=0;i<actual.length;i++) {
+	  same(expected.contains(actual[i]) != -1, true, message);
+	}
+	title = "SiteTitle";
+	obj = getTiddlyLinkInfo(title,null);
+	actual = obj.classes.split(" ");
+	for(i=0;i<actual.length;i++) {
+	  same(expected.contains(actual[i]) != -1, true, message);
+	}
+
+	setUp('it should get subTitle from config.annotations if there is an entry there for the title parameter');
+	title = "SiteTitle";
+	obj = getTiddlyLinkInfo(title,null);
+	expected = config.annotations["SiteTitle"];
+	actual = obj.subTitle;
+	same(actual,expected,message);
+
+	setUp('it should get subTitle by calling tiddler.getSubtitle() if there is no entry in config.annotations');
+	// tests_mock.before(funcToMock);
+		var getSubtitleMock = new jqMock.Mock(Tiddler.prototype, "getSubtitle");
+	getSubtitleMock.modify().args().multiplicity(1);
+	obj = getTiddlyLinkInfo(title,currClasses);
+	getSubtitleMock.verifyAll();
+	getSubtitleMock.restore();
+	// same(actual, true, message);
+
+  });
+
+
+  test('Utilities: createExternalLink(place,url)', function() {
+
+	function setUp(_message) {
+	  message = _message;
+	  place = document.body;
+	  url = "http://www.tiddlywiki.com";
+	  link = createExternalLink(place,url);
+	}
+
+	setUp('it should return an anchor element');
+	var expected = "A";
+	var actual = link.nodeName;
+	same(actual,expected,message);
+
+	setUp('it should set the anchor href to the "url" argument with a "/" on the end if one is missing');
+	expected = url + "/";
+	actual = link.href;
+	same(actual,expected,message);
+
+	setUp('it should set the anchor className to "externalLink"');
+	expected = "externalLink";
+	actual = link.className;
+	same(actual,expected,message);
+
+	setUp('it should append the anchor as a child element of the "place" argument');
+	actual = place.childNodes.length;
+	link = createExternalLink(place,url);
+	actual = place.childNodes.length - actual;
+	expected = 1;
+	same(actual,expected,message);
+
+	setUp('it should set the anchor title to config.messages.externalLinkTooltip.format([url]');
+	expected = config.messages.externalLinkTooltip.format([url]);
+	actual = link.title;
+	same(actual,expected,message);
+
+	setUp('it should set the anchor target to "_blank" if config.options.chkOpenInNewWindow is true');
+	expected = "_blank";
+	var oldOption = config.options.chkOpenInNewWindow;
+	config.options.chkOpenInNewWindow = true;
+	link = createExternalLink(place,url);
+	actual = link.target;
+	config.options.chkOpenInNewWindow = oldOption; // restore public variable
+	same(actual,expected,message);
+
+  });
+
+});
+
diff --git a/test/data/tiddlywiki/test/js/Version.js b/test/data/tiddlywiki/test/js/Version.js
new file mode 100755
index 000000000..16f644840
--- /dev/null
+++ b/test/data/tiddlywiki/test/js/Version.js
@@ -0,0 +1,58 @@
+jQuery(document).ready(function(){
+
+	module("Utilitis.js");
+
+	test("Version", function() {
+		expect(17);
+
+		ok(version,'there should be a version value');
+		ok(version.title=='TiddlyWiki','the title should be "TiddlyWiki"');
+		ok(parseInt(version.major)!=NaN,'the major value should be a number');
+		ok(parseInt(version.minor)!=NaN,'the minor value should be a number');
+		ok(parseInt(version.revision)!=NaN,'the revision value should be a number');
+		ok(parseInt(version.beta)!=NaN,'the beta value should be a number');
+		ok(typeof version.date=='object','the date value should be a TiddlyWiki Date object');
+		//ok(version.date.convertToYYYYMMDDHHMM()).should_match(/^\d{12,12}$/);
+		ok(typeof version.extensions=='object','the extensions value should be an object');
+
+		var v = {title: "TiddlyWiki", major: 1, minor: 2, revision: 3, beta: 5, date: new Date("Apr 17, 2008"), extensions: {}};
+		var expected = "1.2.3 (beta 5)";
+		var actual = formatVersion(v);
+		ok(actual==expected,'format version 1.2.3 beta 5 should match an asserted string');
+
+		expected = version.major + "." + version.minor + "." + version.revision + (version.alpha ? " (alpha " + version.alpha + ")" : (version.beta ? " (beta " + version.beta + ")" : ""));
+		actual = formatVersion();
+		ok(actual==expected,'format version should match a constructed value');
+
+		var v1 = {title: "TiddlyWiki", major: 2, minor: 4, revision: 0, beta: 2, date: new Date("Apr 17, 2008"), extensions: {}};
+		var v2 = {title: "TiddlyWiki", major: 2, minor: 4, revision: 0, beta: 2, date: new Date("Apr 17, 2008"), extensions: {}};
+		ok(compareVersions(v1,v2)==0,'version 2.4.0 beta 2 should equal version 2.4.0 beta 2');
+
+		v1 = {title: "TiddlyWiki", major: 1, minor: 0, revision: 0, date: new Date("Apr 17, 2008"), extensions: {}};
+		v2 = {title: "TiddlyWiki", major: 2, minor: 0, revision: 0, date: new Date("Apr 17, 2008"), extensions: {}};
+		ok(compareVersions(v1,v2)==1,'version 1.0 should be less than version 2.0');
+
+		v1 = {title: "TiddlyWiki", major: 1, minor: 0, revision: 0, date: new Date("Apr 17, 2008"), extensions: {}};
+		v2 = {title: "TiddlyWiki", major: 1, minor: 1, revision: 0, date: new Date("Apr 17, 2008"), extensions: {}};
+		ok(compareVersions(v1,v2)==1,'version 1.0 should be less than version 1.1');
+
+		v1 = {title: "TiddlyWiki", major: 1, minor: 0, revision: 0, date: new Date("Apr 17, 2008"), extensions: {}};
+		v2 = {title: "TiddlyWiki", major: 1, minor: 0, revision: 1, date: new Date("Apr 17, 2008"), extensions: {}};
+		ok(compareVersions(v1,v2)==1,'version 1.0.0 should be less than version 1.0.1');
+
+		v1 = {title: "TiddlyWiki", major: 1, minor: 0, revision: 0, date: new Date("Apr 17, 2008"), extensions: {}};
+		v2 = {title: "TiddlyWiki", major: 1, minor: 0, revision: 0, beta: 1, date: new Date("Apr 17, 2008"), extensions: {}};
+		ok(compareVersions(v1,v2)==-1,'version 1.0.0 (no beta) should be more than version 1.0.0 beta 1');
+
+		v1 = {title: "TiddlyWiki", major: 1, minor: 0, revision: 0, beta: 1, date: new Date("Apr 17, 2008"), extensions: {}};
+		v2 = {title: "TiddlyWiki", major: 1, minor: 0, revision: 0, beta: 2, date: new Date("Apr 17, 2008"), extensions: {}};
+		ok(compareVersions(v1,v2)==1,'version 1.0.0 beta 1 should be less than version 1.0.0 beta 2');
+
+		v1 = {title: "TiddlyWiki", major: 1, minor: 2, revision: 3, date: new Date("Apr 17, 2008"), extensions: {}};
+		v2 = {title: "TiddlyWiki", major: 1, minor: 2, revision: 3, beta: 4, date: new Date("Apr 17, 2008"), extensions: {}};
+		ok(compareVersions(v1,v2)==-1,'version 1.2.3 (no beta) should be more than version 1.2.3 beta 4');
+
+	});
+
+
+});
diff --git a/test/data/tiddlywiki/test/js/Wikifier.js b/test/data/tiddlywiki/test/js/Wikifier.js
new file mode 100755
index 000000000..8f780fa2d
--- /dev/null
+++ b/test/data/tiddlywiki/test/js/Wikifier.js
@@ -0,0 +1,193 @@
+jQuery(document).ready(function(){
+
+	module("Wikifier.js");
+
+	test("getParser()", function() {
+		expect(7);
+
+		formatter = new Formatter(config.formatters);
+
+		var actual = getParser(null,null);
+		var expected = formatter;
+		deepEqual(actual, expected, 'it should return the default formatter if no tiddler argument is provided');
+
+		var t = new Tiddler("t");
+		actual = getParser(t,null);
+		expected = formatter;
+		deepEqual(actual, expected, 'it should return the default formatter if no format argument is provided and the tiddler has no "wikiformat" field and is not tagged with the value of formatTag of a member of config.parsers');
+
+		actual = getParser(t,"nomatch");
+		expected = formatter;
+		deepEqual(actual, expected, 'it should return the default formatter if a format argument is provided, but does not appear as a value of formatTag of a member of config.parsers; the tiddler has no "wikiformat" field and is not tagged with the value of formatTag from a member of config.parsers');
+
+		t.fields.wikiformat = "nomatch";
+		actual = getParser(t,null);
+		expected = formatter;
+		deepEqual(actual, expected, 'it should return the default formatter if the tiddler has a "wikiformat" field that does not appear as a value of formatTag of a member of config.parsers; no format argument is provided and the tiddler is not tagged with the value of formatTag from a member of config.parsers');
+
+		t.fields.wikiformat = "format_field";
+		t.tags.push("format_tag");
+		config.parsers.field = {
+			format: "format_field"
+		};
+		config.parsers.tag = {
+			formatTag: "format_tag"
+		};
+		actual = getParser(t,null);
+		expected = config.parsers.field;
+		equals(actual, expected, 'it should return the formatter specified by the "wikiformat" field even if a format tag is provided; no format parameter is provided');
+		config.parsers.field = {};
+		config.parsers.tag = {};
+
+		t = new Tiddler("t");
+		t.tags.push("format_tag");
+		config.parsers.tag = {
+			formatTag: "format_tag"
+		};
+		actual = getParser(t,null);
+		expected = config.parsers.tag;
+		equals(actual, expected, 'it should return the formatter specified by the format tag; the tiddler has no "wikiformat" field and no format parameter is provided');
+
+		t = new Tiddler("t");
+		t.fields.wikiformat = "format_field";
+		t.tags.push("format_tag");
+		config.parsers.field = {
+			format: "format_field"
+		};
+		config.parsers.tag = {
+			formatTag: "format_tag"
+		};
+		config.parsers.parameter = {
+			format: "format_parameter"
+		};
+		actual = getParser(t,"format_parameter");
+		expected = config.parsers.parameter;
+		equals(actual, expected, 'it should return the formatter specified by the format parameter even if a format tag and a "wikiformat" field are provided');
+		config.parsers.field = {};
+		config.parsers.tag = {};
+		config.parsers.parameter = {};
+	});
+
+	test('wikify(): it should not call subWikify() if the "source" parameter is not provided', function() {
+		expect(1);
+
+		var place = document.createElement("div");
+		var d = document.body.appendChild(place);
+		d.style.display = "none";
+
+		var subWikifyMock = new jqMock.Mock(Wikifier.prototype, "subWikify");
+		subWikifyMock.modify().args().multiplicity(0);
+		wikify();
+		subWikifyMock.verifyAll();
+		subWikifyMock.restore();
+	});
+
+	test('Wikifier: wikifyStatic()', function() {
+		wikifier_input_strings = {
+			bold:"''bold''",
+			italic:"//italic//",
+			underline:"__underline__",
+			superscript:"^^superscript^^",
+			subscript:"~~subscript~~",
+			strikeout:"--strikeout--",
+			code:"{{{code}}}"
+		};
+
+		wikifier_output_strings = {
+			bold:"<strong>bold</strong>",
+			italic:"<em>italic</em>",
+			underline:"<u>underline</u>",
+			superscript:"<sup>superscript</sup>",
+			subscript:"<sub>subscript</sub>",
+			strikeout:"<strike>strikeout</strike>",
+			code:"<code>code</code>"
+		};
+
+		formatter = new Formatter(config.formatters);
+		var actual = "";
+		var expected = "";
+		for (var i in wikifier_input_strings) {
+			actual = wikifyStatic(wikifier_input_strings[i]).toLowerCase();
+			expected = wikifier_output_strings[i];
+			equals(actual,expected,'testing input strings for Formatter.characterFormat'+wikifier_input_strings[i]);
+		}
+
+		formatter = new Formatter(config.formatters);
+		expected = '<table class="twtable"><tbody><tr class="evenrow"><td>a</td><td>b</td></tr><tr class="oddrow"><td>c</td><td>d</td></tr></tbody></table>';
+		actual = wikifyStatic("|a|b|\n|c|d|").toLowerCase();
+		equals(actual,expected,'testing table formatting');
+	});
+
+	test('Wikifier: wikifyStatic() 2', function() {
+		var expected = "";
+		var actual = wikifyStatic(null);
+		equals(actual,expected,'it should return an empty string if source does not exist');
+		actual = wikifyStatic("");
+		equals(actual,expected,'it should return an empty string if source is an empty string');
+
+		source = "some text";
+		actual = wikifyStatic(source);
+		ok(actual,'it should not require a tiddler to work');
+
+	/*'it should call subWikify() with the pre block as the only parameter': function() {
+		var funcToMock = 'Wikifier.prototype.subWikify';
+		tests_mock.before(funcToMock,function() {
+			tests_mock.frame[funcToMock].funcArgs = arguments;
+		});
+		wikifyStatic(source);
+		var tests_mock_return = tests_mock.after(funcToMock);
+		var expected = "PRE";
+		equals(tests_mock_return.called,true);
+		equals(tests_mock_return.funcArgs.length,1);
+		equals(tests_mock_return.funcArgs[0].nodeName,expected);
+	},*/
+
+		expected = "string";
+		actual = typeof wikifyStatic(source);
+		equals(actual,expected,'it should return a text string');
+
+		place = document.createElement("div");
+		d = document.body.appendChild(place);
+		d.style.display = "none";
+		expected = document.body.childNodes.length;
+		var html = wikifyStatic(source);
+		actual = document.body.childNodes.length;
+		equals(actual,expected,'it should not leave any elements attached to the document body after returning');
+		removeNode(d);
+	});
+
+	test('Wikifier: wikifyStatic() 3 htmlEntitiesEncoding', function() {
+		wikifier_input_strings = {
+			illegal01:"&a#x0301;",
+			e160:"&#160;",
+			e161:"&#161;",
+			e162:"&#162;",
+			e163:"&#163;",
+			e255:"&#255;",
+			e8800:"&#8800;",
+			e0x300:"&#x300;",
+			e0x0300:"&#x0300;"
+		};
+
+		wikifier_output_strings = {
+			illegal01:"&amp;a#x0301;",
+			e160:"<span>&nbsp;</span>",
+			e161:"<span>¡</span>",
+			e162:"<span>¢</span>",
+			e163:"<span>£</span>",
+			e255:"<span>ÿ</span>",
+			e8800:"<span>≠</span>",
+			e0x300:"<span>̀</span>",
+			e0x0300:"<span>̀</span>"
+		};
+
+		formatter = new Formatter(config.formatters);
+		var actual = "";
+		var expected = "";
+		for (var i in wikifier_input_strings) {
+			actual = wikifyStatic(wikifier_input_strings[i]).toLowerCase();
+			expected = wikifier_output_strings[i];
+			equals(actual,expected,'testing input strings for Formatter.htmlEntitiesEncoding'+wikifier_input_strings[i]);
+		}
+	});
+});
diff --git a/test/data/tiddlywiki/test/js/Wizard.js b/test/data/tiddlywiki/test/js/Wizard.js
new file mode 100755
index 000000000..de0517ff7
--- /dev/null
+++ b/test/data/tiddlywiki/test/js/Wizard.js
@@ -0,0 +1,59 @@
+jQuery(document).ready(function(){
+
+	module("Wizard.js");
+
+	test("Wizard: construction", function() {
+		expect(1);
+
+		var w = new Wizard();
+		var actual = w.formElem===null && w.bodyElem===null && w.footElem===null;
+		ok(actual==true,'properties should be null when constructed with no parameters');
+
+	});
+
+	test("Wizard: setValue / getValue (no formEl)", function() {
+		var w = new Wizard();
+		var val1 = w.getValue("test");
+		w.setValue("test", "foo");
+		var val2 = w.getValue("test");
+		strictEqual(val1, null, "no value set");
+		strictEqual(val2, null, "value could not be set as no formEl");
+	});
+
+	test("Wizard: setValue / getValue (formEl)", function() {
+		var w = new Wizard();
+		w.createWizard($("<div />")[0], "My Title");
+		var val1 = w.getValue("test1");
+		var elem = $("<div />").addClass("foo")[0];
+		w.setValue("test1", "foo");
+		w.setValue("test2", ["a list", "of items"]);
+		w.setValue("test3", { name: "data", val: "foo" });
+		w.setValue("test4", elem);
+		var val2 = w.getValue("test1");
+		var val3 = w.getValue("test2");
+		var val4 = w.getValue("test3");
+		var val5 = w.getValue("test4");
+
+		strictEqual(val1, undefined, "no value set but returns undefined if formEl exists");
+		strictEqual(val2, "foo", "value should be set in this situation");
+		strictEqual(val3.length, 2, "array set successfully (1/2)");
+		strictEqual(val3[0], "a list", "array set successfully (2/2)");
+		strictEqual(val4.name, "data", "object set successfully");
+		strictEqual($(val5).hasClass("foo"), true, "element set successfully");
+	});
+
+	test("Wizard: createWizard", function() {
+		var elem = $(place)[0];
+		var wizard = new Wizard();
+		wizard.createWizard(place, 'Import a TiddlyWiki');
+		strictEqual(wizard.formElem.nodeName, "FORM", "a form element set.");
+	});
+	
+	test("Wizard: setValue of existing property name on node", function() {
+		var w = new Wizard();
+		w.createWizard($("<div />")[0], "My Title");
+		w.setValue("nodeName", "foo");
+		var mode = w.getValue("nodeName");
+		strictEqual(mode, "foo", "reserved names should be possible to set.")
+	});
+});
diff --git a/test/data/tiddlywiki/test/js/Zoomer.js b/test/data/tiddlywiki/test/js/Zoomer.js
new file mode 100755
index 000000000..3260ea900
--- /dev/null
+++ b/test/data/tiddlywiki/test/js/Zoomer.js
@@ -0,0 +1,32 @@
+jQuery(document).ready(function(){
+
+	module("Zoomer");
+
+	test("Zoomer functions", function() {
+
+	var zoomer_elem = document.body.appendChild(document.createElement("div"));
+	var zoomer_text = "hi!";
+	var actual = new Zoomer(zoomer_text,zoomer_elem,zoomer_elem);
+
+	ok(actual,'it should return a Morpher object');
+
+	delete zoomer_elem;
+	delete zoomer_text;
+
+	zoomer_elem = document.body.appendChild(document.createElement("div"));
+	zoomer_text = "hi!";
+
+	var before = document.body.childNodes.length;
+	var z = new Zoomer(zoomer_text,zoomer_elem,zoomer_elem);
+	var after = document.body.childNodes.length;
+	actual = after - before;
+	var expected = 1;
+	same(actual,expected,'it should create a div as child of the body');
+	actual = document.body.childNodes[document.body.childNodes.length-1].nodeName;
+	expected = "DIV";
+	same(actual,expected,'it should create a div with the class of "zoomer"');
+
+	delete zoomer_elem;
+	delete zoomer_text;
+	});
+});
diff --git a/test/data/tiddlywiki/test/js/split.recipe b/test/data/tiddlywiki/test/js/split.recipe
new file mode 100755
index 000000000..a444c4ada
--- /dev/null
+++ b/test/data/tiddlywiki/test/js/split.recipe
@@ -0,0 +1,26 @@
+jquery: Animator.js
+jquery: SavingRSS.js
+jquery: Numbers.js
+jquery: Arrays.js
+jquery: Crypto.js
+jquery: DOM.js
+jquery: Dates.js
+jquery: Encoding.js
+jquery: FileSystem.js
+jquery: LoadingSaving.js
+jquery: Macros.js
+#jquery: main.js
+jquery: Options.js
+jquery: RGB.js
+jquery: Shadows.js
+jquery: Strings.js
+jquery: Tiddler.js
+jquery: TiddlerFields.js
+jquery: TiddlyWiki.js
+jquery: Filters.js
+jquery: TW21Saver.js
+jquery: Utilities.js
+jquery: Version.js
+jquery: Wikifier.js
+jquery: Wizard.js
+#jquery: Zoomer.js
diff --git a/test/data/tiddlywiki/test/js/template.js b/test/data/tiddlywiki/test/js/template.js
new file mode 100755
index 000000000..2285a824c
--- /dev/null
+++ b/test/data/tiddlywiki/test/js/template.js
@@ -0,0 +1,11 @@
+jQuery(document).ready(function() {
+	module("<module>");
+
+	test("<section>", function() {
+		var actual, expected;
+
+		actual = <...>;
+		expected = <...>;
+		same(actual, expected, "<message>");
+	});
+});
diff --git a/test/data/tiddlywiki/test/qunit/delayTestExecution.js b/test/data/tiddlywiki/test/qunit/delayTestExecution.js
new file mode 100755
index 000000000..2f3817b7e
--- /dev/null
+++ b/test/data/tiddlywiki/test/qunit/delayTestExecution.js
@@ -0,0 +1,9 @@
+jQuery(document).ready(function() {
+	test("Wait until TiddlyWiki starts", function() {
+		stop();
+	});
+});
+
+jQuery().bind("startup", function() {
+	start();
+});
diff --git a/test/data/tiddlywiki/test/qunit/qunit.css b/test/data/tiddlywiki/test/qunit/qunit.css
new file mode 100755
index 000000000..10e765761
--- /dev/null
+++ b/test/data/tiddlywiki/test/qunit/qunit.css
@@ -0,0 +1,163 @@
+/** Font Family and Sizes */
+
+#qunit-tests, #qunit-header, #qunit-banner, #qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult {
+	font-family: "Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial;
+}
+
+#qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult, #qunit-tests li { font-size: small; }
+#qunit-tests { font-size: smaller; }
+
+
+/** Resets */
+
+#qunit-tests, #qunit-tests ol, #qunit-header, #qunit-banner, #qunit-userAgent, #qunit-testresult {
+	margin: 0;
+	padding: 0;
+}
+
+
+/** Header */
+
+#qunit-header {
+	padding: 0.5em 0 0.5em 1em;
+
+	color: #8699a4;
+	background-color: #0d3349;
+
+	font-size: 1.5em;
+	line-height: 1em;
+	font-weight: normal;
+	
+	border-radius: 15px 15px 0 0;
+	-moz-border-radius: 15px 15px 0 0;
+	-webkit-border-top-right-radius: 15px;
+	-webkit-border-top-left-radius: 15px;
+}
+
+#qunit-header a {
+	text-decoration: none;
+	color: #c2ccd1;
+}
+
+#qunit-header a:hover,
+#qunit-header a:focus {
+	color: #fff;
+}
+
+#qunit-banner {
+	height: 5px;
+}
+
+#qunit-testrunner-toolbar {
+	padding: 0em 0 0.5em 2em;
+}
+
+#qunit-userAgent {
+	padding: 0.5em 0 0.5em 2.5em;
+	background-color: #2b81af;
+	color: #fff;
+	text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px;
+}
+
+
+/** Tests: Pass/Fail */
+
+#qunit-tests {
+	list-style-position: inside;
+}
+
+#qunit-tests li {
+	padding: 0.4em 0.5em 0.4em 2.5em;
+	border-bottom: 1px solid #fff;
+	list-style-position: inside;
+}
+
+#qunit-tests li strong {
+	cursor: pointer;
+}
+
+#qunit-tests ol {
+	margin-top: 0.5em;
+	padding: 0.5em;
+	
+	background-color: #fff;
+	
+	border-radius: 15px;
+	-moz-border-radius: 15px;
+	-webkit-border-radius: 15px;
+	
+	box-shadow: inset 0px 2px 13px #999;
+	-moz-box-shadow: inset 0px 2px 13px #999;
+	-webkit-box-shadow: inset 0px 2px 13px #999;
+}
+
+/*** Test Counts */
+
+#qunit-tests b.counts                       { color: black; }
+#qunit-tests b.passed                       { color: #5E740B; }
+#qunit-tests b.failed                       { color: #710909; }
+
+#qunit-tests li li {
+	margin: 0.5em;
+	padding: 0.4em 0.5em 0.4em 0.5em;
+	background-color: #fff;
+	border-bottom: none;
+	list-style-position: inside;
+}
+
+/*** Passing Styles */
+
+#qunit-tests li li.pass {
+	color: #5E740B;
+	background-color: #fff;
+	border-left: 26px solid #C6E746;
+}
+
+#qunit-tests .pass                          { color: #528CE0; background-color: #D2E0E6; }
+#qunit-tests .pass .test-name               { color: #366097; }
+ 
+#qunit-tests .pass .test-actual,
+#qunit-tests .pass .test-expected           { color: #999999; }
+
+#qunit-banner.qunit-pass                    { background-color: #C6E746; }
+
+/*** Failing Styles */
+
+#qunit-tests li li.fail {
+	color: #710909;
+	background-color: #fff;
+	border-left: 26px solid #EE5757;
+}
+
+#qunit-tests .fail                          { color: #000000; background-color: #EE5757; }
+#qunit-tests .fail .test-name,
+#qunit-tests .fail .module-name             { color: #000000; }
+
+#qunit-tests .fail .test-actual             { color: #EE5757; }
+#qunit-tests .fail .test-expected           { color: green;   }
+
+#qunit-banner.qunit-fail, 
+#qunit-testrunner-toolbar                   { background-color: #EE5757; }
+
+
+/** Footer */
+
+#qunit-testresult {
+	padding: 0.5em 0.5em 0.5em 2.5em;
+
+	color: #2b81af;
+	background-color: #D2E0E6;
+
+	border-radius: 0 0 15px 15px;
+	-moz-border-radius: 0 0 15px 15px;
+	-webkit-border-bottom-right-radius: 15px;
+	-webkit-border-bottom-left-radius: 15px;
+}
+
+/** Fixture */
+
+#qunit-fixture {
+	position: absolute;
+	top: -10000px;
+	left: -10000px;
+}
diff --git a/test/data/tiddlywiki/test/qunit/qunit.js b/test/data/tiddlywiki/test/qunit/qunit.js
new file mode 100755
index 000000000..d54b72ae6
--- /dev/null
+++ b/test/data/tiddlywiki/test/qunit/qunit.js
@@ -0,0 +1,1297 @@
+/*
+ * QUnit - A JavaScript Unit Testing Framework
+ * 
+ * http://docs.jquery.com/QUnit
+ *
+ * Copyright (c) 2009 John Resig, Jörn Zaefferer
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ */
+
+(function(window) {
+
+var QUnit = {
+
+	// call on start of module test to prepend name to all tests
+	module: function(name, testEnvironment) {
+		config.currentModule = name;
+
+		synchronize(function() {
+			if ( config.previousModule ) {
+				QUnit.moduleDone( config.currentModule, config.moduleStats.bad, config.moduleStats.all );
+			}
+
+			config.previousModule = config.currentModule;
+			config.currentModule = name;
+			config.moduleTestEnvironment = testEnvironment;
+			config.moduleStats = { all: 0, bad: 0 };
+
+			QUnit.moduleStart( name, testEnvironment );
+		});
+	},
+
+	asyncTest: function(testName, expected, callback) {
+		if ( arguments.length === 2 ) {
+			callback = expected;
+			expected = 0;
+		}
+
+		QUnit.test(testName, expected, callback, true);
+	},
+	
+	test: function(testName, expected, callback, async) {
+		var name = '<span class="test-name">' + testName + '</span>', testEnvironment, testEnvironmentArg;
+
+		if ( arguments.length === 2 ) {
+			callback = expected;
+			expected = null;
+		}
+		// is 2nd argument a testEnvironment?
+		if ( expected && typeof expected === 'object') {
+			testEnvironmentArg =  expected;
+			expected = null;
+		}
+
+		if ( config.currentModule ) {
+			name = '<span class="module-name">' + config.currentModule + "</span>: " + name;
+		}
+
+		if ( !validTest(config.currentModule + ": " + testName) ) {
+			return;
+		}
+
+		synchronize(function() {
+
+			testEnvironment = extend({
+				setup: function() {},
+				teardown: function() {}
+			}, config.moduleTestEnvironment);
+			if (testEnvironmentArg) {
+				extend(testEnvironment,testEnvironmentArg);
+			}
+
+			QUnit.testStart( testName, testEnvironment );
+
+			// allow utility functions to access the current test environment
+			QUnit.current_testEnvironment = testEnvironment;
+			
+			config.assertions = [];
+			config.expected = expected;
+			
+			var tests = id("qunit-tests");
+			if (tests) {
+				var b = document.createElement("strong");
+					b.innerHTML = "Running " + name;
+				var li = document.createElement("li");
+					li.appendChild( b );
+					li.id = "current-test-output";
+				tests.appendChild( li );
+			}
+
+			try {
+				if ( !config.pollution ) {
+					saveGlobal();
+				}
+
+				testEnvironment.setup.call(testEnvironment);
+			} catch(e) {
+				QUnit.ok( false, "Setup failed on " + name + ": " + e.message );
+			}
+	    });
+	
+	    synchronize(function() {
+			if ( async ) {
+				QUnit.stop();
+			}
+
+			try {
+				callback.call(testEnvironment);
+			} catch(e) {
+				fail("Test " + name + " died, exception and test follows", e, callback);
+				QUnit.ok( false, "Died on test #" + (config.assertions.length + 1) + ": " + e.message + " - " + QUnit.jsDump.parse(e) );
+				// else next test will carry the responsibility
+				saveGlobal();
+
+				// Restart the tests if they're blocking
+				if ( config.blocking ) {
+					start();
+				}
+			}
+		});
+
+		synchronize(function() {
+			try {
+				checkPollution();
+				testEnvironment.teardown.call(testEnvironment);
+			} catch(e) {
+				QUnit.ok( false, "Teardown failed on " + name + ": " + e.message );
+			}
+	    });
+	
+	    synchronize(function() {
+			var good = 0, bad = 0,
+				tests = id("qunit-tests");
+
+			config.stats.all += config.assertions.length;
+			config.moduleStats.all += config.assertions.length;
+
+			if ( tests ) {
+				var ol  = document.createElement("ol");
+
+				for ( var i = 0; i < config.assertions.length; i++ ) {
+					var assertion = config.assertions[i];
+
+					var li = document.createElement("li");
+					li.className = assertion.result ? "pass" : "fail";
+					li.innerHTML = assertion.message || (assertion.result ? "okay" : "failed");
+					ol.appendChild( li );
+
+					if ( assertion.result ) {
+						good++;
+					} else {
+						bad++;
+						config.stats.bad++;
+						config.moduleStats.bad++;
+					}
+				}
+				if (bad == 0) {
+					ol.style.display = "none";
+				}
+
+				var b = document.createElement("strong");
+				b.innerHTML = name + " <b class='counts'>(<b class='failed'>" + bad + "</b>, <b class='passed'>" + good + "</b>, " + config.assertions.length + ")</b>";
+				
+				addEvent(b, "click", function() {
+					var next = b.nextSibling, display = next.style.display;
+					next.style.display = display === "none" ? "block" : "none";
+				});
+				
+				addEvent(b, "dblclick", function(e) {
+					var target = e && e.target ? e.target : window.event.srcElement;
+					if ( target.nodeName.toLowerCase() == "span" || target.nodeName.toLowerCase() == "b" ) {
+						target = target.parentNode;
+					}
+					if ( window.location && target.nodeName.toLowerCase() === "strong" ) {
+						window.location.search = "?" + encodeURIComponent(getText([target]).replace(/\(.+\)$/, "").replace(/(^\s*|\s*$)/g, ""));
+					}
+				});
+
+				var li = id("current-test-output");
+				li.id = "";
+				li.className = bad ? "fail" : "pass";
+				li.style.display = resultDisplayStyle(!bad);
+				li.removeChild( li.firstChild );
+				li.appendChild( b );
+				li.appendChild( ol );
+
+				if ( bad ) {
+					var toolbar = id("qunit-testrunner-toolbar");
+					if ( toolbar ) {
+						toolbar.style.display = "block";
+						id("qunit-filter-pass").disabled = null;
+						id("qunit-filter-missing").disabled = null;
+					}
+				}
+
+			} else {
+				for ( var i = 0; i < config.assertions.length; i++ ) {
+					if ( !config.assertions[i].result ) {
+						bad++;
+						config.stats.bad++;
+						config.moduleStats.bad++;
+					}
+				}
+			}
+
+			try {
+				QUnit.reset();
+			} catch(e) {
+				fail("reset() failed, following Test " + name + ", exception and reset fn follows", e, QUnit.reset);
+			}
+
+			if ( config.expected && config.expected != config.assertions.length ) {
+				QUnit.ok( false, "Expected " + config.expected + " assertions, but " + config.assertions.length + " were run" );
+			}
+
+			QUnit.testDone( testName, bad, config.assertions.length );
+
+			if ( !window.setTimeout && !config.queue.length ) {
+				done();
+			}
+		});
+
+		synchronize( done );
+	},
+	
+	/**
+	 * Specify the number of expected assertions to gurantee that failed test (no assertions are run at all) don't slip through.
+	 */
+	expect: function(asserts) {
+		config.expected = asserts;
+	},
+
+	/**
+	 * Asserts true.
+	 * @example ok( "asdfasdf".length > 5, "There must be at least 5 chars" );
+	 */
+	ok: function(a, msg) {
+		a = !!a;
+		var details = {
+			result: a,
+			message: msg
+		};
+		msg = escapeHtml(msg);
+		QUnit.log(a, msg, details);
+		config.assertions.push({
+			result: a,
+			message: msg
+		});
+	},
+
+	/**
+	 * Checks that the first two arguments are equal, with an optional message.
+	 * Prints out both actual and expected values.
+	 *
+	 * Prefered to ok( actual == expected, message )
+	 *
+	 * @example equal( format("Received {0} bytes.", 2), "Received 2 bytes." );
+	 *
+	 * @param Object actual
+	 * @param Object expected
+	 * @param String message (optional)
+	 */
+	equal: function(actual, expected, message) {
+		QUnit.push(expected == actual, actual, expected, message);
+	},
+
+	notEqual: function(actual, expected, message) {
+		QUnit.push(expected != actual, actual, expected, message);
+	},
+	
+	deepEqual: function(actual, expected, message) {
+		QUnit.push(QUnit.equiv(actual, expected), actual, expected, message);
+	},
+
+	notDeepEqual: function(actual, expected, message) {
+		QUnit.push(!QUnit.equiv(actual, expected), actual, expected, message);
+	},
+
+	strictEqual: function(actual, expected, message) {
+		QUnit.push(expected === actual, actual, expected, message);
+	},
+
+	notStrictEqual: function(actual, expected, message) {
+		QUnit.push(expected !== actual, actual, expected, message);
+	},
+
+	raises: function(fn,  message) {
+		try {
+			fn();
+			ok( false, message );
+		}
+		catch (e) {
+			ok( true, message );
+		}
+	},
+
+	start: function() {
+		// A slight delay, to avoid any current callbacks
+		if ( window.setTimeout ) {
+			window.setTimeout(function() {
+				if ( config.timeout ) {
+					clearTimeout(config.timeout);
+				}
+
+				config.blocking = false;
+				process();
+			}, 13);
+		} else {
+			config.blocking = false;
+			process();
+		}
+	},
+	
+	stop: function(timeout) {
+		config.blocking = true;
+
+		if ( timeout && window.setTimeout ) {
+			config.timeout = window.setTimeout(function() {
+				QUnit.ok( false, "Test timed out" );
+				QUnit.start();
+			}, timeout);
+		}
+	}
+
+};
+
+// Backwards compatibility, deprecated
+QUnit.equals = QUnit.equal;
+QUnit.same = QUnit.deepEqual;
+
+// Maintain internal state
+var config = {
+	// The queue of tests to run
+	queue: [],
+
+	// block until document ready
+	blocking: true
+};
+
+// Load paramaters
+(function() {
+	var location = window.location || { search: "", protocol: "file:" },
+		GETParams = location.search.slice(1).split('&');
+
+	for ( var i = 0; i < GETParams.length; i++ ) {
+		GETParams[i] = decodeURIComponent( GETParams[i] );
+		if ( GETParams[i] === "noglobals" ) {
+			GETParams.splice( i, 1 );
+			i--;
+			config.noglobals = true;
+		} else if ( GETParams[i].search('=') > -1 ) {
+			GETParams.splice( i, 1 );
+			i--;
+		}
+	}
+	
+	// restrict modules/tests by get parameters
+	config.filters = GETParams;
+	
+	// Figure out if we're running the tests from a server or not
+	QUnit.isLocal = !!(location.protocol === 'file:');
+})();
+
+// Expose the API as global variables, unless an 'exports'
+// object exists, in that case we assume we're in CommonJS
+if ( typeof exports === "undefined" || typeof require === "undefined" ) {
+	extend(window, QUnit);
+	window.QUnit = QUnit;
+} else {
+	extend(exports, QUnit);
+	exports.QUnit = QUnit;
+}
+
+// define these after exposing globals to keep them in these QUnit namespace only
+extend(QUnit, {
+	config: config,
+
+	// Initialize the configuration options
+	init: function() {
+		extend(config, {
+			stats: { all: 0, bad: 0 },
+			moduleStats: { all: 0, bad: 0 },
+			started: +new Date,
+			updateRate: 1000,
+			blocking: false,
+			autostart: true,
+			autorun: false,
+			assertions: [],
+			filters: [],
+			queue: []
+		});
+
+		var tests = id("qunit-tests"),
+			banner = id("qunit-banner"),
+			result = id("qunit-testresult");
+
+		if ( tests ) {
+			tests.innerHTML = "";
+		}
+
+		if ( banner ) {
+			banner.className = "";
+		}
+
+		if ( result ) {
+			result.parentNode.removeChild( result );
+		}
+	},
+	
+	/**
+	 * Resets the test setup. Useful for tests that modify the DOM.
+	 * 
+	 * If jQuery is available, uses jQuery's html(), otherwise just innerHTML.
+	 */
+	reset: function() {
+		if ( window.jQuery ) {
+			jQuery( "#main, #qunit-fixture" ).html( config.fixture );
+		} else {
+			var main = id( 'main' ) || id( 'qunit-fixture' );
+			if ( main ) {
+				main.innerHTML = config.fixture;
+			}
+		}
+	},
+	
+	/**
+	 * Trigger an event on an element.
+	 *
+	 * @example triggerEvent( document.body, "click" );
+	 *
+	 * @param DOMElement elem
+	 * @param String type
+	 */
+	triggerEvent: function( elem, type, event ) {
+		if ( document.createEvent ) {
+			event = document.createEvent("MouseEvents");
+			event.initMouseEvent(type, true, true, elem.ownerDocument.defaultView,
+				0, 0, 0, 0, 0, false, false, false, false, 0, null);
+			elem.dispatchEvent( event );
+
+		} else if ( elem.fireEvent ) {
+			elem.fireEvent("on"+type);
+		}
+	},
+	
+	// Safe object type checking
+	is: function( type, obj ) {
+		return QUnit.objectType( obj ) == type;
+	},
+	
+	objectType: function( obj ) {
+		if (typeof obj === "undefined") {
+				return "undefined";
+
+		// consider: typeof null === object
+		}
+		if (obj === null) {
+				return "null";
+		}
+
+		var type = Object.prototype.toString.call( obj )
+			.match(/^\[object\s(.*)\]$/)[1] || '';
+
+		switch (type) {
+				case 'Number':
+						if (isNaN(obj)) {
+								return "nan";
+						} else {
+								return "number";
+						}
+				case 'String':
+				case 'Boolean':
+				case 'Array':
+				case 'Date':
+				case 'RegExp':
+				case 'Function':
+						return type.toLowerCase();
+		}
+		if (typeof obj === "object") {
+				return "object";
+		}
+		return undefined;
+	},
+	
+	push: function(result, actual, expected, message) {
+		var details = {
+			result: result,
+			message: message,
+			actual: actual,
+			expected: expected
+		};
+		
+		message = escapeHtml(message) || (result ? "okay" : "failed");
+		message = '<span class="test-message">' + message + "</span>";
+		expected = escapeHtml(QUnit.jsDump.parse(expected));
+		actual = escapeHtml(QUnit.jsDump.parse(actual));
+		var output = message + ', expected: <span class="test-expected">' + expected + '</span>';
+		if (actual != expected) {
+			output += ' result: <span class="test-actual">' + actual + '</span>, diff: ' + QUnit.diff(expected, actual);
+		}
+		
+		QUnit.log(result, message, details);
+		
+		config.assertions.push({
+			result: !!result,
+			message: output
+		});
+	},
+	
+	// Logging callbacks
+	begin: function() {},
+	done: function(failures, total) {},
+	log: function(result, message) {},
+	testStart: function(name, testEnvironment) {},
+	testDone: function(name, failures, total) {},
+	moduleStart: function(name, testEnvironment) {},
+	moduleDone: function(name, failures, total) {}
+});
+
+if ( typeof document === "undefined" || document.readyState === "complete" ) {
+	config.autorun = true;
+}
+
+addEvent(window, "load", function() {
+	QUnit.begin();
+	
+	// Initialize the config, saving the execution queue
+	var oldconfig = extend({}, config);
+	QUnit.init();
+	extend(config, oldconfig);
+
+	config.blocking = false;
+
+	var userAgent = id("qunit-userAgent");
+	if ( userAgent ) {
+		userAgent.innerHTML = navigator.userAgent;
+	}
+	var banner = id("qunit-header");
+	if ( banner ) {
+		var paramsIndex = location.href.lastIndexOf(location.search);
+		if ( paramsIndex > -1 ) {
+			var mainPageLocation = location.href.slice(0, paramsIndex);
+			if ( mainPageLocation == location.href ) {
+				banner.innerHTML = '<a href=""> ' + banner.innerHTML + '</a> ';
+			} else {
+				var testName = decodeURIComponent(location.search.slice(1));
+				banner.innerHTML = '<a href="' + mainPageLocation + '">' + banner.innerHTML + '</a> &#8250; <a href="">' + testName + '</a>';
+			}
+		}
+	}
+	
+	var toolbar = id("qunit-testrunner-toolbar");
+	if ( toolbar ) {
+		toolbar.style.display = "none";
+		
+		var filter = document.createElement("input");
+		filter.type = "checkbox";
+		filter.id = "qunit-filter-pass";
+		filter.disabled = true;
+		addEvent( filter, "click", function() {
+			var li = document.getElementsByTagName("li");
+			for ( var i = 0; i < li.length; i++ ) {
+				if ( li[i].className.indexOf("pass") > -1 ) {
+					li[i].style.display = filter.checked ? "none" : "";
+				}
+			}
+		});
+		toolbar.appendChild( filter );
+
+		var label = document.createElement("label");
+		label.setAttribute("for", "qunit-filter-pass");
+		label.innerHTML = "Hide passed tests";
+		toolbar.appendChild( label );
+
+		var missing = document.createElement("input");
+		missing.type = "checkbox";
+		missing.id = "qunit-filter-missing";
+		missing.disabled = true;
+		addEvent( missing, "click", function() {
+			var li = document.getElementsByTagName("li");
+			for ( var i = 0; i < li.length; i++ ) {
+				if ( li[i].className.indexOf("fail") > -1 && li[i].innerHTML.indexOf('missing test - untested code is broken code') > - 1 ) {
+					li[i].parentNode.parentNode.style.display = missing.checked ? "none" : "block";
+				}
+			}
+		});
+		toolbar.appendChild( missing );
+
+		label = document.createElement("label");
+		label.setAttribute("for", "qunit-filter-missing");
+		label.innerHTML = "Hide missing tests (untested code is broken code)";
+		toolbar.appendChild( label );
+	}
+
+	var main = id('main') || id('qunit-fixture');
+	if ( main ) {
+		config.fixture = main.innerHTML;
+	}
+
+	if (config.autostart) {
+		QUnit.start();
+	}
+});
+
+function done() {
+	if ( config.doneTimer && window.clearTimeout ) {
+		window.clearTimeout( config.doneTimer );
+		config.doneTimer = null;
+	}
+
+	if ( config.queue.length ) {
+		config.doneTimer = window.setTimeout(function(){
+			if ( !config.queue.length ) {
+				done();
+			} else {
+				synchronize( done );
+			}
+		}, 13);
+
+		return;
+	}
+
+	config.autorun = true;
+
+	// Log the last module results
+	if ( config.currentModule ) {
+		QUnit.moduleDone( config.currentModule, config.moduleStats.bad, config.moduleStats.all );
+	}
+
+	var banner = id("qunit-banner"),
+		tests = id("qunit-tests"),
+		html = ['Tests completed in ',
+		+new Date - config.started, ' milliseconds.<br/>',
+		'<span class="passed">', config.stats.all - config.stats.bad, '</span> tests of <span class="total">', config.stats.all, '</span> passed, <span class="failed">', config.stats.bad,'</span> failed.'].join('');
+
+	if ( banner ) {
+		banner.className = (config.stats.bad ? "qunit-fail" : "qunit-pass");
+	}
+
+	if ( tests ) {	
+		var result = id("qunit-testresult");
+
+		if ( !result ) {
+			result = document.createElement("p");
+			result.id = "qunit-testresult";
+			result.className = "result";
+			tests.parentNode.insertBefore( result, tests.nextSibling );
+		}
+
+		result.innerHTML = html;
+	}
+
+	QUnit.done( config.stats.bad, config.stats.all );
+}
+
+function validTest( name ) {
+	var i = config.filters.length,
+		run = false;
+
+	if ( !i ) {
+		return true;
+	}
+	
+	while ( i-- ) {
+		var filter = config.filters[i],
+			not = filter.charAt(0) == '!';
+
+		if ( not ) {
+			filter = filter.slice(1);
+		}
+
+		if ( name.indexOf(filter) !== -1 ) {
+			return !not;
+		}
+
+		if ( not ) {
+			run = true;
+		}
+	}
+
+	return run;
+}
+
+function resultDisplayStyle(passed) {
+	return passed && id("qunit-filter-pass") && id("qunit-filter-pass").checked ? 'none' : '';
+}
+
+function escapeHtml(s) {
+	if (!s) {
+		return "";
+	}
+	s = s + "";
+	return s.replace(/[\&"<>\\]/g, function(s) {
+		switch(s) {
+			case "&": return "&amp;";
+			case "\\": return "\\\\";
+			case '"': return '\"';
+			case "<": return "&lt;";
+			case ">": return "&gt;";
+			default: return s;
+		}
+	});
+}
+
+function synchronize( callback ) {
+	config.queue.push( callback );
+
+	if ( config.autorun && !config.blocking ) {
+		process();
+	}
+}
+
+function process() {
+	var start = (new Date()).getTime();
+
+	while ( config.queue.length && !config.blocking ) {
+		if ( config.updateRate <= 0 || (((new Date()).getTime() - start) < config.updateRate) ) {
+			config.queue.shift()();
+
+		} else {
+			setTimeout( process, 13 );
+			break;
+		}
+	}
+}
+
+function saveGlobal() {
+	config.pollution = [];
+	
+	if ( config.noglobals ) {
+		for ( var key in window ) {
+			config.pollution.push( key );
+		}
+	}
+}
+
+function checkPollution( name ) {
+	var old = config.pollution;
+	saveGlobal();
+	
+	var newGlobals = diff( old, config.pollution );
+	if ( newGlobals.length > 0 ) {
+		ok( false, "Introduced global variable(s): " + newGlobals.join(", ") );
+		config.expected++;
+	}
+
+	var deletedGlobals = diff( config.pollution, old );
+	if ( deletedGlobals.length > 0 ) {
+		ok( false, "Deleted global variable(s): " + deletedGlobals.join(", ") );
+		config.expected++;
+	}
+}
+
+// returns a new Array with the elements that are in a but not in b
+function diff( a, b ) {
+	var result = a.slice();
+	for ( var i = 0; i < result.length; i++ ) {
+		for ( var j = 0; j < b.length; j++ ) {
+			if ( result[i] === b[j] ) {
+				result.splice(i, 1);
+				i--;
+				break;
+			}
+		}
+	}
+	return result;
+}
+
+function fail(message, exception, callback) {
+	if ( typeof console !== "undefined" && console.error && console.warn ) {
+		console.error(message);
+		console.error(exception);
+		console.warn(callback.toString());
+
+	} else if ( window.opera && opera.postError ) {
+		opera.postError(message, exception, callback.toString);
+	}
+}
+
+function extend(a, b) {
+	for ( var prop in b ) {
+		a[prop] = b[prop];
+	}
+
+	return a;
+}
+
+function addEvent(elem, type, fn) {
+	if ( elem.addEventListener ) {
+		elem.addEventListener( type, fn, false );
+	} else if ( elem.attachEvent ) {
+		elem.attachEvent( "on" + type, fn );
+	} else {
+		fn();
+	}
+}
+
+function id(name) {
+	return !!(typeof document !== "undefined" && document && document.getElementById) &&
+		document.getElementById( name );
+}
+
+// Test for equality any JavaScript type.
+// Discussions and reference: http://philrathe.com/articles/equiv
+// Test suites: http://philrathe.com/tests/equiv
+// Author: Philippe Rathé <prathe@gmail.com>
+QUnit.equiv = function () {
+
+    var innerEquiv; // the real equiv function
+    var callers = []; // stack to decide between skip/abort functions
+    var parents = []; // stack to avoiding loops from circular referencing
+
+    // Call the o related callback with the given arguments.
+    function bindCallbacks(o, callbacks, args) {
+        var prop = QUnit.objectType(o);
+        if (prop) {
+            if (QUnit.objectType(callbacks[prop]) === "function") {
+                return callbacks[prop].apply(callbacks, args);
+            } else {
+                return callbacks[prop]; // or undefined
+            }
+        }
+    }
+    
+    var callbacks = function () {
+
+        // for string, boolean, number and null
+        function useStrictEquality(b, a) {
+            if (b instanceof a.constructor || a instanceof b.constructor) {
+                // to catch short annotaion VS 'new' annotation of a declaration
+                // e.g. var i = 1;
+                //      var j = new Number(1);
+                return a == b;
+            } else {
+                return a === b;
+            }
+        }
+
+        return {
+            "string": useStrictEquality,
+            "boolean": useStrictEquality,
+            "number": useStrictEquality,
+            "null": useStrictEquality,
+            "undefined": useStrictEquality,
+
+            "nan": function (b) {
+                return isNaN(b);
+            },
+
+            "date": function (b, a) {
+                return QUnit.objectType(b) === "date" && a.valueOf() === b.valueOf();
+            },
+
+            "regexp": function (b, a) {
+                return QUnit.objectType(b) === "regexp" &&
+                    a.source === b.source && // the regex itself
+                    a.global === b.global && // and its modifers (gmi) ...
+                    a.ignoreCase === b.ignoreCase &&
+                    a.multiline === b.multiline;
+            },
+
+            // - skip when the property is a method of an instance (OOP)
+            // - abort otherwise,
+            //   initial === would have catch identical references anyway
+            "function": function () {
+                var caller = callers[callers.length - 1];
+                return caller !== Object &&
+                        typeof caller !== "undefined";
+            },
+
+            "array": function (b, a) {
+                var i, j, loop;
+                var len;
+
+                // b could be an object literal here
+                if ( ! (QUnit.objectType(b) === "array")) {
+                    return false;
+                }   
+                
+                len = a.length;
+                if (len !== b.length) { // safe and faster
+                    return false;
+                }
+                
+                //track reference to avoid circular references
+                parents.push(a);
+                for (i = 0; i < len; i++) {
+                    loop = false;
+                    for(j=0;j<parents.length;j++){
+                        if(parents[j] === a[i]){
+                            loop = true;//dont rewalk array
+                        }
+                    }
+                    if (!loop && ! innerEquiv(a[i], b[i])) {
+                        parents.pop();
+                        return false;
+                    }
+                }
+                parents.pop();
+                return true;
+            },
+
+            "object": function (b, a) {
+                var i, j, loop;
+                var eq = true; // unless we can proove it
+                var aProperties = [], bProperties = []; // collection of strings
+
+                // comparing constructors is more strict than using instanceof
+                if ( a.constructor !== b.constructor) {
+                    return false;
+                }
+
+                // stack constructor before traversing properties
+                callers.push(a.constructor);
+                //track reference to avoid circular references
+                parents.push(a);
+                
+                for (i in a) { // be strict: don't ensures hasOwnProperty and go deep
+                    loop = false;
+                    for(j=0;j<parents.length;j++){
+                        if(parents[j] === a[i])
+                            loop = true; //don't go down the same path twice
+                    }
+                    aProperties.push(i); // collect a's properties
+
+                    if (!loop && ! innerEquiv(a[i], b[i])) {
+                        eq = false;
+                        break;
+                    }
+                }
+
+                callers.pop(); // unstack, we are done
+                parents.pop();
+
+                for (i in b) {
+                    bProperties.push(i); // collect b's properties
+                }
+
+                // Ensures identical properties name
+                return eq && innerEquiv(aProperties.sort(), bProperties.sort());
+            }
+        };
+    }();
+
+    innerEquiv = function () { // can take multiple arguments
+        var args = Array.prototype.slice.apply(arguments);
+        if (args.length < 2) {
+            return true; // end transition
+        }
+
+        return (function (a, b) {
+            if (a === b) {
+                return true; // catch the most you can
+            } else if (a === null || b === null || typeof a === "undefined" || typeof b === "undefined" || QUnit.objectType(a) !== QUnit.objectType(b)) {
+                return false; // don't lose time with error prone cases
+            } else {
+                return bindCallbacks(a, callbacks, [b, a]);
+            }
+
+        // apply transition with (1..n) arguments
+        })(args[0], args[1]) && arguments.callee.apply(this, args.splice(1, args.length -1));
+    };
+
+    return innerEquiv;
+
+}();
+
+/**
+ * jsDump
+ * Copyright (c) 2008 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com
+ * Licensed under BSD (http://www.opensource.org/licenses/bsd-license.php)
+ * Date: 5/15/2008
+ * @projectDescription Advanced and extensible data dumping for Javascript.
+ * @version 1.0.0
+ * @author Ariel Flesler
+ * @link {http://flesler.blogspot.com/2008/05/jsdump-pretty-dump-of-any-javascript.html}
+ */
+QUnit.jsDump = (function() {
+	function quote( str ) {
+		return '"' + str.toString().replace(/"/g, '\\"') + '"';
+	};
+	function literal( o ) {
+		return o + '';	
+	};
+	function join( pre, arr, post ) {
+		var s = jsDump.separator(),
+			base = jsDump.indent(),
+			inner = jsDump.indent(1);
+		if ( arr.join )
+			arr = arr.join( ',' + s + inner );
+		if ( !arr )
+			return pre + post;
+		return [ pre, inner + arr, base + post ].join(s);
+	};
+	function array( arr ) {
+		var i = arr.length,	ret = Array(i);					
+		this.up();
+		while ( i-- )
+			ret[i] = this.parse( arr[i] );				
+		this.down();
+		return join( '[', ret, ']' );
+	};
+	
+	var reName = /^function (\w+)/;
+	
+	var jsDump = {
+		parse:function( obj, type ) { //type is used mostly internally, you can fix a (custom)type in advance
+			var	parser = this.parsers[ type || this.typeOf(obj) ];
+			type = typeof parser;			
+			
+			return type == 'function' ? parser.call( this, obj ) :
+				   type == 'string' ? parser :
+				   this.parsers.error;
+		},
+		typeOf:function( obj ) {
+			var type;
+			if ( obj === null ) {
+				type = "null";
+			} else if (typeof obj === "undefined") {
+				type = "undefined";
+			} else if (QUnit.is("RegExp", obj)) {
+				type = "regexp";
+			} else if (QUnit.is("Date", obj)) {
+				type = "date";
+			} else if (QUnit.is("Function", obj)) {
+				type = "function";
+			} else if (obj.setInterval && obj.document && !obj.nodeType) {
+				type = "window";
+			} else if (obj.nodeType === 9) {
+				type = "document";
+			} else if (obj.nodeType) {
+				type = "node";
+			} else if (typeof obj === "object" && typeof obj.length === "number" && obj.length >= 0) {
+				type = "array";
+			} else {
+				type = typeof obj;
+			}
+			return type;
+		},
+		separator:function() {
+			return this.multiline ?	this.HTML ? '<br />' : '\n' : this.HTML ? '&nbsp;' : ' ';
+		},
+		indent:function( extra ) {// extra can be a number, shortcut for increasing-calling-decreasing
+			if ( !this.multiline )
+				return '';
+			var chr = this.indentChar;
+			if ( this.HTML )
+				chr = chr.replace(/\t/g,'   ').replace(/ /g,'&nbsp;');
+			return Array( this._depth_ + (extra||0) ).join(chr);
+		},
+		up:function( a ) {
+			this._depth_ += a || 1;
+		},
+		down:function( a ) {
+			this._depth_ -= a || 1;
+		},
+		setParser:function( name, parser ) {
+			this.parsers[name] = parser;
+		},
+		// The next 3 are exposed so you can use them
+		quote:quote, 
+		literal:literal,
+		join:join,
+		//
+		_depth_: 1,
+		// This is the list of parsers, to modify them, use jsDump.setParser
+		parsers:{
+			window: '[Window]',
+			document: '[Document]',
+			error:'[ERROR]', //when no parser is found, shouldn't happen
+			unknown: '[Unknown]',
+			'null':'null',
+			undefined:'undefined',
+			'function':function( fn ) {
+				var ret = 'function',
+					name = 'name' in fn ? fn.name : (reName.exec(fn)||[])[1];//functions never have name in IE
+				if ( name )
+					ret += ' ' + name;
+				ret += '(';
+				
+				ret = [ ret, this.parse( fn, 'functionArgs' ), '){'].join('');
+				return join( ret, this.parse(fn,'functionCode'), '}' );
+			},
+			array: array,
+			nodelist: array,
+			arguments: array,
+			object:function( map ) {
+				var ret = [ ];
+				this.up();
+				for ( var key in map )
+					ret.push( this.parse(key,'key') + ': ' + this.parse(map[key]) );
+				this.down();
+				return join( '{', ret, '}' );
+			},
+			node:function( node ) {
+				var open = this.HTML ? '&lt;' : '<',
+					close = this.HTML ? '&gt;' : '>';
+					
+				var tag = node.nodeName.toLowerCase(),
+					ret = open + tag;
+					
+				for ( var a in this.DOMAttrs ) {
+					var val = node[this.DOMAttrs[a]];
+					if ( val )
+						ret += ' ' + a + '=' + this.parse( val, 'attribute' );
+				}
+				return ret + close + open + '/' + tag + close;
+			},
+			functionArgs:function( fn ) {//function calls it internally, it's the arguments part of the function
+				var l = fn.length;
+				if ( !l ) return '';				
+				
+				var args = Array(l);
+				while ( l-- )
+					args[l] = String.fromCharCode(97+l);//97 is 'a'
+				return ' ' + args.join(', ') + ' ';
+			},
+			key:quote, //object calls it internally, the key part of an item in a map
+			functionCode:'[code]', //function calls it internally, it's the content of the function
+			attribute:quote, //node calls it internally, it's an html attribute value
+			string:quote,
+			date:quote,
+			regexp:literal, //regex
+			number:literal,
+			'boolean':literal
+		},
+		DOMAttrs:{//attributes to dump from nodes, name=>realName
+			id:'id',
+			name:'name',
+			'class':'className'
+		},
+		HTML:false,//if true, entities are escaped ( <, >, \t, space and \n )
+		indentChar:'   ',//indentation unit
+		multiline:false //if true, items in a collection, are separated by a \n, else just a space.
+	};
+
+	return jsDump;
+})();
+
+// from Sizzle.js
+function getText( elems ) {
+	var ret = "", elem;
+
+	for ( var i = 0; elems[i]; i++ ) {
+		elem = elems[i];
+
+		// Get the text from text nodes and CDATA nodes
+		if ( elem.nodeType === 3 || elem.nodeType === 4 ) {
+			ret += elem.nodeValue;
+
+		// Traverse everything else, except comment nodes
+		} else if ( elem.nodeType !== 8 ) {
+			ret += getText( elem.childNodes );
+		}
+	}
+
+	return ret;
+};
+
+/*
+ * Javascript Diff Algorithm
+ *  By John Resig (http://ejohn.org/)
+ *  Modified by Chu Alan "sprite"
+ *
+ * Released under the MIT license.
+ *
+ * More Info:
+ *  http://ejohn.org/projects/javascript-diff-algorithm/
+ *  
+ * Usage: QUnit.diff(expected, actual)
+ * 
+ * QUnit.diff("the quick brown fox jumped over", "the quick fox jumps over") == "the  quick <del>brown </del> fox <del>jumped </del><ins>jumps </ins> over"
+ */
+QUnit.diff = (function() {
+	function diff(o, n){
+		var ns = new Object();
+		var os = new Object();
+		
+		for (var i = 0; i < n.length; i++) {
+			if (ns[n[i]] == null) 
+				ns[n[i]] = {
+					rows: new Array(),
+					o: null
+				};
+			ns[n[i]].rows.push(i);
+		}
+		
+		for (var i = 0; i < o.length; i++) {
+			if (os[o[i]] == null) 
+				os[o[i]] = {
+					rows: new Array(),
+					n: null
+				};
+			os[o[i]].rows.push(i);
+		}
+		
+		for (var i in ns) {
+			if (ns[i].rows.length == 1 && typeof(os[i]) != "undefined" && os[i].rows.length == 1) {
+				n[ns[i].rows[0]] = {
+					text: n[ns[i].rows[0]],
+					row: os[i].rows[0]
+				};
+				o[os[i].rows[0]] = {
+					text: o[os[i].rows[0]],
+					row: ns[i].rows[0]
+				};
+			}
+		}
+		
+		for (var i = 0; i < n.length - 1; i++) {
+			if (n[i].text != null && n[i + 1].text == null && n[i].row + 1 < o.length && o[n[i].row + 1].text == null &&
+			n[i + 1] == o[n[i].row + 1]) {
+				n[i + 1] = {
+					text: n[i + 1],
+					row: n[i].row + 1
+				};
+				o[n[i].row + 1] = {
+					text: o[n[i].row + 1],
+					row: i + 1
+				};
+			}
+		}
+		
+		for (var i = n.length - 1; i > 0; i--) {
+			if (n[i].text != null && n[i - 1].text == null && n[i].row > 0 && o[n[i].row - 1].text == null &&
+			n[i - 1] == o[n[i].row - 1]) {
+				n[i - 1] = {
+					text: n[i - 1],
+					row: n[i].row - 1
+				};
+				o[n[i].row - 1] = {
+					text: o[n[i].row - 1],
+					row: i - 1
+				};
+			}
+		}
+		
+		return {
+			o: o,
+			n: n
+		};
+	}
+	
+	return function(o, n){
+		o = o.replace(/\s+$/, '');
+		n = n.replace(/\s+$/, '');
+		var out = diff(o == "" ? [] : o.split(/\s+/), n == "" ? [] : n.split(/\s+/));
+
+		var str = "";
+		
+		var oSpace = o.match(/\s+/g);
+		if (oSpace == null) {
+			oSpace = [" "];
+		}
+		else {
+			oSpace.push(" ");
+		}
+		var nSpace = n.match(/\s+/g);
+		if (nSpace == null) {
+			nSpace = [" "];
+		}
+		else {
+			nSpace.push(" ");
+		}
+		
+		if (out.n.length == 0) {
+			for (var i = 0; i < out.o.length; i++) {
+				str += '<del>' + out.o[i] + oSpace[i] + "</del>";
+			}
+		}
+		else {
+			if (out.n[0].text == null) {
+				for (n = 0; n < out.o.length && out.o[n].text == null; n++) {
+					str += '<del>' + out.o[n] + oSpace[n] + "</del>";
+				}
+			}
+			
+			for (var i = 0; i < out.n.length; i++) {
+				if (out.n[i].text == null) {
+					str += '<ins>' + out.n[i] + nSpace[i] + "</ins>";
+				}
+				else {
+					var pre = "";
+					
+					for (n = out.n[i].row + 1; n < out.o.length && out.o[n].text == null; n++) {
+						pre += '<del>' + out.o[n] + oSpace[n] + "</del>";
+					}
+					str += " " + out.n[i].text + nSpace[i] + pre;
+				}
+			}
+		}
+		
+		return str;
+	};
+})();
+
+})(this);
diff --git a/test/data/tiddlywiki/test/qunit/raiseAssertion.js b/test/data/tiddlywiki/test/qunit/raiseAssertion.js
new file mode 100755
index 000000000..1ceaafb9f
--- /dev/null
+++ b/test/data/tiddlywiki/test/qunit/raiseAssertion.js
@@ -0,0 +1,35 @@
+/*
+ * extension of the QUnit framework to support exception handling
+ * cf. http://dev.jquery.com/ticket/4318
+ */
+
+(function($) {
+
+$.extend(window, {
+	raises: raises
+});
+
+/**
+ * Checks that the given expression throws an exception of the expected type, with an optional message.
+ *
+ * @example raises( function() { return foo.bar; }, "TypeError", "invalid property access raises TypeError exception" );
+ *
+ * @param Function expression
+ * @param String expected exception type
+ * @param String message (optional)
+ */
+function raises(expression, expected, message) {
+	try {
+		push(false, expression(), expected, message);
+	} catch(ex) {
+		push(ex.name == expected, ex.name, expected, message);
+	}
+}
+
+// duplicated private function from testrunner.js
+function push(result, actual, expected, message) {
+	message = message || (result ? "okay" : "failed");
+	QUnit.ok( result, result ? message + ": " + expected : message + ", expected: " + jsDump.parse(expected) + " result: " + jsDump.parse(actual) );
+}
+
+})(jQuery);
diff --git a/test/data/tiddlywiki/test/qunit/split.recipe b/test/data/tiddlywiki/test/qunit/split.recipe
new file mode 100755
index 000000000..bfd2f60aa
--- /dev/null
+++ b/test/data/tiddlywiki/test/qunit/split.recipe
@@ -0,0 +1,4 @@
+#jslib: delayTestExecution.js
+jslib: raiseAssertion.js
+jslib: qunit.js
+style: qunit.css
diff --git a/test/data/tiddlywiki/test/recipes/sample.txt b/test/data/tiddlywiki/test/recipes/sample.txt
new file mode 100755
index 000000000..0cd850f13
--- /dev/null
+++ b/test/data/tiddlywiki/test/recipes/sample.txt
@@ -0,0 +1,7 @@
+lorem ipsum
+dolor sit amet
+
+ !"#$%&'()*+,-./0123456789:;<=>?
+@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~
+©čČ
+foo bar baz
diff --git a/test/data/tiddlywiki/test/recipes/shadows/DefaultTiddlers.tiddler b/test/data/tiddlywiki/test/recipes/shadows/DefaultTiddlers.tiddler
new file mode 100755
index 000000000..3cfea3077
--- /dev/null
+++ b/test/data/tiddlywiki/test/recipes/shadows/DefaultTiddlers.tiddler
@@ -0,0 +1,3 @@
+<div title="DefaultTiddlers" tags="excludeLists excludeSearch">
+<pre></pre>
+</div>
diff --git a/test/data/tiddlywiki/test/recipes/shadows/MainMenu.tiddler b/test/data/tiddlywiki/test/recipes/shadows/MainMenu.tiddler
new file mode 100755
index 000000000..f6600dc71
--- /dev/null
+++ b/test/data/tiddlywiki/test/recipes/shadows/MainMenu.tiddler
@@ -0,0 +1,3 @@
+<div title="MainMenu" tags="excludeLists excludeSearch">
+<pre></pre>
+</div>
diff --git a/test/data/tiddlywiki/test/recipes/shadows/SideBarOptions.tiddler b/test/data/tiddlywiki/test/recipes/shadows/SideBarOptions.tiddler
new file mode 100755
index 000000000..7ac832697
--- /dev/null
+++ b/test/data/tiddlywiki/test/recipes/shadows/SideBarOptions.tiddler
@@ -0,0 +1,3 @@
+<div title="SideBarOptions" tags="excludeLists excludeSearch">
+<pre></pre>
+</div>
diff --git a/test/data/tiddlywiki/test/recipes/shadows/SideBarTabs.tiddler b/test/data/tiddlywiki/test/recipes/shadows/SideBarTabs.tiddler
new file mode 100755
index 000000000..64a502456
--- /dev/null
+++ b/test/data/tiddlywiki/test/recipes/shadows/SideBarTabs.tiddler
@@ -0,0 +1,3 @@
+<div title="SideBarTabs" tags="excludeLists excludeSearch">
+<pre></pre>
+</div>
diff --git a/test/data/tiddlywiki/test/recipes/shadows/split.recipe b/test/data/tiddlywiki/test/recipes/shadows/split.recipe
new file mode 100755
index 000000000..4cb9beb8e
--- /dev/null
+++ b/test/data/tiddlywiki/test/recipes/shadows/split.recipe
@@ -0,0 +1,4 @@
+shadow: DefaultTiddlers.tiddler
+shadow: MainMenu.tiddler
+shadow: SideBarOptions.tiddler
+shadow: SideBarTabs.tiddler
diff --git a/test/data/tiddlywiki/test/recipes/tests.html.recipe b/test/data/tiddlywiki/test/recipes/tests.html.recipe
new file mode 100755
index 000000000..d7bdb9b92
--- /dev/null
+++ b/test/data/tiddlywiki/test/recipes/tests.html.recipe
@@ -0,0 +1,18 @@
+# TiddlyWiki components
+recipe: ../../tiddlywiki.html.recipe
+recipe: ../../deprecated/split.recipe
+recipe: shadows/split.recipe
+
+# jQuery
+recipe: ../../jquery/split.recipe
+
+# test framework
+recipe: ../qunit/split.recipe
+recipe: ../jqMock/split.recipe
+recipe: ../html/split.recipe
+
+# tests
+recipe: ../js/split.recipe
+
+# testdata
+recipe: ../testdata/split.recipe
diff --git a/test/data/tiddlywiki/test/reporter.html b/test/data/tiddlywiki/test/reporter.html
new file mode 100755
index 000000000..8306ff9c4
--- /dev/null
+++ b/test/data/tiddlywiki/test/reporter.html
@@ -0,0 +1,55 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>Test Suite</title>
+	<link rel="stylesheet" type="text/css" href="styles/main.css">
+	<style type="text/css">
+		* {
+			margin: 0;
+			padding: 0;
+		}
+	</style>
+	<script src="../jquery/jquery-1.3.2.min.js" type="text/javascript"></script>
+	<script type="text/javascript">
+		jQuery.noConflict();
+
+		(function($) {
+
+		var uri = "http://localhost/reporter.php";
+
+		$(document).ready(function() {
+			$("<iframe id='frm_core' />").attr("src", "tests.html").
+				width(800).height(600).
+				appendTo(document.body).
+				load(function() { getTestResults(this); });
+		});
+
+		var getTestResults = function(frm) {
+			var container = $(frm).contents().find("#testresult");
+			if(container.length) {
+				var total = container.find(".all").text();
+				var failures = container.find(".bad").text();
+				reportTestResults(total, failures);
+			} else { // poll
+				setTimeout(function() { getTestResults(frm); }, 10);
+			}
+		};
+
+		var reportTestResults = function(total, failures) {
+			if(window.Components && window.netscape && window.netscape.security &&
+				document.location.protocol.indexOf("http") == -1) {
+				window.netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
+			}
+			$.post(uri, { total: total, failures: failures });
+		};
+
+		})(jQuery);
+	</script>
+</head>
+
+<body>
+</body>
+
+</html>
diff --git a/test/data/tiddlywiki/test/reporter.php b/test/data/tiddlywiki/test/reporter.php
new file mode 100755
index 000000000..1ea86d537
--- /dev/null
+++ b/test/data/tiddlywiki/test/reporter.php
@@ -0,0 +1,16 @@
+<?php
+
+$smtp = "smtp.gmail.com";
+$sender = "info@tiddlywiki.com";
+$recipient = "info@tiddlywiki.com";
+$subject = "Test Report";
+
+ini_set("SMTP", $smtp);
+ini_set("smtp_port", "465");
+ini_set("sendmail_from", $sender);
+
+echo $message = "Total : " . $_POST["total"] . " Failures : " . $_POST["failures"];
+
+echo mail($recipient, $subject, $message);
+
+?>
diff --git a/test/data/tiddlywiki/test/testdata/split.recipe b/test/data/tiddlywiki/test/testdata/split.recipe
new file mode 100755
index 000000000..05ac3143b
--- /dev/null
+++ b/test/data/tiddlywiki/test/testdata/split.recipe
@@ -0,0 +1,3 @@
+tiddler: testTiddler1.tid
+tiddler: testTiddler2.tid
+tiddler: testTiddler3.tid
diff --git a/test/data/tiddlywiki/test/testdata/testTiddler1.tid b/test/data/tiddlywiki/test/testdata/testTiddler1.tid
new file mode 100755
index 000000000..6b8b65ad2
--- /dev/null
+++ b/test/data/tiddlywiki/test/testdata/testTiddler1.tid
@@ -0,0 +1,6 @@
+tags: testTag oneTag
+fieldvalue: one
+modified: 201012010340
+created: 200910211355
+
+hello
diff --git a/test/data/tiddlywiki/test/testdata/testTiddler2.tid b/test/data/tiddlywiki/test/testdata/testTiddler2.tid
new file mode 100755
index 000000000..cb9160679
--- /dev/null
+++ b/test/data/tiddlywiki/test/testdata/testTiddler2.tid
@@ -0,0 +1,17 @@
+tags: testTag twoTag
+fieldvalue: two
+modified: 19951201034020
+created: 19940722031200
+
+hello
+
+slice:4t
+
+!section
+bar
+
+!section2
+test
+
+!Section3
+welcome
diff --git a/test/data/tiddlywiki/test/testdata/testTiddler3.tid b/test/data/tiddlywiki/test/testdata/testTiddler3.tid
new file mode 100755
index 000000000..f8a5d4820
--- /dev/null
+++ b/test/data/tiddlywiki/test/testdata/testTiddler3.tid
@@ -0,0 +1,10 @@
+tags: testTag threeTag
+fieldvalue: three
+server.bag: foo
+field-thing: bar
+creator: martin
+modified: 20101201094020
+created: 200910191255
+
+hello
+[[testTiddler2]]
diff --git a/test/data/tiddlywiki/tiddlywiki.html.recipe b/test/data/tiddlywiki/tiddlywiki.html.recipe
new file mode 100755
index 000000000..e861efa7b
--- /dev/null
+++ b/test/data/tiddlywiki/tiddlywiki.html.recipe
@@ -0,0 +1,5 @@
+recipe: html/split.recipe
+recipe: shadows/split.recipe
+recipe: js/split.recipe
+recipe: deprecated/split.recipe
+recipe: jquery/split.recipe
diff --git a/test/data/tiddlywiki/tiddlywiki_externaljs.html.recipe b/test/data/tiddlywiki/tiddlywiki_externaljs.html.recipe
new file mode 100755
index 000000000..d5d4e8a0b
--- /dev/null
+++ b/test/data/tiddlywiki/tiddlywiki_externaljs.html.recipe
@@ -0,0 +1,4 @@
+recipe: html/split.recipe
+recipe: shadows/split.recipe
+version: js/Version.js
+jsext: html/externaljs.txt
diff --git a/test/data/tiddlywiki/tiddlywiki_externaljs_tiddlyspace.html.recipe b/test/data/tiddlywiki/tiddlywiki_externaljs_tiddlyspace.html.recipe
new file mode 100755
index 000000000..0d46385c6
--- /dev/null
+++ b/test/data/tiddlywiki/tiddlywiki_externaljs_tiddlyspace.html.recipe
@@ -0,0 +1,4 @@
+recipe: html/split.recipe
+recipe: shadows/split.recipe
+version: js/Version.js
+jsext: html/externaljs_tiddlyspace.txt
diff --git a/test/data/tiddlywiki/tiddlywiki_externaljs_tiddlyspace_alpha.html.recipe b/test/data/tiddlywiki/tiddlywiki_externaljs_tiddlyspace_alpha.html.recipe
new file mode 100755
index 000000000..e6d40bc78
--- /dev/null
+++ b/test/data/tiddlywiki/tiddlywiki_externaljs_tiddlyspace_alpha.html.recipe
@@ -0,0 +1,4 @@
+recipe: html/split.recipe
+recipe: shadows/split.recipe
+version: js/Version.js
+jsext: html/externaljs_tiddlyspace_alpha.txt
diff --git a/test/data/tiddlywiki/tiddlywikinonoscript.html.recipe b/test/data/tiddlywiki/tiddlywikinonoscript.html.recipe
new file mode 100755
index 000000000..3bcebace3
--- /dev/null
+++ b/test/data/tiddlywiki/tiddlywikinonoscript.html.recipe
@@ -0,0 +1,5 @@
+recipe: html/splitnonoscript.recipe
+recipe: shadows/split.recipe
+recipe: js/split.recipe
+recipe: deprecated/split.recipe
+recipe: jquery/split.recipe
diff --git a/test/data/tiddlywiki/uploadalpha b/test/data/tiddlywiki/uploadalpha
new file mode 100755
index 000000000..42d3583b6
--- /dev/null
+++ b/test/data/tiddlywiki/uploadalpha
@@ -0,0 +1,56 @@
+#!/usr/bin/env bash
+
+# Usage:
+#  uploadalpha [release] [username]
+
+# default values
+USERNAME=${2:-$LOGNAME}
+DEFAULT_RELEASE=`cat ALPHA`
+RELEASE=${1:-$DEFAULT_RELEASE}
+HOST="$USERNAME@tiddlywiki.com"
+DIR="/var/www/www.tiddlywiki.com/htdocs"
+OWNER="www-data:www-data"
+PERM="664"
+TW_DIR="cooked"
+
+# setPermissions()
+# Usage:
+#  setPermissions file
+function setPermissions() {
+	COMMANDS="$COMMANDS sudo chown $OWNER $1;"
+	COMMANDS="$COMMANDS sudo chmod $PERM $1;"
+}
+
+# upload files to temporary folder
+echo
+echo "uploading files"
+echo
+cd 
+FILES="$TW_DIR/tiddlywiki.$RELEASE.html $TW_DIR/tiddlywiki_compressed.$RELEASE.html $TW_DIR/tiddlywiki_externaljs.$RELEASE.html $TW_DIR/tiddlywiki_externaljs_tiddlyspace.$RELEASE.html $TW_DIR/twcore.$RELEASE.js jquery/jquery.js jquery/plugins/jQuery.twStylesheet.js"
+scp $FILES "$HOST:./tmp/"
+
+# transfer files to their respective folders
+echo
+echo "transferring files"
+echo
+stty -echo
+COMMANDS="ssh $HOST"
+# Empty
+COMMANDS="$COMMANDS sudo cp ./tmp/tiddlywiki.$RELEASE.html $DIR/alpha/empty.html;"
+setPermissions "$DIR/alpha/empty.html"
+# Compressed
+COMMANDS="$COMMANDS sudo mv ./tmp/tiddlywiki_compressed.$RELEASE.html $DIR/alpha/tiddlywiki_compressed.html;"
+setPermissions "$DIR/alpha/tiddlywiki_compressed.html"
+COMMANDS="$COMMANDS sudo mv ./tmp/tiddlywiki_externaljs.$RELEASE.html $DIR/alpha/tiddlywiki_externaljs.html;"
+setPermissions "$DIR/alpha/tiddlywiki_externaljs.html"
+COMMANDS="$COMMANDS sudo mv ./tmp/tiddlywiki_externaljs_tiddlyspace.$RELEASE.html $DIR/alpha/tiddlywiki_externaljs_tiddlyspace.html;"
+setPermissions "$DIR/alpha/tiddlywiki_externaljs_tiddlyspace.html"
+COMMANDS="$COMMANDS sudo mv ./tmp/twcore.$RELEASE.js $DIR/alpha/twcore.js;"
+setPermissions "$DIR/alpha/twcore.js"
+COMMANDS="$COMMANDS sudo mv ./tmp/jquery.js $DIR/alpha/jquery.js;"
+setPermissions "$DIR/alpha/jquery.js"
+COMMANDS="$COMMANDS sudo mv ./tmp/jQuery.twStylesheet.js $DIR/alpha/jQuery.twStylesheet.js;"
+setPermissions "$DIR/alpha/jQuery.twStylesheet.js"
+# execute
+$COMMANDS
+stty echo