$parameters widgets now claim index parameters sequentially (#7962)

* $parameters widgets now claim index parameters sequentially

Before, they just always used their own indices, which meant unnamed
parameters would get assigned to multiple values, which wasn't any
use to anyone.

* Elaborated tests for nested parameters

* Added example to clarify how multiple paramter definitions are handled

* Updated \procedure documentation

* Removed depth from $parameters

* Add failing test

* Adjusted transclude to account for refreshing

* This index system should work

It handles some strange edge cases too.

* Stupid end-of-file newlines

* Removed redundant whitespace pragma

---------

Co-authored-by: Jeremy Ruston <jeremy@jermolene.com>

.eslintignore

@@ -0,0 +1,8 @@
+# Ignore "third party" code whose style we will not change.
+/boot/sjcl.js
+/core/modules/utils/base64-utf8/base64-utf8.module.js
+/core/modules/utils/base64-utf8/base64-utf8.module.min.js
+/core/modules/utils/diff-match-patch/diff_match_patch.js
+/core/modules/utils/diff-match-patch/diff_match_patch_uncompressed.js
+/core/modules/utils/dom/csscolorparser.js
+/plugins/tiddlywiki/*/files/

.eslintrc.yml

@@ -0,0 +1,283 @@
+env:
+  browser: true
+  commonjs: true
+  es2021: true
+  node: true
+extends: 'eslint:recommended'
+globals:
+  "$tw": "writable" # temporary
+parserOptions:
+  ecmaVersion: 5
+rules:
+  array-bracket-newline: 'off'
+  array-bracket-spacing: 'off'
+  array-callback-return: 'off'
+  array-element-newline: 'off'
+  arrow-body-style: error
+  arrow-parens:
+    - error
+    - as-needed
+  arrow-spacing:
+    - error
+    - after: true
+      before: true
+  block-scoped-var: 'off'
+  block-spacing: 'off'
+  brace-style: 'off'
+  callback-return: 'off'
+  camelcase: 'off'
+  capitalized-comments: 'off'
+  class-methods-use-this: error
+  comma-dangle: 'off'
+  comma-spacing: 'off'
+  comma-style: 'off'
+  complexity: 'off'
+  computed-property-spacing: 'off'
+  consistent-return: 'off'
+  consistent-this: 'off'
+  curly: 'off'
+  default-case: 'off'
+  default-case-last: error
+  default-param-last: error
+  dot-location: 'off'
+  dot-notation: 'off'
+  eol-last: 'off'
+  eqeqeq: 'off'
+  func-call-spacing: 'off'
+  func-name-matching: 'off'
+  func-names: 'off'
+  func-style: 'off'
+  function-call-argument-newline: 'off'
+  function-paren-newline: 'off'
+  generator-star-spacing: error
+  global-require: 'off'
+  grouped-accessor-pairs: error
+  guard-for-in: 'off'
+  handle-callback-err: 'off'
+  id-blacklist: error
+  id-denylist: error
+  id-length: 'off'
+  id-match: error
+  implicit-arrow-linebreak: error
+  indent: 'off'
+  indent-legacy: 'off'
+  init-declarations: 'off'
+  jsx-quotes: error
+  key-spacing: 'off'
+  keyword-spacing:
+    - error
+    - before: true
+      after: false
+      overrides:
+        'case':
+          after: true
+        'do':
+          'after': true
+        'else':
+          after: true
+        'return':
+          after: true
+        'throw':
+          after: true
+        'try':
+          after: true
+  line-comment-position: 'off'
+  linebreak-style: 'off'
+  lines-around-comment: 'off'
+  lines-around-directive: 'off'
+  lines-between-class-members: error
+  max-classes-per-file: error
+  max-depth: 'off'
+  max-len: 'off'
+  max-lines: 'off'
+  max-lines-per-function: 'off'
+  max-nested-callbacks: error
+  max-params: 'off'
+  max-statements: 'off'
+  max-statements-per-line: 'off'
+  multiline-comment-style: 'off'
+  multiline-ternary: 'off'
+  new-parens: 'off'
+  newline-after-var: 'off'
+  newline-before-return: 'off'
+  newline-per-chained-call: 'off'
+  no-alert: 'off'
+  no-array-constructor: 'off'
+  no-await-in-loop: error
+  no-bitwise: 'off'
+  no-buffer-constructor: 'off'
+  no-caller: error
+  no-catch-shadow: 'off'
+  no-confusing-arrow: error
+  no-console: 'off'
+  no-constant-condition:
+    - error
+    - checkLoops: false
+  no-constructor-return: error
+  no-continue: 'off'
+  no-div-regex: 'off'
+  no-duplicate-imports: error
+  no-else-return: 'off'
+  no-empty-function: 'off'
+  no-eq-null: 'off'
+  no-eval: 'off'
+  no-extend-native: 'off'
+  no-extra-bind: 'off'
+  no-extra-label: 'off'
+  no-extra-parens: 'off'
+  no-floating-decimal: 'off'
+  no-implicit-coercion:
+    - error
+    - boolean: false
+      number: false
+      string: false
+  no-implicit-globals: 'off'
+  no-implied-eval: error
+  no-inline-comments: 'off'
+  no-invalid-this: 'off'
+  no-iterator: error
+  no-label-var: 'off'
+  no-labels: 'off'
+  no-lone-blocks: 'off'
+  no-lonely-if: 'off'
+  no-loop-func: 'off'
+  no-loss-of-precision: error
+  no-magic-numbers: 'off'
+  no-mixed-operators: 'off'
+  no-mixed-requires: 'off'
+  no-multi-assign: 'off'
+  no-multi-spaces: 'off'
+  no-multi-str: error
+  no-multiple-empty-lines: 'off'
+  no-native-reassign: 'off'
+  no-negated-condition: 'off'
+  no-negated-in-lhs: error
+  no-nested-ternary: 'off'
+  no-new: 'off'
+  no-new-func: 'off'
+  no-new-object: 'off'
+  no-new-require: error
+  no-new-wrappers: error
+  no-octal-escape: error
+  no-param-reassign: 'off'
+  no-path-concat: error
+  no-plusplus: 'off'
+  no-process-env: 'off'
+  no-process-exit: 'off'
+  no-promise-executor-return: error
+  no-proto: 'off'
+  no-restricted-exports: error
+  no-restricted-globals: error
+  no-restricted-imports: error
+  no-restricted-modules: error
+  no-restricted-properties: error
+  no-restricted-syntax: error
+  no-return-assign: 'off'
+  no-return-await: error
+  no-script-url: 'off'
+  no-self-compare: 'off'
+  no-sequences: 'off'
+  no-shadow: 'off'
+  no-spaced-func: 'off'
+  no-sync: 'off'
+  no-tabs: 'off'
+  no-template-curly-in-string: error
+  no-ternary: 'off'
+  no-throw-literal: 'off'
+  no-trailing-spaces: 'off'
+  no-undef-init: 'off'
+  no-undefined: 'off'
+  no-underscore-dangle: 'off'
+  no-unmodified-loop-condition: 'off'
+  no-unneeded-ternary: 'off'
+  no-unreachable-loop: error
+  no-unused-expressions: 'off'
+  no-use-before-define: 'off'
+  no-useless-backreference: error
+  no-useless-call: 'off'
+  no-useless-computed-key: error
+  no-useless-concat: 'off'
+  no-useless-constructor: error
+  no-useless-rename: error
+  no-useless-return: 'off'
+  no-var: 'off'
+  no-void: 'off'
+  no-warning-comments: 'off'
+  no-whitespace-before-property: error
+  nonblock-statement-body-position:
+    - error
+    - any
+  object-curly-newline: 'off'
+  object-curly-spacing: 'off'
+  object-property-newline: 'off'
+  object-shorthand: 'off'
+  one-var: 'off'
+  one-var-declaration-per-line: 'off'
+  operator-assignment: 'off'
+  operator-linebreak: 'off'
+  padded-blocks: 'off'
+  padding-line-between-statements: error
+  prefer-arrow-callback: 'off'
+  prefer-const: 'off'
+  prefer-destructuring: 'off'
+  prefer-exponentiation-operator: 'off'
+  prefer-named-capture-group: 'off'
+  prefer-numeric-literals: error
+  prefer-object-spread: 'off'
+  prefer-promise-reject-errors: error
+  prefer-reflect: 'off'
+  prefer-regex-literals: 'off'
+  prefer-rest-params: 'off'
+  prefer-spread: 'off'
+  prefer-template: 'off'
+  quote-props: 'off'
+  quotes: 'off'
+  radix: 'off'
+  require-atomic-updates: error
+  require-await: error
+  require-jsdoc: 'off'
+  require-unicode-regexp: 'off'
+  rest-spread-spacing: error
+  semi: 'off'
+  semi-spacing: 'off'
+  semi-style: 'off'
+  sort-imports: error
+  sort-keys: 'off'
+  sort-vars: 'off'
+  space-before-blocks: 'off'
+  space-before-function-paren: 'off'
+  space-in-parens: 'off'
+  space-infix-ops: 'off'
+  space-unary-ops: 'off'
+  spaced-comment: 'off'
+  strict: 'off'
+  switch-colon-spacing: 'off'
+  symbol-description: error
+  template-curly-spacing: error
+  template-tag-spacing: error
+  unicode-bom:
+    - error
+    - never
+  valid-jsdoc: 'off'
+  valid-typeof:
+    - error
+    - requireStringLiterals: false
+  vars-on-top: 'off'
+  wrap-iife: 'off'
+  wrap-regex: 'off'
+  yield-star-spacing: error
+  yoda: 'off'
+
+  # temporary rules
+  no-useless-escape: 'off'
+  no-unused-vars: 'off'
+  no-empty: 'off'
+  no-extra-semi: 'off'
+  no-redeclare: 'off'
+  no-control-regex: "off"
+  no-mixed-spaces-and-tabs: "off"
+  no-extra-boolean-cast: "off"
+  no-prototype-builtins: "off"
+  no-undef: "off"
+  no-unreachable: "off"
+  no-self-assign: "off"

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

.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

.github/workflows/ci.yml

@@ -4,9 +4,8 @@ on:
     branches:
       - master
       - tiddlywiki-com
-      - multi-wiki-support
 env:
-  NODE_VERSION: "22"
+  NODE_VERSION: "18"
 jobs:
   test:
     runs-on: ubuntu-latest
@@ -83,14 +82,3 @@ jobs:
       - run: "./bin/build-tw-org.sh"
         env:
           GH_TOKEN: ${{ secrets.GITHUBPUSHTOKEN }}
-  build-mws-tiddlywiki-com:
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/multi-wiki-support'
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
-        with:
-          node-version: "${{ env.NODE_VERSION }}"
-      - run: "./bin/build-mws-site.sh"
-        env:
-          GH_TOKEN: ${{ secrets.GITHUBPUSHTOKEN }}

.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 -io "@$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 }}

.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: $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     

.gitignore

@@ -5,9 +5,6 @@
 tmp/
 output/
 node_modules/
-store/
 /test-results/
 /playwright-report/
 /playwright/.cache/
-$__StoryList.tid
-/editions/test/test-store/*

TODO BEFORE MERGING THIS PR.md

@@ -1,4 +0,0 @@
-The `multi-wiki-support` branch includes some changes that are not intended to be merged into the `master` branch:
-
-* Readme update (see `editions/tw5.com/tiddlers/readme/ReadMe.tid`)
-* Remove `multiwikiserver` plugin from `readme-bld.sh` (see `bin/readme-bld.sh`)

bin/build-mws-site.sh

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

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.7
+    TW5_BUILD_VERSION=v5.3.3
 fi
 
 echo "Using TW5_BUILD_VERSION as [$TW5_BUILD_VERSION]"
@@ -97,6 +97,7 @@ if [ -n "$TW5_BUILD_ARCHIVE" ]; then
 
 node $TW5_BUILD_TIDDLYWIKI \
 	$TW5_BUILD_MAIN_EDITION \
+	--verbose \
 	--version \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_ARCHIVE \
@@ -114,6 +115,7 @@ fi
 
 node $TW5_BUILD_TIDDLYWIKI \
 	$TW5_BUILD_MAIN_EDITION \
+	--verbose \
 	--version \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
@@ -126,6 +128,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /tiddlywikicore-<version>.js	Core plugin javascript
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/empty \
+	--verbose \
 	--output $TW5_BUILD_OUTPUT \
 	--build empty emptyexternalcore \
 	|| exit 1
@@ -134,6 +137,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /test.html			Test edition
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/test \
+	--verbose \
 	--output $TW5_BUILD_OUTPUT \
 	--rendertiddler $:/core/save/all test.html text/plain \
 	|| exit 1
@@ -146,21 +150,16 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /dev/static/static.css	Static stylesheet
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/dev \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/dev \
 	--build index favicon static \
 	|| exit 1
 
-# /tour.html			tour edition
-node $TW5_BUILD_TIDDLYWIKI \
-	./editions/tour \
-	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all tour.html text/plain \
-	|| exit 1
-
 # /share.html				Custom edition for sharing via the URL
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/share \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
 	--build share \
@@ -169,6 +168,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /upgrade.html				Custom edition for performing upgrades
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/upgrade \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
 	--build upgrade \
@@ -177,6 +177,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /encrypted.html			Copy of the main file encrypted with the password "password"
 node $TW5_BUILD_TIDDLYWIKI \
 	$TW5_BUILD_MAIN_EDITION \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
 	--build encrypted \
@@ -192,6 +193,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /editions/xlsx-utils/index.html	xlsx-utils edition
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/xlsx-utils \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/editions/xlsx-utils/ \
 	--build index \
@@ -200,6 +202,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /editions/resumebuilder/index.html	Resume builder edition
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/resumebuilder \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/editions/resumebuilder/ \
 	--build index \
@@ -208,6 +211,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /editions/text-slicer/index.html	Text slicer edition
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/text-slicer \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/editions/text-slicer/ \
 	--build index \
@@ -216,6 +220,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /editions/translators/index.html	Translators edition
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/translators \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/editions/translators/ \
 	--build index \
@@ -224,6 +229,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /editions/introduction/index.html	Introduction edition
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/introduction \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/editions/introduction/ \
 	--build index \
@@ -232,6 +238,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /editions/full/index.html	Full edition
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/full \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/editions/full/ \
 	--build index \
@@ -240,6 +247,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /editions/tw5.com-docs/index.html	tiddlywiki.com docs edition
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/tw5.com-docs \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/editions/tw5.com-docs/ \
 	--build index \
@@ -248,6 +256,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /editions/twitter-archivist/index.html	Twitter Archivist edition
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/twitter-archivist \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/editions/twitter-archivist/ \
 	--build index \
@@ -263,6 +272,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/innerwikidemo \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
 	--rendertiddler $:/core/save/all plugins/tiddlywiki/innerwiki/index.html text/plain \
@@ -273,6 +283,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/dynaviewdemo \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
 	--rendertiddler $:/core/save/all plugins/tiddlywiki/dynaview/index.html text/plain \
@@ -287,6 +298,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/katexdemo \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
 	--rendertiddler $:/core/save/all plugins/tiddlywiki/katex/index.html text/plain \
@@ -297,6 +309,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /plugins/tiddlywiki/tahoelafs/empty.html	Empty wiki with Tahoe-LAFS plugin
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/tahoelafs \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
 	--rendertiddler $:/core/save/all plugins/tiddlywiki/tahoelafs/index.html text/plain \
@@ -307,6 +320,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /plugins/tiddlywiki/d3/empty.html	Empty wiki with D3 plugin
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/d3demo \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
 	--rendertiddler $:/core/save/all plugins/tiddlywiki/d3/index.html text/plain \
@@ -317,6 +331,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /plugins/tiddlywiki/codemirror/empty.html	Empty wiki with codemirror plugin
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/codemirrordemo \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
 	--rendertiddler $:/core/save/all plugins/tiddlywiki/codemirror/index.html text/plain \
@@ -327,6 +342,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /plugins/tiddlywiki/markdown/empty.html		Empty wiki with Markdown plugin
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/markdowndemo \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
 	--rendertiddler $:/core/save/all plugins/tiddlywiki/markdown/index.html text/plain \
@@ -337,6 +353,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /plugins/tiddlywiki/tw2parser/empty.html		Empty wiki with tw2parser plugin
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/classicparserdemo \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
 	--rendertiddler $:/core/save/all plugins/tiddlywiki/tw2parser/index.html text/plain \
@@ -347,22 +364,13 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /plugins/tiddlywiki/highlight/empty.html		Empty wiki with highlight plugin
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/highlightdemo \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
 	--rendertiddler $:/core/save/all plugins/tiddlywiki/highlight/index.html text/plain \
 	--rendertiddler $:/core/save/empty plugins/tiddlywiki/highlight/empty.html text/plain \
 	|| exit 1
 
-# /plugins/tiddlywiki/geospatial/index.html		Demo wiki with geospatial plugin
-# /plugins/tiddlywiki/geospatial/empty.html		Empty wiki with geospatial plugin
-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/empty plugins/tiddlywiki/geospatial/empty.html text/plain \
-	|| exit 1
-
 ######################################################
 #
 # Language editions
@@ -384,6 +392,7 @@ rm -rf $TW5_BUILD_OUTPUT/languages/zh-Hant/static/*
 # /languages/de-AT/empty.html		Empty wiki with de-AT language
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/de-AT \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/languages/de-AT \
 	--build favicon empty static index \
@@ -393,6 +402,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /languages/de-DE/empty.html		Empty wiki with de-DE language
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/de-DE \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/languages/de-DE \
 	--build favicon empty static index \
@@ -402,6 +412,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /languages/es-ES/empty.html		Empty wiki with es-ES language
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/es-ES \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/languages/es-ES \
 	--build favicon empty static index \
@@ -411,6 +422,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /languages/fr-FR/empty.html		Empty wiki with fr-FR language
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/fr-FR \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/languages/fr-FR \
 	--build favicon empty static index \
@@ -420,6 +432,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /languages/ja-JP/empty.html		Empty wiki with ja-JP language
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/ja-JP \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/languages/ja-JP \
 	--build empty index \
@@ -429,6 +442,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /languages/ko-KR/empty.html		Empty wiki with ko-KR language
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/ko-KR \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/languages/ko-KR \
 	--build favicon empty static index \
@@ -438,6 +452,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /languages/zh-Hans/empty.html		Empty wiki with zh-Hans language
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/zh-Hans \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/languages/zh-Hans \
 	--build empty index \
@@ -447,6 +462,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 # /languages/zh-Hant/empty.html		Empty wiki with zh-Hant language
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/zh-Hant \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/languages/zh-Hant \
 	--build empty index \
@@ -460,6 +476,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/pluginlibrary \
+	--verbose \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/library/$TW5_BUILD_VERSION \
 	--build library\

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

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

bin/ci-test.sh

@@ -2,8 +2,6 @@
 
 # test TiddlyWiki5 for tiddlywiki.com
 
-npm install
-
 node ./tiddlywiki.js \
 	./editions/test \
 	--verbose \

bin/readme-bld.sh

@@ -10,17 +10,8 @@ fi
 
 # tw5.com readmes
 node $TW5_BUILD_TIDDLYWIKI \
-	+plugins/tiddlywiki/multiwikiserver \
 	editions/tw5.com \
 	--verbose \
 	--output . \
 	--build readmes \
 	|| exit 1
-
-# tw.org readmes
-node $TW5_BUILD_TIDDLYWIKI \
-	editions/tw.org \
-	--verbose \
-	--output . \
-	--build readmes \
-	|| exit 1

boot/boot.js

@@ -142,15 +142,15 @@ $tw.utils.each = function(object,callback) {
 	var next,f,length;
 	if(object) {
 		if(Object.prototype.toString.call(object) == "[object Array]") {
-			for(f=0, length=object.length; f<length; f++) {
+			for (f=0, length=object.length; f<length; f++) {
 				next = callback(object[f],f,object);
 				if(next === false) {
 					break;
 				}
-			}
+		    }
 		} else {
 			var keys = Object.keys(object);
-			for(f=0, length=keys.length; f<length; f++) {
+			for (f=0, length=keys.length; f<length; f++) {
 				var key = keys[f];
 				next = callback(object[key],key,object);
 				if(next === false) {
@@ -177,7 +177,6 @@ document: defaults to current document
 eventListeners: array of event listeners (this option won't work until $tw.utils.addEventListeners() has been loaded)
 */
 $tw.utils.domMaker = function(tag,options) {
-	var options = options || {};
 	var doc = options.document || document;
 	var element = doc.createElementNS(options.namespace || "http://www.w3.org/1999/xhtml",tag);
 	if(options["class"]) {
@@ -219,34 +218,9 @@ $tw.utils.error = function(err) {
 			heading = dm("h1",{text: errHeading}),
 			prompt = dm("div",{text: promptMsg, "class": "tc-error-prompt"}),
 			message = dm("div",{text: err, "class":"tc-error-message"}),
-			closeButton = dm("div",{children: [dm("button",{text: ( $tw.language == undefined ? "close" : $tw.language.getString("Buttons/Close/Caption") )})], "class": "tc-error-prompt"}),
-			downloadButton = dm("div",{children: [dm("button",{text: ( $tw.language == undefined ? "download tiddlers" : $tw.language.getString("Buttons/EmergencyDownload/Caption") )})], "class": "tc-error-prompt"}),
-			form = dm("form",{children: [heading,prompt,downloadButton,message,closeButton], "class": "tc-error-form"});
+			button = dm("div",{children: [dm("button",{text: ( $tw.language == undefined ? "close" : $tw.language.getString("Buttons/Close/Caption") )})], "class": "tc-error-prompt"}),
+			form = dm("form",{children: [heading,prompt,message,button], "class": "tc-error-form"});
 		document.body.insertBefore(form,document.body.firstChild);
-		downloadButton.addEventListener("click",function(event) {
-			if($tw && $tw.wiki) {
-				var tiddlers = [];
-				$tw.wiki.each(function(tiddler,title) {
-					tiddlers.push(tiddler.fields);
-				});
-				var link = dm("a"),
-					text = JSON.stringify(tiddlers);
-				if(Blob !== undefined) {
-					var blob = new Blob([text], {type: "text/html"});
-					link.setAttribute("href", URL.createObjectURL(blob));
-				} else {
-					link.setAttribute("href","data:text/html," + encodeURIComponent(text));
-				}
-				link.setAttribute("download","emergency-tiddlers-" + (new Date()) + ".json");
-				document.body.appendChild(link);
-				link.click();
-				document.body.removeChild(link);
-			} else {
-				alert("Emergency tiddler download is not available");
-			}
-			event.preventDefault();
-			return false;
-		},true);
 		form.addEventListener("submit",function(event) {
 			document.body.removeChild(form);
 			event.preventDefault();
@@ -275,7 +249,7 @@ Extend an object with the properties from a list of source objects
 $tw.utils.extend = function(object /*, sourceObjectList */) {
 	$tw.utils.each(Array.prototype.slice.call(arguments,1),function(source) {
 		if(source) {
-			for(var p in source) {
+			for (var p in source) {
 				object[p] = source[p];
 			}
 		}
@@ -289,7 +263,7 @@ Fill in any null or undefined properties of an object with the properties from a
 $tw.utils.deepDefaults = function(object /*, sourceObjectList */) {
 	$tw.utils.each(Array.prototype.slice.call(arguments,1),function(source) {
 		if(source) {
-			for(var p in source) {
+			for (var p in source) {
 				if(object[p] === null || object[p] === undefined) {
 					object[p] = source[p];
 				}
@@ -386,8 +360,8 @@ $tw.utils.parseDate = function(value) {
 				parseInt(value.substr(10,2)||"00",10),
 				parseInt(value.substr(12,2)||"00",10),
 				parseInt(value.substr(14,3)||"000",10)));
-		d.setUTCFullYear(year); // See https://stackoverflow.com/a/5870822
-		return d;
+		  d.setUTCFullYear(year); // See https://stackoverflow.com/a/5870822
+		  return d;
 	} else if($tw.utils.isDate(value)) {
 		return value;
 	} else {
@@ -812,7 +786,6 @@ $tw.utils.Crypto = function() {
 			}
 			return outputText;
 		};
-	$tw.sjcl = sjcl;
 	this.setPassword = function(newPassword) {
 		currentPassword = newPassword;
 		this.updateCryptoStateTiddler();
@@ -893,8 +866,8 @@ $tw.modules.execute = function(moduleName,moduleRoot) {
 	} else {
 		/*
 		CommonJS optional require.main property:
-			In a browser we offer a fake main module which points back to the boot function
-			(Theoretically, this may allow TW to eventually load itself as a module in the browser)
+		 In a browser we offer a fake main module which points back to the boot function
+		 (Theoretically, this may allow TW to eventually load itself as a module in the browser)
 		*/
 		Object.defineProperty(sandbox.require, "main", {
 			value: (typeof(require) !== "undefined") ? require.main : {TiddlyWiki: _boot},
@@ -936,9 +909,9 @@ $tw.modules.execute = function(moduleName,moduleRoot) {
 				moduleInfo.exports = moduleInfo.definition;
 			}
 		} catch(e) {
-			if(e instanceof SyntaxError) {
+			if (e instanceof SyntaxError) {
 				var line = e.lineNumber || e.line; // Firefox || Safari
-				if(typeof(line) != "undefined" && line !== null) {
+				if (typeof(line) != "undefined" && line !== null) {
 					$tw.utils.error("Syntax error in boot module " + name + ":" + line + ":\n" + e.stack);
 				} else if(!$tw.browser) {
 					// this is the only way to get node.js to display the line at which the syntax error appeared,
@@ -1533,7 +1506,7 @@ Define all modules stored in ordinary tiddlers
 $tw.Wiki.prototype.defineTiddlerModules = function() {
 	this.each(function(tiddler,title) {
 		if(tiddler.hasField("module-type")) {
-			switch(tiddler.fields.type) {
+			switch (tiddler.fields.type) {
 				case "application/javascript":
 					// We only define modules that haven't already been defined, because in the browser modules in system tiddlers are defined in inline script
 					if(!$tw.utils.hop($tw.modules.titles,tiddler.fields.title)) {
@@ -1994,10 +1967,10 @@ $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 = path.relative(rootPath, filename).split('/').slice(0, -1);
 							break;
 						case "filepath":
-							value = path.relative(rootPath, filename).split(path.sep).join('/');
+							value = path.relative(rootPath, filename);
 							break;
 						case "filename":
 							value = path.basename(filename);
@@ -2043,7 +2016,7 @@ $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
 		arrayOfFiles = arrayOfFiles || [];
 		var files = fs.readdirSync(dirPath);
 		files.forEach(function(file) {
-			if(recurse && fs.statSync(dirPath + path.sep + file).isDirectory()) {
+			if (recurse && fs.statSync(dirPath + path.sep + file).isDirectory()) {
 				arrayOfFiles = getAllFiles(dirPath + path.sep + file, recurse, arrayOfFiles);
 			} else if(fs.statSync(dirPath + path.sep + file).isFile()){
 				arrayOfFiles.push(path.join(dirPath, path.sep, file));
@@ -2188,16 +2161,13 @@ Returns an array of search paths
 */
 $tw.getLibraryItemSearchPaths = function(libraryPath,envVar) {
 	var pluginPaths = [path.resolve($tw.boot.corePath,libraryPath)],
-		env;
-	if(envVar) {
 		env = process.env[envVar];
-		if(env) {
-			env.split(path.delimiter).map(function(item) {
-				if(item) {
-					pluginPaths.push(item);
-				}
-			});
-		}
+	if(env) {
+		env.split(path.delimiter).map(function(item) {
+			if(item) {
+				pluginPaths.push(item);
+			}
+		});
 	}
 	return pluginPaths;
 };
@@ -2283,7 +2253,7 @@ $tw.loadWikiTiddlers = function(wikiPath,options) {
 		}
 		$tw.wiki.addTiddlers(tiddlerFile.tiddlers);
 	});
-	if($tw.boot.wikiPath == wikiPath) {
+	if ($tw.boot.wikiPath == wikiPath) {
 		// Save the original tiddler file locations if requested
 		var output = {}, relativePath, fileInfo;
 		for(var title in $tw.boot.files) {
@@ -2468,7 +2438,6 @@ $tw.boot.initStartup = function(options) {
 	$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");
@@ -2483,12 +2452,8 @@ $tw.boot.initStartup = function(options) {
 	$tw.utils.registerFileType("text/x-markdown","utf8",[".md",".markdown"]);
 	$tw.utils.registerFileType("application/enex+xml","utf8",".enex");
 	$tw.utils.registerFileType("application/vnd.openxmlformats-officedocument.wordprocessingml.document","base64",".docx");
-	$tw.utils.registerFileType("application/msword","base64",".doc");
 	$tw.utils.registerFileType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet","base64",".xlsx");
-	$tw.utils.registerFileType("application/excel","base64",".xls");
-	$tw.utils.registerFileType("application/vnd.ms-excel","base64",".xls");
 	$tw.utils.registerFileType("application/vnd.openxmlformats-officedocument.presentationml.presentation","base64",".pptx");
-	$tw.utils.registerFileType("application/mspowerpoint","base64",".ppt");
 	$tw.utils.registerFileType("text/x-bibtex","utf8",".bib",{deserializerType:"application/x-bibtex"});
 	$tw.utils.registerFileType("application/x-bibtex","utf8",".bib");
 	$tw.utils.registerFileType("application/epub+zip","base64",".epub");
@@ -2637,14 +2602,14 @@ $tw.boot.doesTaskMatchPlatform = function(taskModule) {
 	var platforms = taskModule.platforms;
 	if(platforms) {
 		for(var t=0; t<platforms.length; t++) {
-			switch(platforms[t]) {
+			switch (platforms[t]) {
 				case "browser":
-					if($tw.browser) {
+					if ($tw.browser) {
 						return true;
 					}
 					break;
 				case "node":
-					if($tw.node) {
+					if ($tw.node) {
 						return true;
 					}
 					break;
@@ -2727,7 +2692,7 @@ Invoke the hook by key
 $tw.hooks.invokeHook = function(hookName /*, value,... */) {
 	var args = Array.prototype.slice.call(arguments,1);
 	if($tw.utils.hop($tw.hooks.names,hookName)) {
-		for(var i = 0; i < $tw.hooks.names[hookName].length; i++) {
+		for (var i = 0; i < $tw.hooks.names[hookName].length; i++) {
 			args[0] = $tw.hooks.names[hookName][i].apply(null,args);
 		}
 	}

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;

boot/sjcl.js.meta

@@ -0,0 +1,3 @@
+title: $:/library/sjcl.js
+type: application/javascript
+library: yes

boot/tiddlywiki.files

@@ -1,32 +0,0 @@
-{
-	"tiddlers": [
-		{
-			"file": "sjcl.js",
-			"fields": {
-				"title": "$:/library/sjcl.js",
-				"type": "application/javascript",
-				"library": "yes"
-			},
-			"prefix": "(function(define) {\n",
-			"suffix": "\n})(function (_,defined){window.sjcl = defined()})\n"
-		},
-		{
-			"file": "boot.js",
-			"fields": {
-				"title": "$:/boot/boot.js",
-				"type": "application/javascript"
-			}
-		},
-		{
-			"file": "bootprefix.js",
-			"fields": {
-				"title": "$:/boot/bootprefix.js",
-				"type": "application/javascript"
-			}
-		},
-		{
-			"file": "boot.css.tid",
-			"isTiddlerFile": true
-		}
-	]
-}

code-of-conduct.md

@@ -1 +0,0 @@
-<p>This community exists because TiddlyWiki is more useful when people share and work together.</p><p>This community is a beautiful but fragile thing: a collection of diverse people from all over the planet, united in their interest in the project, and their commitment to helping one another achieve and learn more.</p><p>We try to make the community as broad and welcoming as possible by remembering some basic principles of culture and behaviour.</p><p>These principles guide technical and non-technical decisions, and help contributors and leaders support our project and community.</p><ul><li>We are optimistic and hopeful</li><li>We aim to foster a learning environment that is collaborative and safe for everyone</li><li>We recognise that the motivation for sharing and helping is usually for appreciation, and not financial gain, and so we take care to acknowledge and <strong>thank the people who enrich the community by sharing what they have created</strong></li><li>While we are united in our interest in TiddlyWiki, we differ in every other conceivable way. We choose to focus on what unites us, and <strong>avoid unnecessarily mixing contentious topics like religion and politics</strong></li><li>We treat each other with respect, and start with the assumption that <strong>others are acting in good faith</strong></li><li>We avoid discriminatory language</li><li>We try to use our strength as a community to help others</li><li>We avoid responding when angry or upset because we try to de-escalate conflict</li><li>We make sure we critique ideas, not people</li><li>When we disagree with others we do so graciously, and treat others with dignity and respoect</li><li>We do not tolerate intolerance towards others</li><li>We seek first to understand others, and then to be understood</li><li>We have fun</li></ul><p>Our discussions are in English. It is not the first language of many people in the community, nor do we all share the same cultural background and reference points. So we take care to use language that is clear and unambigous, and avoid cultural references or jokes that will not be widely understood.</p><p>It is not acceptable to make jokes or other comments that discriminate by race, gender, sexuality, or other protected characteristic.</p><p>As an inclusive community, we are committed to making sure that TiddlyWiki is an accessible tool that understands the needs of people with disabilities.</p>

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>

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>

core/images/standard-layout.tid

@@ -1,7 +0,0 @@
-title: $:/core/images/standard-layout
-tags: $:/tags/Image
-
-\parameters (size:"22pt")
-<svg width=<<size>> height=<<size>> class="tc-image-standard-layout tc-image-button" viewBox="0 0 128 128">
-    <path d="M71.93 72A8.07 8.07 0 0 1 80 80.07v7.86A8.071 8.071 0 0 1 71.93 96H8.07A8.067 8.067 0 0 1 0 87.93v-7.86A8.072 8.072 0 0 1 8.07 72h63.86Zm0 32a8.07 8.07 0 0 1 8.07 8.07v7.86a8.071 8.071 0 0 1-8.07 8.07H8.07A8.067 8.067 0 0 1 0 119.93v-7.86A8.072 8.072 0 0 1 8.07 104h63.86Zm0-104A8.068 8.068 0 0 1 80 8.07v47.86A8.073 8.073 0 0 1 71.93 64H8.07A8.07 8.07 0 0 1 0 55.93V8.07A8.072 8.072 0 0 1 8.07 0h63.86Zm48 0c2.14 0 4.193.85 5.706 2.364A8.067 8.067 0 0 1 128 8.07v111.86c0 2.14-.85 4.193-2.364 5.706A8.067 8.067 0 0 1 119.93 128H96.07c-2.14 0-4.193-.85-5.706-2.364A8.067 8.067 0 0 1 88 119.93V8.07c0-2.14.85-4.193 2.364-5.706A8.067 8.067 0 0 1 96.07 0h23.86ZM116 24h-16a3.995 3.995 0 0 0-2.828 1.172 3.995 3.995 0 0 0 0 5.656A3.995 3.995 0 0 0 100 32h16a3.995 3.995 0 0 0 2.828-1.172 3.995 3.995 0 0 0 0-5.656A3.995 3.995 0 0 0 116 24Z"/>
-</svg>

core/language/en-GB/Buttons.multids

@@ -28,7 +28,6 @@ Encryption/ClearPassword/Caption: clear password
 Encryption/ClearPassword/Hint: Clear the password and save this wiki without encryption
 Encryption/SetPassword/Caption: set password
 Encryption/SetPassword/Hint: Set a password for saving this wiki with encryption
-EmergencyDownload/Caption: download tiddlers as json
 ExportPage/Caption: export all
 ExportPage/Hint: Export all tiddlers
 ExportTiddler/Caption: export tiddler
@@ -80,7 +79,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 +103,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
@@ -133,7 +129,6 @@ Excise/Caption/Replace/Link: link
 Excise/Caption/Replace/Transclusion: transclusion
 Excise/Caption/Tag: Tag new tiddler with the title of this tiddler
 Excise/Caption/TiddlerExists: Warning: tiddler already exists
-Excise/DefaultTitle: New Excision
 Excise/Hint: Excise the selected text into a new tiddler
 Heading1/Caption: heading 1
 Heading1/Hint: Apply heading level 1 formatting to lines containing selection

core/language/en-GB/ControlPanel.multids

@@ -96,10 +96,6 @@ Plugins/PluginWillRequireReload: (requires reload)
 Plugins/Plugins/Caption: Plugins
 Plugins/Plugins/Hint: Plugins
 Plugins/Reinstall/Caption: reinstall
-Plugins/Stability/Deprecated: DEPRECATED
-Plugins/Stability/Experimental: EXPERIMENTAL
-Plugins/Stability/Legacy: LEGACY
-Plugins/Stability/Stable: STABLE
 Plugins/Themes/Caption: Themes
 Plugins/Themes/Hint: Theme plugins
 Plugins/Update/Caption: update
@@ -175,8 +171,6 @@ Settings/NavigationPermalinkviewMode/UpdateAddressBar/Description: Update addres
 Settings/PerformanceInstrumentation/Caption: Performance Instrumentation
 Settings/PerformanceInstrumentation/Hint: Displays performance statistics in the browser developer console. Requires reload to take effect
 Settings/PerformanceInstrumentation/Description: Enable performance instrumentation
-Settings/RecentLimit/Caption: Recent Tab Limit 
-Settings/RecentLimit/Hint: Maximum number of tiddlers to be displayed under the sidebar "Recent" tab
 Settings/ToolbarButtonStyle/Caption: Toolbar Button Style
 Settings/ToolbarButtonStyle/Hint: Choose the style for toolbar buttons:
 Settings/ToolbarButtonStyle/Styles/Borderless: Borderless
@@ -204,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
@@ -218,12 +206,6 @@ Stylesheets/Caption: Stylesheets
 Stylesheets/Expand/Caption: Expand All
 Stylesheets/Hint: This is the rendered CSS of the current stylesheet tiddlers tagged with <<tag "$:/tags/Stylesheet">>
 Stylesheets/Restore/Caption: Restore
-TestCases/Caption: Test Cases
-TestCases/Hint: Test cases are self contained examples for testing and learning
-TestCases/All/Caption: All Test Cases
-TestCases/All/Hint: All Test Cases
-TestCases/Failed/Caption: Failed Test Cases
-TestCases/Failed/Hint: Only Failed Test Cases
 Theme/Caption: Theme
 Theme/Prompt: Current theme:
 TiddlerFields/Caption: Tiddler Fields
@@ -247,7 +229,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.

core/language/en-GB/Docs/ModuleTypes.multids

@@ -9,7 +9,7 @@ config: Data to be inserted into `$tw.config`.
 filteroperator: Individual filter operator methods.
 global: Global data to be inserted into `$tw`.
 info: Publishes system information via the [[$:/temp/info-plugin]] pseudo-plugin.
-isfilteroperator: Parameters for the ''is'' filter operator.
+isfilteroperator: Operands for the ''is'' filter operator.
 library: Generic module type for general purpose JavaScript modules.
 macro: JavaScript macro definitions.
 parser: Parsers for different content types.

core/language/en-GB/Docs/PaletteColours.multids

@@ -65,13 +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
 site-title-foreground: Site title foreground
 static-alert-foreground: Static alert foreground
 tab-background-selected: Tab background for selected tabs

core/language/en-GB/EditTemplate.multids

@@ -26,8 +26,6 @@ Tags/ClearInput/Caption: clear input
 Tags/ClearInput/Hint: Clear tag input
 Tags/Dropdown/Caption: tag list
 Tags/Dropdown/Hint: Show tag list
-Tags/EmptyMessage: No tags found
-Tags/EmptyMessage/System: No system tags found
 Title/BadCharacterWarning: Warning: avoid using any of the characters <<bad-chars>> in tiddler titles
 Title/Exists/Prompt: Target tiddler already exists
 Title/Relink/Prompt: Update ''<$text text=<<fromTitle>>/>'' to ''<$text text=<<toTitle>>/>'' in the //tags// and //list// fields of other tiddlers

core/language/en-GB/Fields.multids

@@ -30,7 +30,6 @@ name: The human readable name associated with a plugin tiddler
 parent-plugin: For a plugin, specifies which plugin of which it is a sub-plugin
 plugin-priority: A numerical value indicating the priority of a plugin tiddler
 plugin-type: The type of plugin in a plugin tiddler
-stability: The development status of a plugin: deprecated, experimental, stable, or legacy
 revision: The revision of the tiddler held at the server
 released: Date of a TiddlyWiki release
 source: The source URL associated with a tiddler

core/language/en-GB/Misc.multids

@@ -30,7 +30,7 @@ Error/DeserializeOperator/UnknownDeserializer: Filter Error: Unknown deserialize
 Error/Filter: Filter error
 Error/FilterSyntax: Syntax error in filter expression
 Error/FilterRunPrefix: Filter Error: Unknown prefix for filter run
-Error/IsFilterOperator: Filter Error: Unknown parameter for the 'is' filter operator
+Error/IsFilterOperator: Filter Error: Unknown operand for the 'is' filter operator
 Error/FormatFilterOperator: Filter Error: Unknown suffix for the 'format' filter operator
 Error/LoadingPluginLibrary: Error loading plugin library
 Error/NetworkErrorAlert: `<h2>''Network Error''</h2>It looks like the connection to the server has been lost. This may indicate a problem with your network connection. Please attempt to restore network connectivity before continuing.<br><br>''Any unsaved changes will be automatically synchronised when connectivity is restored''.`
@@ -70,7 +70,7 @@ No: No
 OfficialPluginLibrary: Official ~TiddlyWiki Plugin Library
 OfficialPluginLibrary/Hint: The official ~TiddlyWiki plugin library at tiddlywiki.com. Plugins, themes and language packs are maintained by the core team.
 PageTemplate/Description: the default ~TiddlyWiki layout
-PageTemplate/Name: Standard Layout
+PageTemplate/Name: Default ~PageTemplate
 PluginReloadWarning: Please save {{$:/core/ui/Buttons/save-wiki}} and reload {{$:/core/ui/Buttons/refresh}} to allow changes to ~JavaScript plugins to take effect
 RecentChanges/DateFormat: DDth MMM YYYY
 Shortcuts/Input/AdvancedSearch/Hint: Open the ~AdvancedSearch panel from within the sidebar search field

core/language/en-GB/Search.multids

@@ -6,8 +6,6 @@ Filter/Hint: Search via a [[filter expression|https://tiddlywiki.com/static/Filt
 Filter/Matches: //<small><<resultCount>> matches</small>//
 Matches: //<small><<resultCount>> matches</small>//
 Matches/All: All matches:
-Matches/NoMatch: //No match//
-Matches/NoResult: //No search result//
 Matches/Title: Title matches:
 Search: Search
 Search/TooShort: Search text too short

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

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

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

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

core/modules/commander.js

@@ -38,13 +38,6 @@ Commander.prototype.log = function(str) {
 	}
 };
 
-/*
-Clear pending commands
-*/
-Commander.prototype.clearCommands = function() {
-	this.commandTokens = this.commandTokens.slice(0,this.nextToken);
-};
-
 /*
 Write a string if verbose flag is set
 */

core/modules/commands/build.js

@@ -24,7 +24,7 @@ var Command = function(params,commander) {
 
 Command.prototype.execute = function() {
 	// Get the build targets defined in the wiki
-	var buildTargets = $tw.boot.wikiInfo && $tw.boot.wikiInfo.build;
+	var buildTargets = $tw.boot.wikiInfo.build;
 	if(!buildTargets) {
 		return "No build targets defined";
 	}

core/modules/commands/listen.js

@@ -16,9 +16,9 @@ var Server = require("$:/core/modules/server/server.js").Server;
 
 exports.info = {
 	name: "listen",
-	synchronous: false,
+	synchronous: true,
 	namedParameterMode: true,
-	mandatoryParameters: []
+	mandatoryParameters: [],
 };
 
 var Command = function(params,commander,callback) {
@@ -38,11 +38,7 @@ Command.prototype.execute = function() {
 		wiki: this.commander.wiki,
 		variables: self.params
 	});
-	var nodeServer = this.server.listen(null,null,null,{
-		callback: function() {
-			self.callback();
-		}
-	});
+	var nodeServer = this.server.listen();
 	$tw.hooks.invokeHook("th-server-command-post-start",this.server,nodeServer,"tiddlywiki");
 	return null;
 };

core/modules/commands/makelibrary.js

@@ -27,8 +27,33 @@ var Command = function(params,commander,callback) {
 
 Command.prototype.execute = function() {
 	var wiki = this.commander.wiki,
+		fs = require("fs"),
+		path = require("path"),
 		upgradeLibraryTitle = this.params[0] || UPGRADE_LIBRARY_TITLE,
-		tiddlers = $tw.utils.getAllPlugins();
+		tiddlers = {};
+	// Collect up the library plugins
+	var collectPlugins = function(folder) {
+			var pluginFolders = $tw.utils.getSubdirectories(folder) || [];
+			for(var p=0; p<pluginFolders.length; p++) {
+				if(!$tw.boot.excludeRegExp.test(pluginFolders[p])) {
+					pluginFields = $tw.loadPluginFolder(path.resolve(folder,"./" + pluginFolders[p]));
+					if(pluginFields && pluginFields.title) {
+						tiddlers[pluginFields.title] = pluginFields;
+					}
+				}
+			}
+		},
+		collectPublisherPlugins = function(folder) {
+			var publisherFolders = $tw.utils.getSubdirectories(folder) || [];
+			for(var t=0; t<publisherFolders.length; t++) {
+				if(!$tw.boot.excludeRegExp.test(publisherFolders[t])) {
+					collectPlugins(path.resolve(folder,"./" + publisherFolders[t]));
+				}
+			}
+		};
+	$tw.utils.each($tw.getLibraryItemSearchPaths($tw.config.pluginsPath,$tw.config.pluginsEnvVar),collectPublisherPlugins);
+	$tw.utils.each($tw.getLibraryItemSearchPaths($tw.config.themesPath,$tw.config.themesEnvVar),collectPublisherPlugins);
+	$tw.utils.each($tw.getLibraryItemSearchPaths($tw.config.languagesPath,$tw.config.languagesEnvVar),collectPlugins);
 	// Save the upgrade library tiddler
 	var pluginFields = {
 		title: upgradeLibraryTitle,

core/modules/commands/quit.js

@@ -1,37 +0,0 @@
-/*\
-title: $:/core/modules/commands/quit.js
-type: application/javascript
-module-type: command
-
-Immediately ends the TiddlyWiki process
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-exports.info = {
-	name: "quit",
-	synchronous: true
-};
-
-var Command = function(params,commander,callback) {
-	var self = this;
-	this.params = params;
-	this.commander = commander;
-	this.callback = callback;
-};
-
-Command.prototype.execute = function() {
-	// Clear any pending commands
-	this.commander.clearCommands();
-	// We don't actually quit, we just issue the "th-quit" hook to give listeners a chance to exit
-	$tw.hooks.invokeHook("th-quit");
-	return null;
-};
-
-exports.Command = Command;
-
-})();

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) {
+				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");
 		});
 		return null;
 	};

core/modules/commands/save.js

@@ -43,9 +43,7 @@ Saves individual tiddlers in their raw text or binary format to the specified fi
 						directory: path.resolve(self.commander.outputPath),
 						pathFilters: [filenameFilter],
 						wiki: wiki,
-						fileInfo: {
-							overwrite: true
-						}
+						fileInfo: {}
 					});
 					if(self.commander.verbose) {
 						console.log("Saving \"" + title + "\" to \"" + fileInfo.filepath + "\"");

core/modules/commands/savewikifolder.js

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

core/modules/config.js

@@ -30,7 +30,7 @@ exports.textPrimitives.wikiLink = exports.textPrimitives.upperLetter + "+" +
 	exports.textPrimitives.upperLetter +
 	exports.textPrimitives.anyLetter + "*";
 
-exports.htmlEntities = {quot:34, dollar:36, amp:38, apos:39, lt:60, gt:62, nbsp:160, iexcl:161, cent:162, pound:163, curren:164, yen:165, brvbar:166, sect:167, uml:168, copy:169, ordf:170, laquo:171, not:172, shy:173, reg:174, macr:175, deg:176, plusmn:177, sup2:178, sup3:179, acute:180, micro:181, para:182, middot:183, cedil:184, sup1:185, ordm:186, raquo:187, frac14:188, frac12:189, frac34:190, iquest:191, Agrave:192, Aacute:193, Acirc:194, Atilde:195, Auml:196, Aring:197, AElig:198, Ccedil:199, Egrave:200, Eacute:201, Ecirc:202, Euml:203, Igrave:204, Iacute:205, Icirc:206, Iuml:207, ETH:208, Ntilde:209, Ograve:210, Oacute:211, Ocirc:212, Otilde:213, Ouml:214, times:215, Oslash:216, Ugrave:217, Uacute:218, Ucirc:219, Uuml:220, Yacute:221, THORN:222, szlig:223, agrave:224, aacute:225, acirc:226, atilde:227, auml:228, aring:229, aelig:230, ccedil:231, egrave:232, eacute:233, ecirc:234, euml:235, igrave:236, iacute:237, icirc:238, iuml:239, eth:240, ntilde:241, ograve:242, oacute:243, ocirc:244, otilde:245, ouml:246, divide:247, oslash:248, ugrave:249, uacute:250, ucirc:251, uuml:252, yacute:253, thorn:254, yuml:255, OElig:338, oelig:339, Scaron:352, scaron:353, Yuml:376, fnof:402, circ:710, tilde:732, Alpha:913, Beta:914, Gamma:915, Delta:916, Epsilon:917, Zeta:918, Eta:919, Theta:920, Iota:921, Kappa:922, Lambda:923, Mu:924, Nu:925, Xi:926, Omicron:927, Pi:928, Rho:929, Sigma:931, Tau:932, Upsilon:933, Phi:934, Chi:935, Psi:936, Omega:937, alpha:945, beta:946, gamma:947, delta:948, epsilon:949, zeta:950, eta:951, theta:952, iota:953, kappa:954, lambda:955, mu:956, nu:957, xi:958, omicron:959, pi:960, rho:961, sigmaf:962, sigma:963, tau:964, upsilon:965, phi:966, chi:967, psi:968, omega:969, thetasym:977, upsih:978, piv:982, ensp:8194, emsp:8195, thinsp:8201, zwnj:8204, zwj:8205, lrm:8206, rlm:8207, ndash:8211, mdash:8212, lsquo:8216, rsquo:8217, sbquo:8218, ldquo:8220, rdquo:8221, bdquo:8222, dagger:8224, Dagger:8225, bull:8226, hellip:8230, permil:8240, prime:8242, Prime:8243, lsaquo:8249, rsaquo:8250, oline:8254, frasl:8260, 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(",");
 

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

@@ -12,27 +12,20 @@ Text editor operation to excise the selection to a new tiddler
 /*global $tw: false */
 "use strict";
 
-function isMarkdown(mediaType) {
-	return mediaType === 'text/markdown' || mediaType === 'text/x-markdown';
-}
-
 exports["excise"] = function(event,operation) {
 	var editTiddler = this.wiki.getTiddler(this.editTitle),
-		editTiddlerTitle = this.editTitle,
-		wikiLinks = !isMarkdown(editTiddler.fields.type),
-		excisionBaseTitle = $tw.language.getString("Buttons/Excise/DefaultTitle");
+		editTiddlerTitle = this.editTitle;
 	if(editTiddler && editTiddler.fields["draft.of"]) {
 		editTiddlerTitle = editTiddler.fields["draft.of"];
 	}
-	var excisionTitle = event.paramObject.title || this.wiki.generateNewTitle(excisionBaseTitle);
+	var excisionTitle = event.paramObject.title || this.wiki.generateNewTitle("New Excision");
 	this.wiki.addTiddler(new $tw.Tiddler(
 		this.wiki.getCreationFields(),
 		this.wiki.getModificationFields(),
 		{
 			title: excisionTitle,
 			text: operation.selection,
-			tags: event.paramObject.tagnew === "yes" ?  [editTiddlerTitle] : [],
-			type: editTiddler.fields.type
+			tags: event.paramObject.tagnew === "yes" ?  [editTiddlerTitle] : []
 		}
 	));
 	operation.replacement = excisionTitle;
@@ -41,8 +34,7 @@ exports["excise"] = function(event,operation) {
 			operation.replacement = "{{" + operation.replacement+ "}}";
 			break;
 		case "link":
-			operation.replacement = wikiLinks ? "[[" + operation.replacement+ "]]"
-				: ("[" + operation.replacement + "](<#" + operation.replacement + ">)");
+			operation.replacement = "[[" + operation.replacement+ "]]";
 			break;
 		case "macro":
 			operation.replacement = "<<" + (event.paramObject.macro || "translink") + " \"\"\"" + operation.replacement + "\"\"\">>";

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

@@ -13,125 +13,37 @@ Text editor operation to wrap the selection with the specified prefix and suffix
 "use strict";
 
 exports["wrap-selection"] = function(event,operation) {
-	var o = operation,
-		prefix = event.paramObject.prefix,
-		suffix = event.paramObject.suffix,
-		trimSelection = event.paramObject.trimSelection || "no",
-		selLength = o.selEnd - o.selStart;
-
-	// This function detects, if trailing spaces are part of the selection __and__ if the user wants to handle them
-	// Returns "yes", "start", "end", "no" (default)
-	//	yes .. there are trailing spaces at both ends
-	//	start .. there are trailing spaces at the start
-	//	end .. there are trailing spaces at the end
-	//	no .. no trailing spaces are taken into account
-	var trailingSpaceAt = function(sel) {
-		var _start,
-			_end,
-			result;
-		// trimSelection is a user parameter, which this evaluations takes into account
-		switch(trimSelection) {
-			case "end":
-				result = (sel.trimEnd().length !== selLength) ? "end" : "no";
-				break;
-			case "yes":
-				_start = sel.trimStart().length !== selLength;
-				_end = sel.trimEnd().length !== selLength;
-				result = (_start && _end) ? "yes" : (_start) ? "start" : (_end) ? "end" : "no";
-				break;
-			case "start":
-				result = (sel.trimStart().length !== selLength) ? "start" : "no";
-				break;
-			default:
-				result = "no";
-				break;
-		}
-		return result;
-	}
-
-	function togglePrefixSuffix() {
-		if(o.text.substring(o.selStart - prefix.length, o.selStart + suffix.length) === prefix + suffix) {
+	if(operation.selStart === operation.selEnd) {
+		// No selection; check if we're within the prefix/suffix
+		if(operation.text.substring(operation.selStart - event.paramObject.prefix.length,operation.selStart + event.paramObject.suffix.length) === event.paramObject.prefix + event.paramObject.suffix) {
 			// Remove the prefix and suffix
-			o.cutStart = o.selStart - prefix.length;
-			o.cutEnd = o.selEnd + suffix.length;
-			o.replacement = "";
-			o.newSelStart = o.cutStart;
-			o.newSelEnd = o.newSelStart;
+			operation.cutStart = operation.selStart - event.paramObject.prefix.length;
+			operation.cutEnd = operation.selEnd + event.paramObject.suffix.length;
+			operation.replacement = "";
+			operation.newSelStart = operation.cutStart;
+			operation.newSelEnd = operation.newSelStart;
 		} else {
 			// Wrap the cursor instead
-			o.cutStart = o.selStart;
-			o.cutEnd = o.selEnd;
-			o.replacement = prefix + suffix;
-			o.newSelStart = o.selStart + prefix.length;
-			o.newSelEnd = o.newSelStart;
+			operation.cutStart = operation.selStart;
+			operation.cutEnd = operation.selEnd;
+			operation.replacement = event.paramObject.prefix + event.paramObject.suffix;
+			operation.newSelStart = operation.selStart + event.paramObject.prefix.length;
+			operation.newSelEnd = operation.newSelStart;
 		}
-	}
-
-	// options: lenPrefix, lenSuffix
-	function removePrefixSuffix(options) {
-		options = options || {};
-		var _lenPrefix = options.lenPrefix || 0;
-		var _lenSuffix = options.lenSuffix || 0;
-
-		o.cutStart = o.selStart - _lenPrefix;
-		o.cutEnd = o.selEnd + _lenSuffix;
-		o.replacement = (_lenPrefix || _lenSuffix) ? o.selection : o.selection.substring(prefix.length, o.selection.length - suffix.length);
-		o.newSelStart = o.cutStart;
-		o.newSelEnd = o.cutStart + o.replacement.length;
-	}
-
-	function addPrefixSuffix() {
-		// remove trailing space if requested
-		switch(trailingSpaceAt(o.selection)) {
-			case "no":
-				// has no trailing spaces
-				o.cutStart = o.selStart;
-				o.cutEnd = o.selEnd;
-				o.replacement = prefix + o.selection + suffix;
-				o.newSelStart = o.selStart;
-				o.newSelEnd = o.selStart + o.replacement.length;
-				break;
-			case "yes":
-				// handle both ends
-				o.cutStart = o.selEnd - (o.selection.trimStart().length);
-				o.cutEnd = o.selection.trimEnd().length + o.selStart;
-				o.replacement = prefix + o.selection.trim() + suffix;
-				o.newSelStart = o.cutStart;
-				o.newSelEnd = o.cutStart + o.replacement.length;
-				break;
-			case "start":
-				// handle leading
-				o.cutStart = o.selEnd - (o.selection.trimStart().length);
-				o.cutEnd = o.selEnd;
-				o.replacement = prefix + o.selection.trimStart() + suffix;
-				o.newSelStart = o.cutStart;
-				o.newSelEnd = o.cutStart + o.replacement.length;
-				break;
-			case "end":
-				// handle trailing
-				o.cutStart = o.selStart;
-				o.cutEnd = o.selection.trimEnd().length + o.selStart;
-				o.replacement = prefix + o.selection.trimEnd() + suffix;
-				o.newSelStart = o.selStart;
-				o.newSelEnd = o.selStart + o.replacement.length;
-				break;
-		}
-	}
-
-	if(o.selStart === o.selEnd) {
-		// No selection; Create prefix and suffix. Set cursor in between them: ""|""
-		togglePrefixSuffix();
-	} else if(o.text.substring(o.selStart, o.selStart + prefix.length) === prefix &&
-				o.text.substring(o.selEnd - suffix.length,o.selEnd) === suffix) {
+	} else if(operation.text.substring(operation.selStart,operation.selStart + event.paramObject.prefix.length) === event.paramObject.prefix && operation.text.substring(operation.selEnd - event.paramObject.suffix.length,operation.selEnd) === event.paramObject.suffix) {
 		// Prefix and suffix are already present, so remove them
-		removePrefixSuffix();
-	} else if(o.text.substring(o.selStart - prefix.length, o.selStart) === prefix &&
-				o.text.substring(o.selEnd, o.selEnd + suffix.length) === suffix) {
-		// Prefix and suffix are present BUT not selected -> remove them
-		removePrefixSuffix({"lenPrefix": prefix.length, "lenSuffix": suffix.length});
+		operation.cutStart = operation.selStart;
+		operation.cutEnd = operation.selEnd;
+		operation.replacement = operation.selection.substring(event.paramObject.prefix.length,operation.selection.length - event.paramObject.suffix.length);
+		operation.newSelStart = operation.selStart;
+		operation.newSelEnd = operation.selStart + operation.replacement.length;
 	} else {
 		// Add the prefix and suffix
-		addPrefixSuffix();
+		operation.cutStart = operation.selStart;
+		operation.cutEnd = operation.selEnd;
+		operation.replacement = event.paramObject.prefix + operation.selection + event.paramObject.suffix;
+		operation.newSelStart = operation.selStart;
+		operation.newSelEnd = operation.selStart + operation.replacement.length;
 	}
 };
 

core/modules/filters/backtranscludes.js

@@ -1,26 +0,0 @@
-/*\
-title: $:/core/modules/filters/backtranscludes.js
-type: application/javascript
-module-type: filteroperator
-
-Filter operator for returning all the backtranscludes from a tiddler
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-/*
-Export our filter function
-*/
-exports.backtranscludes = function(source,operator,options) {
-	var results = new $tw.utils.LinkedList();
-	source(function(tiddler,title) {
-		results.pushTop(options.wiki.getTiddlerBacktranscludes(title));
-	});
-	return results.makeTiddlerIterator(options.wiki);
-};
-
-})();

core/modules/filters/crypto.js

@@ -14,9 +14,12 @@ Filter operators for cryptography, using the Stanford JavaScript library
 
 exports.sha256 = function(source,operator,options) {
 	var results = [],
-		length = parseInt(operator.operand,10) || 20;
+		length = parseInt(operator.operand,10) || 20,
+		sha256 = function(text) {
+			return sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(text)).substr(0,length);
+		};
 	source(function(tiddler,title) {
-		results.push($tw.utils.sha256(title,{length: length}));
+		results.push(sha256(title));
 	});
 	return results;
 };

core/modules/filters/encodings.js

@@ -18,8 +18,8 @@ Export our filter functions
 
 exports.decodebase64 = function(source,operator,options) {
 	var results = [];
-	var binary = operator.suffixes && operator.suffixes[0].indexOf("binary") !== -1;
-	var urlsafe = operator.suffixes && operator.suffixes[0].indexOf("urlsafe") !== -1;
+	var binary = operator.suffixes && operator.suffixes.indexOf("binary") !== -1;
+	var urlsafe = operator.suffixes && operator.suffixes.indexOf("urlsafe") !== -1;
 	source(function(tiddler,title) {
 		results.push($tw.utils.base64Decode(title,binary,urlsafe));
 	});
@@ -28,8 +28,8 @@ exports.decodebase64 = function(source,operator,options) {
 
 exports.encodebase64 = function(source,operator,options) {
 	var results = [];
-	var binary = operator.suffixes && operator.suffixes[0].indexOf("binary") !== -1;
-	var urlsafe = operator.suffixes && operator.suffixes[0].indexOf("urlsafe") !== -1;
+	var binary = operator.suffixes && operator.suffixes.indexOf("binary") !== -1;
+	var urlsafe = operator.suffixes && operator.suffixes.indexOf("urlsafe") !== -1;
 	source(function(tiddler,title) {
 		results.push($tw.utils.base64Encode(title,binary,urlsafe));
 	});

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

core/modules/filters/transcludes.js

@@ -1,26 +0,0 @@
-/*\
-title: $:/core/modules/filters/transcludes.js
-type: application/javascript
-module-type: filteroperator
-
-Filter operator for returning all the transcludes from a tiddler
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-/*
-Export our filter function
-*/
-exports.transcludes = function(source,operator,options) {
-	var results = new $tw.utils.LinkedList();
-	source(function(tiddler,title) {
-		results.pushTop(options.wiki.getTiddlerTranscludes(title));
-	});
-	return results.makeTiddlerIterator(options.wiki);
-};
-
-})();

core/modules/filters/x-listops.js

@@ -202,7 +202,7 @@ Extended filter operators to manipulate the current list.
 		}
 		if(resultsIndex !== -1) {
 			i = i + step;
-			nextOperandIndex = (i < opLength ? i : i % opLength);
+			nextOperandIndex = (i < opLength ? i : i - opLength);
 			if(operands.length > 1) {
 				results.splice(resultsIndex,1,operands[nextOperandIndex]);
 			} else {

core/modules/indexers/back-indexer.js

@@ -1,122 +0,0 @@
-/*\
-title: $:/core/modules/indexers/back-indexer.js
-type: application/javascript
-module-type: indexer
-
-By parsing the tiddler text, indexes the tiddlers' back links, back transclusions, block level back links.
-
-\*/
-function BackIndexer(wiki) {
-	this.wiki = wiki;
-}
-
-BackIndexer.prototype.init = function() {
-	this.subIndexers = {
-		link: new BackSubIndexer(this,"extractLinks"),
-		transclude: new BackSubIndexer(this,"extractTranscludes"),
-	};
-};
-
-BackIndexer.prototype.rebuild = function() {
-	$tw.utils.each(this.subIndexers,function(subIndexer) {
-		subIndexer.rebuild();
-	});
-};
-
-BackIndexer.prototype.update = function(updateDescriptor) {
-	$tw.utils.each(this.subIndexers,function(subIndexer) {
-		subIndexer.update(updateDescriptor);
-	});
-};
-function BackSubIndexer(indexer,extractor) {
-	this.wiki = indexer.wiki;
-	this.indexer = indexer;
-	this.extractor = extractor;
-	/**
-	 * {
-	 *   [target title, e.g. tiddler title being linked to]:
-	 *     {
-	 * 		   [source title, e.g. tiddler title that has link syntax in its text]: true
-	 * 	   }
-	 * }
-	 */
-	this.index = null;
-}
-
-BackSubIndexer.prototype.init = function() {
-	// lazy init until first lookup
-	this.index = null;
-}
-
-BackSubIndexer.prototype._init = function() {
-	this.index = Object.create(null);
-	var self = this;
-	this.wiki.forEachTiddler(function(sourceTitle,tiddler) {
-		var newTargets = self._getTarget(tiddler);
-		$tw.utils.each(newTargets, function(target) {
-			if(!self.index[target]) {
-				self.index[target] = Object.create(null);
-			}
-			self.index[target][sourceTitle] = true;
-		});
-	});
-}
-
-BackSubIndexer.prototype.rebuild = function() {
-	this.index = null;
-}
-
-/*
-* Get things that is being referenced in the text, e.g. tiddler names in the link syntax.
-*/
-BackSubIndexer.prototype._getTarget = function(tiddler) {
-	if(this.wiki.isBinaryTiddler(tiddler.fields.text)) {
-		return [];
-	}
-	var parser = this.wiki.parseText(tiddler.fields.type, tiddler.fields.text, {});
-	if(parser) {
-		return this.wiki[this.extractor](parser.tree, tiddler.fields.title);
-	}
-	return [];
-}
-
-BackSubIndexer.prototype.update = function(updateDescriptor) {
-	// lazy init/update until first lookup
-	if(!this.index) {
-		return;
-	}
-	var newTargets = [],
-	    oldTargets = [],
-	    self = this;
-	if(updateDescriptor.old.exists) {
-		oldTargets = this._getTarget(updateDescriptor.old.tiddler);
-	}
-	if(updateDescriptor.new.exists) {
-		newTargets = this._getTarget(updateDescriptor.new.tiddler);
-	}
-
-	$tw.utils.each(oldTargets,function(target) {
-		if(self.index[target]) {
-			delete self.index[target][updateDescriptor.old.tiddler.fields.title];
-		}
-	});
-	$tw.utils.each(newTargets,function(target) {
-		if(!self.index[target]) {
-			self.index[target] = Object.create(null);
-		}
-		self.index[target][updateDescriptor.new.tiddler.fields.title] = true;
-	});
-}
-
-BackSubIndexer.prototype.lookup = function(title) {
-	if(!this.index) {
-		this._init();
-	}
-	if(this.index[title]) {
-		return Object.keys(this.index[title]);
-	} else {
-		return [];
-	}
-}
-
-exports.BackIndexer = BackIndexer;

core/modules/indexers/backlinks-index.js

@@ -0,0 +1,86 @@
+/*\
+title: $:/core/modules/indexers/backlinks-indexer.js
+type: application/javascript
+module-type: indexer
+
+Indexes the tiddlers' backlinks
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global modules: false */
+"use strict";
+
+
+function BacklinksIndexer(wiki) {
+	this.wiki = wiki;
+}
+
+BacklinksIndexer.prototype.init = function() {
+	this.index = null;
+}
+
+BacklinksIndexer.prototype.rebuild = function() {
+	this.index = null;
+}
+
+BacklinksIndexer.prototype._getLinks = function(tiddler) {
+	var parser =  this.wiki.parseText(tiddler.fields.type, tiddler.fields.text, {});
+	if(parser) {
+		return this.wiki.extractLinks(parser.tree);
+	}
+	return [];
+}
+
+BacklinksIndexer.prototype.update = function(updateDescriptor) {
+	if(!this.index) {
+		return;
+	}
+	var newLinks = [],
+	    oldLinks = [],
+	    self = this;
+	if(updateDescriptor.old.exists) {
+		oldLinks = this._getLinks(updateDescriptor.old.tiddler);
+	}
+	if(updateDescriptor.new.exists) {
+		newLinks = this._getLinks(updateDescriptor.new.tiddler);
+	}
+
+	$tw.utils.each(oldLinks,function(link) {
+		if(self.index[link]) {
+			delete self.index[link][updateDescriptor.old.tiddler.fields.title];
+		}
+	});
+	$tw.utils.each(newLinks,function(link) {
+		if(!self.index[link]) {
+			self.index[link] = Object.create(null);
+		}
+		self.index[link][updateDescriptor.new.tiddler.fields.title] = true;
+	});
+}
+
+BacklinksIndexer.prototype.lookup = function(title) {
+	if(!this.index) {
+		this.index = Object.create(null);
+		var self = this;
+		this.wiki.forEachTiddler(function(title,tiddler) {
+			var links = self._getLinks(tiddler);
+			$tw.utils.each(links, function(link) {
+				if(!self.index[link]) {
+					self.index[link] = Object.create(null);
+				}
+				self.index[link][title] = true;
+			});
+		});
+	}
+	if(this.index[title]) {
+		return Object.keys(this.index[title]);
+	} else {
+		return [];
+	}
+}
+
+exports.BacklinksIndexer = BacklinksIndexer;
+
+})();

core/modules/macros/csvtiddlers.js

@@ -35,11 +35,9 @@ exports.run = function(filter,format) {
 	// Collect all the fields
 	for(t=0;t<tiddlers.length; t++) {
 		tiddler = this.wiki.getTiddler(tiddlers[t]);
-		if(tiddler) {
-			for(f in tiddler.fields) {
-				if(fields.indexOf(f) === -1) {
-					fields.push(f);
-				}
+		for(f in tiddler.fields) {
+			if(fields.indexOf(f) === -1) {
+				fields.push(f);
 			}
 		}
 	}
@@ -62,10 +60,8 @@ exports.run = function(filter,format) {
 	for(var t=0;t<tiddlers.length; t++) {
 		row = [];
 		tiddler = this.wiki.getTiddler(tiddlers[t]);
-			if(tiddler) {
-				for(f=0; f<fields.length; f++) {
-					row.push(quoteAndEscape(tiddler ? tiddler.getFieldString(fields[f]) || "" : ""));
-				}	
+			for(f=0; f<fields.length; f++) {
+				row.push(quoteAndEscape(tiddler ? tiddler.getFieldString(fields[f]) || "" : ""));
 			}
 		output.push(row.join(","));
 	}

core/modules/macros/unusedtitle.js

@@ -16,22 +16,20 @@ exports.name = "unusedtitle";
 exports.params = [
 	{name: "baseName"},
 	{name: "separator"},
-	{name: "template"},
-	{name: "startCount"}
+	{name: "template"}
 ];
 
 /*
 Run the macro
 */
-exports.run = function(baseName,separator,template,startCount) {
+exports.run = function(baseName,separator,template) {
 	separator = separator || " ";
-	startCount = startCount || 0;
 	if(!baseName) {
 		baseName = $tw.language.getString("DefaultNewTiddlerTitle");
 	}
 	// $tw.wiki.generateNewTitle = function(baseTitle,options)
-	// options.prefix must be a string!
-	return this.wiki.generateNewTitle(baseName, {"prefix": separator, "template": template, "startCount": startCount});
+	// options.prefix must be a string! 
+	return this.wiki.generateNewTitle(baseName, {"prefix": separator, "template": template});
 };
 
 })();

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;

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]}
 			}
 	}];
 };

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
 		}]
 	}];
 };

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

@@ -6,7 +6,7 @@ module-type: wikirule
 Conditional shortcut syntax
 
 ```
-This is a <%if [{something}] %>Elephant<%elseif [{else}] %>Pelican<%else%>Crocodile<%endif%>
+This is a <% if [{something}] %>Elephant<% elseif [{else}] %>Pelican<% else %>Crocodile<% endif %>
 ```
 
 \*/
@@ -27,7 +27,7 @@ exports.init = function(parser) {
 };
 
 exports.findNextMatch = function(startPos) {
-	// Look for the next <%if shortcut
+	// Look for the next <% if shortcut
 	this.matchRegExp.lastIndex = startPos;
 	this.match = this.matchRegExp.exec(this.parser.source);
 	// If not found then return no match

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]
 			}]
 		}];
 	}

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];
 };

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];
 };

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]);

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
 	}];

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];

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;

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: []
 	}];

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();

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

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
 			}]
 		}];
 	}

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

@@ -3,7 +3,30 @@ title: $:/core/modules/parsers/wikiparser/rules/quoteblock.js
 type: application/javascript
 module-type: wikirule
 
-Wiki text rule for quote blocks.
+Wiki text rule for quote blocks. For example:
+
+```
+	<<<.optionalClass(es) optional cited from
+	a quote
+	<<<
+	
+	<<<.optionalClass(es)
+	a quote
+	<<< optional cited from
+```
+
+Quotes can be quoted by putting more <s
+
+```
+	<<<
+	Quote Level 1
+	
+	<<<<
+	QuoteLevel 2
+	<<<<
+	
+	<<<
+```
 
 \*/
 (function(){
@@ -24,42 +47,33 @@ exports.init = function(parser) {
 exports.parse = function() {
 	var classes = ["tc-quote"];
 	// Get all the details of the match
-	var reEndString = "^\\s*" + this.match[1] + "(?!<)";
+	var reEndString = "^" + this.match[1] + "(?!<)";
 	// 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);
+	var tree= this.parser.parseBlocks(reEndString);
 	// If we got a cite, put it before the text
 	if(cite.length > 0) {
 		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 +81,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
 	}];

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
 			}]
 		}];
 	}
 };
 
-})();
+})();

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

@@ -93,12 +93,11 @@ var processRow = function(prevColumns) {
 			}
 			// Check whether this is a heading cell
 			var cell;
-			var start = this.parser.pos;
 			if(chr === "!") {
 				this.parser.pos++;
-				cell = {type: "element", tag: "th", start: start, children: []};
+				cell = {type: "element", tag: "th", children: []};
 			} else {
-				cell = {type: "element", tag: "td", start: start, children: []};
+				cell = {type: "element", tag: "td", children: []};
 			}
 			tree.push(cell);
 			// Record information about this cell
@@ -122,7 +121,6 @@ var processRow = function(prevColumns) {
 			}
 			// Move back to the closing `|`
 			this.parser.pos--;
-			cell.end = this.parser.pos;
 		}
 		col++;
 		cellRegExp.lastIndex = this.parser.pos;
@@ -152,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;
 			}
@@ -171,17 +169,15 @@ exports.parse = function() {
 				rowContainer.children = this.parser.parseInlineRun(rowTermRegExp,{eatTerminator: true});
 			} else {
 				// Create the row
-				var theRow = {type: "element", tag: "tr", children: [], start: rowMatch.index};
+				var theRow = {type: "element", tag: "tr", children: []};
 				$tw.utils.addClassToParseTreeNode(theRow,rowCount%2 ? "oddRow" : "evenRow");
 				rowContainer.children.push(theRow);
 				// Process the row
 				theRow.children = processRow.call(this,prevColumns);
 				this.parser.pos = rowMatch.index + rowMatch[0].length;
-				theRow.end = this.parser.pos;
 				// Increment the row count
 				rowCount++;
 			}
-			rowContainer.end = this.parser.pos;
 		}
 		rowMatch = rowRegExp.exec(this.parser.source);
 	}

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
 			}]
 		}];
 	}

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
 		}]
 	}];
 };

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;
 
 })();
+

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);

