Update road map

* [ja_JP] Japanese translation update from commit: 4dc89f6

* [ja_JP] Japanese translation update from commit: 4dc89f6

* [ja_JP] Japanese translation update from commit: 381388f, 4dc89f6, 5fa1098

* [ja_JP] Japanese translation update from commit: 3c1d658

* [ja_JP] Japanese translation update from commit: 3c1d658

* [ja_JP] Japanese translation update from commit: 29a567f, 6aee5eb

* [ja_JP] Japanese translation update from commit: 0ac2b6c

* [ja_JP] Japanese translation update from commit: 1994574

* [ja_JP] Japanese translation update from commit: 5dfdbc8

* [ja_JP] Japanese translation update from commit: 1994574

* [ja_JP] Japanese translation update from commit: 81d8d67

* [ja_JP] Japanese translation update from commit: 81d8d67

* [ja_JP] Japanese translation update from commit: 4196d96

* [ja_JP] Japanese translation update from commit: 1994574

* [ja_JP] Japanese translation update from commit: 1994574

* [ja-JP] Japanese translation of 'community\project\TiddlyWiki Project.tid'

* [ja-JP] Japanese translation of 'community\docs\Community Cards Caveats.tid'

* [ja-JP] Japanese translation of 'community\project\TiddlyWiki People.tid'

* [ja-JP] Japanese translation of 'community\project\Vacant Positions.tid'

* [ja-JP] Japanese translation of 'community\docs\Community Cards.tid'

* [ja-JP] Japanese translation of 'community\docs\Displaying Community Cards.tid'

* [ja-JP] Japanese translation of 'community\docs\Submitting a Community Card.tid'

* [ja-JP] Japanese translation of 'community\tools\cards\Procedures.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\Resources.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\Resources.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\Community Links Aggregator.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\TiddlyWiki Newsletter.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\marketplace\TiddlyWiki Marketplace.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\hellothere\HelloThumbnail.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\Improving TiddlyWiki Documentation.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\Translate TiddlyWiki into your language.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\TiddlyWiki_European_Meetup_2016.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\TiddlyWiki_European_Meetup_2017.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\editions\Tidme by oflg.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\editions\_Cardo-A Task and Project Management Wiki_ by David_Szego.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\editions\Drift by Tony K.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\editions\Stroll by David Gifford.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\plugins\GSD5.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\plugins\TiddlyWiki for Scholars.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\_TiddlyStudy_ by Kebi.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\resources\Wikilabs by PMario.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\resources\Projectify by Nicolas Petton.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\plugins\TW5-Graph by Flibbles.tid'

* [ja-JP] Japanese translation has been modified to display the ja-title.

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\articles\_A free, open source wiki revisited_ by Mark Gibbs, NetworkWorld.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\articles\_Notizen mit TiddlyWiki systemubergreifend nutzen_ by Michael Sonntag.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\articles\_Setting Up a Personal TiddlyWiki Server on OS X_ by Kris Johnson.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\articles\_TiddlyWiki 5 im Betatest_ by besim.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\articles\_TiddlyWiki_ by Sander de Boer.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\resources\TiddlyWiki Posts.tid'

* [ja-JP] A little correction to the Japanese translation

.gitattributes

