Merge branch 'master' into landing-page-experiments-2023

.github/workflows/ci.yml

@@ -10,12 +10,12 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: "${{ env.NODE_VERSION }}"
       - run: "./bin/ci-test.sh"
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: playwright-report
@@ -30,8 +30,8 @@ jobs:
       TW5_BUILD_MAIN_EDITION: "./editions/prerelease"
       TW5_BUILD_OUTPUT: "./output/prerelease"
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: "${{ env.NODE_VERSION }}"
       - run: "./bin/ci-pre-build.sh"
@@ -62,8 +62,8 @@ jobs:
       TW5_BUILD_OUTPUT: "./output"
       TW5_BUILD_ARCHIVE: "./output"
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: "${{ env.NODE_VERSION }}"
       - run: "./bin/ci-pre-build.sh"

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

@@ -0,0 +1,55 @@
+name: Calculate PR build size
+on:
+  pull_request_target:
+    types: [opened, reopened, synchronize]
+    paths:
+      - 'boot/**'
+      - 'core/**'
+      - 'themes/snowwhite/**'
+      - 'themes/vanilla/**'
+
+jobs:
+  calculate-build-size:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: read
+      contents: read
+    outputs:
+      pr_size: ${{ steps.get_sizes.outputs.pr_size }}
+      base_size: ${{ steps.get_sizes.outputs.base_size }}
+    steps:
+    - name: build-size-check
+      id: get_sizes
+      uses: TiddlyWiki/cerebrus@v4
+      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: size:calc
+
+  dispatch-followup:
+    needs: calculate-build-size
+    runs-on: ubuntu-latest
+    permissions:
+      actions: write  # Required to dispatch another workflow
+      pull-requests: write
+      contents: read
+    steps:
+    - name: Trigger follow-up workflow
+      uses: actions/github-script@v6
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        script: |
+          await github.rest.actions.createWorkflowDispatch({
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            workflow_id: 'pr-comment-build-size.yml',
+            ref: 'master',
+            inputs: {
+              pr_number: '${{ github.event.pull_request.number }}',
+              base_ref: '${{ github.event.pull_request.base.ref }}',
+              pr_size: '${{ needs.calculate-build-size.outputs.pr_size }}',
+              base_size: '${{ needs.calculate-build-size.outputs.base_size }}'
+            }
+          });

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

@@ -0,0 +1,36 @@
+name: Comment on PR build size (Trusted workflow)
+
+on:
+  workflow_dispatch:
+    inputs:
+      pr_number:
+        required: true
+        type: string
+      base_ref:
+        required: true
+        type: string
+      pr_size:
+        required: true
+        type: string
+      base_size:
+        required: true
+        type: string
+
+jobs:
+  comment-on-pr:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+      contents: read
+
+    steps:
+    - name: Build and check size
+      uses: TiddlyWiki/cerebrus@v4
+      with:
+        pr_number: ${{ inputs.pr_number }}
+        repo: ${{ github.repository }}
+        base_ref: ${{ inputs.base_ref }}
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        mode: size:comment
+        pr_size: ${{ inputs.pr_size }}
+        base_size: ${{ inputs.base_size }}

.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 }}

bin/build-site.sh

@@ -105,6 +105,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 fi
 
 # /index.html			Main site
+# /external-(version).html External core version of main site
 # /favicon.ico			Favicon for main site
 # /static.html			Static rendering of default tiddlers
 # /alltiddlers.html		Static rendering of all tiddlers
@@ -117,7 +118,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 	--version \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
-	--build favicon static index \
+	--build favicon static index external-js \
 	|| exit 1
 
 # /empty.html					Empty
@@ -155,7 +156,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/tour \
 	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all tour.html text/plain \
+	--rendertiddler $:/core/save/all-external-js tour.html text/plain \
 	|| exit 1
 
 # /share.html				Custom edition for sharing via the URL
@@ -194,7 +195,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 	./editions/xlsx-utils \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/editions/xlsx-utils/ \
-	--build index \
+	--build external \
 	|| exit 1
 
 # /editions/resumebuilder/index.html	Resume builder edition