core/modules/savers/put.js

@@ -20,7 +20,7 @@ Retrieve ETag if available
 */
 var retrieveETag = function(self) {
 	var headers = {
-		Accept: "*/*"
+		Accept: "*/*;charset=UTF-8"
 	};
 	$tw.utils.httpRequest({
 		url: self.uri(),
@@ -48,14 +48,14 @@ 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",
 		callback: function(err,data,xhr) {
 			// Check DAV header http://www.webdav.org/specs/rfc2518.html#rfc.section.9.1
 			if(!err) {
-				self.serverAcceptsPuts = xhr.status >= 200 && xhr.status < 300 && !!xhr.getResponseHeader("dav");
+				self.serverAcceptsPuts = xhr.status === 200 && !!xhr.getResponseHeader("dav");
 			}
 		}
 	});

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

core/modules/server/server.js

@@ -140,11 +140,6 @@ function sendResponse(request,response,statusCode,headers,data,encoding) {
 				return;
 			}
 		}
-	} else {
-		// RFC 7231, 6.1. Overview of Status Codes:
-		// Browser clients may cache 200, 203, 204, 206, 300, 301, 
-		// 404, 405, 410, 414, and 501 unless given explicit cache controls
-		headers["Cache-Control"] = headers["Cache-Control"] || "no-store";
 	}
 	/*
 	If the gzip=yes is set, check if the user agent permits compression. If so,
@@ -364,11 +359,6 @@ Server.prototype.listen = function(port,host,prefix) {
 	}
 	// Display the port number after we've started listening (the port number might have been specified as zero, in which case we will get an assigned port)
 	server.on("listening",function() {
-		// Stop listening when we get the "th-quit" hook
-		$tw.hooks.addHook("th-quit",function() {
-			server.close();
-		});
-		// Log listening details
 		var address = server.address(),
 			url = self.protocol + "://" + (address.family === "IPv6" ? "[" + address.address + "]" : address.address) + ":" + address.port + prefix;
 		$tw.utils.log("Serving on " + url,"brown/orange");

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;
 						});

core/modules/startup/render.js

@@ -29,11 +29,7 @@ var THROTTLE_REFRESH_TIMEOUT = 400;
 
 exports.startup = function() {
 	// Set up the title
-	$tw.titleWidgetNode = $tw.wiki.makeTranscludeWidget(PAGE_TITLE_TITLE, {
-		document: $tw.fakeDocument,
-		parseAsInline: true,
-		importPageMacros: true,
-	});
+	$tw.titleWidgetNode = $tw.wiki.makeTranscludeWidget(PAGE_TITLE_TITLE,{document: $tw.fakeDocument, parseAsInline: true});
 	$tw.titleContainer = $tw.fakeDocument.createElement("div");
 	$tw.titleWidgetNode.render($tw.titleContainer,null);
 	document.title = $tw.titleContainer.textContent;
@@ -85,8 +81,6 @@ exports.startup = function() {
 		deferredChanges = Object.create(null);
 		$tw.hooks.invokeHook("th-page-refreshed");
 	}
-	var throttledRefresh = $tw.perf.report("throttledRefresh",refresh);
-
 	// Add the change event handler
 	$tw.wiki.addEventListener("change",$tw.perf.report("mainRefresh",function(changes) {
 		// Check if only tiddlers that are throttled have changed
@@ -107,7 +101,7 @@ exports.startup = function() {
 			if(isNaN(timeout)) {
 				timeout = THROTTLE_REFRESH_TIMEOUT;
 			}
-			timerId = setTimeout(throttledRefresh,timeout);
+			timerId = setTimeout(refresh,timeout);
 			$tw.utils.extend(deferredChanges,changes);
 		} else {
 			$tw.utils.extend(deferredChanges,changes);

core/modules/startup/rootwidget.js

@@ -39,7 +39,6 @@ exports.startup = function() {
 			method: params.method,
 			body: params.body,
 			binary: params.binary,
-			useDefaultHeaders: params.useDefaultHeaders,
 			oncompletion: params.oncompletion,
 			onprogress: params.onprogress,
 			bindStatus: params["bind-status"],
@@ -48,13 +47,7 @@ exports.startup = function() {
 			headers: getPropertiesWithPrefix(params,"header-"),
 			passwordHeaders: getPropertiesWithPrefix(params,"password-header-"),
 			queryStrings: getPropertiesWithPrefix(params,"query-"),
-			passwordQueryStrings: getPropertiesWithPrefix(params,"password-query-"),
-			basicAuthUsername: params["basic-auth-username"],
-			basicAuthUsernameFromStore: params["basic-auth-username-from-store"],
-			basicAuthPassword: params["basic-auth-password"],
-			basicAuthPasswordFromStore: params["basic-auth-password-from-store"],
-			bearerAuthToken: params["bearer-auth-token"],
-			bearerAuthTokenFromStore: params["bearer-auth-token-from-store"]
+			passwordQueryStrings: getPropertiesWithPrefix(params,"password-query-")
 		});
 	});
 	$tw.rootWidget.addEventListener("tm-http-cancel-all-requests",function(event) {
@@ -75,10 +68,7 @@ exports.startup = function() {
 	});
 	// Install the copy-to-clipboard  mechanism
 	$tw.rootWidget.addEventListener("tm-copy-to-clipboard",function(event) {
-		$tw.utils.copyToClipboard(event.param,{
-			successNotification: event.paramObject && event.paramObject.successNotification,
-			failureNotification: event.paramObject && event.paramObject.failureNotification
-		});
+		$tw.utils.copyToClipboard(event.param);
 	});
 	// Install the tm-focus-selector message
 	$tw.rootWidget.addEventListener("tm-focus-selector",function(event) {

core/modules/startup/story.js

@@ -93,9 +93,7 @@ exports.startup = function() {
 				updateAddressBar: $tw.wiki.getTiddlerText(CONFIG_PERMALINKVIEW_UPDATE_ADDRESS_BAR,"yes").trim() === "yes" ? "permalink" : "none",
 				updateHistory: $tw.wiki.getTiddlerText(CONFIG_UPDATE_HISTORY,"no").trim(),
 				targetTiddler: event.param || event.tiddlerTitle,
-				copyToClipboard: $tw.wiki.getTiddlerText(CONFIG_PERMALINKVIEW_COPY_TO_CLIPBOARD,"yes").trim() === "yes" ? "permalink" : "none",
-				successNotification: event.paramObject && event.paramObject.successNotification,
-				failureNotification: event.paramObject && event.paramObject.failureNotification
+				copyToClipboard: $tw.wiki.getTiddlerText(CONFIG_PERMALINKVIEW_COPY_TO_CLIPBOARD,"yes").trim() === "yes" ? "permalink" : "none"
 			});
 		});
 		// Listen for the tm-permaview message
@@ -104,9 +102,7 @@ exports.startup = function() {
 				updateAddressBar: $tw.wiki.getTiddlerText(CONFIG_PERMALINKVIEW_UPDATE_ADDRESS_BAR,"yes").trim() === "yes" ? "permaview" : "none",
 				updateHistory: $tw.wiki.getTiddlerText(CONFIG_UPDATE_HISTORY,"no").trim(),
 				targetTiddler: event.param || event.tiddlerTitle,
-				copyToClipboard: $tw.wiki.getTiddlerText(CONFIG_PERMALINKVIEW_COPY_TO_CLIPBOARD,"yes").trim() === "yes" ? "permaview" : "none",
-				successNotification: event.paramObject && event.paramObject.successNotification,
-				failureNotification: event.paramObject && event.paramObject.failureNotification
+				copyToClipboard: $tw.wiki.getTiddlerText(CONFIG_PERMALINKVIEW_COPY_TO_CLIPBOARD,"yes").trim() === "yes" ? "permaview" : "none"
 			});
 		});
 	}
@@ -181,8 +177,6 @@ options.updateAddressBar: "permalink", "permaview" or "no" (defaults to "permavi
 options.updateHistory: "yes" or "no" (defaults to "no")
 options.copyToClipboard: "permalink", "permaview" or "no" (defaults to "no")
 options.targetTiddler: optional title of target tiddler for permalink
-options.successNotification: optional title of tiddler to use as the notification in case of success
-options.failureNotification: optional title of tiddler to use as the notification in case of failure
 */
 function updateLocationHash(options) {
 	// Get the story and the history stack
@@ -211,18 +205,14 @@ function updateLocationHash(options) {
 			break;
 	}
 	// Copy URL to the clipboard
-	var url = "";
 	switch(options.copyToClipboard) {
 		case "permalink":
-			url = $tw.utils.getLocationPath() + "#" + encodeURIComponent(targetTiddler);
+			$tw.utils.copyToClipboard($tw.utils.getLocationPath() + "#" + encodeURIComponent(targetTiddler));
 			break;
 		case "permaview":
-			url = $tw.utils.getLocationPath() + "#" + encodeURIComponent(targetTiddler) + ":" + encodeURIComponent($tw.utils.stringifyList(storyList));
+			$tw.utils.copyToClipboard($tw.utils.getLocationPath() + "#" + encodeURIComponent(targetTiddler) + ":" + encodeURIComponent($tw.utils.stringifyList(storyList)));
 			break;
 	}
-	if(url) {
-		$tw.utils.copyToClipboard(url,{successNotification: options.successNotification, failureNotification: options.failureNotification});
-	}
 	// Only change the location hash if we must, thus avoiding unnecessary onhashchange events
 	if($tw.utils.getLocationHash() !== $tw.locationHash) {
 		if(options.updateHistory === "yes") {

core/modules/startup/windows.js

@@ -56,7 +56,7 @@ exports.startup = function() {
 			return;
 		}
 		// Initialise the document
-		srcDocument.write("<!DOCTYPE html><head></head><body class='tc-body tc-single-tiddler-window'></body></html>");
+		srcDocument.write("<html><head></head><body class='tc-body tc-single-tiddler-window'></body></html>");
 		srcDocument.close();
 		srcDocument.title = windowTitle;
 		srcWindow.addEventListener("beforeunload",function(event) {

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();

core/modules/syncer.js

@@ -257,11 +257,7 @@ Save an incoming tiddler in the store, and updates the associated tiddlerInfo
 Syncer.prototype.storeTiddler = function(tiddlerFields) {
 	// Save the tiddler
 	var tiddler = new $tw.Tiddler(tiddlerFields);
-	// Only save the tiddler if it has changed
-	var existingTiddler = this.wiki.getTiddler(tiddlerFields.title);
-	if(!existingTiddler || !existingTiddler.isEqual(tiddler)) {
-		this.wiki.addTiddler(tiddler);
-	}
+	this.wiki.addTiddler(tiddler);
 	// Save the tiddler revision and changeCount details
 	this.tiddlerInfo[tiddlerFields.title] = {
 		revision: this.getTiddlerRevision(tiddlerFields.title),
@@ -560,7 +556,6 @@ SaveTiddlerTask.prototype.run = function(callback) {
 			// Invoke the callback
 			callback(null);
 		},{
-			syncer: self.syncer,
 			tiddlerInfo: self.syncer.tiddlerInfo[self.title]
 		});
 	} else {
@@ -591,7 +586,6 @@ DeleteTiddlerTask.prototype.run = function(callback) {
 		// Invoke the callback
 		callback(null);
 	},{
-		syncer: self.syncer,
 		tiddlerInfo: self.syncer.tiddlerInfo[this.title]
 	});
 };
@@ -620,8 +614,6 @@ LoadTiddlerTask.prototype.run = function(callback) {
 		}
 		// Invoke the callback
 		callback(null);
-	},{
-		syncer: self.syncer
 	});
 };
 

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/"];
 

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,12 +289,10 @@ 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",
-			failureNotification = options.failureNotification || "$:/language/Notifications/CopiedToClipboard/Failed"
-		$tw.notifier.display(succeeded ? successNotification : failureNotification);
+		$tw.notifier.display(succeeded ? "$:/language/Notifications/CopiedToClipboard/Succeeded" : "$:/language/Notifications/CopiedToClipboard/Failed");
 	}
 	document.body.removeChild(textArea);
 };
