Fix typo

To make it easier to handle state, and enable us to add support for the "incomingTitle" parameter

.eslintignore

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

.eslintrc.yml

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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,43 @@
+---
+name: Bug report
+about: Create a report to help us improve TiddlyWiki 5
+title: "[BUG]"
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**TiddlyWiki Configuration (please complete the following information):**
+ - Version [e.g. v5.1.24]
+ - Saving mechanism [e.g. Node.js, TiddlyDesktop, TiddlyHost etc]
+ - Plugins installed [e.g. Freelinks, TiddlyMap]
+ 
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,67 +0,0 @@
-name: Bug report
-description: Create a report to help us improve TiddlyWiki 5
-title: "[BUG] "
-body:
-  - type: textarea
-    id: Describe
-    attributes:
-      label: Describe the bug
-      description: A clear and concise description of what the bug is.
-    validations:
-      required: true
-  - type: textarea
-    id: Expected
-    attributes:
-      label: Expected behavior
-      description: A clear and concise description of what you expected to happen.
-    validations:
-      required: false
-  - type: textarea
-    id: Reproduce
-    attributes:
-      label: To Reproduce
-      description: "Steps to reproduce the behavior:"
-      value: |
-        1. Go to '...'
-        2. Click on '....'
-        3. Scroll down to '....'
-        4. See error
-    validations:
-      required: false
-  - type: textarea
-    id: Screenshots
-    attributes:
-      label: Screenshots
-      description: If applicable, add screenshots to help explain your problem.
-      placeholder: Drag image here to upload screenshot!
-    validations:
-      required: false
-  - type: textarea
-    id: Configuration
-    attributes:
-      label: TiddlyWiki Configuration
-      description: please complete the following information
-      value: |
-        - Version [e.g. v5.1.24]
-        - Saving mechanism [e.g. Node.js, TiddlyDesktop, TiddlyHost etc]
-        - Plugins installed [e.g. Freelinks, TiddlyMap]
-
-        ### Desktop (please complete the following information):
-
-        - OS: [e.g. iOS]
-        - Browser [e.g. chrome, safari]
-        - Version [e.g. 22]
-
-        ### Smartphone (please complete the following information):
-
-        - Device: [e.g. iPhone6]
-        - OS: [e.g. iOS8.1]
-        - Browser [e.g. stock browser, safari]
-        - Version [e.g. 22]
-    validations:
-      required: true
-  - type: textarea
-    id: Context
-    attributes:
-      label: Additional context
-      description: Add any other context about the problem here.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Discuss feature request
-    url: https://github.com/Jermolene/TiddlyWiki5/discussions
-    about: Open new discussion about new feature
-  - name: Talk.Tiddlywiki Forum
-    url: https://talk.tiddlywiki.org
-    about: Join the Forum

.github/PULL_REQUEST_TEMPLATE/pull_request_template.md

@@ -20,11 +20,3 @@ A clear and concise description of any alternative solutions or features you've
 Add any other context or screenshots about the feature request here.
 
 If you link to discussions elsewhere then please copy and paste the important text, and don't expect readers to scan the entire discussion to find the relevant part.
-
-## Checklist before requesting a review
-
-- [ ] Illustrate any visual changes (however minor) with before/after screenshots
-- [ ] Self-review of code
-- [ ] Documentation updates (for user-visible changes)
-- [ ] Tests (for core code changes)
-- [ ] Complies with coding style guidelines (for JavaScript code)

.github/workflows/ci.yml

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

.gitignore

@@ -1,7 +1,5 @@
 .DS_Store
 .c9/
-.vscode/
 tmp/
 output/
 node_modules/
-

bin/build-site.sh

@@ -5,7 +5,7 @@
 # Default to the current version number for building the plugin library
 
 if [  -z "$TW5_BUILD_VERSION" ]; then
-    TW5_BUILD_VERSION=v5.2.8
+    TW5_BUILD_VERSION=v5.2.0
 fi
 
 echo "Using TW5_BUILD_VERSION as [$TW5_BUILD_VERSION]"
@@ -233,15 +233,6 @@ node $TW5_BUILD_TIDDLYWIKI \
 	--build index \
 	|| exit 1
 
-# /editions/twitter-archivist/index.html	Twitter Archivist edition
-node $TW5_BUILD_TIDDLYWIKI \
-	./editions/twitter-archivist \
-	--verbose \
-	--load $TW5_BUILD_OUTPUT/build.tid \
-	--output $TW5_BUILD_OUTPUT/editions/twitter-archivist/ \
-	--build index \
-	|| exit 1
-
 ######################################################
 #
 # Plugin demos
@@ -359,14 +350,14 @@ node $TW5_BUILD_TIDDLYWIKI \
 
 # Delete any existing static content
 
-rm -rf $TW5_BUILD_OUTPUT/languages/de-AT/static/*
-rm -rf $TW5_BUILD_OUTPUT/languages/de-DE/static/*
-rm -rf $TW5_BUILD_OUTPUT/languages/es-ES/static/*
-rm -rf $TW5_BUILD_OUTPUT/languages/fr-FR/static/*
-rm -rf $TW5_BUILD_OUTPUT/languages/ja-JP/static/*
-rm -rf $TW5_BUILD_OUTPUT/languages/ko-KR/static/*
-rm -rf $TW5_BUILD_OUTPUT/languages/zh-Hans/static/*
-rm -rf $TW5_BUILD_OUTPUT/languages/zh-Hant/static/*
+rm $TW5_BUILD_OUTPUT/languages/de-AT/static/*
+rm $TW5_BUILD_OUTPUT/languages/de-DE/static/*
+rm $TW5_BUILD_OUTPUT/languages/es-ES/static/*
+rm $TW5_BUILD_OUTPUT/languages/fr-FR/static/*
+rm $TW5_BUILD_OUTPUT/languages/ja-JP/static/*
+rm $TW5_BUILD_OUTPUT/languages/ko-KR/static/*
+rm $TW5_BUILD_OUTPUT/languages/zh-Hans/static/*
+rm $TW5_BUILD_OUTPUT/languages/zh-Hant/static/*
 
 # /languages/de-AT/index.html		Demo wiki with de-AT language
 # /languages/de-AT/empty.html		Empty wiki with de-AT language
@@ -459,7 +450,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/library/$TW5_BUILD_VERSION \
-	--build library\
+	--build \
 	|| exit 1
 
 # Delete the temporary build tiddler

bin/build-tw-org.sh

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

bin/test.sh

@@ -9,7 +9,6 @@ node ./tiddlywiki.js \
 	--verbose \
 	--version \
 	--rendertiddler $:/core/save/all test.html text/plain \
-	--test \
 	|| exit 1
 
 echo To run the tests in a browser, open "editions/test/output/test.html"

boot/boot.js

@@ -68,26 +68,6 @@ $tw.utils.isArrayEqual = function(array1,array2) {
 	});
 };
 
-/*
-Add an entry to a sorted array if it doesn't already exist, while maintaining the sort order
-*/
-$tw.utils.insertSortedArray = function(array,value) {
-	var low = 0, high = array.length - 1, mid, cmp;
-	while(low <= high) {
-		mid = (low + high) >> 1;
-		cmp = value.localeCompare(array[mid]);
-		if(cmp > 0) {
-			low = mid + 1;
-		} else if(cmp < 0) {
-			high = mid - 1;
-		} else {
-			return array;
-		}
-	}
-	array.splice(low,0,value);
-	return array;
-};
-
 /*
 Push entries onto an array, removing them first if they already exist in the array
 	array: array to modify (assumed to be free of duplicates)
@@ -96,42 +76,34 @@ Push entries onto an array, removing them first if they already exist in the arr
 $tw.utils.pushTop = function(array,value) {
 	var t,p;
 	if($tw.utils.isArray(value)) {
-		if($tw.config._temp_allowDuplicates) {
-			Array.prototype.push.apply(array,value);
-		} else {
-			// Remove any array entries that are duplicated in the new values
-			if(value.length !== 0) {
-				if(array.length !== 0) {
-					if(value.length < array.length) {
-						for(t=0; t<value.length; t++) {
-							p = array.indexOf(value[t]);
-							if(p !== -1) {
-								array.splice(p,1);
-							}
+		// Remove any array entries that are duplicated in the new values
+		if(value.length !== 0) {
+			if(array.length !== 0) {
+				if(value.length < array.length) {
+					for(t=0; t<value.length; t++) {
+						p = array.indexOf(value[t]);
+						if(p !== -1) {
+							array.splice(p,1);
 						}
-					} else {
-						for(t=array.length-1; t>=0; t--) {
-							p = value.indexOf(array[t]);
-							if(p !== -1) {
-								array.splice(t,1);
-							}
+					}
+				} else {
+					for(t=array.length-1; t>=0; t--) {
+						p = value.indexOf(array[t]);
+						if(p !== -1) {
+							array.splice(t,1);
 						}
 					}
 				}
-				// Push the values on top of the main array
-				Array.prototype.push.apply(array,value);
-			}			
+			}
+			// Push the values on top of the main array
+			array.push.apply(array,value);
 		}
 	} else {
-		if($tw.config._temp_allowDuplicates) {
-			array.push(value);
-		} else {
-			p = array.indexOf(value);
-			if(p !== -1) {
-				array.splice(p,1);
-			}
-			array.push(value);
+		p = array.indexOf(value);
+		if(p !== -1) {
+			array.splice(p,1);
 		}
+		array.push(value);
 	}
 	return array;
 };
@@ -321,7 +293,7 @@ $tw.utils.getLocationHash = function() {
 	var idx = href.indexOf('#');
 	if(idx === -1) {
 		return "#";
-	} else if(href.substr(idx + 1,1) === "#" ||  href.substr(idx + 1,3) === "%23") {
+	} else if(idx < href.length-1 && href[idx+1] === '#') {
 		// Special case: ignore location hash if it itself starts with a #
 		return "#";
 	} else {
@@ -383,7 +355,7 @@ $tw.utils.stringifyList = function(value) {
 		var result = new Array(value.length);
 		for(var t=0, l=value.length; t<l; t++) {
 			var entry = value[t] || "";
-			if(entry.match(/[^\S\xA0]/mg)) {
+			if(entry.indexOf(" ") !== -1) {
 				result[t] = "[[" + entry + "]]";
 			} else {
 				result[t] = entry;
@@ -405,7 +377,7 @@ $tw.utils.parseStringArray = function(value, allowDuplicate) {
 			match = memberRegExp.exec(value);
 			if(match) {
 				var item = match[1] || match[2];
-				if(item !== undefined && (!$tw.utils.hop(names,item) || allowDuplicate || $tw.config._temp_allowDuplicates)) {
+				if(item !== undefined && (!$tw.utils.hop(names,item) || allowDuplicate)) {
 					results.push(item);
 					names[item] = true;
 				}
@@ -437,19 +409,6 @@ $tw.utils.parseFields = function(text,fields) {
 	return fields;
 };
 
-// Safely parse a string as JSON
-$tw.utils.parseJSONSafe = function(text,defaultJSON) {
-	try {
-		return JSON.parse(text);
-	} catch(e) {
-		if(typeof defaultJSON === "function") {
-			return defaultJSON(e);
-		} else {
-			return defaultJSON || {};
-		}
-	}
-};
-
 /*
 Resolves a source filepath delimited with `/` relative to a specified absolute root filepath.
 In relative paths, the special folder name `..` refers to immediate parent directory, and the
@@ -1122,7 +1081,7 @@ $tw.Wiki = function(options) {
 		tiddlerTitles = null, // Array of tiddler titles
 		getTiddlerTitles = function() {
 			if(!tiddlerTitles) {
-				tiddlerTitles = Object.keys(tiddlers).sort(function(a,b) {return a.localeCompare(b);});
+				tiddlerTitles = Object.keys(tiddlers);
 			}
 			return tiddlerTitles;
 		},
@@ -1175,8 +1134,10 @@ $tw.Wiki = function(options) {
 				}
 				// Save the new tiddler
 				tiddlers[title] = tiddler;
-				// Check we've got the title
-				tiddlerTitles = $tw.utils.insertSortedArray(tiddlerTitles || [],title);
+				// Check we've got it's title
+				if(tiddlerTitles && tiddlerTitles.indexOf(title) === -1) {
+					tiddlerTitles.push(title);
+				}
 				// Record the new tiddler state
 				updateDescriptor["new"] = {
 					tiddler: tiddler,
@@ -1238,16 +1199,13 @@ $tw.Wiki = function(options) {
 	this.getTiddler = function(title) {
 		if(title) {
 			var t = tiddlers[title];
-			if(t !== undefined) {
+			if(t instanceof $tw.Tiddler) {
 				return t;
-			} else {
-				var s = shadowTiddlers[title];
-				if(s !== undefined) {
-					return s.tiddler;
-				}
+			} else if(title !== undefined && shadowTiddlers[title]) {
+				return shadowTiddlers[title].tiddler;
 			}
+			return undefined;
 		}
-		return undefined;
 	};
 
 	// Get an array of all tiddler titles
@@ -1364,7 +1322,7 @@ $tw.Wiki = function(options) {
 			var tiddler = tiddlers[title];
 			if(tiddler) {
 				if(tiddler.fields.type === "application/json" && tiddler.hasField("plugin-type") && tiddler.fields.text) {
-					pluginInfo[tiddler.fields.title] = $tw.utils.parseJSONSafe(tiddler.fields.text);
+					pluginInfo[tiddler.fields.title] = JSON.parse(tiddler.fields.text);
 					results.modifiedPlugins.push(tiddler.fields.title);
 				}
 			} else {
@@ -1497,7 +1455,7 @@ $tw.Wiki.prototype.defineTiddlerModules = function() {
 					}
 					break;
 				case "application/json":
-					$tw.modules.define(tiddler.fields.title,tiddler.fields["module-type"],$tw.utils.parseJSONSafe(tiddler.fields.text));
+					$tw.modules.define(tiddler.fields.title,tiddler.fields["module-type"],JSON.parse(tiddler.fields.text));
 					break;
 				case "application/x-tiddler-dictionary":
 					$tw.modules.define(tiddler.fields.title,tiddler.fields["module-type"],$tw.utils.parseFields(tiddler.fields.text));
@@ -1686,7 +1644,12 @@ $tw.modules.define("$:/boot/tiddlerdeserializer/json","tiddlerdeserializer",{
 				}
 				return true;
 			},
-			data = $tw.utils.parseJSONSafe(text);
+			data = {};
+		try {
+			data = JSON.parse(text);			
+		} catch(e) {
+			// Ignore JSON parse errors
+		}
 		if($tw.utils.isArray(data) && isTiddlerArrayValid(data)) {
 			return data;
 		} else if(isTiddlerValid(data)) {
@@ -1726,7 +1689,7 @@ $tw.boot.decryptEncryptedTiddlers = function(callback) {
 				$tw.crypto.setPassword(data.password);
 				var decryptedText = $tw.crypto.decrypt(encryptedText);
 				if(decryptedText) {
-					var json = $tw.utils.parseJSONSafe(decryptedText);
+					var json = JSON.parse(decryptedText);
 					for(var title in json) {
 						$tw.preloadTiddler(json[title]);
 					}
@@ -1889,7 +1852,7 @@ A default set of files for TiddlyWiki to ignore during load.
 This matches what NPM ignores, and adds "*.meta" to ignore tiddler
 metadata files.
 */