@@ -210,7 +211,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 	./editions/text-slicer \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/editions/text-slicer/ \
-	--build index \
+	--build external \
 	|| exit 1
 
 # /editions/translators/index.html	Translators edition
@@ -242,7 +243,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 	./editions/tw5.com-docs \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/editions/tw5.com-docs/ \
-	--build index \
+	--build external \
 	|| exit 1
 
 # /editions/twitter-archivist/index.html	Twitter Archivist edition
@@ -265,7 +266,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 	./editions/innerwikidemo \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all plugins/tiddlywiki/innerwiki/index.html text/plain \
+	--rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/innerwiki/index.html text/plain \
 	|| exit 1
 
 # /plugins/tiddlywiki/dynaview/index.html	Demo wiki with DynaView plugin
@@ -275,7 +276,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 	./editions/dynaviewdemo \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all plugins/tiddlywiki/dynaview/index.html text/plain \
+	--rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/dynaview/index.html text/plain \
 	--rendertiddler $:/core/save/empty plugins/tiddlywiki/dynaview/empty.html text/plain \
 	|| exit 1
 
@@ -289,7 +290,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 	./editions/katexdemo \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all plugins/tiddlywiki/katex/index.html text/plain \
+	--rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/katex/index.html text/plain \
 	--rendertiddler $:/core/save/empty plugins/tiddlywiki/katex/empty.html text/plain \
 	|| exit 1
 
@@ -319,7 +320,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 	./editions/codemirrordemo \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all plugins/tiddlywiki/codemirror/index.html text/plain \
+	--rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/codemirror/index.html text/plain \
 	--rendertiddler $:/core/save/empty plugins/tiddlywiki/codemirror/empty.html text/plain \
 	|| exit 1
 
@@ -329,7 +330,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 	./editions/markdowndemo \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all plugins/tiddlywiki/markdown/index.html text/plain \
+	--rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/markdown/index.html text/plain \
 	--rendertiddler $:/core/save/empty plugins/tiddlywiki/markdown/empty.html text/plain \
 	|| exit 1
 
@@ -339,7 +340,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 	./editions/classicparserdemo \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all plugins/tiddlywiki/tw2parser/index.html text/plain \
+	--rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/tw2parser/index.html text/plain \
 	--rendertiddler $:/core/save/empty plugins/tiddlywiki/tw2parser/empty.html text/plain \
 	|| exit 1
 
@@ -349,7 +350,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 	./editions/highlightdemo \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all plugins/tiddlywiki/highlight/index.html text/plain \
+	--rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/highlight/index.html text/plain \
 	--rendertiddler $:/core/save/empty plugins/tiddlywiki/highlight/empty.html text/plain \
 	|| exit 1
 
@@ -359,7 +360,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 	./editions/geospatialdemo \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all plugins/tiddlywiki/geospatial/index.html text/plain \
+	--rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/geospatial/index.html text/plain \
 	--rendertiddler $:/core/save/empty plugins/tiddlywiki/geospatial/empty.html text/plain \
 	|| exit 1
 

boot/boot.js

