Fix broken merge

Merge branch 'master' into logging-improvements
Initial improvements
2026-01-27 05:13:40 +00:00 · 2024-06-06 16:39:06 +01:00 · 2024-06-06 16:32:06 +01:00 · 2019-01-17 15:20:24 +00:00
570 changed files with 2797 additions and 4501 deletions
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -231,10 +231,7 @@ rules:
  prefer-spread: 'off'
  prefer-template: 'off'
  quote-props: 'off'
-  quotes:
-    - error
-    - double
-    - avoidEscape: true
+  quotes: 'off'
  radix: 'off'
  require-atomic-updates: error
  require-await: error
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -21,7 +21,7 @@ body:
    attributes:
      label: To Reproduce
      description: "Steps to reproduce the behavior:"
-      placeholder: |
+      value: |
        1. Go to '...'
        2. Click on '....'
        3. Scroll down to '....'
@@ -41,7 +41,7 @@ body:
    attributes:
      label: TiddlyWiki Configuration
      description: please complete the following information
-      placeholder: |
+      value: |
        - Version [e.g. v5.1.24]
        - Saving mechanism [e.g. Node.js, TiddlyDesktop, TiddlyHost etc]
        - Plugins installed [e.g. Freelinks, TiddlyMap]
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,7 +1,7 @@
 blank_issues_enabled: false
 contact_links:
  - name: Discuss feature request
-    url: https://github.com/TiddlyWiki/TiddlyWiki5/discussions
+    url: https://github.com/Jermolene/TiddlyWiki5/discussions
    about: Open new discussion about new feature
  - name: Talk.Tiddlywiki Forum
    url: https://talk.tiddlywiki.org
--- a/.github/workflows/cla-check.yml
+++ b/.github/workflows/cla-check.yml
@@ -1,30 +0,0 @@
-name: Check CLA Signature
-on:
-  pull_request_target:
-    types:
-      - opened
-      - reopened
-    paths-ignore:
-      - 'licenses/cla-individual.md'
-jobs:
-  check_cla:
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-    if: ${{ (github.event.pull_request.user.login != github.repository_owner) }}
-    steps:
-    - run: |
-        if ! curl -s https://raw.githubusercontent.com/Jermolene/TiddlyWiki5/tiddlywiki-com/licenses/cla-individual.md | grep -o "@$USER,"; then
-          echo "CLA not signed"
-          gh pr comment "$NUMBER" -b "@$USER It appears that this is your first contribution to the project, welcome.
-          
-          With apologies for the bureaucracy, please could you prepare a separate PR to the 'tiddlywiki-com' branch with your signature for the Contributor License Agreement (see [contributing.md](https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/contributing.md))."
-        else
-          echo "CLA already signed"
-          gh pr comment "$NUMBER" -b "Confirmed: **$USER** has already signed the Contributor License Agreement (see [contributing.md](https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/contributing.md))"
-        fi
-      env:
-        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        GH_REPO: ${{ github.repository }}
-        NUMBER: ${{ github.event.pull_request.number }}
-        USER: ${{ github.actor }}
--- a/.github/workflows/cla-signed.yml
+++ b/.github/workflows/cla-signed.yml
@@ -1,70 +0,0 @@
-name: CLA Signed
-
-on:
-  pull_request_target:
-    types:
-      - opened
-      - closed
-    paths:
-      - 'licenses/cla-individual.md'
-
-env:
-  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  GH_REPO: ${{ github.repository }}
-  NUMBER: ${{ github.event.pull_request.number }}
-  AUTHOR: ${{ github.event.pull_request.user.login }}
-
-jobs:
-  # check if PRs updating the CLA are targetting the tiddlywiki-com branch
-  check-signature-branch:
-    if: (github.event.pull_request.merged != true) && (github.event.pull_request.user.login != github.repository_owner)
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-    steps:
-    - run: |
-        if ! $BRANCH == "tiddlywiki-com"; then
-          echo "This CLA signature targets the wrong branch"
-          gh pr comment "$NUMBER" -b "@$AUTHOR Signatures to the CLA must target the 'tiddlywiki-com' branch."
-        fi
-      env:
-        BRANCH: ${{ github.event.pull_request.base.ref }}
-
-  # leave a comment on each open PR by a given author when their signature is added to the CLA
-  cla-signed:
-    if: (github.event.pull_request.merged == true) && (github.event.pull_request.user.login != github.repository_owner)
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-    steps:
-    - name: List open PRs by user
-      id: list-prs
-      uses: actions/github-script@v6
-      with:
-        result-encoding: string
-        script: |
-          const owner = context.repo.owner,
-            repo = context.repo.repo,
-            author = context.payload.pull_request.user.login;
-
-          const { data: pullRequests } = await github.rest.pulls.list({
-            owner: owner,
-            repo: repo,
-            state: 'open',
-            sort: 'created',
-            direction: 'desc',
-            per_page: 100
-          });
-          const userPullRequests = pullRequests.filter(pr => pr.user.login === author),
-            prNumbers = userPullRequests.map(pr => pr.number).join(',');
-          console.log(`Open pull requests by ${author}:${prNumbers}`);
-          return prNumbers;
-          
-    - name: Comment open PRs by the same author
-      run: |
-        prs=($(echo ${{ steps.list-prs.outputs.result }} | tr "," "\n"))  
-  
-        for number in "${prs[@]}"  
-        do  
-          gh pr comment "$number" -b "**$AUTHOR** has signed the Contributor License Agreement (see [contributing.md](https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/contributing.md))"
-        done     
--- a/bin/build-site.sh
+++ b/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.3.6
+    TW5_BUILD_VERSION=v5.3.3
 fi

 echo "Using TW5_BUILD_VERSION as [$TW5_BUILD_VERSION]"
--- a/bin/ci-pre-build.sh
+++ b/bin/ci-pre-build.sh
@@ -7,4 +7,4 @@ npm --force install tiddlywiki || exit 1

 # Pull existing GitHub pages content

-git clone --depth=1 --branch=master "https://github.com/TiddlyWiki/tiddlywiki.com-gh-pages.git" output
+git clone --depth=1 --branch=master "https://github.com/Jermolene/jermolene.github.io.git" output
--- a/bin/ci-push.sh
+++ b/bin/ci-push.sh
@@ -10,6 +10,6 @@ git config --global user.email "actions@github.com"
 git config --global user.name "GitHub Actions"
 git add -A .
 git commit --message "GitHub build: $GITHUB_RUN_NUMBER of $TW5_BUILD_BRANCH ($(date +'%F %T %Z'))"
-git remote add deploy "https://$GH_TOKEN@github.com/TiddlyWiki/tiddlywiki.com-gh-pages.git" &>/dev/null
+git remote add deploy "https://$GH_TOKEN@github.com/Jermolene/jermolene.github.io.git" &>/dev/null
 git push deploy master &>/dev/null
 cd ..
--- a/boot/bootprefix.js
+++ b/boot/bootprefix.js
@@ -21,7 +21,7 @@ $tw.boot = $tw.boot || Object.create(null);

 // Detect platforms
 if(!("browser" in $tw)) {
-	$tw.browser = typeof(window) !== "undefined" && typeof(document) !== "undefined" ? {} : null;
+	$tw.browser = typeof(window) !== "undefined" ? {} : null;
 }
 if(!("node" in $tw)) {
 	$tw.node = typeof(process) === "object" ? {} : null;
--- a/contributing.md
+++ b/contributing.md
--- a/core/images/discord.tid
+++ b/core/images/discord.tid
@@ -1,5 +0,0 @@
-title: $:/core/images/discord
-tags: $:/tags/Image
-
-\parameters (size:"22pt")
-<svg width=<<size>> height=<<size>> class="tc-image-discord tc-image-button" viewBox="0 -28.5 256 256"><path d="M216.856 16.597A208.502 208.502 0 0 0 164.042 0c-2.275 4.113-4.933 9.645-6.766 14.046-19.692-2.961-39.203-2.961-58.533 0-1.832-4.4-4.55-9.933-6.846-14.046a207.809 207.809 0 0 0-52.855 16.638C5.618 67.147-3.443 116.4 1.087 164.956c22.169 16.555 43.653 26.612 64.775 33.193A161.094 161.094 0 0 0 79.735 175.3a136.413 136.413 0 0 1-21.846-10.632 108.636 108.636 0 0 0 5.356-4.237c42.122 19.702 87.89 19.702 129.51 0a131.66 131.66 0 0 0 5.355 4.237 136.07 136.07 0 0 1-21.886 10.653c4.006 8.02 8.638 15.67 13.873 22.848 21.142-6.58 42.646-16.637 64.815-33.213 5.316-56.288-9.08-105.09-38.056-148.36ZM85.474 135.095c-12.645 0-23.015-11.805-23.015-26.18s10.149-26.2 23.015-26.2c12.867 0 23.236 11.804 23.015 26.2.02 14.375-10.148 26.18-23.015 26.18Zm85.051 0c-12.645 0-23.014-11.805-23.014-26.18s10.148-26.2 23.014-26.2c12.867 0 23.236 11.804 23.015 26.2 0 14.375-10.148 26.18-23.015 26.18Z"/></svg>
--- a/core/images/input-button.tid
+++ b/core/images/input-button.tid
@@ -1,5 +0,0 @@
-title: $:/core/images/input-button
-tags: $:/tags/Image
-
-\parameters (size:"22pt")
-<svg width=<<size>> height=<<size>> class="tc-image-input-button tc-image-button" viewBox="0 0 22 22"><path d="M1.375 22h19.249c.365 0 .716-.145.973-.404v.001c.258-.257.404-.607.403-.972v-11a1.376 1.376 0 0 0-2.75 0v9.625H2.75V9.625a1.376 1.376 0 0 0-2.75 0v11C0 21.384.617 22 1.375 22Z"/><path d="m9.732 11.904-1.541-1.541a1.375 1.375 0 1 0-1.944 1.944l3.887 3.888c.258.258.608.402.973.402h-.001c.353 0 .705-.134.974-.402l3.888-3.889a1.376 1.376 0 0 0 .001-1.944 1.377 1.377 0 0 0-1.946 0l-1.541 1.542V1.376a1.375 1.375 0 1 0-2.75 0v10.528Z"/></svg>
--- a/core/language/en-GB/Buttons.multids
+++ b/core/language/en-GB/Buttons.multids
@@ -80,7 +80,6 @@ NewMarkdown/Caption: new Markdown tiddler
 NewMarkdown/Hint: Create a new Markdown tiddler
 NewTiddler/Caption: new tiddler
 NewTiddler/Hint: Create a new tiddler
-OpenControlPanel/Hint: Open control panel
 OpenWindow/Caption: open in new window
 OpenWindow/Hint: Open tiddler in new window
 Palette/Caption: palette
@@ -105,8 +104,6 @@ ShowSideBar/Caption: show sidebar
 ShowSideBar/Hint: Show sidebar
 TagManager/Caption: tag manager
 TagManager/Hint: Open tag manager
-TestCaseImport/Caption: import tiddlers
-TestCaseImport/Hint: Import tiddlers
 Timestamp/Caption: timestamps
 Timestamp/Hint: Choose whether modifications update timestamps
 Timestamp/On/Caption: timestamps are on
--- a/core/language/en-GB/ControlPanel.multids
+++ b/core/language/en-GB/ControlPanel.multids
@@ -198,12 +198,6 @@ Settings/TitleLinks/Yes/Description: Display tiddler titles as links
 Settings/MissingLinks/Caption: Wiki Links
 Settings/MissingLinks/Hint: Choose whether to link to tiddlers that do not exist yet
 Settings/MissingLinks/Description: Enable links to missing tiddlers
-SocialCard/Caption: Social Media Card
-SocialCard/Domain/Prompt: Domain name to display for the link (for example, ''tiddlywiki.com'')
-SocialCard/Hint: This information is used by social and messaging services to display a preview card for links to this TiddlyWiki when hosted online
-SocialCard/PreviewUrl/Prompt: Full URL to preview image for this TiddlyWiki
-SocialCard/PreviewUrl/Preview: Preview image:
-SocialCard/Url/Prompt: Full URL of this TiddlyWiki
 StoryTiddler/Caption: Story Tiddler
 StoryTiddler/Hint: This rule cascade is used to dynamically choose the template for displaying a tiddler in the story river.
 StoryView/Caption: Story View
@@ -241,7 +235,3 @@ ViewTemplateBody/Caption: View Template Body
 ViewTemplateBody/Hint: This rule cascade is used by the default view template to dynamically choose the template for displaying the body of a tiddler.
 ViewTemplateTitle/Caption: View Template Title
 ViewTemplateTitle/Hint: This rule cascade is used by the default view template to dynamically choose the template for displaying the title of a tiddler.
-ViewTemplateSubtitle/Caption: View Template Subtitle
-ViewTemplateSubtitle/Hint: This rule cascade is used by the default view template to dynamically choose the template for displaying the subtitle of a tiddler.
-ViewTemplateTags/Caption: View Template Tags
-ViewTemplateTags/Hint: This rule cascade is used by the default view template to dynamically choose the template for displaying the tags area of a tiddler.
--- a/core/language/en-GB/Docs/PaletteColours.multids
+++ b/core/language/en-GB/Docs/PaletteColours.multids
@@ -65,10 +65,6 @@ sidebar-tab-foreground-selected: Sidebar tab foreground for selected tabs
 sidebar-tab-foreground: Sidebar tab foreground
 sidebar-tiddler-link-foreground-hover: Sidebar tiddler link foreground hover
 sidebar-tiddler-link-foreground: Sidebar tiddler link foreground
-stability-stable: Badge for stability level "stable"
-stability-experimental: Badge for stability level "experimental"
-stability-deprecated: Badge for stability level "deprecated"
-stability-legacy: Badge for stability level "legacy"
 testcase-accent-level-1: Test case accent colour with no nesting
 testcase-accent-level-2: Test case accent colour with 2nd level nesting
 testcase-accent-level-3: Test case accent colour with 3rd level nesting or higher
--- a/core/language/en-GB/Snippets/FunctionDefinition.tid
+++ b/core/language/en-GB/Snippets/FunctionDefinition.tid
@@ -1,7 +0,0 @@
-title: $:/language/Snippets/FunctionDefinition
-tags: $:/tags/TextEditor/Snippet
-caption: Function definition
-
-\function f.name(param1,param2:"default value") [<param1>!is[blank]else<param2>]
-
-<<f.name>>
--- a/core/language/en-GB/Snippets/ProcedureDefinition.tid
+++ b/core/language/en-GB/Snippets/ProcedureDefinition.tid
@@ -1,7 +0,0 @@
-title: $:/language/Snippets/ProcedureDefinition
-tags: $:/tags/TextEditor/Snippet
-caption: Procedure definition
-
-\procedure procName(param1:"default value",param2)
-Your text comes here.
-\end
--- a/core/language/en-GB/Types/image_x-icon.tid
+++ b/core/language/en-GB/Types/image_x-icon.tid
@@ -0,0 +1,5 @@
+title: $:/language/Docs/Types/image/x-icon
+description: ICO icon
+name: image/x-icon
+group: Image
+group-sort: 1
--- a/core/language/en-GB/Types/text_vnd.tiddlywiki_multiple.tid
+++ b/core/language/en-GB/Types/text_vnd.tiddlywiki_multiple.tid
@@ -1,5 +0,0 @@
-title: $:/language/Docs/Types/text/vnd.tiddlywiki-multiple
-description: Compound tiddler
-name: text/vnd.tiddlywiki-multiple
-group: Developer
-group-sort: 2
--- a/plugins/tiddlywiki/classictools/languages/en-GB/types/text_x-tiddlywiki.tid
+++ b/plugins/tiddlywiki/classictools/languages/en-GB/types/text_x-tiddlywiki.tid
--- a/core/modules/commands/fetch.js
+++ b/core/modules/commands/fetch.js
@@ -120,7 +120,7 @@ Command.prototype.fetchFile = function(url,options,callback,redirectCount) {
 	        }
 	   	});
 	   	response.on("error",function(e) {
-			console.log("Error on GET request: " + e);
+			self.commander.log("Error on GET request: " + e);
 			callback(e);
 	   	});
 	});