-$tw.boot.excludeRegExp = /^\.DS_Store$|^.*\.meta$|^\..*\.swp$|^\._.*$|^\.git$|^\.github$|^\.vscode$|^\.hg$|^\.lock-wscript$|^\.svn$|^\.wafpickle-.*$|^CVS$|^npm-debug\.log$/;
+$tw.boot.excludeRegExp = /^\.DS_Store$|^.*\.meta$|^\..*\.swp$|^\._.*$|^\.git$|^\.hg$|^\.lock-wscript$|^\.svn$|^\.wafpickle-.*$|^CVS$|^npm-debug\.log$/;
 
 /*
 Load all the tiddlers recursively from a directory, including honouring `tiddlywiki.files` files for drawing in external files. Returns an array of {filepath:,type:,tiddlers: [{..fields...}],hasMetaFile:}. Note that no file information is returned for externally loaded tiddlers, just the `tiddlers` property.
@@ -1926,7 +1889,7 @@ filepath: pathname of the directory containing the specification file
 $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
 	var tiddlers = [];
 	// Read the specification
-	var filesInfo = $tw.utils.parseJSONSafe(fs.readFileSync(filepath + path.sep + "tiddlywiki.files","utf8"));
+	var filesInfo = JSON.parse(fs.readFileSync(filepath + path.sep + "tiddlywiki.files","utf8"));
 	// Helper to process a file
 	var processFile = function(filename,isTiddlerFile,fields,isEditableFile) {
 		var extInfo = $tw.config.fileExtensionInfo[path.extname(filename)],
@@ -2056,7 +2019,7 @@ $tw.loadPluginFolder = function(filepath,excludeRegExp) {
 			console.log("Warning: missing plugin.info file in " + filepath);
 			return null;
 		}
-		var pluginInfo = $tw.utils.parseJSONSafe(fs.readFileSync(infoPath,"utf8"));
+		var pluginInfo = JSON.parse(fs.readFileSync(infoPath,"utf8"));
 		// Read the plugin files
 		var pluginFiles = $tw.loadTiddlersFromPath(filepath,excludeRegExp);
 		// Save the plugin tiddlers into the plugin info
@@ -2173,7 +2136,7 @@ $tw.loadWikiTiddlers = function(wikiPath,options) {
 		pluginFields;
 	// Bail if we don't have a wiki info file
 	if(fs.existsSync(wikiInfoPath)) {
-		wikiInfo = $tw.utils.parseJSONSafe(fs.readFileSync(wikiInfoPath,"utf8"));
+		wikiInfo = JSON.parse(fs.readFileSync(wikiInfoPath,"utf8"));
 	} else {
 		return null;
 	}
@@ -2313,25 +2276,14 @@ $tw.loadTiddlersNode = function() {
 Startup TiddlyWiki
 */
 $tw.boot.initStartup = function(options) {
-	var _temp_allowDuplicates;
-	options = options || {};
 	// Get the URL hash and check for safe mode
 	$tw.locationHash = "#";
 	if($tw.browser && !$tw.node) {
 		if(location.hash === "#:safe") {
 			$tw.safeMode = true;
-		} else if(location.hash === "#dupes") {
-			_temp_allowDuplicates = true;
-			$tw.locationHash = $tw.utils.getLocationHash();
 		} else {
 			$tw.locationHash = $tw.utils.getLocationHash();
 		}
-	} else {
-		var p = $tw.boot.argv.indexOf("--dupes");
-		if(p !== -1) {
-			_temp_allowDuplicates = true;
-			$tw.boot.argv.splice(p,1);
-		}
 	}
 	// Initialise some more $tw properties
 	$tw.utils.deepDefaults($tw,{
@@ -2340,7 +2292,6 @@ $tw.boot.initStartup = function(options) {
 			types: {} // hashmap by module type of hashmap of exports
 		},
 		config: { // Configuration overridables
-			_temp_allowDuplicates: _temp_allowDuplicates,
 			pluginsPath: "../plugins/",
 			themesPath: "../themes/",
 			languagesPath: "../languages/",
@@ -2423,12 +2374,11 @@ $tw.boot.initStartup = function(options) {
 	$tw.utils.registerFileType("application/x-font-ttf","base64",".woff");
 	$tw.utils.registerFileType("application/font-woff2","base64",".woff2");
 	$tw.utils.registerFileType("audio/ogg","base64",".ogg");
-	$tw.utils.registerFileType("audio/mp4","base64",[".mp4",".m4a"]);
 	$tw.utils.registerFileType("video/ogg","base64",[".ogm",".ogv",".ogg"]);
 	$tw.utils.registerFileType("video/webm","base64",".webm");
 	$tw.utils.registerFileType("video/mp4","base64",".mp4");
 	$tw.utils.registerFileType("audio/mp3","base64",".mp3");
-	$tw.utils.registerFileType("audio/mpeg","base64");
+	$tw.utils.registerFileType("audio/mp4","base64",[".mp4",".m4a"]);
 	$tw.utils.registerFileType("text/markdown","utf8",[".md",".markdown"],{deserializerType:"text/x-markdown"});
 	$tw.utils.registerFileType("text/x-markdown","utf8",[".md",".markdown"]);
 	$tw.utils.registerFileType("application/enex+xml","utf8",".enex");
@@ -2440,7 +2390,7 @@ $tw.boot.initStartup = function(options) {
 	$tw.utils.registerFileType("application/epub+zip","base64",".epub");
 	$tw.utils.registerFileType("application/octet-stream","base64",".octet-stream");
 	// Create the wiki store for the app
-	$tw.wiki = new $tw.Wiki($tw.safeMode && {enableIndexers: []});
+	$tw.wiki = new $tw.Wiki();
 	// Install built in tiddler fields modules
 	$tw.Tiddler.fieldModules = $tw.modules.getModulesByTypeAsHashmap("tiddlerfield");
 	// Install the tiddler deserializer modules
@@ -2493,14 +2443,6 @@ $tw.boot.execStartup = function(options){
 	if($tw.crypto) {
 		$tw.crypto.updateCryptoStateTiddler();
 	}
-	// Warn if using duplicates mode
-	console.log("\x1b[0;31m--------=====>>>>>> " + $tw.wiki.getTiddler("$:/core/_temp_allowDuplicates/Heading").fields.text + "\x1b[0m");
-	console.log("\x1b[0;34m--------=====>>>>>> " + $tw.wiki.getTiddler("$:/core/_temp_allowDuplicates/Warning").fields.text + "\x1b[0m");
-	if($tw.config._temp_allowDuplicates) {
-		console.log("\x1b[0;31m--------=====>>>>>> " + $tw.wiki.getTiddler("$:/core/_temp_allowDuplicates/StatusOn").fields.text + "\x1b[0m");
-	} else {
-		console.log("\x1b[0;32m--------=====>>>>>> " + $tw.wiki.getTiddler("$:/core/_temp_allowDuplicates/StatusOff").fields.text + "\x1b[0m");
-	}
 	// Gather up any startup modules
 	$tw.boot.remainingStartupModules = []; // Array of startup modules
 	$tw.modules.forEachModuleOfType("startup",function(title,module) {
@@ -2628,7 +2570,7 @@ $tw.boot.isStartupTaskEligible = function(taskModule) {
 		for(t=0; t<remaining.length; t++) {
 			var task = remaining[t];
 			if(task.before && task.before.indexOf(name) !== -1) {
-				if($tw.boot.doesTaskMatchPlatform(task) && (!task.name || $tw.boot.disabledStartupModules.indexOf(task.name) === -1)) {
+				if($tw.boot.doesTaskMatchPlatform(task) || (task.name && $tw.boot.disabledStartupModules.indexOf(name) !== -1)) {
 					return false;
 				}
 			}
@@ -2707,4 +2649,3 @@ if(typeof(exports) !== "undefined") {
 } else {
 	_boot(window.$tw);
 }
-//# sourceURL=$:/boot/boot.js

boot/bootprefix.js

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

core/_temp_allowDuplicates.tid

@@ -1,92 +0,0 @@
-title: $:/core/_temp_allowDuplicates
-tags: $:/tags/AboveStory
-
-<div class="marching-ants-box" style="
-    position: fixed;
-    top: 100px;
-    left: -4px;
-    max-width: 50%;
-    z-index: 1000;
-    padding: 1em;
-    border-top-right-radius: 16px;
-    border-bottom-right-radius: 16px;
-    color: #fff;">
-
-<$reveal type="match" state="$:/state/_temp_allowDuplicatesWarning" text="hide" default="show">
-
-<$button set="$:/state/_temp_allowDuplicatesWarning" setTo="show" class="tc-btn-invisible" style="
-    width: 100%;
-    text-align: left;
-    fill: #ff0;">
-
-{{$:/core/images/warning}}
-
-</$button>
-
-</$reveal>
-
-<$reveal type="nomatch" state="$:/state/_temp_allowDuplicatesWarning" text="hide" default="show">
-
-<$button set="$:/state/_temp_allowDuplicatesWarning" setTo="hide" class="tc-btn-invisible" style="
-    width: 100%;
-    text-align: left;
-    fill: #ff0;">
-
-<span style="float:right;">{{$:/core/images/chevron-left}}</span> {{$:/core/images/warning}}
-
-</$button>
-
-<div style="
-	font-weight: bold;">
-
-{{$:/core/_temp_allowDuplicates/Heading}}
-
-</div>
-
-<div style="">
-
-{{$:/core/_temp_allowDuplicates/Warning}}
-
-</div>
-
-<$list filter="1 1 1 1 +[butfirst[]limit[1]]" emptyMessage="""
-
-<div style="
-	font-weight: bold;
-	color: #0f0;">
-
-{{$:/core/_temp_allowDuplicates/StatusOff}}
-
-//Append `#dupes` to the browser address bar to enable//
-
-</div>
-""">
-
-<div style="
-	font-weight: bold;
-	color: #fff;
-	font-size: 1.5em;
-	padding: 4px;" class="marching-ants-box">
-
-{{$:/core/_temp_allowDuplicates/StatusOn}}
-
-//Remove `#dupes` from the browser address bar to disable//
-
-</div>
-
-</$list>
-
-</$reveal>
-
-</div>
-
-<style>
-@keyframes marching-ants { to { background-position: 100% 100% } }
-
-.marching-ants-box {
-	border: 4px solid transparent;
-	background: linear-gradient(#d85858, #d85858) padding-box,
-	            repeating-linear-gradient(-45deg, #f00 0, #f00 25%, transparent 0, transparent 50%) 0 / 12px 12px;
-	animation: marching-ants 12s linear infinite;
-}
-</style>

core/copyright.tid

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

core/images/layout-button.tid

@@ -1,4 +0,0 @@
-title: $:/core/images/layout-button
-tags: $:/tags/Image
-
-<svg width="22pt" height="22pt" class="tc-image-layout-button tc-image-button" viewBox="0 0 24 24" stroke-width="1" stroke="none"><path d="M0 0h24v24H0z" fill="none"/><rect x="2" y="2" width="7" height="7" rx="2"/><rect x="2" y="13" width="7" height="9" rx="2"/><rect x="12" y="2" width="10" height="20" rx="2"/></svg>

core/images/mastodon.tid

@@ -1,6 +0,0 @@
-title: $:/core/images/mastodon
-tags: $:/tags/Image
-
-<svg width="22pt" height="22pt" class="tc-image-mastodon tc-image-button" viewBox="0 0 128 128">
-  <path d="M112.716,76.735C111.231,85.764 99.411,95.646 85.836,97.561C78.757,98.559 71.787,99.476 64.355,99.073C52.201,98.415 42.61,95.646 42.61,95.646C42.61,97.044 42.683,98.374 42.829,99.619C44.409,113.79 54.723,114.639 64.493,115.035C74.354,115.434 83.134,112.163 83.134,112.163L83.539,122.695C83.539,122.695 76.642,127.071 64.355,127.875C57.58,128.315 49.167,127.674 39.369,124.61C18.118,117.965 14.463,91.202 13.904,64.048C13.733,55.985 13.839,48.383 13.839,42.024C13.839,14.257 29.238,6.118 29.238,6.118C37.002,1.905 50.326,0.134 64.177,-0L64.517,-0C78.369,0.134 91.701,1.905 99.465,6.118C99.465,6.118 114.864,14.257 114.864,42.024C114.864,42.024 115.057,62.511 112.716,76.735ZM96.7,44.179C96.7,37.307 95.219,31.847 92.245,27.807C89.177,23.767 85.16,21.696 80.174,21.696C74.403,21.696 70.034,24.316 67.146,29.556L64.337,35.118L61.529,29.556C58.64,24.316 54.271,21.696 48.501,21.696C43.514,21.696 39.497,23.767 36.43,27.807C33.455,31.847 31.974,37.307 31.974,44.179L31.974,77.8L43.249,77.8L43.249,45.167C43.249,38.288 45.699,34.796 50.599,34.796C56.017,34.796 58.733,38.938 58.733,47.128L58.733,64.99L69.941,64.99L69.941,47.128C69.941,38.938 72.657,34.796 78.075,34.796C82.975,34.796 85.425,38.288 85.425,45.167L85.425,77.8L96.7,77.8L96.7,44.179Z"/>
-</svg>

core/images/save-button-dynamic.tid

@@ -1,12 +0,0 @@
-title: $:/core/images/save-button-dynamic
-tags: $:/tags/Image
-
-<svg width="22pt" height="22pt" class="tc-image-save-button-dynamic tc-image-button" viewBox="0 0 128 128">
-<g class="tc-image-save-button-dynamic-clean">
-<path fill-rule="evenodd" d="M120.783 34.33c4.641 8.862 7.266 18.948 7.266 29.646 0 35.347-28.653 64-64 64-35.346 0-64-28.653-64-64 0-35.346 28.654-64 64-64 18.808 0 35.72 8.113 47.43 21.03l2.68-2.68c3.13-3.13 8.197-3.132 11.321-.008 3.118 3.118 3.121 8.193-.007 11.32l-4.69 4.691zm-12.058 12.058a47.876 47.876 0 013.324 17.588c0 26.51-21.49 48-48 48s-48-21.49-48-48 21.49-48 48-48c14.39 0 27.3 6.332 36.098 16.362L58.941 73.544 41.976 56.578c-3.127-3.127-8.201-3.123-11.32-.005-3.123 3.124-3.119 8.194.006 11.319l22.617 22.617a7.992 7.992 0 005.659 2.347c2.05 0 4.101-.783 5.667-2.349l44.12-44.12z"/>
-</g>
-<g class="tc-image-save-button-dynamic-dirty">
-<path d="M64.856912,0 C100.203136,0 128.856912,28.653776 128.856912,64 C128.856912,99.346224 100.203136,128 64.856912,128 C29.510688,128 0.856911958,99.346224 0.856911958,64 C0.856911958,28.653776 29.510688,0 64.856912,0 Z M64.856912,16 C38.347244,16 16.856912,37.490332 16.856912,64 C16.856912,90.509668 38.347244,112 64.856912,112 C91.3665799,112 112.856912,90.509668 112.856912,64 C112.856912,37.490332 91.3665799,16 64.856912,16 Z"></path>
-<circle cx="65" cy="64" r="32"></circle>
-</g>
-</svg>

core/language/en-GB/Buttons.multids

@@ -18,8 +18,6 @@ CopyToClipboard/Caption: copy to clipboard
 CopyToClipboard/Hint: Copy this text to the clipboard
 Delete/Caption: delete
 Delete/Hint: Delete this tiddler
-DeleteTiddlers/Caption: delete tiddlers
-DeleteTiddlers/Hint: Delete tiddlers
 Edit/Caption: edit
 Edit/Hint: Edit this tiddler
 Encryption/Caption: encryption
@@ -59,8 +57,6 @@ Home/Caption: home
 Home/Hint: Open the default tiddlers
 Language/Caption: language
 Language/Hint: Choose the user interface language
-LayoutSwitcher/Hint: Open layout switcher
-LayoutSwitcher/Caption: layout
 Manager/Caption: tiddler manager
 Manager/Hint: Open tiddler manager
 More/Caption: more

core/language/en-GB/ControlPanel.multids

@@ -7,7 +7,7 @@ Appearance/Hint: Ways to customise the appearance of your TiddlyWiki.
 Basics/AnimDuration/Prompt: Animation duration
 Basics/AutoFocus/Prompt: Default focus field for new tiddlers
 Basics/Caption: Basics
-Basics/DefaultTiddlers/BottomHint: Use [[double square brackets]] for titles with spaces. Or you can choose to {{retain story ordering||$:/snippets/retain-story-ordering-button}}
+Basics/DefaultTiddlers/BottomHint: Use &#91;&#91;double square brackets&#93;&#93; for titles with spaces. Or you can choose to <$button set="$:/DefaultTiddlers" setTo="[list[$:/StoryList]]">retain story ordering</$button>
 Basics/DefaultTiddlers/Prompt: Default tiddlers
 Basics/DefaultTiddlers/TopHint: Choose which tiddlers are displayed at startup
 Basics/Language/Prompt: Hello! Current language:
@@ -27,17 +27,10 @@ Basics/Tiddlers/Prompt: Number of tiddlers
 Basics/Title/Prompt: Title of this ~TiddlyWiki
 Basics/Username/Prompt: Username for signing edits
 Basics/Version/Prompt: ~TiddlyWiki version
-Cascades/Caption: Cascades
-Cascades/Hint: These global rules are used to dynamically choose certain templates. The result of the cascade is the result of the first filter in the sequence that returns a result
-Cascades/TagPrompt: Filters tagged <$macrocall $name="tag" tag=<<currentTiddler>>/>
 EditorTypes/Caption: Editor Types
 EditorTypes/Editor/Caption: Editor
 EditorTypes/Hint: These tiddlers determine which editor is used to edit specific tiddler types.
 EditorTypes/Type/Caption: Type
-EditTemplateBody/Caption: Edit Template Body
-EditTemplateBody/Hint: This rule cascade is used by the default edit template to dynamically choose the template for editing the body of a tiddler.
-FieldEditor/Caption: Field Editor
-FieldEditor/Hint: This rules cascade is used to dynamically choose the template for rendering a tiddler field based on its name. It is used within the Edit Template.
 Info/Caption: Info
 Info/Hint: Information about this TiddlyWiki
 KeyboardShortcuts/Add/Prompt: Type shortcut here
@@ -90,8 +83,8 @@ Plugins/Languages/Caption: Languages
 Plugins/Languages/Hint: Language pack plugins
 Plugins/NoInfoFound/Hint: No ''"<$text text=<<currentTab>>/>"'' found
 Plugins/NotInstalled/Hint: This plugin is not currently installed
-Plugins/OpenPluginLibrary: Open plugin library
-Plugins/ClosePluginLibrary: Close plugin library
+Plugins/OpenPluginLibrary: open plugin library
+Plugins/ClosePluginLibrary: close plugin library
 Plugins/PluginWillRequireReload: (requires reload)
 Plugins/Plugins/Caption: Plugins
 Plugins/Plugins/Hint: Plugins
@@ -198,8 +191,6 @@ Settings/TitleLinks/Yes/Description: Display tiddler titles as links
 Settings/MissingLinks/Caption: Wiki Links
 Settings/MissingLinks/Hint: Choose whether to link to tiddlers that do not exist yet
 Settings/MissingLinks/Description: Enable links to missing tiddlers
-StoryTiddler/Caption: Story Tiddler
-StoryTiddler/Hint: This rule cascade is used to dynamically choose the template for displaying a tiddler in the story river.
 StoryView/Caption: Story View
 StoryView/Prompt: Current view:
 Stylesheets/Caption: Stylesheets
@@ -210,10 +201,6 @@ Theme/Caption: Theme
 Theme/Prompt: Current theme:
 TiddlerFields/Caption: Tiddler Fields
 TiddlerFields/Hint: This is the full set of TiddlerFields in use in this wiki (including system tiddlers but excluding shadow tiddlers).
-TiddlerColour/Caption: Tiddler Colour
-TiddlerColour/Hint: This rules cascade is used to dynamically choose the colour for a tiddler (used for the icon and the associated tag pill).
-TiddlerIcon/Caption: Tiddler Icon
-TiddlerIcon/Hint: This rules cascade is used to dynamically choose the icon for a tiddler.
 Toolbars/Caption: Toolbars
 Toolbars/EditToolbar/Caption: Edit Toolbar
 Toolbars/EditToolbar/Hint: Choose which buttons are displayed for tiddlers in edit mode. Drag and drop to change the ordering
@@ -225,7 +212,3 @@ Toolbars/EditorToolbar/Hint: Choose which buttons are displayed in the editor to
 Toolbars/ViewToolbar/Caption: View Toolbar
 Toolbars/ViewToolbar/Hint: Choose which buttons are displayed for tiddlers in view mode. Drag and drop to change the ordering
 Tools/Download/Full/Caption: Download full wiki
-ViewTemplateBody/Caption: View Template Body
-ViewTemplateBody/Hint: This rule cascade is used by the default view template to dynamically choose the template for displaying the body of a tiddler.
-ViewTemplateTitle/Caption: View Template Title
-ViewTemplateTitle/Hint: This rule cascade is used by the default view template to dynamically choose the template for displaying the title of a tiddler.

core/language/en-GB/EditTemplate.multids

@@ -1,6 +1,5 @@
 title: $:/language/EditTemplate/
 
-Caption: Editor
 Body/External/Hint: This tiddler shows content stored outside of the main TiddlyWiki file. You can edit the tags and fields but cannot directly edit the content itself
 Body/Placeholder: Type the text for this tiddler
 Body/Preview/Type/Output: output

core/language/en-GB/Fields.multids

@@ -1,13 +1,10 @@
 title: $:/language/Docs/Fields/
 
 _canonical_uri: The full URI of an external image tiddler
-author: Name of the author of a plugin
 bag: The name of the bag from which a tiddler came
 caption: The text to be displayed on a tab or button
-code-body: The view template will display the tiddler as code if set to ''yes''
 color: The CSS color value associated with a tiddler
 component: The name of the component responsible for an [[alert tiddler|AlertMechanism]]
-core-version: For a plugin, indicates what version of TiddlyWiki with which it is compatible
 current-tiddler: Used to cache the top tiddler in a [[history list|HistoryMechanism]]
 created: The date a tiddler was created
 creator: The name of the person who created a tiddler
@@ -15,29 +12,27 @@ dependents: For a plugin, lists the dependent plugin titles
 description: The descriptive text for a plugin, or a modal dialogue
 draft.of: For draft tiddlers, contains the title of the tiddler of which this is a draft
 draft.title: For draft tiddlers, contains the proposed new title of the tiddler
-footer: The footer text for a modal
-hide-body: The view template will hide bodies of tiddlers if set to ''yes''
+footer: The footer text for a wizard
+hide-body: The view template will hide bodies of tiddlers if set to: ''yes''
 icon: The title of the tiddler containing the icon associated with a tiddler
-library: Indicates that a tiddler should be saved as a JavaScript library if set to ''yes''
+library: Indicates that a tiddler should be saved as a JavaScript library if set to: ''yes''
 list: An ordered list of tiddler titles associated with a tiddler
 list-before: If set, the title of a tiddler before which this tiddler should be added to the ordered list of tiddler titles, or at the start of the list if this field is present but empty
 list-after: If set, the title of the tiddler after which this tiddler should be added to the ordered list of tiddler titles, or at the end of the list if this field is present but empty
 modified: The date and time at which a tiddler was last modified
 modifier: The tiddler title associated with the person who last modified a tiddler
-module-type: For javascript tiddlers, specifies what kind of module it is
 name: The human readable name associated with a plugin tiddler
-parent-plugin: For a plugin, specifies which plugin of which it is a sub-plugin
 plugin-priority: A numerical value indicating the priority of a plugin tiddler
 plugin-type: The type of plugin in a plugin tiddler
 revision: The revision of the tiddler held at the server
 released: Date of a TiddlyWiki release
 source: The source URL associated with a tiddler
-subtitle: The subtitle text for a modal
+subtitle: The subtitle text for a wizard
 tags: A list of tags associated with a tiddler
 text: The body text of a tiddler
 throttle.refresh: If present, throttles refreshes of this tiddler
 title: The unique name of a tiddler
-toc-link: Suppresses the tiddler's link in a Table of Contents tree if set to ''no'' 
+toc-link: Suppresses the tiddler's link in a Table of Contents tree if set to: ''no'' 
 type: The content type of a tiddler
 version: Version information for a plugin
 _is_skinny: If present, indicates that the tiddler text field must be loaded from the server

core/language/en-GB/GettingStarted.tid

@@ -9,10 +9,9 @@ Before you start storing important information in ~TiddlyWiki it is vital to mak
 
 <div class="tc-control-panel">
 
-|tc-table-no-border tc-first-col-min-width tc-first-link-nowrap|k
-| <$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link>|<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
-| <$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link>|<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
-|^ <$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link><br><<lingo DefaultTiddlers/TopHint>>|<$edit tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
+|<$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
+|<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
+|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
 </div>
 
 See the [[control panel|$:/ControlPanel]] for more options.

core/language/en-GB/Help/commands.tid

@@ -1,18 +0,0 @@
-title: $:/language/Help/commands
-description: Run commands returned from a filter
-
-Sequentially run the command tokens returned from a filter
-
-```
---commands <filter>
-```
-
-Examples
-
-```
---commands "[enlist{$:/build-commands-as-text}]"
-```
-
-```
---commands "[{$:/build-commands-as-json}jsonindexes[]] :map[{$:/build-commands-as-json}jsonget<currentTiddler>]"
-```

core/language/en-GB/Help/default.tid

@@ -3,7 +3,6 @@ title: $:/language/Help/default
 \define commandTitle()
 $:/language/Help/$(command)$
 \end
-\whitespace trim
 ```
 usage: tiddlywiki [<wikifolder>] [--<command> [<args>...]...]
 ```
@@ -12,9 +11,7 @@ Available commands:
 
 <ul>
 <$list filter="[commands[]sort[title]]" variable="command">
-<li><$link to=<<commandTitle>>><$macrocall $name="command" $type="text/plain" $output="text/plain"/></$link>:
-&#32;
-<$transclude tiddler=<<commandTitle>> field="description"/></li>
+<li><$link to=<<commandTitle>>><$macrocall $name="command" $type="text/plain" $output="text/plain"/></$link>: <$transclude tiddler=<<commandTitle>> field="description"/></li>
 </$list>
 </ul>
 

core/language/en-GB/Help/pipe.tid

@@ -0,0 +1,13 @@
+title: $:/language/Help/pipe
+description: Pipe data to/from external processes
+
+Pipe data to/from external processes.
+
+```
+--pipe <pipename> <filter> <incomingTitle> <arguments>...
+```
+
+* ''pipename'': identifies the pipe, matching the name defined in the `tiddlywiki.info` file
+* ''filter'': identifies the tiddlers to be passed to the pipe
+* ''incomingTitle'': provides a title to be applied to incoming tiddlers for the `raw-text` output format
+* ''arguments'': passed through to external task pipes, and ignored for other types of pipe

core/language/en-GB/Help/render.tid

@@ -31,5 +31,5 @@ Notes:
 
 Examples:
 
-* `--render '[!is[system]]' '[encodeuricomponent[]addprefix[tiddlers/]addsuffix[.html]]'` -- renders all non-system tiddlers as files in the subdirectory "tiddlers" with URL-encoded titles and the extension HTML
-* `--render '.' 'tiddlers.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' '[tag[HelloThere]]'` -- renders the tiddlers tagged "HelloThere" to a JSON file named "tiddlers.json"
+* `--render "[!is[system]]" "[encodeuricomponent[]addprefix[tiddlers/]addsuffix[.html]]"` -- renders all non-system tiddlers as files in the subdirectory "tiddlers" with URL-encoded titles and the extension HTML
+

core/language/en-GB/Misc.multids

@@ -8,14 +8,13 @@ CloseAll/Button: close all
 ColourPicker/Recent: Recent:
 ConfirmCancelTiddler: Do you wish to discard changes to the tiddler "<$text text=<<title>>/>"?
 ConfirmDeleteTiddler: Do you wish to delete the tiddler "<$text text=<<title>>/>"?
-ConfirmDeleteTiddlers: Are you sure you wish to delete <<resultCount>> tiddler(s)?
 ConfirmOverwriteTiddler: Do you wish to overwrite the tiddler "<$text text=<<title>>/>"?
 ConfirmEditShadowTiddler: You are about to edit a ShadowTiddler. Any changes will override the default system making future upgrades non-trivial. Are you sure you want to edit "<$text text=<<title>>/>"?
 ConfirmAction: Do you wish to proceed?
 Count: count
 DefaultNewTiddlerTitle: New Tiddler
 Diffs/CountMessage: <<diff-count>> differences
-DropMessage: Drop now (or use the 'Escape' key to cancel)
+DropMessage: Drop here (or use the 'Escape' key to cancel)
 Encryption/Cancel: Cancel
 Encryption/ConfirmClearPassword: Do you wish to clear the password? This will remove the encryption applied when saving this wiki
 Encryption/PromptSetPassword: Set a new password for this TiddlyWiki
@@ -40,7 +39,6 @@ Error/RetrievingSkinny: Error retrieving skinny tiddler list
 Error/SavingToTWEdit: Error saving to TWEdit
 Error/WhileSaving: Error while saving
 Error/XMLHttpRequest: XMLHttpRequest error code
-Error/ZoominTextNode: Story View Error: It appears you tried to interact with a tiddler that displays in a custom container. This is most likely caused by using `$:/tags/StoryTiddlerTemplateFilter` with a template that contains text or whitespace at the start. Please use the pragma `\whitespace trim` and ensure the whole contents of the tiddler is wrapped in a single HTML element. The text that caused this issue:
 InternalJavaScriptError/Title: Internal JavaScript Error
 InternalJavaScriptError/Hint: Well, this is embarrassing. It is recommended that you restart TiddlyWiki by refreshing your browser
 LayoutSwitcher/Description: Open the layout switcher

core/language/en-GB/Modals/SaveInstructions.tid

@@ -0,0 +1,21 @@
+title: $:/language/Modals/SaveInstructions
+subtitle: Save your work
+footer: <$button message="tm-close-tiddler">Close</$button>
+help: https://tiddlywiki.com/static/SavingChanges.html
+
+Your changes to this wiki need to be saved as a ~TiddlyWiki HTML file.
+
+!!! Desktop browsers
+
+# Select ''Save As'' from the ''File'' menu
+# Choose a filename and location
+#* Some browsers also require you to explicitly specify the file saving format as ''Webpage, HTML only'' or similar
+# Close this tab
+
+!!! Smartphone browsers
+
+# Create a bookmark to this page
+#* If you've got iCloud or Google Sync set up then the bookmark will automatically sync to your desktop where you can open it and save it as above
+# Close this tab
+
+//If you open the bookmark again in Mobile Safari you will see this message again. If you want to go ahead and use the file, just click the ''close'' button below//

core/language/en-GB/SideBar.multids

@@ -1,6 +1,5 @@
 title: $:/language/SideBar/
 
-Caption: Sidebar
 All/Caption: All
 Contents/Caption: Contents
 Drafts/Caption: Drafts

core/messages.multids

@@ -1,6 +0,0 @@
-title: $:/core/_temp_allowDuplicates/
-
-Heading: Important Warning
-Warning: This is a special prerelease version of TW5 for experimenting with a potentially incompatible change to the core logic of filter processing. It is only intended to be used for evaluation and testing
-StatusOff: The allow duplicates setting is currently: OFF
-StatusOn: The allow duplicates setting is currently: ON

core/modules/commands/commands.js

@@ -1,42 +0,0 @@
-/*\
-title: $:/core/modules/commands/commands.js
-type: application/javascript
-module-type: command
-
-Runs the commands returned from a filter
-
-\*/
-
-(function() {
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-exports.info = {
-	name: "commands",
-	synchronous: true
-};
-
-var Command = function(params, commander) {
-	this.params = params;
-	this.commander = commander;
-};
-
-Command.prototype.execute = function() {
-	// Parse the filter
-	var filter = this.params[0];
-	if(!filter) {
-		return "No filter specified";
-	}
-	var commands = this.commander.wiki.filterTiddlers(filter)
-	if(commands.length === 0) {
-		return "No tiddlers found for filter '" + filter + "'";
-	}
-	this.commander.addCommandTokens(commands);
-	return null;
-};
-
-exports.Command = Command;
-
-})();

core/modules/commands/init.js

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

core/modules/commands/pipe.js

@@ -0,0 +1,278 @@
+/*\
+title: $:/core/modules/commands/pipe.js
+type: application/javascript
+module-type: command
+
+Command to execute an external task
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+exports.info = {
+	name: "pipe",
+	synchronous: false
+};
+
+var Command = function(params,commander,callback) {
+	this.params = params;
+	this.commander = commander;
+	this.callback = callback;
+};
+
+Command.prototype.execute = function() {
+	var self = this;
+	if(this.params.length < 2) {
+		return "Missing parameters";
+	}
+	var name = self.params[0], // External pipe name
+		outgoingFilter = self.params[1], // Filter of tiddlers to write to the pipe
+		incomingTitle = self.params[2],
+		args = self.params.slice(3); // Remaining arguments are passed on as tasks arguments
+	// Find the pipe information
+	var pipeInfo = ($tw.boot.wikiInfo["external-pipes"] || {})[name];
+	if(!pipeInfo) {
+		return this.callback("External pipe \"" + name + "\" not found");
+	}
+	// Create the pipe instance and process a message
+	var pipe = new Pipe({
+		name: name,
+		pipeInfo: pipeInfo,
+		outgoingFilter: outgoingFilter,
+		incomingTitle: incomingTitle,
+		args: args,
+		command: this
+	});
+	pipe.processMessage(this.callback);
+};
+
+function Pipe(options) {
+	this.name = options.name;
+	this.pipeInfo = options.pipeInfo;
+	this.outgoingFilter = options.outgoingFilter;
+	this.incomingTitle = options.incomingTitle;
+	this.args = options.args;
+	this.command = options.command;
+}
+
+Pipe.prototype.processMessage = function(callback) {
+	// Get the outgoing data
+	var data = this.composeOutgoingData(this.outgoingFilter);
+	// Connect to the pipe
+	switch(this.pipeInfo.type) {
+		case "task":
+			this.pipeExternalTask(data,callback);
+			break;
+		case "socket":
+			this.pipeSocket(data,callback);
+			break;
+		case "socket-erlang":
+			this.pipeSocketErlang(data,callback);
+			break;
+		default:
+			callback("Invalid pipe specifier '" + this.name + "': " + this.pipeInfo.type);
+			break;
+	}
+};
+
+Pipe.prototype.log = function(args) {
+	this.command.commander.log("Pipe: " + Array.prototype.slice.call(arguments,0).join(" "));
+};
+
+Pipe.prototype.pipeExternalTask = function(data,callback) {
+	var self = this,
+		spawn = require("child_process").spawn,
+		path = require("path"),
+		childProcess = spawn(path.resolve($tw.boot.wikiPath,this.pipeInfo.path),this.args,{
+			stdio: ["pipe","pipe",process.stderr],
+			shell: true,
+			env: $tw.utils.extend({},process.env,this.pipeInfo.environment)
+		});
+	// Pass the tiddlers over the outgoing stream
+	childProcess.stdin.on("error",function(err) {
+		self.log("Task stdin error",err)
+	});
+	childProcess.stdin.write(data);
+	childProcess.stdin.end();
+	// Catch the output
+	var chunks = [];
+	childProcess.stdout.on("data",function(chunk) {
+		chunks.push(chunk.toString());
+	});
+	childProcess.stdout.on("close",function() {
+		self.log("Task stdout close");
+		self.processIncomingData(chunks.join(""));
+	});
+	childProcess.stdout.on("error",function(err) {
+		self.log("Task stdout error",err)
+	});
+	// Pick up the output when the process ends
+	childProcess.on("error",function(err) {
+		self.log("Task error",err)
+	});
+	childProcess.on("exit",function(code,signal) {
+		self.log("Task exit",code,signal)
+		if(code !== 0) {
+			return callback("Error executing external task: " + code);
+		}
+		// Exit successfully
+		callback(null);
+	});
+};
+
+Pipe.prototype.pipeSocket = function(data,callback) {
+	var self = this,
+		net = require("net"),
+		socket = new net.Socket({
+			allowHalfOpen: true
+		}),
+		chunks = [];
+	socket.connect(this.pipeInfo.port,this.pipeInfo.host || 8081,function() {
+		self.log("Socket connection",this.pipeInfo.port,this.pipeInfo.host);
+		socket.write(data);
+		socket.end();
+	});
+	socket.on("error",function(e) {
+		self.log("Socket error",e)
+	});
+	socket.on("data",function(data) {
+		chunks.push(data.toString());
+	});
+	socket.on("end",function() {
+		self.processIncomingData(chunks.join(""));
+		self.log("Socket end");
+		socket.destroy();
+	});
+	// Add a "close" event handler for the client socket
+	socket.on("close",function() {
+		self.log("Socket closed");
+		return callback(null);
+	});
+	return null;
+};
+
+Pipe.prototype.pipeSocketErlang = function(data,callback) {
+	var self = this,
+		encoding = this.pipeInfo.encoding || "utf8",
+		net = require("net"),
+		socket = new net.Socket(),
+		accumulator = Buffer.alloc(0);
+	socket.connect(this.pipeInfo.port,this.pipeInfo.host || 8081,function() {
+		self.log("Socket connection",self.pipeInfo.port,self.pipeInfo.host);
+		var dataBytes = Buffer.from(data,encoding);
+		// Write 32-bit big endian message length
+		var lengthBytes = Buffer.alloc(4);
+		lengthBytes.writeUInt32BE(dataBytes.length + 1,0)
+console.log("Writing bytes",dataBytes.length + 1);
+		socket.write(lengthBytes);
+		// Write 8-bit type
+		var typeByte = Buffer.alloc(1);
+		typeByte.writeUInt8(1,0);
+		socket.write(typeByte);
+		// Write data
+		socket.write(dataBytes);
+	});
+	socket.on("error",function(e) {
+		self.log("Socket error",e)
+	});
+	socket.on("data",function(data) {
+console.log("Received data",data.length)
+		accumulator = Buffer.concat([accumulator,data]);
+		while(accumulator.length > 4) {
+			var length = accumulator.readInt32BE(0);
+			if(accumulator.length >= (length + 4)) {
+				if(length < 1) {
+					throw "ERROR: Incoming message length field is less than 1";
+				}
+				var type = accumulator.readUInt8(4),
+					dataLength = length - 1,
+					data = accumulator.toString(encoding,5,dataLength + 5);
+console.log("Got message",length,type)
+				self.processIncomingData(data);
+				accumulator = accumulator.slice(length + 4);
+socket.end();
+return callback(null);
+			} else {
+				break;
+			}
+		}
+	});
+	socket.on("end",function() {
+		self.log("Socket end");
+		socket.destroy();
+	});
+	// Add a "close" event handler for the client socket
+	socket.on("close",function() {
+		self.log("Socket closed");
+		return callback(null);
+	});
+	return null;
+};
+
+Pipe.prototype.composeOutgoingData = function(outgoingFilter) {
+	var self = this,
+		pipeInfoInput = this.pipeInfo.input || {},
+		data;
+	switch(pipeInfoInput.format || "json-raw-tiddlers") {
+		case "rendered-text":
+			var titles = self.command.commander.wiki.filterTiddlers(outgoingFilter),
+				output = [];
+			$tw.utils.each(titles,function(title) {
+				output.push(self.command.commander.wiki.renderTiddler("text/plain",title));
+			});
+			data = output.join("");
+			break;
+		case "json-rendered-text-tiddlers":
+			var titles = self.command.commander.wiki.filterTiddlers(outgoingFilter),
+				tiddlers = [];
+			$tw.utils.each(titles,function(title) {
+				tiddlers.push({
+					title: title,
+					text: self.command.commander.wiki.renderTiddler("text/plain",title)
+				})
+			});
+			data = JSON.stringify(tiddlers); 
+			break;
+		case "json-raw-tiddlers":
+			// Intentional fall-through
+		default:
+			data = this.command.commander.wiki.getTiddlersAsJson(outgoingFilter);
+			break;
+	}
+	return data;
+};
+
+Pipe.prototype.processIncomingData = function(data) {
+	var pipeInfoOutput = this.pipeInfo.output || {},
+		jsonData;
+	switch(pipeInfoOutput.format || "text") {
+		case "json-raw-tiddlers":
+			try {
+				jsonData = JSON.parse(data);
+			} catch(e) {
+				this.log("Error parsing returned JSON: " + e + "\n\n\n->\n" + data);
+			}
+			// Add the tiddlers
+			if(jsonData) {
+				this.command.commander.wiki.addTiddlers(jsonData);				
+			}
+			break;
+		case "text":
+			// Intentional fall-through
+		default:
+console.log("Writing tiddler",pipeInfoOutput.tiddler,{
+				text: data, title: this.incomingTitle
+			})
+			this.command.commander.wiki.addTiddler(new $tw.Tiddler(pipeInfoOutput.tiddler,{
+				text: data, title: this.incomingTitle || pipeInfoOutput.tiddler.title
+			}));
+			break;
+	}
+};
+
+exports.Command = Command;
+
+})();

core/modules/commands/render.js

@@ -50,7 +50,7 @@ Render individual tiddlers and save the results to the specified files
 				console.log("Rendering \"" + title + "\" to \"" + filepath + "\"");
 			}
 			var parser = wiki.parseTiddler(template || title),
-				widgetNode = wiki.makeWidget(parser,{variables: $tw.utils.extend({},variables,{currentTiddler: title,storyTiddler: title})}),
+				widgetNode = wiki.makeWidget(parser,{variables: $tw.utils.extend({},variables,{currentTiddler: title})}),
 				container = $tw.fakeDocument.createElement("div");
 			widgetNode.render(container,null);
 			var text = type === "text/html" ? container.innerHTML : container.textContent;

core/modules/commands/rendertiddler.js

@@ -40,7 +40,6 @@ Command.prototype.execute = function() {
 	$tw.utils.createFileDirectories(filename);
 	if(template) {
 		variables.currentTiddler = title;
-		variables.storyTiddler = title;
 		title = template;
 	}
 	if(name && value) {

core/modules/commands/rendertiddlers.js

@@ -46,7 +46,7 @@ Command.prototype.execute = function() {
 	}
 	$tw.utils.each(tiddlers,function(title) {
 		var parser = wiki.parseTiddler(template),
-			widgetNode = wiki.makeWidget(parser,{variables: {currentTiddler: title, storyTiddler: title}}),
+			widgetNode = wiki.makeWidget(parser,{variables: {currentTiddler: title}}),
 			container = $tw.fakeDocument.createElement("div");
 		widgetNode.render(container,null);
 		var text = type === "text/html" ? container.innerHTML : container.textContent,
@@ -57,7 +57,7 @@ Command.prototype.execute = function() {
 				exportPath = path.resolve(outputPath,macroPath + extension);
 			}
 		}
-		var finalPath = exportPath || path.resolve(pathname,$tw.utils.encodeURIComponentExtended(title) + extension);
+		var finalPath = exportPath || path.resolve(pathname,encodeURIComponent(title) + extension);
 		$tw.utils.createFileDirectories(finalPath);
 		fs.writeFileSync(finalPath,text,"utf8");
 	});

core/modules/commands/save.js

@@ -8,60 +8,46 @@ Saves individual tiddlers in their raw text or binary format to the specified fi
 \*/
 (function(){
 
-	/*jslint node: true, browser: true */
-	/*global $tw: false */
-	"use strict";
-	
-	exports.info = {
-		name: "save",
-		synchronous: true
-	};
-	
-	var Command = function(params,commander,callback) {
-		this.params = params;
-		this.commander = commander;
-		this.callback = callback;
-	};
-	
-	Command.prototype.execute = function() {
-		if(this.params.length < 1) {
-			return "Missing filename filter";
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+exports.info = {
+	name: "save",
+	synchronous: true
+};
+
+var Command = function(params,commander,callback) {
+	this.params = params;
+	this.commander = commander;
+	this.callback = callback;
+};
+
+Command.prototype.execute = function() {
+	if(this.params.length < 1) {
+		return "Missing filename filter";
+	}
+	var self = this,
+		fs = require("fs"),
+		path = require("path"),
+		wiki = this.commander.wiki,
+		tiddlerFilter = this.params[0],
+		filenameFilter = this.params[1] || "[is[tiddler]]",
+		tiddlers = wiki.filterTiddlers(tiddlerFilter);
+	$tw.utils.each(tiddlers,function(title) {
+		var tiddler = self.commander.wiki.getTiddler(title),
+			type = tiddler.fields.type || "text/vnd.tiddlywiki",
+			contentTypeInfo = $tw.config.contentTypeInfo[type] || {encoding: "utf8"},
+			filepath = path.resolve(self.commander.outputPath,wiki.filterTiddlers(filenameFilter,$tw.rootWidget,wiki.makeTiddlerIterator([title]))[0]);
+		if(self.commander.verbose) {
+			console.log("Saving \"" + title + "\" to \"" + filepath + "\"");
 		}
-		var self = this,
-			fs = require("fs"),
-			path = require("path"),
-			result = null,
-			wiki = this.commander.wiki,
-			tiddlerFilter = this.params[0],
-			filenameFilter = this.params[1] || "[is[tiddler]]",
-			tiddlers = wiki.filterTiddlers(tiddlerFilter);
-		$tw.utils.each(tiddlers,function(title) {
-			if(!result) {
-				var tiddler = self.commander.wiki.getTiddler(title);
-				if(tiddler) {
-					var fileInfo = $tw.utils.generateTiddlerFileInfo(tiddler,{
-						directory: path.resolve(self.commander.outputPath),
-						pathFilters: [filenameFilter],
-						wiki: wiki,
-						fileInfo: {}
-					});
-					if(self.commander.verbose) {
-						console.log("Saving \"" + title + "\" to \"" + fileInfo.filepath + "\"");
-					}
-					try {
-						$tw.utils.saveTiddlerToFileSync(tiddler,fileInfo);
-					} catch (err) {
-						result = "Error saving tiddler \"" + title + "\", to file: \"" + fileInfo.filepath + "\"";
-					}
-				} else {
-					result = "Tiddler '" + title + "' not found";
-				}
-			}
-		});
-		return result;
-	};
-	
-	exports.Command = Command;
-	
-	})();
-	
+		$tw.utils.createFileDirectories(filepath);
+		fs.writeFileSync(filepath,tiddler.fields.text,contentTypeInfo.encoding);
+	});
+	return null;
+};
+
+exports.Command = Command;
+
+})();

core/modules/commands/savelibrarytiddlers.js

@@ -65,11 +65,11 @@ Command.prototype.execute = function() {
 	$tw.utils.each(filteredPluginList,function(title) {
 		var tiddler = containerData.tiddlers[title];
 		// Save each JSON file and collect the skinny data
-		var pathname = path.resolve(self.commander.outputPath,basepath + $tw.utils.encodeURIComponentExtended(title) + ".json");
+		var pathname = path.resolve(self.commander.outputPath,basepath + encodeURIComponent(title) + ".json");
 		$tw.utils.createFileDirectories(pathname);
 		fs.writeFileSync(pathname,JSON.stringify(tiddler),"utf8");
 		// Collect the skinny list data
-		var pluginTiddlers = $tw.utils.parseJSONSafe(tiddler.text),
+		var pluginTiddlers = JSON.parse(tiddler.text),
 			readmeContent = (pluginTiddlers.tiddlers[title + "/readme"] || {}).text,
 			doesRequireReload = !!self.commander.wiki.doesPluginInfoRequireReload(pluginTiddlers),
 			iconTiddler = pluginTiddlers.tiddlers[title + "/icon"] || {},

core/modules/commands/savetiddlers.js

@@ -45,7 +45,7 @@ Command.prototype.execute = function() {
 		var tiddler = self.commander.wiki.getTiddler(title),
 			type = tiddler.fields.type || "text/vnd.tiddlywiki",
 			contentTypeInfo = $tw.config.contentTypeInfo[type] || {encoding: "utf8"},
-			filename = path.resolve(pathname,$tw.utils.encodeURIComponentExtended(title));
+			filename = path.resolve(pathname,encodeURIComponent(title));
 		fs.writeFileSync(filename,tiddler.fields.text,contentTypeInfo.encoding);
 	});
 	return null;

core/modules/commands/savewikifolder.js

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

core/modules/config.js

@@ -30,7 +30,7 @@ exports.textPrimitives.wikiLink = exports.textPrimitives.upperLetter + "+" +
 	exports.textPrimitives.upperLetter +
 	exports.textPrimitives.anyLetter + "*";
 
-exports.htmlEntities = {quot:34, dollar:36, amp:38, apos:39, lt:60, gt:62, nbsp:160, iexcl:161, cent:162, pound:163, curren:164, yen:165, brvbar:166, sect:167, uml:168, copy:169, ordf:170, laquo:171, not:172, shy:173, reg:174, macr:175, deg:176, plusmn:177, sup2:178, sup3:179, acute:180, micro:181, para:182, middot:183, cedil:184, sup1:185, ordm:186, raquo:187, frac14:188, frac12:189, frac34:190, iquest:191, Agrave:192, Aacute:193, Acirc:194, Atilde:195, Auml:196, Aring:197, AElig:198, Ccedil:199, Egrave:200, Eacute:201, Ecirc:202, Euml:203, Igrave:204, Iacute:205, Icirc:206, Iuml:207, ETH:208, Ntilde:209, Ograve:210, Oacute:211, Ocirc:212, Otilde:213, Ouml:214, times:215, Oslash:216, Ugrave:217, Uacute:218, Ucirc:219, Uuml:220, Yacute:221, THORN:222, szlig:223, agrave:224, aacute:225, acirc:226, atilde:227, auml:228, aring:229, aelig:230, ccedil:231, egrave:232, eacute:233, ecirc:234, euml:235, igrave:236, iacute:237, icirc:238, iuml:239, eth:240, ntilde:241, ograve:242, oacute:243, ocirc:244, otilde:245, ouml:246, divide:247, oslash:248, ugrave:249, uacute:250, ucirc:251, uuml:252, yacute:253, thorn:254, yuml:255, OElig:338, oelig:339, Scaron:352, scaron:353, Yuml:376, fnof:402, circ:710, tilde:732, Alpha:913, Beta:914, Gamma:915, Delta:916, Epsilon:917, Zeta:918, Eta:919, Theta:920, Iota:921, Kappa:922, Lambda:923, Mu:924, Nu:925, Xi:926, Omicron:927, Pi:928, Rho:929, Sigma:931, Tau:932, Upsilon:933, Phi:934, Chi:935, Psi:936, Omega:937, alpha:945, beta:946, gamma:947, delta:948, epsilon:949, zeta:950, eta:951, theta:952, iota:953, kappa:954, lambda:955, mu:956, nu:957, xi:958, omicron:959, pi:960, rho:961, sigmaf:962, sigma:963, tau:964, upsilon:965, phi:966, chi:967, psi:968, omega:969, thetasym:977, upsih:978, piv:982, ensp:8194, emsp:8195, thinsp:8201, zwnj:8204, zwj:8205, lrm:8206, rlm:8207, ndash:8211, mdash:8212, lsquo:8216, rsquo:8217, sbquo:8218, ldquo:8220, rdquo:8221, bdquo:8222, dagger:8224, Dagger:8225, bull:8226, hellip:8230, permil:8240, prime:8242, Prime:8243, lsaquo:8249, rsaquo:8250, oline:8254, frasl:8260, euro:8364, image:8465, weierp:8472, real:8476, trade:8482, alefsym:8501, larr:8592, uarr:8593, rarr:8594, darr:8595, harr:8596, crarr:8629, lArr:8656, uArr:8657, rArr:8658, dArr:8659, hArr:8660, forall:8704, part:8706, exist:8707, empty:8709, nabla:8711, isin:8712, notin:8713, ni:8715, prod:8719, sum:8721, minus:8722, lowast:8727, radic:8730, prop:8733, infin:8734, ang:8736, and:8743, or:8744, cap:8745, cup:8746, int:8747, there4:8756, sim:8764, cong:8773, asymp:8776, ne:8800, equiv:8801, le:8804, ge:8805, sub:8834, sup:8835, nsub:8836, sube:8838, supe:8839, oplus:8853, otimes:8855, perp:8869, sdot:8901, lceil:8968, rceil:8969, lfloor:8970, rfloor:8971, lang:9001, rang:9002, loz:9674, spades:9824, clubs:9827, hearts:9829, diams:9830 };
+exports.htmlEntities = {quot:34, amp:38, apos:39, lt:60, gt:62, nbsp:160, iexcl:161, cent:162, pound:163, curren:164, yen:165, brvbar:166, sect:167, uml:168, copy:169, ordf:170, laquo:171, not:172, shy:173, reg:174, macr:175, deg:176, plusmn:177, sup2:178, sup3:179, acute:180, micro:181, para:182, middot:183, cedil:184, sup1:185, ordm:186, raquo:187, frac14:188, frac12:189, frac34:190, iquest:191, Agrave:192, Aacute:193, Acirc:194, Atilde:195, Auml:196, Aring:197, AElig:198, Ccedil:199, Egrave:200, Eacute:201, Ecirc:202, Euml:203, Igrave:204, Iacute:205, Icirc:206, Iuml:207, ETH:208, Ntilde:209, Ograve:210, Oacute:211, Ocirc:212, Otilde:213, Ouml:214, times:215, Oslash:216, Ugrave:217, Uacute:218, Ucirc:219, Uuml:220, Yacute:221, THORN:222, szlig:223, agrave:224, aacute:225, acirc:226, atilde:227, auml:228, aring:229, aelig:230, ccedil:231, egrave:232, eacute:233, ecirc:234, euml:235, igrave:236, iacute:237, icirc:238, iuml:239, eth:240, ntilde:241, ograve:242, oacute:243, ocirc:244, otilde:245, ouml:246, divide:247, oslash:248, ugrave:249, uacute:250, ucirc:251, uuml:252, yacute:253, thorn:254, yuml:255, OElig:338, oelig:339, Scaron:352, scaron:353, Yuml:376, fnof:402, circ:710, tilde:732, Alpha:913, Beta:914, Gamma:915, Delta:916, Epsilon:917, Zeta:918, Eta:919, Theta:920, Iota:921, Kappa:922, Lambda:923, Mu:924, Nu:925, Xi:926, Omicron:927, Pi:928, Rho:929, Sigma:931, Tau:932, Upsilon:933, Phi:934, Chi:935, Psi:936, Omega:937, alpha:945, beta:946, gamma:947, delta:948, epsilon:949, zeta:950, eta:951, theta:952, iota:953, kappa:954, lambda:955, mu:956, nu:957, xi:958, omicron:959, pi:960, rho:961, sigmaf:962, sigma:963, tau:964, upsilon:965, phi:966, chi:967, psi:968, omega:969, thetasym:977, upsih:978, piv:982, ensp:8194, emsp:8195, thinsp:8201, zwnj:8204, zwj:8205, lrm:8206, rlm:8207, ndash:8211, mdash:8212, lsquo:8216, rsquo:8217, sbquo:8218, ldquo:8220, rdquo:8221, bdquo:8222, dagger:8224, Dagger:8225, bull:8226, hellip:8230, permil:8240, prime:8242, Prime:8243, lsaquo:8249, rsaquo:8250, oline:8254, frasl:8260, euro:8364, image:8465, weierp:8472, real:8476, trade:8482, alefsym:8501, larr:8592, uarr:8593, rarr:8594, darr:8595, harr:8596, crarr:8629, lArr:8656, uArr:8657, rArr:8658, dArr:8659, hArr:8660, forall:8704, part:8706, exist:8707, empty:8709, nabla:8711, isin:8712, notin:8713, ni:8715, prod:8719, sum:8721, minus:8722, lowast:8727, radic:8730, prop:8733, infin:8734, ang:8736, and:8743, or:8744, cap:8745, cup:8746, int:8747, there4:8756, sim:8764, cong:8773, asymp:8776, ne:8800, equiv:8801, le:8804, ge:8805, sub:8834, sup:8835, nsub:8836, sube:8838, supe:8839, oplus:8853, otimes:8855, perp:8869, sdot:8901, lceil:8968, rceil:8969, lfloor:8970, rfloor:8971, lang:9001, rang:9002, loz:9674, spades:9824, clubs:9827, hearts:9829, diams:9830 };
 
 exports.htmlVoidElements = "area,base,br,col,command,embed,hr,img,input,keygen,link,meta,param,source,track,wbr".split(",");
 

core/modules/deserializers.js

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

core/modules/editor/engines/framed.js

@@ -34,10 +34,8 @@ function FramedEngine(options) {
 	this.parentNode.insertBefore(this.iframeNode,this.nextSibling);
 	this.iframeDoc = this.iframeNode.contentWindow.document;
 	// (Firefox requires us to put some empty content in the iframe)
-	var paletteTitle = this.widget.wiki.getTiddlerText("$:/palette");
-	var colorScheme = (this.widget.wiki.getTiddler(paletteTitle) || {fields: {}}).fields["color-scheme"] || "light";
 	this.iframeDoc.open();
-	this.iframeDoc.write("<meta name='color-scheme' content='" + colorScheme + "'>");
+	this.iframeDoc.write("");
 	this.iframeDoc.close();
 	// Style the iframe
 	this.iframeNode.className = this.dummyTextArea.className;
@@ -87,7 +85,7 @@ function FramedEngine(options) {
 	$tw.utils.addEventListeners(this.domNode,[
 		{name: "click",handlerObject: this,handlerMethod: "handleClickEvent"},
 		{name: "input",handlerObject: this,handlerMethod: "handleInputEvent"},
-		{name: "keydown",handlerObject: this,handlerMethod: "handleKeydownEvent"},
+		{name: "keydown",handlerObject: this.widget,handlerMethod: "handleKeydownEvent"},
 		{name: "focus",handlerObject: this,handlerMethod: "handleFocusEvent"}
 	]);
 	// Add drag and drop event listeners if fileDrop is enabled
@@ -177,11 +175,9 @@ FramedEngine.prototype.fixHeight = function() {
 Focus the engine node
 */
 FramedEngine.prototype.focus  = function() {
-	if(this.domNode.focus) {
+	if(this.domNode.focus && this.domNode.select) {
 		this.domNode.focus();
-	}
-	if(this.domNode.select) {
-		$tw.utils.setSelectionByPosition(this.domNode,this.widget.editFocusSelectFromStart,this.widget.editFocusSelectFromEnd);
+		this.domNode.select();
 	}
 };
 
@@ -194,17 +190,6 @@ FramedEngine.prototype.handleFocusEvent = function(event) {
 	}
 };
 
-/*
-Handle a keydown event
- */
-FramedEngine.prototype.handleKeydownEvent = function(event) {
-	if ($tw.keyboardManager.handleKeydownEvent(event, {onlyPriority: true})) {
-		return true;
-	}
-
-	return this.widget.handleKeydownEvent(event);
-};
-
 /*
 Handle a click
 */
@@ -220,7 +205,7 @@ FramedEngine.prototype.handleInputEvent = function(event) {
 	this.widget.saveChanges(this.getText());
 	this.fixHeight();
 	if(this.widget.editInputActions) {
-		this.widget.invokeActionString(this.widget.editInputActions,this,event,{actionValue: this.getText()});
+		this.widget.invokeActionString(this.widget.editInputActions);
 	}
 	return true;
 };

core/modules/editor/engines/simple.js

@@ -119,12 +119,10 @@ SimpleEngine.prototype.fixHeight = function() {
 /*
 Focus the engine node
 */
-SimpleEngine.prototype.focus = function() {
-	if(this.domNode.focus) {
+SimpleEngine.prototype.focus  = function() {
+	if(this.domNode.focus && this.domNode.select) {
 		this.domNode.focus();
-	}
-	if(this.domNode.select) {
-		$tw.utils.setSelectionByPosition(this.domNode,this.widget.editFocusSelectFromStart,this.widget.editFocusSelectFromEnd);
+		this.domNode.select();
 	}
 };
 
@@ -135,7 +133,7 @@ SimpleEngine.prototype.handleInputEvent = function(event) {
 	this.widget.saveChanges(this.getText());
 	this.fixHeight();
 	if(this.widget.editInputActions) {
-		this.widget.invokeActionString(this.widget.editInputActions,this,event,{actionValue: this.getText()});
+		this.widget.invokeActionString(this.widget.editInputActions);
 	}
 	return true;
 };

core/modules/editor/factory.js

@@ -115,7 +115,7 @@ function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) {
 				// Otherwise, we need to construct a default value for the editor
 				switch(this.editField) {
 					case "text":
-						value = "";
+						value = "Type the text for the tiddler '" + this.editTitle + "'";
 						type = "text/vnd.tiddlywiki";
 						break;
 					case "title":
@@ -180,8 +180,6 @@ function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) {
 		this.editMinHeight = this.getAttribute("minHeight",DEFAULT_MIN_TEXT_AREA_HEIGHT);
 		this.editFocusPopup = this.getAttribute("focusPopup");
 		this.editFocus = this.getAttribute("focus");
-		this.editFocusSelectFromStart = $tw.utils.parseNumber(this.getAttribute("focusSelectFromStart","0"));
-		this.editFocusSelectFromEnd = $tw.utils.parseNumber(this.getAttribute("focusSelectFromEnd","0"));
 		this.editTabIndex = this.getAttribute("tabindex");
 		this.editCancelPopups = this.getAttribute("cancelPopups","") === "yes";
 		this.editInputActions = this.getAttribute("inputActions");
@@ -220,7 +218,7 @@ function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) {
 	EditTextWidget.prototype.refresh = function(changedTiddlers) {
 		var changedAttributes = this.computeAttributes();
 		// Completely rerender if any of our attributes have changed
-		if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes["default"] || changedAttributes["class"] || changedAttributes.placeholder || changedAttributes.size || changedAttributes.autoHeight || changedAttributes.minHeight || changedAttributes.focusPopup ||  changedAttributes.rows || changedAttributes.tabindex || changedAttributes.cancelPopups || changedAttributes.inputActions || changedAttributes.refreshTitle || changedAttributes.autocomplete || changedTiddlers[HEIGHT_MODE_TITLE] || changedTiddlers[ENABLE_TOOLBAR_TITLE] || changedTiddlers["$:/palette"] || changedAttributes.disabled || changedAttributes.fileDrop) {
+		if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes["default"] || changedAttributes["class"] || changedAttributes.placeholder || changedAttributes.size || changedAttributes.autoHeight || changedAttributes.minHeight || changedAttributes.focusPopup ||  changedAttributes.rows || changedAttributes.tabindex || changedAttributes.cancelPopups || changedAttributes.inputActions || changedAttributes.refreshTitle || changedAttributes.autocomplete || changedTiddlers[HEIGHT_MODE_TITLE] || changedTiddlers[ENABLE_TOOLBAR_TITLE] || changedAttributes.disabled || changedAttributes.fileDrop) {
 			this.refreshSelf();
 			return true;
 		} else if (changedTiddlers[this.editRefreshTitle]) {
@@ -300,7 +298,7 @@ function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) {
 	Propogate keydown events to our container for the keyboard widgets benefit
 	*/
 	EditTextWidget.prototype.propogateKeydownEvent = function(event) {
-		var newEvent = this.cloneEvent(event,["keyCode","code","which","key","metaKey","ctrlKey","altKey","shiftKey"]);
+		var newEvent = this.cloneEvent(event,["keyCode","which","metaKey","ctrlKey","altKey","shiftKey"]);
 		return !this.parentDomNode.dispatchEvent(newEvent);
 	};
 
@@ -326,7 +324,7 @@ function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) {
 	If there are no Files, let the browser handle it.
 	*/
 	EditTextWidget.prototype.handleDropEvent = function(event) {
-		if($tw.utils.dragEventContainsFiles(event)) {
+		if(event.dataTransfer.files.length) {
 			event.preventDefault();
 			event.stopPropagation();
 			this.dispatchDOMEvent(this.cloneEvent(event,["dataTransfer"]));

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

@@ -25,8 +25,8 @@ exports["prefix-lines"] = function(event,operation) {
 	$tw.utils.each(lines,function(line,index) {
 		// Remove and count any existing prefix characters
 		var count = 0;
-		while($tw.utils.startsWith(line,event.paramObject.character)) {
-			line = line.substring(event.paramObject.character.length);
+		while(line.charAt(0) === event.paramObject.character) {
+			line = line.substring(1);
 			count++;
 		}
 		// Remove any whitespace

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

@@ -13,35 +13,16 @@ Text editor operation to wrap the selected lines with a prefix and suffix
 "use strict";
 
 exports["wrap-lines"] = function(event,operation) {
-	var prefix = event.paramObject.prefix || "",
-		suffix = event.paramObject.suffix || "";
-	if($tw.utils.endsWith(operation.text.substring(0,operation.selStart), prefix + "\n") &&
-			$tw.utils.startsWith(operation.text.substring(operation.selEnd), "\n" + suffix)) {
-		// Selected text is already surrounded by prefix and suffix: Remove them
-		// Cut selected text plus prefix and suffix
-		operation.cutStart = operation.selStart - (prefix.length + 1);
-		operation.cutEnd = operation.selEnd + suffix.length + 1;
-		// Also cut the following newline (if there is any)
-		if (operation.text[operation.cutEnd] === "\n") {
-			operation.cutEnd++;
-		}
-		// Replace with selection
-		operation.replacement = operation.text.substring(operation.selStart,operation.selEnd);
-		// Select text that was in between prefix and suffix
-		operation.newSelStart = operation.cutStart;
-		operation.newSelEnd = operation.selEnd - (prefix.length + 1);
-	} else {
-		// Cut just past the preceding line break, or the start of the text
-		operation.cutStart = $tw.utils.findPrecedingLineBreak(operation.text,operation.selStart);
-		// Cut to just past the following line break, or to the end of the text
-		operation.cutEnd = $tw.utils.findFollowingLineBreak(operation.text,operation.selEnd);
-		// Add the prefix and suffix
-		operation.replacement = prefix + "\n" +
-					operation.text.substring(operation.cutStart,operation.cutEnd) + "\n" +
-					suffix + "\n";
-		operation.newSelStart = operation.cutStart + prefix.length + 1;
-		operation.newSelEnd = operation.newSelStart + (operation.cutEnd - operation.cutStart);
-	}
+	// Cut just past the preceding line break, or the start of the text
+	operation.cutStart = $tw.utils.findPrecedingLineBreak(operation.text,operation.selStart);
+	// Cut to just past the following line break, or to the end of the text
+	operation.cutEnd = $tw.utils.findFollowingLineBreak(operation.text,operation.selEnd);
+	// Add the prefix and suffix
+	operation.replacement = event.paramObject.prefix + "\n" +
+				operation.text.substring(operation.cutStart,operation.cutEnd) + "\n" +
+				event.paramObject.suffix + "\n";
+	operation.newSelStart = operation.cutStart + event.paramObject.prefix.length + 1;
+	operation.newSelEnd = operation.newSelStart + (operation.cutEnd - operation.cutStart);
 };
 
 })();

core/modules/filterrunprefixes/cascade.js

@@ -1,53 +0,0 @@
-/*\
-title: $:/core/modules/filterrunprefixes/cascade.js
-type: application/javascript
-module-type: filterrunprefix
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-/*
-Export our filter prefix function
-*/
-exports.cascade = function(operationSubFunction,options) {
-	return function(results,source,widget) {
-		if(results.length !== 0) {
-			var filterList = operationSubFunction(source,widget),
-				filterFnList = [];
-			var inputResults = results.toArray();
-			results.clear();
-			$tw.utils.each(inputResults,function(title) {
-				var result = ""; // If no filter matches, we return an empty string
-				$tw.utils.each(filterList,function(filter,index) {
-					if(!filterFnList[index]) {
-						filterFnList[index] = options.wiki.compileFilter(filter);
-					}
-					var output = filterFnList[index](options.wiki.makeTiddlerIterator([title]),{
-						getVariable: function(name,opts) {
-							opts = opts || {};
-							opts.variables = {
-								"currentTiddler": "" + title,
-								"..currentTiddler": widget.getVariable("currentTiddler")
-							};
-							if(name in opts.variables) {
-								return opts.variables[name];
-							} else {
-								return widget.getVariable(name,opts);
-							}
-						}
-					});
-					if(output.length !== 0) {
-						result = output[0];
-						return false;
-					}
-				});
-				results.push(result);
-			});
-		}
-	}
-};
-
-})();

core/modules/filterrunprefixes/filter.js

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

core/modules/filterrunprefixes/map.js

@@ -15,37 +15,22 @@ Export our filter prefix function
 exports.map = function(operationSubFunction,options) {
 	return function(results,source,widget) {
 		if(results.length > 0) {
-			var inputTitles = results.toArray(),
-				index = 0,
-				suffixes = options.suffixes,
-				flatten = (suffixes[0] && suffixes[0][0] === "flat") ? true : false;
+			var inputTitles = results.toArray();
 			results.clear();
 			$tw.utils.each(inputTitles,function(title) {
 				var filtered = operationSubFunction(options.wiki.makeTiddlerIterator([title]),{
-					getVariable: function(name,opts) {
-						opts = opts || {};
-						opts.variables = {
-							"currentTiddler": "" + title,
-							"..currentTiddler": widget.getVariable("currentTiddler"),
-							"index": "" + index,
-							"revIndex": "" +  (inputTitles.length - 1 - index),
-							"length": "" + inputTitles.length
-						};
-						if(name in opts.variables) {
-							return opts.variables[name];
-						} else {
-							return widget.getVariable(name,opts);
+					getVariable: function(name) {
+						switch(name) {
+							case "currentTiddler":
+								return "" + title;
+							case "..currentTiddler":
+								return widget.getVariable("currentTiddler");
+							default:
+								return widget.getVariable(name);
 						}
 					}
 				});
-				if(filtered.length && flatten) {
-					$tw.utils.each(filtered,function(value) {
-						results.push(value);
-					})
-				} else {
-					results.push(filtered[0]||"");
-				}
-				++index;
+				results.push(filtered[0] || "");
 			});
 		}
 	}

core/modules/filterrunprefixes/reduce.js

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

core/modules/filterrunprefixes/sort.js

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

core/modules/filters.js

@@ -12,9 +12,6 @@ Adds tiddler filtering methods to the $tw.Wiki object.
 /*global $tw: false */
 "use strict";
 
-/* Maximum permitted filter recursion depth */
-var MAX_FILTER_DEPTH = 300;
-
 /*
 Parses an operation (i.e. a run) within a filter string
 	operators: Array of array of operator nodes into which results should be inserted
@@ -98,12 +95,10 @@ function parseFilterOperation(operators,filterString,p) {
 			if(nextBracketPos === -1) {
 				throw "Missing closing bracket in filter expression";
 			}
-			if(operator.regexp) {
-				operand.text = "";
-			} else {
+			if(!operator.regexp) {
 				operand.text = filterString.substring(p,nextBracketPos);
+				operator.operands.push(operand);
 			}
-			operator.operands.push(operand);
 			p = nextBracketPos + 1;
 		}
 
@@ -223,18 +218,10 @@ source: an iterator function for the source tiddlers, called source(iterator), w
 widget: an optional widget node for retrieving the current tiddler etc.
 */
 exports.compileFilter = function(filterString) {
-	if(!this.filterCache) {
-		this.filterCache = Object.create(null);
-		this.filterCacheCount = 0;
-	}
-	if(this.filterCache[filterString] !== undefined) {
-		return this.filterCache[filterString];
-	}
 	var filterParseTree;
 	try {
 		filterParseTree = this.parseFilter(filterString);
 	} catch(e) {
-		// We do not cache this result, so it adjusts along with localization changes
 		return function(source,widget) {
 			return [$tw.language.getString("Error/Filter") + ": " + e];
 		};
@@ -331,7 +318,7 @@ exports.compileFilter = function(filterString) {
 		})());
 	});
 	// Return a function that applies the operations to a source iterator of tiddler titles
-	var fnMeasured = $tw.perf.measure("filter: " + filterString,function filterFunction(source,widget) {
+	return $tw.perf.measure("filter: " + filterString,function filterFunction(source,widget) {
 		if(!source) {
 			source = self.each;
 		} else if(typeof source === "object") { // Array or hashmap
@@ -341,27 +328,11 @@ exports.compileFilter = function(filterString) {
 			widget = $tw.rootWidget;
 		}
 		var results = new $tw.utils.LinkedList();
-		self.filterRecursionCount = (self.filterRecursionCount || 0) + 1;
-		if(self.filterRecursionCount < MAX_FILTER_DEPTH) {
-			$tw.utils.each(operationFunctions,function(operationFunction) {
-				operationFunction(results,source,widget);
-			});
-		} else {
-			results.push("/**-- Excessive filter recursion --**/");
-		}
-		self.filterRecursionCount = self.filterRecursionCount - 1;
+		$tw.utils.each(operationFunctions,function(operationFunction) {
+			operationFunction(results,source,widget);
+		});
 		return results.toArray();
 	});
-	if(this.filterCacheCount >= 2000) {
-		// To prevent memory leak, we maintain an upper limit for cache size.
-		// Reset if exceeded. This should give us 95% of the benefit
-		// that no cache limit would give us.
-		this.filterCache = Object.create(null);
-		this.filterCacheCount = 0;
-	}
-	this.filterCache[filterString] = fnMeasured;
-	this.filterCacheCount++;
-	return fnMeasured;
 };
 
 })();

core/modules/filters/crypto.js

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

core/modules/filters/encodings.js

@@ -16,22 +16,6 @@ Filter operator for applying decodeURIComponent() to each item.
 Export our filter functions
 */
 
-exports.decodebase64 = function(source,operator,options) {
-	var results = [];
-	source(function(tiddler,title) {
-		results.push($tw.utils.base64Decode(title));
-	});
-	return results;
-};
-
-exports.encodebase64 = function(source,operator,options) {
-	var results = [];
-	source(function(tiddler,title) {
-		results.push($tw.utils.base64Encode(title));
-	});
-	return results;
-};
-
 exports.decodeuricomponent = function(source,operator,options) {
 	var results = [];
 	source(function(tiddler,title) {
@@ -43,7 +27,7 @@ exports.decodeuricomponent = function(source,operator,options) {
 exports.encodeuricomponent = function(source,operator,options) {
 	var results = [];
 	source(function(tiddler,title) {
-		results.push($tw.utils.encodeURIComponentExtended(title));
+		results.push(encodeURIComponent(title));
 	});
 	return results;
 };

core/modules/filters/filter.js

@@ -21,15 +21,14 @@ exports.filter = function(source,operator,options) {
 		target = operator.prefix !== "!";
 	source(function(tiddler,title) {
 		var list = filterFn.call(options.wiki,options.wiki.makeTiddlerIterator([title]),{
-				getVariable: function(name,opts) {
-					opts = opts || {};
+				getVariable: function(name) {
 					switch(name) {
 						case "currentTiddler":
 							return "" + title;
 						case "..currentTiddler":
 							return options.widget.getVariable("currentTiddler");
 						default:
-							return options.widget.getVariable(name,opts);
+							return options.widget.getVariable(name);
 					}
 				}
 			});

core/modules/filters/format/json.js

@@ -1,35 +0,0 @@
-/*\
-title: $:/core/modules/filters/format/json.js
-type: application/javascript
-module-type: formatfilteroperator
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-/*
-Export our filter function
-*/
-exports.json = function(source,operand,options) {
-	var results = [],
-		spaces = null;
-	if(operand) {
-		spaces = /^\d+$/.test(operand) ? parseInt(operand,10) : operand;
-	}
-	source(function(tiddler,title) {
-		var data = $tw.utils.parseJSONSafe(title);
-		try {
-			data = JSON.parse(title);
-		} catch(e) {
-			data = undefined;
-		}
-		if(data !== undefined) {
-			results.push(JSON.stringify(data,null,spaces));
-		}
-	});
-	return results;
-};
-
-})();

core/modules/filters/insertafter.js

@@ -1,46 +0,0 @@
-/*\
-title: $:/core/modules/filters/insertafter.js
-type: application/javascript
-module-type: filteroperator
-
-Insert an item after another item in a list
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-/*
-Order a list
-*/
-exports.insertafter = function(source,operator,options) {
-	var results = [];
-	source(function(tiddler,title) {
-		results.push(title);
-	});
-	var target = operator.operands[1] || (options.widget && options.widget.getVariable(operator.suffix || "currentTiddler"));
-	if(target !== operator.operand) {
-		// Remove the entry from the list if it is present
-		var pos = results.indexOf(operator.operand);
-		if(pos !== -1) {
-			results.splice(pos,1);
-		}
-		// Insert the entry after the target marker
-		pos = results.indexOf(target);
-		if(pos !== -1) {
-			results.splice(pos+1,0,operator.operand);
-		} else {
-			var suffix = operator.operands.length > 1 ? operator.suffix : "";
-			if(suffix === "start") {
-				results.splice(0,0,operator.operand);
-			} else {
-				results.push(operator.operand);
-			}
-		}
-	}
-	return results;
-};
-
-})();

core/modules/filters/insertbefore.js

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

core/modules/filters/is/draft.js

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

core/modules/filters/is/variable.js

@@ -19,13 +19,13 @@ exports.variable = function(source,prefix,options) {
 	var results = [];
 	if(prefix === "!") {
 		source(function(tiddler,title) {
-			if(options.widget.getVariable(title) === undefined) {
+			if(!(title in options.widget.variables)) {
 				results.push(title);
 			}
 		});
 	} else {
 		source(function(tiddler,title) {
-			if(options.widget.getVariable(title) !== undefined) {
+			if(title in options.widget.variables) {
 				results.push(title);
 			}
 		});

core/modules/filters/json-ops.js

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

core/modules/filters/listops.js

@@ -87,8 +87,7 @@ exports.butlast = function(source,operator,options) {
 	source(function(tiddler,title) {
 		results.push(title);
 	});
-	var index = count === 0 ? results.length : -count;
-	return results.slice(0,index);
+	return results.slice(0,-count);
 };
 exports.bl = exports.butlast;
 
@@ -104,16 +103,4 @@ exports.nth = function(source,operator,options) {
 	return results.slice(count - 1,count);
 };
 
-/*
-The zero based nth member of the list
-*/
-exports.zth = function(source,operator,options) {
-	var count = $tw.utils.getInt(operator.operand,0),
-		results = [];
-	source(function(tiddler,title) {
-		results.push(title);
-	});
-	return results.slice(count,count + 1);
-};
-
 })();

core/modules/filters/lookup.js

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

core/modules/filters/prefix.js

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

core/modules/filters/reduce.js

@@ -27,8 +27,7 @@ exports.reduce = function(source,operator,options) {
 	for(var index=0; index<results.length; index++) {
 		var title = results[index],
 			list = filterFn.call(options.wiki,options.wiki.makeTiddlerIterator([title]),{
-				getVariable: function(name,opts) {
-					opts = opts || {};
+				getVariable: function(name) {
 					switch(name) {
 						case "currentTiddler":
 							return "" + title;
@@ -43,7 +42,7 @@ exports.reduce = function(source,operator,options) {
 						case "length":
 							return "" + results.length;
 						default:
-							return options.widget.getVariable(name,opts);
+							return options.widget.getVariable(name);
 					}
 				}
 			});

core/modules/filters/removeprefix.js

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

core/modules/filters/removesuffix.js

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

core/modules/filters/search.js

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

core/modules/filters/sortsub.js

@@ -26,15 +26,14 @@ exports.sortsub = function(source,operator,options) {
 		var r = filterFn.call(options.wiki,function(iterator) {
 			iterator(options.wiki.getTiddler(title),title);
 		},{
-			getVariable: function(name,opts) {
-				opts = opts || {};
+			getVariable: function(name) {
 				switch(name) {
 					case "currentTiddler":
 						return "" + title;
 					case "..currentTiddler":
 						return options.widget.getVariable("currentTiddler");
 					default:
-						return options.widget.getVariable(name,opts);
+						return options.widget.getVariable(name);
 				}
 			}
 		});

core/modules/filters/strings.js

@@ -74,113 +74,6 @@ exports.join = makeStringReducingOperator(
 	},null
 );
 
-var dmp = require("$:/core/modules/utils/diff-match-patch/diff_match_patch.js");
-
-exports.levenshtein = makeStringBinaryOperator(
-	function(a,b) {
-		var dmpObject = new dmp.diff_match_patch(),
-			diffs = dmpObject.diff_main(a,b);
-		return [dmpObject.diff_levenshtein(diffs) + ""];
-	}
-);
-
-// these two functions are adapted from https://github.com/google/diff-match-patch/wiki/Line-or-Word-Diffs
-function diffLineWordMode(text1,text2,mode) {
-	var dmpObject = new dmp.diff_match_patch();
-	var a = diffPartsToChars(text1,text2,mode);
-	var lineText1 = a.chars1;
-	var lineText2 = a.chars2;
-	var lineArray = a.lineArray;
-	var diffs = dmpObject.diff_main(lineText1,lineText2,false);
-	dmpObject.diff_charsToLines_(diffs,lineArray);
-	return diffs;
-}
-
-function diffPartsToChars(text1,text2,mode) {
-	var lineArray = [];
-	var lineHash = {};
-	lineArray[0] = '';
-
-    function diff_linesToPartsMunge_(text,mode) {
-        var chars = '';
-        var lineStart = 0;
-        var lineEnd = -1;
-        var lineArrayLength = lineArray.length,
-            regexpResult;
-        var searchRegexp = /\W+/g;
-        while(lineEnd < text.length - 1) {
-	        if(mode === "words") {
-                regexpResult = searchRegexp.exec(text);
-                lineEnd = searchRegexp.lastIndex;
-                if(regexpResult === null) {
-                lineEnd = text.length;
-                }
-                lineEnd = --lineEnd;
-            } else {
-                lineEnd = text.indexOf('\n', lineStart);
-                if(lineEnd == -1) {
-                    lineEnd = text.length - 1;
-                }
-            }
-            var line = text.substring(lineStart, lineEnd + 1);
-
-            if(lineHash.hasOwnProperty ? lineHash.hasOwnProperty(line) : (lineHash[line] !== undefined)) {
-				chars += String.fromCharCode(lineHash[line]);
-            } else {
-                if (lineArrayLength == maxLines) {
-                  line = text.substring(lineStart);
-                  lineEnd = text.length;
-                }
-                chars += String.fromCharCode(lineArrayLength);
-                lineHash[line] = lineArrayLength;
-                lineArray[lineArrayLength++] = line;
-            }
-            lineStart = lineEnd + 1;
-        }
-        return chars;
-    }
-    var maxLines = 40000;
-    var chars1 = diff_linesToPartsMunge_(text1,mode);
-    maxLines = 65535;
-    var chars2 = diff_linesToPartsMunge_(text2,mode);
-    return {chars1: chars1, chars2: chars2, lineArray: lineArray};
-};
-
-exports.makepatches = function(source,operator,options) {
-	var dmpObject = new dmp.diff_match_patch(),
-		suffix = operator.suffix || "",
-		result = [];
-		
-		source(function(tiddler,title) {
-			var diffs, patches;
-			if(suffix === "lines" || suffix === "words") {
-				diffs = diffLineWordMode(title,operator.operand,suffix);
-				patches = dmpObject.patch_make(title,diffs);
-			} else {
-				patches = dmpObject.patch_make(title,operator.operand);
-			}
-			Array.prototype.push.apply(result,[dmpObject.patch_toText(patches)]);
-		});
-
-	return result;
-};
-
-exports.applypatches = makeStringBinaryOperator(
-	function(a,b) {
-		var dmpObject = new dmp.diff_match_patch(),
-			patches;
-		try {
-			patches = dmpObject.patch_fromText(b);
-		} catch(e) {
-		}
-		if(patches) {
-			return [dmpObject.patch_apply(patches,a)[0]];
-		} else {
-			return [a];
-		}
-	}
-);
-
 function makeStringBinaryOperator(fnCalc) {
 	return function(source,operator,options) {
 		var result = [];
@@ -228,23 +121,21 @@ exports["search-replace"] = function(source,operator,options) {
 		flagSuffix = (suffixes[0] ? (suffixes[0][0] || "") : ""),
 		flags = (flagSuffix.indexOf("g") !== -1 ? "g" : "") + (flagSuffix.indexOf("i") !== -1 ? "i" : "") + (flagSuffix.indexOf("m") !== -1 ? "m" : ""),
 		isRegExp = (suffixes[1] && suffixes[1][0] === "regexp") ? true : false,
-		//Escape regexp characters if the operand is not a regular expression
-		searchTerm = isRegExp ? operator.operand : $tw.utils.escapeRegExp(operator.operand),
-		//Escape $ character in replacement string if not in regular expression mode
-		replacement = isRegExp ? operator.operands[1] : (operator.operands[1]||"").replace(/\$/g,"$$$$"),
+		searchTerm,
 		regExp;
-	try {
-		regExp = new RegExp(searchTerm,flags);
-	} catch(ex) {
-		return ["RegExp error: " + ex];
-	}
 
 	source(function(tiddler,title) {
 		if(title && (operator.operands.length > 1)) {
+			//Escape regexp characters if the operand is not a regular expression
+			searchTerm = isRegExp ? operator.operand : $tw.utils.escapeRegExp(operator.operand);
+			try {
+				regExp = new RegExp(searchTerm,flags);
+			} catch(ex) {
+				return ["RegExp error: " + ex];
+			}
 			results.push(
-				title.replace(regExp,replacement)
+				title.replace(regExp,operator.operands[1])
 			);
-			regExp.lastIndex = 0;
 		} else {
 			results.push(title);
 		}
@@ -291,4 +182,4 @@ exports.charcode = function(source,operator,options) {
 	return [chars.join("")];
 };
 
-})();
+})();

core/modules/filters/suffix.js

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

core/modules/filters/untagged.js

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

core/modules/filters/variables.js

@@ -16,15 +16,9 @@ Filter operator for returning the names of the active variables
 Export our filter function
 */
 exports.variables = function(source,operator,options) {
-	var names = [],
-		widget = options.widget;
-	while(widget && !widget.hasOwnProperty("variables")) {
-		widget = widget.parentWidget;
-	}
-	if(widget && widget.variables) {
-		for(var variable in widget.variables) {
-			names.push(variable);
-		}
+	var names = [];
+	for(var variable in options.widget.variables) {
+		names.push(variable);
 	}
 	return names.sort();
 };

core/modules/indexers/field-indexer.js

@@ -32,18 +32,18 @@ FieldIndexer.prototype.setMaxIndexedValueLength = function(length) {
 
 FieldIndexer.prototype.addIndexMethods = function() {
 	var self = this;
-	// get all tiddlers, including those overwrite shadow tiddlers
 	this.wiki.each.byField = function(name,value) {
-		var lookup = self.lookup(name,value);
+		var titles = self.wiki.allTitles(),
+			lookup = self.lookup(name,value);
 		return lookup && lookup.filter(function(title) {
-			return self.wiki.tiddlerExists(title)
+			return titles.indexOf(title) !== -1;
 		});
 	};
-	// get shadow tiddlers, including shadow tiddlers that is overwritten
 	this.wiki.eachShadow.byField = function(name,value) {
-		var lookup = self.lookup(name,value);
+		var titles = self.wiki.allShadowTitles(),
+			lookup = self.lookup(name,value);
 		return lookup && lookup.filter(function(title) {
-			return self.wiki.isShadowTiddler(title)
+			return titles.indexOf(title) !== -1;
 		});
 	};
 	this.wiki.eachTiddlerPlusShadows.byField = function(name,value) {

core/modules/keyboard.js

@@ -141,7 +141,6 @@ function KeyboardManager(options) {
 	this.shortcutKeysList = [], // Stores the shortcut-key descriptors
 	this.shortcutActionList = [], // Stores the corresponding action strings
 	this.shortcutParsedList = []; // Stores the parsed key descriptors
-	this.shortcutPriorityList = []; // Stores the parsed shortcut priority
 	this.lookupNames = ["shortcuts"];
 	this.lookupNames.push($tw.platform.isMac ? "shortcuts-mac" : "shortcuts-not-mac")
 	this.lookupNames.push($tw.platform.isWindows ? "shortcuts-windows" : "shortcuts-not-windows");
@@ -319,23 +318,12 @@ KeyboardManager.prototype.updateShortcutLists = function(tiddlerList) {
 		this.shortcutKeysList[i] = tiddlerFields.key !== undefined ? tiddlerFields.key : undefined;
 		this.shortcutActionList[i] = tiddlerFields.text;
 		this.shortcutParsedList[i] = this.shortcutKeysList[i] !== undefined ? this.parseKeyDescriptors(this.shortcutKeysList[i]) : undefined;
-		this.shortcutPriorityList[i] = tiddlerFields.priority === "yes" ? true : false;
 	}
 };
 
-/*
-event: the keyboard event object
-options:
-	onlyPriority: true if only priority global shortcuts should be invoked
-*/
-KeyboardManager.prototype.handleKeydownEvent = function(event, options) {
-	options = options || {};
+KeyboardManager.prototype.handleKeydownEvent = function(event) {
 	var key, action;
 	for(var i=0; i<this.shortcutTiddlers.length; i++) {
-		if(options.onlyPriority && this.shortcutPriorityList[i] !== true) {
-			continue;
-		}
-
 		if(this.shortcutParsedList[i] !== undefined && this.checkKeyDescriptors(event,this.shortcutParsedList[i])) {
 			key = this.shortcutParsedList[i];
 			action = this.shortcutActionList[i];

core/modules/parsers/csvparser.js

@@ -13,11 +13,6 @@ The CSV text parser processes CSV files into a table wrapped in a scrollable wid
 "use strict";
 
 var CsvParser = function(type,text,options) {
-	// Special handler for tab-delimited files
-	if (type === 'text/tab-delimited-values' && !options.separator) {
-		options.separator = "\t";
-	}
-	
 	// Table framework
 	this.tree = [{
 		"type": "scrollable", "children": [{
@@ -29,33 +24,30 @@ var CsvParser = function(type,text,options) {
 		}]
 	}];
 	// Split the text into lines
-	var lines = $tw.utils.parseCsvString(text, options),
+	var lines = text.split(/\r?\n/mg),
 		tag = "th";
-	var maxColumns = 0;
-	$tw.utils.each(lines, function(columns) {
-		maxColumns = Math.max(columns.length, maxColumns);
-	});
-	
 	for(var line=0; line<lines.length; line++) {
-		var columns = lines[line];
-		var row = {
-			"type": "element", "tag": "tr", "children": []
-		};
-		for(var column=0; column<maxColumns; column++) {
-			row.children.push({
-				"type": "element", "tag": tag, "children": [{
-					"type": "text",
-					"text": columns[column] || ''
-				}]
-			});
+		var lineText = lines[line];
+		if(lineText) {
+			var row = {
+					"type": "element", "tag": "tr", "children": []
+				};
+			var columns = lineText.split(",");
+			for(var column=0; column<columns.length; column++) {
+				row.children.push({
+						"type": "element", "tag": tag, "children": [{
+							"type": "text",
+							"text": columns[column]
+						}]
+					});
+			}
+			tag = "td";
+			this.tree[0].children[0].children[0].children.push(row);
 		}
-		tag = "td";
-		this.tree[0].children[0].children[0].children.push(row);
 	}
 };
 
 exports["text/csv"] = CsvParser;
-exports["text/tab-delimited-values"] = CsvParser;
 
 })();
 

core/modules/parsers/parseutils.js

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

core/modules/parsers/pdfparser.js

@@ -15,7 +15,7 @@ The PDF parser embeds a PDF viewer
 var ImageParser = function(type,text,options) {
 	var element = {
 			type: "element",
-			tag: "iframe",
+			tag: "embed",
 			attributes: {}
 		},
 		src;

core/modules/parsers/wikiparser/rules/import.js

@@ -25,7 +25,7 @@ Instantiate parse rule
 exports.init = function(parser) {
 	this.parser = parser;
 	// Regexp to match
-	this.matchRegExp = /\\import[^\S\n]/mg;
+	this.matchRegExp = /^\\import[^\S\n]/mg;
 };
 
 /*

core/modules/parsers/wikiparser/rules/macrodef.js

@@ -27,7 +27,7 @@ Instantiate parse rule
 exports.init = function(parser) {
 	this.parser = parser;
 	// Regexp to match
-	this.matchRegExp = /\\define\s+([^(\s]+)\(\s*([^)]*)\)(\s*\r?\n)?/mg;
+	this.matchRegExp = /^\\define\s+([^(\s]+)\(\s*([^)]*)\)(\s*\r?\n)?/mg;
 };
 
 /*
@@ -58,7 +58,7 @@ exports.parse = function() {
 	var reEnd;
 	if(this.match[3]) {
 		// If so, the end of the body is marked with \end
-		reEnd = new RegExp("(\\r?\\n[^\\S\\n\\r]*\\\\end[^\\S\\n\\r]*(?:" + $tw.utils.escapeRegExp(this.match[1]) + ")?(?:$|\\r?\\n))","mg");
+		reEnd = /(\r?\n\\end[^\S\n\r]*(?:$|\r?\n))/mg;
 	} else {
 		// Otherwise, the end of the definition is marked by the end of the line
 		reEnd = /($|\r?\n)/mg;

core/modules/parsers/wikiparser/rules/parsermode.js

@@ -1,68 +0,0 @@
-/*\
-title: $:/core/modules/parsers/wikiparser/rules/parsermode.js
-type: application/javascript
-module-type: wikirule
-
-Wiki pragma rule for parser mode specifications
-
-```
-\parsermode block
-\parsermode inline
-```
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-exports.name = "parsermode";
-exports.types = {pragma: true};
-
-/*
-Instantiate parse rule
-*/
-exports.init = function(parser) {
-	this.parser = parser;
-	// Regexp to match
-	this.matchRegExp = /\\parsermode[^\S\n]/mg;
-};
-
-/*
-Parse the most recent match
-*/
-exports.parse = function() {
-	// Move past the pragma invocation
-	this.parser.pos = this.matchRegExp.lastIndex;
-	// Parse whitespace delimited tokens terminated by a line break
-	var reMatch = /[^\S\n]*(\S+)|(\r?\n)/mg,
-		parserMode = undefined;
-	reMatch.lastIndex = this.parser.pos;
-	var match = reMatch.exec(this.parser.source);
-	while(match && match.index === this.parser.pos) {
-		this.parser.pos = reMatch.lastIndex;
-		// Exit if we've got the line break
-		if(match[2]) {
-			break;
-		}
-		// Process the token
-		if(match[1]) {
-			parserMode = match[1];
-		}
-		// Match the next token
-		match = reMatch.exec(this.parser.source);
-	}
-	// Process the tokens
-	if(parserMode !== undefined) {
-		if(parserMode === "block") {
-			this.parser.parseAsInline = false;
-		} else if(parserMode === "inline") {
-			this.parser.parseAsInline = true;
-		}
-	}
-	// No parse tree nodes to return
-	return [];
-};
-
-})();

core/modules/parsers/wikiparser/rules/rules.js

@@ -26,7 +26,7 @@ Instantiate parse rule
 exports.init = function(parser) {
 	this.parser = parser;
 	// Regexp to match
-	this.matchRegExp = /\\rules[^\S\n]/mg;
+	this.matchRegExp = /^\\rules[^\S\n]/mg;
 };
 
 /*

core/modules/parsers/wikiparser/rules/styleinline.js

@@ -41,6 +41,9 @@ exports.parse = function() {
 	var node = {
 		type: "element",
 		tag: "span",
+		attributes: {
+			"class": {type: "string", value: "tc-inline-style"}
+		},
 		children: tree
 	};
 	if(classString) {
@@ -49,9 +52,6 @@ exports.parse = function() {
 	if(stylesString) {
 		$tw.utils.addAttributeToParseTreeNode(node,"style",stylesString);
 	}
-	if(!classString && !stylesString) {
-		$tw.utils.addClassToParseTreeNode(node,"tc-inline-style");
-	}
 	return [node];
 };
 

core/modules/parsers/wikiparser/rules/whitespace.js

@@ -26,7 +26,7 @@ Instantiate parse rule
 exports.init = function(parser) {
 	this.parser = parser;
 	// Regexp to match
-	this.matchRegExp = /\\whitespace[^\S\n]/mg;
+	this.matchRegExp = /^\\whitespace[^\S\n]/mg;
 };
 
 /*

core/modules/parsers/wikiparser/wikiparser.js

@@ -47,8 +47,6 @@ var WikiParser = function(type,text,options) {
 	this.sourceLength = this.source.length;
 	// Flag for ignoring whitespace
 	this.configTrimWhiteSpace = false;
-	// Parser mode
-	this.parseAsInline = options.parseAsInline;
 	// Set current parse position
 	this.pos = 0;
 	// Start with empty output
@@ -85,7 +83,7 @@ var WikiParser = function(type,text,options) {
 	// Parse any pragmas
 	var topBranch = this.parsePragmas();
 	// Parse the text into inline runs or blocks
-	if(this.parseAsInline) {
+	if(options.parseAsInline) {
 		topBranch.push.apply(topBranch,this.parseInlineRun());
 	} else {
 		topBranch.push.apply(topBranch,this.parseBlocks());
@@ -118,7 +116,7 @@ WikiParser.prototype.loadRemoteTiddler = function(url) {
 */
 WikiParser.prototype.setupRules = function(proto,configPrefix) {
 	var self = this;
-	if(!$tw.safeMode) {
+	if(!$tw.safemode) {
 		$tw.utils.each(proto,function(object,name) {
 			if(self.wiki.getTiddlerText(configPrefix + name,"enable") !== "enable") {
 				delete proto[name];

core/modules/pluginswitcher.js

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

core/modules/savers/beaker.js

@@ -0,0 +1,64 @@
+/*\
+title: $:/core/modules/savers/beaker.js
+type: application/javascript
+module-type: saver
+
+Saves files using the Beaker browser's (https://beakerbrowser.com) Dat protocol (https://datproject.org/)
+Compatible with beaker >= V0.7.2
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+/*
+Set up the saver
+*/
+var BeakerSaver = function(wiki) {
+	this.wiki = wiki;
+};
+
+BeakerSaver.prototype.save = function(text,method,callback) {
+	var dat = new DatArchive("" + window.location),
+		pathname = ("" + window.location.pathname).split("#")[0];
+	dat.stat(pathname).then(function(value) {
+		if(value.isDirectory()) {
+			pathname = pathname + "/index.html";
+		}
+		dat.writeFile(pathname,text,"utf8").then(function(value) {
+			callback(null);
+		},function(reason) {
+			callback("Beaker Saver Write Error: " + reason);
+		});
+	},function(reason) {
+		callback("Beaker Saver Stat Error: " + reason);
+	});
+	return true;
+};
+
+/*
+Information about this saver
+*/
+BeakerSaver.prototype.info = {
+	name: "beaker",
+	priority: 3000,
+	capabilities: ["save", "autosave"]
+};
+
+/*
+Static method that returns true if this saver is capable of working
+*/
+exports.canSave = function(wiki) {
+	return !!window.DatArchive && location.protocol==="dat:";
+};
+
+/*
+Create an instance of this saver
+*/
+exports.create = function(wiki) {
+	return new BeakerSaver(wiki);
+};
+
+})();

core/modules/savers/gitea.js

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

core/modules/savers/github.js

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

core/modules/savers/gitlab.js

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

core/modules/savers/hyperdrive.js

@@ -0,0 +1,64 @@
+/*\
+title: $:/core/modules/savers/hyperdrive.js
+type: application/javascript
+module-type: saver
+
+Saves files using the Hyperdrive Protocol (https://hypercore-protocol.org/#hyperdrive) Beaker browser beta-1.0 and later (https://beakerbrowser.com)
+Compatible with beaker >= V1.0.0
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+/*
+Set up the saver
+*/
+var HyperdriveSaver = function(wiki) {
+	this.wiki = wiki;
+};
+
+HyperdriveSaver.prototype.save = function(text,method,callback) {
+	var dat = beaker.hyperdrive.drive("" + window.location),
+		pathname = ("" + window.location.pathname).split("#")[0];
+	dat.stat(pathname).then(function(value) {
+		if(value.isDirectory()) {
+			pathname = pathname + "/index.html";
+		}
+		dat.writeFile(pathname,text,"utf8").then(function(value) {
+			callback(null);
+		},function(reason) {
+			callback("Hyperdrive Saver Write Error: " + reason);
+		});
+	},function(reason) {
+		callback("Hyperdrive Saver Stat Error: " + reason);
+	});
+	return true;
+};
+
+/*
+Information about this saver
+*/
+HyperdriveSaver.prototype.info = {
+	name: "beaker-1.x",
+	priority: 3000,
+	capabilities: ["save", "autosave"]
+};
+
+/*
+Static method that returns true if this saver is capable of working
+*/
+exports.canSave = function(wiki) {
+	return !!window.beaker && !!beaker.hyperdrive && location.protocol==="hyper:";
+};
+
+/*
+Create an instance of this saver
+*/
+exports.create = function(wiki) {
+	return new HyperdriveSaver(wiki);
+};
+
+})();

core/modules/savers/put.js

@@ -80,7 +80,6 @@ PutSaver.prototype.save = function(text,method,callback) {
 	if(this.etag) {
 		headers["If-Match"] = this.etag;
 	}
-	$tw.notifier.display("$:/language/Notifications/Save/Starting");
 	$tw.utils.httpRequest({
 		url: this.uri(),
 		type: "PUT",
@@ -88,20 +87,17 @@ PutSaver.prototype.save = function(text,method,callback) {
 		data: text,
 		callback: function(err,data,xhr) {
 			if(err) {
-				var status = xhr.status,
-					errorMsg = err;
+				// response is textual: "XMLHttpRequest error code: 412"
+				var status = Number(err.substring(err.indexOf(':') + 2, err.length))
 				if(status === 412) { // file changed on server
-					errorMsg = $tw.language.getString("Error/PutEditConflict");
+					callback($tw.language.getString("Error/PutEditConflict"));
 				} else if(status === 401) { // authentication required
-					errorMsg = $tw.language.getString("Error/PutUnauthorized");
+					callback($tw.language.getString("Error/PutUnauthorized"));
 				} else if(status === 403) { // permission denied
-					errorMsg = $tw.language.getString("Error/PutForbidden");
+					callback($tw.language.getString("Error/PutForbidden"));
+				} else {
+					callback(err); // fail
 				}
-				if (xhr.responseText) {
-					// treat any server response like a plain text error explanation
-					errorMsg = errorMsg + "\n\n" + xhr.responseText;
-				}
-				callback(errorMsg); // fail
 			} else {
 				self.etag = xhr.getResponseHeader("ETag");
 				if(self.etag == null) {

core/modules/savers/upload.js

@@ -64,7 +64,6 @@ UploadSaver.prototype.save = function(text,method,callback) {
 	var tail = "\r\n--" + boundary + "--\r\n",
 		data = head.join("\r\n") + text + tail;
 	// Do the HTTP post
-	$tw.notifier.display("$:/language/Notifications/Save/Starting");
 	var http = new XMLHttpRequest();
 	http.open("POST",url,true,username,password);
 	http.setRequestHeader("Content-Type","multipart/form-data; charset=UTF-8; boundary=" + boundary);
@@ -82,6 +81,7 @@ UploadSaver.prototype.save = function(text,method,callback) {
 	} catch(ex) {
 		return callback($tw.language.getString("Error/Caption") + ":" + ex);
 	}
+	$tw.notifier.display("$:/language/Notifications/Save/Starting");
 	return true;
 };
 

core/modules/server/routes/get-status.js

@@ -21,7 +21,6 @@ exports.handler = function(request,response,state) {
 		username: state.authenticatedUsername || state.server.get("anon-username") || "",
 		anonymous: !state.authenticatedUsername,
 		read_only: !state.server.isAuthorized("writers",state.authenticatedUsername),
-		logout_is_available: false,
 		space: {
 			recipe: "default"
 		},

core/modules/server/routes/post-commands.js

@@ -0,0 +1,55 @@
+/*\
+title: $:/core/modules/server/routes/post-commands.js
+type: application/javascript
+module-type: route
+
+POST /commands/
+
+\*/
+(function() {
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+exports.method = "POST";
+
+exports.path = /^\/commands\/$/;
+
+exports.handler = function(request,response,state) {	
+	// Check we're enabled
+	if(!($tw.boot.wikiInfo.config || {})["allow-remote-commands"]) {
+		response.writeHead(404);
+		response.end();
+		return;
+	}
+	// Get the job descriptor
+	var jobDescriptor = JSON.parse(state.data);
+	console.log("JOB START:",jobDescriptor)
+	// Respond OK
+	response.writeHead(204, "OK",{
+		"Content-Type": "application/json"
+	});
+	// Maintain status
+	var setStatus = function(status,message) {
+		if(jobDescriptor.statusTitle) {
+			state.wiki.addTiddler(new $tw.Tiddler({title: jobDescriptor.statusTitle,text: status,message: message}));
+		}
+	}
+	setStatus("started");
+	// Initiate the commands
+	var commander = new $tw.Commander(
+		jobDescriptor.commands || [],
+		function(err) {
+			setStatus(err ? "error" : "ok",err ? err : undefined);
+			console.log("JOB END:",err)
+		},
+		state.wiki,
+		{output: process.stdout, error: process.stderr}
+	);
+	commander.execute();
+	// Return results
+	response.end(JSON.stringify({}),"utf8"); // Nothing useful for us to return 
+};
+
+}());

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

@@ -18,7 +18,7 @@ exports.path = /^\/recipes\/default\/tiddlers\/(.+)$/;
 
 exports.handler = function(request,response,state) {
 	var title = $tw.utils.decodeURIComponentSafe(state.params[0]),
-	fields = $tw.utils.parseJSONSafe(state.data);
+	fields = JSON.parse(state.data);
 	// Pull up any subfields in the `fields` object
 	if(fields.fields) {
 		$tw.utils.each(fields.fields,function(field,name) {
@@ -30,16 +30,6 @@ exports.handler = function(request,response,state) {
 	if(fields.revision) {
 		delete fields.revision;
 	}
-	// If this is a skinny tiddler, it means the client never got the full
-	// version of the tiddler to edit. So we must preserve whatever text
-	// already exists on the server, or else we'll inadvertently delete it.
-	if(fields._is_skinny !== undefined) {
-		var tiddler = state.wiki.getTiddler(title);
-		if(tiddler) {
-			fields.text = tiddler.fields.text;
-		}
-		delete fields._is_skinny;
-	}
 	state.wiki.addTiddler(new $tw.Tiddler(fields,{title: title}));
 	var changeCount = state.wiki.getChangeCount(title).toString();
 	response.writeHead(204, "OK",{

core/modules/server/server.js

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