@@ -232,10 +232,10 @@ $tw.utils.error = function(err) {
 				var link = dm("a"),
 					text = JSON.stringify(tiddlers);
 				if(Blob !== undefined) {
-					var blob = new Blob([text], {type: "text/html"});
+					var blob = new Blob([text], {type: "application/json"});
 					link.setAttribute("href", URL.createObjectURL(blob));
 				} else {
-					link.setAttribute("href","data:text/html," + encodeURIComponent(text));
+					link.setAttribute("href","data:application/json," + encodeURIComponent(text));
 				}
 				link.setAttribute("download","emergency-tiddlers-" + (new Date()) + ".json");
 				document.body.appendChild(link);
@@ -1470,17 +1470,15 @@ $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
-		pluginTiddlers.sort(function(a,b) {
-			if("plugin-priority" in a.fields && "plugin-priority" in b.fields) {
-				return a.fields["plugin-priority"] - b.fields["plugin-priority"];
-			} else if("plugin-priority" in a.fields) {
+		// 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) {
+				return priorityA - priorityB;
+			} else if (a.fields.title < b.fields.title) {
 				return -1;
-			} else if("plugin-priority" in b.fields) {
-				return +1;
-			} 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;
@@ -1904,8 +1902,16 @@ $tw.loadTiddlersFromFile = function(filepath,fields) {
 		extensionInfo = $tw.utils.getFileExtensionInfo(ext),
 		type = extensionInfo ? extensionInfo.type : null,
 		typeInfo = type ? $tw.config.contentTypeInfo[type] : null,
-		data = fs.readFileSync(filepath,typeInfo ? typeInfo.encoding : "utf8"),
-		tiddlers = $tw.wiki.deserializeTiddlers(ext,data,fields),
+		fileSize = fs.statSync(filepath).size,
+		data;
+	if(fileSize > $tw.config.maxEditFileSize) {
+		data = "File " + filepath + "not loaded because it is too large";
+		console.log("Warning: " + data);
+		ext = ".txt";
+	} else {
+		data = fs.readFileSync(filepath,typeInfo ? typeInfo.encoding : "utf8");
+	}
+	var tiddlers = $tw.wiki.deserializeTiddlers(ext,data,fields),
 		metadata = $tw.loadMetadataForFile(filepath);
 	if(metadata) {
 		if(type === "application/json") {
@@ -1994,7 +2000,7 @@ $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
 					var value = tiddler[name];
 					switch(fieldInfo.source) {
 						case "subdirectories":
-							value = path.relative(rootPath, filename).split(path.sep).slice(0, -1);
+							value = $tw.utils.stringifyList(path.relative(rootPath, filename).split(path.sep).slice(0, -1));
 							break;
 						case "filepath":
 							value = path.relative(rootPath, filename).split(path.sep).join('/');
@@ -2015,10 +2021,10 @@ $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
 							value = path.extname(filename);
 							break;
 						case "created":
-							value = new Date(fs.statSync(pathname).birthtime);
+							value = $tw.utils.stringifyDate(new Date(fs.statSync(pathname).birthtime));
 							break;
 						case "modified":
-							value = new Date(fs.statSync(pathname).mtime);
+							value = $tw.utils.stringifyDate(new Date(fs.statSync(pathname).mtime));
 							break;
 					}
 					if(fieldInfo.prefix) {
@@ -2465,13 +2471,15 @@ $tw.boot.initStartup = function(options) {
 	$tw.utils.registerFileType("image/webp","base64",".webp",{flags:["image"]});
 	$tw.utils.registerFileType("image/heic","base64",".heic",{flags:["image"]});
 	$tw.utils.registerFileType("image/heif","base64",".heif",{flags:["image"]});
+	$tw.utils.registerFileType("image/avif","base64",".avif",{flags:["image"]});
 	$tw.utils.registerFileType("image/svg+xml","utf8",".svg",{flags:["image"]});
 	$tw.utils.registerFileType("image/vnd.microsoft.icon","base64",".ico",{flags:["image"]});
 	$tw.utils.registerFileType("image/x-icon","base64",".ico",{flags:["image"]});
 	$tw.utils.registerFileType("application/wasm","base64",".wasm");
-	$tw.utils.registerFileType("application/font-woff","base64",".woff");
-	$tw.utils.registerFileType("application/x-font-ttf","base64",".woff");
-	$tw.utils.registerFileType("application/font-woff2","base64",".woff2");
+	$tw.utils.registerFileType("font/woff","base64",".woff");
+	$tw.utils.registerFileType("font/woff2","base64",".woff2");
+	$tw.utils.registerFileType("font/ttf","base64",".ttf");
+	$tw.utils.registerFileType("font/otf","base64",".otf");
 	$tw.utils.registerFileType("audio/ogg","base64",".ogg");
 	$tw.utils.registerFileType("audio/mp4","base64",[".mp4",".m4a"]);
 	$tw.utils.registerFileType("video/ogg","base64",[".ogm",".ogv",".ogg"]);

boot/bootprefix.js

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

core/acknowledgements.tid

@@ -5,7 +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/]]
 * [[Normalize.css by Nicolas Gallagher|http://necolas.github.io/normalize.css/]]
-
-And media from these projects:
-
-* World flag icons from [[Wikipedia|http://commons.wikimedia.org/wiki/Category:SVG_flags_by_country]]

core/copyright.tid

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

core/images/language.tid

@@ -0,0 +1,5 @@
+title: $:/core/images/language
+tags: $:/tags/Image
+
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-language tc-image-button" viewBox="0 0 92 92"><path d="M0 0h2480.32v3507.87H0z" style="fill:none" transform="scale(.03696 .02613)"/><path d="M71.508 62.298c-1.243 15.83-16.758 28.344-35.714 28.344-5.713 0-11.113-1.136-15.905-3.158-2.977 2.498-8.618 4.183-15.088 4.183-.929 0-1.84-.034-2.73-.102 4.499-1.5 7.989-4.886 9.298-9.099C4.373 76.918 0 69.016 0 60.246 0 49.773 6.237 40.537 15.729 35.07c1.235 7.764 5.492 14.713 11.724 19.953l-7.269 18.453c-.393.976-.676 1.737-.847 2.285a5.326 5.326 0 0 0-.256 1.591c0 .89.368 1.686 1.103 2.388.736.702 1.583 1.052 2.542 1.052 1.13 0 1.942-.33 2.438-.988.497-.659 1.096-1.93 1.797-3.812l1.797-4.826h15.3l1.797 4.723c.239.582.526 1.254.86 2.015.333.762.646 1.327.936 1.695.291.368.65.659 1.078.873.428.213.942.32 1.54.32a3.586 3.586 0 0 0 2.632-1.09c.727-.728 1.09-1.528 1.09-2.4 0-.84-.384-2.183-1.154-4.031l-3.545-8.755c2.142.3 4.34.455 6.58.455 5.541 0 10.824-.951 15.636-2.674Zm-30.563.247 1.059 2.898H30.76l2.32-6.467a43.152 43.152 0 0 0 7.865 3.569Z"/><path d="M71.778 57.635c-4.793 2.023-10.191 3.157-15.907 3.157-19.767 0-35.793-13.61-35.793-30.396S36.104.001 55.87.001c19.772 0 35.797 13.61 35.797 30.395 0 8.77-4.373 16.674-11.371 22.221 1.309 4.211 4.8 7.6 9.299 9.1-.89.067-1.802.1-2.73.1-6.47 0-12.11-1.686-15.088-4.182Zm-15.59-15.887a44.237 44.237 0 0 0 3.3 2.496c4.284 2.942 9.06 5.381 14.33 7.315l2.334-3.517c-5.134-1.871-9.696-4.125-13.69-6.763a42.558 42.558 0 0 1-3.37-2.483c4.247-4.806 7.374-10.43 9.38-16.869h6.698V17.78h-16.7a47.226 47.226 0 0 0-1.528-2.959 52.943 52.943 0 0 0-2.885-4.562l-4.218 1.554a36.467 36.467 0 0 1 2.971 3.983c.427.661.833 1.323 1.217 1.984H36.394v4.148h6.77a36.878 36.878 0 0 0 5.422 11.56 42.918 42.918 0 0 0 4.591 5.497c-4.687 4.017-10.548 6.932-17.582 8.744l2.247 3.709c7.746-2.44 13.861-5.67 18.347-9.689Zm-9.047-19.82h16.991c-1.86 5.668-4.528 10.402-8 14.204a42.526 42.526 0 0 1-4.247-4.922c-2.126-2.883-3.71-5.977-4.744-9.283Z"/></svg>

core/language/en-GB/ControlPanel.multids

@@ -131,15 +131,14 @@ Saving/GitService/Gitea/Caption: Gitea Saver
 Saving/GitService/Gitea/Password: Personal access token for API (via Gitea’s web interface: `Settings | Applications | Generate New Token`)
 Saving/TiddlySpot/Advanced/Heading: Advanced Settings
 Saving/TiddlySpot/BackupDir: Backup Directory
-Saving/TiddlySpot/ControlPanel: ~TiddlySpot Control Panel
+Saving/TiddlySpot/ControlPanel: ~TiddlyHost Control Panel
 Saving/TiddlySpot/Backups: Backups
-Saving/TiddlySpot/Caption: ~TiddlySpot Saver
-Saving/TiddlySpot/Description: These settings are only used when saving to [[TiddlySpot|http://tiddlyspot.com]], [[TiddlyHost|https://tiddlyhost.com]], or a compatible remote server. See [[here|https://github.com/simonbaird/tiddlyhost/wiki/TiddlySpot-Saver-configuration-for-Tiddlyhost-and-Tiddlyspot]] for information on ~TiddlySpot and ~TiddlyHost saving configuration.
+Saving/TiddlySpot/Caption: ~TiddlyHost Saver
+Saving/TiddlySpot/Description: These settings are only used when saving to [[TiddlyHost|https://tiddlyhost.com]] or a compatible remote server. See [[here|https://github.com/simonbaird/tiddlyhost/wiki/TiddlySpot-Saver-configuration-for-Tiddlyhost-and-Tiddlyspot]] for information on ~TiddlyHost saving configuration
 Saving/TiddlySpot/Filename: Upload Filename
-Saving/TiddlySpot/Heading: ~TiddlySpot
-Saving/TiddlySpot/Hint: //The server URL defaults to `http://<wikiname>.tiddlyspot.com/store.cgi` and can be changed to use a custom server address, e.g. `http://example.com/store.php`.//
+Saving/TiddlySpot/Heading: ~TiddlyHost
+Saving/TiddlySpot/Hint: //The server URL defaults to `http://<wikiname>.tiddlyspot.com/` and can be changed to use a custom server address, e.g. `http://example.com/store.php`.//
 Saving/TiddlySpot/Password: Password
-Saving/TiddlySpot/ReadOnly: Note that [[TiddlySpot|http://tiddlyspot.com]] no longer allows the creation of new sites. For new sites, you can use [[TiddlyHost|https://tiddlyhost.com]], a new hosting service that replaces ~TiddlySpot.
 Saving/TiddlySpot/ServerURL: Server URL
 Saving/TiddlySpot/UploadDir: Upload Directory
 Saving/TiddlySpot/UserName: Wiki Name
@@ -190,6 +189,8 @@ Settings/DefaultSidebarTab/Caption: Default Sidebar Tab
 Settings/DefaultSidebarTab/Hint: Specify which sidebar tab is displayed by default
 Settings/DefaultMoreSidebarTab/Caption: Default More Sidebar Tab
 Settings/DefaultMoreSidebarTab/Hint: Specify which More sidebar tab is displayed by default
+Settings/DefaultTiddlerInfoTab/Caption: Default Tiddler Info Tab
+Settings/DefaultTiddlerInfoTab/Hint: Specify which tab is displayed by default when tiddler info panel is opened
 Settings/LinkToBehaviour/Caption: Tiddler Opening Behaviour
 Settings/LinkToBehaviour/InsideRiver/Hint: Navigation from //within// the story river
 Settings/LinkToBehaviour/OutsideRiver/Hint: Navigation from //outside// the story river

core/language/en-GB/Fields.multids

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

core/language/en-GB/icon.tid

@@ -1,13 +0,0 @@
-title: $:/languages/en-GB/icon
-type: image/svg+xml
-
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 30" width="1200" height="600">
-<clipPath id="t">
-	<path d="M30,15 h30 v15 z v15 h-30 z h-30 v-15 z v-15 h30 z"/>
-</clipPath>
-<path d="M0,0 v30 h60 v-30 z" fill="#00247d"/>
-<path d="M0,0 L60,30 M60,0 L0,30" stroke="#fff" stroke-width="6"/>
-<path d="M0,0 L60,30 M60,0 L0,30" clip-path="url(#t)" stroke="#cf142b" stroke-width="4"/>
-<path d="M30,0 v30 M0,15 h60" stroke="#fff" stroke-width="10"/>
-<path d="M30,0 v30 M0,15 h60" stroke="#cf142b" stroke-width="6"/>
-</svg>

core/modules/commander.js

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

core/modules/commands/build.js

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

core/modules/commands/clearpassword.js

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

core/modules/commands/commands.js

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

core/modules/commands/deletetiddlers.js

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

core/modules/commands/editions.js

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

core/modules/commands/fetch.js

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

core/modules/commands/help.js

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

core/modules/commands/import.js

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

core/modules/commands/init.js

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

core/modules/commands/listen.js

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

core/modules/commands/load.js

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

core/modules/commands/makelibrary.js

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

core/modules/commands/output.js

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

core/modules/commands/password.js

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

core/modules/commands/render.js

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

core/modules/commands/rendertiddler.js

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

core/modules/commands/rendertiddlers.js

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

core/modules/commands/save.js

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

core/modules/commands/savelibrarytiddlers.js

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

core/modules/commands/savetiddler.js

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

core/modules/commands/savetiddlers.js

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

core/modules/commands/savewikifolder.js

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

core/modules/commands/server.js

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

core/modules/commands/setfield.js

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

core/modules/commands/unpackplugin.js

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

core/modules/commands/verbose.js

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

core/modules/commands/version.js

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

core/modules/config.js

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

core/modules/deserializers.js

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

core/modules/editor/engines/framed.js

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

core/modules/editor/engines/simple.js

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

core/modules/editor/factory.js

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

core/modules/filterrunprefixes/all.js

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

core/modules/filterrunprefixes/and.js

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

core/modules/filterrunprefixes/cascade.js

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

core/modules/filterrunprefixes/else.js

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

core/modules/filterrunprefixes/except.js

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

core/modules/filterrunprefixes/filter.js

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

core/modules/filterrunprefixes/intersection.js

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

core/modules/filterrunprefixes/map.js

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

core/modules/filterrunprefixes/or.js

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

core/modules/filterrunprefixes/reduce.js

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

core/modules/filterrunprefixes/sort.js

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

core/modules/filterrunprefixes/then.js

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

core/modules/filters.js

@@ -6,10 +6,7 @@ module-type: wikimethod
 Adds tiddler filtering methods to the $tw.Wiki object.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var widgetClass = require("$:/core/modules/widgets/widget.js").widget;
@@ -251,8 +248,7 @@ exports.compileFilter = function(filterString) {
 		// Create a function for the chain of operators in the operation
 		var operationSubFunction = function(source,widget) {
 			var accumulator = source,
-				results = [],
-				currTiddlerTitle = widget && widget.getVariable("currentTiddler");
+				results = [];
 			$tw.utils.each(operation.operators,function(operator) {
 				var operands = [],
 					operatorFunction;
@@ -268,6 +264,7 @@ exports.compileFilter = function(filterString) {
 				}
 				$tw.utils.each(operator.operands,function(operand) {
 					if(operand.indirect) {
+						var currTiddlerTitle = widget && widget.getVariable("currentTiddler");
 						operand.value = self.getTextReference(operand.text,"",currTiddlerTitle);
 					} else if(operand.variable) {
 						var varTree = $tw.utils.parseFilterVariable(operand.text);
@@ -367,5 +364,3 @@ exports.compileFilter = function(filterString) {
 	this.filterCacheCount++;
 	return fnMeasured;
 };
-
-})();

core/modules/filters/addprefix.js

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

core/modules/filters/addsuffix.js

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

core/modules/filters/after.js

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

core/modules/filters/all.js

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

core/modules/filters/all/current.js

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

core/modules/filters/all/missing.js

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

core/modules/filters/all/orphans.js

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

core/modules/filters/all/shadows.js

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

core/modules/filters/all/tags.js

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

core/modules/filters/all/tiddlers.js

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

core/modules/filters/backlinks.js

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

core/modules/filters/backtranscludes.js

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

core/modules/filters/before.js

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

core/modules/filters/commands.js

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

core/modules/filters/compare.js

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

core/modules/filters/contains.js

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

core/modules/filters/count.js

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

core/modules/filters/crypto.js

@@ -6,10 +6,7 @@ module-type: filteroperator
 Filter operators for cryptography, using the Stanford JavaScript library
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.sha256 = function(source,operator,options) {
@@ -20,5 +17,3 @@ exports.sha256 = function(source,operator,options) {
 	});
 	return results;
 };
-
-})();

core/modules/filters/days.js

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

core/modules/filters/deserialize.js

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

core/modules/filters/deserializers.js

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

core/modules/filters/duplicateslugs.js

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

core/modules/filters/each.js

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

core/modules/filters/eachday.js

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

core/modules/filters/editiondescription.js

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

core/modules/filters/editions.js

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

core/modules/filters/else.js

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

core/modules/filters/encodings.js

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