@@ -1,4 +0,0 @@
-boot/** -linguist-generated
-**/tiddlywiki.files linguist-language=JSON
-**/tiddlywiki.info linguist-language=JSON
-**/plugin.info linguist-language=JSON

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,62 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve TiddlyWiki 5
-title: "[Report] "
-type: report
-
----
-
-<!-- Remove elements, that you do not need -->
-<!-- Add screenshots where needed -->
-
-**Problem Description**
-<!-- Describe your problem: A clear and concise description of what your problem is -->
-
-
-**To Reproduce**
-
-Steps to reproduce the behavior:
-
-1. At https://tiddlywiki.com
-2. Click on ...
-3. Scroll down to ...
-4. See ...
-
-
-**Expected behavior**
-
-As a user,
-<!-- As a developer, -->
-I would expect ...
-
-
-**TiddlyWiki Configuration**
-<!-- Please complete the following information -->
-
-- Report created with: [Wiki Information](https://tiddlywiki.com/#%24%3A%2Fcore%2Fui%2FControlPanel%2FWikiInformation)
-
-<!-- Your report comes here -->
-<!-- or -->
-<!-- Add it manually -->
-
-- Version: <!-- e.g. v5.3.8 -->
-- Saving mechanism: <!-- e.g. Node.js, TiddlyDesktop, TiddlyHost etc -->
-- Plugins installed: <!-- e.g. Freelinks, TiddlyMap ... other 3rd party plugins -->
-
-
-**Desktop**
-<!-- Please complete the following information -->
-
-- OS: <!--  e.g. iOS -->
-- Browser: <!-- e.g. chrome, safari, FireFox -- Version: -->
-
-**Smartphone**
-<!-- Please complete the following information -->
-
-- Device: <!-- e.g. iPhone6 -->
-- OS: <!-- e.g. iOS8.1 -->
-- Browser: <!-- e.g. stock browser, safari, FireFox -- Version: -->
-
-
-**Additional context**
-<!-- Add any other context about the problem here. -->

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,67 @@
+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:"
+      placeholder: |
+        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
+      placeholder: |
+        - 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/feature_request.md

@@ -4,23 +4,17 @@ about: Suggest an idea for TiddlyWiki 5
 title: "[IDEA]"
 labels: ''
 assignees: ''
-type: idea
 
 ---
 
-**Is your idea related to a problem? Please describe.**
-
-A clear and concise description of what the problem is. Eg:
-As a user, I would like [...]
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 
 **Describe the solution you'd like**
-
 A clear and concise description of what you want to happen.
 
 **Describe alternatives you've considered**
-
 A clear and concise description of any alternative solutions or features you've considered.
 
 **Additional context**
-
 Add any other context or screenshots about the feature request here.

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
           node-version: "${{ env.NODE_VERSION }}"
@@ -30,7 +30,7 @@ jobs:
       TW5_BUILD_MAIN_EDITION: "./editions/prerelease"
       TW5_BUILD_OUTPUT: "./output/prerelease"
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
           node-version: "${{ env.NODE_VERSION }}"
@@ -62,7 +62,7 @@ jobs:
       TW5_BUILD_OUTPUT: "./output"
       TW5_BUILD_ARCHIVE: "./output"
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
           node-version: "${{ env.NODE_VERSION }}"

.github/workflows/eslint.yml

@@ -1,40 +0,0 @@
-name: ESLint
-
-on:
-  pull_request:
-    types: [opened, synchronize, reopened]
-  workflow_dispatch:
-
-concurrency:
-  group: lint-${{ github.event.pull_request.number || github.ref_name }}
-  cancel-in-progress: true
-
-permissions:
-  contents: read
-  # Needed for GitHub Checks API
-  checks: write
-
-jobs:
-  eslint:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v5
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-
-      - name: Install dependencies
-        run: npm install --include=dev
-
-      - name: Run ESLint with reviewdog (GitHub Checks)
-        uses: reviewdog/action-eslint@v1
-        with:
-          eslint_flags: '.'
-          reporter: github-pr-check
-          fail_level: error
-          level: error
-          tool_name: ESLint PR code

.github/workflows/pr-check-build-size.yml

@@ -20,7 +20,7 @@ jobs:
     steps:
     - name: build-size-check
       id: get_sizes
-      uses: TiddlyWiki/cerebrus@v6
+      uses: TiddlyWiki/cerebrus@v4
       with:
         pr_number: ${{ github.event.pull_request.number }}
         repo: ${{ github.repository }}

.github/workflows/pr-comment-build-size.yml

@@ -25,7 +25,7 @@ jobs:
 
     steps:
     - name: Build and check size
-      uses: TiddlyWiki/cerebrus@v6
+      uses: TiddlyWiki/cerebrus@v4
       with:
         pr_number: ${{ inputs.pr_number }}
         repo: ${{ github.repository }}

.github/workflows/pr-path-validation.yml

@@ -0,0 +1,18 @@
+name: Validate PR Paths
+
+on:
+  pull_request_target:
+    types: [opened, reopened, synchronize]
+
+jobs:
+  validate-pr:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Validate PR
+      uses: TiddlyWiki/cerebrus@v4
+      with:
+        pr_number: ${{ github.event.pull_request.number }}
+        repo: ${{ github.repository }}
+        base_ref: ${{ github.base_ref }}
+        github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/pr-validation.yml

@@ -1,37 +0,0 @@
-name: PR Validation
-
-on:
-  pull_request_target:
-    types: [opened, reopened, synchronize]
-
-permissions:
-  contents: read
-  pull-requests: write
-  issues: write
-jobs:
-  validate-pr:
-    runs-on: ubuntu-latest
-
-    steps:
-    # Step 1: Validate PR paths
-    - name: Validate PR Paths
-      uses: TiddlyWiki/cerebrus@v6
-      with:
-        pr_number: ${{ github.event.pull_request.number }}
-        repo: ${{ github.repository }}
-        base_ref: ${{ github.event.pull_request.base.ref }}
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        mode: rules
-      continue-on-error: true
-    
-    # Step 2: Validate change notes
-    - name: Validate Change Notes
-      uses: TiddlyWiki/cerebrus@v6
-      with:
-        pr_number: ${{ github.event.pull_request.number }}
-        repo: ${{ github.repository }}
-        base_ref: ${{ github.event.pull_request.base.ref }}
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        mode: changenotes
-      continue-on-error: false
-

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.4.0
+    TW5_BUILD_VERSION=v5.3.8
 fi
 
 echo "Using TW5_BUILD_VERSION as [$TW5_BUILD_VERSION]"
@@ -73,8 +73,10 @@ rm $TW5_BUILD_OUTPUT/dev/static/*
 
 echo "<a href='./plugins/tiddlywiki/tw2parser/index.html'>Moved to http://tiddlywiki.com/plugins/tiddlywiki/tw2parser/index.html</a>" > $TW5_BUILD_OUTPUT/classicparserdemo.html
 echo "<a href='./plugins/tiddlywiki/codemirror/index.html'>Moved to http://tiddlywiki.com/plugins/tiddlywiki/codemirror/index.html</a>" > $TW5_BUILD_OUTPUT/codemirrordemo.html
+echo "<a href='./plugins/tiddlywiki/d3/index.html'>Moved to http://tiddlywiki.com/plugins/tiddlywiki/d3/index.html</a>" > $TW5_BUILD_OUTPUT/d3demo.html
 echo "<a href='./plugins/tiddlywiki/highlight/index.html'>Moved to http://tiddlywiki.com/plugins/tiddlywiki/highlight/index.html</a>" > $TW5_BUILD_OUTPUT/highlightdemo.html
 echo "<a href='./plugins/tiddlywiki/markdown/index.html'>Moved to http://tiddlywiki.com/plugins/tiddlywiki/markdown/index.html</a>" > $TW5_BUILD_OUTPUT/markdowndemo.html
+echo "<a href='./plugins/tiddlywiki/tahoelafs/index.html'>Moved to http://tiddlywiki.com/plugins/tiddlywiki/tahoelafs/index.html</a>" > $TW5_BUILD_OUTPUT/tahoelafs.html
 
 # Put the build details into a .tid file so that it can be included in each build (deleted at the end of this script)
 
@@ -120,6 +122,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 	|| exit 1
 
 # /empty.html					Empty
+# /empty.hta					For Internet Explorer
 # /empty-external-core.html		External core empty
 # /tiddlywikicore-<version>.js	Core plugin javascript
 node $TW5_BUILD_TIDDLYWIKI \
@@ -298,6 +301,26 @@ node $TW5_BUILD_TIDDLYWIKI \
 	--rendertiddler $:/core/save/empty plugins/tiddlywiki/katex/empty.html text/plain \
 	|| exit 1
 
+# /plugins/tiddlywiki/tahoelafs/index.html	Demo wiki with Tahoe-LAFS plugin
+# /plugins/tiddlywiki/tahoelafs/empty.html	Empty wiki with Tahoe-LAFS plugin
+node $TW5_BUILD_TIDDLYWIKI \
+	./editions/tahoelafs \
+	--load $TW5_BUILD_OUTPUT/build.tid \
+	--output $TW5_BUILD_OUTPUT \
+	--rendertiddler $:/core/save/all plugins/tiddlywiki/tahoelafs/index.html text/plain \
+	--rendertiddler $:/core/save/empty plugins/tiddlywiki/tahoelafs/empty.html text/plain \
+	|| exit 1
+
+# /plugins/tiddlywiki/d3/index.html	Demo wiki with D3 plugin
+# /plugins/tiddlywiki/d3/empty.html	Empty wiki with D3 plugin
+node $TW5_BUILD_TIDDLYWIKI \
+	./editions/d3demo \
+	--load $TW5_BUILD_OUTPUT/build.tid \
+	--output $TW5_BUILD_OUTPUT \
+	--rendertiddler $:/core/save/all plugins/tiddlywiki/d3/index.html text/plain \
+	--rendertiddler $:/core/save/empty plugins/tiddlywiki/d3/empty.html text/plain \
+	|| exit 1
+
 # /plugins/tiddlywiki/codemirror/index.html	Demo wiki with codemirror plugin
 # /plugins/tiddlywiki/codemirror/empty.html	Empty wiki with codemirror plugin
 node $TW5_BUILD_TIDDLYWIKI \

bin/optimise-svgs.js

@@ -15,40 +15,40 @@ var fs = require("fs"),
 	{ optimize } = require("svgo"),
 	config = {
 		plugins: [
-			"cleanupAttrs",
-			"removeDoctype",
-			"removeXMLProcInst",
-			"removeComments",
-			"removeMetadata",
-			"removeTitle",
-			"removeDesc",
-			"removeUselessDefs",
-			"removeEditorsNSData",
-			"removeEmptyAttrs",
-			"removeHiddenElems",
-			"removeEmptyText",
-			"removeEmptyContainers",
+			'cleanupAttrs',
+			'removeDoctype',
+			'removeXMLProcInst',
+			'removeComments',
+			'removeMetadata',
+			'removeTitle',
+			'removeDesc',
+			'removeUselessDefs',
+			'removeEditorsNSData',
+			'removeEmptyAttrs',
+			'removeHiddenElems',
+			'removeEmptyText',
+			'removeEmptyContainers',
 			// 'removeViewBox',
-			"cleanupEnableBackground",
-			"convertStyleToAttrs",
-			"convertColors",
-			"convertPathData",
-			"convertTransform",
-			"removeUnknownsAndDefaults",
-			"removeNonInheritableGroupAttrs",
-			"removeUselessStrokeAndFill",
-			"removeUnusedNS",
-			"cleanupIDs",
-			"cleanupNumericValues",
-			"moveElemsAttrsToGroup",
-			"moveGroupAttrsToElems",
-			"collapseGroups",
+			'cleanupEnableBackground',
+			'convertStyleToAttrs',
+			'convertColors',
+			'convertPathData',
+			'convertTransform',
+			'removeUnknownsAndDefaults',
+			'removeNonInheritableGroupAttrs',
+			'removeUselessStrokeAndFill',
+			'removeUnusedNS',
+			'cleanupIDs',
+			'cleanupNumericValues',
+			'moveElemsAttrsToGroup',
+			'moveGroupAttrsToElems',
+			'collapseGroups',
 			// 'removeRasterImages',
-			"mergePaths",
-			"convertShapeToPath",
-			"sortAttrs",
+			'mergePaths',
+			'convertShapeToPath',
+			'sortAttrs',
 			//'removeDimensions',
-			{name: "removeAttrs", params: { attrs: "(stroke|fill)" } }
+			{name: 'removeAttrs', params: { attrs: '(stroke|fill)' } }
 		]
 	};
 
@@ -72,7 +72,7 @@ files.forEach(function(filename) {
 			var newSVG = header.join("\n") + "\n\n" + result.data.replace("&lt;&lt;now &quot;DD&quot;&gt;&gt;","<<now \"DD\">>");
 			fs.writeFileSync(filepath,newSVG);
 		} else {
-			console.log("Error " + err + " with " + filename);
+			console.log("Error " + err + " with " + filename)
 			process.exit();
 		};
 	}

boot/boot.js

@@ -8,10 +8,10 @@ On the server this file is executed directly to boot TiddlyWiki. In the browser,
 
 \*/
 
-/* eslint-disable @stylistic/indent */
-
 var _boot = (function($tw) {
 
+/*jslint node: true, browser: true */
+/*global modules: false, $tw: false */
 "use strict";
 
 // Include bootprefix if we're not given module data
@@ -35,7 +35,7 @@ if($tw.node) {
 $tw.boot.log = function(str) {
 	$tw.boot.logMessages = $tw.boot.logMessages || [];
 	$tw.boot.logMessages.push(str);
-};
+}
 
 /*
 Check if an object has a property
@@ -44,8 +44,12 @@ $tw.utils.hop = function(object,property) {
 	return object ? Object.prototype.hasOwnProperty.call(object,property) : false;
 };
 
-/** @deprecated Use Array.isArray instead  */
-$tw.utils.isArray = (value) => Array.isArray(value);
+/*
+Determine if a value is an array
+*/
+$tw.utils.isArray = function(value) {
+	return Object.prototype.toString.call(value) == "[object Array]";
+};
 
 /*
 Check if an array is equal by value and by reference.
@@ -124,22 +128,35 @@ $tw.utils.pushTop = function(array,value) {
 	return array;
 };
 
-/** @deprecated Use instanceof Date instead */
-$tw.utils.isDate = (value) => value instanceof Date;
+/*
+Determine if a value is a date
+*/
+$tw.utils.isDate = function(value) {
+	return Object.prototype.toString.call(value) === "[object Date]";
+};
 
-/** @deprecated Use array iterative methods instead */
+/*
+Iterate through all the own properties of an object or array. Callback is invoked with (element,title,object)
+*/
 $tw.utils.each = function(object,callback) {
+	var next,f,length;
 	if(object) {
-		if(Array.isArray(object)) {
-			object.every((element,index,array) => {
-				const next = callback(element,index,array);
-				return next !== false;
-			});
+		if(Object.prototype.toString.call(object) == "[object Array]") {
+			for(f=0, length=object.length; f<length; f++) {
+				next = callback(object[f],f,object);
+				if(next === false) {
+					break;
+				}
+			}
 		} else {
-			Object.entries(object).every((entry) => {
-				const next = callback(entry[1], entry[0], object);
-				return next !== false;
-			});
+			var keys = Object.keys(object);
+			for(f=0, length=keys.length; f<length; f++) {
+				var key = keys[f];
+				next = callback(object[key],key,object);
+				if(next === false) {
+					break;
+				}
+			}
 		}
 	}
 };
@@ -318,26 +335,28 @@ $tw.utils.htmlDecode = function(s) {
 Get the browser location.hash. We don't use location.hash because of the way that Firefox auto-urldecodes it (see http://stackoverflow.com/questions/1703552/encoding-of-window-location-hash)
 */
 $tw.utils.getLocationHash = function() {
-	const href = window.location.href,
-		idx = href.indexOf("#");
-
+	var href = window.location.href;
+	var idx = href.indexOf('#');
 	if(idx === -1) {
 		return "#";
-	}
-
-	const afterHash = href.substring(idx + 1);
-	if(afterHash.startsWith("#") || afterHash.startsWith("%23")) {
+	} else if(href.substr(idx + 1,1) === "#" ||  href.substr(idx + 1,3) === "%23") {
 		// Special case: ignore location hash if it itself starts with a #
 		return "#";
+	} else {
+		return href.substring(idx);
 	}
-	return href.substring(idx);
 };
 
-
-/** @deprecated Pad a string to a given length with "0"s. Length defaults to 2 */
-$tw.utils.pad = function(value,length = 2) {
-	const s = value.toString();
-	return s.padStart(length, "0");
+/*
+Pad a string to a given length with "0"s. Length defaults to 2
+*/
+$tw.utils.pad = function(value,length) {
+	length = length || 2;
+	var s = value.toString();
+	if(s.length < length) {
+		s = "000000000000000000000000000".substr(0,length - s.length) + s;
+	}
+	return s;
 };
 
 // Convert a date into UTC YYYYMMDDHHMMSSmmm format
@@ -563,7 +582,7 @@ using a lowercase extension only.
 */
 $tw.utils.getFileExtensionInfo = function(ext) {
 	return ext ? $tw.config.fileExtensionInfo[ext.toLowerCase()] : null;
-};
+}
 
 /*
 Given an extension, get the correct encoding for that file.
@@ -586,7 +605,7 @@ var globalCheck =[
 	"    delete Object.prototype.__temp__;",
 	"  }",
 	"  delete Object.prototype.__temp__;",
-].join("\n");
+].join('\n');
 
 /*
 Run code globally with specified context variables in scope
@@ -611,10 +630,10 @@ $tw.utils.evalGlobal = function(code,context,filename,sandbox,allowGlobals) {
 	// Compile the code into a function
 	var fn;
 	if($tw.browser) {
-		fn = Function("return " + code + "\n\n//# sourceURL=" + filename)(); // See https://github.com/TiddlyWiki/TiddlyWiki5/issues/6839
+		fn = window["eval"](code + "\n\n//# sourceURL=" + filename);
 	} else {
 		if(sandbox){
-			fn = vm.runInContext(code,sandbox,filename);
+			fn = vm.runInContext(code,sandbox,filename)
 		} else {
 			fn = vm.runInThisContext(code,filename);
 		}
@@ -622,7 +641,7 @@ $tw.utils.evalGlobal = function(code,context,filename,sandbox,allowGlobals) {
 	// Call the function and return the exports
 	return fn.apply(null,contextValues);
 };
-$tw.utils.sandbox = !$tw.browser ? vm.createContext({}) : undefined;
+$tw.utils.sandbox = !$tw.browser ? vm.createContext({}) : undefined; 
 /*
 Run code in a sandbox with only the specified context variables in scope
 */
@@ -725,7 +744,7 @@ $tw.utils.PasswordPrompt.prototype.createPrompt = function(options) {
 	var self = this;
 	form.addEventListener("submit",function(event) {
 		// Collect the form data
-		var data = {};
+		var data = {},t;
 		$tw.utils.each(form.elements,function(element) {
 			if(element.name && element.value) {
 				data[element.name] = element.value;
@@ -771,7 +790,7 @@ $tw.utils.PasswordPrompt.prototype.removePrompt = function(promptInfo) {
 		promptInfo.form.parentNode.removeChild(promptInfo.form);
 		this.setWrapperDisplay();
 	}
-};
+}
 
 /*
 Crypto helper object for encrypted content. It maintains the password text in a closure, and provides methods to change
@@ -780,13 +799,12 @@ the password, and to encrypt/decrypt a block of text
 $tw.utils.Crypto = function() {
 	var sjcl = $tw.node ? (global.sjcl || require("./sjcl.js")) : window.sjcl,
 		currentPassword = null,
-		callSjcl = function(method,inputText,password,options) {
-			options = options || {};
+		callSjcl = function(method,inputText,password) {
 			password = password || currentPassword;
 			var outputText;
 			try {
 				if(password) {
-					outputText = sjcl[method](password,inputText,options);
+					outputText = sjcl[method](password,inputText);
 				}
 			} catch(ex) {
 				console.log("Crypto error:" + ex);
@@ -810,10 +828,9 @@ $tw.utils.Crypto = function() {
 	};
 	this.hasPassword = function() {
 		return !!currentPassword;
-	};
+	}
 	this.encrypt = function(text,password) {
-		// set default ks:256 -- see: http://bitwiseshiftleft.github.io/sjcl/doc/convenience.js.html
-		return callSjcl("encrypt",text,password,{v:1,iter:10000,ks:256,ts:64,mode:"ccm",adata:"",cipher:"aes"});
+		return callSjcl("encrypt",text,password);
 	};
 	this.decrypt = function(text,password) {
 		return callSjcl("decrypt",text,password);
@@ -828,7 +845,7 @@ Execute the module named 'moduleName'. The name can optionally be relative to th
 $tw.modules.execute = function(moduleName,moduleRoot) {
 	var name = moduleName;
 	if(moduleName.charAt(0) === ".") {
-		name = $tw.utils.resolvePath(moduleName,moduleRoot);
+		name = $tw.utils.resolvePath(moduleName,moduleRoot)
 	}
 	if(!$tw.modules.titles[name]) {
 		if($tw.modules.titles[name + ".js"]) {
@@ -889,6 +906,7 @@ $tw.modules.execute = function(moduleName,moduleRoot) {
 	if(!moduleInfo) {
 		// We could not find the module on this path
 		// Try to defer to browserify etc, or node
+		var deferredModule;
 		if($tw.browser) {
 			if(window.require) {
 				try {
@@ -1143,7 +1161,8 @@ enableIndexers - Array of indexer names to enable, or null to use all available
 */
 $tw.Wiki = function(options) {
 	options = options || {};
-	var tiddlers = Object.create(null), // Hashmap of tiddlers
+	var self = this,
+		tiddlers = Object.create(null), // Hashmap of tiddlers
 		tiddlerTitles = null, // Array of tiddler titles
 		getTiddlerTitles = function() {
 			if(!tiddlerTitles) {
@@ -1197,7 +1216,7 @@ $tw.Wiki = function(options) {
 						shadow: this.isShadowTiddler(title),
 						exists: this.tiddlerExists(title)
 					}
-				};
+				}
 				// Save the new tiddler
 				tiddlers[title] = tiddler;
 				// Check we've got the title
@@ -1207,7 +1226,7 @@ $tw.Wiki = function(options) {
 					tiddler: tiddler,
 					shadow: this.isShadowTiddler(title),
 					exists: this.tiddlerExists(title)
-				};
+				}
 				// Update indexes
 				this.clearCache(title);
 				this.clearGlobalCache();
@@ -1232,7 +1251,7 @@ $tw.Wiki = function(options) {
 					shadow: this.isShadowTiddler(title),
 					exists: this.tiddlerExists(title)
 				}
-			};
+			}
 			// Delete the tiddler
 			delete tiddlers[title];
 			// Delete it from the list of titles
@@ -1247,7 +1266,7 @@ $tw.Wiki = function(options) {
 				tiddler: this.getTiddler(title),
 				shadow: this.isShadowTiddler(title),
 				exists: this.tiddlerExists(title)
-			};
+			}
 			// Update indexes
 			this.clearCache(title);
 			this.clearGlobalCache();
@@ -1414,7 +1433,7 @@ $tw.Wiki = function(options) {
 			checkTiddler = function(tiddler,title) {
 				if(tiddler && tiddler.fields.type === "application/json" && tiddler.fields["plugin-type"] && (!pluginType || tiddler.fields["plugin-type"] === pluginType)) {
 					var disablingTiddler = self.getTiddler("$:/config/Plugins/Disabled/" + title);
-					if(title === "$:/core" || title === "$:/core-server" || !disablingTiddler || (disablingTiddler.fields.text || "").trim() !== "yes") {
+					if(title === "$:/core" || !disablingTiddler || (disablingTiddler.fields.text || "").trim() !== "yes") {
 						self.unregisterPluginTiddlers(null,[title]); // Unregister the plugin if it's already registered
 						pluginTiddlers.push(tiddler);
 						registeredTitles.push(tiddler.fields.title);
@@ -1435,7 +1454,8 @@ $tw.Wiki = function(options) {
 
 	// Unregister the plugin tiddlers of a particular type, or null/undefined for any type, optionally restricting unregistering to an array of tiddler titles. Returns an array of the titles affected
 	this.unregisterPluginTiddlers = function(pluginType,titles) {
-		var unregisteredTitles = [];
+		var self = this,
+			unregisteredTitles = [];
 		// Remove any previous registered plugins of this type
 		for(var t=pluginTiddlers.length-1; t>=0; t--) {
 			var tiddler = pluginTiddlers[t];
@@ -1449,15 +1469,16 @@ $tw.Wiki = function(options) {
 
 	// Unpack the currently registered plugins, creating shadow tiddlers for their constituent tiddlers
 	this.unpackPluginTiddlers = function() {
+		var self = this;
 		// Sort the plugin titles by the `plugin-priority` field, if this field is missing, default to 1
 		pluginTiddlers.sort(function(a, b) {
 			var priorityA = "plugin-priority" in a.fields ? a.fields["plugin-priority"] : 1;
 			var priorityB = "plugin-priority" in b.fields ? b.fields["plugin-priority"] : 1;
-			if(priorityA !== priorityB) {
+			if (priorityA !== priorityB) {
 				return priorityA - priorityB;
-			} else if(a.fields.title < b.fields.title) {
+			} else if (a.fields.title < b.fields.title) {
 				return -1;
-			} else if(a.fields.title === b.fields.title) {
+			} else if (a.fields.title === b.fields.title) {
 				return 0;
 			} else {
 				return +1;
@@ -1509,8 +1530,7 @@ Define all modules stored in ordinary tiddlers
 */
 $tw.Wiki.prototype.defineTiddlerModules = function() {
 	this.each(function(tiddler,title) {
-		// Modules in draft tiddlers are disabled
-		if(tiddler.hasField("module-type") && (!tiddler.hasField("draft.of"))) {
+		if(tiddler.hasField("module-type")) {
 			switch(tiddler.fields.type) {
 				case "application/javascript":
 					// We only define modules that haven't already been defined, because in the browser modules in system tiddlers are defined in inline script
@@ -1537,11 +1557,6 @@ $tw.Wiki.prototype.defineShadowModules = function() {
 	this.eachShadow(function(tiddler,title) {
 		// Don't define the module if it is overidden by an ordinary tiddler
 		if(!self.tiddlerExists(title) && tiddler.hasField("module-type")) {
-			if(tiddler.hasField("draft.of")) {
-				// Report a fundamental problem
-				console.warn(`TiddlyWiki: Plugins should not contain tiddlers with a 'draft.of' field: ${tiddler.fields.title}`);
-				return;
-			}
 			// Define the module
 			$tw.modules.define(tiddler.fields.title,tiddler.fields["module-type"],tiddler.fields.text);
 		}
@@ -1564,7 +1579,7 @@ $tw.Wiki.prototype.processSafeMode = function() {
 	// Assemble a report tiddler
 	var titleReportTiddler = "TiddlyWiki Safe Mode",
 		report = [];
-	report.push("TiddlyWiki has been started in [[safe mode|https://tiddlywiki.com/static/SafeMode.html]]. All plugins are temporarily disabled. Most customisations have been disabled by renaming the following tiddlers:");
+	report.push("TiddlyWiki has been started in [[safe mode|https://tiddlywiki.com/static/SafeMode.html]]. All plugins are temporarily disabled. Most customisations have been disabled by renaming the following tiddlers:")
 	// Delete the overrides
 	overrides.forEach(function(title) {
 		var tiddler = self.getTiddler(title),
@@ -1573,7 +1588,7 @@ $tw.Wiki.prototype.processSafeMode = function() {
 		self.addTiddler(new $tw.Tiddler(tiddler, {title: newTitle}));
 		report.push("* [[" + title + "|" + newTitle + "]]");
 	});
-	report.push();
+	report.push()
 	this.addTiddler(new $tw.Tiddler({title: titleReportTiddler, text: report.join("\n\n")}));
 	// Set $:/DefaultTiddlers to point to our report
 	this.addTiddler(new $tw.Tiddler({title: "$:/DefaultTiddlers", text: "[[" + titleReportTiddler + "]]"}));
@@ -1890,7 +1905,7 @@ $tw.loadTiddlersFromFile = function(filepath,fields) {
 		fileSize = fs.statSync(filepath).size,
 		data;
 	if(fileSize > $tw.config.maxEditFileSize) {
-		data = "File " + filepath + " not loaded because it is too large";
+		data = "File " + filepath + "not loaded because it is too large";
 		console.log("Warning: " + data);
 		ext = ".txt";
 	} else {
@@ -1961,41 +1976,22 @@ 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"), function(e) {
-		console.log("Warning: tiddlywiki.files in " + filepath + " invalid: " + e.message);
-		return {};
-	});
-
+	var filesInfo = $tw.utils.parseJSONSafe(fs.readFileSync(filepath + path.sep + "tiddlywiki.files","utf8"));
 	// Helper to process a file
 	var processFile = function(filename,isTiddlerFile,fields,isEditableFile,rootPath) {
 		var extInfo = $tw.config.fileExtensionInfo[path.extname(filename)],
 			type = (extInfo || {}).type || fields.type || "text/plain",
 			typeInfo = $tw.config.contentTypeInfo[type] || {},
 			pathname = path.resolve(filepath,filename),
+			text = fs.readFileSync(pathname,typeInfo.encoding || "utf8"),
 			metadata = $tw.loadMetadataForFile(pathname) || {},
-			fileTooLarge = false,
-			text, fileTiddlers;
-
-		if("_canonical_uri" in fields) {
-			text = "";
-		} else if(fs.statSync(pathname).size > $tw.config.maxEditFileSize) {
-			var msg = "File " + pathname + " not loaded because it is too large";
-			console.log("Warning: " + msg);
-			fileTooLarge = true;
-			text = isTiddlerFile ? msg : "";
-		} else {
-			text = fs.readFileSync(pathname,typeInfo.encoding || "utf8");
-		}
-
+			fileTiddlers;
 		if(isTiddlerFile) {
-			fileTiddlers = $tw.wiki.deserializeTiddlers(fileTooLarge ? ".txt" : path.extname(pathname),text,metadata) || [];
+			fileTiddlers = $tw.wiki.deserializeTiddlers(path.extname(pathname),text,metadata) || [];
 		} else {
 			fileTiddlers =  [$tw.utils.extend({text: text},metadata)];
 		}
 		var combinedFields = $tw.utils.extend({},fields,metadata);
-		if(fileTooLarge && isTiddlerFile) {
-			delete combinedFields.type;    // type altered
-		}
 		$tw.utils.each(fileTiddlers,function(tiddler) {
 			$tw.utils.each(combinedFields,function(fieldInfo,name) {
 				if(typeof fieldInfo === "string" || $tw.utils.isArray(fieldInfo)) {
@@ -2007,7 +2003,7 @@ $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
 							value = $tw.utils.stringifyList(path.relative(rootPath, filename).split(path.sep).slice(0, -1));
 							break;
 						case "filepath":
-							value = path.relative(rootPath, filename).split(path.sep).join("/");
+							value = path.relative(rootPath, filename).split(path.sep).join('/');
 							break;
 						case "filename":
 							value = path.basename(filename);
@@ -2060,7 +2056,7 @@ $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
 			}
 		});
 		return arrayOfFiles;
-	};
+	}
 	// Process the listed tiddlers
 	$tw.utils.each(filesInfo.tiddlers,function(tidInfo) {
 		if(tidInfo.prefix && tidInfo.suffix) {
@@ -2070,7 +2066,6 @@ $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
 		} else if(tidInfo.suffix) {
 			tidInfo.fields.text = {suffix: tidInfo.suffix};
 		}
-		tidInfo.fields = tidInfo.fields || {};
 		processFile(tidInfo.file,tidInfo.isTiddlerFile,tidInfo.fields);
 	});
 	// Process any listed directories
@@ -2092,7 +2087,6 @@ $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
 					var thisPath = path.relative(filepath, files[t]),
 					filename = path.basename(thisPath);
 					if(filename !== "tiddlywiki.files" && !metaRegExp.test(filename) && fileRegExp.test(filename)) {
-						dirSpec.fields = dirSpec.fields || {};
 						processFile(thisPath,dirSpec.isTiddlerFile,dirSpec.fields,dirSpec.isEditableFile,dirSpec.path);
 					}
 				}
@@ -2169,7 +2163,7 @@ Returns the path of the plugin folder
 $tw.findLibraryItem = function(name,paths) {
 	var pathIndex = 0;
 	do {
-		var pluginPath = path.resolve(paths[pathIndex],"./" + name);
+		var pluginPath = path.resolve(paths[pathIndex],"./" + name)
 		if(fs.existsSync(pluginPath) && fs.statSync(pluginPath).isDirectory()) {
 			return pluginPath;
 		}
@@ -2356,7 +2350,6 @@ $tw.loadTiddlersNode = function() {
 	});
 	// Load the core tiddlers
 	$tw.wiki.addTiddler($tw.loadPluginFolder($tw.boot.corePath));
-	$tw.wiki.addTiddler($tw.loadPluginFolder($tw.boot.coreServerPath));
 	// Load any extra plugins
 	$tw.utils.each($tw.boot.extraPlugins,function(name) {
 		if(name.charAt(0) === "+") { // Relative path to plugin
@@ -2430,7 +2423,6 @@ $tw.boot.initStartup = function(options) {
 		// System paths and filenames
 		$tw.boot.bootPath = options.bootPath || path.dirname(module.filename);
 		$tw.boot.corePath = path.resolve($tw.boot.bootPath,"../core");
-		$tw.boot.coreServerPath = path.resolve($tw.boot.bootPath,"../core-server");
 		// If there's no arguments then default to `--help`
 		if($tw.boot.argv.length === 0) {
 			$tw.boot.argv = ["--help"];
@@ -2528,7 +2520,7 @@ $tw.boot.initStartup = function(options) {
 				}
 			});
 			return result;
-		};
+		}
 	}
 };
 $tw.boot.loadStartup = function(options){
@@ -2545,7 +2537,7 @@ $tw.boot.loadStartup = function(options){
 	}
 	// Give hooks a chance to modify the store
 	$tw.hooks.invokeHook("th-boot-tiddlers-loaded");
-};
+}
 $tw.boot.execStartup = function(options){
 	// Unpack plugin tiddlers
 	$tw.wiki.readPluginInfo();
@@ -2555,10 +2547,10 @@ $tw.boot.execStartup = function(options){
 	if($tw.safeMode) {
 		$tw.wiki.processSafeMode();
 	}
-	// Register typed modules from the tiddlers we've just loaded and any modules within plugins
-	// Tiddlers should appear last so that they may overwrite shadows during module registration
-	$tw.wiki.defineShadowModules();
+	// Register typed modules from the tiddlers we've just loaded
 	$tw.wiki.defineTiddlerModules();
+	// And any modules within plugins
+	$tw.wiki.defineShadowModules();
 	// Make sure the crypto state tiddler is up to date
 	if($tw.crypto) {
 		$tw.crypto.updateCryptoStateTiddler();
@@ -2575,7 +2567,7 @@ $tw.boot.execStartup = function(options){
 	$tw.boot.disabledStartupModules = $tw.boot.disabledStartupModules || [];
 	// Repeatedly execute the next eligible task
 	$tw.boot.executeNextStartupTask(options.callback);
-};
+}
 /*
 Startup TiddlyWiki
 */
@@ -2594,7 +2586,7 @@ $tw.addUnloadTask = function(task) {
 	if($tw.unloadTasks.indexOf(task) === -1) {
 		$tw.unloadTasks.push(task);
 	}
-};
+}
 
 /*
 Execute the remaining eligible startup tasks
@@ -2627,13 +2619,11 @@ $tw.boot.executeNextStartupTask = function(callback) {
 			$tw.boot.log(s.join(" "));
 			// Execute task
 			if(!$tw.utils.hop(task,"synchronous") || task.synchronous) {
-				const thenable = task.startup();
-				if(thenable && typeof thenable.then === "function"){
-					thenable.then(asyncTaskCallback);
-					return true;
-				} else {
-					return asyncTaskCallback();
+				task.startup();
+				if(task.name) {
+					$tw.boot.executedStartupModules[task.name] = true;
 				}
+				return $tw.boot.executeNextStartupTask(callback);
 			} else {
 				task.startup(asyncTaskCallback);
 				return true;
@@ -2641,7 +2631,7 @@ $tw.boot.executeNextStartupTask = function(callback) {
 		}
 		taskIndex++;
 	}
-	if(typeof callback === "function") {
+	if(typeof callback === 'function') {
 		callback();
 	}
 	return false;
@@ -2778,8 +2768,6 @@ return $tw;
 
 });
 
-/* eslint-enable @stylistic/indent */
-
 if(typeof(exports) !== "undefined") {
 	exports.TiddlyWiki = _boot;
 } else {

boot/bootprefix.js

@@ -12,8 +12,6 @@ See Boot.js for further details of the boot process.
 
 \*/
 
-/* eslint-disable @stylistic/indent */
-
 var _bootprefix = (function($tw) {
 
 "use strict";
@@ -116,8 +114,6 @@ return $tw;
 
 });
 
-/* eslint-enable @stylistic/indent */
-
 if(typeof(exports) === "undefined") {
 	// Set up $tw global for the browser
 	window.$tw = _bootprefix(window.$tw);

core-server/commands/render.js

@@ -1,63 +0,0 @@
-/*\
-title: $:/core/modules/commands/render.js
-type: application/javascript
-module-type: command
-
-Render individual tiddlers and save the results to the specified files
-
-\*/
-
-"use strict";
-	
-exports.info = {
-	name: "render",
-	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 tiddler filter";
-	}
-	var self = this,
-		fs = require("fs"),
-		path = require("path"),
-		wiki = this.commander.wiki,
-		tiddlerFilter = this.params[0],
-		filenameFilter = this.params[1] || "[is[tiddler]addsuffix[.html]]",
-		type = this.params[2] || "text/html",
-		template = this.params[3],
-		variableList = this.params.slice(4),
-		tiddlers = wiki.filterTiddlers(tiddlerFilter),
-		variables =  Object.create(null);
-	while(variableList.length >= 2) {
-		variables[variableList[0]] = variableList[1];
-		variableList = variableList.slice(2);
-	}
-	$tw.utils.each(tiddlers,function(title) {
-		var filenameResults = wiki.filterTiddlers(filenameFilter,$tw.rootWidget,wiki.makeTiddlerIterator([title]));
-		if(filenameResults.length > 0) {
-			var filepath = path.resolve(self.commander.outputPath,filenameResults[0]);
-			if(self.commander.verbose) {
-				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})}),
-				container = $tw.fakeDocument.createElement("div");
-			widgetNode.render(container,null);
-			var text = type === "text/html" ? container.innerHTML : container.textContent;
-			$tw.utils.createFileDirectories(filepath);
-			fs.writeFileSync(filepath,text,"utf8");
-		} else {
-			console.log("Not rendering \"" + title + "\" because the filename filter returned an empty result");
-		}
-	});
-	return null;
-};
-	
-exports.Command = Command;

core-server/commands/save.js

@@ -1,62 +0,0 @@
-/*\
-title: $:/core/modules/commands/save.js
-type: application/javascript
-module-type: command
-
-Saves individual tiddlers in their raw text or binary format to the specified files
-
-\*/
-
-"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,
-		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: {
-						overwrite: true
-					}
-				});
-				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;

core-server/plugin.info

@@ -1,11 +0,0 @@
-{
-	"title": "$:/core-server",
-	"name": "Core Server Components",
-	"description": "TiddlyWiki5 core server components",
-	"author": "JeremyRuston",
-	"core-version": ">=5.0.0",
-	"platform": "server",
-	"plugin-priority": "0",
-	"list": "readme",
-	"stability": "STABILITY_2_STABLE"
-}

core-server/readme.tid

@@ -1,7 +0,0 @@
-title: $:/core-server/readme
-
-This plugin contains TiddlyWiki's core components that are only needed on the server, comprising:
-
-* Commands
-* HTTP server code
-* Utility functions for server

core-server/server/routes/get-file.js

@@ -1,73 +0,0 @@
-/*\
-title: $:/core/modules/server/routes/get-file.js
-type: application/javascript
-module-type: route
-
-GET /files/:filepath
-
-\*/
-"use strict";
-
-exports.methods = ["GET"];
-
-exports.path = /^\/files\/(.+)$/;
-
-exports.info = {
-	priority: 100
-};
-
-exports.handler = function(request,response,state) {
-	var path = require("path"),
-		fs = require("fs"),
-		suppliedFilename = $tw.utils.decodeURIComponentSafe(state.params[0]),
-		baseFilename = path.resolve(state.boot.wikiPath,"files"),
-		filename = path.resolve(baseFilename,suppliedFilename),
-		extension = path.extname(filename);
-	// Check that the filename is inside the wiki files folder
-	if(path.relative(baseFilename,filename).indexOf("..") === 0) {
-		return state.sendResponse(404,{"Content-Type": "text/plain"},"File '" + suppliedFilename + "' not found");
-	}
-	fs.stat(filename, function(err, stats) {
-		if(err) {
-			return state.sendResponse(404,{"Content-Type": "text/plain"},"File '" + suppliedFilename + "' not found");
-		} else {
-			var type = ($tw.config.fileExtensionInfo[extension] ? $tw.config.fileExtensionInfo[extension].type : "application/octet-stream"),
-				responseHeaders = {
-					"Content-Type": type,
-					"Accept-Ranges": "bytes"
-				};
-			var rangeHeader = request.headers.range,
-				stream;
-			if(rangeHeader) {
-				// Handle range requests
-				var parts = rangeHeader.replace(/bytes=/, "").split("-"),
-					start = parseInt(parts[0], 10),
-					end = parts[1] ? parseInt(parts[1], 10) : stats.size - 1;
-				// Validate start and end
-				if(isNaN(start) || isNaN(end) || start < 0 || end < start || end >= stats.size) {
-					responseHeaders["Content-Range"] = "bytes */" + stats.size;
-					return response.writeHead(416, responseHeaders).end();
-				}
-				var chunksize = (end - start) + 1;
-				responseHeaders["Content-Range"] = "bytes " + start + "-" + end + "/" + stats.size;
-				responseHeaders["Content-Length"] = chunksize;
-				response.writeHead(206, responseHeaders);
-				stream = fs.createReadStream(filename, {start: start, end: end});
-			} else {
-				responseHeaders["Content-Length"] = stats.size;
-				response.writeHead(200, responseHeaders);
-				stream = fs.createReadStream(filename);
-			}
-			// Common stream error handling
-			stream.on("error", function(err) {
-				if(!response.headersSent) {
-					response.writeHead(500, {"Content-Type": "text/plain"});
-					response.end("Read error");
-				} else {
-					response.destroy();
-				}
-			});
-			stream.pipe(response);
-		}
-	});
-};

core-server/utils/base64.js

@@ -1,30 +0,0 @@
-/*\
-title: $:/core-modules/modules/utils/base64.js
-type: application/javascript
-module-type: utils-node
-
-Base64 UTF-8 utlity functions.
-
-\*/
-
-"use strict";
-
-const { TextEncoder, TextDecoder } = require("node:util");
-
-exports.btoa = (binstr) => Buffer.from(binstr, "binary").toString("base64");
-
-exports.atob = (b64) => Buffer.from(b64, "base64").toString("binary");
-
-function base64ToBytes(base64) {
-	const binString = exports.atob(base64);
-	return Uint8Array.from(binString, (m) => m.codePointAt(0));
-};
-
-function bytesToBase64(bytes) {
-	const binString = Array.from(bytes, (byte) => String.fromCodePoint(byte)).join("");
-	return exports.btoa(binString);
-};
-
-exports.base64EncodeUtf8 = (str) => bytesToBase64(new TextEncoder().encode(str));
-
-exports.base64DecodeUtf8 = (str) => new TextDecoder().decode(base64ToBytes(str));

core-server/utils/escapecss.js

@@ -1,95 +0,0 @@
-/*\
-title: $:/core-server/modules/utils/escapecss.js
-type: application/javascript
-module-type: utils-node
-
-Provides CSS.escape() functionality.
-
-\*/
-
-"use strict";
-
-exports.escapeCSS = (function() {
-	// see also https://drafts.csswg.org/cssom/#serialize-an-identifier
-
-	/* eslint-disable */
-	/*! https://mths.be/cssescape v1.5.1 by @mathias | MIT license */
-	return function(value) {
-		if (arguments.length == 0) {
-			throw new TypeError('`CSS.escape` requires an argument.');
-		}
-		var string = String(value);
-		var length = string.length;
-		var index = -1;
-		var codeUnit;
-		var result = '';
-		var firstCodeUnit = string.charCodeAt(0);
-		while (++index < length) {
-			codeUnit = string.charCodeAt(index);
-			// Note: there’s no need to special-case astral symbols, surrogate
-			// pairs, or lone surrogates.
-
-			// If the character is NULL (U+0000), then the REPLACEMENT CHARACTER
-			// (U+FFFD).
-			if (codeUnit == 0x0000) {
-				result += '\uFFFD';
-				continue;
-			}
-
-			if (
-				// If the character is in the range [\1-\1F] (U+0001 to U+001F) or is
-				// U+007F, […]
-				(codeUnit >= 0x0001 && codeUnit <= 0x001F) || codeUnit == 0x007F ||
-				// If the character is the first character and is in the range [0-9]
-				// (U+0030 to U+0039), […]
-				(index == 0 && codeUnit >= 0x0030 && codeUnit <= 0x0039) ||
-				// If the character is the second character and is in the range [0-9]
-				// (U+0030 to U+0039) and the first character is a `-` (U+002D), […]
-				(
-					index == 1 &&
-					codeUnit >= 0x0030 && codeUnit <= 0x0039 &&
-					firstCodeUnit == 0x002D
-				)
-			) {
-				// https://drafts.csswg.org/cssom/#escape-a-character-as-code-point
-				result += '\\' + codeUnit.toString(16) + ' ';
-				continue;
-			}
-
-			if (
-				// If the character is the first character and is a `-` (U+002D), and
-				// there is no second character, […]
-				index == 0 &&
-				length == 1 &&
-				codeUnit == 0x002D
-			) {
-				result += '\\' + string.charAt(index);
-				continue;
-			}
-
-			// If the character is not handled by one of the above rules and is
-			// greater than or equal to U+0080, is `-` (U+002D) or `_` (U+005F), or
-			// is in one of the ranges [0-9] (U+0030 to U+0039), [A-Z] (U+0041 to
-			// U+005A), or [a-z] (U+0061 to U+007A), […]
-			if (
-				codeUnit >= 0x0080 ||
-				codeUnit == 0x002D ||
-				codeUnit == 0x005F ||
-				codeUnit >= 0x0030 && codeUnit <= 0x0039 ||
-				codeUnit >= 0x0041 && codeUnit <= 0x005A ||
-				codeUnit >= 0x0061 && codeUnit <= 0x007A
-			) {
-				// the character itself
-				result += string.charAt(index);
-				continue;
-			}
-
-			// Otherwise, the escaped character.
-			// https://drafts.csswg.org/cssom/#escape-a-character
-			result += '\\' + string.charAt(index);
-
-		}
-		return result;
-	};
-	/* eslint-enable */
-})();

core/acknowledgements.tid

@@ -5,4 +5,3 @@ TiddlyWiki incorporates code from these fine OpenSource projects:
 * [[The Stanford Javascript Crypto Library|http://bitwiseshiftleft.github.io/sjcl/]]
 * [[The Jasmine JavaScript Test Framework|https://jasmine.github.io/]]
 * [[modern-normalize by Sindre Sorhus|https://github.com/sindresorhus/modern-normalize]]
-* [[diff-match-patch-es by antfu|https://github.com/antfu/diff-match-patch-es]]

core/language/en-GB/ControlPanel.multids

@@ -6,7 +6,6 @@ Appearance/Caption: Appearance
 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/AutoFocusEdit/Prompt: Default focus field for existing 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/Prompt: Default tiddlers
@@ -148,7 +147,7 @@ Settings/AutoSave/Disabled/Description: Do not save changes automatically
 Settings/AutoSave/Enabled/Description: Save changes automatically
 Settings/AutoSave/Hint: Attempt to automatically save changes during editing when using a supporting saver
 Settings/CamelCase/Caption: Camel Case Wiki Links
-Settings/CamelCase/Hint: Requires reload to take effect
+Settings/CamelCase/Hint: You can globally disable automatic linking of ~CamelCase phrases. Requires reload to take effect
 Settings/CamelCase/Description: Enable automatic ~CamelCase linking
 Settings/Caption: Settings
 Settings/EditorToolbar/Caption: Editor Toolbar

core/language/en-GB/Draft.multids

@@ -1,4 +0,0 @@
-title: $:/language/Draft/
-
-Attribution: Draft of '<<draft-title>>' by {{$:/status/UserName}}
-Title: Draft of '<<draft-title>>'

core/language/en-GB/Misc.multids

@@ -1,6 +1,5 @@
 title: $:/language/
 
-Alerts: Alerts
 AboveStory/ClassicPlugin/Warning: It looks like you are trying to load a plugin designed for ~TiddlyWiki Classic. Please note that [[these plugins do not work with TiddlyWiki version 5.x.x|https://tiddlywiki.com/#TiddlyWikiClassic]]. ~TiddlyWiki Classic plugins detected:
 BinaryWarning/Prompt: This tiddler contains binary data
 ClassicWarning/Hint: This tiddler is written in TiddlyWiki Classic wiki text format, which is not fully compatible with TiddlyWiki version 5. See https://tiddlywiki.com/static/Upgrading.html for more details.

core/language/en-GB/TiddlerInfo.multids

@@ -9,11 +9,6 @@ Advanced/ShadowInfo/NotShadow/Hint: The tiddler <$link to=<<infoTiddler>>><$text
 Advanced/ShadowInfo/Shadow/Hint: The tiddler <$link to=<<infoTiddler>>><$text text=<<infoTiddler>>/></$link> is a shadow tiddler
 Advanced/ShadowInfo/Shadow/Source: It is defined in the plugin <$link to=<<pluginTiddler>>><$text text=<<pluginTiddler>>/></$link>
 Advanced/ShadowInfo/OverriddenShadow/Hint: It is overridden by an ordinary tiddler
-Advanced/CascadeInfo/Heading: Cascade Details
-Advanced/CascadeInfo/Hint: These are the view template segments (tagged <<tag "$:/tags/ViewTemplate">>) using a cascade filter and their resulting template for the current tiddler.
-Advanced/CascadeInfo/Detail/View: View
-Advanced/CascadeInfo/Detail/ActiveCascadeFilter: Active cascade filter
-Advanced/CascadeInfo/Detail/Template: Template
 Fields/Caption: Fields
 List/Caption: List
 List/Empty: This tiddler does not have a list

core/modules/background-actions.js

@@ -1,116 +0,0 @@
-/*\
-title: $:/core/modules/background-actions.js
-type: application/javascript
-module-type: global
-
-Class to dispatch actions when filters change
-
-\*/
-
-"use strict";
-
-class BackgroundActionDispatcher {
-	constructor(filterTracker, wiki) {
-		this.filterTracker = filterTracker;
-		this.wiki = wiki;
-		this.nextTrackedFilterId = 1;
-		this.trackedFilters = new Map(); // Use Map for better key management
-		// Track the filter for the background actions
-		this.filterTracker.track({
-			filterString: "[all[tiddlers+shadows]tag[$:/tags/BackgroundAction]!is[draft]]",
-			fnEnter: (title) => this.trackFilter(title),
-			fnLeave: (title, enterValue) => this.untrackFilter(enterValue),
-			fnChange: (title, enterValue) => {
-				this.untrackFilter(enterValue);
-				return this.trackFilter(title);
-			},
-			fnProcess: (changes) => this.process(changes)
-		});
-	}
-
-	trackFilter(title) {
-		const tiddler = this.wiki.getTiddler(title);
-		const id = this.nextTrackedFilterId++;
-		const tracker = new BackgroundActionTracker({
-			wiki: this.wiki,
-			title,
-			trackFilter: tiddler.fields["track-filter"],
-			actions: tiddler.fields.text
-		});
-		this.trackedFilters.set(id, tracker);
-		return id;
-	}
-
-	untrackFilter(enterValue) {
-		const tracker = this.trackedFilters.get(enterValue);
-		if(tracker) {
-			tracker.destroy();
-		}
-		this.trackedFilters.delete(enterValue);
-	}
-
-	process(changes) {
-		for(const tracker of this.trackedFilters.values()) {
-			tracker.process(changes);
-		}
-	}
-}
-
-/*
-Represents an individual tracked filter. Options include:
-wiki: wiki to use
-title: title of the tiddler being tracked
-trackFilter: filter string to track changes
-actions: actions to be executed when the filter changes
-*/
-class BackgroundActionTracker {
-	constructor({wiki, title, trackFilter, actions}) {
-		this.wiki = wiki;
-		this.title = title;
-		this.trackFilter = trackFilter;
-		this.actions = actions;
-		this.filterTracker = new $tw.FilterTracker(this.wiki);
-		this.hasChanged = false;
-		this.trackerID = this.filterTracker.track({
-			filterString: this.trackFilter,
-			fnEnter: () => { this.hasChanged = true; },
-			fnLeave: () => { this.hasChanged = true; },
-			fnProcess: (changes) => {
-				if(this.hasChanged) {
-					this.hasChanged = false;
-					console.log("Processing background action", this.title);
-					const tiddler = this.wiki.getTiddler(this.title);
-					let doActions = true;
-					if(tiddler && tiddler.fields.platforms) {
-						doActions = false;
-						const platforms = $tw.utils.parseStringArray(tiddler.fields.platforms);
-						if(($tw.browser && platforms.includes("browser")) || ($tw.node && platforms.includes("node"))) {
-							doActions = true;
-						}
-					}
-					if(doActions) {
-						this.wiki.invokeActionString(
-							this.actions,
-							null,
-							{
-								currentTiddler: this.title
-							},{
-								parentWidget: $tw.rootWidget
-							}
-						);
-					}
-				}
-			}
-		});
-	}
-
-	process(changes) {
-		this.filterTracker.handleChangeEvent(changes);
-	}
-
-	destroy() {
-		this.filterTracker.untrack(this.trackerID);
-	}
-}
-
-exports.BackgroundActionDispatcher = BackgroundActionDispatcher;

core/modules/commander.js

@@ -99,18 +99,16 @@ Commander.prototype.executeNextCommand = function() {
 					}
 				}
 				if(command.info.synchronous) {
-					// Synchronous command (await thenables)
+					// Synchronous command
 					c = new command.Command(params,this);
 					err = c.execute();
-					if(err && typeof err.then === "function") {
-						err.then((e) => { e ? this.callback(e) : this.executeNextCommand(); });
-					} else if(err) {
+					if(err) {
 						this.callback(err);
 					} else {
 						this.executeNextCommand();
 					}
 				} else {
-					// Asynchronous command (await thenables)
+					// Asynchronous command
 					c = new command.Command(params,this,function(err) {
 						if(err) {
 							self.callback(err);
@@ -119,9 +117,7 @@ Commander.prototype.executeNextCommand = function() {
 						}
 					});
 					err = c.execute();
-					if(err && typeof err.then === "function") {
-						err.then((e) => { if(e) this.callback(e); });
-					} else if(err) {
+					if(err) {
 						this.callback(err);
 					}
 				}

core/modules/commands/commands.js

@@ -25,7 +25,7 @@ Command.prototype.execute = function() {
 	if(!filter) {
 		return "No filter specified";
 	}
-	var commands = this.commander.wiki.filterTiddlers(filter);
+	var commands = this.commander.wiki.filterTiddlers(filter)
 	if(commands.length === 0) {
 		return "No tiddlers found for filter '" + filter + "'";
 	}

core/modules/commands/deletetiddlers.js

@@ -24,7 +24,8 @@ Command.prototype.execute = function() {
 	if(this.params.length < 1) {
 		return "Missing filter";
 	}
-	var wiki = this.commander.wiki,
+	var self = this,
+		wiki = this.commander.wiki,
 		filter = this.params[0],
 		tiddlers = wiki.filterTiddlers(filter);
 	$tw.utils.each(tiddlers,function(title) {

core/modules/commands/fetch.js

@@ -66,7 +66,7 @@ Command.prototype.fetchFiles = function(options) {
 	// Get the list of URLs
 	var urls;
 	if(options.url) {
-		urls = [options.url];
+		urls = [options.url]
 	} else if(options.urlFilter) {
 		urls = this.commander.wiki.filterTiddlers(options.urlFilter);
 	} else {
@@ -96,30 +96,30 @@ Command.prototype.fetchFile = function(url,options,callback,redirectCount) {
 	var self = this,
 		lib = url.substr(0,8) === "https://" ? require("https") : require("http");
 	lib.get(url).on("response",function(response) {
-		var type = (response.headers["content-type"] || "").split(";")[0],
-			data = [];
-		self.commander.write("Reading " + url + ": ");
-		response.on("data",function(chunk) {
-			data.push(chunk);
-			self.commander.write(".");
-		});
-		response.on("end",function() {
-			self.commander.write("\n");
-			if(response.statusCode === 200) {
-				self.processBody(Buffer.concat(data),type,options,url);
-				callback(null);
-			} else {
-				if(response.statusCode === 302 || response.statusCode === 303 || response.statusCode === 307) {
-					return self.fetchFile(response.headers.location,options,callback,redirectCount + 1);
-				} else {
-					return callback("Error " + response.statusCode + " retrieving " + url);
-				}
-			}
-		});
-		response.on("error",function(e) {
+	    var type = (response.headers["content-type"] || "").split(";")[0],
+	    	data = [];
+	    self.commander.write("Reading " + url + ": ");
+	    response.on("data",function(chunk) {
+	        data.push(chunk);
+	        self.commander.write(".");
+	    });
+	    response.on("end",function() {
+	        self.commander.write("\n");
+	        if(response.statusCode === 200) {
+		        self.processBody(Buffer.concat(data),type,options,url);
+		        callback(null);
+	        } else {
+	        	if(response.statusCode === 302 || response.statusCode === 303 || response.statusCode === 307) {
+	        		return self.fetchFile(response.headers.location,options,callback,redirectCount + 1);
+	        	} else {
+		        	return callback("Error " + response.statusCode + " retrieving " + url)
+	        	}
+	        }
+	   	});
+	   	response.on("error",function(e) {
 			console.log("Error on GET request: " + e);
 			callback(e);
-		});
+	   	});
 	});
 	return null;
 };
@@ -153,18 +153,18 @@ Command.prototype.processBody = function(body,type,options,url) {
 			if(options.transformFilter) {
 				var transformedTitle = (incomingWiki.filterTiddlers(options.transformFilter,null,self.commander.wiki.makeTiddlerIterator([title])) || [""])[0];
 				if(transformedTitle) {
-					self.commander.log("Importing " + title + " as " + transformedTitle);
+					self.commander.log("Importing " + title + " as " + transformedTitle)
 					newTiddler = new $tw.Tiddler(tiddler,{title: transformedTitle});
 				}
 			} else {
-				self.commander.log("Importing " + title);
+				self.commander.log("Importing " + title)
 				newTiddler = tiddler;
 			}
 			self.commander.wiki.importTiddler(newTiddler);
 			count++;
 		}
 	});
-	self.commander.log("Imported " + count + " tiddlers");
+	self.commander.log("Imported " + count + " tiddlers")
 };
 
 exports.Command = Command;

core/modules/commands/import.js

@@ -22,7 +22,8 @@ var Command = function(params,commander,callback) {
 
 Command.prototype.execute = function() {
 	var self = this,
-		fs = require("fs");
+		fs = require("fs"),
+		path = require("path");
 	if(this.params.length < 2) {
 		return "Missing parameters";
 	}

core/modules/commands/init.js

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

core/modules/commands/listen.js

@@ -19,6 +19,7 @@ exports.info = {
 };
 
 var Command = function(params,commander,callback) {
+	var self = this;
 	this.params = params;
 	this.commander = commander;
 	this.callback = callback;

core/modules/commands/load.js

@@ -21,7 +21,9 @@ var Command = function(params,commander,callback) {
 };
 
 Command.prototype.execute = function() {
-	var self = this;
+	var self = this,
+		fs = require("fs"),
+		path = require("path");
 	if(this.params.length < 1) {
 		return "Missing filename";
 	}

core/modules/commands/output.js

@@ -21,7 +21,8 @@ var Command = function(params,commander,callback) {
 };
 
 Command.prototype.execute = function() {
-	var path = require("path");
+	var fs = require("fs"),
+		path = require("path");
 	if(this.params.length < 1) {
 		return "Missing output path";
 	}

core/modules/commands/render.js

@@ -0,0 +1,65 @@
+/*\
+title: $:/core/modules/commands/render.js
+type: application/javascript
+module-type: command
+
+Render individual tiddlers and save the results to the specified files
+
+\*/
+
+	"use strict";
+	
+	var widget = require("$:/core/modules/widgets/widget.js");
+	
+	exports.info = {
+		name: "render",
+		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 tiddler filter";
+		}
+		var self = this,
+			fs = require("fs"),
+			path = require("path"),
+			wiki = this.commander.wiki,
+			tiddlerFilter = this.params[0],
+			filenameFilter = this.params[1] || "[is[tiddler]addsuffix[.html]]",
+			type = this.params[2] || "text/html",
+			template = this.params[3],
+			variableList = this.params.slice(4),
+			tiddlers = wiki.filterTiddlers(tiddlerFilter),
+			variables =  Object.create(null);
+			while(variableList.length >= 2) {
+				variables[variableList[0]] = variableList[1];
+				variableList = variableList.slice(2);
+			}
+		$tw.utils.each(tiddlers,function(title) {
+			var filenameResults = wiki.filterTiddlers(filenameFilter,$tw.rootWidget,wiki.makeTiddlerIterator([title]));
+			if(filenameResults.length > 0) {
+				var filepath = path.resolve(self.commander.outputPath,filenameResults[0]);
+				if(self.commander.verbose) {
+					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})}),
+					container = $tw.fakeDocument.createElement("div");
+				widgetNode.render(container,null);
+				var text = type === "text/html" ? container.innerHTML : container.textContent;
+				$tw.utils.createFileDirectories(filepath);
+				fs.writeFileSync(filepath,text,"utf8");
+			} else {
+				console.log("Not rendering \"" + title + "\" because the filename filter returned an empty result");
+			}
+		});
+		return null;
+	};
+	
+	exports.Command = Command;

core/modules/commands/rendertiddlers.js

@@ -9,6 +9,8 @@ Command to render several tiddlers to a folder of files
 
 "use strict";
 
+var widget = require("$:/core/modules/widgets/widget.js");
+
 exports.info = {
 	name: "rendertiddlers",
 	synchronous: true

core/modules/commands/save.js

@@ -0,0 +1,63 @@
+/*\
+title: $:/core/modules/commands/save.js
+type: application/javascript
+module-type: command
+
+Saves individual tiddlers in their raw text or binary format to the specified files
+
+\*/
+
+	"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"),
+			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: {
+							overwrite: true
+						}
+					});
+					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;

core/modules/commands/savetiddlers.js

@@ -9,6 +9,8 @@ Command to save several tiddlers to a folder of files
 
 "use strict";
 
+var widget = require("$:/core/modules/widgets/widget.js");
+
 exports.info = {
 	name: "savetiddlers",
 	synchronous: true

core/modules/commands/savewikifolder.js

@@ -43,7 +43,7 @@ Command.prototype.execute = function() {
 		namedParames,
 		tiddlerFilter,
 		options = {};
-	if(regFilter.test(this.params[1])) {  
+	if (regFilter.test(this.params[1])) {  
 		namedParames = this.commander.extractNamedParameters(this.params.slice(1));
 		tiddlerFilter = namedParames.filter || "[all[tiddlers]]";
 	} else {
@@ -76,7 +76,6 @@ WikiFolderMaker.prototype.tiddlersToIgnore = [
 	"$:/boot/boot.js",
 	"$:/boot/bootprefix.js",
 	"$:/core",
-	"$:/core-server",
 	"$:/library/sjcl.js",
 	"$:/temp/info-plugin"
 ];
@@ -177,13 +176,13 @@ WikiFolderMaker.prototype.saveCustomPlugin = function(pluginTiddler) {
 	$tw.utils.each(pluginTiddlers,function(tiddler,title) {
 		if(!tiddler.title) {
 			tiddler.title = title;
-		}
+		 }
 		self.saveTiddler(directory,new $tw.Tiddler(tiddler));
 	});
 };
 
 WikiFolderMaker.prototype.saveTiddler = function(directory,tiddler) {
-	var fileInfo, pathFilters, extFilters;
+	var title = tiddler.fields.title, fileInfo, pathFilters, extFilters;
 	if(this.wiki.tiddlerExists("$:/config/FileSystemPaths")) {
 		pathFilters = this.wiki.getTiddlerText("$:/config/FileSystemPaths","").split("\n");
 	}

core/modules/commands/server.js

@@ -17,6 +17,7 @@ exports.info = {
 };
 
 var Command = function(params,commander,callback) {
+	var self = this;
 	this.params = params;
 	this.commander = commander;
 	this.callback = callback;

core/modules/commands/setfield.js

@@ -9,6 +9,8 @@ Command to modify selected tiddlers to set a field to the text of a template tid
 
 "use strict";
 
+var widget = require("$:/core/modules/widgets/widget.js");
+
 exports.info = {
 	name: "setfield",
 	synchronous: true
@@ -24,7 +26,8 @@ Command.prototype.execute = function() {
 	if(this.params.length < 4) {
 		return "Missing parameters";
 	}
-	var wiki = this.commander.wiki,
+	var self = this,
+		wiki = this.commander.wiki,
 		filter = this.params[0],
 		fieldname = this.params[1] || "text",
 		templatetitle = this.params[2],

core/modules/editor/engines/framed.js

@@ -34,7 +34,7 @@ function FramedEngine(options) {
 	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("<!DOCTYPE html><html><head><meta name='color-scheme' content='" + colorScheme + "'></head><body></body></html>");
+	this.iframeDoc.write("<meta name='color-scheme' content='" + colorScheme + "'>");
 	this.iframeDoc.close();
 	// Style the iframe
 	this.iframeNode.className = this.dummyTextArea.className;
@@ -156,8 +156,8 @@ Fix the height of textarea to fit content
 FramedEngine.prototype.fixHeight = function() {
 	// Make sure styles are updated
 	this.copyStyles();
-	// If .editRows is initialised, it takes precedence
-	if(this.widget.editTag === "textarea" && !this.widget.editRows) {
+	// Adjust height
+	if(this.widget.editTag === "textarea") {
 		if(this.widget.editAutoHeight) {
 			if(this.domNode && !this.domNode.isTiddlyWikiFakeDom) {
 				var newHeight = $tw.utils.resizeTextAreaToFit(this.domNode,this.widget.editMinHeight);
@@ -197,7 +197,7 @@ FramedEngine.prototype.handleFocusEvent = function(event) {
 Handle a keydown event
  */
 FramedEngine.prototype.handleKeydownEvent = function(event) {
-	if($tw.keyboardManager.handleKeydownEvent(event, {onlyPriority: true})) {
+	if ($tw.keyboardManager.handleKeydownEvent(event, {onlyPriority: true})) {
 		return true;
 	}
 

core/modules/editor/engines/simple.js

@@ -100,8 +100,7 @@ SimpleEngine.prototype.getText = function() {
 Fix the height of textarea to fit content
 */
 SimpleEngine.prototype.fixHeight = function() {
-	// If .editRows is initialised, it takes precedence
-	if((this.widget.editTag === "textarea") && !this.widget.editRows) {
+	if(this.widget.editTag === "textarea") {
 		if(this.widget.editAutoHeight) {
 			if(this.domNode && !this.domNode.isTiddlyWikiFakeDom) {
 				$tw.utils.resizeTextAreaToFit(this.domNode,this.widget.editMinHeight);

core/modules/editor/factory.js

@@ -48,19 +48,19 @@ function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) {
 			this.toolbarNode = this.document.createElement("div");
 			this.toolbarNode.className = "tc-editor-toolbar";
 			parent.insertBefore(this.toolbarNode,nextSibling);
-			this.domNodes.push(this.toolbarNode);
 			this.renderChildren(this.toolbarNode,null);
+			this.domNodes.push(this.toolbarNode);
 		}
 		// Create our element
 		var editInfo = this.getEditInfo(),
 			Engine = this.editShowToolbar ? toolbarEngine : nonToolbarEngine;
 		this.engine = new Engine({
-			widget: this,
-			value: editInfo.value,
-			type: editInfo.type,
-			parentNode: parent,
-			nextSibling: nextSibling
-		});
+				widget: this,
+				value: editInfo.value,
+				type: editInfo.type,
+				parentNode: parent,
+				nextSibling: nextSibling
+			});
 		// Call the postRender hook
 		if(this.postRender) {
 			this.postRender();
@@ -68,7 +68,7 @@ function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) {
 		// Fix height
 		this.engine.fixHeight();
 		// Focus if required
-		if($tw.browser && (this.editFocus === "true" || this.editFocus === "yes") && !$tw.utils.hasClass(this.parentDomNode.ownerDocument.activeElement,"tc-keep-focus")) {
+		if(this.editFocus === "true" || this.editFocus === "yes") {
 			this.engine.focus();
 		}
 		// Add widget message listeners
@@ -220,7 +220,7 @@ function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) {
 		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) {
 			this.refreshSelf();
 			return true;
-		} else if(changedTiddlers[this.editRefreshTitle]) {
+		} else if (changedTiddlers[this.editRefreshTitle]) {
 			this.engine.updateDomNodeText(this.getEditInfo().value);
 		} else if(changedTiddlers[this.editTitle]) {
 			var editInfo = this.getEditInfo();
@@ -274,8 +274,8 @@ function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) {
 					});
 				if($tw.keyboardManager.checkKeyDescriptors(event,keyInfoArray)) {
 					var clickEvent = this.document.createEvent("Events");
-					clickEvent.initEvent("click",true,false);
-					el.dispatchEvent(clickEvent);
+				    clickEvent.initEvent("click",true,false);
+				    el.dispatchEvent(clickEvent);
 					event.preventDefault();
 					event.stopPropagation();
 					return true;

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

@@ -10,7 +10,7 @@ Text editor operation to excise the selection to a new tiddler
 "use strict";
 
 function isMarkdown(mediaType) {
-	return mediaType === "text/markdown" || mediaType === "text/x-markdown";
+	return mediaType === 'text/markdown' || mediaType === 'text/x-markdown';
 }
 
 exports["excise"] = function(event,operation) {

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

@@ -19,7 +19,7 @@ exports["wrap-lines"] = function(event,operation) {
 		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") {
+		if (operation.text[operation.cutEnd] === "\n") {
 			operation.cutEnd++;
 		}
 		// Replace with selection

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

@@ -44,7 +44,7 @@ exports["wrap-selection"] = function(event,operation) {
 				break;
 		}
 		return result;
-	};
+	}
 
 	function togglePrefixSuffix() {
 		if(o.text.substring(o.selStart - prefix.length, o.selStart + suffix.length) === prefix + suffix) {

core/modules/filter-tracker.js

@@ -1,106 +0,0 @@
-/*\
-title: $:/core/modules/filter-tracker.js
-type: application/javascript
-module-type: global
-
-Class to track the results of a filter string
-
-\*/
-
-"use strict";
-
-class FilterTracker {
-	constructor(wiki) {
-		this.wiki = wiki;
-		this.trackers = new Map();
-		this.nextTrackerId = 1;
-	}
-
-	handleChangeEvent(changes) {
-		this.processTrackers();
-		this.processChanges(changes);
-	}
-
-	/*
-	Add a tracker to the filter tracker. Returns null if any of the parameters are invalid, or a tracker id if the tracker was added successfully. Options include:
-	filterString: the filter string to track
-	fnEnter: function to call when a title enters the filter results. Called even if the tiddler does not actually exist. Called as (title), and should return a truthy value that is stored in the tracker as the "enterValue"
-	fnLeave: function to call when a title leaves the filter results. Called as (title,enterValue)
-	fnChange: function to call when a tiddler changes in the filter results. Only called for filter results that identify a tiddler or shadow tiddler. Called as (title,enterValue), and may optionally return a replacement enterValue
-	fnProcess: function to call each time the tracker is processed, after any enter, leave or change functions are called. Called as (changes)
-	*/
-	track(options = {}) {
-		const {
-			filterString,
-			fnEnter,
-			fnLeave,
-			fnChange,
-			fnProcess
-		} = options;
-		const id = this.nextTrackerId++;
-		const tracker = {
-			id,
-			filterString,
-			fnEnter,
-			fnLeave,
-			fnChange,
-			fnProcess,
-			previousResults: [],
-			resultValues: {}
-		};
-		this.trackers.set(id, tracker);
-		// Process the tracker
-		this.processTracker(id);
-		return id;
-	}
-
-	untrack(id) {
-		this.trackers.delete(id);
-	}
-
-	processTrackers() {
-		for(const id of this.trackers.keys()) {
-			this.processTracker(id);
-		}
-	}
-
-	processTracker(id) {
-		const tracker = this.trackers.get(id);
-		if(!tracker) return;
-		const results = [];
-		// Evaluate the filter and remove duplicate results
-		$tw.utils.each(this.wiki.filterTiddlers(tracker.filterString), (title) => {
-			$tw.utils.pushTop(results, title);
-		});
-		// Process the newly entered results
-		results.forEach((title) => {
-			if(!tracker.previousResults.includes(title) && !tracker.resultValues[title] && tracker.fnEnter) {
-				tracker.resultValues[title] = tracker.fnEnter(title) || true;
-			}
-		});
-		// Process the results that have just left
-		tracker.previousResults.forEach((title) => {
-			if(!results.includes(title) && tracker.resultValues[title] && tracker.fnLeave) {
-				tracker.fnLeave(title, tracker.resultValues[title]);
-				delete tracker.resultValues[title];
-			}
-		});
-		// Update the previous results
-		tracker.previousResults = results;
-	}
-
-	processChanges(changes) {
-		for(const tracker of this.trackers.values()) {
-			Object.keys(changes).forEach((title) => {
-				if(title && tracker.previousResults.includes(title) && tracker.fnChange) {
-					tracker.resultValues[title] = tracker.fnChange(title, tracker.resultValues[title]) || tracker.resultValues[title];
-				}
-			});
-			if(tracker.fnProcess) {
-				tracker.fnProcess(changes);
-			}
-		}
-	}
-}
-
-exports.FilterTracker = FilterTracker;

core/modules/filterrunprefixes/cascade.js

@@ -24,7 +24,7 @@ exports.cascade = function(operationSubFunction,options) {
 					}
 					var output = filterFnList[index](options.wiki.makeTiddlerIterator([title]),widget.makeFakeWidgetWithVariables({
 						"currentTiddler": "" + title,
-						"..currentTiddler": widget.getVariable("currentTiddler",{defaultValue:""})
+						"..currentTiddler": widget.getVariable("currentTiddler","")
 					}));
 					if(output.length !== 0) {
 						result = output[0];
@@ -34,5 +34,5 @@ exports.cascade = function(operationSubFunction,options) {
 				results.push(result);
 			});
 		}
-	};
+	}
 };

core/modules/filterrunprefixes/filter.js

@@ -18,7 +18,7 @@ exports.filter = function(operationSubFunction,options) {
 			results.each(function(title) {
 				var filtered = operationSubFunction(options.wiki.makeTiddlerIterator([title]),widget.makeFakeWidgetWithVariables({
 					"currentTiddler": "" + title,
-					"..currentTiddler": widget.getVariable("currentTiddler",{defaultValue:""}),
+					"..currentTiddler": widget.getVariable("currentTiddler",""),
 					"index": "" + index,
 					"revIndex": "" +  (results.length - 1 - index),
 					"length": "" + results.length
@@ -30,5 +30,5 @@ exports.filter = function(operationSubFunction,options) {
 			});
 			results.remove(resultsToRemove);
 		}
-	};
+	}
 };

core/modules/filterrunprefixes/let.js

@@ -1,39 +0,0 @@
-/*\
-title: $:/core/modules/filterrunprefixes/let.js
-type: application/javascript
-module-type: filterrunprefix
-
-Assign a value to a variable
-
-\*/
-
-"use strict";
-
-/*
-Export our filter prefix function
-*/
-exports.let = function(operationSubFunction,options) {
-	// Return the filter run prefix function
-	return function(results,source,widget) {
-		// Save the result list
-		var resultList = results.toArray();
-		// Clear the results
-		results.clear();
-		// Evaluate the subfunction to get the variable name
-		var subFunctionResults = operationSubFunction(source,widget);
-		if(subFunctionResults.length === 0) {
-			return;
-		}
-		var name = subFunctionResults[0];
-		if(typeof name !== "string" || name.length === 0) {
-			return;
-		}
-		// Assign the result of the subfunction to the variable
-		var variables = {};
-		variables[name] = resultList;
-		// Return the variables
-		return {
-			variables: variables
-		};
-	};
-};

core/modules/filterrunprefixes/map.js

@@ -20,7 +20,7 @@ exports.map = function(operationSubFunction,options) {
 			$tw.utils.each(inputTitles,function(title) {
 				var filtered = operationSubFunction(options.wiki.makeTiddlerIterator([title]),widget.makeFakeWidgetWithVariables({
 					"currentTiddler": "" + title,
-					"..currentTiddler": widget.getVariable("currentTiddler",{defaultValue:""}),
+					"..currentTiddler": widget.getVariable("currentTiddler",""),
 					"index": "" + index,
 					"revIndex": "" +  (inputTitles.length - 1 - index),
 					"length": "" + inputTitles.length
@@ -28,12 +28,12 @@ exports.map = function(operationSubFunction,options) {
 				if(filtered.length && flatten) {
 					$tw.utils.each(filtered,function(value) {
 						results.push(value);
-					});
+					})
 				} else {
 					results.push(filtered[0]||"");
 				}
 				++index;
 			});
 		}
-	};
+	}
 };

core/modules/filterrunprefixes/reduce.js

@@ -17,7 +17,7 @@ exports.reduce = function(operationSubFunction,options) {
 			results.each(function(title) {
 				var list = operationSubFunction(options.wiki.makeTiddlerIterator([title]),widget.makeFakeWidgetWithVariables({
 					"currentTiddler": "" + title,
-					"..currentTiddler": widget.getVariable("currentTiddler",{defaultValue:""}),
+					"..currentTiddler": widget.getVariable("currentTiddler"),
 					"index": "" + index,
 					"revIndex": "" +  (results.length - 1 - index),
 					"length": "" + results.length,
@@ -31,5 +31,5 @@ exports.reduce = function(operationSubFunction,options) {
 			results.clear();
 			results.push(accumulator);
 		}
-	};
+	}
 };

core/modules/filterrunprefixes/sort.js

@@ -24,7 +24,7 @@ exports.sort = function(operationSubFunction,options) {
 			results.each(function(title) {
 				var key = operationSubFunction(options.wiki.makeTiddlerIterator([title]),widget.makeFakeWidgetWithVariables({
 					"currentTiddler": "" + title,
-					"..currentTiddler": widget.getVariable("currentTiddler",{defaultValue:""})
+					"..currentTiddler": widget.getVariable("currentTiddler")
 				}));
 				sortKeys.push(key[0] || "");
 			});
@@ -36,12 +36,12 @@ exports.sort = function(operationSubFunction,options) {
 			// Sort the indexes
 			compareFn = $tw.utils.makeCompareFunction(sortType,{defaultType: "string", invert:invert, isCaseSensitive:isCaseSensitive});
 			indexes = indexes.sort(function(a,b) {
-				return compareFn(sortKeys[a],sortKeys[b]);
+					return compareFn(sortKeys[a],sortKeys[b]);
 			});
 			// Add to results in correct order
 			$tw.utils.each(indexes,function(index) {
 				results.push(inputTitles[index]);
 			});
 		}
-	};
+	}
 };

core/modules/filters.js

@@ -35,7 +35,7 @@ function parseFilterOperation(operators,filterString,p) {
 			operator.prefix = filterString.charAt(p++);
 		}
 		// Get the operator name
-		nextBracketPos = filterString.substring(p).search(/[\[\{<\/\(]/);
+		nextBracketPos = filterString.substring(p).search(/[\[\{<\/]/);
 		if(nextBracketPos === -1) {
 			throw "Missing [ in filter expression";
 		}
@@ -43,7 +43,7 @@ function parseFilterOperation(operators,filterString,p) {
 		var bracket = filterString.charAt(nextBracketPos);
 		operator.operator = filterString.substring(p,nextBracketPos);
 		// Any suffix?
-		var colon = operator.operator.indexOf(":");
+		var colon = operator.operator.indexOf(':');
 		if(colon > -1) {
 			// The raw suffix for older filters
 			operator.suffix = operator.operator.substring(colon + 1);
@@ -67,7 +67,7 @@ function parseFilterOperation(operators,filterString,p) {
 		operator.operands = [];
 		var parseOperand = function(bracketType) {
 			var operand = {};
-			switch(bracketType) {
+			switch (bracketType) {
 				case "{": // Curly brackets
 					operand.indirect = true;
 					nextBracketPos = filterString.indexOf("}",p);
@@ -79,17 +79,13 @@ function parseFilterOperation(operators,filterString,p) {
 					operand.variable = true;
 					nextBracketPos = filterString.indexOf(">",p);
 					break;
-				case "(": // Round brackets
-					operand.multiValuedVariable = true;
-					nextBracketPos = filterString.indexOf(")",p);
-					break;
 				case "/": // regexp brackets
 					var rex = /^((?:[^\\\/]|\\.)*)\/(?:\(([mygi]+)\))?/g,
 						rexMatch = rex.exec(filterString.substring(p));
 					if(rexMatch) {
 						operator.regexp = new RegExp(rexMatch[1], rexMatch[2]);
-						// DEPRECATION WARNING
-						console.log("WARNING: Filter",operator.operator,"has a deprecated regexp operand",operator.regexp);
+	// DEPRECATION WARNING
+	console.log("WARNING: Filter",operator.operator,"has a deprecated regexp operand",operator.regexp);
 						nextBracketPos = p + rex.lastIndex - 1;
 					}
 					else {
@@ -108,7 +104,7 @@ function parseFilterOperation(operators,filterString,p) {
 			}
 			operator.operands.push(operand);
 			p = nextBracketPos + 1;
-		};
+		}
 
 		p = nextBracketPos + 1;
 		parseOperand(bracket);
@@ -116,7 +112,7 @@ function parseFilterOperation(operators,filterString,p) {
 		// Check for multiple operands
 		while(filterString.charAt(p) === ",") {
 			p++;
-			if(/^[\[\{<\/\(]/.test(filterString.substring(p))) {
+			if(/^[\[\{<\/]/.test(filterString.substring(p))) {
 				nextBracketPos = p;
 				p++;
 				parseOperand(filterString.charAt(nextBracketPos));
@@ -145,15 +141,7 @@ exports.parseFilter = function(filterString) {
 		p = 0, // Current position in the filter string
 		match;
 	var whitespaceRegExp = /(\s+)/mg,
-		// Groups:
-		// 1 - entire filter run prefix
-		// 2 - filter run prefix itself
-		// 3 - filter run prefix suffixes
-		// 4 - opening square bracket following filter run prefix
-		// 5 - double quoted string following filter run prefix
-		// 6 - single quoted string following filter run prefix
-		// 7 - anything except for whitespace and square brackets
-		operandRegExp = /((?:\+|\-|~|(?:=>?)|\:(\w+)(?:\:([\w\:, ]*))?)?)(?:(\[)|(?:"([^"]*)")|(?:'([^']*)')|([^\s\[\]]+))/mg;
+		operandRegExp = /((?:\+|\-|~|=|\:(\w+)(?:\:([\w\:, ]*))?)?)(?:(\[)|(?:"([^"]*)")|(?:'([^']*)')|([^\s\[\]]+))/mg;
 	while(p < filterString.length) {
 		// Skip any whitespace
 		whitespaceRegExp.lastIndex = p;
@@ -164,45 +152,38 @@ exports.parseFilter = function(filterString) {
 		// Match the start of the operation
 		if(p < filterString.length) {
 			operandRegExp.lastIndex = p;
+			match = operandRegExp.exec(filterString);
+			if(!match || match.index !== p) {
+				throw $tw.language.getString("Error/FilterSyntax");
+			}
 			var operation = {
 				prefix: "",
 				operators: []
 			};
-			match = operandRegExp.exec(filterString);
-			if(match && match.index === p) {
-				// If there is a filter run prefix
-				if(match[1]) {
-					operation.prefix = match[1];
-					p = p + operation.prefix.length;
-					// Name for named prefixes
-					if(match[2]) {
-						operation.namedPrefix = match[2];
-					}
-					// Suffixes for filter run prefix
-					if(match[3]) {
-						operation.suffixes = [];
-						$tw.utils.each(match[3].split(":"),function(subsuffix) {
-							operation.suffixes.push([]);
-							$tw.utils.each(subsuffix.split(","),function(entry) {
-								entry = $tw.utils.trim(entry);
-								if(entry) {
-									operation.suffixes[operation.suffixes.length -1].push(entry);
-								}
-							});
+			if(match[1]) {
+				operation.prefix = match[1];
+				p = p + operation.prefix.length;
+				if(match[2]) {
+					operation.namedPrefix = match[2];
+				}
+				if(match[3]) {
+					operation.suffixes = [];
+					 $tw.utils.each(match[3].split(":"),function(subsuffix) {
+						operation.suffixes.push([]);
+						$tw.utils.each(subsuffix.split(","),function(entry) {
+							entry = $tw.utils.trim(entry);
+							if(entry) {
+								operation.suffixes[operation.suffixes.length -1].push(entry);
+							}
 						});
-					}
+					 });
 				}
-				// Opening square bracket
-				if(match[4]) {
-					p = parseFilterOperation(operation.operators,filterString,p);
-				} else {
-					p = match.index + match[0].length;
-				}
-			} else {
-				// No filter run prefix
-				p = parseFilterOperation(operation.operators,filterString,p);
 			}
-			// Quoted strings and unquoted title
+			if(match[4]) { // Opening square bracket
+				p = parseFilterOperation(operation.operators,filterString,p);
+			} else {
+				p = match.index + match[0].length;
+			}
 			if(match[5] || match[6] || match[7]) { // Double quoted string, single quoted string or unquoted title
 				operation.operators.push(
 					{operator: "title", operands: [{text: match[5] || match[6] || match[7]}]}
@@ -228,7 +209,7 @@ exports.getFilterRunPrefixes = function() {
 		$tw.modules.applyMethods("filterrunprefix",this.filterRunPrefixes);
 	}
 	return this.filterRunPrefixes;
-};
+}
 
 exports.filterTiddlers = function(filterString,widget,source) {
 	var fn = this.compileFilter(filterString);
@@ -270,8 +251,6 @@ exports.compileFilter = function(filterString) {
 				results = [];
 			$tw.utils.each(operation.operators,function(operator) {
 				var operands = [],
-					multiValueOperands = [],
-					isMultiValueOperand = [],
 					operatorFunction;
 				if(!operator.operator) {
 					// Use the "title" operator if no operator is specified
@@ -287,46 +266,28 @@ exports.compileFilter = function(filterString) {
 					if(operand.indirect) {
 						var currTiddlerTitle = widget && widget.getVariable("currentTiddler");
 						operand.value = self.getTextReference(operand.text,"",currTiddlerTitle);
-						operand.multiValue = [operand.value];
 					} else if(operand.variable) {
 						var varTree = $tw.utils.parseFilterVariable(operand.text);
 						operand.value = widgetClass.evaluateVariable(widget,varTree.name,{params: varTree.params, source: source})[0] || "";
-						operand.multiValue = [operand.value];
-					} else if(operand.multiValuedVariable) {
-						var varTree = $tw.utils.parseFilterVariable(operand.text);
-						var resultList = widgetClass.evaluateVariable(widget,varTree.name,{params: varTree.params, source: source});
-						if((resultList.length > 0 && resultList[0] !== undefined) || resultList.length === 0) {
-							operand.multiValue = widgetClass.evaluateVariable(widget,varTree.name,{params: varTree.params, source: source}) || [];
-							operand.value = operand.multiValue[0] || "";
-						} else {
-							operand.value = "";
-							operand.multiValue = [];
-						}
-						operand.isMultiValueOperand = true;	
 					} else {
 						operand.value = operand.text;
-						operand.multiValue = [operand.value];
 					}
 					operands.push(operand.value);
-					multiValueOperands.push(operand.multiValue);
-					isMultiValueOperand.push(!!operand.isMultiValueOperand);
 				});
 
 				// Invoke the appropriate filteroperator module
 				results = operatorFunction(accumulator,{
-					operator: operator.operator,
-					operand: operands.length > 0 ? operands[0] : undefined,
-					operands: operands,
-					multiValueOperands: multiValueOperands,
-					isMultiValueOperand: isMultiValueOperand,
-					prefix: operator.prefix,
-					suffix: operator.suffix,
-					suffixes: operator.suffixes,
-					regexp: operator.regexp
-				},{
-					wiki: self,
-					widget: widget
-				});
+							operator: operator.operator,
+							operand: operands.length > 0 ? operands[0] : undefined,
+							operands: operands,
+							prefix: operator.prefix,
+							suffix: operator.suffix,
+							suffixes: operator.suffixes,
+							regexp: operator.regexp
+						},{
+							wiki: self,
+							widget: widget
+						});
 				if($tw.utils.isArray(results)) {
 					accumulator = self.makeTiddlerIterator(results);
 				} else {
@@ -358,8 +319,6 @@ exports.compileFilter = function(filterString) {
 					return filterRunPrefixes["and"](operationSubFunction, options);
 				case "~": // This operation is unioned into the result only if the main result so far is empty
 					return filterRunPrefixes["else"](operationSubFunction, options);
-				case "=>": // This operation is applied to the main results so far, and the results are assigned to a variable
-					return filterRunPrefixes["let"](operationSubFunction, options);
 				default: 
 					if(operation.namedPrefix && filterRunPrefixes[operation.namedPrefix]) {
 						return filterRunPrefixes[operation.namedPrefix](operationSubFunction, options);
@@ -386,13 +345,7 @@ exports.compileFilter = function(filterString) {
 		self.filterRecursionCount = (self.filterRecursionCount || 0) + 1;
 		if(self.filterRecursionCount < MAX_FILTER_DEPTH) {
 			$tw.utils.each(operationFunctions,function(operationFunction) {
-				var operationResult = operationFunction(results,source,widget);
-				if(operationResult) {
-					if(operationResult.variables) {
-						// If the filter run prefix has returned variables, create a new fake widget with those variables
-						widget = widget.makeFakeWidgetWithVariables(operationResult.variables);
-					}
-				}
+				operationFunction(results,source,widget);
 			});
 		} else {
 			results.push("/**-- Excessive filter recursion --**/");

core/modules/filters/compare.js

@@ -32,4 +32,4 @@ var modes = {
 	"gt": function(value) {return value > 0;},
 	"lteq": function(value) {return value <= 0;},
 	"lt": function(value) {return value < 0;}
-};
+}

core/modules/filters/deserialize.js

@@ -31,4 +31,4 @@ exports["deserialize"] = function(source,operator,options) {
 		return [$tw.language.getString("Error/DeserializeOperator/MissingOperand")];
 	}
 	return results;
-};
+}

core/modules/filters/each.js

@@ -15,8 +15,8 @@ Export our filter function
 */
 exports.each = function(source,operator,options) {
 	var results =[] ,
-		value,values = {},
-		field = operator.operand || "title";
+	value,values = {},
+	field = operator.operand || "title";
 	if(operator.suffix === "value" && field === "title") {
 		source(function(tiddler,title) {
 			if(!$tw.utils.hop(values,title)) {

core/modules/filters/field.js

@@ -53,7 +53,7 @@ exports.field = function(source,operator,options) {
 			if(source.byField && operator.operand) {
 				indexedResults = source.byField(fieldname,operator.operand);
 				if(indexedResults) {
-					return indexedResults;
+					return indexedResults
 				}
 			}
 			source(function(tiddler,title) {

core/modules/filters/fields.js

@@ -24,7 +24,7 @@ exports.fields = function(source,operator,options) {
 				for(fieldName in tiddler.fields) {
 					(operand.indexOf(fieldName) !== -1) ? $tw.utils.pushTop(results,fieldName) : "";
 				}
-			} else if(suffixes.indexOf("exclude") !== -1) {
+			} else if (suffixes.indexOf("exclude") !== -1) {
 				for(fieldName in tiddler.fields) {
 					(operand.indexOf(fieldName) !== -1) ? "" : $tw.utils.pushTop(results,fieldName);
 				}

core/modules/filters/filter.js

@@ -19,7 +19,7 @@ exports.filter = function(source,operator,options) {
 	source(function(tiddler,title) {
 		var list = filterFn.call(options.wiki,options.wiki.makeTiddlerIterator([title]),options.widget.makeFakeWidgetWithVariables({
 			"currentTiddler": "" + title,
-			"..currentTiddler": options.widget.getVariable("currentTiddler",{defaultValue:""})
+			"..currentTiddler": options.widget.getVariable("currentTiddler","")
 		}));
 		if((list.length > 0) === target) {
 			results.push(title);

core/modules/filters/format/json.js

@@ -16,8 +16,12 @@ exports.json = function(source,operand,options) {
 		spaces = /^\d+$/.test(operand) ? parseInt(operand,10) : operand;
 	}
 	source(function(tiddler,title) {
-		var data = $tw.utils.parseJSONSafe(title,function(){return undefined;});
-
+		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));
 		}

core/modules/filters/format/timestamp.js

@@ -12,7 +12,7 @@ Export our filter function
 exports.timestamp = function(source,operand,options) {
 	var results = [];
 	source(function(tiddler,title) {
-		if(title.match(/^-?\d+$/)) {
+		if (title.match(/^-?\d+$/)) {
 			var value = new Date(Number(title));
 			results.push($tw.utils.formatDateString(value,operand || "[UTC]YYYY0MM0DD0hh0mm0ss0XXX"));
 		}

core/modules/filters/function.js

@@ -16,8 +16,8 @@ exports.function = function(source,operator,options) {
 	var functionName = operator.operands[0],
 		params = [],
 		results;
-	$tw.utils.each(operator.multiValueOperands.slice(1),function(paramList) {
-		params.push({value: paramList[0] || "",multiValue: paramList});
+	$tw.utils.each(operator.operands.slice(1),function(param) {
+		params.push({value: param});
 	});
 	// console.log(`Calling ${functionName} with params ${JSON.stringify(params)}`);
 	var variableInfo = options.widget && options.widget.getVariableInfo && options.widget.getVariableInfo(functionName,{params: params, source: source});

core/modules/filters/getindex.js

@@ -13,7 +13,7 @@ returns the value at a given index of datatiddlers
 Export our filter function
 */
 exports.getindex = function(source,operator,options) {
-	var data,results = [];
+	var data,title,results = [];
 	if(operator.operand){
 		source(function(tiddler,title) {
 			title = tiddler ? tiddler.fields.title : title;

core/modules/filters/json-ops.js

@@ -113,22 +113,6 @@ exports["jsonset"] = function(source,operator,options) {
 	return results;
 };
 
-exports["jsondelete"] = function(source,operator,options) {
-	var indexes = operator.operands,
-		results = [];
-	source(function(tiddler,title) {
-		var data = $tw.utils.parseJSONSafe(title,title);
-		// If parsing failed (data equals original title and is a string), return unchanged
-		if(data === title && typeof data === "string") {
-			results.push(title);
-		} else if(data) {
-			data = deleteDataItem(data,indexes);
-			results.push(JSON.stringify(data));
-		}
-	});
-	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
 */
@@ -157,13 +141,13 @@ function convertDataItemValueToStrings(item) {
 	if(item === undefined) {
 		return undefined;
 	} else if(item === null) {
-		return ["null"];
+		return ["null"]
 	} else if(typeof item === "object") {
 		var results = [],i,t;
-		if(Array.isArray(item)) {
+		if($tw.utils.isArray(item)) {
 			// Return all the items in arrays recursively
 			for(i=0; i<item.length; i++) {
-				t = convertDataItemValueToStrings(item[i]);
+				t = convertDataItemValueToStrings(item[i])
 				if(t !== undefined) {
 					results.push.apply(results,t);
 				}
@@ -194,7 +178,7 @@ function convertDataItemKeysToStrings(item) {
 			return [];
 		}
 		var results = [];
-		if(Array.isArray(item)) {
+		if($tw.utils.isArray(item)) {
 			for(var i=0; i<item.length; i++) {
 				results.push(i.toString());
 			}
@@ -217,7 +201,7 @@ function getDataItemType(data,indexes) {
 		return item;
 	} else if(item === null) {
 		return "null";
-	} else if(Array.isArray(item)) {
+	} else if($tw.utils.isArray(item)) {
 		return "array";
 	} else if(typeof item === "object") {
 		return "object";
@@ -229,9 +213,9 @@ function getDataItemType(data,indexes) {
 function getItemAtIndex(item,index) {
 	if($tw.utils.hop(item,index)) {
 		return item[index];
-	} else if(Array.isArray(item)) {
+	} else if($tw.utils.isArray(item)) {
 		index = $tw.utils.parseInt(index);
-		if(index < 0) { index = index + item.length; };
+		if(index < 0) { index = index + item.length };
 		return item[index]; // Will be undefined if index was out-of-bounds
 	} else {
 		return undefined;
@@ -239,16 +223,15 @@ function getItemAtIndex(item,index) {
 }
 
 /*
-Traverse the index chain and return the item at the specified depth.
-Returns the item at the end of the traversal, or undefined if traversal fails.
+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 traverseIndexChain(data,indexes,stopBeforeLast) {
+function getDataItem(data,indexes) {
 	if(indexes.length === 0 || (indexes.length === 1 && indexes[0] === "")) {
 		return data;
 	}
+	// Get the item
 	var item = data;
-	var stopIndex = stopBeforeLast ? indexes.length - 1 : indexes.length;
-	for(var i = 0; i < stopIndex; i++) {
+	for(var i=0; i<indexes.length; i++) {
 		if(item !== undefined) {
 			if(item !== null && ["number","string","boolean"].indexOf(typeof item) === -1) {
 				item = getItemAtIndex(item,indexes[i]);
@@ -260,13 +243,6 @@ function traverseIndexChain(data,indexes,stopBeforeLast) {
 	return 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) {
-	return traverseIndexChain(data,indexes,false);
-}
-
 /*
 Given a JSON data structure, an array of index strings and a value, return the data structure with the value added at the end of the index chain. If any of the index strings are invalid then the JSON data structure is returned unmodified. If the root item is targetted then a different data object will be returned
 */
@@ -279,17 +255,20 @@ function setDataItem(data,indexes,value) {
 	if(indexes.length === 0 || (indexes.length === 1 && indexes[0] === "")) {
 		return value;
 	}
-	// Traverse the JSON data structure using the index chain up to the parent
-	var current = traverseIndexChain(data,indexes,true);
-	if(current === undefined) {
-		// Return the original JSON data structure if any of the index strings are invalid
-		return data;
+	// Traverse the JSON data structure using the index chain
+	var current = data;
+	for(var i = 0; i < indexes.length - 1; i++) {
+		current = getItemAtIndex(current,indexes[i]);
+		if(current === undefined) {
+			// Return the original JSON data structure if any of the index strings are invalid
+			return data;
+		}
 	}
 	// Add the value to the end of the index chain
 	var lastIndex = indexes[indexes.length - 1];
-	if(Array.isArray(current)) {
+	if($tw.utils.isArray(current)) {
 		lastIndex = $tw.utils.parseInt(lastIndex);
-		if(lastIndex < 0) { lastIndex = lastIndex + current.length; };
+		if(lastIndex < 0) { lastIndex = lastIndex + current.length };
 	}
 	// Only set indexes on objects and arrays
 	if(typeof current === "object") {
@@ -297,32 +276,3 @@ function setDataItem(data,indexes,value) {
 	}
 	return data;
 }
-
-/*
-Given a JSON data structure and an array of index strings, return the data structure with the item at the end of the index chain deleted. If any of the index strings are invalid then the JSON data structure is returned unmodified. If the root item is targetted then the JSON data structure is returned unmodified.
-*/
-function deleteDataItem(data,indexes) {
-	// Check for the root item - don't delete the root
-	if(indexes.length === 0 || (indexes.length === 1 && indexes[0] === "")) {
-		return data;
-	}
-	// Traverse the JSON data structure using the index chain up to the parent
-	var current = traverseIndexChain(data,indexes,true);
-	if(current === undefined || current === null) {
-		// Return the original JSON data structure if any of the index strings are invalid
-		return data;
-	}
-	// Delete the item at the end of the index chain
-	var lastIndex = indexes[indexes.length - 1];
-	if(Array.isArray(current) && current !== null) {
-		lastIndex = $tw.utils.parseInt(lastIndex);
-		if(lastIndex < 0) { lastIndex = lastIndex + current.length; };
-		// Check if index is valid before splicing
-		if(lastIndex >= 0 && lastIndex < current.length) {
-			current.splice(lastIndex,1);
-		}
-	} else if(typeof current === "object" && current !== null) {
-		delete current[lastIndex];
-	}
-	return data;
-}

core/modules/filters/lookup.js

@@ -25,7 +25,7 @@ exports.lookup = function(source,operator,options) {
 		indexSuffix = (suffixes[1] && suffixes[1][0] === "index") ? true : false,
 		target;
 	if(operator.operands.length == 2) {
-		target = operator.operands[1];
+		target = operator.operands[1]
 	} else {
 		target = indexSuffix ? "0": "text";
 	}

core/modules/filters/math.js

@@ -17,35 +17,35 @@ Note that strings are converted to numbers automatically. Trailing non-digits ar
 "use strict";
 
 exports.negate = makeNumericBinaryOperator(
-	function(a) {return -a;}
+	function(a) {return -a}
 );
 
 exports.abs = makeNumericBinaryOperator(
-	function(a) {return Math.abs(a);}
+	function(a) {return Math.abs(a)}
 );
 
 exports.ceil = makeNumericBinaryOperator(
-	function(a) {return Math.ceil(a);}
+	function(a) {return Math.ceil(a)}
 );
 
 exports.floor = makeNumericBinaryOperator(
-	function(a) {return Math.floor(a);}
+	function(a) {return Math.floor(a)}
 );
 
 exports.round = makeNumericBinaryOperator(
-	function(a) {return Math.round(a);}
+	function(a) {return Math.round(a)}
 );
 
 exports.trunc = makeNumericBinaryOperator(
-	function(a) {return Math.trunc(a);}
+	function(a) {return Math.trunc(a)}
 );
 
 exports.untrunc = makeNumericBinaryOperator(
-	function(a) {return Math.ceil(Math.abs(a)) * Math.sign(a);}
+	function(a) {return Math.ceil(Math.abs(a)) * Math.sign(a)}
 );
 
 exports.sign = makeNumericBinaryOperator(
-	function(a) {return Math.sign(a);}
+	function(a) {return Math.sign(a)}
 );
 
 exports.add = makeNumericBinaryOperator(
@@ -103,29 +103,29 @@ exports.log = makeNumericBinaryOperator(
 );
 
 exports.sum = makeNumericReducingOperator(
-	function(accumulator,value) {return accumulator + value;},
+	function(accumulator,value) {return accumulator + value},
 	0 // Initial value
 );
 
 exports.product = makeNumericReducingOperator(
-	function(accumulator,value) {return accumulator * value;},
+	function(accumulator,value) {return accumulator * value},
 	1 // Initial value
 );
 
 exports.maxall = makeNumericReducingOperator(
-	function(accumulator,value) {return Math.max(accumulator,value);},
+	function(accumulator,value) {return Math.max(accumulator,value)},
 	-Infinity // Initial value
 );
 
 exports.minall = makeNumericReducingOperator(
-	function(accumulator,value) {return Math.min(accumulator,value);},
+	function(accumulator,value) {return Math.min(accumulator,value)},
 	Infinity // Initial value
 );
 
 exports.median = makeNumericArrayOperator(
 	function(values) {
 		var len = values.length, median;
-		values.sort(function(a,b) {return a-b;});
+		values.sort(function(a,b) {return a-b});
 		if(len % 2) { 
 			// Odd, return the middle number
 			median = values[(len - 1) / 2];
@@ -138,7 +138,7 @@ exports.median = makeNumericArrayOperator(
 );
 
 exports.average = makeNumericReducingOperator(
-	function(accumulator,value) {return accumulator + value;},
+	function(accumulator,value) {return accumulator + value},
 	0, // Initial value
 	function(finalValue,numberOfValues) {
 		return finalValue/numberOfValues;
@@ -146,7 +146,7 @@ exports.average = makeNumericReducingOperator(
 );
 
 exports.variance = makeNumericReducingOperator(
-	function(accumulator,value) {return accumulator + value;},
+	function(accumulator,value) {return accumulator + value},
 	0,
 	function(finalValue,numberOfValues,originalValues) {
 		return getVarianceFromArray(originalValues,finalValue/numberOfValues);
@@ -154,7 +154,7 @@ exports.variance = makeNumericReducingOperator(
 );
 
 exports["standard-deviation"] = makeNumericReducingOperator(
-	function(accumulator,value) {return accumulator + value;},
+	function(accumulator,value) {return accumulator + value},
 	0,
 	function(finalValue,numberOfValues,originalValues) {
 		var variance = getVarianceFromArray(originalValues,finalValue/numberOfValues);
@@ -164,31 +164,31 @@ exports["standard-deviation"] = makeNumericReducingOperator(
 
 //trigonometry
 exports.cos = makeNumericBinaryOperator(
-	function(a) {return Math.cos(a);}
+	function(a) {return Math.cos(a)}
 );
 
 exports.sin = makeNumericBinaryOperator(
-	function(a) {return Math.sin(a);}
+	function(a) {return Math.sin(a)}
 );
 
 exports.tan = makeNumericBinaryOperator(
-	function(a) {return Math.tan(a);}
+	function(a) {return Math.tan(a)}
 );
 
 exports.acos = makeNumericBinaryOperator(
-	function(a) {return Math.acos(a);}
+	function(a) {return Math.acos(a)}
 );
 
 exports.asin = makeNumericBinaryOperator(
-	function(a) {return Math.asin(a);}
+	function(a) {return Math.asin(a)}
 );
 
 exports.atan = makeNumericBinaryOperator(
-	function(a) {return Math.atan(a);}
+	function(a) {return Math.atan(a)}
 );
 
 exports.atan2 = makeNumericBinaryOperator(
-	function(a,b) {return Math.atan2(a,b);}
+	function(a,b) {return Math.atan2(a,b)}
 );
 
 //Calculate the variance of a population of numbers in an array given its mean
@@ -217,13 +217,9 @@ function makeNumericReducingOperator(fnCalc,initialValue,fnFinal) {
 		source(function(tiddler,title) {
 			result.push($tw.utils.parseNumber(title));
 		});
-		// We return an empty array if there are no input titles
-		if(result.length === 0) {
-			return [];
-		}
 		var value = result.reduce(function(accumulator,currentValue) {
-			return fnCalc(accumulator,currentValue);
-		},initialValue);
+				return fnCalc(accumulator,currentValue);
+			},initialValue);
 		if(fnFinal) {
 			value = fnFinal(value,result.length,result);
 		}

core/modules/filters/range.js

@@ -21,7 +21,7 @@ exports.range = function(source,operator,options) {
 	}
 	// Process the parts
 	var beg, end, inc, i, fixed = 0;
-	for(i=0; i<parts.length; i++) {
+	for (i=0; i<parts.length; i++) {
 		// Validate real number
 		if(!/^\s*[+-]?((\d+(\.\d*)?)|(\.\d+))\s*$/.test(parts[i])) {
 			return ["range: bad number \"" + parts[i] + "\""];
@@ -36,10 +36,10 @@ exports.range = function(source,operator,options) {
 	switch(parts.length) {
 		case 1:
 			end = parts[0];
-			if(end >= 1) {
+			if (end >= 1) {
 				beg = 1;
 			}
-			else if(end <= -1) {
+			else if (end <= -1) {
 				beg = -1;
 			}
 			else {
@@ -72,7 +72,7 @@ exports.range = function(source,operator,options) {
 	end += direction * 0.5 * Math.pow(0.1,fixed);
 	var safety = 10010;
 	// Enumerate the range
-	if(end<beg) {
+	if (end<beg) {
 		for(i=beg; i>end; i+=inc) {
 			results.push(i.toFixed(fixed));
 			if(--safety<0) {

core/modules/filters/removesuffix.js

@@ -15,7 +15,7 @@ Export our filter function
 exports.removesuffix = function(source,operator,options) {
 	var results = [],
 		suffixes = (operator.suffixes || [])[0] || [];
-	if(!operator.operand) {
+	if (!operator.operand) {
 		source(function(tiddler,title) {
 			results.push(title);
 		});

core/modules/filters/sort.js

@@ -14,31 +14,31 @@ Export our filter function
 */
 exports.sort = function(source,operator,options) {
 	var results = prepare_results(source);
-	options.wiki.sortTiddlers(results,operator.operands[0] || "title",operator.prefix === "!",false,false,undefined,operator.operands[1]);
+	options.wiki.sortTiddlers(results,operator.operand || "title",operator.prefix === "!",false,false);
 	return results;
 };
 
 exports.nsort = function(source,operator,options) {
 	var results = prepare_results(source);
-	options.wiki.sortTiddlers(results,operator.operands[0] || "title",operator.prefix === "!",false,true,undefined,operator.operands[1]);
+	options.wiki.sortTiddlers(results,operator.operand || "title",operator.prefix === "!",false,true);
 	return results;
 };
 
 exports.sortan = function(source, operator, options) {
 	var results = prepare_results(source);
-	options.wiki.sortTiddlers(results, operator.operands[0] || "title", operator.prefix === "!",false,false,true,operator.operands[1]);
+	options.wiki.sortTiddlers(results, operator.operand || "title", operator.prefix === "!",false,false,true);
 	return results;
 };
 
 exports.sortcs = function(source,operator,options) {
 	var results = prepare_results(source);
-	options.wiki.sortTiddlers(results,operator.operands[0] || "title",operator.prefix === "!",true,false,undefined,operator.operands[1]);
+	options.wiki.sortTiddlers(results,operator.operand || "title",operator.prefix === "!",true,false);
 	return results;
 };
 
 exports.nsortcs = function(source,operator,options) {
 	var results = prepare_results(source);
-	options.wiki.sortTiddlers(results,operator.operands[0] || "title",operator.prefix === "!",true,true,undefined,operator.operands[1]);
+	options.wiki.sortTiddlers(results,operator.operand || "title",operator.prefix === "!",true,true);
 	return results;
 };
 

core/modules/filters/strings.js

@@ -37,14 +37,14 @@ exports.trim = function(source,operator,options) {
 		operand = (operator.operand || ""),
 		fnCalc;
 	if(suffix === "prefix") {
-		fnCalc = function(a,b) {return [$tw.utils.trimPrefix(a,b)];};
+		fnCalc = function(a,b) {return [$tw.utils.trimPrefix(a,b)];}
 	} else if(suffix === "suffix") {
-		fnCalc = function(a,b) {return [$tw.utils.trimSuffix(a,b)];};
+		fnCalc = function(a,b) {return [$tw.utils.trimSuffix(a,b)];}
 	} else {
 		if(operand === "") {
-			fnCalc = function(a) {return [$tw.utils.trim(a)];};
+			fnCalc = function(a) {return [$tw.utils.trim(a)];}
 		} else {
-			fnCalc = function(a,b) {return [$tw.utils.trimSuffix($tw.utils.trimPrefix(a,b),b)];};
+			fnCalc = function(a,b) {return [$tw.utils.trimSuffix($tw.utils.trimPrefix(a,b),b)];}
 		}
 	}
 	source(function(tiddler,title) {
@@ -71,53 +71,107 @@ exports.join = makeStringReducingOperator(
 	},null
 );
 
-const dmp = require("$:/core/modules/utils/diff-match-patch/diff_match_patch.js");
+var dmp = require("$:/core/modules/utils/diff-match-patch/diff_match_patch.js");
 
 exports.levenshtein = makeStringBinaryOperator(
 	function(a,b) {
-		const diffs = dmp.diffMain(a,b);
-		return [dmp.diffLevenshtein(diffs).toString()];
+		var dmpObject = new dmp.diff_match_patch(),
+			diffs = dmpObject.diff_main(a,b);
+		return [dmpObject.diff_levenshtein(diffs) + ""];
 	}
 );
 
-// this function is adapted from https://github.com/google/diff-match-patch/wiki/Line-or-Word-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 a = $tw.utils.diffPartsToChars(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 = dmp.diffMain(lineText1,lineText2,false);
-	dmp.diffCharsToLines(diffs,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 suffix = operator.suffix || "",
+	var dmpObject = new dmp.diff_match_patch(),
+		suffix = operator.suffix || "",
 		result = [];
 		
-	source(function(tiddler,title) {
-		let diffs, patches;
-		if(suffix === "lines" || suffix === "words") {
-			diffs = diffLineWordMode(title,operator.operand,suffix);
-			patches = dmp.patchMake(title,diffs);
-		} else {
-			patches = dmp.patchMake(title,operator.operand);
-		}
-		Array.prototype.push.apply(result,[dmp.patchToText(patches)]);
-	});
+		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) {
-		let patches;
+		var dmpObject = new dmp.diff_match_patch(),
+			patches;
 		try {
-			patches = dmp.patchFromText(b);
+			patches = dmpObject.patch_fromText(b);
 		} catch(e) {
 		}
 		if(patches) {
-			return [dmp.patchApply(patches,a)[0]];
+			return [dmpObject.patch_apply(patches,a)[0]];
 		} else {
 			return [a];
 		}
@@ -225,7 +279,7 @@ exports.pad = function(source,operator,options) {
 		}
 	});
 	return results;
-};
+}
 
 exports.charcode = function(source,operator,options) {
 	var chars = [];

core/modules/filters/suffix.js

@@ -15,7 +15,7 @@ Export our filter function
 exports.suffix = function(source,operator,options) {
 	var results = [],
 		suffixes = (operator.suffixes || [])[0] || [];
-	if(!operator.operand) {
+	if (!operator.operand) {
 		source(function(tiddler,title) {
 			results.push(title);
 		});

core/modules/filters/title.js

@@ -16,13 +16,12 @@ exports.title = function(source,operator,options) {
 	var results = [];
 	if(operator.prefix === "!") {
 		source(function(tiddler,title) {
-			var titleList = operator.multiValueOperands[0] || [];
-			if(tiddler && titleList.indexOf(tiddler.fields.title) === -1) {
+			if(tiddler && tiddler.fields.title !== operator.operand) {
 				results.push(title);
 			}
 		});
 	} else {
-		Array.prototype.push.apply(results,operator.multiValueOperands[0]);
+		results.push(operator.operand);
 	}
 	return results;
 };

core/modules/filters/unknown.js

@@ -20,8 +20,8 @@ exports["[unknown]"] = function(source,operator,options) {
 	// Check for a user defined filter operator
 	if(operator.operator.indexOf(".") !== -1) {
 		var params = [];
-		$tw.utils.each(operator.multiValueOperands,function(paramList) {
-			params.push({value: paramList[0] || "",multiValue: paramList});
+		$tw.utils.each(operator.operands,function(param) {
+			params.push({value: param});
 		});	
 		var variableInfo = options.widget && options.widget.getVariableInfo && options.widget.getVariableInfo(operator.operator,{params: params, source: source});
 		if(variableInfo && variableInfo.srcVariable) {

core/modules/filters/variables.js

@@ -24,4 +24,4 @@ exports.variables = function(source,operator,options) {
 		}
 	}
 	return names.sort();
-};
+};

core/modules/filters/x-listops.js

@@ -7,224 +7,224 @@ Extended filter operators to manipulate the current list.
 
 \*/
 
-"use strict";
+	"use strict";
 
-/*
+	/*
 	Fetch titles from the current list
 	*/
-var prepare_results = function (source) {
+	var prepare_results = function (source) {
 	var results = [];
-	source(function (tiddler, title) {
-		results.push(title);
-	});
-	return results;
-};
+		source(function (tiddler, title) {
+			results.push(title);
+		});
+		return results;
+	};
 
-/*
+	/*
 	Moves a number of items from the tail of the current list before the item named in the operand
 	*/
-exports.putbefore = function (source, operator) {
-	var results = prepare_results(source),
-		index = results.indexOf(operator.operand),
-		count = $tw.utils.getInt(operator.suffix,1);
-	return (index === -1) ?
-		results.slice(0, -1) :
-		results.slice(0, index).concat(results.slice(-count)).concat(results.slice(index, -count));
-};
+	exports.putbefore = function (source, operator) {
+		var results = prepare_results(source),
+			index = results.indexOf(operator.operand),
+			count = $tw.utils.getInt(operator.suffix,1);
+		return (index === -1) ?
+			results.slice(0, -1) :
+			results.slice(0, index).concat(results.slice(-count)).concat(results.slice(index, -count));
+	};
 
-/*
+	/*
 	Moves a number of items from the tail of the current list after the item named in the operand
 	*/
-exports.putafter = function (source, operator) {
-	var results = prepare_results(source),
-		index = results.indexOf(operator.operand),
-		count = $tw.utils.getInt(operator.suffix,1);
-	return (index === -1) ?
-		results.slice(0, -1) :
-		results.slice(0, index + 1).concat(results.slice(-count)).concat(results.slice(index + 1, -count));
-};
+	exports.putafter = function (source, operator) {
+		var results = prepare_results(source),
+			index = results.indexOf(operator.operand),
+			count = $tw.utils.getInt(operator.suffix,1);
+		return (index === -1) ?
+			results.slice(0, -1) :
+			results.slice(0, index + 1).concat(results.slice(-count)).concat(results.slice(index + 1, -count));
+	};
 
-/*
+	/*
 	Replaces the item named in the operand with a number of items from the tail of the current list
 	*/
-exports.replace = function (source, operator) {
-	var results = prepare_results(source),
-		index = results.indexOf(operator.operand),
-		count = $tw.utils.getInt(operator.suffix,1);
-	return (index === -1) ?
-		results.slice(0, -count) :
-		results.slice(0, index).concat(results.slice(-count)).concat(results.slice(index + 1, -count));
-};
+	exports.replace = function (source, operator) {
+		var results = prepare_results(source),
+			index = results.indexOf(operator.operand),
+			count = $tw.utils.getInt(operator.suffix,1);
+		return (index === -1) ?
+			results.slice(0, -count) :
+			results.slice(0, index).concat(results.slice(-count)).concat(results.slice(index + 1, -count));
+	};
 
-/*
+	/*
 	Moves a number of items from the tail of the current list to the head of the list
 	*/
-exports.putfirst = function (source, operator) {
-	var results = prepare_results(source),
-		count = $tw.utils.getInt(operator.suffix,1);
-	return results.slice(-count).concat(results.slice(0, -count));
-};
+	exports.putfirst = function (source, operator) {
+		var results = prepare_results(source),
+			count = $tw.utils.getInt(operator.suffix,1);
+		return results.slice(-count).concat(results.slice(0, -count));
+	};
 
-/*
+	/*
 	Moves a number of items from the head of the current list to the tail of the list
 	*/
-exports.putlast = function (source, operator) {
-	var results = prepare_results(source),
-		count = $tw.utils.getInt(operator.suffix,1);
-	return results.slice(count).concat(results.slice(0, count));
-};
+	exports.putlast = function (source, operator) {
+		var results = prepare_results(source),
+			count = $tw.utils.getInt(operator.suffix,1);
+		return results.slice(count).concat(results.slice(0, count));
+	};
 
-/*
+	/*
 	Moves the item named in the operand a number of places forward or backward in the list
 	*/
-exports.move = function (source, operator) {
-	var results = prepare_results(source),
-		index = results.indexOf(operator.operand),
-		count = $tw.utils.getInt(operator.suffix,1),
-		marker = results.splice(index, 1),
-		offset =  (index + count) > 0 ? index + count : 0;
-	return results.slice(0, offset).concat(marker).concat(results.slice(offset));
-};
+	exports.move = function (source, operator) {
+		var results = prepare_results(source),
+			index = results.indexOf(operator.operand),
+			count = $tw.utils.getInt(operator.suffix,1),
+			marker = results.splice(index, 1),
+			offset =  (index + count) > 0 ? index + count : 0;
+		return results.slice(0, offset).concat(marker).concat(results.slice(offset));
+	};
 
-/*
+	/*
 	Returns the items from the current list that are after the item named in the operand
 	*/
-exports.allafter = function (source, operator) {
-	var results = prepare_results(source),
-		index = results.indexOf(operator.operand);
-	return (index === -1) ? [] :
-		(operator.suffix) ? results.slice(index) :
+	exports.allafter = function (source, operator) {
+		var results = prepare_results(source),
+			index = results.indexOf(operator.operand);
+		return (index === -1) ? [] :
+			(operator.suffix) ? results.slice(index) :
 			results.slice(index + 1);
-};
+	};
 
-/*
+	/*
 	Returns the items from the current list that are before the item named in the operand
 	*/
-exports.allbefore = function (source, operator) {
-	var results = prepare_results(source),
-		index = results.indexOf(operator.operand);
-	return (index === -1) ? [] :
-		(operator.suffix) ? results.slice(0, index + 1) :
+	exports.allbefore = function (source, operator) {
+		var results = prepare_results(source),
+			index = results.indexOf(operator.operand);
+		return (index === -1) ? [] :
+			(operator.suffix) ? results.slice(0, index + 1) :
 			results.slice(0, index);
-};
+	};
 
-/*
+	/*
 	Appends the items listed in the operand array to the tail of the current list
 	*/
-exports.append = function (source, operator) {
-	var append = $tw.utils.parseStringArray(operator.operand, "true"),
-		results = prepare_results(source),
-		count = parseInt(operator.suffix) || append.length;
-	return (append.length === 0) ? results :
-		(operator.prefix) ? results.concat(append.slice(-count)) :
+	exports.append = function (source, operator) {
+		var append = $tw.utils.parseStringArray(operator.operand, "true"),
+			results = prepare_results(source),
+			count = parseInt(operator.suffix) || append.length;
+		return (append.length === 0) ? results :
+			(operator.prefix) ? results.concat(append.slice(-count)) :
 			results.concat(append.slice(0, count));
-};
+	};
 
-/*
+	/*
 	Prepends the items listed in the operand array to the head of the current list
 	*/
-exports.prepend = function (source, operator) {
-	var prepend = $tw.utils.parseStringArray(operator.operand, "true"),
-		results = prepare_results(source),
-		count = $tw.utils.getInt(operator.suffix,prepend.length);
-	return (prepend.length === 0) ? results :
-		(operator.prefix) ? prepend.slice(-count).concat(results) :
+	exports.prepend = function (source, operator) {
+		var prepend = $tw.utils.parseStringArray(operator.operand, "true"),
+			results = prepare_results(source),
+			count = $tw.utils.getInt(operator.suffix,prepend.length);
+		return (prepend.length === 0) ? results :
+			(operator.prefix) ? prepend.slice(-count).concat(results) :
 			prepend.slice(0, count).concat(results);
-};
+	};
 
-/*
+	/*
 	Returns all items from the current list except the items listed in the operand array
 	*/
-exports.remove = function (source, operator) {
-	var array = $tw.utils.parseStringArray(operator.operand, "true"),
-		results = prepare_results(source),
-		count = parseInt(operator.suffix) || array.length,
-		p,
-		len,
-		index;
-	len = array.length - 1;
-	for(p = 0; p < count; ++p) {
-		if(operator.prefix) {
-			index = results.indexOf(array[len - p]);
-		} else {
-			index = results.indexOf(array[p]);
+	exports.remove = function (source, operator) {
+		var array = $tw.utils.parseStringArray(operator.operand, "true"),
+			results = prepare_results(source),
+			count = parseInt(operator.suffix) || array.length,
+			p,
+			len,
+			index;
+		len = array.length - 1;
+		for (p = 0; p < count; ++p) {
+			if (operator.prefix) {
+				index = results.indexOf(array[len - p]);
+			} else {
+				index = results.indexOf(array[p]);
+			}
+			if (index !== -1) {
+				results.splice(index, 1);
+			}
 		}
-		if(index !== -1) {
-			results.splice(index, 1);
-		}
-	}
-	return results;
-};
+		return results;
+	};
 
-/*
+	/*
 	Returns all items from the current list sorted in the order of the items in the operand array
 	*/
-exports.sortby = function (source, operator) {
-	var results = prepare_results(source);
-	if(!results || results.length < 2) {
+	exports.sortby = function (source, operator) {
+		var results = prepare_results(source);
+		if (!results || results.length < 2) {
+			return results;
+		}
+		var lookup = $tw.utils.parseStringArray(operator.operand, "true");
+		results.sort(function (a, b) {
+			return lookup.indexOf(a) - lookup.indexOf(b);
+		});
 		return results;
-	}
-	var lookup = $tw.utils.parseStringArray(operator.operand, "true");
-	results.sort(function (a, b) {
-		return lookup.indexOf(a) - lookup.indexOf(b);
-	});
-	return results;
-};
+	};
 
-/*
+	/*
 	Removes all duplicate items from the current list
 	*/
-exports.unique = function (source, operator) {
-	var results = prepare_results(source);
-	var set = results.reduce(function (a, b) {
-		if(a.indexOf(b) < 0) {
-			a.push(b);
-		}
-		return a;
-	}, []);
-	return set;
-};
+	exports.unique = function (source, operator) {
+		var results = prepare_results(source);
+		var set = results.reduce(function (a, b) {
+			if (a.indexOf(b) < 0) {
+				a.push(b);
+			}
+			return a;
+		}, []);
+		return set;
+	};
 
-var cycleValueInArray = function(results,operands,stepSize) {
-	var resultsIndex,
-		step = stepSize || 1,
-		i = 0,
-		opLength = operands.length,
-		nextOperandIndex;
-	for(i; i < opLength; i++) {
-		resultsIndex = results.indexOf(operands[i]);
+	var cycleValueInArray = function(results,operands,stepSize) {
+		var resultsIndex,
+			step = stepSize || 1,
+			i = 0,
+			opLength = operands.length,
+			nextOperandIndex;
+		for(i; i < opLength; i++) {
+			resultsIndex = results.indexOf(operands[i]);
+			if(resultsIndex !== -1) {
+				break;
+			}
+		}
 		if(resultsIndex !== -1) {
-			break;
-		}
-	}
-	if(resultsIndex !== -1) {
-		i = i + step;
-		nextOperandIndex = (i < opLength ? i : i % opLength);
-		if(operands.length > 1) {
-			results.splice(resultsIndex,1,operands[nextOperandIndex]);
+			i = i + step;
+			nextOperandIndex = (i < opLength ? i : i % opLength);
+			if(operands.length > 1) {
+				results.splice(resultsIndex,1,operands[nextOperandIndex]);
+			} else {
+				results.splice(resultsIndex,1);
+			}
 		} else {
-			results.splice(resultsIndex,1);
+			results.push(operands[0]);
 		}
-	} else {
-		results.push(operands[0]);
+		return results;
 	}
-	return results;
-};
 
-/*
+	/*
 	Toggles an item in the current list.
 	*/
-exports.toggle = function(source,operator) {
-	return cycleValueInArray(prepare_results(source),operator.operands);
-};
-
-exports.cycle = function(source,operator) {
-	var results = prepare_results(source),
-		operands = (operator.operand.length ? $tw.utils.parseStringArray(operator.operand, "true") : [""]),
-		step = $tw.utils.getInt(operator.operands[1]||"",1);
-	if(step < 0) {
-		operands.reverse();
-		step = Math.abs(step);
+	exports.toggle = function(source,operator) {
+		return cycleValueInArray(prepare_results(source),operator.operands);
+	}
+
+	exports.cycle = function(source,operator) {
+		var results = prepare_results(source),
+			operands = (operator.operand.length ? $tw.utils.parseStringArray(operator.operand, "true") : [""]),
+			step = $tw.utils.getInt(operator.operands[1]||"",1);
+		if(step < 0) {
+			operands.reverse();
+			step = Math.abs(step);
+		}
+		return cycleValueInArray(results,operands,step);
 	}
-	return cycleValueInArray(results,operands,step);
-};

core/modules/indexers/back-indexer.js

@@ -46,7 +46,7 @@ function BackSubIndexer(indexer,extractor) {
 BackSubIndexer.prototype.init = function() {
 	// lazy init until first lookup
 	this.index = null;
-};
+}
 
 BackSubIndexer.prototype._init = function() {
 	this.index = Object.create(null);
@@ -60,11 +60,11 @@ BackSubIndexer.prototype._init = function() {
 			self.index[target][sourceTitle] = true;
 		});
 	});
-};
+}
 
 BackSubIndexer.prototype.rebuild = function() {
 	this.index = null;
-};
+}
 
 /*
 * Get things that is being referenced in the text, e.g. tiddler names in the link syntax.
@@ -78,7 +78,7 @@ BackSubIndexer.prototype._getTarget = function(tiddler) {
 		return this.wiki[this.extractor](parser.tree, tiddler.fields.title);
 	}
 	return [];
-};
+}
 
 BackSubIndexer.prototype.update = function(updateDescriptor) {
 	// lazy init/update until first lookup
@@ -86,8 +86,8 @@ BackSubIndexer.prototype.update = function(updateDescriptor) {
 		return;
 	}
 	var newTargets = [],
-		oldTargets = [],
-		self = this;
+	    oldTargets = [],
+	    self = this;
 	if(updateDescriptor.old.exists) {
 		oldTargets = this._getTarget(updateDescriptor.old.tiddler);
 	}
@@ -106,7 +106,7 @@ BackSubIndexer.prototype.update = function(updateDescriptor) {
 		}
 		self.index[target][updateDescriptor.new.tiddler.fields.title] = true;
 	});
-};
+}
 
 BackSubIndexer.prototype.lookup = function(title) {
 	if(!this.index) {
@@ -117,6 +117,6 @@ BackSubIndexer.prototype.lookup = function(title) {
 	} else {
 		return [];
 	}
-};
+}
 
 exports.BackIndexer = BackIndexer;

core/modules/indexers/field-indexer.js

@@ -19,7 +19,7 @@ FieldIndexer.prototype.init = function() {
 	this.index = null;
 	this.maxIndexedValueLength = DEFAULT_MAXIMUM_INDEXED_VALUE_LENGTH;
 	this.addIndexMethods();
-};
+}
 
 // Provided for testing
 FieldIndexer.prototype.setMaxIndexedValueLength = function(length) {
@@ -33,14 +33,14 @@ FieldIndexer.prototype.addIndexMethods = function() {
 	this.wiki.each.byField = function(name,value) {
 		var lookup = self.lookup(name,value);
 		return lookup && lookup.filter(function(title) {
-			return self.wiki.tiddlerExists(title);
+			return self.wiki.tiddlerExists(title)
 		});
 	};
 	// get shadow tiddlers, including shadow tiddlers that is overwritten
 	this.wiki.eachShadow.byField = function(name,value) {
 		var lookup = self.lookup(name,value);
 		return lookup && lookup.filter(function(title) {
-			return self.wiki.isShadowTiddler(title);
+			return self.wiki.isShadowTiddler(title)
 		});
 	};
 	this.wiki.eachTiddlerPlusShadows.byField = function(name,value) {

core/modules/info/dimensions.js

@@ -1,86 +0,0 @@
-/*\
-title: $:/core/modules/info/windowdimensions.js
-type: application/javascript
-module-type: info
-\*/
-
-exports.getInfoTiddlerFields = function(updateInfoTiddlersCallback) {
-	if(!$tw.browser) {
-		return [];
-	}
-
-	class WindowDimensionsTracker {
-		constructor(updateCallback) {
-			this.updateCallback = updateCallback;
-			this.resizeHandlers = new Map();
-			this.dimensionsInfo = [
-				["outer/width", (win) => win.outerWidth],
-				["outer/height", (win) => win.outerHeight],
-				["inner/width", (win) => win.innerWidth],
-				["inner/height", (win) => win.innerHeight],
-				["client/width", (win) => win.document.documentElement.clientWidth],
-				["client/height", (win) => win.document.documentElement.clientHeight]
-			];
-		}
-
-		buildTiddlers(win,windowId) {
-			const prefix = `$:/info/browser/window/${windowId}/`;
-			return this.dimensionsInfo.map(([suffix, getter]) => ({
-				title: prefix + suffix,
-				text: String(getter(win))
-			}));
-		}
-
-		clearTiddlers(windowId) {
-			const prefix = `$:/info/browser/window/${windowId}/`,
-				deletions = this.dimensionsInfo.map(([suffix]) => prefix + suffix);
-			this.updateCallback([], deletions);
-		}
-
-		getUpdateHandler(win,windowId) {
-			let scheduled = false;
-			return () => {
-				if(!scheduled) {
-					scheduled = true;
-					requestAnimationFrame(() => {
-						this.updateCallback(this.buildTiddlers(win,windowId), []);
-						scheduled = false;
-					});
-				}
-			};
-		}
-
-		trackWindow(win,windowId) {
-			const handler = this.getUpdateHandler(win, windowId);
-			handler(); // initial update
-			win.addEventListener("resize",handler,{passive:true});
-			this.resizeHandlers.set(windowId,{win, handler});
-		}
-
-		untrackWindow(windowId) {
-			const entry = this.resizeHandlers.get(windowId);
-			if(entry) {
-				entry.win.removeEventListener("resize", entry.handler);
-				this.resizeHandlers.delete(windowId);
-			}
-			this.clearTiddlers(windowId);
-		}
-	}
-
-	const tracker = new WindowDimensionsTracker(updateInfoTiddlersCallback);
-
-	// Track main window
-	tracker.trackWindow(window,"system/main");
-
-	// Hook into event bus for user windows
-	if($tw.eventBus) {
-		$tw.eventBus.on("window:opened", ({window: win, windowID}) => {
-			tracker.trackWindow(win, "user/" + windowID);
-		});
-		$tw.eventBus.on("window:closed", ({windowID}) => {
-			tracker.untrackWindow("user/" + windowID);
-		});
-	}
-
-	return [];
-};

core/modules/info/mediaquerytracker.js

@@ -1,67 +0,0 @@
-/*\
-title: $:/core/modules/info/mediaquerytracker.js
-type: application/javascript
-module-type: info
-
-Initialise $:/info/ tiddlers derived from media queries via 
-
-\*/
-
-"use strict";
-
-exports.getInfoTiddlerFields = function(updateInfoTiddlersCallback) {
-	if($tw.browser) {
-		// Functions to start and stop tracking a particular media query tracker tiddler
-		function track(title) {
-			var result = {},
-				tiddler = $tw.wiki.getTiddler(title);
-			if(tiddler) {
-				var mediaQuery = tiddler.fields["media-query"],
-					infoTiddler = tiddler.fields["info-tiddler"],
-					infoTiddlerAlt = tiddler.fields["info-tiddler-alt"];
-				if(mediaQuery && infoTiddler) {
-					// Evaluate and track the media query
-					result.mqList = window.matchMedia(mediaQuery);
-					function getResultTiddlers() {
-						var value = result.mqList.matches ? "yes" : "no",
-							tiddlers = [];
-						tiddlers.push({title: infoTiddler, text: value});
-						if(infoTiddlerAlt) {
-							tiddlers.push({title: infoTiddlerAlt, text: value});
-						}
-						return tiddlers;
-					};
-					updateInfoTiddlersCallback(getResultTiddlers());
-					result.handler = function(event) {
-						updateInfoTiddlersCallback(getResultTiddlers());
-					};
-					result.mqList.addEventListener("change",result.handler);
-				}
-			}
-			return result;
-		}
-		function untrack(enterValue) {
-			if(enterValue.mqList && enterValue.handler) {
-				enterValue.mqList.removeEventListener("change",enterValue.handler);
-			}
-		}
-		// Track media query tracker tiddlers
-		function fnEnter(title) {
-			return track(title);
-		}
-		function fnLeave(title,enterValue) {
-			untrack(enterValue);
-		}
-		function fnChange(title,enterValue) {
-			untrack(enterValue);
-			return track(title);
-		}
-		$tw.filterTracker.track({
-			filterString: "[all[tiddlers+shadows]tag[$:/tags/MediaQueryTracker]!is[draft]]",
-			fnEnter: fnEnter,
-			fnLeave: fnLeave,
-			fnChange: fnChange
-		});
-	}
-	return [];
-};

core/modules/info/platform.js

@@ -33,6 +33,13 @@ exports.getInfoTiddlerFields = function(updateInfoTiddlersCallback) {
 		// Screen size
 		infoTiddlerFields.push({title: "$:/info/browser/screen/width", text: window.screen.width.toString()});
 		infoTiddlerFields.push({title: "$:/info/browser/screen/height", text: window.screen.height.toString()});
+ 		// Dark mode through event listener on MediaQueryList
+ 		var mqList = window.matchMedia("(prefers-color-scheme: dark)"),
+ 			getDarkModeTiddler = function() {return {title: "$:/info/darkmode", text: mqList.matches ? "yes" : "no"};};
+ 		infoTiddlerFields.push(getDarkModeTiddler());
+ 		mqList.addListener(function(event) {
+ 			updateInfoTiddlersCallback([getDarkModeTiddler()]);
+ 		});
 		// Language
 		infoTiddlerFields.push({title: "$:/info/browser/language", text: navigator.language || ""});
 	}

core/modules/keyboard.js

@@ -140,7 +140,7 @@ function KeyboardManager(options) {
 	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.isMac ? "shortcuts-mac" : "shortcuts-not-mac")
 	this.lookupNames.push($tw.platform.isWindows ? "shortcuts-windows" : "shortcuts-not-windows");
 	this.lookupNames.push($tw.platform.isLinux ? "shortcuts-linux" : "shortcuts-not-linux");
 	this.updateShortcutLists(this.getShortcutTiddlerList());
@@ -161,7 +161,7 @@ KeyboardManager.prototype.getModifierKeys = function() {
 		91, // Meta (left)
 		93, // Meta (right)
 		224 // Meta (Firefox)
-	];
+	]
 };
 
 /*
@@ -187,7 +187,8 @@ KeyboardManager.prototype.parseKeyDescriptor = function(keyDescriptor,options) {
 			metaKey: false
 		};
 	for(var t=0; t<components.length; t++) {
-		var s = components[t].toLowerCase();
+		var s = components[t].toLowerCase(),
+			c = s.charCodeAt(0);
 		// Look for modifier keys
 		if(s === "ctrl") {
 			info.ctrlKey = true;
@@ -265,7 +266,7 @@ KeyboardManager.prototype.getPrintableShortcuts = function(keyInfoArray) {
 		}
 	});
 	return result;
-};
+}
 
 KeyboardManager.prototype.checkKeyDescriptor = function(event,keyInfo) {
 	return keyInfo &&
@@ -292,15 +293,15 @@ KeyboardManager.prototype.getMatchingKeyDescriptor = function(event,keyInfoArray
 KeyboardManager.prototype.getEventModifierKeyDescriptor = function(event) {
 	return event.ctrlKey && !event.shiftKey	&& !event.altKey && !event.metaKey ? "ctrl" : 
 		event.shiftKey && !event.ctrlKey && !event.altKey && !event.metaKey ? "shift" : 
-			event.ctrlKey && event.shiftKey && !event.altKey && !event.metaKey ? "ctrl-shift" : 
-				event.altKey && !event.shiftKey && !event.ctrlKey && !event.metaKey ? "alt" : 
-					event.altKey && event.shiftKey && !event.ctrlKey && !event.metaKey ? "alt-shift" : 
-						event.altKey && event.ctrlKey && !event.shiftKey && !event.metaKey ? "ctrl-alt" : 
-							event.altKey && event.shiftKey && event.ctrlKey && !event.metaKey ? "ctrl-alt-shift" : 
-								event.metaKey && !event.ctrlKey && !event.shiftKey && !event.altKey ? "meta" : 
-									event.metaKey && event.ctrlKey && !event.shiftKey && !event.altKey ? "meta-ctrl" :
-										event.metaKey && event.ctrlKey && event.shiftKey && !event.altKey ? "meta-ctrl-shift" :
-											event.metaKey && event.ctrlKey && event.shiftKey && event.altKey ? "meta-ctrl-alt-shift" : "normal";
+		event.ctrlKey && event.shiftKey && !event.altKey && !event.metaKey ? "ctrl-shift" : 
+		event.altKey && !event.shiftKey && !event.ctrlKey && !event.metaKey ? "alt" : 
+		event.altKey && event.shiftKey && !event.ctrlKey && !event.metaKey ? "alt-shift" : 
+		event.altKey && event.ctrlKey && !event.shiftKey && !event.metaKey ? "ctrl-alt" : 
+		event.altKey && event.shiftKey && event.ctrlKey && !event.metaKey ? "ctrl-alt-shift" : 
+		event.metaKey && !event.ctrlKey && !event.shiftKey && !event.altKey ? "meta" : 
+		event.metaKey && event.ctrlKey && !event.shiftKey && !event.altKey ? "meta-ctrl" :
+		event.metaKey && event.ctrlKey && event.shiftKey && !event.altKey ? "meta-ctrl-shift" :
+		event.metaKey && event.ctrlKey && event.shiftKey && event.altKey ? "meta-ctrl-alt-shift" : "normal";
 };
 
 KeyboardManager.prototype.getShortcutTiddlerList = function() {
@@ -370,8 +371,8 @@ KeyboardManager.prototype.handleShortcutChanges = function(changedTiddlers) {
 	var newList = this.getShortcutTiddlerList();
 	var hasChanged = $tw.utils.hopArray(changedTiddlers,this.shortcutTiddlers) ? true :
 		($tw.utils.hopArray(changedTiddlers,newList) ? true :
-			(this.detectNewShortcuts(changedTiddlers))
-		);
+		(this.detectNewShortcuts(changedTiddlers))
+	);
 	// Re-cache shortcuts if something changed
 	if(hasChanged) {
 		this.updateShortcutLists(newList);

core/modules/macros/csvtiddlers.js

@@ -24,7 +24,8 @@ exports.params = [
 Run the macro
 */
 exports.run = function(filter,format) {
-	var tiddlers = this.wiki.filterTiddlers(filter),
+	var self = this,
+		tiddlers = this.wiki.filterTiddlers(filter),
 		tiddler,
 		fields = [],
 		t,f;
@@ -45,24 +46,24 @@ exports.run = function(filter,format) {
 		var p = fields.indexOf(value);
 		if(p !== -1) {
 			fields.splice(p,1);
-			fields.unshift(value);
+			fields.unshift(value)
 		}
 	});
 	// Output the column headings
 	var output = [], row = [];
 	fields.forEach(function(value) {
-		row.push(quoteAndEscape(value));
+		row.push(quoteAndEscape(value))
 	});
 	output.push(row.join(","));
 	// Output each tiddler
 	for(var t=0;t<tiddlers.length; t++) {
 		row = [];
 		tiddler = this.wiki.getTiddler(tiddlers[t]);
-		if(tiddler) {
-			for(f=0; f<fields.length; f++) {
-				row.push(quoteAndEscape(tiddler ? tiddler.getFieldString(fields[f]) || "" : ""));
-			}	
-		}
+			if(tiddler) {
+				for(f=0; f<fields.length; f++) {
+					row.push(quoteAndEscape(tiddler ? tiddler.getFieldString(fields[f]) || "" : ""));
+				}	
+			}
 		output.push(row.join(","));
 	}
 	return output.join("\n");

core/modules/macros/displayshortcuts.js

@@ -31,8 +31,8 @@ exports.run = function(shortcuts,prefix,separator,suffix) {
 	}));
 	if(shortcutArray.length > 0) {
 		shortcutArray.sort(function(a,b) {
-			return a.toLowerCase().localeCompare(b.toLowerCase());
-		});
+		    return a.toLowerCase().localeCompare(b.toLowerCase());
+		})
 		return prefix + shortcutArray.join(separator) + suffix;
 	} else {
 		return "";

core/modules/parsers/audioparser.js

@@ -11,28 +11,19 @@ The audio parser parses an audio tiddler into an embeddable HTML element
 
 var AudioParser = function(type,text,options) {
 	var element = {
-		type: "element",
-		tag: "$audio", // Using $audio to enable widget interception
-		attributes: {
-			controls: {type: "string", value: "controls"},
-			style: {type: "string", value: "width: 100%; object-fit: contain"}
-		}
-	};
-		
-	// Pass through source information
+			type: "element",
+			tag: "audio",
+			attributes: {
+				controls: {type: "string", value: "controls"},
+				style: {type: "string", value: "width: 100%; object-fit: contain"}
+			}
+		},
+		src;
 	if(options._canonical_uri) {
 		element.attributes.src = {type: "string", value: options._canonical_uri};
-		element.attributes.type = {type: "string", value: type};
 	} else if(text) {
 		element.attributes.src = {type: "string", value: "data:" + type + ";base64," + text};
-		element.attributes.type = {type: "string", value: type};
 	}
-	
-	// Pass through tiddler title if available
-	if(options.title) {
-		element.attributes.tiddler = {type: "string", value: options.title};
-	}
-	
 	this.tree = [element];
 	this.source = text;
 	this.type = type;
@@ -42,4 +33,3 @@ exports["audio/ogg"] = AudioParser;
 exports["audio/mpeg"] = AudioParser;
 exports["audio/mp3"] = AudioParser;
 exports["audio/mp4"] = AudioParser;
-