--- a/core/modules/commands/render.js
+++ b/core/modules/commands/render.js
@@ -45,22 +45,17 @@ Render individual tiddlers and save the results to the specified files
 				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");
+			var filepath = path.resolve(self.commander.outputPath,wiki.filterTiddlers(filenameFilter,$tw.rootWidget,wiki.makeTiddlerIterator([title]))[0]);
+			if(self.commander.verbose) {
+				self.commander.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");
 		});
 		return null;
 	};
@@ -68,4 +63,4 @@ Render individual tiddlers and save the results to the specified files
 	exports.Command = Command;
 	
 	})();
-	
+	
--- a/core/modules/commands/save.js
+++ b/core/modules/commands/save.js
@@ -48,7 +48,7 @@ Saves individual tiddlers in their raw text or binary format to the specified fi
 						}
 					});
 					if(self.commander.verbose) {
-						console.log("Saving \"" + title + "\" to \"" + fileInfo.filepath + "\"");
+						self.commander.log("Saving \"" + title + "\" to \"" + filepath + "\"");
 					}
 					try {
 						$tw.utils.saveTiddlerToFileSync(tiddler,fileInfo);
--- a/core/modules/config.js
+++ b/core/modules/config.js
@@ -30,7 +30,7 @@ exports.textPrimitives.wikiLink = exports.textPrimitives.upperLetter + "+" +
 	exports.textPrimitives.upperLetter +
 	exports.textPrimitives.anyLetter + "*";

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

 exports.htmlVoidElements = "area,base,br,col,command,embed,hr,img,input,keygen,link,meta,param,source,track,wbr".split(",");

--- a/core/modules/filters/backtranscludes.js
+++ b/core/modules/filters/backtranscludes.js
@@ -16,11 +16,11 @@ Filter operator for returning all the backtranscludes from a tiddler
 Export our filter function
 */
 exports.backtranscludes = function(source,operator,options) {
-	var results = new $tw.utils.LinkedList();
+	var results = [];
 	source(function(tiddler,title) {
-		results.pushTop(options.wiki.getTiddlerBacktranscludes(title));
+		$tw.utils.pushTop(results,options.wiki.getTiddlerBacktranscludes(title));
 	});
-	return results.makeTiddlerIterator(options.wiki);
+	return results;
 };

 })();