@@ -327,7 +324,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;
 			}

core/modules/utils/dom/http.js

@@ -69,7 +69,7 @@ HttpClient.prototype.cancelAllHttpRequests = function() {
 		for(var t=this.requests.length - 1; t--; t>=0) {
 			var requestInfo = this.requests[t];
 			requestInfo.request.cancel();
-		}
+		}	
 	}
 	this.requests = [];
 	this.updateRequestTracker();
@@ -100,12 +100,6 @@ headers: hashmap of header name to header value to be sent with the request
 passwordHeaders: hashmap of header name to password store name to be sent with the request
 queryStrings: hashmap of query string parameter name to parameter value to be sent with the request
 passwordQueryStrings: hashmap of query string parameter name to password store name to be sent with the request
-basicAuthUsername: plain username for basic authentication
-basicAuthUsernameFromStore: name of password store entry containing username
-basicAuthPassword: plain password for basic authentication
-basicAuthPasswordFromStore: name of password store entry containing password
-bearerAuthToken: plain text token for bearer authentication
-bearerAuthTokenFromStore: name of password store entry contain bear authorization token
 */
 function HttpClientRequest(options) {
 	var self = this;
@@ -118,7 +112,6 @@ function HttpClientRequest(options) {
 	this.method = options.method || "GET";
 	this.body = options.body || "";
 	this.binary = options.binary || "";
-	this.useDefaultHeaders = options.useDefaultHeaders !== "false" ? true : false,
 	this.variables = options.variables;
 	var url = options.url;
 	$tw.utils.each(options.queryStrings,function(value,name) {
@@ -135,14 +128,6 @@ function HttpClientRequest(options) {
 	$tw.utils.each(options.passwordHeaders,function(value,name) {
 		self.requestHeaders[name] = $tw.utils.getPassword(value) || "";
 	});
-	this.basicAuthUsername = options.basicAuthUsername || (options.basicAuthUsernameFromStore && $tw.utils.getPassword(options.basicAuthUsernameFromStore)) || "";
-	this.basicAuthPassword = options.basicAuthPassword || (options.basicAuthPasswordFromStore && $tw.utils.getPassword(options.basicAuthPasswordFromStore)) || "";
-	this.bearerAuthToken = options.bearerAuthToken || (options.bearerAuthTokenFromStore && $tw.utils.getPassword(options.bearerAuthTokenFromStore)) || "";
-	if(this.basicAuthUsername && this.basicAuthPassword) {
-		this.requestHeaders.Authorization = "Basic " + $tw.utils.base64Encode(this.basicAuthUsername + ":" + this.basicAuthPassword);
-	} else if(this.bearerAuthToken) {
-		this.requestHeaders.Authorization = "Bearer " + this.bearerAuthToken;
-	}
 }
 
 HttpClientRequest.prototype.send = function(callback) {
@@ -171,7 +156,6 @@ HttpClientRequest.prototype.send = function(callback) {
 		this.xhr = $tw.utils.httpRequest({
 			url: this.url,
 			type: this.method,
-			useDefaultHeaders: this.useDefaultHeaders,
 			headers: this.requestHeaders,
 			data: this.body,
 			returnProp: this.binary === "" ? "responseText" : "response",
@@ -247,8 +231,7 @@ Make an HTTP request. Options are:
 exports.httpRequest = function(options) {
 	var type = options.type || "GET",
 		url = options.url,
-		useDefaultHeaders = options.useDefaultHeaders !== false ? true : false,
-		headers = options.headers || (useDefaultHeaders ? {accept: "application/json"} : {}),
+		headers = options.headers || {accept: "application/json"},
 		hasHeader = function(targetHeader) {
 			targetHeader = targetHeader.toLowerCase();
 			var result = false;
@@ -274,7 +257,7 @@ exports.httpRequest = function(options) {
 			if(hasHeader("Content-Type") && ["application/x-www-form-urlencoded","multipart/form-data","text/plain"].indexOf(getHeader["Content-Type"]) === -1) {
 				return false;
 			}
-			return true;
+			return true;	
 		},
 		returnProp = options.returnProp || "responseText",
 		request = new XMLHttpRequest(),
@@ -300,13 +283,13 @@ exports.httpRequest = function(options) {
 	// Set up the state change handler
 	request.onreadystatechange = function() {
 		if(this.readyState === 4) {
-			if(this.status >= 200 && this.status < 300) {
+			if(this.status === 200 || this.status === 201 || this.status === 204) {
 				// Success!
 				options.callback(null,this[returnProp],this);
 				return;
 			}
 		// Something went wrong
-		options.callback($tw.language.getString("Error/XMLHttpRequest") + ": " + this.status,this[returnProp],this);
+		options.callback($tw.language.getString("Error/XMLHttpRequest") + ": " + this.status,null,this);
 		}
 	};
 	// Handle progress
@@ -324,10 +307,10 @@ exports.httpRequest = function(options) {
 			request.setRequestHeader(headerTitle,header);
 		});
 	}
-	if(data && !hasHeader("Content-Type") && useDefaultHeaders) {
+	if(data && !hasHeader("Content-Type")) {
 		request.setRequestHeader("Content-Type","application/x-www-form-urlencoded; charset=UTF-8");
 	}
-	if(!hasHeader("X-Requested-With") && !isSimpleRequest(type,headers) && useDefaultHeaders) {
+	if(!hasHeader("X-Requested-With") && !isSimpleRequest(type,headers)) {
 		request.setRequestHeader("X-Requested-With","TiddlyWiki");
 	}
 	// Send data

core/modules/utils/edition-info.js

@@ -29,14 +29,10 @@ exports.getEditionInfo = function() {
 			for(var entryIndex=0; entryIndex<entries.length; entryIndex++) {
 				var entry = entries[entryIndex];
 				// Check if directories have a valid tiddlywiki.info
-				// Check if the entry is a hidden directory
-				if((entry.charAt(0) !== ".") && !editionInfo[entry] && $tw.utils.isDirectory(path.resolve(editionPath,entry))) {
-					var file=path.resolve(editionPath,entry,"tiddlywiki.info");
-					if(fs.existsSync(file)) {
-						var info = $tw.utils.parseJSONSafe(fs.readFileSync(file,"utf8"),null);
-						if(info) {
-							editionInfo[entry] = info;
-						}
+				if(!editionInfo[entry] && $tw.utils.isDirectory(path.resolve(editionPath,entry))) {
+					var info = $tw.utils.parseJSONSafe(fs.readFileSync(path.resolve(editionPath,entry,"tiddlywiki.info"),"utf8"),null);
+					if(info) {
+						editionInfo[entry] = info;
 					}
 				}
 			}
@@ -45,4 +41,4 @@ exports.getEditionInfo = function() {
 	return editionInfo;
 };
 
-})();
+})();

core/modules/utils/errors.js

@@ -1,23 +0,0 @@
-/*\
-title: $:/core/modules/utils/errors.js
-type: application/javascript
-module-type: utils
-
-Custom errors for TiddlyWiki.
-
-\*/
-(function(){
-
-function TranscludeRecursionError() {
-	Error.apply(this,arguments);
-	this.signatures = Object.create(null);
-};
-
-/* Maximum permitted depth of the widget tree for recursion detection */
-TranscludeRecursionError.MAX_WIDGET_TREE_DEPTH = 1000;
-
-TranscludeRecursionError.prototype = Object.create(Error);
-
-exports.TranscludeRecursionError = TranscludeRecursionError;
-
-})();

core/modules/utils/fakedom.js

@@ -42,7 +42,7 @@ var TW_TextNode = function(text) {
 	this.textContent = text + "";
 };
 
-Object.setPrototypeOf(TW_TextNode.prototype,TW_Node.prototype);
+Object.setPrototypeOf(TW_TextNode,TW_Node.prototype);
 
 Object.defineProperty(TW_TextNode.prototype, "nodeType", {
 	get: function() {
@@ -56,64 +56,36 @@ Object.defineProperty(TW_TextNode.prototype, "formattedTextContent", {
 	}
 });
 
-var TW_Style = function(el) {
-	// Define the internal style object
-	var styleObject = {
-		// Method to get the entire style object
-		get: function() {
-			return el._style;
-		},
-		// Method to set styles using a string (e.g. "color:red; background-color:blue;")
-		set: function(str) {
-			var self = this;
-			str = str || "";
-			$tw.utils.each(str.split(";"),function(declaration) {
-				var parts = declaration.split(":"),
-					name = $tw.utils.trim(parts[0]),
-					value = $tw.utils.trim(parts[1]);
-				if(name && value) {
-					el._style[$tw.utils.convertStyleNameToPropertyName(name)] = value;
-				}
-			});
-		},
-		// Method to set a specific property without transforming the property name, such as a custom property
-		setProperty: function(name, value) {
-			el._style[name] = value;
-		}
-	};
-
-	// Return a Proxy to handle direct access to individual style properties
-	return new Proxy(styleObject, {
-		get: function(target, property) {
-			// If the property exists on styleObject, return it (get, set, setProperty methods)
-			if (property in target) {
-				return target[property];
-			}
-			// Otherwise, return the corresponding property from _style
-			return el._style[$tw.utils.convertStyleNameToPropertyName(property)] || "";
-		},
-		set: function(target, property, value) {
-			// Set the property in _style
-			el._style[$tw.utils.convertStyleNameToPropertyName(property)] = value;
-			return true;
-		}
-	});
-};
-
-var TW_Element = function(tag, namespace) {
+var TW_Element = function(tag,namespace) {
 	bumpSequenceNumber(this);
 	this.isTiddlyWikiFakeDom = true;
 	this.tag = tag;
 	this.attributes = {};
 	this.isRaw = false;
 	this.children = [];
-	this._style = {}; // Internal style object
-	this.style = new TW_Style(this); // Proxy for style management
+	this._style = {};
 	this.namespaceURI = namespace || "http://www.w3.org/1999/xhtml";
 };
 
+Object.setPrototypeOf(TW_Element,TW_Node.prototype);
 
-Object.setPrototypeOf(TW_Element.prototype,TW_Node.prototype);
+Object.defineProperty(TW_Element.prototype, "style", {
+	get: function() {
+		return this._style;
+	},
+	set: function(str) {
+		var self = this;
+		str = str || "";
+		$tw.utils.each(str.split(";"),function(declaration) {
+			var parts = declaration.split(":"),
+				name = $tw.utils.trim(parts[0]),
+				value = $tw.utils.trim(parts[1]);
+			if(name && value) {
+				self._style[$tw.utils.convertStyleNameToPropertyName(name)] = value;
+			}
+		});
+	}
+});
 
 Object.defineProperty(TW_Element.prototype, "nodeType", {
 	get: function() {
@@ -133,7 +105,7 @@ TW_Element.prototype.setAttribute = function(name,value) {
 		throw "Cannot setAttribute on a raw TW_Element";
 	}
 	if(name === "style") {
-		this.style.set(value);
+		this.style = value;
 	} else {
 		this.attributes[name] = value + "";
 	}

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;
@@ -316,13 +316,11 @@ Options include:
 	pathFilters: optional array of filters to be used to generate the base path
 	wiki: optional wiki for evaluating the pathFilters
 	fileInfo: an existing fileInfo object to check against
-	fileInfo.overwrite: if true, turns off filename clash numbers (defaults to false)
 */
 exports.generateTiddlerFilepath = function(title,options) {
 	var directory = options.directory || "",
 		extension = options.extension || "",
 		originalpath = (options.fileInfo && options.fileInfo.originalpath) ? options.fileInfo.originalpath : "",
-		overwrite = options.fileInfo && options.fileInfo.overwrite || false,
 		filepath;
 	// Check if any of the pathFilters applies
 	if(options.pathFilters && options.wiki) {
@@ -383,20 +381,19 @@ exports.generateTiddlerFilepath = function(title,options) {
 			filepath += char.charCodeAt(0).toString();
 		});
 	}
-	// Add a uniquifier if the file already exists (default)
-	var fullPath = path.resolve(directory, filepath + extension);
-	if (!overwrite) {
-		var oldPath = (options.fileInfo) ? options.fileInfo.filepath : undefined,
+	// Add a uniquifier if the file already exists
+	var fullPath, oldPath = (options.fileInfo) ? options.fileInfo.filepath : undefined,
 		count = 0;
-		do {
-			fullPath = path.resolve(directory,filepath + (count ? "_" + count : "") + extension);
-			if(oldPath && oldPath == fullPath) break;
-			count++;
-		} while(fs.existsSync(fullPath));
-	}
+	do {
+		fullPath = path.resolve(directory,filepath + (count ? "_" + count : "") + extension);
+		if(oldPath && oldPath == fullPath) {
+			break;
+		}
+		count++;
+	} while(fs.existsSync(fullPath));
 	// If the last write failed with an error, or if path does not start with:
 	//	the resolved options.directory, the resolved wikiPath directory, the wikiTiddlersPath directory, 
-	//	or the 'originalpath' directory, then $tw.utils.encodeURIComponentExtended() and resolve to options.directory.
+	//	or the 'originalpath' directory, then $tw.utils.encodeURIComponentExtended() and resolve to tiddler directory.
 	var writePath = $tw.hooks.invokeHook("th-make-tiddler-path",fullPath,fullPath),
 		encode = (options.fileInfo || {writeError: false}).writeError == true;
 	if(!encode) {

core/modules/utils/repository.js

@@ -1,52 +0,0 @@
-/*\
-title: $:/core/modules/utils/repository.js
-type: application/javascript
-module-type: utils
-
-Utilities for working with the TiddlyWiki repository file structure
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-/*
-Get an object containing all the plugins as a hashmap by title of the JSON representation of the plugin
-Options:
-
-ignoreEnvironmentVariables: defaults to false
-*/
-exports.getAllPlugins = function(options) {
-	options = options || {};
-	var fs = require("fs"),
-		path = require("path"),
-		tiddlers = {};
-	// Collect up the library plugins
-	var collectPlugins = function(folder) {
-			var pluginFolders = $tw.utils.getSubdirectories(folder) || [];
-			for(var p=0; p<pluginFolders.length; p++) {
-				if(!$tw.boot.excludeRegExp.test(pluginFolders[p])) {
-					var pluginFields = $tw.loadPluginFolder(path.resolve(folder,"./" + pluginFolders[p]));
-					if(pluginFields && pluginFields.title) {
-						tiddlers[pluginFields.title] = pluginFields;
-					}
-				}
-			}
-		},
-		collectPublisherPlugins = function(folder) {
-			var publisherFolders = $tw.utils.getSubdirectories(folder) || [];
-			for(var t=0; t<publisherFolders.length; t++) {
-				if(!$tw.boot.excludeRegExp.test(publisherFolders[t])) {
-					collectPlugins(path.resolve(folder,"./" + publisherFolders[t]));
-				}
-			}
-		};
-	$tw.utils.each($tw.getLibraryItemSearchPaths($tw.config.pluginsPath,options.ignoreEnvironmentVariables ? undefined : $tw.config.pluginsEnvVar),collectPublisherPlugins);
-	$tw.utils.each($tw.getLibraryItemSearchPaths($tw.config.themesPath,options.ignoreEnvironmentVariables ? undefined : $tw.config.themesEnvVar),collectPublisherPlugins);
-	$tw.utils.each($tw.getLibraryItemSearchPaths($tw.config.languagesPath,options.ignoreEnvironmentVariables ? undefined : $tw.config.languagesEnvVar),collectPlugins);
-	return tiddlers;
-};
-
-})();

core/modules/utils/transliterate.js

@@ -924,7 +924,7 @@ exports.transliterate = function(str) {
 };
 
 exports.transliterateToSafeASCII = function(str) {
-	return str.replace(/[^\x20-\x7F]/g,function(ch) {
+	return str.replace(/[^\x00-\x7F]/g,function(ch) {
 		return exports.transliterationPairs[ch] || ""
 	});
 };

core/modules/utils/utils.js

@@ -330,18 +330,16 @@ exports.formatTitleString = function(template,options) {
 			}]
 		];
 	while(t.length){
-		var matchString = "",
-			found = false;
+		var matchString = "";
 		$tw.utils.each(matches, function(m) {
 			var match = m[0].exec(t);
 			if(match) {
-				found = true;
 				matchString = m[1].call(null,match);
 				t = t.substr(match[0].length);
 				return false;
 			}
 		});
-		if(found) {
+		if(matchString) {
 			result += matchString;
 		} else {
 			result += t.charAt(0);
@@ -821,15 +819,6 @@ exports.hashString = function(str) {
 	},0);
 };
 
-/*
-Cryptographic hash function as used by sha256 filter operator
-options.length .. number of characters returned defaults to 64
-*/
-exports.sha256 = function(str, options) {
-	options = options || {}
-	return $tw.sjcl.codec.hex.fromBits($tw.sjcl.hash.sha256.hash(str)).substr(0,options.length || 64);
-}
-
 /*
 Base64 utility functions that work in either browser or Node.js
 */
@@ -933,7 +922,7 @@ IE does not have sign function
 */
 exports.sign = Math.sign || function(x) {
 	x = +x; // convert to a number
-	if(x === 0 || isNaN(x)) {
+	if (x === 0 || isNaN(x)) {
 		return x;
 	}
 	return x > 0 ? 1 : -1;
@@ -946,7 +935,7 @@ exports.strEndsWith = function(str,ending,position) {
 	if(str.endsWith) {
 		return str.endsWith(ending,position);
 	} else {
-		if(typeof position !== 'number' || !isFinite(position) || Math.floor(position) !== position || position > str.length) {
+		if (typeof position !== 'number' || !isFinite(position) || Math.floor(position) !== position || position > str.length) {
 			position = str.length;
 		}
 		position -= ending.length;