--- a/core/modules/filters/strings.js
+++ b/core/modules/filters/strings.js
@@ -127,7 +127,7 @@ function diffPartsToChars(text1,text2,mode) {
            if(lineHash.hasOwnProperty ? lineHash.hasOwnProperty(line) : (lineHash[line] !== undefined)) {
 				chars += String.fromCharCode(lineHash[line]);
            } else {
-                if(lineArrayLength == maxLines) {
+                if (lineArrayLength == maxLines) {
                  line = text.substring(lineStart);
                  lineEnd = text.length;
                }
@@ -217,10 +217,7 @@ exports.splitregexp = function(source,operator,options) {
 		return ["RegExp error: " + ex];
 	}
 	source(function(tiddler,title) {
-		var parts = title.split(regExp).map(function(part){
-			return part || "";	// make sure it's a string
-		});
-		Array.prototype.push.apply(result,parts);
+		Array.prototype.push.apply(result,title.split(regExp));
 	});
 	return result;
 };
@@ -267,7 +264,7 @@ exports.pad = function(source,operator,options) {
 			} else {
 				var padString = "",
 					padStringLength = targetLength - title.length;
-				while(padStringLength > padString.length) {
+				while (padStringLength > padString.length) {
 					padString += fill;
 				}
 				//make sure we do not exceed the specified length
--- a/core/modules/filters/transcludes.js
+++ b/core/modules/filters/transcludes.js
@@ -20,7 +20,7 @@ exports.transcludes = function(source,operator,options) {
 	source(function(tiddler,title) {
 		results.pushTop(options.wiki.getTiddlerTranscludes(title));
 	});
-	return results.makeTiddlerIterator(options.wiki);
+	return results.toArray();
 };

 })();
--- a/core/modules/indexers/back-indexer.js
+++ b/core/modules/indexers/back-indexer.js
@@ -75,7 +75,7 @@ BackSubIndexer.prototype._getTarget = function(tiddler) {
 	}
 	var parser = this.wiki.parseText(tiddler.fields.type, tiddler.fields.text, {});
 	if(parser) {
-		return this.wiki[this.extractor](parser.tree, tiddler.fields.title);
+		return this.wiki[this.extractor](parser.tree);
 	}
 	return [];
 }
--- a/core/modules/parsers/parseutils.js
+++ b/core/modules/parsers/parseutils.js
@@ -114,7 +114,7 @@ exports.parseStringLiteral = function(source,pos) {
 	var match = reString.exec(source);
 	if(match && match.index === pos) {
 		node.value = match[1] !== undefined ? match[1] :(
-			match[2] !== undefined ? match[2] : match[3]
+			match[2] !== undefined ? match[2] : match[3] 
 					);
 		node.end = pos + match[0].length;
 		return node;
--- a/core/modules/parsers/wikiparser/rules/codeblock.js
+++ b/core/modules/parsers/wikiparser/rules/codeblock.js
@@ -29,16 +29,13 @@ exports.init = function(parser) {

 exports.parse = function() {
 	var reEnd = /(\r?\n```$)/mg;
-	var languageStart = this.parser.pos + 3,
-		languageEnd = languageStart + this.match[1].length;
 	// Move past the match
 	this.parser.pos = this.matchRegExp.lastIndex;

 	// Look for the end of the block
 	reEnd.lastIndex = this.parser.pos;
 	var match = reEnd.exec(this.parser.source),
-		text,
-		codeStart = this.parser.pos;
+		text;
 	// Process the block
 	if(match) {
 		text = this.parser.source.substring(this.parser.pos,match.index);
@@ -51,8 +48,8 @@ exports.parse = function() {
 	return [{
 			type: "codeblock",
 			attributes: {
-					code: {type: "string", value: text, start: codeStart, end: this.parser.pos},
-					language: {type: "string", value: this.match[1], start: languageStart, end: languageEnd}
+					code: {type: "string", value: text},
+					language: {type: "string", value: this.match[1]}
 			}
 	}];
 };
--- a/core/modules/parsers/wikiparser/rules/codeinline.js
+++ b/core/modules/parsers/wikiparser/rules/codeinline.js
@@ -33,8 +33,7 @@ exports.parse = function() {
 	// Look for the end marker
 	reEnd.lastIndex = this.parser.pos;
 	var match = reEnd.exec(this.parser.source),
-		text,
-		start = this.parser.pos;
+		text;
 	// Process the text
 	if(match) {
 		text = this.parser.source.substring(this.parser.pos,match.index);
@@ -48,9 +47,7 @@ exports.parse = function() {
 		tag: "code",
 		children: [{
 			type: "text",
-			text: text,
-			start: start,
-			end: this.parser.pos
+			text: text
 		}]
 	}];
 };
--- a/core/modules/parsers/wikiparser/rules/extlink.js
+++ b/core/modules/parsers/wikiparser/rules/extlink.js
@@ -31,7 +31,6 @@ exports.init = function(parser) {

 exports.parse = function() {
 	// Move past the match
-    var start = this.parser.pos;
 	this.parser.pos = this.matchRegExp.lastIndex;
 	// Create the link unless it is suppressed
 	if(this.match[0].substr(0,1) === "~") {
@@ -47,7 +46,7 @@ exports.parse = function() {
 				rel: {type: "string", value: "noopener noreferrer"}
 			},
 			children: [{
-				type: "text", text: this.match[0], start: start, end: this.parser.pos
+				type: "text", text: this.match[0]
 			}]
 		}];
 	}
--- a/core/modules/parsers/wikiparser/rules/filteredtranscludeblock.js
+++ b/core/modules/parsers/wikiparser/rules/filteredtranscludeblock.js
@@ -31,16 +31,6 @@ exports.init = function(parser) {

 exports.parse = function() {
 	// Move past the match
-	var filterStart = this.parser.pos + 3;
-	var filterEnd = filterStart + this.match[1].length;
-	var toolTipStart = filterEnd + 1;
-	var toolTipEnd = toolTipStart + (this.match[2] ? this.match[2].length : 0);
-	var templateStart = toolTipEnd + 2;
-	var templateEnd = templateStart + (this.match[3] ? this.match[3].length : 0);
-	var styleStart = templateEnd + 2;
-	var styleEnd = styleStart + (this.match[4] ? this.match[4].length : 0);
-	var classesStart = styleEnd + 1;
-	var classesEnd = classesStart + (this.match[5] ? this.match[5].length : 0);
 	this.parser.pos = this.matchRegExp.lastIndex;
 	// Get the match details
 	var filter = this.match[1],
@@ -52,21 +42,21 @@ exports.parse = function() {
 	var node = {
 		type: "list",
 		attributes: {
-			filter: {type: "string", value: filter, start: filterStart, end: filterEnd},
+			filter: {type: "string", value: filter}
 		},
 		isBlock: true
 	};
 	if(tooltip) {
-		node.attributes.tooltip = {type: "string", value: tooltip, start: toolTipStart, end: toolTipEnd};
+		node.attributes.tooltip = {type: "string", value: tooltip};
 	}
 	if(template) {
-		node.attributes.template = {type: "string", value: template, start: templateStart, end: templateEnd};
+		node.attributes.template = {type: "string", value: template};
 	}
 	if(style) {
-		node.attributes.style = {type: "string", value: style, start: styleStart, end: styleEnd};
+		node.attributes.style = {type: "string", value: style};
 	}
 	if(classes) {
-		node.attributes.itemClass = {type: "string", value: classes.split(".").join(" "), start: classesStart, end: classesEnd};
+		node.attributes.itemClass = {type: "string", value: classes.split(".").join(" ")};
 	}
 	return [node];
 };
--- a/core/modules/parsers/wikiparser/rules/filteredtranscludeinline.js
+++ b/core/modules/parsers/wikiparser/rules/filteredtranscludeinline.js
@@ -30,16 +30,6 @@ exports.init = function(parser) {
 };

 exports.parse = function() {
-	var filterStart = this.parser.pos + 3;
-	var filterEnd = filterStart + this.match[1].length;
-	var toolTipStart = filterEnd + 1;
-	var toolTipEnd = toolTipStart + (this.match[2] ? this.match[2].length : 0);
-	var templateStart = toolTipEnd + 2;
-	var templateEnd = templateStart + (this.match[3] ? this.match[3].length : 0);
-	var styleStart = templateEnd + 2;
-	var styleEnd = styleStart + (this.match[4] ? this.match[4].length : 0);
-	var classesStart = styleEnd + 1;
-	var classesEnd = classesStart + (this.match[5] ? this.match[5].length : 0);
 	// Move past the match
 	this.parser.pos = this.matchRegExp.lastIndex;
 	// Get the match details
@@ -52,20 +42,20 @@ exports.parse = function() {
 	var node = {
 		type: "list",
 		attributes: {
-			filter: {type: "string", value: filter, start: filterStart, end: filterEnd},
+			filter: {type: "string", value: filter}
 		}
 	};
 	if(tooltip) {
-		node.attributes.tooltip = {type: "string", value: tooltip, start: toolTipStart, end: toolTipEnd};
+		node.attributes.tooltip = {type: "string", value: tooltip};
 	}
 	if(template) {
-		node.attributes.template = {type: "string", value: template, start: templateStart, end: templateEnd};
+		node.attributes.template = {type: "string", value: template};
 	}
 	if(style) {
-		node.attributes.style = {type: "string", value: style, start: styleStart, end: styleEnd};
+		node.attributes.style = {type: "string", value: style};
 	}
 	if(classes) {
-		node.attributes.itemClass = {type: "string", value: classes.split(".").join(" "), start: classesStart, end: classesEnd};
+		node.attributes.itemClass = {type: "string", value: classes.split(".").join(" ")};
 	}
 	return [node];
 };
--- a/core/modules/parsers/wikiparser/rules/hardlinebreaks.js
+++ b/core/modules/parsers/wikiparser/rules/hardlinebreaks.js
@@ -45,11 +45,10 @@ exports.parse = function() {
 		reEnd.lastIndex = this.parser.pos;
 		match = reEnd.exec(this.parser.source);
 		if(match) {
-			var start = this.parser.pos;
 			this.parser.pos = reEnd.lastIndex;
 			// Add a line break if the terminator was a line break
 			if(match[2]) {
-				tree.push({type: "element", tag: "br", start: start, end: this.parser.pos});
+				tree.push({type: "element", tag: "br"});
 			}
 		}
 	} while(match && !match[1]);
--- a/core/modules/parsers/wikiparser/rules/heading.js
+++ b/core/modules/parsers/wikiparser/rules/heading.js
@@ -30,17 +30,15 @@ exports.parse = function() {
 	// Move past the !s
 	this.parser.pos = this.matchRegExp.lastIndex;
 	// Parse any classes, whitespace and then the heading itself
-	var classStart = this.parser.pos;
 	var classes = this.parser.parseClasses();
-	var classEnd = this.parser.pos;
 	this.parser.skipWhitespace({treatNewlinesAsNonWhitespace: true});
 	var tree = this.parser.parseInlineRun(/(\r?\n)/mg);
 	// Return the heading
 	return [{
 		type: "element",
-		tag: "h" + headingLevel,
+		tag: "h" + headingLevel, 
 		attributes: {
-			"class": {type: "string", value: classes.join(" "), start: classStart, end: classEnd}
+			"class": {type: "string", value: classes.join(" ")}
 		},
 		children: tree
 	}];
--- a/core/modules/parsers/wikiparser/rules/html.js
+++ b/core/modules/parsers/wikiparser/rules/html.js
@@ -44,10 +44,6 @@ Parse the most recent match
 exports.parse = function() {
 	// Retrieve the most recent match so that recursive calls don't overwrite it
 	var tag = this.nextTag;
-	if (!tag.isSelfClosing) {
-		tag.openTagStart = tag.start;
-		tag.openTagEnd = tag.end;
-	}
 	this.nextTag = null;
 	// Advance the parser position to past the tag
 	this.parser.pos = tag.end;
@@ -64,27 +60,6 @@ exports.parse = function() {
 			var reEnd = new RegExp("(" + reEndString + ")","mg");
 			tag.children = this.parser.parseInlineRun(reEnd,{eatTerminator: true});
 		}
-		tag.end = this.parser.pos;
-		tag.closeTagEnd = tag.end;
-		if (tag.closeTagEnd === tag.openTagEnd || this.parser.source[tag.closeTagEnd - 1] !== '>') {
-			tag.closeTagStart = tag.end;
-		} else {
-			tag.closeTagStart = tag.closeTagEnd - 2;
-			var closeTagMinPos = tag.children.length > 0 ? tag.children[tag.children.length-1].end : tag.openTagEnd;
-			if (!Number.isSafeInteger(closeTagMinPos)) closeTagMinPos = tag.openTagEnd;
-			while (tag.closeTagStart >= closeTagMinPos) {
-				var char = this.parser.source[tag.closeTagStart];
-				if (char === '>') {
-					tag.closeTagStart = -1;
-					break;
-				}
-				if (char === '<') break;
-				tag.closeTagStart -= 1;
-			}
-			if (tag.closeTagStart < closeTagMinPos) {
-				tag.closeTagStart = tag.end;
-			}
-		}
 	}
 	// Return the tag
 	return [tag];
--- a/core/modules/parsers/wikiparser/rules/image.js
+++ b/core/modules/parsers/wikiparser/rules/image.js
@@ -122,9 +122,9 @@ exports.parseImage = function(source,pos) {
 	}
 	pos = token.end;
 	if(token.match[1]) {
-		node.attributes.tooltip = {type: "string", value: token.match[1].trim(),start: token.start,end:token.start + token.match[1].length - 1};
+		node.attributes.tooltip = {type: "string", value: token.match[1].trim()};
 	}
-	node.attributes.source = {type: "string", value: (token.match[2] || "").trim(), start: token.start + (token.match[1] ? token.match[1].length : 0), end: token.end - 2};
+	node.attributes.source = {type: "string", value: (token.match[2] || "").trim()};
 	// Update the end position
 	node.end = pos;
 	return node;
--- a/core/modules/parsers/wikiparser/rules/import.js
+++ b/core/modules/parsers/wikiparser/rules/import.js
@@ -38,14 +38,13 @@ exports.parse = function() {
 	// Parse the filter terminated by a line break
 	var reMatch = /(.*)(?:$|\r?\n)/mg;
 	reMatch.lastIndex = this.parser.pos;
-	var filterStart = this.parser.source;
 	var match = reMatch.exec(this.parser.source);
 	this.parser.pos = reMatch.lastIndex;
 	// Parse tree nodes to return
 	return [{
 		type: "importvariables",
 		attributes: {
-			filter: {type: "string", value: match[1], start: filterStart, end: this.parser.pos}
+			filter: {type: "string", value: match[1]}
 		},
 		children: []
 	}];
--- a/core/modules/parsers/wikiparser/rules/list.js
+++ b/core/modules/parsers/wikiparser/rules/list.js
@@ -74,7 +74,6 @@ exports.parse = function() {
 		// Match the list marker
 		var reMatch = /([\*#;:>]+)/mg;
 		reMatch.lastIndex = this.parser.pos;
-		var start = this.parser.pos;
 		var match = reMatch.exec(this.parser.source);
 		if(!match || match.index !== this.parser.pos) {
 			break;
@@ -95,21 +94,9 @@ exports.parse = function() {
 			}
 			// Construct the list element or reuse the previous one at this level
 			if(listStack.length <= t) {
-				var listElement = {
-					type: "element",
-					tag: listInfo.listTag,
-					children: [
-						{
-							type: "element",
-							tag: listInfo.itemTag,
-							children: [],
-							start: start,
-							end: this.parser.pos,
-						}
-					],
-					start: start,
-					end: this.parser.pos,
-				};
+				var listElement = {type: "element", tag: listInfo.listTag, children: [
+					{type: "element", tag: listInfo.itemTag, children: []}
+				]};
 				// Link this list element into the last child item of the parent list item
 				if(t) {
 					var prevListItem = listStack[t-1].children[listStack[t-1].children.length-1];
@@ -118,33 +105,21 @@ exports.parse = function() {
 				// Save this element in the stack
 				listStack[t] = listElement;
 			} else if(t === (match[0].length - 1)) {
-				listStack[t].children.push({
-					type: "element",
-					tag: listInfo.itemTag,
-					children: [],
-					start: start,
-					end: this.parser.pos,
-				});
+				listStack[t].children.push({type: "element", tag: listInfo.itemTag, children: []});
 			}
 		}
 		if(listStack.length > match[0].length) {
 			listStack.splice(match[0].length,listStack.length - match[0].length);
 		}
 		// Process the body of the list item into the last list item
-		var classStart = this.parser.pos;
 		var lastListChildren = listStack[listStack.length-1].children,
 			lastListItem = lastListChildren[lastListChildren.length-1],
 			classes = this.parser.parseClasses();
-		var classEnd = this.parser.pos;
 		this.parser.skipWhitespace({treatNewlinesAsNonWhitespace: true});
 		var tree = this.parser.parseInlineRun(/(\r?\n)/mg);
 		lastListItem.children.push.apply(lastListItem.children,tree);
-		lastListItem.end = this.parser.pos;
-		listStack[listStack.length-1].end = this.parser.pos;
 		if(classes.length > 0) {
 			$tw.utils.addClassToParseTreeNode(lastListItem,classes.join(" "));
-			lastListItem.attributes.class.start = classStart;
-			lastListItem.attributes.class.end = classEnd;
 		}
 		// Consume any whitespace following the list item
 		this.parser.skipWhitespace();
--- a/core/modules/parsers/wikiparser/rules/prettyextlink.js
+++ b/core/modules/parsers/wikiparser/rules/prettyextlink.js
@@ -96,20 +96,15 @@ exports.parseLink = function(source,pos) {
 		splitPos = null;
 	}
 	// Pull out the tooltip and URL
-	var tooltip, URL, urlStart;
-	textNode.start = pos;
+	var tooltip, URL;
 	if(splitPos) {
-		urlStart = splitPos + 1;
 		URL = source.substring(splitPos + 1,closePos).trim();
 		textNode.text = source.substring(pos,splitPos).trim();
-		textNode.end = splitPos;
 	} else {
-		urlStart = pos;
 		URL = source.substring(pos,closePos).trim();
 		textNode.text = URL;
-		textNode.end = closePos;
 	}
-	node.attributes.href = {type: "string", value: URL, start: urlStart, end: closePos};
+	node.attributes.href = {type: "string", value: URL};
 	node.attributes.target = {type: "string", value: "_blank"};
 	node.attributes.rel = {type: "string", value: "noopener noreferrer"};
 	// Update the end position
--- a/core/modules/parsers/wikiparser/rules/prettylink.js
+++ b/core/modules/parsers/wikiparser/rules/prettylink.js
@@ -29,39 +29,32 @@ exports.init = function(parser) {

 exports.parse = function() {
 	// Move past the match
-	var start = this.parser.pos + 2;
 	this.parser.pos = this.matchRegExp.lastIndex;
 	// Process the link
 	var text = this.match[1],
-		link = this.match[2] || text,
-		textEndPos = this.parser.source.indexOf("|", start);
-	if (textEndPos < 0 || textEndPos > this.matchRegExp.lastIndex) {
-		textEndPos = this.matchRegExp.lastIndex - 2;
-	}
-	var linkStart = this.match[2] ? (start + this.match[1].length + 1) : start;
-	var linkEnd = linkStart + link.length;
+		link = this.match[2] || text;
 	if($tw.utils.isLinkExternal(link)) {
 		return [{
 			type: "element",
 			tag: "a",
 			attributes: {
-				href: {type: "string", value: link, start: linkStart, end: linkEnd},
+				href: {type: "string", value: link},
 				"class": {type: "string", value: "tc-tiddlylink-external"},
 				target: {type: "string", value: "_blank"},
 				rel: {type: "string", value: "noopener noreferrer"}
 			},
 			children: [{
-				type: "text", text: text, start: start, end: textEndPos
+				type: "text", text: text
 			}]
 		}];
 	} else {
 		return [{
 			type: "link",
 			attributes: {
-				to: {type: "string", value: link, start: linkStart, end: linkEnd}
+				to: {type: "string", value: link}
 			},
 			children: [{
-				type: "text", text: text, start: start, end: textEndPos
+				type: "text", text: text
 			}]
 		}];
 	}
--- a/core/modules/parsers/wikiparser/rules/quoteblock.js
+++ b/core/modules/parsers/wikiparser/rules/quoteblock.js
@@ -28,13 +28,9 @@ exports.parse = function() {
 	// Move past the <s
 	this.parser.pos = this.matchRegExp.lastIndex;
 	// Parse any classes, whitespace and then the optional cite itself
-	var classStart = this.parser.pos;
 	classes.push.apply(classes, this.parser.parseClasses());
-	var classEnd = this.parser.pos;
 	this.parser.skipWhitespace({treatNewlinesAsNonWhitespace: true});
-	var citeStart = this.parser.pos;
 	var cite = this.parser.parseInlineRun(/(\r?\n)/mg);
-	var citeEnd = this.parser.pos;
 	// before handling the cite, parse the body of the quote
 	var tree = this.parser.parseBlocks(reEndString);
 	// If we got a cite, put it before the text
@@ -42,24 +38,18 @@ exports.parse = function() {
 		tree.unshift({
 			type: "element",
 			tag: "cite",
-			children: cite,
-			start: citeStart,
-			end: citeEnd
+			children: cite
 		});
 	}
 	// Parse any optional cite
 	this.parser.skipWhitespace({treatNewlinesAsNonWhitespace: true});
-	citeStart = this.parser.pos;
 	cite = this.parser.parseInlineRun(/(\r?\n)/mg);
-	citeEnd = this.parser.pos;
 	// If we got a cite, push it
 	if(cite.length > 0) {
 		tree.push({
 			type: "element",
 			tag: "cite",
-			children: cite,
-			start: citeStart,
-			end: citeEnd
+			children: cite
 		});
 	}
 	// Return the blockquote element
@@ -67,7 +57,7 @@ exports.parse = function() {
 		type: "element",
 		tag: "blockquote",
 		attributes: {
-			class: { type: "string", value: classes.join(" "), start: classStart, end: classEnd },
+			class: { type: "string", value: classes.join(" ") },
 		},
 		children: tree
 	}];
--- a/core/modules/parsers/wikiparser/rules/syslink.js
+++ b/core/modules/parsers/wikiparser/rules/syslink.js
@@ -29,11 +29,10 @@ exports.init = function(parser) {
 exports.parse = function() {
 	var match = this.match[0];
 	// Move past the match
-	var start = this.parser.pos;
 	this.parser.pos = this.matchRegExp.lastIndex;
 	// Create the link unless it is suppressed
 	if(match.substr(0,1) === "~") {
-		return [{type: "text", text: match.substr(1), start: start+1, end: this.parser.pos}];
+		return [{type: "text", text: match.substr(1)}];
 	} else {
 		return [{
 			type: "link",
@@ -42,12 +41,10 @@ exports.parse = function() {
 			},
 			children: [{
 				type: "text",
-				text: match,
-				start: start,
-				end: this.parser.pos
+				text: match
 			}]
 		}];
 	}
 };

-})();
+})();
--- a/core/modules/parsers/wikiparser/rules/table.js
+++ b/core/modules/parsers/wikiparser/rules/table.js
@@ -150,7 +150,7 @@ exports.parse = function() {
 		} else {
 			// Otherwise, create a new row if this one is of a different type
 			if(rowType !== currRowType) {
-				rowContainer = {type: "element", tag: rowContainerTypes[rowType], children: [], start: this.parser.pos, end: this.parser.pos};
+				rowContainer = {type: "element", tag: rowContainerTypes[rowType], children: []};
 				table.children.push(rowContainer);
 				currRowType = rowType;
 			}
@@ -178,7 +178,6 @@ exports.parse = function() {
 				// Increment the row count
 				rowCount++;
 			}
-			rowContainer.end = this.parser.pos;
 		}
 		rowMatch = rowRegExp.exec(this.parser.source);
 	}
--- a/core/modules/parsers/wikiparser/rules/typedblock.js
+++ b/core/modules/parsers/wikiparser/rules/typedblock.js
@@ -46,7 +46,6 @@ exports.parse = function() {
 		renderType = this.match[2];
 	// Move past the match
 	this.parser.pos = this.matchRegExp.lastIndex;
-	var start = this.parser.pos;
 	// Look for the end of the block
 	reEnd.lastIndex = this.parser.pos;
 	var match = reEnd.exec(this.parser.source),
@@ -75,9 +74,7 @@ exports.parse = function() {
 			tag: "pre",
 			children: [{
 				type: "text",
-				text: text,
-				start: start,
-				end: this.parser.pos
+				text: text
 			}]
 		}];
 	}
--- a/core/modules/parsers/wikiparser/rules/wikilink.js
+++ b/core/modules/parsers/wikiparser/rules/wikilink.js
@@ -36,7 +36,6 @@ exports.parse = function() {
 	// Get the details of the match
 	var linkText = this.match[0];
 	// Move past the macro call
-	var start = this.parser.pos;
 	this.parser.pos = this.matchRegExp.lastIndex;
 	// If the link starts with the unwikilink character then just output it as plain text
 	if(linkText.substr(0,1) === $tw.config.textPrimitives.unWikiLink) {
@@ -58,9 +57,7 @@ exports.parse = function() {
 		},
 		children: [{
 			type: "text",
-			text: linkText,
-			start: start,
-			end: this.parser.pos
+			text: linkText
 		}]
 	}];
 };
--- a/core/modules/parsers/wikiparser/wikiparser.js
+++ b/core/modules/parsers/wikiparser/wikiparser.js
@@ -91,11 +91,6 @@ var WikiParser = function(type,text,options) {
 	} else {
 		topBranch.push.apply(topBranch,this.parseBlocks());
 	}
-	// Build rules' name map
-	this.usingRuleMap = {};
-	$tw.utils.each(this.pragmaRules, function (ruleInfo) { self.usingRuleMap[ruleInfo.rule.name] = Object.getPrototypeOf(ruleInfo.rule); });
-	$tw.utils.each(this.blockRules, function (ruleInfo) { self.usingRuleMap[ruleInfo.rule.name] = Object.getPrototypeOf(ruleInfo.rule); });
-	$tw.utils.each(this.inlineRules, function (ruleInfo) { self.usingRuleMap[ruleInfo.rule.name] = Object.getPrototypeOf(ruleInfo.rule); });
 	// Return the parse tree
 };

@@ -214,13 +209,8 @@ WikiParser.prototype.parsePragmas = function() {
 			break;
 		}
 		// Process the pragma rule
-		var start = this.pos;
 		var subTree = nextMatch.rule.parse();
 		if(subTree.length > 0) {
-			// Set the start and end positions of the pragma rule if
-			if (subTree[0].start === undefined) subTree[0].start = start;
-			if (subTree[subTree.length - 1].end === undefined) subTree[subTree.length - 1].end = this.pos;
-			$tw.utils.each(subTree, function (node) { node.rule = nextMatch.rule.name; });
 			// Quick hack; we only cope with a single parse tree node being returned, which is true at the moment
 			currentTreeBranch.push.apply(currentTreeBranch,subTree);
 			subTree[0].children = [];
@@ -245,15 +235,7 @@ WikiParser.prototype.parseBlock = function(terminatorRegExpString) {
 	// Look for a block rule that applies at the current position
 	var nextMatch = this.findNextMatch(this.blockRules,this.pos);
 	if(nextMatch && nextMatch.matchIndex === this.pos) {
-		var start = this.pos;
-		var subTree = nextMatch.rule.parse();
-		// Set the start and end positions of the first and last blocks if they're not already set
-		if (subTree.length > 0) {
-			if (subTree[0].start === undefined) subTree[0].start = start;
-			if (subTree[subTree.length - 1].end === undefined) subTree[subTree.length - 1].end = this.pos;
-		}
-		$tw.utils.each(subTree, function (node) { node.rule = nextMatch.rule.name; });
-		return subTree;
+		return nextMatch.rule.parse();
 	}
 	// Treat it as a paragraph if we didn't find a block rule
 	var start = this.pos;
@@ -350,16 +332,7 @@ WikiParser.prototype.parseInlineRunUnterminated = function(options) {
 			this.pos = nextMatch.matchIndex;
 		}
 		// Process the run rule
-		var start = this.pos;
-		var subTree = nextMatch.rule.parse();
-		// Set the start and end positions of the first and last child if they're not already set
-		if (subTree.length > 0) {
-			// Set the start and end positions of the first and last child if they're not already set
-			if (subTree[0].start === undefined) subTree[0].start = start;
-			if (subTree[subTree.length - 1].end === undefined) subTree[subTree.length - 1].end = this.pos;
-		}
-		$tw.utils.each(subTree, function (node) { node.rule = nextMatch.rule.name; });
-		tree.push.apply(tree,subTree);
+		tree.push.apply(tree,nextMatch.rule.parse());
 		// Look for the next run rule
 		nextMatch = this.findNextMatch(this.inlineRules,this.pos);
 	}
@@ -410,15 +383,7 @@ WikiParser.prototype.parseInlineRunTerminatedExtended = function(terminatorRegEx
 				this.pos = inlineRuleMatch.matchIndex;
 			}
 			// Process the inline rule
-			var start = this.pos;
-			var subTree = inlineRuleMatch.rule.parse();
-			// Set the start and end positions of the first and last child if they're not already set
-			if (subTree.length > 0) {
-				if (subTree[0].start === undefined) subTree[0].start = start;
-				if (subTree[subTree.length - 1].end === undefined) subTree[subTree.length - 1].end = this.pos;
-			}
-			$tw.utils.each(subTree, function (node) { node.rule = inlineRuleMatch.rule.name; });
-			tree.push.apply(tree,subTree);
+			tree.push.apply(tree,inlineRuleMatch.rule.parse());
 			// Look for the next inline rule
 			inlineRuleMatch = this.findNextMatch(this.inlineRules,this.pos);
 			// Look for the next terminator match
@@ -444,7 +409,7 @@ WikiParser.prototype.pushTextWidget = function(array,text,start,end) {
 		text = $tw.utils.trim(text);
 	}
 	if(text) {
-		array.push({type: "text", text: text, start: start, end: end});
+		array.push({type: "text", text: text, start: start, end: end});		
 	}
 };

@@ -497,3 +462,4 @@ WikiParser.prototype.amendRules = function(type,names) {
 exports["text/vnd.tiddlywiki"] = WikiParser;

 })();
+
--- a/core/modules/saver-handler.js
+++ b/core/modules/saver-handler.js
@@ -95,7 +95,6 @@ function SaverHandler(options) {
 	if($tw.browser) {
 		$tw.rootWidget.addEventListener("tm-save-wiki",function(event) {
 			self.saveWiki({
-				wiki: event.widget.wiki,
 				template: event.param,
 				downloadType: "text/plain",
 				variables: event.paramObject
@@ -103,7 +102,6 @@ function SaverHandler(options) {
 		});
 		$tw.rootWidget.addEventListener("tm-download-file",function(event) {
 			self.saveWiki({
-				wiki: event.widget.wiki,
 				method: "download",
 				template: event.param,
 				downloadType: "text/plain",
@@ -149,22 +147,20 @@ Save the wiki contents. Options are:
 	method: "save", "autosave" or "download"
 	template: the tiddler containing the template to save
 	downloadType: the content type for the saved file
-	wiki: optional wiki, overriding the default wiki specified in the constructor
 */
 SaverHandler.prototype.saveWiki = function(options) {
 	options = options || {};
 	var self = this,
-		wiki = options.wiki || this.wiki,
 		method = options.method || "save";
 	// Ignore autosave if disabled
-	if(method === "autosave" && ($tw.config.disableAutoSave || wiki.getTiddlerText(this.titleAutoSave,"yes") !== "yes")) {
+	if(method === "autosave" && ($tw.config.disableAutoSave || this.wiki.getTiddlerText(this.titleAutoSave,"yes") !== "yes")) {
 		return false;
 	}
 	var	variables = options.variables || {},
 		template = (options.template || 
-		           wiki.getTiddlerText("$:/config/SaveWikiButton/Template","$:/core/save/all")).trim(),
+		           this.wiki.getTiddlerText("$:/config/SaveWikiButton/Template","$:/core/save/all")).trim(),
 		downloadType = options.downloadType || "text/plain",
-		text = wiki.renderTiddler(downloadType,template,options),
+		text = this.wiki.renderTiddler(downloadType,template,options),
 		callback = function(err) {
 			if(err) {
 				alert($tw.language.getString("Error/WhileSaving") + ":\n\n" + err);
--- a/core/modules/savers/put.js
+++ b/core/modules/savers/put.js
@@ -48,7 +48,7 @@ var PutSaver = function(wiki) {
 	var self = this;
 	var uri = this.uri();
 	// Async server probe. Until probe finishes, save will fail fast
-	// See also https://github.com/TiddlyWiki/TiddlyWiki5/issues/2276
+	// See also https://github.com/Jermolene/TiddlyWiki5/issues/2276
 	$tw.utils.httpRequest({
 		url: uri,
 		type: "OPTIONS",
--- a/core/modules/server/authenticators/header.js
+++ b/core/modules/server/authenticators/header.js
@@ -37,9 +37,7 @@ HeaderAuthenticator.prototype.authenticateRequest = function(request,response,st
 		return false;
 	} else {
 		// authenticatedUsername will be undefined for anonymous users
-		if(username) {
-			state.authenticatedUsername = $tw.utils.decodeURIComponentSafe(username);
-		}
+		state.authenticatedUsername = $tw.utils.decodeURIComponentSafe(username);
 		return true;
 	}
 };
--- a/core/modules/server/server.js
+++ b/core/modules/server/server.js
@@ -33,7 +33,13 @@ function Server(options) {
 	this.routes = options.routes || [];
 	this.authenticators = options.authenticators || [];
 	this.wiki = options.wiki;
+	this.logger = new $tw.utils.Logger("server",{colour: "cyan"});
+	this.logger.setPrefix(":" + process.pid + "-" + (Number(new Date()) - 1095776640000));
 	this.boot = options.boot || $tw.boot;
+	// Name the server and init the boot state
+	this.servername = $tw.utils.transliterateToSafeASCII(this.get("server-name") || this.wiki.getTiddlerText("$:/SiteTitle") || "TiddlyWiki5");
+	this.boot.origin = this.get("origin")? this.get("origin"): this.protocol+"://"+this.get("host")+":"+this.get("port");
+	this.boot.pathPrefix = this.get("path-prefix") || "";
 	// Initialise the variables
 	this.variables = $tw.utils.extend({},this.defaultVariables);
 	if(options.variables) {
@@ -92,10 +98,6 @@ function Server(options) {
 		this.protocol = "https";
 	}
 	this.transport = require(this.protocol);
-	// Name the server and init the boot state
-	this.servername = $tw.utils.transliterateToSafeASCII(this.get("server-name") || this.wiki.getTiddlerText("$:/SiteTitle") || "TiddlyWiki5");
-	this.boot.origin = this.get("origin")? this.get("origin"): this.protocol+"://"+this.get("host")+":"+this.get("port");
-	this.boot.pathPrefix = this.get("path-prefix") || "";
 }

 /*
@@ -287,9 +289,9 @@ Server.prototype.requestHandler = function(request,response,options) {
 	var route = self.findMatchingRoute(request,state);
 	// Optionally output debug info
 	if(self.get("debug-level") !== "none") {
-		console.log("Request path:",JSON.stringify(state.urlInfo));
-		console.log("Request headers:",JSON.stringify(request.headers));
-		console.log("authenticatedUsername:",state.authenticatedUsername);
+		self.logger.log("Request path:",JSON.stringify(state.urlInfo.href));
+		self.logger.log("Request headers:",JSON.stringify(request.headers));
+		self.logger.log("authenticatedUsername:",state.authenticatedUsername);
 	}
 	// Return a 404 if we didn't find a route
 	if(!route) {
--- a/core/modules/startup/plugins.js
+++ b/core/modules/startup/plugins.js
@@ -61,7 +61,7 @@ exports.startup = function() {
 				// Collect the shadow tiddlers of any modified plugins
 				$tw.utils.each(changes.modifiedPlugins,function(pluginTitle) {
 					var pluginInfo = $tw.wiki.getPluginInfo(pluginTitle);
-					if(pluginInfo && pluginInfo.tiddlers) {
+					if(pluginInfo) {
 						$tw.utils.each(Object.keys(pluginInfo.tiddlers),function(title) {
 							changedShadowTiddlers[title] = false;
 						});
--- a/core/modules/storyviews/classic.js
+++ b/core/modules/storyviews/classic.js
@@ -30,8 +30,12 @@ ClassicStoryView.prototype.navigateTo = function(historyInfo) {
 	if(!targetElement || targetElement.nodeType === Node.TEXT_NODE) {
 		return;
 	}
-	// Scroll the node into view
-	this.listWidget.dispatchEvent({type: "tm-scroll", target: targetElement});
+	if(duration) {
+		// Scroll the node into view
+		this.listWidget.dispatchEvent({type: "tm-scroll", target: targetElement});
+	} else {
+		targetElement.scrollIntoView();
+	}
 };

 ClassicStoryView.prototype.insert = function(widget) {
@@ -78,10 +82,6 @@ ClassicStoryView.prototype.remove = function(widget) {
 			removeElement = function() {
 				widget.removeChildDomNodes();
 			};
-		// Blur the focus if it is within the descendents of the node we are removing
-		if($tw.utils.domContains(targetElement,targetElement.ownerDocument.activeElement)) {
-			targetElement.ownerDocument.activeElement.blur();
-		}
 		// Abandon if the list entry isn't a DOM element (it might be a text node)
 		if(!targetElement || targetElement.nodeType === Node.TEXT_NODE) {
 			removeElement();
--- a/core/modules/upgraders/system.js
+++ b/core/modules/upgraders/system.js
@@ -12,7 +12,7 @@ Upgrader module that suppresses certain system tiddlers that shouldn't be import
 /*global $tw: false */
 "use strict";

-var DONT_IMPORT_LIST = ["$:/Import", "$:/build"],
+var DONT_IMPORT_LIST = ["$:/Import"],
 	UNSELECT_PREFIX_LIST = ["$:/temp/","$:/state/","$:/StoryList","$:/HistoryList"],
 	WARN_IMPORT_PREFIX_LIST = ["$:/core/modules/"];

--- a/core/modules/utils/dom/dom.js
+++ b/core/modules/utils/dom/dom.js
@@ -270,7 +270,6 @@ Copy plain text to the clipboard on browsers that support it
 */
 exports.copyToClipboard = function(text,options) {
 	options = options || {};
-	text = text || "";
 	var textArea = document.createElement("textarea");
 	textArea.style.position = "fixed";
 	textArea.style.top = 0;
@@ -290,7 +289,7 @@ exports.copyToClipboard = function(text,options) {
 	var succeeded = false;
 	try {
 		succeeded = document.execCommand("copy");
-	} catch(err) {
+	} catch (err) {
 	}
 	if(!options.doNotNotify) {
 		var successNotification = options.successNotification || "$:/language/Notifications/CopiedToClipboard/Succeeded",
@@ -327,7 +326,7 @@ exports.collectDOMVariables = function(selectedNode,domNode,event) {
 			variables["tv-popup-coords"] = Popup.buildCoordinates(Popup.coordinatePrefix.csOffsetParent,nodeRect);

 			var absRect = $tw.utils.extend({}, nodeRect);
-			for(var currentNode = selectedNode.offsetParent; currentNode; currentNode = currentNode.offsetParent) {
+			for (var currentNode = selectedNode.offsetParent; currentNode; currentNode = currentNode.offsetParent) {
 				absRect.left += currentNode.offsetLeft;
 				absRect.top += currentNode.offsetTop;
 			}
--- a/core/modules/utils/filesystem.js
+++ b/core/modules/utils/filesystem.js
@@ -238,7 +238,7 @@ exports.generateTiddlerFileInfo = function(tiddler,options) {
 	} else {
 		// Save as a .tid or a text/binary file plus a .meta file
 		var tiddlerType = tiddler.fields.type || "text/vnd.tiddlywiki";
-		if(tiddlerType === "text/vnd.tiddlywiki" || tiddlerType === "text/vnd.tiddlywiki-multiple" || tiddler.hasField("_canonical_uri")) {
+		if(tiddlerType === "text/vnd.tiddlywiki" || tiddler.hasField("_canonical_uri")) {
 			// Save as a .tid file
 			fileInfo.type = "application/x-tiddler";
 			fileInfo.hasMetaFile = false;
--- a/core/modules/utils/logger.js
+++ b/core/modules/utils/logger.js
@@ -21,6 +21,7 @@ function Logger(componentName,options) {
 	options = options || {};
 	this.componentName = componentName || "";
 	this.colour = options.colour || "white";
+	this.prefix = options.prefix || "";
 	this.enable = "enable" in options ? options.enable : true;
 	this.save = "save" in options ? options.save : true;
 	this.saveLimit = options.saveLimit || 100 * 1024;
@@ -33,6 +34,20 @@ Logger.prototype.setSaveBuffer = function(logger) {
 	this.saveBufferLogger = logger;
 };

+/*
+Change the output colour
+*/
+Logger.prototype.setColour = function(colour) {
+	this.colour = colour || "white";
+};
+
+/*
+Change the prefix
+*/
+Logger.prototype.setPrefix = function(prefix) {
+	this.prefix = prefix || "";
+};
+
 /*
 Log a message
 */
--- a/core/modules/widgets/action-log.js
+++ b/core/modules/widgets/action-log.js
@@ -66,12 +66,7 @@ LogWidget.prototype.log = function() {
 	});

 	for(var v in this.variables) {
-		var variable = this.parentWidget && this.parentWidget.variables[v];
-		if(variable && variable.isFunctionDefinition) {
-			allVars[v] = variable.value;
-		} else {
-			allVars[v]  = this.getVariable(v,{defaultValue:""});
-		}
+		allVars[v] = this.getVariable(v,{defaultValue:""});
 	}
 	if(this.filter) {
 		filteredVars = this.wiki.compileFilter(this.filter).call(this.wiki,this.wiki.makeTiddlerIterator(allVars));
--- a/core/modules/widgets/button.js
+++ b/core/modules/widgets/button.js
@@ -262,7 +262,7 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
 */
 ButtonWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
-	if(changedAttributes.tooltip || changedAttributes.actions || changedAttributes.to || changedAttributes.message || changedAttributes.param || changedAttributes.set || changedAttributes.setTo || changedAttributes.popup || changedAttributes.hover || changedAttributes.selectedClass || changedAttributes.style || changedAttributes.dragFilter || changedAttributes.dragTiddler || (this.set && changedTiddlers[this.set]) || (this.popup && changedTiddlers[this.popup]) || (this.popupTitle && changedTiddlers[this.popupTitle]) || changedAttributes.popupAbsCoords || changedAttributes.setTitle || changedAttributes.setField || changedAttributes.setIndex || changedAttributes.popupTitle || changedAttributes.disabled || changedAttributes["default"]) {
+	if(changedAttributes.actions || changedAttributes.to || changedAttributes.message || changedAttributes.param || changedAttributes.set || changedAttributes.setTo || changedAttributes.popup || changedAttributes.hover || changedAttributes.selectedClass || changedAttributes.style || changedAttributes.dragFilter || changedAttributes.dragTiddler || (this.set && changedTiddlers[this.set]) || (this.popup && changedTiddlers[this.popup]) || (this.popupTitle && changedTiddlers[this.popupTitle]) || changedAttributes.popupAbsCoords || changedAttributes.setTitle || changedAttributes.setField || changedAttributes.setIndex || changedAttributes.popupTitle || changedAttributes.disabled || changedAttributes["default"]) {
 		this.refreshSelf();
 		return true;
 	} else {
--- a/core/modules/widgets/data.js
+++ b/core/modules/widgets/data.js
@@ -75,9 +75,7 @@ DataWidget.prototype.computeDataTiddlerValues = function() {
 		}
 	});
 	// Deal with $tiddler, $filter or $compound-tiddler attributes
-	var tiddlers = [],
-		compoundTiddlers,
-		title;
+	var tiddlers = [],title;
 	if(this.hasAttribute("$tiddler")) {
 		title = this.getAttribute("$tiddler");
 		if(title) {
@@ -93,9 +91,7 @@ DataWidget.prototype.computeDataTiddlerValues = function() {
 			var titles = this.wiki.filterTiddlers(filter);
 			$tw.utils.each(titles,function(title) {
 				var tiddler = self.wiki.getTiddler(title);
-				if(tiddler) {
-					tiddlers.push(tiddler);
-				}
+				tiddlers.push(tiddler);
 			});
 		}
 	}
@@ -105,17 +101,8 @@ DataWidget.prototype.computeDataTiddlerValues = function() {
 			tiddlers.push.apply(tiddlers,this.extractCompoundTiddler(title));
 		}
 	}
-	if(this.hasAttribute("$compound-filter")) {
-		filter = this.getAttribute("$compound-filter");
-		if(filter) {
-			compoundTiddlers = this.wiki.filterTiddlers(filter);
-			$tw.utils.each(compoundTiddlers, function(title){
-				tiddlers.push.apply(tiddlers,self.extractCompoundTiddler(title));
-			});
-		}
-	}
 	// Return the literal item if none of the special attributes were used
-	if(!this.hasAttribute("$tiddler") && !this.hasAttribute("$filter") && !this.hasAttribute("$compound-tiddler") && !this.hasAttribute("$compound-filter")) {
+	if(!this.hasAttribute("$tiddler") && !this.hasAttribute("$filter") && !this.hasAttribute("$compound-tiddler")) {
 		if(Object.keys(item).length > 0 && !!item.title) {
 			return [new $tw.Tiddler(item)];
 		} else {
--- a/core/modules/wiki.js
+++ b/core/modules/wiki.js
@@ -551,45 +551,28 @@ exports.getTiddlerBacklinks = function(targetTitle) {


 /*
-Return an array of tiddler titles that are directly transcluded within the given parse tree. `title` is the tiddler being parsed, we will ignore its self-referential transclusions, only return
+Return an array of tiddler titles that are directly transcluded within the given parse tree
 */
-exports.extractTranscludes = function(parseTreeRoot, title) {
+exports.extractTranscludes = function(parseTreeRoot) {
 	// Count up the transcludes
 	var transcludes = [],
 		checkParseTree = function(parseTree, parentNode) {
 			for(var t=0; t<parseTree.length; t++) {
 				var parseTreeNode = parseTree[t];
-				if(parseTreeNode.type === "transclude") {
-					if(parseTreeNode.attributes.$tiddler) {
-						if(parseTreeNode.attributes.$tiddler.type === "string") {
-							var value;
-							// if it is Transclusion with Templates like `{{Index||$:/core/ui/TagTemplate}}`, the `$tiddler` will point to the template. We need to find the actual target tiddler from parent node
-							if(parentNode && parentNode.type === "tiddler" && parentNode.attributes.tiddler && parentNode.attributes.tiddler.type === "string") {
-								// Empty value (like `{{!!field}}`) means self-referential transclusion.
-								value = parentNode.attributes.tiddler.value || title;
-							} else {
-								value = parseTreeNode.attributes.$tiddler.value;
-							}
-						}
-					} else if(parseTreeNode.attributes.tiddler) {
-						if (parseTreeNode.attributes.tiddler.type === "string") {
-							// Old transclude widget usage
-							value = parseTreeNode.attributes.tiddler.value;
-						}
-					} else if(parseTreeNode.attributes.$field && parseTreeNode.attributes.$field.type === "string") {
-						// Empty value (like `<$transclude $field='created'/>`) means self-referential transclusion. 
-						value = title;
-					} else if(parseTreeNode.attributes.field && parseTreeNode.attributes.field.type === "string") {
-						// Old usage with Empty value (like `<$transclude field='created'/>`)
-						value = title;
+				if(parseTreeNode.type === "transclude" && parseTreeNode.attributes.$tiddler && parseTreeNode.attributes.$tiddler.type === "string") {
+					var value;
+					// if it is Transclusion with Templates like `{{Index||$:/core/ui/TagTemplate}}`, the `$tiddler` will point to the template. We need to find the actual target tiddler from parent node
+					if(parentNode && parentNode.type === "tiddler" && parentNode.attributes.tiddler && parentNode.attributes.tiddler.type === "string") {
+						value = parentNode.attributes.tiddler.value;
+					} else {
+						value = parseTreeNode.attributes.$tiddler.value;
 					}
-					// Deduplicate the result.
-					if(value && transcludes.indexOf(value) === -1) {
-						$tw.utils.pushTop(transcludes,value);
+					if(transcludes.indexOf(value) === -1) {
+						transcludes.push(value);
 					}
 				}
 				if(parseTreeNode.children) {
-					checkParseTree(parseTreeNode.children,parseTreeNode);
+					checkParseTree(parseTreeNode.children, parseTreeNode);
 				}
 			}
 		};
@@ -608,8 +591,7 @@ exports.getTiddlerTranscludes = function(title) {
 		// Parse the tiddler
 		var parser = self.parseTiddler(title);
 		if(parser) {
-			// this will ignore self-referential transclusions from `title`
-			return self.extractTranscludes(parser.tree,title);
+			return self.extractTranscludes(parser.tree);
 		}
 		return [];
 	});
--- a/core/palettes/GruvBoxDark.tid
+++ b/core/palettes/GruvBoxDark.tid
@@ -82,10 +82,6 @@ sidebar-tab-foreground: <<colour tab-foreground>>
 sidebar-tiddler-link-foreground-hover: #458588
 sidebar-tiddler-link-foreground: #98971a
 site-title-foreground: <<colour tiddler-title-foreground>>
-stability-deprecated: #cc241d
-stability-experimental: #d79921
-stability-legacy: #458588
-stability-stable: #98971a
 static-alert-foreground: #B48EAD
 tab-background-selected: #ebdbb2
 tab-background: #665c54
--- a/core/palettes/Nord.tid
+++ b/core/palettes/Nord.tid
@@ -82,10 +82,6 @@ sidebar-tab-foreground: <<colour tab-foreground>>
 sidebar-tiddler-link-foreground-hover: #A3BE8C
 sidebar-tiddler-link-foreground: #81A1C1
 site-title-foreground: <<colour tiddler-title-foreground>>
-stability-deprecated: #bf616a
-stability-experimental: #d08770
-stability-legacy: #88c0d0
-stability-stable: #a3be8c
 static-alert-foreground: #B48EAD
 tab-background-selected: #ECEFF4
 tab-background: #4C566A
--- a/core/palettes/SolarizedDark.tid
+++ b/core/palettes/SolarizedDark.tid
@@ -18,7 +18,7 @@ button-foreground: #93a1a1
 code-background: #073642
 code-border: #586e75
 code-foreground: #93a1a1
-dirty-indicator: #dc322f
+dirty-indicator: inherit
 download-background: #859900
 download-foreground: #073642
 dragger-background: #073642
@@ -72,10 +72,6 @@ sidebar-tab-foreground-selected: #93a1a1
 sidebar-tiddler-link-foreground: #2aa198
 sidebar-tiddler-link-foreground-hover: #eee8d5
 site-title-foreground: #d33682
-stability-deprecated: #dc322f
-stability-experimental: #b58900
-stability-legacy: #268bd2
-stability-stable: #859900
 static-alert-foreground: #93a1a1
 tab-background: #073642
 tab-background-selected: #002b36
--- a/core/palettes/SolarizedLight.tid
+++ b/core/palettes/SolarizedLight.tid
@@ -18,7 +18,7 @@ button-foreground: #586e75
 code-background: #eee8d5
 code-border: #93a1a1
 code-foreground: #586e75
-dirty-indicator: #dc322f
+dirty-indicator: inherit
 download-background: #859900
 download-foreground: #eee8d5
 dragger-background: #eee8d5
@@ -72,10 +72,6 @@ sidebar-tab-foreground-selected: #586e75
 sidebar-tiddler-link-foreground: #2aa198
 sidebar-tiddler-link-foreground-hover: #002b36
 site-title-foreground: #d33682
-stability-deprecated: #dc322f
-stability-experimental: #b58900
-stability-legacy: #268bd2
-stability-stable: #859900
 static-alert-foreground: #586e75
 tab-background: #eee8d5
 tab-background-selected: #fdf6e3
--- a/core/palettes/Vanilla.tid
+++ b/core/palettes/Vanilla.tid
@@ -82,10 +82,6 @@ sidebar-tab-foreground: <<colour tab-foreground>>
 sidebar-tiddler-link-foreground-hover: #444444
 sidebar-tiddler-link-foreground: #999999
 site-title-foreground: <<colour tiddler-title-foreground>>
-stability-stable: #008000
-stability-experimental: #c07c00
-stability-deprecated: #ff0000
-stability-legacy: #0000ff
 static-alert-foreground: #aaaaaa
 tab-background-selected: #ffffff
 tab-background: #d8d8d8
@@ -99,7 +95,7 @@ table-footer-background: #a8a8a8
 table-header-background: #f0f0f0
 tag-background: #ec6
 tag-foreground: #ffffff
-testcase-accent-level-1: #c1eaff
+testcase-accent-level-1: #84C5E6
 testcase-accent-level-2: #E3B740
 testcase-accent-level-3: #5FD564
 tiddler-background: <<colour background>>
--- a/core/templates/social-metadata.tid
+++ b/core/templates/social-metadata.tid
@@ -1,38 +0,0 @@
-title: $:/core/templates/social-metadata
-tags: $:/tags/RawMarkupWikified
-
-\procedure meta-plain(name,source,name-attribute:"name")
-\whitespace trim
-<%if [<source>has[text]] %>
-	&lt;meta <$text text=<<name-attribute>>/>="<$text text=<<name>>/>" content="<$text text={{{ [<source>get[text]encodehtml[]] }}}/>"&gt;
-	<$text text={{{ [charcode[10]] }}}/>
-<%endif%>
-\end meta-plain
-
-\procedure meta-wikified(name,source,name-attribute:"name")
-\whitespace trim
-<%if [<source>has[text]] %>
-	<$wikify name="html" text={{{ [<source>get[text]] }}} output="text">
-		&lt;meta <$text text=<<name-attribute>>/>="<$text text=<<name>>/>" content="<$text text={{{ [<html>encodehtml[]] }}}/>"&gt;
-		<$text text={{{ [charcode[10]] }}}/>
-	</$wikify>
-<%endif%>
-\end meta-wikified
-
-\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline macrocallblock conditional commentinline commentblock
-<<meta-wikified "description" "$:/SiteSubtitle">>
-
-<!-- Facebook Meta Tags -->
-<<meta-plain "og:url" "$:/SiteUrl" "property">>
-<<meta-plain "og:type" "website" "property">>
-<<meta-wikified "og:title" "$:/SiteTitle" "property">>
-<<meta-wikified "og:description" "$:/SiteSubtitle" "property">>
-<<meta-plain "og:image" "$:/SitePreviewImageUrl" "property">>
-
-<!-- Twitter Meta Tags -->
-<<meta-plain "twitter:card" "summary_large_image">>
-<<meta-plain "twitter:domain" "$:/SiteDomain" "property">>
-<<meta-plain "twitter:url" "$:/SiteUrl" "property">>
-<<meta-wikified "twitter:title" "$:/SiteTitle">>
-<<meta-wikified "twitter:description" "$:/SiteSubtitle">>
-<<meta-plain "twitter:image" "$:/SitePreviewImageUrl">>
--- a/core/ui/ControlPanel/Cascades/ViewTemplateSubtitle.tid
+++ b/core/ui/ControlPanel/Cascades/ViewTemplateSubtitle.tid
@@ -1,9 +0,0 @@
-title: $:/core/ui/ControlPanel/ViewTemplateSubtitle
-tags: $:/tags/ControlPanel/Cascades
-caption: {{$:/language/ControlPanel/ViewTemplateSubtitle/Caption}}
-
-\define lingo-base() $:/language/ControlPanel/ViewTemplateSubtitle/
-
-<<lingo Hint>>
-
-{{$:/tags/ViewTemplateSubtitleFilter||$:/snippets/ListTaggedCascade}}
--- a/core/ui/ControlPanel/Cascades/ViewTemplateTags.tid
+++ b/core/ui/ControlPanel/Cascades/ViewTemplateTags.tid
@@ -1,9 +0,0 @@
-title: $:/core/ui/ControlPanel/ViewTemplateTags
-tags: $:/tags/ControlPanel/Cascades
-caption: {{$:/language/ControlPanel/ViewTemplateTags/Caption}}
-
-\define lingo-base() $:/language/ControlPanel/ViewTemplateTags/
-
-<<lingo Hint>>
-
-{{$:/tags/ViewTemplateTagsFilter||$:/snippets/ListTaggedCascade}}
--- a/core/ui/ControlPanel/SocialCard.tid
+++ b/core/ui/ControlPanel/SocialCard.tid
@@ -1,22 +0,0 @@
-title: $:/core/ui/ControlPanel/SocialCard
-tags: $:/tags/ControlPanel/Advanced
-caption: {{$:/language/ControlPanel/SocialCard/Caption}}
-
-\define lingo-base() $:/language/ControlPanel/
-
-<<lingo SocialCard/Hint>>
-
-|<$link to="$:/SiteTitle"><<lingo Basics/Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
-|<$link to="$:/SiteSubtitle"><<lingo Basics/Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
-|<$link to="$:/SiteDomain"><<lingo SocialCard/Domain/Prompt>></$link> |<$edit-text tiddler="$:/SiteDomain" default="" tag="input"/> |
-|<$link to="$:/SiteUrl"><<lingo SocialCard/Url/Prompt>></$link> |<$edit-text tiddler="$:/SiteUrl" default="" tag="input"/> |
-|<$link to="$:/SitePreviewUrl"><<lingo SocialCard/PreviewUrl/Prompt>></$link> |<$edit-text tiddler="$:/SitePreviewUrl" default="" tag="input"/> |
-
-<%if [[$:/SitePreviewUrl]get[text]else[]!is[blank]] %>
-<div>
-<div>
-<<lingo SocialCard/PreviewUrl/Preview>>
-</div>
-<img src={{$:/SitePreviewUrl}}/>
-</div>
-<%endif%>
--- a/core/ui/ControlPanel/TiddlyWiki.tid
+++ b/core/ui/ControlPanel/TiddlyWiki.tid
@@ -9,7 +9,7 @@ list-before:

 <$list filter="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Settings]]">

-<div class="tc-control-panel-setting" data-setting-title=<<currentTiddler>> >
+<div class="tc-control-panel-setting" data-setting-title=<<currentTiddler>> style="border-top:1px solid #eee;">

 !!.tc-control-panel-accent <$link><$transclude field="caption"/></$link>

--- a/core/ui/EditorToolbar/bold.tid
+++ b/core/ui/EditorToolbar/bold.tid
@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/bold
 caption: {{$:/language/Buttons/Bold/Caption}}
 description: {{$:/language/Buttons/Bold/Hint}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
 shortcuts: ((bold))

 <$action-sendmessage
--- a/core/ui/EditorToolbar/excise.tid
+++ b/core/ui/EditorToolbar/excise.tid
@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/excise
 caption: {{$:/language/Buttons/Excise/Caption}}
 description: {{$:/language/Buttons/Excise/Hint}}
-condition: [<targetTiddler>type[]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]] +[first[]]
+condition: [<targetTiddler>type[]] [<targetTiddler>type[text/vnd.tiddlywiki]] +[first[]]
 shortcuts: ((excise))
 dropdown: $:/core/ui/EditorToolbar/excise-dropdown

--- a/core/ui/EditorToolbar/heading-1.tid
+++ b/core/ui/EditorToolbar/heading-1.tid
@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/heading-1
 caption: {{$:/language/Buttons/Heading1/Caption}}
 description: {{$:/language/Buttons/Heading1/Hint}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
 button-classes: tc-text-editor-toolbar-item-start-group
 shortcuts: ((heading-1))

--- a/core/ui/EditorToolbar/heading-2.tid
+++ b/core/ui/EditorToolbar/heading-2.tid
@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/heading-2
 caption: {{$:/language/Buttons/Heading2/Caption}}
 description: {{$:/language/Buttons/Heading2/Hint}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
 shortcuts: ((heading-2))

 <$action-sendmessage
--- a/core/ui/EditorToolbar/heading-3.tid
+++ b/core/ui/EditorToolbar/heading-3.tid
@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/heading-3
 caption: {{$:/language/Buttons/Heading3/Caption}}
 description: {{$:/language/Buttons/Heading3/Hint}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
 shortcuts: ((heading-3))

 <$action-sendmessage
--- a/core/ui/EditorToolbar/heading-4.tid
+++ b/core/ui/EditorToolbar/heading-4.tid
@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/heading-4
 caption: {{$:/language/Buttons/Heading4/Caption}}
 description: {{$:/language/Buttons/Heading4/Hint}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
 shortcuts: ((heading-4))

 <$action-sendmessage
--- a/core/ui/EditorToolbar/heading-5.tid
+++ b/core/ui/EditorToolbar/heading-5.tid
@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/heading-5
 caption: {{$:/language/Buttons/Heading5/Caption}}
 description: {{$:/language/Buttons/Heading5/Hint}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
 shortcuts: ((heading-5))

 <$action-sendmessage
--- a/core/ui/EditorToolbar/heading-6.tid
+++ b/core/ui/EditorToolbar/heading-6.tid
@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/heading-6
 caption: {{$:/language/Buttons/Heading6/Caption}}
 description: {{$:/language/Buttons/Heading6/Hint}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
 shortcuts: ((heading-6))

 <$action-sendmessage
--- a/core/ui/EditorToolbar/italic.tid
+++ b/core/ui/EditorToolbar/italic.tid
@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/italic
 caption: {{$:/language/Buttons/Italic/Caption}}
 description: {{$:/language/Buttons/Italic/Hint}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
 shortcuts: ((italic))

 <$action-sendmessage
--- a/core/ui/EditorToolbar/link.tid
+++ b/core/ui/EditorToolbar/link.tid
@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/link
 caption: {{$:/language/Buttons/Link/Caption}}
 description: {{$:/language/Buttons/Link/Hint}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
 button-classes: tc-text-editor-toolbar-item-start-group
 shortcuts: ((link))
 dropdown: $:/core/ui/EditorToolbar/link-dropdown
--- a/core/ui/EditorToolbar/linkify.tid
+++ b/core/ui/EditorToolbar/linkify.tid
@@ -1,5 +1,5 @@
 caption: {{$:/language/Buttons/Linkify/Caption}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
 description: {{$:/language/Buttons/Linkify/Hint}}
 icon: $:/core/images/linkify
 list-before: $:/core/ui/EditorToolbar/mono-block
--- a/core/ui/EditorToolbar/list-bullet.tid
+++ b/core/ui/EditorToolbar/list-bullet.tid
@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/list-bullet
 caption: {{$:/language/Buttons/ListBullet/Caption}}
 description: {{$:/language/Buttons/ListBullet/Hint}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
 shortcuts: ((list-bullet))

 <$action-sendmessage
--- a/core/ui/EditorToolbar/list-number.tid
+++ b/core/ui/EditorToolbar/list-number.tid
@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/list-number
 caption: {{$:/language/Buttons/ListNumber/Caption}}
 description: {{$:/language/Buttons/ListNumber/Hint}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
 shortcuts: ((list-number))

 <$action-sendmessage
--- a/core/ui/EditorToolbar/mono-block.tid
+++ b/core/ui/EditorToolbar/mono-block.tid
@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/mono-block
 caption: {{$:/language/Buttons/MonoBlock/Caption}}
 description: {{$:/language/Buttons/MonoBlock/Hint}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
 button-classes: tc-text-editor-toolbar-item-start-group
 shortcuts: ((mono-block))

--- a/core/ui/EditorToolbar/mono-line.tid
+++ b/core/ui/EditorToolbar/mono-line.tid
@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/mono-line
 caption: {{$:/language/Buttons/MonoLine/Caption}}
 description: {{$:/language/Buttons/MonoLine/Hint}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
 shortcuts: ((mono-line))

 <$action-sendmessage
--- a/core/ui/EditorToolbar/picture.tid
+++ b/core/ui/EditorToolbar/picture.tid
@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/picture
 caption: {{$:/language/Buttons/Picture/Caption}}
 description: {{$:/language/Buttons/Picture/Hint}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
 shortcuts: ((picture))
 dropdown: $:/core/ui/EditorToolbar/picture-dropdown

--- a/core/ui/EditorToolbar/quote.tid
+++ b/core/ui/EditorToolbar/quote.tid
@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/quote
 caption: {{$:/language/Buttons/Quote/Caption}}
 description: {{$:/language/Buttons/Quote/Hint}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
 shortcuts: ((quote))

 <$action-sendmessage
--- a/core/ui/EditorToolbar/strikethrough.tid
+++ b/core/ui/EditorToolbar/strikethrough.tid
@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/strikethrough
 caption: {{$:/language/Buttons/Strikethrough/Caption}}
 description: {{$:/language/Buttons/Strikethrough/Hint}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
 shortcuts: ((strikethrough))

 <$action-sendmessage
--- a/core/ui/EditorToolbar/subscript.tid
+++ b/core/ui/EditorToolbar/subscript.tid
@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/subscript
 caption: {{$:/language/Buttons/Subscript/Caption}}
 description: {{$:/language/Buttons/Subscript/Hint}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
 shortcuts: ((subscript))

 <$action-sendmessage
--- a/core/ui/EditorToolbar/superscript.tid
+++ b/core/ui/EditorToolbar/superscript.tid
@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/superscript
 caption: {{$:/language/Buttons/Superscript/Caption}}
 description: {{$:/language/Buttons/Superscript/Hint}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
 shortcuts: ((superscript))

 <$action-sendmessage
--- a/core/ui/EditorToolbar/transcludify.tid
+++ b/core/ui/EditorToolbar/transcludify.tid
@@ -1,5 +1,5 @@
 caption: {{$:/language/Buttons/Transcludify/Caption}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
 description: {{$:/language/Buttons/Transcludify/Hint}}
 icon: $:/core/images/transcludify
 list-before: $:/core/ui/EditorToolbar/mono-block
--- a/core/ui/EditorToolbar/underline.tid
+++ b/core/ui/EditorToolbar/underline.tid
@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/underline
 caption: {{$:/language/Buttons/Underline/Caption}}
 description: {{$:/language/Buttons/Underline/Hint}}
-condition: [<targetTiddler>!has[type]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]]
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
 shortcuts: ((underline))

 <$action-sendmessage
--- a/core/ui/KeyboardShortcuts/open-control-panel.tid
+++ b/core/ui/KeyboardShortcuts/open-control-panel.tid
@@ -1,8 +0,0 @@
-title: $:/core/ui/KeyboardShortcuts/open-control-panel
-tags: $:/tags/KeyboardShortcut
-key: ((open-control-panel))
-
-\whitespace trim
-<$navigator story="$:/StoryList" history="$:/HistoryList">
-<$action-navigate $to="$:/ControlPanel" $scroll="yes"/>
-</$navigator>
--- a/core/ui/TagTemplate.tid
+++ b/core/ui/TagTemplate.tid
@@ -9,7 +9,7 @@ title: $:/core/ui/TagTemplate
 		colour={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}}
 		palette={{$:/palette}}
 		element-tag="$button"
-		element-attributes="""popup=<<qualify "$:/state/popup/tag">> dragFilter="[subfilter{$:/core/config/TagPillDragFilter}]" tag='span'"""
+		element-attributes="""popup=<<qualify "$:/state/popup/tag">> dragFilter="[all[current]tagging[]]" tag='span'"""
 	/>
 	<$reveal state=<<qualify "$:/state/popup/tag">> type="popup" position="below" animate="yes" class="tc-drop-down">
 		<$set name="tv-show-missing-links" value="yes">
--- a/core/ui/TestCaseTemplate.tid
+++ b/core/ui/TestCaseTemplate.tid
@@ -13,8 +13,7 @@ title: $:/core/ui/TestCaseTemplate
 		testActions="Actions"
 		testHideIfPass=<<hideIfPass>>
 	>
-		<$data $compound-filter={{!!import-compound}}/>
 		<$data $compound-tiddler=<<currentTiddler>>/>
-		<%if [{!!description}!is[blank]] %><$data title="Description" text={{!!description}}/><%endif%>
+		<$data title="Description" text={{!!description}}/>
 	</$testcase>
 </$let>
--- a/core/ui/TestCases/DefaultTemplate.tid
+++ b/core/ui/TestCases/DefaultTemplate.tid
@@ -1,5 +1,4 @@
 title: $:/core/ui/testcases/DefaultTemplate
-code-body: yes

 \whitespace trim
 \procedure linkcatcherActions()
@@ -16,7 +15,7 @@ code-body: yes
 	<div class="tc-test-case-wrapper">
 		<div class="tc-test-case-header">
 			<h2>
-				<$genesis $type={{{ [<linkTarget>!match[]then[$link]else[span]] }}} to=<<testcaseTiddler>>>
+				<$genesis $type={{{ [<linkTarget>!match[]then[$link]else[div]] }}} to=<<testcaseTiddler>>>
 					<%if [<testResult>!match[]] %>
 						<span class={{{ tc-test-case-result-icon [<testResult>!match[fail]then[tc-test-case-result-icon-pass]] [<testResult>match[fail]then[tc-test-case-result-icon-fail]] +[join[ ]] }}}>
 							<%if [<testResult>!match[fail]] %>
@@ -28,36 +27,11 @@ code-body: yes
 					<%endif%>
 					<$view tiddler="Description" mode="inline"/>
 				</$genesis>
-				<span class="tc-test-case-toolbar">
-					<$button popup=`$(state)$-more`
-						tooltip={{$:/language/Buttons/More/Hint}}
-						aria-label={{$:/language/Buttons/More/Caption}}
-						class="tc-btn-invisible"
-						selectedClass="tc-selected"
-					>
-						{{$:/core/images/down-arrow}}
-					</$button>
-					<$let 
-						tv-config-toolbar-icons="yes"
-						tv-config-toolbar-text="yes"
-						tv-config-toolbar-class="tc-btn-invisible"
-					>
-						<$reveal state=`$(state)$-more` type="popup" position="belowleft" animate="yes">
-							<div class="tc-drop-down">
-								<$list filter="[all[shadows+tiddlers]tag[$:/tags/TestCase/Actions]!has[draft.of]]"
-									variable="listItem"
-								>
-									<$transclude $tiddler=<<listItem>> $mode="inline"/>
-								</$list>
-							</div>
-						</$reveal>
-					</$let>
-				</span>
 			</h2>
 		</div>
 		<%if [[Narrative]is[tiddler]] %>
 			<div class="tc-test-case-narrative">
-				<$transclude $tiddler="Narrative" $mode="block"/>
+				<$transclude $tiddler="Narrative" mode="block"/>
 			</div>
 		<%endif%>
 		<%if [<testResult>match[fail]] %>
@@ -72,7 +46,7 @@ code-body: yes
 		<%endif%>
 		<div class="tc-test-case-panes">
 			<div class="tc-test-case-source">
-				<$macrocall $name="tabs" tabsList="[all[tiddlers]sort[]] -[prefix<state>] -Description -Narrative -Output Output +[putfirst[]] -[has[plugin-type]]" state=<<state>> default="Output" template="$:/core/ui/testcases/DefaultTemplate/SourceTabs"/>
+				<$macrocall $name="tabs" tabsList="[all[tiddlers]sort[]] -[prefix<state>] -Description -Narrative -ExpectedResult -Output Output +[putfirst[]] -[has[plugin-type]]" state=<<state>> default="Output" template="$:/core/ui/testcases/DefaultTemplate/SourceTabs"/>
 			</div>
 			<div class="tc-test-case-divider">
 			</div>
--- a/core/ui/TestCases/DefaultTemplateSourceTabs.tid
+++ b/core/ui/TestCases/DefaultTemplateSourceTabs.tid
@@ -19,9 +19,6 @@ title: $:/core/ui/testcases/DefaultTemplate/SourceTabs
 	</table>
 </$list>
 <$edit class="tc-edit-texteditor" tiddler=<<currentTab>>/>
-<div class="tc-test-case-footer-toolbar">
-<$macrocall $name="copy-to-clipboard" src={{{ [<currentTab>get[text]] }}}/>
-</div>
 \end

 <$transclude $variable="body" $mode="inline"/>
--- a/core/ui/TestCases/actions/Export.tid
+++ b/core/ui/TestCases/actions/Export.tid
@@ -1,4 +0,0 @@
-title: $:/core/ui/testcases/actions/Export
-tags: $:/tags/TestCase/Actions
-
-<$macrocall $name="exportButton" exportFilter="[all[tiddlers]sort[]] -[prefix[$:/state/]] -Description -Narrative -ExpectedResult -Output Output +[putfirst[]] -[has[plugin-type]]" lingoBase="$:/language/Buttons/ExportTiddlers/"/>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jeremy Ruston	c11b04ae9a	Fix broken merge	2024-06-06 16:39:06 +01:00
Jeremy Ruston	5d2a59d20d	Merge branch 'master' into logging-improvements	2024-06-06 16:32:06 +01:00
Jermolene	22a85e8fc7	Initial improvements	2019-01-17 15:20:24 +00:00