diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ed16d707d2..f6fb58f7d2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v4
+ - uses: actions/checkout@v5
- uses: actions/setup-node@v4
with:
node-version: "${{ env.NODE_VERSION }}"
@@ -30,7 +30,7 @@ jobs:
TW5_BUILD_MAIN_EDITION: "./editions/prerelease"
TW5_BUILD_OUTPUT: "./output/prerelease"
steps:
- - uses: actions/checkout@v4
+ - uses: actions/checkout@v5
- uses: actions/setup-node@v4
with:
node-version: "${{ env.NODE_VERSION }}"
@@ -62,7 +62,7 @@ jobs:
TW5_BUILD_OUTPUT: "./output"
TW5_BUILD_ARCHIVE: "./output"
steps:
- - uses: actions/checkout@v4
+ - uses: actions/checkout@v5
- uses: actions/setup-node@v4
with:
node-version: "${{ env.NODE_VERSION }}"
diff --git a/.github/workflows/eslint.yml b/.github/workflows/eslint.yml
new file mode 100644
index 0000000000..eae1d2c468
--- /dev/null
+++ b/.github/workflows/eslint.yml
@@ -0,0 +1,40 @@
+name: ESLint
+
+on:
+ pull_request:
+ types: [opened, synchronize, reopened]
+ workflow_dispatch:
+
+concurrency:
+ group: lint-${{ github.event.pull_request.number || github.ref_name }}
+ cancel-in-progress: true
+
+permissions:
+ contents: read
+ # Needed for GitHub Checks API
+ checks: write
+
+jobs:
+ eslint:
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v5
+
+ - name: Setup Node.js
+ uses: actions/setup-node@v4
+ with:
+ node-version: 20
+
+ - name: Install dependencies
+ run: npm install --include=dev
+
+ - name: Run ESLint with reviewdog (GitHub Checks)
+ uses: reviewdog/action-eslint@v1
+ with:
+ eslint_flags: '.'
+ reporter: github-pr-check
+ fail_level: error
+ level: error
+ tool_name: ESLint PR code
diff --git a/.github/workflows/pr-check-build-size.yml b/.github/workflows/pr-check-build-size.yml
new file mode 100644
index 0000000000..8512a30d4e
--- /dev/null
+++ b/.github/workflows/pr-check-build-size.yml
@@ -0,0 +1,55 @@
+name: Calculate PR build size
+on:
+ pull_request_target:
+ types: [opened, reopened, synchronize]
+ paths:
+ - 'boot/**'
+ - 'core/**'
+ - 'themes/tiddlywiki/snowwhite/**'
+ - 'themes/tiddlywiki/vanilla/**'
+
+jobs:
+ calculate-build-size:
+ runs-on: ubuntu-latest
+ permissions:
+ pull-requests: read
+ contents: read
+ outputs:
+ pr_size: ${{ steps.get_sizes.outputs.pr_size }}
+ base_size: ${{ steps.get_sizes.outputs.base_size }}
+ steps:
+ - name: build-size-check
+ id: get_sizes
+ uses: TiddlyWiki/cerebrus@v4
+ with:
+ pr_number: ${{ github.event.pull_request.number }}
+ repo: ${{ github.repository }}
+ base_ref: ${{ github.event.pull_request.base.ref }}
+ github_token: ${{ secrets.GITHUB_TOKEN }}
+ mode: size:calc
+
+ dispatch-followup:
+ needs: calculate-build-size
+ runs-on: ubuntu-latest
+ permissions:
+ actions: write # Required to dispatch another workflow
+ pull-requests: write
+ contents: read
+ steps:
+ - name: Trigger follow-up workflow
+ uses: actions/github-script@v6
+ with:
+ github-token: ${{ secrets.GITHUB_TOKEN }}
+ script: |
+ await github.rest.actions.createWorkflowDispatch({
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ workflow_id: 'pr-comment-build-size.yml',
+ ref: 'master',
+ inputs: {
+ pr_number: '${{ github.event.pull_request.number }}',
+ base_ref: '${{ github.event.pull_request.base.ref }}',
+ pr_size: '${{ needs.calculate-build-size.outputs.pr_size }}',
+ base_size: '${{ needs.calculate-build-size.outputs.base_size }}'
+ }
+ });
\ No newline at end of file
diff --git a/.github/workflows/pr-comment-build-size.yml b/.github/workflows/pr-comment-build-size.yml
new file mode 100644
index 0000000000..8421d99c8d
--- /dev/null
+++ b/.github/workflows/pr-comment-build-size.yml
@@ -0,0 +1,36 @@
+name: Comment on PR build size (Trusted workflow)
+
+on:
+ workflow_dispatch:
+ inputs:
+ pr_number:
+ required: true
+ type: string
+ base_ref:
+ required: true
+ type: string
+ pr_size:
+ required: true
+ type: string
+ base_size:
+ required: true
+ type: string
+
+jobs:
+ comment-on-pr:
+ runs-on: ubuntu-latest
+ permissions:
+ pull-requests: write
+ contents: read
+
+ steps:
+ - name: Build and check size
+ uses: TiddlyWiki/cerebrus@v4
+ with:
+ pr_number: ${{ inputs.pr_number }}
+ repo: ${{ github.repository }}
+ base_ref: ${{ inputs.base_ref }}
+ github_token: ${{ secrets.GITHUB_TOKEN }}
+ mode: size:comment
+ pr_size: ${{ inputs.pr_size }}
+ base_size: ${{ inputs.base_size }}
diff --git a/.github/workflows/pr-path-validation.yml b/.github/workflows/pr-path-validation.yml
new file mode 100644
index 0000000000..674a9115bd
--- /dev/null
+++ b/.github/workflows/pr-path-validation.yml
@@ -0,0 +1,18 @@
+name: Validate PR Paths
+
+on:
+ pull_request_target:
+ types: [opened, reopened, synchronize]
+
+jobs:
+ validate-pr:
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Validate PR
+ uses: TiddlyWiki/cerebrus@v4
+ with:
+ pr_number: ${{ github.event.pull_request.number }}
+ repo: ${{ github.repository }}
+ base_ref: ${{ github.base_ref }}
+ github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/bin/build-site.sh b/bin/build-site.sh
index 40b9b447e5..a68dc0752b 100755
--- a/bin/build-site.sh
+++ b/bin/build-site.sh
@@ -5,7 +5,7 @@
# Default to the current version number for building the plugin library
if [ -z "$TW5_BUILD_VERSION" ]; then
- TW5_BUILD_VERSION=v5.3.7
+ TW5_BUILD_VERSION=v5.4.0
fi
echo "Using TW5_BUILD_VERSION as [$TW5_BUILD_VERSION]"
@@ -73,10 +73,8 @@ rm $TW5_BUILD_OUTPUT/dev/static/*
echo "Moved to http://tiddlywiki.com/plugins/tiddlywiki/tw2parser/index.html" > $TW5_BUILD_OUTPUT/classicparserdemo.html
echo "Moved to http://tiddlywiki.com/plugins/tiddlywiki/codemirror/index.html" > $TW5_BUILD_OUTPUT/codemirrordemo.html
-echo "Moved to http://tiddlywiki.com/plugins/tiddlywiki/d3/index.html" > $TW5_BUILD_OUTPUT/d3demo.html
echo "Moved to http://tiddlywiki.com/plugins/tiddlywiki/highlight/index.html" > $TW5_BUILD_OUTPUT/highlightdemo.html
echo "Moved to http://tiddlywiki.com/plugins/tiddlywiki/markdown/index.html" > $TW5_BUILD_OUTPUT/markdowndemo.html
-echo "Moved to http://tiddlywiki.com/plugins/tiddlywiki/tahoelafs/index.html" > $TW5_BUILD_OUTPUT/tahoelafs.html
# Put the build details into a .tid file so that it can be included in each build (deleted at the end of this script)
@@ -159,6 +157,13 @@ node $TW5_BUILD_TIDDLYWIKI \
--rendertiddler $:/core/save/all-external-js tour.html text/plain \
|| exit 1
+# /surveys.html surveys edition
+node $TW5_BUILD_TIDDLYWIKI \
+ ./editions/tiddlywiki-surveys \
+ --output $TW5_BUILD_OUTPUT \
+ --build index \
+ || exit 1
+
# /share.html Custom edition for sharing via the URL
node $TW5_BUILD_TIDDLYWIKI \
./editions/share \
@@ -294,26 +299,6 @@ node $TW5_BUILD_TIDDLYWIKI \
--rendertiddler $:/core/save/empty plugins/tiddlywiki/katex/empty.html text/plain \
|| exit 1
-# /plugins/tiddlywiki/tahoelafs/index.html Demo wiki with Tahoe-LAFS plugin
-# /plugins/tiddlywiki/tahoelafs/empty.html Empty wiki with Tahoe-LAFS plugin
-node $TW5_BUILD_TIDDLYWIKI \
- ./editions/tahoelafs \
- --load $TW5_BUILD_OUTPUT/build.tid \
- --output $TW5_BUILD_OUTPUT \
- --rendertiddler $:/core/save/all plugins/tiddlywiki/tahoelafs/index.html text/plain \
- --rendertiddler $:/core/save/empty plugins/tiddlywiki/tahoelafs/empty.html text/plain \
- || exit 1
-
-# /plugins/tiddlywiki/d3/index.html Demo wiki with D3 plugin
-# /plugins/tiddlywiki/d3/empty.html Empty wiki with D3 plugin
-node $TW5_BUILD_TIDDLYWIKI \
- ./editions/d3demo \
- --load $TW5_BUILD_OUTPUT/build.tid \
- --output $TW5_BUILD_OUTPUT \
- --rendertiddler $:/core/save/all plugins/tiddlywiki/d3/index.html text/plain \
- --rendertiddler $:/core/save/empty plugins/tiddlywiki/d3/empty.html text/plain \
- || exit 1
-
# /plugins/tiddlywiki/codemirror/index.html Demo wiki with codemirror plugin
# /plugins/tiddlywiki/codemirror/empty.html Empty wiki with codemirror plugin
node $TW5_BUILD_TIDDLYWIKI \
diff --git a/boot/boot.js b/boot/boot.js
index 20a639731c..6ac64c5868 100644
--- a/boot/boot.js
+++ b/boot/boot.js
@@ -641,7 +641,7 @@ $tw.utils.evalGlobal = function(code,context,filename,sandbox,allowGlobals) {
// Call the function and return the exports
return fn.apply(null,contextValues);
};
-$tw.utils.sandbox = !$tw.browser ? vm.createContext({}) : undefined;
+$tw.utils.sandbox = !$tw.browser ? vm.createContext({}) : undefined;
/*
Run code in a sandbox with only the specified context variables in scope
*/
@@ -799,12 +799,13 @@ the password, and to encrypt/decrypt a block of text
$tw.utils.Crypto = function() {
var sjcl = $tw.node ? (global.sjcl || require("./sjcl.js")) : window.sjcl,
currentPassword = null,
- callSjcl = function(method,inputText,password) {
+ callSjcl = function(method,inputText,password,options) {
+ options = options || {};
password = password || currentPassword;
var outputText;
try {
if(password) {
- outputText = sjcl[method](password,inputText);
+ outputText = sjcl[method](password,inputText,options);
}
} catch(ex) {
console.log("Crypto error:" + ex);
@@ -830,7 +831,8 @@ $tw.utils.Crypto = function() {
return !!currentPassword;
}
this.encrypt = function(text,password) {
- return callSjcl("encrypt",text,password);
+ // set default ks:256 -- see: http://bitwiseshiftleft.github.io/sjcl/doc/convenience.js.html
+ return callSjcl("encrypt",text,password,{v:1,iter:10000,ks:256,ts:64,mode:"ccm",adata:"",cipher:"aes"});
};
this.decrypt = function(text,password) {
return callSjcl("decrypt",text,password);
@@ -1433,7 +1435,7 @@ $tw.Wiki = function(options) {
checkTiddler = function(tiddler,title) {
if(tiddler && tiddler.fields.type === "application/json" && tiddler.fields["plugin-type"] && (!pluginType || tiddler.fields["plugin-type"] === pluginType)) {
var disablingTiddler = self.getTiddler("$:/config/Plugins/Disabled/" + title);
- if(title === "$:/core" || !disablingTiddler || (disablingTiddler.fields.text || "").trim() !== "yes") {
+ if(title === "$:/core" || title === "$:/core-server" || !disablingTiddler || (disablingTiddler.fields.text || "").trim() !== "yes") {
self.unregisterPluginTiddlers(null,[title]); // Unregister the plugin if it's already registered
pluginTiddlers.push(tiddler);
registeredTitles.push(tiddler.fields.title);
@@ -1530,7 +1532,8 @@ Define all modules stored in ordinary tiddlers
*/
$tw.Wiki.prototype.defineTiddlerModules = function() {
this.each(function(tiddler,title) {
- if(tiddler.hasField("module-type")) {
+ // Modules in draft tiddlers are disabled
+ if(tiddler.hasField("module-type") && (!tiddler.hasField("draft.of"))) {
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
@@ -1557,6 +1560,11 @@ $tw.Wiki.prototype.defineShadowModules = function() {
this.eachShadow(function(tiddler,title) {
// Don't define the module if it is overidden by an ordinary tiddler
if(!self.tiddlerExists(title) && tiddler.hasField("module-type")) {
+ if(tiddler.hasField("draft.of")) {
+ // Report a fundamental problem
+ console.warn(`TiddlyWiki: Plugins should not contain tiddlers with a 'draft.of' field: ${tiddler.fields.title}`);
+ return;
+ }
// Define the module
$tw.modules.define(tiddler.fields.title,tiddler.fields["module-type"],tiddler.fields.text);
}
@@ -1905,7 +1913,7 @@ $tw.loadTiddlersFromFile = function(filepath,fields) {
fileSize = fs.statSync(filepath).size,
data;
if(fileSize > $tw.config.maxEditFileSize) {
- data = "File " + filepath + "not loaded because it is too large";
+ data = "File " + filepath + " not loaded because it is too large";
console.log("Warning: " + data);
ext = ".txt";
} else {
@@ -1976,22 +1984,41 @@ filepath: pathname of the directory containing the specification file
$tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
var tiddlers = [];
// Read the specification
- var filesInfo = $tw.utils.parseJSONSafe(fs.readFileSync(filepath + path.sep + "tiddlywiki.files","utf8"));
+ var filesInfo = $tw.utils.parseJSONSafe(fs.readFileSync(filepath + path.sep + "tiddlywiki.files","utf8"), function(e) {
+ console.log("Warning: tiddlywiki.files in " + filepath + " invalid: " + e.message);
+ return {};
+ });
+
// Helper to process a file
var processFile = function(filename,isTiddlerFile,fields,isEditableFile,rootPath) {
var extInfo = $tw.config.fileExtensionInfo[path.extname(filename)],
type = (extInfo || {}).type || fields.type || "text/plain",
typeInfo = $tw.config.contentTypeInfo[type] || {},
pathname = path.resolve(filepath,filename),
- text = fs.readFileSync(pathname,typeInfo.encoding || "utf8"),
metadata = $tw.loadMetadataForFile(pathname) || {},
- fileTiddlers;
+ fileTooLarge = false,
+ text, fileTiddlers;
+
+ if("_canonical_uri" in fields) {
+ text = "";
+ } else if(fs.statSync(pathname).size > $tw.config.maxEditFileSize) {
+ var msg = "File " + pathname + " not loaded because it is too large";
+ console.log("Warning: " + msg);
+ fileTooLarge = true;
+ text = isTiddlerFile ? msg : "";
+ } else {
+ text = fs.readFileSync(pathname,typeInfo.encoding || "utf8");
+ }
+
if(isTiddlerFile) {
- fileTiddlers = $tw.wiki.deserializeTiddlers(path.extname(pathname),text,metadata) || [];
+ fileTiddlers = $tw.wiki.deserializeTiddlers(fileTooLarge ? ".txt" : path.extname(pathname),text,metadata) || [];
} else {
fileTiddlers = [$tw.utils.extend({text: text},metadata)];
}
var combinedFields = $tw.utils.extend({},fields,metadata);
+ if(fileTooLarge && isTiddlerFile) {
+ delete combinedFields.type; // type altered
+ }
$tw.utils.each(fileTiddlers,function(tiddler) {
$tw.utils.each(combinedFields,function(fieldInfo,name) {
if(typeof fieldInfo === "string" || $tw.utils.isArray(fieldInfo)) {
@@ -2066,6 +2093,7 @@ $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
} else if(tidInfo.suffix) {
tidInfo.fields.text = {suffix: tidInfo.suffix};
}
+ tidInfo.fields = tidInfo.fields || {};
processFile(tidInfo.file,tidInfo.isTiddlerFile,tidInfo.fields);
});
// Process any listed directories
@@ -2087,6 +2115,7 @@ $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
var thisPath = path.relative(filepath, files[t]),
filename = path.basename(thisPath);
if(filename !== "tiddlywiki.files" && !metaRegExp.test(filename) && fileRegExp.test(filename)) {
+ dirSpec.fields = dirSpec.fields || {};
processFile(thisPath,dirSpec.isTiddlerFile,dirSpec.fields,dirSpec.isEditableFile,dirSpec.path);
}
}
@@ -2350,6 +2379,7 @@ $tw.loadTiddlersNode = function() {
});
// Load the core tiddlers
$tw.wiki.addTiddler($tw.loadPluginFolder($tw.boot.corePath));
+ $tw.wiki.addTiddler($tw.loadPluginFolder($tw.boot.coreServerPath));
// Load any extra plugins
$tw.utils.each($tw.boot.extraPlugins,function(name) {
if(name.charAt(0) === "+") { // Relative path to plugin
@@ -2423,6 +2453,7 @@ $tw.boot.initStartup = function(options) {
// System paths and filenames
$tw.boot.bootPath = options.bootPath || path.dirname(module.filename);
$tw.boot.corePath = path.resolve($tw.boot.bootPath,"../core");
+ $tw.boot.coreServerPath = path.resolve($tw.boot.bootPath,"../core-server");
// If there's no arguments then default to `--help`
if($tw.boot.argv.length === 0) {
$tw.boot.argv = ["--help"];
@@ -2547,10 +2578,10 @@ $tw.boot.execStartup = function(options){
if($tw.safeMode) {
$tw.wiki.processSafeMode();
}
- // Register typed modules from the tiddlers we've just loaded
- $tw.wiki.defineTiddlerModules();
- // And any modules within plugins
+ // Register typed modules from the tiddlers we've just loaded and any modules within plugins
+ // Tiddlers should appear last so that they may overwrite shadows during module registration
$tw.wiki.defineShadowModules();
+ $tw.wiki.defineTiddlerModules();
// Make sure the crypto state tiddler is up to date
if($tw.crypto) {
$tw.crypto.updateCryptoStateTiddler();
@@ -2619,11 +2650,13 @@ $tw.boot.executeNextStartupTask = function(callback) {
$tw.boot.log(s.join(" "));
// Execute task
if(!$tw.utils.hop(task,"synchronous") || task.synchronous) {
- task.startup();
- if(task.name) {
- $tw.boot.executedStartupModules[task.name] = true;
+ const thenable = task.startup();
+ if(thenable && typeof thenable.then === "function"){
+ thenable.then(asyncTaskCallback);
+ return true;
+ } else {
+ return asyncTaskCallback();
}
- return $tw.boot.executeNextStartupTask(callback);
} else {
task.startup(asyncTaskCallback);
return true;
diff --git a/community/docs/Community Cards Caveats.tid b/community/docs/Community Cards Caveats.tid
new file mode 100644
index 0000000000..c63a29d63b
--- /dev/null
+++ b/community/docs/Community Cards Caveats.tid
@@ -0,0 +1,5 @@
+title: Community Cards Caveats
+created: 20250909171928024
+modified: 20250909171928024
+
+''Please note that [[Community Cards]] are a new initiative started in September 2025. There is further work required to complete the team and people information.''
diff --git a/community/docs/Community Cards.tid b/community/docs/Community Cards.tid
new file mode 100644
index 0000000000..087eaac651
--- /dev/null
+++ b/community/docs/Community Cards.tid
@@ -0,0 +1,11 @@
+title: Community Cards
+tags: Community
+modified: 20250909171928024
+created: 20250909171928024
+
+The purpose of Community Cards is to allow project plans and other community activities to be linked to the people who are involved in them. They also allow people to share their interests and activities in the TiddlyWiki community, and to help people in the TiddlyWiki community get to know each other better.
+
+{{Community Cards Caveats}}
+
+* [[Submitting a Community Card]]
+* [[Displaying Community Cards]]
diff --git a/community/docs/Displaying Community Cards.tid b/community/docs/Displaying Community Cards.tid
new file mode 100644
index 0000000000..3d371ccd89
--- /dev/null
+++ b/community/docs/Displaying Community Cards.tid
@@ -0,0 +1,26 @@
+title: Displaying Community Cards
+tags: [[Community Cards]]
+modified: 20250909171928024
+created: 20250909171928024
+
+!! Cards for people
+
+This is an inline card for <> and <> which can be used in the middle of a sentence.
+
+This is a stack of inline cards:
+
+<>
+
+Here is a full format card:
+
+<>
+
+This is how the card looks when there is no such person:
+
+<>
+
+!! Cards for teams
+
+This is a card for a project team:
+
+<>
\ No newline at end of file
diff --git a/community/docs/Submitting a Community Card.tid b/community/docs/Submitting a Community Card.tid
new file mode 100644
index 0000000000..195bf289f3
--- /dev/null
+++ b/community/docs/Submitting a Community Card.tid
@@ -0,0 +1,36 @@
+title: Submitting a Community Card
+tags: [[Community Cards]]
+modified: 20250909171928024
+created: 20250909171928024
+
+Anyone associated with the TiddlyWiki community can submit a Community Card. The submission process currently involves making a GitHub pull request but we intend to provide a more user-friendly submission process in the future.
+
+Pull requests to add or update a community card should be made against the `tiddlywiki-com` branch of the [[TiddlyWiki repository|https://github.com/TiddlyWiki/TiddlyWiki5]] in the directory `community/people`.
+
+The card should be a TiddlyWiki tiddler with the following fields:
+
+|!Field |!Required|!Description |
+|`title`|Yes |The username of the person represented by the card, starting with `@` (e.g. `@Jermolene`). This is the title of the card and should be unique |
+|`tags`|Yes |The tags for the card, including `Community/Person` |
+|`fullname`|Yes |The full name of the person or group represented by the card |
+|`avatar`|Yes |The base64 representation of the 32x32 avatar image for the person represented by the card |
+|`first-sighting`|No |The date of the first sighting in the community of the person represented by the card. This should be in ISO 8601 format (YYYY-MM-DD) |
+|`talk.tiddlywiki.org`|Yes |The username of the person or group on the TiddlyWiki Talk forum |
+|`github`|No |The username of the person or group on GitHub |
+|`linkedin`|No |The URL of the LinkedIn profile for the person or group represented by the card |
+|`flickr`|No |The URL of the Flickr profile for the person or group represented by the card |
+|`homepage`|No |The URL of the homepage for the person or group represented by the card |
+|`email`|No |The email address of the person or group represented by the card |
+|`text`|Yes |The text of the card. This should include a brief description of the person or group represented by the card, and any other relevant information |
+
+! Rules for Community Cards
+
+Community cards must observe the following rules. It is intended to enforce them with an automated script, but for the moment they will be manually checked.
+
+* `title` must be unique and start with `@`
+* `tags` must include `Community/Person`
+* `fullname` must be provided
+* `avatar` must be a base64 representation of a 32x32 image, with a limit of 1KB. [[Squoosh|https://squoosh.app/]] is recommended for resizing and compressing images
+* `first-sighting` should be in ISO 8601 format (YYYY-MM-DD)
+* `talk.tiddlywiki.org` must be provided
+* `text` total size must not exceed 2KB
diff --git a/community/people/Arlen22.tid b/community/people/Arlen22.tid
new file mode 100644
index 0000000000..5bc1023121
--- /dev/null
+++ b/community/people/Arlen22.tid
@@ -0,0 +1,10 @@
+title: @Arlen22
+tags: Community/Person
+fullname: Arlen Beiler
+first-sighting: 2011-06-20
+talk.tiddlywiki.org: arlen22
+github: Arlen22
+homepage: arlen22.github.io
+avatar: /9j/4AAQSkZJRgABAQAAAQABAAD/2wEEEAAVABUAFQAVABYAFQAYABoAGgAYACEAIwAfACMAIQAwAC0AKQApAC0AMABJADQAOAA0ADgANABJAG8ARQBRAEUARQBRAEUAbwBiAHcAYQBaAGEAdwBiALEAiwB7AHsAiwCxAMwArACiAKwAzAD4AN0A3QD4ATgBKAE4AZcBlwIkEQAVABUAFQAVABYAFQAYABoAGgAYACEAIwAfACMAIQAwAC0AKQApAC0AMABJADQAOAA0ADgANABJAG8ARQBRAEUARQBRAEUAbwBiAHcAYQBaAGEAdwBiALEAiwB7AHsAiwCxAMwArACiAKwAzAD4AN0A3QD4ATgBKAE4AZcBlwIk/8IAEQgAQABAAwEiAAIRAQMRAf/EADAAAAIDAQEAAAAAAAAAAAAAAAMFAQQGAgABAQEBAQEAAAAAAAAAAAAAAAIDAQAE/9oADAMBAAIQAxAAAADIRMd3XctQlXtCTTmB6RFvANDouy4DYwEEar6YVM7ocz57mcqnZys+V2azZU4XZSoiZqhQt9TKOlnO+GOl1HyoUPXLn//EACYQAAICAQQCAgEFAAAAAAAAAAECABEDBBIhMUFRECITFCMycZH/2gAIAQEAAT8AI4Bv4ryAeBAnANHuNidWogEwYHNRsdfA8iruVMOIu6iYtK4c714vgTDpXyOfrQHdifoArEXxM2mR0NeOhUzI+LJzYbuHszCm5hYseZh0gXYWFIai4cWJgFJuFKYvtr2sJRuB9fUzgDHlGMHia2757uYsYc0TNHpsSmzzMONjl9iu74iK6PbWT7gv/RMiZDk+qcA3NXkAVl3gE+ADU1PDVdiaDCGJZjQEyowKANS1ZMwK+HJ+3a0KUDqYnYINxJ3eItDk81M2cZD+NVIrmanU/wAl2gCZiGNiaFziJ3LYIHcXMrLvDABe17EN1vCgqR2TNPnGTBSBbDTeV3c2amdlxPuD2C3H9epqmV628xqsUYmdiuwkVVTSZ0Q/dxwYdScrgBRsqONi2KQX7mo1G4WCK20B6j6p/VpcfMXPVQ9mbhx9eLgZrFGDUZB1DqMrCma4xN8mDcR5qK5Rgw7Hx//EABwRAQEBAQACAwAAAAAAAAAAAAECABEDIhIxQf/aAAgBAgEBPwDVQYpfzd66qDeOSn7yEmH23ffDAi66mug6DM9N8HTAY3//xAAcEQEBAQEAAgMAAAAAAAAAAAABAAIREBIiQVH/2gAIAQMBAT8AglC+rJbdCT1vVC33l83tj2OPLS+AJ3+Tf//Z
+
+I make random software.
\ No newline at end of file
diff --git a/community/people/EricShulman.tid b/community/people/EricShulman.tid
new file mode 100644
index 0000000000..24201765f6
--- /dev/null
+++ b/community/people/EricShulman.tid
@@ -0,0 +1,29 @@
+title: @ericshulman
+tags: Community/Person Community/Team/Contributors
+fullname: Eric Shulman
+first-sighting: 2005-06-21
+talk.tiddlywiki.org: ericshulman
+github: ericshulman
+homepage: tiddlytools.com
+email: elsdesign@gmail.com
+avatar: iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAQAAADZc7J/AAAD/ElEQVR42o2Tf2iUdRzH37e7rOa222233bab3mqKU9QihCAi+isKwX/sh5UQhGYQhNAvQowRUoghQWDOIJtQmOY0M92ZmVGm0WbTyZI1Nnft99S1jc3dPT9efffg/bHdLn19Hp4HPjzv9/fz+fL5aE58PwUkjzzFVC4P/G/k6E445Pc+uceeaqnv7Ogd6Rq68PPhrc+vkiERWOLT/+Ib8uQHNiXax3BIM0mC+CEtl2G7X9mIeCV+9Ejrr2MAtgkH14SNBRZXrYYPNF86nsXCkx/8dATAsp0JhknQTYJrTHg5SNI0qMekb+aw8Hr74WCKpNNu/0Kck5ymkRMcZz/1Jv5g2CUFbZYelrbMvlBMonHvJK3JuPsdTQxwExc8XG7SxF7OcxGScP6wRGCG/Asjf39VPydTzbQyRBrXBKToBCP/nQQ9VpIDO6SumU3EjUFLzX766HMG0mIvoJnXEbU47GGXc4TGBs3zWp5Jh7F47omdf56hy9lLIz3gyYfZSQMJztFEH3KEDg+bf1dkzkO9Savks7H9NLqnuEw3MEU314nTwABj/MV2R6y8JL+0wKdM8MtX23aFy04dF5mg08QI6XYsemmzRfiMDP5Mg1emK4ienZxi0p0gBfRwhSHAxgXGGeS6tYUdu6TPA3Ofr3Mfj9Bv4zHMDaCTMcBlnG4cJqx64sagN9Ngw3RJoa5R+MftI8k1Wm7NcSsH6KKPFGBbG1n1srQ+06DWpJ59cRhsGKGbo0wBFpDgNGcBcHGsl9BuSZmjfCRHWnv0BtgOcJVWwAZG2cw+3uErAKacZ6hq32PkGWuNSaxsHgIHxqjje5I4/Ms2dCt+BHpcUT4ai0j5sw22TCea2sCBbz3BOjaRFj+JeAE46IoHxlUmlfrmWuZT+8Ae935fjljDe3zpLdEJxGriLHdFtL8mKC2cbbAgIOXVBemwBhHibZq4xN/0YgPrESsRsiMs+C1zEwwFxqBqs4hY2yhlKeIUab5GLEM8SLlVRslu77jZhEwL/ofKKZ4uknxiiLO0cYFGFpJPMTGiRO0iQqtNrX7NxueTcahqv4/FTpgwFYinOcoxtiLKWEwF+U6Mqv5FuVlWSQHzvBWmKmUqIEg1YiMfIu6lhjKCRK0YkXelwoDmIjztWrCot5KQs5R5zKccIVZQwl3cTaVdQVGnfOkrzFbDuvuJWTVuBcXcQ5iFlFFAmBynlBKKH/f6z06pX6r6pJoSQlaeW2gsighi3na1E6HwNSkUUHbS45FXG7ajhIi68+1cO98qtqqJEHzTW6LbEfUstER1ef2llBKhiGqKW7VGUk6lT7dnmS/gnZMf1KPaoI16VWsrA1KhX3dObo5m9VqQpff/AFTcI4hMzFV+AAAAAElFTkSuQmCC
+
+\define wiki(text,topic) [[$text$|https://en.wikipedia.org/wiki/$topic$]]
+
+''Hello! My name is Eric Shulman''. I am the author of ''[[www.TiddlyTools.com|http://www.TiddlyTools.com]] (Small Tools for Big Ideas! ™)'', a popular collection of original plugins, macros, widgets, templates and stylesheets for TiddlyWiki that I have created and shared with the TiddlyWiki community.
+
+<<<
+Think of TiddlyTools as a ''virtual hardware store and "demonstration showroom"'', offering tools, parts and techniques that provide a rich variety of new functionality and feature enhancements to help you ''turn a general-purpose TiddlyWiki "info-house" into a comfortable, custom-built "info-home"''.
+
+The TiddlyWiki core system provides the basic structure and utilities: the foundation, framing, walls, roof, windows/doors, plumbing, heating, and electrical systems. Then, TiddlyTools helps you with all the "finish work": the appliances, fixtures, lighting, cabinets, furniture, paint, wallpaper, carpeting, etc. ''to best suit your specific needs and personal style''.
+<<<
+
+Since the early days of TiddlyWiki (April 2005), I have worked closely with its inventor, [[Jeremy Ruston|https://jermolene.com/]], to help develop and improve TiddlyWiki's core functions. I am also a key contributor and administrator of the online TiddlyWiki [[Discourse|https://talk.TiddlyWiki.org]] and [[GoogleGroups|https://groups.google.com/forum/#!forum/tiddlywiki]] discussion forums, providing ongoing assistance to the worldwide TiddlyWiki community. I have written over 15,000 detailed responses to individual questions posted online. For several years I was also the lead developer and maintainer of the [[TiddlyWiki Classic|https://classic.tiddlywiki.com/]] codebase.
+
+I was born and raised in suburban Long Island, NY, and attended [[Carnegie Mellon University (CMU)|https://www.cmu.edu/]] in Pittsburgh, PA, where I studied ''Computer Science, Cognitive Psychology, Sociology, Human Factors Design, and Artificial Intelligence''. As an undergraduate at CMU, I was privileged to work with some of the major luminaries in early software research and design, including <>, <>, <>, and <>. I was also employed in several Computer Science Department research projects, including the development of speech recognition technologies, graphical interface systems, and interactive applications for instruction in physics, art and music. I received a ''Bachelor of Science in "Interactive Systems Design"'' from CMU in 1985.
+
+During my early post-graduate years, I worked for several notable software development companies, including
+<> and <>. I was an integral member of the <> development team where I helped create the first GUI-based application interfaces for Microsoft Windows and IBM OS/2.
+
+Since 1998, I have been an ''independent design consultant'', living and working in Silicon Valley, where I apply more than 40 years of experience to provide ''analysis, design and software development services'' for commercial companies and not-for-profit organizations, with emphasis on ''information architecture'' and ''interaction/visual design standards'' to improve ease-of-use for new and existing software products and online environments.
diff --git a/community/people/Jermolene.tid b/community/people/Jermolene.tid
new file mode 100644
index 0000000000..b75e410c78
--- /dev/null
+++ b/community/people/Jermolene.tid
@@ -0,0 +1,21 @@
+title: @Jermolene
+tags: Community/Person
+fullname: Jeremy Ruston
+first-sighting: 2004-09-20
+talk.tiddlywiki.org: jeremyruston
+github: Jermolene
+linkedin: www.linkedin.com/in/jermy
+flickr: www.flickr.com/photos/jermy/
+bluesky: https://bsky.app/profile/jermolene.bsky.social
+homepage: jermolene.com
+email: jeremy@jermolene.com
+avatar: /9j/4AAQSkZJRgABAQAAAQABAAD/2wCEAAgICAgJCAkKCgkNDgwODRMREBARExwUFhQWFBwrGx8bGx8bKyYuJSMlLiZENS8vNUROQj5CTl9VVV93cXecnNEBCAgICAkICQoKCQ0ODA4NExEQEBETHBQWFBYUHCsbHxsbHxsrJi4lIyUuJkQ1Ly81RE5CPkJOX1VVX3dxd5yc0f/CABEIACAAIAMBIgACEQEDEQH/xAAtAAEBAAMAAAAAAAAAAAAAAAAHBgIEBQEBAQEBAAAAAAAAAAAAAAAAAgQBBf/aAAwDAQACEAMQAAAANF4uTuPRhD2nBLnUiJvKM0DtMKy//8QAKxAAAgIBAwMDAQkAAAAAAAAAAQIDBBEABRITITEiMkFxFEJRUmFicoGR/9oACAEBAAE/AInTA6gUGP4ZOQbW1bPsmyUq1q+gmvFPUzZPDkPamtwqU75ks04JakroVcg5RwRjg66NUx25KbzqJYyMngfqSuq0M3NZYIebJIvZozIvI/iNPcp/aalSdJXsS4VcKeIzlvU3jVTcYLNiaGISrjkhWQYDfQ63pYAzCDBsOiu7Dsx4EHH6r2w2ttimjd2IsNErhhJHKI04/uzqxuCxpBYVVWKSHqwMyMSQ33SB7dUJFmlkMYRgnqZgCMf7rf8AeEt3A9YOhjXAb2k8u7dtT1RZeOtXmYxiOPj4ZWY/lb51skqUNnNW/wBNzC7IpB6gQeeB/jq/fqGOaLbowuYn5MAQOw8LjW5Vmeo0qIsqYLLKjHIZmwv9fB1//8QAHxEAAQMEAwEAAAAAAAAAAAAAEQABAgMSIWExMkFR/9oACAECAQE/AD9iTy2lJmHUB8BVKM4SNSOj46a29saX/8QAHREAAgICAwEAAAAAAAAAAAAAAQIAAwQRITGBkf/aAAgBAwEBPwDHpFpJZtamVSiBWT2Yt7hmCDsb+TKtsKqpGg3M/9k=
+
+I'm the original inventor of TiddlyWiki. You can hire me through my consultancy company [[Intertwingled Innovations|https://intertwingledinnovations.com]] or contact me directly.
+
+Further information:
+
+* A recording of the [[keynote I gave at QCon London in April 2024|https://www.infoq.com/presentations/bbc-micro/]], and the [[discussion on talk.tiddlywiki.org|https://talk.tiddlywiki.org/t/recording-of-jeremys-keynote-at-qcon-london-april-2024/10505]]. The talk mixes some nostalgia about my teenage activities with the BBC Micro with thoughts on the development of the software industry and insights gained from working with TiddlyWiki
+* An [[interview with me in The Inquirer|https://web.archive.org/web/20111103225832/http://www.theinquirer.net/inquirer/feature/2105529/bt-software-engineer-tells-telco-source]] by Wendy Grossman
+* A [[hilarious interview with me|https://www.youtube.com/watch?v=auyIhw8MTmQ]] from British television in 1983
+* Here's a video of a presentation I did in 2007 called [["How to Start an Open Source Project"|http://vimeo.com/856110]].
diff --git a/community/people/MotovunJack.tid b/community/people/MotovunJack.tid
new file mode 100644
index 0000000000..0d8bee7ae4
--- /dev/null
+++ b/community/people/MotovunJack.tid
@@ -0,0 +1,11 @@
+title: @MotovunJack
+tags: Community/Person Community/Robot
+fullname: Motovun Jack
+first-sighting: 2012-01-12
+github: MotovunJack
+homepage: tiddlywiki.com
+avatar: /9j/4AAQSkZJRgABAQAAAQABAAD/2wEEEAAYABgAGAAYABkAGAAaAB0AHQAaACUAKAAjACgAJQA2ADIALgAuADIANgBSADsAPwA7AD8AOwBSAH0ATgBbAE4ATgBbAE4AfQBuAIYAbQBlAG0AhgBuAMYAnACKAIoAnADGAOUAwQC2AMEA5QEWAPgA+AEWAV4BTAFeAckByQJmEQAYABgAGAAYABkAGAAaAB0AHQAaACUAKAAjACgAJQA2ADIALgAuADIANgBSADsAPwA7AD8AOwBSAH0ATgBbAE4ATgBbAE4AfQBuAIYAbQBlAG0AhgBuAMYAnACKAIoAnADGAOUAwQC2AMEA5QEWAPgA+AEWAV4BTAFeAckByQJm/8IAEQgAQABAAwEiAAIRAQMRAf/EADAAAAIDAQEAAAAAAAAAAAAAAAMEAQIFBgABAQEBAQEAAAAAAAAAAAAAAAIDAQAE/9oADAMBAAIQAxAAAADZCfn5vZJz+rnODGtpbpm6O8xzG9lCiszXtikQhtkTBputBxURJuVVYlEdBaQ284mPDj6GmkNUblMxRmi7dKw//8QAKxAAAgIBAgUCBgMBAAAAAAAAAQIAAxESIQQTIkFRFGEjMUJxgaEyNGLR/9oACAEBAAE/AMmX3ilMkjPaV3ragZDtNRmoxpvA2sEqQcHEwJxlwa98nYbCU8TymDfSTvPVKMbZHkQcTU4yDH46tTiE8RxjLXnQp7Dx5MACgKuyqMAS1xXU7kjYTiEbWp3y0IucYbGx6e05hDAqMH/k59o3DfxAE5hss1MNzODdVraxu50ieppH1Tivi8O6eYQ1j4B6guAftChDMNjBqycHcCYJqdj2s3idRBHfpi/1Kie7PDo95w/EMxYM22n9yy5AzBc/iLe7dIqx7kyy2ypyOWoYTofhCyDAZtx4MOmpK9sncyx1NdSq2kBBt3EKf6mgIzDUPIiByuqk7faMLbOyEjuuxEAyo56AgeTA3KL1AYRm1CcvmkgAs2wHjEvPxGIMJPmHUQCQNothr32A0ggeYluplcAK2PlLbTytZUkdwI7V3lAQMgbAfP8AMoCV1AKMOR+pdsc5yD595mMmNIGD4h0vsfupHyBlTKW9znMd+TQnljPWqHYIqhwD1zKsqtjBzCAVAyBicnqG6jbOe0//xAAbEQEBAAMBAQEAAAAAAAAAAAABAAIRIRASQf/aAAgBAgEBPwBYbZDuXvnLE5OrkWJzxI4g33ift//EABsRAAMBAQADAAAAAAAAAAAAAAABEQIhEBJB/9oACAEDAQE/AMqjzHwjGoZXPHTb6Zp1/TRp1khYjW01xHqz/9k=
+
+Motovun Jack is a robot that helps maintain the TiddlyWiki project infrastructure. It is not a person, but rather a set of automated scripts and tools that assist in managing the various services and resources used by the TiddlyWiki community.
+
+The origin of the name "Motovun Jack" is a lovable and playful kitten encountered by [[@Jermolene]] in the beautiful medieval hill town of Motovun in Croatia. Jack was [[first adopted|https://github.com/TiddlyWiki/TiddlyWiki5/commit/ecfbaaa5641f14e1766ef17ef6416bf9aa992863]] as the TiddlyWiki 5 mascot in 2012.
diff --git a/community/project/TiddlyWiki People.tid b/community/project/TiddlyWiki People.tid
new file mode 100644
index 0000000000..64ac944d81
--- /dev/null
+++ b/community/project/TiddlyWiki People.tid
@@ -0,0 +1,10 @@
+title: TiddlyWiki People
+modified: 20250909171928024
+created: 20250909171928024
+tags: Community About
+
+Members of the TiddlyWiki community who are involved in the development of TiddlyWiki and the running of the project are invited to [[create a Community Card|Submitting a Community Card]] so that they can be included in project plans and organisation charts. Community Cards can also showcase their interests and activities in the TiddlyWiki community.
+
+{{Community Cards Caveats}}
+
+<>
\ No newline at end of file
diff --git a/community/project/TiddlyWiki Project.tid b/community/project/TiddlyWiki Project.tid
new file mode 100644
index 0000000000..b0d62cf1ff
--- /dev/null
+++ b/community/project/TiddlyWiki Project.tid
@@ -0,0 +1,10 @@
+title: TiddlyWiki Project
+modified: 20250909171928024
+created: 20250909171928024
+tags: Community About
+
+The TiddlyWiki Project is the coordinated, ongoing effort to maintain and improve TiddlyWiki, and to support the TiddlyWiki community.
+
+{{Community Cards Caveats}}
+
+<$list filter="[tag[Community/Team]]" template="$:/tiddlywiki/community/cards/ViewTemplateBodyTemplateTeam"/>
\ No newline at end of file
diff --git a/community/project/Vacant Positions.tid b/community/project/Vacant Positions.tid
new file mode 100644
index 0000000000..8408c793bf
--- /dev/null
+++ b/community/project/Vacant Positions.tid
@@ -0,0 +1,4 @@
+title: Vacant Positions
+tags: [[TiddlyWiki Project]]
+
+If you are interested in volunteering to help the project please get in touch with <>.
\ No newline at end of file
diff --git a/community/project/teams/Core Team.tid b/community/project/teams/Core Team.tid
new file mode 100644
index 0000000000..932477fc0f
--- /dev/null
+++ b/community/project/teams/Core Team.tid
@@ -0,0 +1,8 @@
+title: Core Team
+tags: Community/Team
+modified: 20250909171928024
+created: 20250909171928024
+leader: @Jermolene
+team: @saqimtiaz
+
+The core team is responsible for the maintenance and development of the TiddlyWiki core and official plugins.
diff --git a/community/project/teams/Infrastructure Team.tid b/community/project/teams/Infrastructure Team.tid
new file mode 100644
index 0000000000..e531aa4210
--- /dev/null
+++ b/community/project/teams/Infrastructure Team.tid
@@ -0,0 +1,14 @@
+title: Infrastructure Team
+tags: Community/Team
+modified: 20250909171928024
+created: 20250909171928024
+team: @MotovunJack
+
+The Infrastructure Team is responsible for maintaining and improving the infrastructure that supports the TiddlyWiki project. This includes the hosting, deployment, and management of the TiddlyWiki websites and services, as well as the tools and systems used by the TiddlyWiki community.
+
+The infrastructure includes:
+
+* talk.tiddlywiki.org
+* github.com/TiddlyWiki
+* tiddlywiki.com DNS
+* Netlify account for PR previews
diff --git a/community/project/teams/MultiWikiServer Team.tid b/community/project/teams/MultiWikiServer Team.tid
new file mode 100644
index 0000000000..922cf7582b
--- /dev/null
+++ b/community/project/teams/MultiWikiServer Team.tid
@@ -0,0 +1,8 @@
+title: MultiWikiServer Team
+tags: Community/Team
+modified: 20250909171928024
+created: 20250909171928024
+leader: @Arlen22
+team:
+
+The MultiWikiServer development repository is at https://github.com/TiddlyWiki/MultiWikiServer
diff --git a/community/project/teams/Newsletter Team.tid b/community/project/teams/Newsletter Team.tid
new file mode 100644
index 0000000000..2c20fd219b
--- /dev/null
+++ b/community/project/teams/Newsletter Team.tid
@@ -0,0 +1,6 @@
+title: Newsletter Team
+tags: Community/Team
+modified: 20250909171928024
+created: 20250909171928024
+
+The Newsletter Team is responsible for producing the TiddlyWiki Newsletter, a monthly email newsletter that highlights news, updates, and community contributions related to TiddlyWiki.
\ No newline at end of file
diff --git a/community/project/teams/Project Team.tid b/community/project/teams/Project Team.tid
new file mode 100644
index 0000000000..5cd92cc3b3
--- /dev/null
+++ b/community/project/teams/Project Team.tid
@@ -0,0 +1,15 @@
+title: Project Team
+tags: Community/Team
+modified: 20250909171928024
+created: 20250909171928024
+icon: $:/tiddlywiki/community/icons/project-team
+leader: @Jermolene
+team: @saqimtiaz @ericshulman
+
+The project team is responsible for the overall TiddlyWiki project, its vision, mission and values, and ensuring that it meets the needs of the community.
+
+Areas of responsibility include:
+
+* Communicating and demonstrating the vision, mission and values of the project
+* Continuously improve the development process and practices of the project
+* more to come...
diff --git a/community/project/teams/Succession Team.tid b/community/project/teams/Succession Team.tid
new file mode 100644
index 0000000000..e57a7affd5
--- /dev/null
+++ b/community/project/teams/Succession Team.tid
@@ -0,0 +1,13 @@
+title: Succession Team
+tags: Community/Team
+modified: 20250909171928024
+created: 20250909171928024
+leader: @Jermolene
+team: @saqimtiaz @ericshulman
+
+The Succession Team is responsible for ensuring that personnel changes do not impact access to the external infrastructure used by the project.
+
+* Work with the other teams to ensure that the project has a succession plan for key personnel
+* Work with the other teams to ensure that they are using the appropriate, community-owned infrastructure
+* Ensure that the members of the succession team share ownership of the key project resources (eg passwords and user accounts). The Succession Team is not expected to use their access rights apart from managing access in the event of personnel changes
+
diff --git a/community/project/teams/tagCommunityTeam.tid b/community/project/teams/tagCommunityTeam.tid
new file mode 100644
index 0000000000..9ae81d76fb
--- /dev/null
+++ b/community/project/teams/tagCommunityTeam.tid
@@ -0,0 +1,5 @@
+title: Community/Team
+modified: 20250909171928024
+created: 20250909171928024
+list: [[Project Team]] [[Core Team]] [[Documentation Team]] [[MultiWikiServer Team]] [[Newsletter Team]] [[Infrastructure Team]] [[Succession Team]]
+
diff --git a/community/readme.md b/community/readme.md
new file mode 100644
index 0000000000..09cd58c5b2
--- /dev/null
+++ b/community/readme.md
@@ -0,0 +1,3 @@
+# Community Records and Resources
+
+These raw tiddlers comprise the community records and resources for the TiddlyWiki project. They are packaged as a root directory outside of the usual "editions" folder so that they can be shared with other wikis.
diff --git a/community/tools/cards/DefaultColourMappings.multids b/community/tools/cards/DefaultColourMappings.multids
new file mode 100644
index 0000000000..6cab7fdc88
--- /dev/null
+++ b/community/tools/cards/DefaultColourMappings.multids
@@ -0,0 +1,15 @@
+title: $:/config/DefaultColourMappings/
+
+community-card-background: #ffffee
+community-card-foreground: #441111
+community-card-dark-shadow: rgba(188, 189, 189, 0.5)
+community-card-shadow: rgba(212, 212, 213, 0.5)
+community-card-header-background: #9e3060
+community-card-header-foreground: #ddddee
+community-card-team-header-background: #306090
+community-card-team-header-foreground: #ddeedd
+community-card-vacancy-header-background: #609030
+community-card-vacancy-header-foreground: #eedddd
+community-card-info-background: #f3f38b
+community-card-info-foreground: #444411
+community-card-field-name-foreground: #888844
diff --git a/community/tools/cards/Procedures.tid b/community/tools/cards/Procedures.tid
new file mode 100644
index 0000000000..9d3879012e
--- /dev/null
+++ b/community/tools/cards/Procedures.tid
@@ -0,0 +1,168 @@
+title: $:/tiddlywiki/community/cards/Procedures
+tags: $:/tags/Global
+
+\procedure community-card-display-jpeg-field(fieldName,mode:"block",default)
+<$genesis $type={{{ [match[block]then[div]else[span]] }}} class={{{ tc-community-card-field-image [[tc-community-card-field-image-]addsuffix] +[join[ ]] }}}>
+ <%if [has] %>
+ 
getaddprefix[data:image/jpeg;base64,]] }}} width="32"/>
+ <%else%>
+ <$transclude $tiddler=<> $mode=<>/>
+ <%endif%>
+
+\end community-card-display-jpeg-field
+
+\procedure community-card-display-transclusion(fieldName,mode:"inline",default)
+<$genesis $type={{{ [match[block]then[div]else[span]] }}} class={{{ tc-community-card-field-image [[tc-community-card-field-image-]addsuffix] +[join[ ]] }}}>
+ <%if [has] %>
+ <$transclude $tiddler={{{ [get] }}} $mode=<>/>
+ <%else%>
+ <$transclude $tiddler=<> $mode=<>/>
+ <%endif%>
+
+\end community-card-display-transclusion
+
+\procedure community-card-display-text-field(fieldName,showLabel:"yes",linkPrefix,displayPrefix,mode:"block")
+<%if [has] :or[match[title]] %>
+ <$genesis $type={{{ [match[block]then[div]else[span]] }}} class={{{ tc-community-card-field-text [[tc-community-card-field-text-]addsuffix] +[join[ ]] }}}>
+ <%if [match[yes]] %>
+
+ <%endif%>
+ <%if [!match[]] %>
+ getaddprefix] }}}
+ class="tc-community-card-field-text-value"
+ rel="noopener noreferrer"
+ target="_blank"
+ >
+ <$text text={{{ [get] :else[match[title]then] +[addprefix] }}}/>
+
+ <%else%>
+
+ <%endif%>
+
+<%endif%>
+\end community-card-display-text-field
+
+\procedure community-card-person(title)
+ <$let currentTiddler=<>>
+ <div class="tc-community-card">
+ <$link to=<<currentTiddler>> class="tc-community-card-header-link">
+ <div class="tc-community-card-header">
+ <<community-card-display-jpeg-field "avatar" default:"$:/tiddlywiki/community/icons/person">>
+ <<community-card-display-text-field "title" showLabel:"no">>
+ </div>
+ </$link>
+ <div class="tc-community-card-info">
+ <<community-card-display-text-field "fullname">>
+ <<community-card-display-text-field "first-sighting">>
+ <<community-card-display-text-field "talk.tiddlywiki.org" linkPrefix:"https://talk.tiddlywiki.org/u/" displayPrefix:"@">>
+ <<community-card-display-text-field "github" linkPrefix:"https://github.com/" displayPrefix:"@">>
+ <<community-card-display-text-field "linkedin" linkPrefix:"https://">>
+ <<community-card-display-text-field "flickr" linkPrefix:"https://">>
+ <<community-card-display-text-field "homepage" linkPrefix:"https://">>
+ <<community-card-display-text-field "email" linkPrefix:"mailto:">>
+ <%if [all[tiddlers+shadows]tag[Community/Team]sort[title]] :filter[{!!leader}match<..currentTiddler>] +[count[]compare:number:gt[0]] %>
+ <div class="tc-community-card-field-text">
+ <span class="tc-community-card-field-text-name">leader</span>
+ <span class="tc-community-card-field-text-value">
+ <$list filter="[all[tiddlers+shadows]tag[Community/Team]sort[title]] :filter[{!!leader}match<..currentTiddler>]">
+ <$transclude $variable="community-card-pill-team" title=<<currentTiddler>>/>
+ </$list>
+ </span>
+ </div>
+ <%endif%>
+ <%if [all[tiddlers+shadows]tag[Community/Team]sort[title]] :filter[enlist{!!team}match<..currentTiddler>] +[count[]compare:number:gt[0]] %>
+ <div class="tc-community-card-field-text">
+ <span class="tc-community-card-field-text-name">member</span>
+ <span class="tc-community-card-field-text-value">
+ <$list filter="[all[tiddlers+shadows]tag[Community/Team]sort[title]] :filter[enlist{!!team}match<..currentTiddler>]">
+ <$transclude $variable="community-card-pill-team" title=<<currentTiddler>>/>
+ </$list>
+ </span>
+ </div>
+ <%endif%>
+ </div>
+ <div class="tc-community-card-body">
+ <$transclude $tiddler=<<currentTiddler>> $field="text" $mode="block"/>
+ </div>
+ </div>
+ </$let>
+\end community-card-person
+
+\procedure community-card-team(title)
+ <$let currentTiddler=<<title>>>
+ <div class="tc-community-card tc-community-card-team">
+ <$link to=<<currentTiddler>> class="tc-community-card-header-link">
+ <div class="tc-community-card-header">
+ <<community-card-display-transclusion fieldName:"icon" default:"$:/tiddlywiki/community/icons/team">>
+ <<community-card-display-text-field "title" showLabel:"no">>
+ </div>
+ </$link>
+ <div class="tc-community-card-info">
+ <div class="tc-community-card-field-text">
+ <span class="tc-community-card-field-text-name">leader</span>
+ <span class="tc-community-card-field-text-value">
+ <%if [<currentTiddler>has[leader]] %>
+ <$transclude $variable="community-card-pill-person" title={{!!leader}}/>
+ <%else%>
+ <$transclude $variable="community-card-vacancy"/>
+ <%endif%>
+ </span>
+ </div>
+ <div class="tc-community-card-field-text">
+ <span class="tc-community-card-field-text-name">team</span>
+ <span class="tc-community-card-field-text-value"><$transclude $variable="community-card-pill-stack-person" personFilter={{!!team}}/></span>
+ </div>
+ </div>
+ <div class="tc-community-card-body">
+ <$transclude $tiddler=<<currentTiddler>> $field="text" $mode="block"/>
+ </div>
+ </div>
+ </$let>
+\end community-card-team
+
+\procedure community-card-pill-person(title)
+ <$let currentTiddler=<<title>>>
+ <$link to=<<currentTiddler>> class="tc-community-card-pill">
+ <<community-card-display-jpeg-field "avatar" default:"$:/tiddlywiki/community/icons/person" mode="inline">>
+ <<community-card-display-text-field "title" showLabel:"no" mode:"inline">>
+ </$link>
+ </$let>
+\end community-card-pill-person
+
+\procedure community-card-pill-stack-person(personFilter:"[tag[Community/Person]]")
+ <div class="tc-community-card-pill-stack">
+ <$list filter=<<personFilter>>>
+ <$list-template>
+ <$transclude $variable="community-card-pill-person" title=<<currentTiddler>> mode="block"/>
+ </$list-template>
+ <$list-empty>
+ <$transclude $variable="community-card-vacancy"/>
+ </$list-empty>
+ </$list>
+ </div>
+\end community-card-pill-stack-person
+
+\procedure community-card-pill-team(title)
+ <$let currentTiddler=<<title>>>
+ <$link to=<<currentTiddler>> class="tc-community-card-pill">
+ <<community-card-display-transclusion fieldName:"icon" default:"$:/tiddlywiki/community/icons/team">>
+ <<community-card-display-text-field "title" showLabel:"no" mode:"inline">>
+ </$link>
+ </$let>
+\end community-card-pill-team
+
+\procedure community-card-vacancy()
+ <$link to="Vacant Positions" class="tc-community-card-pill tc-community-card-pill-vacancy">
+ <span class="tc-community-card-field-image tc-community-card-field-image-avatar">
+ {{$:/core/images/help}}
+ </span>
+ <span class="tc-community-card-field-text tc-community-card-field-text-title">
+ <span class="tc-community-card-field-text-value">
+ Vacant
+ </span>
+ </span>
+ </$link>
+\end community-card-vacancy
diff --git a/community/tools/cards/Styles.tid b/community/tools/cards/Styles.tid
new file mode 100644
index 0000000000..48322922c8
--- /dev/null
+++ b/community/tools/cards/Styles.tid
@@ -0,0 +1,158 @@
+title: $:/tiddlywiki/community/cards/Styles
+tags: $:/tags/Stylesheet
+
+.tc-community-card {
+ display: flex;
+ flex-direction: column;
+ flex-wrap: wrap;
+ justify-content: center;
+ border-radius: 8px;
+ width: 100%;
+ margin-bottom: 8px;
+ background: <<colour community-card-background>>;
+ color: <<colour community-card-foreground>>;
+ fill: <<colour community-card-foreground>>;
+ box-shadow: 0 1px 3px 0 <<colour community-card-shadow>>, 0 0 0 1px <<colour community-card-shadow>>;
+ transition: box-shadow 0.3s ease,transform .3s ease;
+}
+
+.tc-community-card:hover {
+ box-shadow: 0 1px 6px 0 <<colour community-card-dark-shadow>>, 0 0 0 1px <<colour community-card-shadow>>;
+ transform: translateY(-2px);
+}
+
+.tc-community-card .tc-community-card-header-link {
+ background-color: <<colour community-card-header-background>>;
+ color: <<colour community-card-header-foreground>>;
+ border-top-left-radius: 8px;
+ border-top-right-radius: 8px;
+}
+
+.tc-community-card.tc-community-card-team .tc-community-card-header-link {
+ background: <<colour community-card-team-header-background>>;
+ color: <<colour community-card-team-header-foreground>>;
+ fill: <<colour community-card-team-header-foreground>>;
+}
+
+.tc-community-card .tc-community-card-header-link:hover {
+ text-decoration: none;
+ background-color: <<colour community-card-header-foreground>>;
+ color: <<colour community-card-header-background>>;
+}
+
+.tc-community-card-header {
+ margin: 0;
+ padding: 0.5em;
+ display: flex;
+ flex-direction: row;
+ flex-wrap: nowrap;
+ justify-content: flex-start;
+ align-items: center;
+ line-height: 0;
+}
+
+.tc-community-card-header .tc-community-card-field-text-title {
+ font-size: 1.5em;
+ font-weight: bold;
+}
+
+.tc-community-card-header .tc-community-card-field-image {
+ display: table-row;
+ width: auto;
+ max-width: 100%;
+ margin-right: 12px;
+}
+
+.tc-community-card-info {
+ display: table;
+ width: auto;
+ max-width: 100%;
+ padding: 8px;
+ margin: 0;
+ background-color: <<colour community-card-info-background>>;
+ color: <<colour community-card-info-foreground>>;
+}
+
+.tc-community-card-body {
+ padding: 0 8px;
+}
+
+.tc-community-card .tc-community-card-field-text {
+ display: table-row;
+}
+
+.tc-community-card .tc-community-card-field-text-name,
+.tc-community-card .tc-community-card-field-text-value {
+ display: table-cell;
+ padding: 2px 6px 2px 0;
+ vertical-align: top;
+}
+
+.tc-community-card .tc-community-card-field-text-name {
+ color: <<colour community-card-field-name-foreground>>;
+ white-space: nowrap;
+ text-align: right;
+ padding-right: 8px;
+}
+
+.tc-community-card .tc-community-card-field-text-value {
+ word-break: break-word;
+ font-weight: bold;
+ width: 100%;
+}
+
+a.tc-community-card-pill {
+ display: inline-flex;
+ align-items: center;
+ gap: 4px;
+ width: auto;
+ min-width:0;
+ max-width: none;
+ align-self: auto;
+ font-size: 0.9em;
+ line-height: 1;
+ vertical-align: middle;
+ padding: 4px;
+ border-radius: 4px;
+ background: <<colour community-card-header-background>>;
+ color: <<colour community-card-header-foreground>>;
+ fill: <<colour community-card-header-foreground>>;
+ box-shadow: 0 1px 3px 0 <<colour community-card-shadow>>, 0 0 0 1px <<colour community-card-shadow>>;
+ transition: box-shadow 0.3s ease,transform .3s ease;
+}
+
+a.tc-community-card-pill.tc-community-card-pill-vacancy {
+ background: <<colour community-card-vacancy-header-background>>;
+ color: <<colour community-card-vacancy-header-foreground>>;
+ fill: <<colour community-card-vacancy-header-foreground>>;
+}
+
+a.tc-community-card-pill:hover {
+ text-decoration: none;
+ box-shadow: 0 1px 6px 0 <<colour community-card-dark-shadow>>, 0 0 0 1px <<colour community-card-shadow>>;
+ transform: translateY(-2px);
+ background: <<colour community-card-header-foreground>>;
+ color: <<colour community-card-header-background>>;
+ fill: <<colour community-card-header-background>>;
+}
+
+a.tc-community-card-pill .tc-community-card-field-image img,
+a.tc-community-card-pill .tc-community-card-field-image svg {
+ width: 16px;
+ height: 16px;
+ vertical-align: middle;
+ display: inline-block;
+}
+
+a.tc-community-card-pill .tc-community-card-field-text {
+ display: inline;
+}
+
+.tc-community-card-pill-stack {
+ display: inline-flex;
+ flex-direction: column;
+ align-items: stretch;
+ gap: 4px;
+ margin: 0;
+ padding: 0;
+}
\ No newline at end of file
diff --git a/community/tools/cards/ViewTemplateBodyCascade.tid b/community/tools/cards/ViewTemplateBodyCascade.tid
new file mode 100644
index 0000000000..db1338f2c1
--- /dev/null
+++ b/community/tools/cards/ViewTemplateBodyCascade.tid
@@ -0,0 +1,6 @@
+title: $:/tiddlywiki/community/cards/ViewTemplateBodyCascade
+tags: $:/tags/ViewTemplateBodyFilter
+list-before:
+
+[tag[Community/Person]then[$:/tiddlywiki/community/cards/ViewTemplateBodyTemplatePerson]]
+[tag[Community/Team]then[$:/tiddlywiki/community/cards/ViewTemplateBodyTemplateTeam]]
\ No newline at end of file
diff --git a/community/tools/cards/ViewTemplateBodyTemplatePerson.tid b/community/tools/cards/ViewTemplateBodyTemplatePerson.tid
new file mode 100644
index 0000000000..926393cddb
--- /dev/null
+++ b/community/tools/cards/ViewTemplateBodyTemplatePerson.tid
@@ -0,0 +1,3 @@
+title: $:/tiddlywiki/community/cards/ViewTemplateBodyTemplatePerson
+
+<$transclude $variable="community-card-person" title=<<currentTiddler>>/>
\ No newline at end of file
diff --git a/community/tools/cards/ViewTemplateBodyTemplateTeam.tid b/community/tools/cards/ViewTemplateBodyTemplateTeam.tid
new file mode 100644
index 0000000000..600c045185
--- /dev/null
+++ b/community/tools/cards/ViewTemplateBodyTemplateTeam.tid
@@ -0,0 +1,3 @@
+title: $:/tiddlywiki/community/cards/ViewTemplateBodyTemplateTeam
+
+<$transclude $variable="community-card-team" title=<<currentTiddler>>/>
diff --git a/community/tools/icons/person.tid b/community/tools/icons/person.tid
new file mode 100644
index 0000000000..373fb50ff4
--- /dev/null
+++ b/community/tools/icons/person.tid
@@ -0,0 +1,7 @@
+title: $:/tiddlywiki/community/icons/person
+tags: $:/tags/Image
+
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> viewBox="0 0 64 64">
+ <path d="M43.127,29.612c-0.879,-0.378 -1.452,-1.25 -1.452,-2.207c-0.006,-0.678 0.27,-1.33 0.761,-1.797c0.147,-0.141 0.29,-0.28 0.397,-0.393c0.753,-0.791 1.416,-1.663 1.978,-2.6c1.392,-2.318 2.126,-4.974 2.126,-7.677c0,-8.196 -6.744,-14.938 -14.938,-14.938c-0.945,0 -1.886,0.088 -2.813,0.266c-5.891,1.031 -10.578,5.586 -11.781,11.446c-1.105,5.016 0.454,10.264 4.118,13.865c0.495,0.469 0.78,1.118 0.792,1.799l0,0.012c0.008,0.966 -0.567,1.848 -1.453,2.23c-5.949,2.466 -10.698,7.172 -13.217,13.099c-1.772,4.059 -2.66,8.45 -2.607,12.88l0,3.192c0,2.858 2.351,5.211 5.212,5.211l43.5,0c2.859,0 5.212,-2.353 5.212,-5.211l-0,-3.225c0.053,-4.427 -0.837,-8.816 -2.611,-12.873c-2.523,-5.922 -7.274,-10.621 -13.224,-13.079Z" style="fill-rule:nonzero;"/>
+</svg>
\ No newline at end of file
diff --git a/community/tools/icons/project-team.tid b/community/tools/icons/project-team.tid
new file mode 100644
index 0000000000..9d4a1e8f5f
--- /dev/null
+++ b/community/tools/icons/project-team.tid
@@ -0,0 +1,7 @@
+title: $:/tiddlywiki/community/icons/project-team
+tags: $:/tags/Image
+
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> viewBox="0 0 64 64">
+ <path d="M24.891,49.399l-3.521,0c-1.398,0 -2.547,-1.15 -2.547,-2.547l0,-1.56c-0.026,-2.165 0.408,-4.311 1.274,-6.295c1.231,-2.897 3.552,-5.197 6.46,-6.402c0.433,-0.187 0.714,-0.618 0.71,-1.09l0,-0.006c-0.006,-0.333 -0.145,-0.65 -0.387,-0.879c-1.791,-1.76 -2.553,-4.325 -2.013,-6.777c0.588,-2.864 2.879,-5.09 5.758,-5.594c0.453,-0.087 0.913,-0.13 1.375,-0.13c4.005,0 7.301,3.295 7.301,7.301c0,1.321 -0.359,2.619 -1.039,3.752c-0.275,0.458 -0.599,0.884 -0.967,1.271c-0.052,0.055 -0.122,0.123 -0.194,0.192c-0.24,0.228 -0.375,0.547 -0.372,0.878c0,0.468 0.28,0.894 0.71,1.079c2.908,1.201 5.23,3.498 6.463,6.392c0.815,1.865 1.248,3.872 1.276,5.904c-0.179,0.006 -0.351,0.007 -0.514,0.003c-0.556,-0.016 -1.375,-0.294 -2.288,-0.512c-1.295,-0.308 -2.719,-0.543 -4.01,-0.396l-0.013,0.001c-1.056,0.128 -2.116,0.325 -3.097,0.76c-0.385,0.171 -1.216,0.753 -1.446,0.916c-1.157,0.297 -2.564,0.475 -3.797,0.312c-0.713,-0.094 -1.402,-0.225 -1.703,-0.778c-0.207,-0.382 -0.181,-0.896 -0.031,-1.565c0.068,-0.3 0.11,-0.593 0.118,-0.842l-0.106,-0.887l-0.212,-0.491l-0.258,-0.36l-0.669,-0.514l-0.832,-0.231l-0.491,0.017l-0.459,0.12l-0.417,0.211l-0.415,0.342l-0.546,0.802l-0.033,0.067c-1.174,2.499 -0.945,4.643 0.013,6.317c0.251,0.437 0.56,0.845 0.919,1.219Zm22.984,-4.722c-0.052,-2.344 -0.566,-4.656 -1.514,-6.805c-1.232,-2.86 -3.339,-5.257 -6.018,-6.845c0.955,-0.816 2.033,-1.473 3.195,-1.949c0.434,-0.187 0.715,-0.618 0.71,-1.09l-0,-0.006c-0.005,-0.333 -0.144,-0.651 -0.386,-0.88c-1.791,-1.76 -2.553,-4.324 -2.013,-6.776c0.587,-2.864 2.878,-5.09 5.758,-5.594c0.453,-0.087 0.913,-0.131 1.375,-0.131c4.005,0 7.3,3.296 7.3,7.301c-0,1.322 -0.359,2.619 -1.038,3.753c-0.276,0.457 -0.6,0.883 -0.968,1.27c-0.052,0.055 -0.121,0.123 -0.194,0.192c-0.24,0.229 -0.375,0.547 -0.372,0.878c-0,0.468 0.28,0.894 0.71,1.079c2.908,1.201 5.229,3.498 6.462,6.392c0.756,1.728 1.184,3.578 1.264,5.458c-0.577,-0.341 -1.293,-0.373 -1.904,-0.07c-0.961,0.475 -1.861,1.117 -2.911,1.371c-0.49,-0.133 -0.983,-0.245 -1.485,-0.308c-0.253,-0.326 -0.536,-0.66 -0.84,-0.911l-0.813,-0.51l-0.752,-0.225c-0.327,-0.051 -0.662,-0.021 -0.974,0.089l-0.67,0.321l-0.569,0.448c-0.403,0.393 -0.733,0.911 -0.979,1.569c-0.202,0.54 -0.344,1.222 -0.492,2.014c-0.244,-0.027 -0.49,-0.047 -0.737,-0.058c-0.333,-0.02 -0.725,-0.006 -1.145,0.023Zm-24.215,-13.651c-2.683,1.591 -4.793,3.994 -6.024,6.861c-1.026,2.332 -1.542,4.857 -1.513,7.405l0,0.59l-11.735,0c-1.397,0 -2.547,-1.15 -2.547,-2.547l0,-1.561c-0.026,-2.165 0.409,-4.31 1.274,-6.295c1.231,-2.897 3.553,-5.197 6.46,-6.401c0.434,-0.187 0.715,-0.618 0.71,-1.09l0,-0.006c-0.005,-0.333 -0.144,-0.651 -0.386,-0.88c-1.791,-1.76 -2.553,-4.324 -2.013,-6.776c0.588,-2.864 2.879,-5.09 5.758,-5.594c0.453,-0.087 0.914,-0.131 1.375,-0.131c4.005,0 7.301,3.296 7.301,7.301c0,1.322 -0.359,2.619 -1.039,3.753c-0.275,0.457 -0.6,0.883 -0.967,1.27c-0.052,0.055 -0.122,0.123 -0.194,0.192c-0.24,0.228 -0.375,0.547 -0.372,0.878c0,0.468 0.28,0.894 0.71,1.079c1.164,0.476 2.246,1.135 3.202,1.952Zm29.027,33.111c-1.417,-0.04 -2.04,-0.037 -2.761,-1.223l-0.563,0.016c-0.654,-0.029 -0.381,-0.016 -0.818,-0.038c-0.73,-0.028 -0.613,-0.722 -0.742,-1.089c-0.205,-1.244 0.272,-2.494 0.257,-3.739c-0.005,-0.442 -0.63,-2.005 -0.854,-2.564c-0.7,0.131 -1.404,0.157 -2.114,0.192c-1.637,-0.004 -3.263,-0.205 -4.878,-0.459c-0.314,1.299 -1.249,3.118 -0.476,4.439c0.938,1.366 1.596,1.745 2.617,1.827c1.02,0.082 1.251,1.234 1.004,1.646c-0.219,0.284 -0.603,0.336 -0.929,0.405l-0.653,0.03c-0.513,-0.017 -0.973,-0.155 -1.43,-0.369c-0.765,-0.427 -1.554,-1.314 -2.141,-1.951c0.137,0.254 0.218,0.751 0.095,0.982c-0.347,0.491 -1.847,0.488 -2.534,0.183c-0.78,-0.347 -2.665,-2.781 -2.957,-4.604c0.776,-1.467 1.905,-2.744 2.477,-4.341c-1.246,-0.795 -1.913,-2.089 -1.827,-3.555l0.032,-0.17c-1.226,0.23 -0.59,0.144 -1.909,0.244c-4.2,-0.013 -7.893,-2.86 -5.813,-7.286c0.135,-0.262 0.263,-0.5 0.493,-0.386c0.184,0.091 0.157,0.457 0.065,0.863c-1.189,5.288 4.621,5.329 8.192,4.35c0.355,-0.097 1.06,-0.751 1.548,-0.968c0.798,-0.354 1.665,-0.498 2.524,-0.602c2.139,-0.244 4.709,0.883 6.015,0.92c1.306,0.037 3.164,-0.313 4.305,-0.239c0.827,0.037 1.64,0.187 2.438,0.4c0.517,-2.519 0.554,-4.374 1.779,-4.804c0.719,0.113 1.273,1.093 1.683,1.617l0.002,-0c0.835,-0.033 1.63,0.178 2.42,0.414c1.431,-0.203 2.631,-1.007 3.895,-1.632c-0.004,0.02 -0.025,0.027 -0.037,0.04c-1.244,1.005 -1.417,2.706 -1.271,4.278c0.054,0.816 -0.176,1.702 -0.461,2.538c-0.534,1.361 -1.564,2.796 -2.759,2.722c-0.452,-0.014 -0.715,-0.27 -1.051,-0.543c-0.065,0.553 -0.321,1.047 -0.568,1.536c-0.57,1.086 -2.06,1.564 -3.44,2.723c-1.379,1.159 0.442,5.297 0.883,6.052c0.442,0.754 1.674,1.03 1.196,1.71c-0.147,0.225 -0.37,0.305 -0.609,0.393l-0.325,0.042Zm-15.735,-3.096l0.206,0.06c0.258,-0.115 0.778,0.064 1.054,0.151c-0.508,-0.563 -1.273,-1.389 -1.824,-1.91c-0.181,-0.631 -0.103,-1.266 -0.065,-1.91l0.008,-0.053c-0.217,0.515 -0.493,1.016 -0.641,1.559c-0.173,0.732 0.771,1.522 1.137,1.975l0.125,0.128Z"/>
+</svg>
diff --git a/community/tools/icons/team.tid b/community/tools/icons/team.tid
new file mode 100644
index 0000000000..ed98568b7b
--- /dev/null
+++ b/community/tools/icons/team.tid
@@ -0,0 +1,9 @@
+title: $:/tiddlywiki/community/icons/team
+tags: $:/tags/Image
+
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> viewBox="0 0 64 64">
+ <path d="M37.439,32.592c-0.43,-0.185 -0.71,-0.611 -0.71,-1.079c-0.003,-0.331 0.132,-0.65 0.372,-0.878c0.072,-0.069 0.142,-0.137 0.194,-0.192c0.368,-0.387 0.692,-0.813 0.967,-1.271c0.68,-1.133 1.039,-2.431 1.039,-3.752c-0,-4.006 -3.296,-7.301 -7.301,-7.301c-0.462,-0 -0.922,0.043 -1.375,0.13c-2.879,0.504 -5.17,2.73 -5.758,5.594c-0.54,2.452 0.222,5.017 2.013,6.777c0.242,0.229 0.381,0.546 0.387,0.879l-0,0.006c0.004,0.472 -0.277,0.903 -0.71,1.09c-2.908,1.205 -5.229,3.505 -6.46,6.402c-0.866,1.984 -1.3,4.13 -1.274,6.295l-0,1.56c-0,1.397 1.149,2.547 2.547,2.547c-0,-0 0,-0 0,-0l21.261,-0c1.397,-0 2.547,-1.15 2.547,-2.547l-0,-1.576c0.026,-2.164 -0.409,-4.309 -1.276,-6.292c-1.233,-2.894 -3.555,-5.191 -6.463,-6.392Z" style="fill-rule:nonzero;"/>
+ <path d="M60.882,35.466c-1.233,-2.894 -3.554,-5.191 -6.462,-6.392c-0.43,-0.185 -0.71,-0.611 -0.71,-1.079c-0.003,-0.331 0.132,-0.649 0.372,-0.878c0.073,-0.069 0.142,-0.137 0.194,-0.192c0.368,-0.387 0.692,-0.813 0.968,-1.27c0.679,-1.134 1.038,-2.431 1.038,-3.753c0,-4.005 -3.295,-7.301 -7.3,-7.301c-0.462,0 -0.922,0.044 -1.375,0.131c-2.88,0.504 -5.171,2.73 -5.758,5.594c-0.54,2.452 0.222,5.016 2.013,6.776c0.242,0.229 0.381,0.547 0.386,0.88l-0,0.006c0.005,0.472 -0.276,0.903 -0.71,1.09c-1.162,0.476 -2.24,1.133 -3.195,1.949c2.679,1.588 4.786,3.985 6.018,6.845c1.029,2.332 1.546,4.857 1.517,7.405l-0,0.605l11.734,-0c1.397,-0 2.547,-1.15 2.547,-2.547l-0,-1.576c0.026,-2.165 -0.409,-4.31 -1.277,-6.293Z" style="fill-rule:nonzero;"/>
+ <path d="M23.66,31.026c-0.956,-0.817 -2.038,-1.476 -3.202,-1.952c-0.43,-0.185 -0.71,-0.611 -0.71,-1.079c-0.003,-0.331 0.132,-0.65 0.372,-0.878c0.072,-0.069 0.142,-0.137 0.194,-0.192c0.367,-0.387 0.692,-0.813 0.967,-1.27c0.68,-1.134 1.039,-2.431 1.039,-3.753c-0,-4.005 -3.296,-7.301 -7.301,-7.301c-0.461,0 -0.922,0.044 -1.375,0.131c-2.879,0.504 -5.17,2.73 -5.758,5.594c-0.54,2.452 0.222,5.016 2.013,6.776c0.242,0.229 0.381,0.547 0.386,0.88l0,0.006c0.005,0.472 -0.276,0.903 -0.71,1.09c-2.907,1.204 -5.229,3.504 -6.46,6.401c-0.865,1.985 -1.3,4.13 -1.274,6.295c0,0 0,1.561 0,1.561c0,1.397 1.15,2.547 2.547,2.547c-0,-0 11.735,-0 11.735,-0l0,-0.59c-0.029,-2.548 0.487,-5.073 1.513,-7.405c1.231,-2.867 3.341,-5.27 6.024,-6.861Z" style="fill-rule:nonzero;"/>
+</svg>
diff --git a/core/modules/commander.js b/core-server/commander.js
similarity index 92%
rename from core/modules/commander.js
rename to core-server/commander.js
index b73e39b0f6..a6cdc81c94 100644
--- a/core/modules/commander.js
+++ b/core-server/commander.js
@@ -99,16 +99,18 @@ Commander.prototype.executeNextCommand = function() {
}
}
if(command.info.synchronous) {
- // Synchronous command
+ // Synchronous command (await thenables)
c = new command.Command(params,this);
err = c.execute();
- if(err) {
+ if(err && typeof err.then === "function") {
+ err.then(e => { e ? this.callback(e) : this.executeNextCommand(); });
+ } else if(err) {
this.callback(err);
} else {
this.executeNextCommand();
}
} else {
- // Asynchronous command
+ // Asynchronous command (await thenables)
c = new command.Command(params,this,function(err) {
if(err) {
self.callback(err);
@@ -117,7 +119,9 @@ Commander.prototype.executeNextCommand = function() {
}
});
err = c.execute();
- if(err) {
+ if(err && typeof err.then === "function") {
+ err.then(e => { if(e) this.callback(e); });
+ } else if(err) {
this.callback(err);
}
}
diff --git a/core/modules/commands/build.js b/core-server/commands/build.js
similarity index 100%
rename from core/modules/commands/build.js
rename to core-server/commands/build.js
diff --git a/core/modules/commands/clearpassword.js b/core-server/commands/clearpassword.js
similarity index 100%
rename from core/modules/commands/clearpassword.js
rename to core-server/commands/clearpassword.js
diff --git a/core/modules/commands/commands.js b/core-server/commands/commands.js
similarity index 100%
rename from core/modules/commands/commands.js
rename to core-server/commands/commands.js
diff --git a/core/modules/commands/deletetiddlers.js b/core-server/commands/deletetiddlers.js
similarity index 100%
rename from core/modules/commands/deletetiddlers.js
rename to core-server/commands/deletetiddlers.js
diff --git a/core/modules/commands/editions.js b/core-server/commands/editions.js
similarity index 100%
rename from core/modules/commands/editions.js
rename to core-server/commands/editions.js
diff --git a/core/modules/commands/fetch.js b/core-server/commands/fetch.js
similarity index 100%
rename from core/modules/commands/fetch.js
rename to core-server/commands/fetch.js
diff --git a/core/modules/commands/help.js b/core-server/commands/help.js
similarity index 100%
rename from core/modules/commands/help.js
rename to core-server/commands/help.js
diff --git a/core/modules/commands/import.js b/core-server/commands/import.js
similarity index 100%
rename from core/modules/commands/import.js
rename to core-server/commands/import.js
diff --git a/core/modules/commands/init.js b/core-server/commands/init.js
similarity index 100%
rename from core/modules/commands/init.js
rename to core-server/commands/init.js
diff --git a/core/modules/commands/listen.js b/core-server/commands/listen.js
similarity index 100%
rename from core/modules/commands/listen.js
rename to core-server/commands/listen.js
diff --git a/core/modules/commands/load.js b/core-server/commands/load.js
similarity index 100%
rename from core/modules/commands/load.js
rename to core-server/commands/load.js
diff --git a/core/modules/commands/makelibrary.js b/core-server/commands/makelibrary.js
similarity index 100%
rename from core/modules/commands/makelibrary.js
rename to core-server/commands/makelibrary.js
diff --git a/core/modules/commands/output.js b/core-server/commands/output.js
similarity index 100%
rename from core/modules/commands/output.js
rename to core-server/commands/output.js
diff --git a/core/modules/commands/password.js b/core-server/commands/password.js
similarity index 100%
rename from core/modules/commands/password.js
rename to core-server/commands/password.js
diff --git a/core/modules/commands/render.js b/core-server/commands/render.js
similarity index 100%
rename from core/modules/commands/render.js
rename to core-server/commands/render.js
diff --git a/core/modules/commands/rendertiddler.js b/core-server/commands/rendertiddler.js
similarity index 100%
rename from core/modules/commands/rendertiddler.js
rename to core-server/commands/rendertiddler.js
diff --git a/core/modules/commands/rendertiddlers.js b/core-server/commands/rendertiddlers.js
similarity index 100%
rename from core/modules/commands/rendertiddlers.js
rename to core-server/commands/rendertiddlers.js
diff --git a/core/modules/commands/save.js b/core-server/commands/save.js
similarity index 100%
rename from core/modules/commands/save.js
rename to core-server/commands/save.js
diff --git a/core/modules/commands/savelibrarytiddlers.js b/core-server/commands/savelibrarytiddlers.js
similarity index 100%
rename from core/modules/commands/savelibrarytiddlers.js
rename to core-server/commands/savelibrarytiddlers.js
diff --git a/core/modules/commands/savetiddler.js b/core-server/commands/savetiddler.js
similarity index 100%
rename from core/modules/commands/savetiddler.js
rename to core-server/commands/savetiddler.js
diff --git a/core/modules/commands/savetiddlers.js b/core-server/commands/savetiddlers.js
similarity index 100%
rename from core/modules/commands/savetiddlers.js
rename to core-server/commands/savetiddlers.js
diff --git a/core/modules/commands/savewikifolder.js b/core-server/commands/savewikifolder.js
similarity index 99%
rename from core/modules/commands/savewikifolder.js
rename to core-server/commands/savewikifolder.js
index 751e0e54ea..b17246e866 100644
--- a/core/modules/commands/savewikifolder.js
+++ b/core-server/commands/savewikifolder.js
@@ -76,6 +76,7 @@ WikiFolderMaker.prototype.tiddlersToIgnore = [
"$:/boot/boot.js",
"$:/boot/bootprefix.js",
"$:/core",
+ "$:/core-server",
"$:/library/sjcl.js",
"$:/temp/info-plugin"
];
diff --git a/core/modules/commands/server.js b/core-server/commands/server.js
similarity index 100%
rename from core/modules/commands/server.js
rename to core-server/commands/server.js
diff --git a/core/modules/commands/setfield.js b/core-server/commands/setfield.js
similarity index 100%
rename from core/modules/commands/setfield.js
rename to core-server/commands/setfield.js
diff --git a/core/modules/commands/unpackplugin.js b/core-server/commands/unpackplugin.js
similarity index 100%
rename from core/modules/commands/unpackplugin.js
rename to core-server/commands/unpackplugin.js
diff --git a/core/modules/commands/verbose.js b/core-server/commands/verbose.js
similarity index 100%
rename from core/modules/commands/verbose.js
rename to core-server/commands/verbose.js
diff --git a/core/modules/commands/version.js b/core-server/commands/version.js
similarity index 100%
rename from core/modules/commands/version.js
rename to core-server/commands/version.js
diff --git a/core/modules/utils/filesystem.js b/core-server/filesystem.js
similarity index 100%
rename from core/modules/utils/filesystem.js
rename to core-server/filesystem.js
diff --git a/core-server/plugin.info b/core-server/plugin.info
new file mode 100644
index 0000000000..21560a1ad4
--- /dev/null
+++ b/core-server/plugin.info
@@ -0,0 +1,11 @@
+{
+ "title": "$:/core-server",
+ "name": "Core Server Components",
+ "description": "TiddlyWiki5 core server components",
+ "author": "JeremyRuston",
+ "core-version": ">=5.0.0",
+ "platform": "server",
+ "plugin-priority": "0",
+ "list": "readme",
+ "stability": "STABILITY_2_STABLE"
+}
diff --git a/core-server/readme.tid b/core-server/readme.tid
new file mode 100644
index 0000000000..23efece016
--- /dev/null
+++ b/core-server/readme.tid
@@ -0,0 +1,7 @@
+title: $:/core-server/readme
+
+This plugin contains TiddlyWiki's core components that are only needed on the server, comprising:
+
+* Commands
+* HTTP server code
+* Utility functions for server
diff --git a/core/modules/server/authenticators/basic.js b/core-server/server/authenticators/basic.js
similarity index 100%
rename from core/modules/server/authenticators/basic.js
rename to core-server/server/authenticators/basic.js
diff --git a/core/modules/server/authenticators/header.js b/core-server/server/authenticators/header.js
similarity index 100%
rename from core/modules/server/authenticators/header.js
rename to core-server/server/authenticators/header.js
diff --git a/core/modules/server/routes/delete-tiddler.js b/core-server/server/routes/delete-tiddler.js
similarity index 87%
rename from core/modules/server/routes/delete-tiddler.js
rename to core-server/server/routes/delete-tiddler.js
index 33cb40d550..17db39848d 100644
--- a/core/modules/server/routes/delete-tiddler.js
+++ b/core-server/server/routes/delete-tiddler.js
@@ -8,10 +8,14 @@ DELETE /recipes/default/tiddlers/:title
\*/
"use strict";
-exports.method = "DELETE";
+exports.methods = ["DELETE"];
exports.path = /^\/bags\/default\/tiddlers\/(.+)$/;
+exports.info = {
+ priority: 100
+};
+
exports.handler = function(request,response,state) {
var title = $tw.utils.decodeURIComponentSafe(state.params[0]);
state.wiki.deleteTiddler(title);
diff --git a/core/modules/server/routes/get-favicon.js b/core-server/server/routes/get-favicon.js
similarity index 85%
rename from core/modules/server/routes/get-favicon.js
rename to core-server/server/routes/get-favicon.js
index 8b757b2f7a..ce4bc55ed8 100644
--- a/core/modules/server/routes/get-favicon.js
+++ b/core-server/server/routes/get-favicon.js
@@ -8,10 +8,14 @@ GET /favicon.ico
\*/
"use strict";
-exports.method = "GET";
+exports.methods = ["GET"];
exports.path = /^\/favicon.ico$/;
+exports.info = {
+ priority: 100
+};
+
exports.handler = function(request,response,state) {
var buffer = state.wiki.getTiddlerText("$:/favicon.ico","");
state.sendResponse(200,{"Content-Type": "image/x-icon"},buffer,"base64");
diff --git a/core-server/server/routes/get-file.js b/core-server/server/routes/get-file.js
new file mode 100644
index 0000000000..ec928319c7
--- /dev/null
+++ b/core-server/server/routes/get-file.js
@@ -0,0 +1,73 @@
+/*\
+title: $:/core/modules/server/routes/get-file.js
+type: application/javascript
+module-type: route
+
+GET /files/:filepath
+
+\*/
+"use strict";
+
+exports.methods = ["GET"];
+
+exports.path = /^\/files\/(.+)$/;
+
+exports.info = {
+ priority: 100
+};
+
+exports.handler = function(request,response,state) {
+ var path = require("path"),
+ fs = require("fs"),
+ suppliedFilename = $tw.utils.decodeURIComponentSafe(state.params[0]),
+ baseFilename = path.resolve(state.boot.wikiPath,"files"),
+ filename = path.resolve(baseFilename,suppliedFilename),
+ extension = path.extname(filename);
+ // Check that the filename is inside the wiki files folder
+ if(path.relative(baseFilename,filename).indexOf("..") === 0) {
+ return state.sendResponse(404,{"Content-Type": "text/plain"},"File '" + suppliedFilename + "' not found");
+ }
+ fs.stat(filename, function(err, stats) {
+ if(err) {
+ return state.sendResponse(404,{"Content-Type": "text/plain"},"File '" + suppliedFilename + "' not found");
+ } else {
+ var type = ($tw.config.fileExtensionInfo[extension] ? $tw.config.fileExtensionInfo[extension].type : "application/octet-stream"),
+ responseHeaders = {
+ "Content-Type": type,
+ "Accept-Ranges": "bytes"
+ };
+ var rangeHeader = request.headers.range,
+ stream;
+ if(rangeHeader) {
+ // Handle range requests
+ var parts = rangeHeader.replace(/bytes=/, "").split("-"),
+ start = parseInt(parts[0], 10),
+ end = parts[1] ? parseInt(parts[1], 10) : stats.size - 1;
+ // Validate start and end
+ if(isNaN(start) || isNaN(end) || start < 0 || end < start || end >= stats.size) {
+ responseHeaders["Content-Range"] = "bytes */" + stats.size;
+ return response.writeHead(416, responseHeaders).end();
+ }
+ var chunksize = (end - start) + 1;
+ responseHeaders["Content-Range"] = "bytes " + start + "-" + end + "/" + stats.size;
+ responseHeaders["Content-Length"] = chunksize;
+ response.writeHead(206, responseHeaders);
+ stream = fs.createReadStream(filename, {start: start, end: end});
+ } else {
+ responseHeaders["Content-Length"] = stats.size;
+ response.writeHead(200, responseHeaders);
+ stream = fs.createReadStream(filename);
+ }
+ // Common stream error handling
+ stream.on("error", function(err) {
+ if(!response.headersSent) {
+ response.writeHead(500, {"Content-Type": "text/plain"});
+ response.end("Read error");
+ } else {
+ response.destroy();
+ }
+ });
+ stream.pipe(response);
+ }
+ });
+};
diff --git a/core/modules/server/routes/get-index.js b/core-server/server/routes/get-index.js
similarity index 87%
rename from core/modules/server/routes/get-index.js
rename to core-server/server/routes/get-index.js
index 7ba52faf60..f856bd511c 100644
--- a/core/modules/server/routes/get-index.js
+++ b/core-server/server/routes/get-index.js
@@ -8,10 +8,14 @@ GET /
\*/
"use strict";
-exports.method = "GET";
+exports.methods = ["GET"];
exports.path = /^\/$/;
+exports.info = {
+ priority: 100
+};
+
exports.handler = function(request,response,state) {
var text = state.wiki.renderTiddler(state.server.get("root-render-type"),state.server.get("root-tiddler")),
responseHeaders = {
diff --git a/core/modules/server/routes/get-login-basic.js b/core-server/server/routes/get-login-basic.js
similarity index 92%
rename from core/modules/server/routes/get-login-basic.js
rename to core-server/server/routes/get-login-basic.js
index bca3bd18d3..e9a73c856b 100644
--- a/core/modules/server/routes/get-login-basic.js
+++ b/core-server/server/routes/get-login-basic.js
@@ -8,10 +8,14 @@ GET /login-basic -- force a Basic Authentication challenge
\*/
"use strict";
-exports.method = "GET";
+exports.methods = ["GET"];
exports.path = /^\/login-basic$/;
+exports.info = {
+ priority: 100
+};
+
exports.handler = function(request,response,state) {
if(!state.authenticatedUsername) {
// Challenge if there's no username
diff --git a/core/modules/server/routes/get-status.js b/core-server/server/routes/get-status.js
similarity index 91%
rename from core/modules/server/routes/get-status.js
rename to core-server/server/routes/get-status.js
index d93c64037f..ed2c528063 100644
--- a/core/modules/server/routes/get-status.js
+++ b/core-server/server/routes/get-status.js
@@ -8,10 +8,14 @@ GET /status
\*/
"use strict";
-exports.method = "GET";
+exports.methods = ["GET"];
exports.path = /^\/status$/;
+exports.info = {
+ priority: 100
+};
+
exports.handler = function(request,response,state) {
var text = JSON.stringify({
username: state.authenticatedUsername || state.server.get("anon-username") || "",
diff --git a/core/modules/server/routes/get-tiddler-html.js b/core-server/server/routes/get-tiddler-html.js
similarity index 95%
rename from core/modules/server/routes/get-tiddler-html.js
rename to core-server/server/routes/get-tiddler-html.js
index a891ea6e7a..b7a8aa8f62 100644
--- a/core/modules/server/routes/get-tiddler-html.js
+++ b/core-server/server/routes/get-tiddler-html.js
@@ -8,10 +8,14 @@ GET /:title
\*/
"use strict";
-exports.method = "GET";
+exports.methods = ["GET"];
exports.path = /^\/([^\/]+)$/;
+exports.info = {
+ priority: 100
+};
+
exports.handler = function(request,response,state) {
var title = $tw.utils.decodeURIComponentSafe(state.params[0]),
tiddler = state.wiki.getTiddler(title);
diff --git a/core/modules/server/routes/get-tiddler.js b/core-server/server/routes/get-tiddler.js
similarity index 94%
rename from core/modules/server/routes/get-tiddler.js
rename to core-server/server/routes/get-tiddler.js
index 58ecb8a43e..b5c4e11a06 100644
--- a/core/modules/server/routes/get-tiddler.js
+++ b/core-server/server/routes/get-tiddler.js
@@ -8,10 +8,14 @@ GET /recipes/default/tiddlers/:title
\*/
"use strict";
-exports.method = "GET";
+exports.methods = ["GET"];
exports.path = /^\/recipes\/default\/tiddlers\/(.+)$/;
+exports.info = {
+ priority: 100
+};
+
exports.handler = function(request,response,state) {
var title = $tw.utils.decodeURIComponentSafe(state.params[0]),
tiddler = state.wiki.getTiddler(title),
diff --git a/core/modules/server/routes/get-tiddlers-json.js b/core-server/server/routes/get-tiddlers-json.js
similarity index 95%
rename from core/modules/server/routes/get-tiddlers-json.js
rename to core-server/server/routes/get-tiddlers-json.js
index 89f91032ee..8c78dad9f4 100644
--- a/core/modules/server/routes/get-tiddlers-json.js
+++ b/core-server/server/routes/get-tiddlers-json.js
@@ -10,10 +10,14 @@ GET /recipes/default/tiddlers.json?filter=<filter>
var DEFAULT_FILTER = "[all[tiddlers]!is[system]sort[title]]";
-exports.method = "GET";
+exports.methods = ["GET"];
exports.path = /^\/recipes\/default\/tiddlers.json$/;
+exports.info = {
+ priority: 100
+};
+
exports.handler = function(request,response,state) {
var filter = state.queryParameters.filter || DEFAULT_FILTER;
if(state.wiki.getTiddlerText("$:/config/Server/AllowAllExternalFilters") !== "yes") {
diff --git a/core/modules/server/routes/put-tiddler.js b/core-server/server/routes/put-tiddler.js
similarity index 95%
rename from core/modules/server/routes/put-tiddler.js
rename to core-server/server/routes/put-tiddler.js
index 74327bd50d..55479b5700 100644
--- a/core/modules/server/routes/put-tiddler.js
+++ b/core-server/server/routes/put-tiddler.js
@@ -8,10 +8,14 @@ PUT /recipes/default/tiddlers/:title
\*/
"use strict";
-exports.method = "PUT";
+exports.methods = ["PUT"];
exports.path = /^\/recipes\/default\/tiddlers\/(.+)$/;
+exports.info = {
+ priority: 100
+};
+
exports.handler = function(request,response,state) {
var title = $tw.utils.decodeURIComponentSafe(state.params[0]),
fields = $tw.utils.parseJSONSafe(state.data);
diff --git a/core/modules/server/server.js b/core-server/server/server.js
similarity index 98%
rename from core/modules/server/server.js
rename to core-server/server/server.js
index 2118e9b503..e1741d08bb 100644
--- a/core/modules/server/server.js
+++ b/core-server/server/server.js
@@ -74,6 +74,11 @@ function Server(options) {
// console.log("Loading server route " + title);
self.addRoute(routeDefinition);
});
+ this.routes.sort((a, b) => {
+ const priorityA = a.info?.priority ?? 100,
+ priorityB = b.info?.priority ?? 100;
+ return priorityB - priorityA;
+ });
// Initialise the http vs https
this.listenOptions = null;
this.protocol = "http";
@@ -217,7 +222,7 @@ Server.prototype.findMatchingRoute = function(request,state) {
} else {
match = potentialRoute.path.exec(pathname);
}
- if(match && request.method === potentialRoute.method) {
+ if(match && (potentialRoute.methods?.includes(request.method) || potentialRoute.method === request.method)) {
state.params = [];
for(var p=1; p<match.length; p++) {
state.params.push(match[p]);
diff --git a/core/modules/startup/commands.js b/core-server/startup/commands.js
similarity index 100%
rename from core/modules/startup/commands.js
rename to core-server/startup/commands.js
diff --git a/core/modules/utils/edition-info.js b/core-server/utils/edition-info.js
similarity index 100%
rename from core/modules/utils/edition-info.js
rename to core-server/utils/edition-info.js
diff --git a/core/modules/utils/repository.js b/core-server/utils/repository.js
similarity index 100%
rename from core/modules/utils/repository.js
rename to core-server/utils/repository.js
diff --git a/core/acknowledgements.tid b/core/acknowledgements.tid
index e1015e2c99..3d4010bfd3 100644
--- a/core/acknowledgements.tid
+++ b/core/acknowledgements.tid
@@ -4,4 +4,4 @@ TiddlyWiki incorporates code from these fine OpenSource projects:
* [[The Stanford Javascript Crypto Library|http://bitwiseshiftleft.github.io/sjcl/]]
* [[The Jasmine JavaScript Test Framework|https://jasmine.github.io/]]
-* [[Normalize.css by Nicolas Gallagher|http://necolas.github.io/normalize.css/]]
+* [[modern-normalize by Sindre Sorhus|https://github.com/sindresorhus/modern-normalize]]
diff --git a/core/language/en-GB/ControlPanel.multids b/core/language/en-GB/ControlPanel.multids
index 129dab0b41..ce0a5b3cf7 100644
--- a/core/language/en-GB/ControlPanel.multids
+++ b/core/language/en-GB/ControlPanel.multids
@@ -131,15 +131,14 @@ Saving/GitService/Gitea/Caption: Gitea Saver
Saving/GitService/Gitea/Password: Personal access token for API (via Gitea’s web interface: `Settings | Applications | Generate New Token`)
Saving/TiddlySpot/Advanced/Heading: Advanced Settings
Saving/TiddlySpot/BackupDir: Backup Directory
-Saving/TiddlySpot/ControlPanel: ~TiddlySpot Control Panel
+Saving/TiddlySpot/ControlPanel: ~TiddlyHost Control Panel
Saving/TiddlySpot/Backups: Backups
-Saving/TiddlySpot/Caption: ~TiddlySpot Saver
-Saving/TiddlySpot/Description: These settings are only used when saving to [[TiddlySpot|http://tiddlyspot.com]], [[TiddlyHost|https://tiddlyhost.com]], or a compatible remote server. See [[here|https://github.com/simonbaird/tiddlyhost/wiki/TiddlySpot-Saver-configuration-for-Tiddlyhost-and-Tiddlyspot]] for information on ~TiddlySpot and ~TiddlyHost saving configuration.
+Saving/TiddlySpot/Caption: ~TiddlyHost Saver
+Saving/TiddlySpot/Description: These settings are only used when saving to [[TiddlyHost|https://tiddlyhost.com]] or a compatible remote server. See [[here|https://github.com/simonbaird/tiddlyhost/wiki/TiddlySpot-Saver-configuration-for-Tiddlyhost-and-Tiddlyspot]] for information on ~TiddlyHost saving configuration
Saving/TiddlySpot/Filename: Upload Filename
-Saving/TiddlySpot/Heading: ~TiddlySpot
-Saving/TiddlySpot/Hint: //The server URL defaults to `http://<wikiname>.tiddlyspot.com/store.cgi` and can be changed to use a custom server address, e.g. `http://example.com/store.php`.//
+Saving/TiddlySpot/Heading: ~TiddlyHost
+Saving/TiddlySpot/Hint: //The server URL defaults to `http://<wikiname>.tiddlyspot.com/` and can be changed to use a custom server address, e.g. `http://example.com/store.php`.//
Saving/TiddlySpot/Password: Password
-Saving/TiddlySpot/ReadOnly: Note that [[TiddlySpot|http://tiddlyspot.com]] no longer allows the creation of new sites. For new sites, you can use [[TiddlyHost|https://tiddlyhost.com]], a new hosting service that replaces ~TiddlySpot.
Saving/TiddlySpot/ServerURL: Server URL
Saving/TiddlySpot/UploadDir: Upload Directory
Saving/TiddlySpot/UserName: Wiki Name
@@ -148,7 +147,7 @@ Settings/AutoSave/Disabled/Description: Do not save changes automatically
Settings/AutoSave/Enabled/Description: Save changes automatically
Settings/AutoSave/Hint: Attempt to automatically save changes during editing when using a supporting saver
Settings/CamelCase/Caption: Camel Case Wiki Links
-Settings/CamelCase/Hint: You can globally disable automatic linking of ~CamelCase phrases. Requires reload to take effect
+Settings/CamelCase/Hint: Requires reload to take effect
Settings/CamelCase/Description: Enable automatic ~CamelCase linking
Settings/Caption: Settings
Settings/EditorToolbar/Caption: Editor Toolbar
@@ -190,6 +189,8 @@ Settings/DefaultSidebarTab/Caption: Default Sidebar Tab
Settings/DefaultSidebarTab/Hint: Specify which sidebar tab is displayed by default
Settings/DefaultMoreSidebarTab/Caption: Default More Sidebar Tab
Settings/DefaultMoreSidebarTab/Hint: Specify which More sidebar tab is displayed by default
+Settings/DefaultTiddlerInfoTab/Caption: Default Tiddler Info Tab
+Settings/DefaultTiddlerInfoTab/Hint: Specify which tab is displayed by default when tiddler info panel is opened
Settings/LinkToBehaviour/Caption: Tiddler Opening Behaviour
Settings/LinkToBehaviour/InsideRiver/Hint: Navigation from //within// the story river
Settings/LinkToBehaviour/OutsideRiver/Hint: Navigation from //outside// the story river
@@ -251,3 +252,6 @@ 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.
+WikiInformation/Caption: Wiki Information
+WikiInformation/Hint: This page summarises high level information about the configuration of this ~TiddlyWiki. It is designed to enable users to quickly share relevant aspects of the configuration of their ~TiddlyWiki with others, for example when seeking help in one of the forums. No private or personal information is included, and nothing is shared without being explicitly copied and pasted elsewhere
+WikiInformation/Drag/Caption: Drag this link to copy this tool to another wiki
\ No newline at end of file
diff --git a/core/modules/editor/engines/framed.js b/core/modules/editor/engines/framed.js
index 9b1c8cd81f..1a4b11c458 100644
--- a/core/modules/editor/engines/framed.js
+++ b/core/modules/editor/engines/framed.js
@@ -34,7 +34,7 @@ function FramedEngine(options) {
var paletteTitle = this.widget.wiki.getTiddlerText("$:/palette");
var colorScheme = (this.widget.wiki.getTiddler(paletteTitle) || {fields: {}}).fields["color-scheme"] || "light";
this.iframeDoc.open();
- this.iframeDoc.write("<meta name='color-scheme' content='" + colorScheme + "'>");
+ this.iframeDoc.write("<!DOCTYPE html><html><head><meta name='color-scheme' content='" + colorScheme + "'></head><body></body></html>");
this.iframeDoc.close();
// Style the iframe
this.iframeNode.className = this.dummyTextArea.className;
diff --git a/core/modules/editor/factory.js b/core/modules/editor/factory.js
index 984cc76bad..2fd323c0bb 100644
--- a/core/modules/editor/factory.js
+++ b/core/modules/editor/factory.js
@@ -68,7 +68,7 @@ function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) {
// Fix height
this.engine.fixHeight();
// Focus if required
- if(this.editFocus === "true" || this.editFocus === "yes") {
+ if($tw.browser && (this.editFocus === "true" || this.editFocus === "yes") && !$tw.utils.hasClass(this.parentDomNode.ownerDocument.activeElement,"tc-keep-focus")) {
this.engine.focus();
}
// Add widget message listeners
diff --git a/core/modules/filters.js b/core/modules/filters.js
index d9e87e4a35..56bc533ccc 100644
--- a/core/modules/filters.js
+++ b/core/modules/filters.js
@@ -267,8 +267,7 @@ exports.compileFilter = function(filterString) {
// Create a function for the chain of operators in the operation
var operationSubFunction = function(source,widget) {
var accumulator = source,
- results = [],
- currTiddlerTitle = widget && widget.getVariable("currentTiddler");
+ results = [];
$tw.utils.each(operation.operators,function(operator) {
var operands = [],
multiValueOperands = [],
@@ -286,6 +285,7 @@ exports.compileFilter = function(filterString) {
}
$tw.utils.each(operator.operands,function(operand) {
if(operand.indirect) {
+ var currTiddlerTitle = widget && widget.getVariable("currentTiddler");
operand.value = self.getTextReference(operand.text,"",currTiddlerTitle);
operand.multiValue = [operand.value];
} else if(operand.variable) {
diff --git a/core/modules/filters/format/json.js b/core/modules/filters/format/json.js
index 5db3658e74..98f85dd27b 100644
--- a/core/modules/filters/format/json.js
+++ b/core/modules/filters/format/json.js
@@ -16,12 +16,8 @@ exports.json = function(source,operand,options) {
spaces = /^\d+$/.test(operand) ? parseInt(operand,10) : operand;
}
source(function(tiddler,title) {
- var data = $tw.utils.parseJSONSafe(title);
- try {
- data = JSON.parse(title);
- } catch(e) {
- data = undefined;
- }
+ var data = $tw.utils.parseJSONSafe(title,function(){return undefined;});
+
if(data !== undefined) {
results.push(JSON.stringify(data,null,spaces));
}
diff --git a/core/modules/filters/math.js b/core/modules/filters/math.js
index 4c2a9168a6..bdf2117eb7 100644
--- a/core/modules/filters/math.js
+++ b/core/modules/filters/math.js
@@ -217,6 +217,10 @@ function makeNumericReducingOperator(fnCalc,initialValue,fnFinal) {
source(function(tiddler,title) {
result.push($tw.utils.parseNumber(title));
});
+ // We return an empty array if there are no input titles
+ if(result.length === 0) {
+ return [];
+ }
var value = result.reduce(function(accumulator,currentValue) {
return fnCalc(accumulator,currentValue);
},initialValue);
diff --git a/core/modules/info/dimensions.js b/core/modules/info/dimensions.js
new file mode 100644
index 0000000000..48458dd0f0
--- /dev/null
+++ b/core/modules/info/dimensions.js
@@ -0,0 +1,86 @@
+/*\
+title: $:/core/modules/info/windowdimensions.js
+type: application/javascript
+module-type: info
+\*/
+
+exports.getInfoTiddlerFields = function(updateInfoTiddlersCallback) {
+ if(!$tw.browser) {
+ return [];
+ }
+
+ class WindowDimensionsTracker {
+ constructor(updateCallback) {
+ this.updateCallback = updateCallback;
+ this.resizeHandlers = new Map();
+ this.dimensionsInfo = [
+ ["outer/width", win => win.outerWidth],
+ ["outer/height", win => win.outerHeight],
+ ["inner/width", win => win.innerWidth],
+ ["inner/height", win => win.innerHeight],
+ ["client/width", win => win.document.documentElement.clientWidth],
+ ["client/height", win => win.document.documentElement.clientHeight]
+ ];
+ }
+
+ buildTiddlers(win,windowId) {
+ const prefix = `$:/info/browser/window/${windowId}/`;
+ return this.dimensionsInfo.map(([suffix, getter]) => ({
+ title: prefix + suffix,
+ text: String(getter(win))
+ }));
+ }
+
+ clearTiddlers(windowId) {
+ const prefix = `$:/info/browser/window/${windowId}/`,
+ deletions = this.dimensionsInfo.map(([suffix]) => prefix + suffix);
+ this.updateCallback([], deletions);
+ }
+
+ getUpdateHandler(win,windowId) {
+ let scheduled = false;
+ return () => {
+ if(!scheduled) {
+ scheduled = true;
+ requestAnimationFrame(() => {
+ this.updateCallback(this.buildTiddlers(win,windowId), []);
+ scheduled = false;
+ });
+ }
+ };
+ }
+
+ trackWindow(win,windowId) {
+ const handler = this.getUpdateHandler(win, windowId);
+ handler(); // initial update
+ win.addEventListener("resize",handler,{passive:true});
+ this.resizeHandlers.set(windowId,{win, handler});
+ }
+
+ untrackWindow(windowId) {
+ const entry = this.resizeHandlers.get(windowId);
+ if(entry) {
+ entry.win.removeEventListener("resize", entry.handler);
+ this.resizeHandlers.delete(windowId);
+ }
+ this.clearTiddlers(windowId);
+ }
+ }
+
+ const tracker = new WindowDimensionsTracker(updateInfoTiddlersCallback);
+
+ // Track main window
+ tracker.trackWindow(window,"system/main");
+
+ // Hook into event bus for user windows
+ if($tw.eventBus) {
+ $tw.eventBus.on("window:opened", ({window: win, windowID}) => {
+ tracker.trackWindow(win, "user/" + windowID);
+ });
+ $tw.eventBus.on("window:closed", ({windowID}) => {
+ tracker.untrackWindow("user/" + windowID);
+ });
+ }
+
+ return [];
+};
diff --git a/core/modules/parsers/audioparser.js b/core/modules/parsers/audioparser.js
index 601de058e3..757703da40 100644
--- a/core/modules/parsers/audioparser.js
+++ b/core/modules/parsers/audioparser.js
@@ -7,23 +7,34 @@ The audio parser parses an audio tiddler into an embeddable HTML element
\*/
+/*jslint node: true, browser: true */
+/*global $tw: false */
"use strict";
var AudioParser = function(type,text,options) {
var element = {
type: "element",
- tag: "audio",
+ tag: "$audio", // Using $audio to enable widget interception
attributes: {
controls: {type: "string", value: "controls"},
style: {type: "string", value: "width: 100%; object-fit: contain"}
}
- },
- src;
+ };
+
+ // Pass through source information
if(options._canonical_uri) {
element.attributes.src = {type: "string", value: options._canonical_uri};
+ element.attributes.type = {type: "string", value: type};
} else if(text) {
element.attributes.src = {type: "string", value: "data:" + type + ";base64," + text};
+ element.attributes.type = {type: "string", value: type};
}
+
+ // Pass through tiddler title if available
+ if(options.title) {
+ element.attributes.tiddler = {type: "string", value: options.title};
+ }
+
this.tree = [element];
this.source = text;
this.type = type;
@@ -33,3 +44,4 @@ exports["audio/ogg"] = AudioParser;
exports["audio/mpeg"] = AudioParser;
exports["audio/mp3"] = AudioParser;
exports["audio/mp4"] = AudioParser;
+
\ No newline at end of file
diff --git a/core/modules/parsers/parseutils.js b/core/modules/parsers/parseutils.js
index 30bc395095..05a85e1ec7 100644
--- a/core/modules/parsers/parseutils.js
+++ b/core/modules/parsers/parseutils.js
@@ -82,6 +82,7 @@ exports.parseTokenString = function(source,pos,token) {
/*
Look for a token matching a regex. Returns null if not found, otherwise returns {type: "regexp", match:, start:, end:,}
+Use the "Y" (sticky) flag to avoid searching the entire rest of the string
*/
exports.parseTokenRegExp = function(source,pos,reToken) {
var node = {
@@ -172,7 +173,7 @@ exports.parseMacroParameter = function(source,pos) {
start: pos
};
// Define our regexp
- var reMacroParameter = /(?:([A-Za-z0-9\-_]+)\s*:)?(?:\s*(?:"""([\s\S]*?)"""|"([^"]*)"|'([^']*)'|\[\[([^\]]*)\]\]|((?:(?:>(?!>))|[^\s>"'])+)))/g;
+ const reMacroParameter = /(?:([A-Za-z0-9\-_]+)\s*:)?(?:\s*(?:"""([\s\S]*?)"""|"([^"]*)"|'([^']*)'|\[\[([^\]]*)\]\]|((?:(?:>(?!>))|[^\s>"'])+)))/y;
// Skip whitespace
pos = $tw.utils.skipWhiteSpace(source,pos);
// Look for the parameter
@@ -240,7 +241,7 @@ exports.parseMacroInvocation = function(source,pos) {
params: []
};
// Define our regexps
- var reMacroName = /([^\s>"'=]+)/g;
+ const reMacroName = /([^\s>"'=]+)/y;
// Skip whitespace
pos = $tw.utils.skipWhiteSpace(source,pos);
// Look for a double less than sign
@@ -277,7 +278,7 @@ exports.parseFilterVariable = function(source) {
params: [],
},
pos = 0,
- reName = /([^\s"']+)/g;
+ reName = /([^\s"']+)/y;
// If there is no whitespace or it is an empty string then there are no macro parameters
if(/^\S*$/.test(source)) {
node.name = source;
@@ -302,11 +303,11 @@ exports.parseAttribute = function(source,pos) {
start: pos
};
// Define our regexps
- var reAttributeName = /([^\/\s>"'`=]+)/g,
- reUnquotedAttribute = /([^\/\s<>"'`=]+)/g,
- reFilteredValue = /\{\{\{([\S\s]+?)\}\}\}/g,
- reIndirectValue = /\{\{([^\}]+)\}\}/g,
- reSubstitutedValue = /(?:```([\s\S]*?)```|`([^`]|[\S\s]*?)`)/g;
+ const reAttributeName = /([^\/\s>"'`=]+)/y,
+ reUnquotedAttribute = /([^\/\s<>"'`=]+)/y,
+ reFilteredValue = /\{\{\{([\S\s]+?)\}\}\}/y,
+ reIndirectValue = /\{\{([^\}]+)\}\}/y,
+ reSubstitutedValue = /(?:```([\s\S]*?)```|`([^`]|[\S\s]*?)`)/y;
// Skip whitespace
pos = $tw.utils.skipWhiteSpace(source,pos);
// Get the attribute name
diff --git a/core/modules/parsers/wikiparser/rules/commentblock.js b/core/modules/parsers/wikiparser/rules/commentblock.js
index 96d3deb3dc..9e25587ba9 100644
--- a/core/modules/parsers/wikiparser/rules/commentblock.js
+++ b/core/modules/parsers/wikiparser/rules/commentblock.js
@@ -22,7 +22,7 @@ Note that the syntax for comments is simplified to an opening "<!--" sequence an
"use strict";
exports.name = "commentblock";
-exports.types = {block:true, pragma:true};
+exports.types = {block: true, pragma: true};
exports.init = function(parser) {
this.parser = parser;
@@ -43,9 +43,18 @@ exports.findNextMatch = function(startPos) {
return undefined;
};
+
exports.parse = function() {
// Move past the match
this.parser.pos = this.endMatchRegExp.lastIndex;
- // Don't return any elements
- return [];
+ // Return a node representing the comment that is not rendered
+ var commentStart = this.match.index;
+ var commentEnd = this.endMatch.index + this.endMatch[0].length;
+ return [{
+ type: "void",
+ children: [],
+ text: this.parser.source.slice(commentStart, commentEnd),
+ start: commentStart,
+ end: commentEnd
+ }];
};
diff --git a/core/modules/parsers/wikiparser/rules/commentinline.js b/core/modules/parsers/wikiparser/rules/commentinline.js
index e826b95e62..1b7ea8b5d1 100644
--- a/core/modules/parsers/wikiparser/rules/commentinline.js
+++ b/core/modules/parsers/wikiparser/rules/commentinline.js
@@ -40,6 +40,13 @@ exports.findNextMatch = function(startPos) {
exports.parse = function() {
// Move past the match
this.parser.pos = this.endMatchRegExp.lastIndex;
- // Don't return any elements
- return [];
+ // Return a node representing the inline comment
+ var commentStart = this.match.index;
+ var commentEnd = this.endMatch.index + this.endMatch[0].length;
+ return [{
+ type: "void",
+ text: this.parser.source.slice(commentStart, commentEnd),
+ start: commentStart,
+ end: commentEnd
+ }];
};
diff --git a/core/modules/parsers/wikiparser/rules/emphasis/strikethrough.js b/core/modules/parsers/wikiparser/rules/emphasis/strikethrough.js
index 24380ed115..3c05bbe2c1 100644
--- a/core/modules/parsers/wikiparser/rules/emphasis/strikethrough.js
+++ b/core/modules/parsers/wikiparser/rules/emphasis/strikethrough.js
@@ -39,7 +39,7 @@ exports.parse = function() {
// Return the classed span
return [{
type: "element",
- tag: "strike",
+ tag: "s",
children: tree
}];
};
diff --git a/core/modules/parsers/wikiparser/rules/extlink.js b/core/modules/parsers/wikiparser/rules/extlink.js
index 2678e38735..7a2485f1cb 100644
--- a/core/modules/parsers/wikiparser/rules/extlink.js
+++ b/core/modules/parsers/wikiparser/rules/extlink.js
@@ -28,11 +28,11 @@ exports.init = function(parser) {
exports.parse = function() {
// Move past the match
- var start = this.parser.pos;
+ 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) === "~") {
- return [{type: "text", text: this.match[0].substr(1)}];
+ return [{type: "text", text: this.match[0].substr(1), start: start, end: this.parser.pos}];
} else {
return [{
type: "element",
diff --git a/core/modules/parsers/wikiparser/rules/fnprocdef.js b/core/modules/parsers/wikiparser/rules/fnprocdef.js
index 8e675a3d1d..8c71372c5c 100644
--- a/core/modules/parsers/wikiparser/rules/fnprocdef.js
+++ b/core/modules/parsers/wikiparser/rules/fnprocdef.js
@@ -6,15 +6,15 @@ module-type: wikirule
Wiki pragma rule for function, procedure and widget definitions
```
-\function name(param:defaultvalue,param2:defaultvalue)
+\function name(param:"defaultvalue", param2:"defaultvalue")
definition text
\end
-\procedure name(param:defaultvalue,param2:defaultvalue)
+\procedure name(param:"defaultvalue", param2:"defaultvalue")
definition text
\end
-\widget $mywidget(param:defaultvalue,param2:defaultvalue)
+\widget $mywidget(param:"defaultvalue", param2:"defaultvalue")
definition text
\end
```
@@ -50,7 +50,7 @@ exports.parse = function() {
var reEnd;
if(this.match[5]) {
// If so, it is a multiline definition and the end of the body is marked with \end
- reEnd = new RegExp("((:?^|\\r?\\n)[^\\S\\n\\r]*\\\\end[^\\S\\n\\r]*(?:" + $tw.utils.escapeRegExp(this.match[2]) + ")?(?:$|\\r?\\n))","mg");
+ reEnd = new RegExp("((:?^|\\r?\\n)[^\\S\\n\\r]*\\\\end[^\\S\\n\\r]*(?:" + $tw.utils.escapeRegExp(this.match[2]) + ")?\\s*?(?:$|\\r?\\n))","mg");
} else {
// Otherwise, the end of the definition is marked by the end of the line
reEnd = /($|\r?\n)/mg;
diff --git a/core/modules/parsers/wikiparser/rules/hardlinebreaks.js b/core/modules/parsers/wikiparser/rules/hardlinebreaks.js
index da28f78084..f229fe843e 100644
--- a/core/modules/parsers/wikiparser/rules/hardlinebreaks.js
+++ b/core/modules/parsers/wikiparser/rules/hardlinebreaks.js
@@ -50,6 +50,8 @@ exports.parse = function() {
}
}
} while(match && !match[1]);
- // Return the nodes
+ // Mark first and last node, and return the nodes
+ if(tree[0]) tree[0].isRuleStart = true;
+ if(tree[tree.length-1]) tree[tree.length-1].isRuleEnd = true;
return tree;
};
diff --git a/core/modules/parsers/wikiparser/rules/html.js b/core/modules/parsers/wikiparser/rules/html.js
index c5f0e86c56..2d1a42a0b1 100644
--- a/core/modules/parsers/wikiparser/rules/html.js
+++ b/core/modules/parsers/wikiparser/rules/html.js
@@ -41,7 +41,7 @@ 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) {
+ if(!tag.isSelfClosing) {
tag.openTagStart = tag.start;
tag.openTagEnd = tag.end;
}
@@ -49,7 +49,7 @@ exports.parse = function() {
// Advance the parser position to past the tag
this.parser.pos = tag.end;
// Check for an immediately following double linebreak
- var hasLineBreak = !tag.isSelfClosing && !!$tw.utils.parseTokenRegExp(this.parser.source,this.parser.pos,/([^\S\n\r]*\r?\n(?:[^\S\n\r]*\r?\n|$))/g);
+ var hasLineBreak = !tag.isSelfClosing && !!$tw.utils.parseTokenRegExp(this.parser.source,this.parser.pos,/([^\S\n\r]*\r?\n(?:[^\S\n\r]*\r?\n|$))/y);
// Set whether we're in block mode
tag.isBlock = this.is.block || hasLineBreak;
// Parse the body if we need to
@@ -63,22 +63,22 @@ exports.parse = function() {
}
tag.end = this.parser.pos;
tag.closeTagEnd = tag.end;
- if (tag.closeTagEnd === tag.openTagEnd || this.parser.source[tag.closeTagEnd - 1] !== '>') {
+ 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) {
+ if(!Number.isSafeInteger(closeTagMinPos)) closeTagMinPos = tag.openTagEnd;
+ while(tag.closeTagStart >= closeTagMinPos) {
var char = this.parser.source[tag.closeTagStart];
- if (char === '>') {
+ if(char === ">") {
tag.closeTagStart = -1;
break;
}
- if (char === '<') break;
+ if(char === "<") break;
tag.closeTagStart -= 1;
}
- if (tag.closeTagStart < closeTagMinPos) {
+ if(tag.closeTagStart < closeTagMinPos) {
tag.closeTagStart = tag.end;
}
}
@@ -100,7 +100,7 @@ exports.parseTag = function(source,pos,options) {
orderedAttributes: []
};
// Define our regexps
- var reTagName = /([a-zA-Z0-9\-\$\.]+)/g;
+ const reTagName = /([a-zA-Z0-9\-\$\.]+)/y;
// Skip whitespace
pos = $tw.utils.skipWhiteSpace(source,pos);
// Look for a less than sign
@@ -148,7 +148,7 @@ exports.parseTag = function(source,pos,options) {
pos = token.end;
// Check for a required line break
if(options.requireLineBreak) {
- token = $tw.utils.parseTokenRegExp(source,pos,/([^\S\n\r]*\r?\n(?:[^\S\n\r]*\r?\n|$))/g);
+ token = $tw.utils.parseTokenRegExp(source,pos,/([^\S\n\r]*\r?\n(?:[^\S\n\r]*\r?\n|$))/y);
if(!token) {
return null;
}
diff --git a/core/modules/parsers/wikiparser/rules/image.js b/core/modules/parsers/wikiparser/rules/image.js
index 2bc90b80d3..9ae093380a 100644
--- a/core/modules/parsers/wikiparser/rules/image.js
+++ b/core/modules/parsers/wikiparser/rules/image.js
@@ -113,7 +113,7 @@ exports.parseImage = function(source,pos) {
// Skip whitespace
pos = $tw.utils.skipWhiteSpace(source,pos);
// Get the source up to the terminating `]]`
- token = $tw.utils.parseTokenRegExp(source,pos,/(?:([^|\]]*?)\|)?([^\]]+?)\]\]/g);
+ token = $tw.utils.parseTokenRegExp(source,pos,/(?:([^|\]]*?)\|)?([^\]]+?)\]\]/y);
if(!token) {
return null;
}
diff --git a/core/modules/parsers/wikiparser/rules/list.js b/core/modules/parsers/wikiparser/rules/list.js
index 98cc5540fc..f3ad79450c 100644
--- a/core/modules/parsers/wikiparser/rules/list.js
+++ b/core/modules/parsers/wikiparser/rules/list.js
@@ -59,6 +59,7 @@ var listTypes = {
":": {listTag: "dl", itemTag: "dd"},
">": {listTag: "blockquote", itemTag: "div"}
};
+exports.listTypes = listTypes;
/*
Parse the most recent match
diff --git a/core/modules/parsers/wikiparser/rules/macrocallblock.js b/core/modules/parsers/wikiparser/rules/macrocallblock.js
index 3793d563d3..800af4e337 100644
--- a/core/modules/parsers/wikiparser/rules/macrocallblock.js
+++ b/core/modules/parsers/wikiparser/rules/macrocallblock.js
@@ -29,7 +29,7 @@ exports.findNextMatch = function(startPos) {
var c = this.parser.source.charAt(nextCall.end);
// Ensure EOL after parsed macro
// If we didn't need to support IE, we'd just use /(?:\r?\n|$)/ym
- if ((c === "") || (c === "\n") || ((c === "\r") && this.parser.source.charAt(nextCall.end+1) === "\n")) {
+ if((c === "") || (c === "\n") || ((c === "\r") && this.parser.source.charAt(nextCall.end+1) === "\n")) {
this.nextCall = nextCall;
return nextStart;
}
diff --git a/core/modules/parsers/wikiparser/rules/macrocallinline.js b/core/modules/parsers/wikiparser/rules/macrocallinline.js
index bd6e777bbe..ba6070a773 100644
--- a/core/modules/parsers/wikiparser/rules/macrocallinline.js
+++ b/core/modules/parsers/wikiparser/rules/macrocallinline.js
@@ -42,3 +42,5 @@ exports.parse = function() {
this.parser.pos = call.end;
return [call];
};
+
+
diff --git a/core/modules/parsers/wikiparser/rules/macrodef.js b/core/modules/parsers/wikiparser/rules/macrodef.js
index 342f5aacd2..72cd4b434b 100644
--- a/core/modules/parsers/wikiparser/rules/macrodef.js
+++ b/core/modules/parsers/wikiparser/rules/macrodef.js
@@ -52,10 +52,11 @@ exports.parse = function() {
}
}
// Is the remainder of the \define line blank after the parameter close paren?
- var reEnd;
+ var reEnd,isBlock = true;
if(this.match[3]) {
// If so, it is a multiline definition and the end of the body is marked with \end
- reEnd = new RegExp("((?:^|\\r?\\n)[^\\S\\n\\r]*\\\\end[^\\S\\n\\r]*(?:" + $tw.utils.escapeRegExp(this.match[1]) + ")?(?:$|\\r?\\n))","mg");
+ isBlock = false;
+ reEnd = new RegExp("((?:^|\\r?\\n)[^\\S\\n\\r]*\\\\end[^\\S\\n\\r]*(?:" + $tw.utils.escapeRegExp(this.match[1]) + ")?\\s*?(?:$|\\r?\\n))","mg");
} else {
// Otherwise, the end of the definition is marked by the end of the line
reEnd = /($|\r?\n)/mg;
@@ -79,7 +80,8 @@ exports.parse = function() {
attributes: {},
children: [],
params: params,
- isMacroDefinition: true
+ isMacroDefinition: true,
+ isBlock: isBlock && !!endMatch
}];
$tw.utils.addAttributeToParseTreeNode(parseTreeNodes[0],"name",this.match[1]);
$tw.utils.addAttributeToParseTreeNode(parseTreeNodes[0],"value",text);
diff --git a/core/modules/parsers/wikiparser/rules/parsermode.js b/core/modules/parsers/wikiparser/rules/parsermode.js
index 868db3e151..f2ee6da3a5 100644
--- a/core/modules/parsers/wikiparser/rules/parsermode.js
+++ b/core/modules/parsers/wikiparser/rules/parsermode.js
@@ -31,6 +31,7 @@ Parse the most recent match
*/
exports.parse = function() {
// Move past the pragma invocation
+ var start = this.parser.pos;
this.parser.pos = this.matchRegExp.lastIndex;
// Parse whitespace delimited tokens terminated by a line break
var reMatch = /[^\S\n]*(\S+)|(\r?\n)/mg,
@@ -58,6 +59,11 @@ exports.parse = function() {
this.parser.parseAsInline = true;
}
}
- // No parse tree nodes to return
- return [];
+ return [{
+ type: "void",
+ children: [],
+ parseAsInline: this.parser.parseAsInline,
+ start: start,
+ end: this.parser.pos
+ }];
};
diff --git a/core/modules/parsers/wikiparser/rules/prettyextlink.js b/core/modules/parsers/wikiparser/rules/prettyextlink.js
index 2c575c2271..ea22c9365f 100644
--- a/core/modules/parsers/wikiparser/rules/prettyextlink.js
+++ b/core/modules/parsers/wikiparser/rules/prettyextlink.js
@@ -113,3 +113,5 @@ exports.parseLink = function(source,pos) {
node.end = closePos + 2;
return node;
};
+
+
diff --git a/core/modules/parsers/wikiparser/rules/prettylink.js b/core/modules/parsers/wikiparser/rules/prettylink.js
index 91579256dc..4f4fa0d2e3 100644
--- a/core/modules/parsers/wikiparser/rules/prettylink.js
+++ b/core/modules/parsers/wikiparser/rules/prettylink.js
@@ -32,7 +32,7 @@ exports.parse = function() {
var text = this.match[1],
link = this.match[2] || text,
textEndPos = this.parser.source.indexOf("|", start);
- if (textEndPos < 0 || textEndPos > this.matchRegExp.lastIndex) {
+ if(textEndPos < 0 || textEndPos > this.matchRegExp.lastIndex) {
textEndPos = this.matchRegExp.lastIndex - 2;
}
var linkStart = this.match[2] ? (start + this.match[1].length + 1) : start;
diff --git a/core/modules/parsers/wikiparser/rules/rules.js b/core/modules/parsers/wikiparser/rules/rules.js
index 7b37493087..a935bf238e 100644
--- a/core/modules/parsers/wikiparser/rules/rules.js
+++ b/core/modules/parsers/wikiparser/rules/rules.js
@@ -54,6 +54,13 @@ exports.parse = function() {
if(tokens.length > 0) {
this.parser.amendRules(tokens[0],tokens.slice(1));
}
- // No parse tree nodes to return
- return [];
+ // No widget to render, return void node.
+ return [{
+ type: "void",
+ attributes: {
+ action: {type: "string", value: tokens[0]},
+ rules: {type: "string", value: tokens.slice(1).join(" ")}
+ },
+ children: []
+ }];
};
diff --git a/core/modules/parsers/wikiparser/rules/styleblock.js b/core/modules/parsers/wikiparser/rules/styleblock.js
index 2abf2fc9e9..da93e79612 100644
--- a/core/modules/parsers/wikiparser/rules/styleblock.js
+++ b/core/modules/parsers/wikiparser/rules/styleblock.js
@@ -64,5 +64,8 @@ exports.parse = function() {
$tw.utils.addAttributeToParseTreeNode(tree[t],"style",styles.join(""));
}
}
- return tree;
+ return [{
+ type: "void",
+ children: tree
+ }]
};
diff --git a/core/modules/parsers/wikiparser/rules/styleinline.js b/core/modules/parsers/wikiparser/rules/styleinline.js
index 3aea0d266a..f8706f1379 100644
--- a/core/modules/parsers/wikiparser/rules/styleinline.js
+++ b/core/modules/parsers/wikiparser/rules/styleinline.js
@@ -21,7 +21,7 @@ exports.types = {inline: true};
exports.init = function(parser) {
this.parser = parser;
- // Regexp to match
+ // Regexp to match /@@(styles)?\s*(\.class\s+)?/
this.matchRegExp = /@@((?:[^\.\r\n\s:]+:[^\r\n;]+;)+)?(\.(?:[^\r\n\s]+)\s+)?/mg;
};
diff --git a/core/modules/parsers/wikiparser/rules/transcludeblock.js b/core/modules/parsers/wikiparser/rules/transcludeblock.js
index 525113d5d7..5c5367cb49 100644
--- a/core/modules/parsers/wikiparser/rules/transcludeblock.js
+++ b/core/modules/parsers/wikiparser/rules/transcludeblock.js
@@ -23,6 +23,27 @@ exports.init = function(parser) {
this.matchRegExp = /\{\{([^\{\}\|]*)(?:\|\|([^\|\{\}]+))?(?:\|([^\{\}]+))?\}\}(?:\r?\n|$)/mg;
};
+/*
+Reject the match if we don't have a template or text reference
+*/
+exports.findNextMatch = function(startPos) {
+ this.matchRegExp.lastIndex = startPos;
+ this.match = this.matchRegExp.exec(this.parser.source);
+ if(this.match) {
+ var template = $tw.utils.trim(this.match[2]),
+ textRef = $tw.utils.trim(this.match[1]);
+ // Bail if we don't have a template or text reference
+ if(!template && !textRef) {
+ return undefined;
+ } else {
+ return this.match.index;
+ }
+ } else {
+ return undefined;
+ }
+ return this.match ? this.match.index : undefined;
+};
+
exports.parse = function() {
// Move past the match
this.parser.pos = this.matchRegExp.lastIndex;
diff --git a/core/modules/parsers/wikiparser/rules/transcludeinline.js b/core/modules/parsers/wikiparser/rules/transcludeinline.js
index 4ae58e6175..57def3e33e 100644
--- a/core/modules/parsers/wikiparser/rules/transcludeinline.js
+++ b/core/modules/parsers/wikiparser/rules/transcludeinline.js
@@ -23,6 +23,27 @@ exports.init = function(parser) {
this.matchRegExp = /\{\{([^\{\}\|]*)(?:\|\|([^\|\{\}]+))?(?:\|([^\{\}]+))?\}\}/mg;
};
+/*
+Reject the match if we don't have a template or text reference
+*/
+exports.findNextMatch = function(startPos) {
+ this.matchRegExp.lastIndex = startPos;
+ this.match = this.matchRegExp.exec(this.parser.source);
+ if(this.match) {
+ var template = $tw.utils.trim(this.match[2]),
+ textRef = $tw.utils.trim(this.match[1]);
+ // Bail if we don't have a template or text reference
+ if(!template && !textRef) {
+ return undefined;
+ } else {
+ return this.match.index;
+ }
+ } else {
+ return undefined;
+ }
+ return this.match ? this.match.index : undefined;
+};
+
exports.parse = function() {
// Move past the match
this.parser.pos = this.matchRegExp.lastIndex;
diff --git a/core/modules/parsers/wikiparser/rules/typedblock.js b/core/modules/parsers/wikiparser/rules/typedblock.js
index 03fdc8e10c..7e988a9962 100644
--- a/core/modules/parsers/wikiparser/rules/typedblock.js
+++ b/core/modules/parsers/wikiparser/rules/typedblock.js
@@ -60,22 +60,37 @@ exports.parse = function() {
var parser = this.parser.wiki.parseText(parseType,text,{defaultType: "text/plain"});
// If there's no render type, just return the parse tree
if(!renderType) {
- return parser.tree;
+ return [{
+ type: "void",
+ children: $tw.utils.isArray(parser.tree) ? parser.tree : [parser.tree],
+ parseType: parseType,
+ renderType: renderType,
+ text: text,
+ start: start,
+ end: this.parser.pos
+ }];
} else {
// Otherwise, render to the rendertype and return in a <PRE> tag
var widgetNode = this.parser.wiki.makeWidget(parser),
container = $tw.fakeDocument.createElement("div");
widgetNode.render(container,null);
- text = renderType === "text/html" ? container.innerHTML : container.textContent;
+ var renderResult = renderType === "text/html" ? container.innerHTML : container.textContent;
+ // Use void node to carry important info for typedblock
return [{
- type: "element",
- tag: "pre",
+ type: "void",
children: [{
- type: "text",
- text: text,
- start: start,
- end: this.parser.pos
- }]
+ type: "element",
+ tag: "pre",
+ children: [{
+ type: "text",
+ text: renderResult,
+ }]
+ }],
+ parseType: parseType,
+ renderType: renderType,
+ text: text,
+ start: start,
+ end: this.parser.pos
}];
}
};
diff --git a/core/modules/parsers/wikiparser/wikiparser.js b/core/modules/parsers/wikiparser/wikiparser.js
index 3d1379fd47..ab4bab11ea 100644
--- a/core/modules/parsers/wikiparser/wikiparser.js
+++ b/core/modules/parsers/wikiparser/wikiparser.js
@@ -215,8 +215,8 @@ WikiParser.prototype.parsePragmas = function() {
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;
+ 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);
@@ -245,9 +245,9 @@ WikiParser.prototype.parseBlock = function(terminatorRegExpString) {
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;
+ 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;
@@ -256,7 +256,7 @@ WikiParser.prototype.parseBlock = function(terminatorRegExpString) {
var start = this.pos;
var children = this.parseInlineRun(terminatorRegExp);
var end = this.pos;
- return [{type: "element", tag: "p", children: children, start: start, end: end }];
+ return [{type: "element", tag: "p", children: children, start: start, end: end, rule: "parseblock" }];
};
/*
@@ -350,10 +350,10 @@ WikiParser.prototype.parseInlineRunUnterminated = function(options) {
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) {
+ 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;
+ 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);
@@ -410,9 +410,9 @@ WikiParser.prototype.parseInlineRunTerminatedExtended = function(terminatorRegEx
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;
+ 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);
diff --git a/core/modules/savers/download.js b/core/modules/savers/download.js
index 9d046d24ac..156dea1444 100644
--- a/core/modules/savers/download.js
+++ b/core/modules/savers/download.js
@@ -35,7 +35,9 @@ DownloadSaver.prototype.save = function(text,method,callback,options) {
}
// Set up the link
var link = document.createElement("a");
- if(Blob !== undefined) {
+ // We prefer Blobs if they're available, unless we're dealing with a tiddler type declaring itself full of base64 encoded content.
+ // Then we use data urls, because browsers will know to decode the stream and download the actual binary file as intended.
+ if(Blob !== undefined && !type.includes(";base64")) {
var blob = new Blob([text], {type: type});
link.setAttribute("href", URL.createObjectURL(blob));
} else {
diff --git a/core/modules/savers/postmessage.js b/core/modules/savers/postmessage.js
new file mode 100644
index 0000000000..6483edc435
--- /dev/null
+++ b/core/modules/savers/postmessage.js
@@ -0,0 +1,66 @@
+/*\
+title: $:/core/modules/savers/postmessage.js
+type: application/javascript
+module-type: saver
+
+Handles saving changes via window.postMessage() to the window.parent
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+/*
+Select the appropriate saver module and set it up
+*/
+var PostMessageSaver = function(wiki) {
+ this.publisher = new $tw.utils.BrowserMessagingPublisher({type: "SAVE"});
+};
+
+PostMessageSaver.prototype.save = function(text,method,callback,options) {
+ // Fail if the publisher hasn't been fully initialised
+ if(!this.publisher.canSend()) {
+ return false;
+ }
+ // Send the save request
+ this.publisher.send({
+ verb: "SAVE",
+ body: text
+ },function(err) {
+ if(err) {
+ callback("PostMessageSaver Error: " + err);
+ } else {
+ callback(null);
+ }
+ });
+ // Indicate that we handled the save
+ return true;
+};
+
+/*
+Information about this saver
+*/
+PostMessageSaver.prototype.info = {
+ name: "postmessage",
+ capabilities: ["save", "autosave"],
+ priority: 100
+};
+
+/*
+Static method that returns true if this saver is capable of working
+*/
+exports.canSave = function(wiki) {
+ // Provisionally say that we can save
+ return true;
+};
+
+/*
+Create an instance of this saver
+*/
+exports.create = function(wiki) {
+ return new PostMessageSaver(wiki);
+};
+
+})();
diff --git a/core/modules/savers/upload.js b/core/modules/savers/upload.js
index 7f17d77bde..35e05286e8 100644
--- a/core/modules/savers/upload.js
+++ b/core/modules/savers/upload.js
@@ -44,7 +44,7 @@ UploadSaver.prototype.save = function(text,method,callback) {
}
// Construct the url if not provided
if(!url) {
- url = "http://" + username + ".tiddlyspot.com/store.cgi";
+ url = "http://" + username + ".tiddlyhost.com/";
}
// Assemble the header
var boundary = "---------------------------" + "AaB03x";
diff --git a/core/modules/server/routes/get-file.js b/core/modules/server/routes/get-file.js
deleted file mode 100644
index 39681de4c3..0000000000
--- a/core/modules/server/routes/get-file.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/*\
-title: $:/core/modules/server/routes/get-file.js
-type: application/javascript
-module-type: route
-
-GET /files/:filepath
-
-\*/
-"use strict";
-
-exports.method = "GET";
-
-exports.path = /^\/files\/(.+)$/;
-
-exports.handler = function(request,response,state) {
- var path = require("path"),
- fs = require("fs"),
- util = require("util"),
- suppliedFilename = $tw.utils.decodeURIComponentSafe(state.params[0]),
- baseFilename = path.resolve(state.boot.wikiPath,"files"),
- filename = path.resolve(baseFilename,suppliedFilename),
- extension = path.extname(filename);
- // Check that the filename is inside the wiki files folder
- if(path.relative(baseFilename,filename).indexOf("..") !== 0) {
- // Send the file
- fs.readFile(filename,function(err,content) {
- var status,content,type = "text/plain";
- if(err) {
- console.log("Error accessing file " + filename + ": " + err.toString());
- status = 404;
- content = "File '" + suppliedFilename + "' not found";
- } else {
- status = 200;
- content = content;
- type = ($tw.config.fileExtensionInfo[extension] ? $tw.config.fileExtensionInfo[extension].type : "application/octet-stream");
- }
- state.sendResponse(status,{"Content-Type": type},content);
- });
- } else {
- state.sendResponse(404,{"Content-Type": "text/plain"},"File '" + suppliedFilename + "' not found");
- }
-};
diff --git a/core/modules/startup/eventbus.js b/core/modules/startup/eventbus.js
new file mode 100644
index 0000000000..0ad69fb27f
--- /dev/null
+++ b/core/modules/startup/eventbus.js
@@ -0,0 +1,46 @@
+/*\
+title: $:/core/modules/startup/eventbus.js
+type: application/javascript
+module-type: startup
+
+Event bus for cross module communication
+\*/
+
+exports.name = "eventbus";
+exports.platforms = ["browser"];
+exports.before = ["windows"];
+exports.synchronous = true;
+
+$tw.eventBus = {
+ listenersMap: new Map(),
+
+ on(event,handler) {
+ if(!this.listenersMap.has(event)) {
+ this.listenersMap.set(event,new Set());
+ }
+ const listeners = this.listenersMap.get(event);
+ listeners.add(handler);
+ },
+
+ off(event,handler) {
+ const listeners = this.listenersMap.get(event);
+ if(listeners) {
+ listeners.delete(handler);
+ }
+ },
+
+ once(event,handler) {
+ const wrapper = (...args) => {
+ handler(...args);
+ this.off(event, wrapper);
+ };
+ this.on(event, wrapper);
+ },
+
+ emit(event,data) {
+ const listeners = this.listenersMap.get(event);
+ if(listeners) {
+ listeners.forEach(fn => fn(data));
+ }
+ }
+};
diff --git a/core/modules/startup/favicon.js b/core/modules/startup/favicon.js
index d1a7c56770..895b46f6c2 100644
--- a/core/modules/startup/favicon.js
+++ b/core/modules/startup/favicon.js
@@ -19,6 +19,16 @@ exports.synchronous = true;
var FAVICON_TITLE = "$:/favicon.ico";
exports.startup = function() {
+ var setFavicon = function() {
+ var tiddler = $tw.wiki.getTiddler(FAVICON_TITLE);
+ if(tiddler) {
+ var faviconLink = document.getElementById("faviconLink"),
+ dataURI = $tw.utils.makeDataUri(tiddler.fields.text,tiddler.fields.type,tiddler.fields._canonical_uri);
+ faviconLink.setAttribute("href",dataURI);
+ $tw.faviconPublisher.send({verb: "FAVICON",body: dataURI});
+ }
+ }
+ $tw.faviconPublisher = new $tw.utils.BrowserMessagingPublisher({type: "FAVICON", onsubscribe: setFavicon});
// Set up the favicon
setFavicon();
// Reset the favicon when the tiddler changes
@@ -28,11 +38,3 @@ exports.startup = function() {
}
});
};
-
-function setFavicon() {
- var tiddler = $tw.wiki.getTiddler(FAVICON_TITLE);
- if(tiddler) {
- var faviconLink = document.getElementById("faviconLink");
- faviconLink.setAttribute("href",$tw.utils.makeDataUri(tiddler.fields.text,tiddler.fields.type,tiddler.fields._canonical_uri));
- }
-}
diff --git a/core/modules/startup/info.js b/core/modules/startup/info.js
index a5767ed341..dc65557c7d 100644
--- a/core/modules/startup/info.js
+++ b/core/modules/startup/info.js
@@ -19,11 +19,17 @@ var TITLE_INFO_PLUGIN = "$:/temp/info-plugin";
exports.startup = function() {
// Function to bake the info plugin with new tiddlers
- var updateInfoPlugin = function(tiddlerFieldsArray) {
+ // additions: array of tiddler field objects
+ // removals: array of titles to remove
+ var updateInfoPlugin = function(additions = [], removals = []) {
// Get the existing tiddlers
var json = $tw.wiki.getTiddlerData(TITLE_INFO_PLUGIN,{tiddlers: {}});
- // Add the new ones
- $tw.utils.each(tiddlerFieldsArray,function(fields) {
+ $tw.utils.each(removals,function(title) {
+ if(json.tiddlers[title]) {
+ delete json.tiddlers[title];
+ }
+ });
+ $tw.utils.each(additions,function(fields) {
if(fields && fields.title) {
json.tiddlers[fields.title] = fields;
}
@@ -47,7 +53,7 @@ exports.startup = function() {
}
});
updateInfoPlugin(tiddlerFieldsArray);
- var changes = $tw.wiki.readPluginInfo([TITLE_INFO_PLUGIN]);
+ $tw.wiki.readPluginInfo([TITLE_INFO_PLUGIN]);
$tw.wiki.registerPluginTiddlers("info",[TITLE_INFO_PLUGIN]);
$tw.wiki.unpackPluginTiddlers();
};
diff --git a/core/modules/startup/load-modules.js b/core/modules/startup/load-modules.js
index cf0a8232dd..c94335fb7e 100644
--- a/core/modules/startup/load-modules.js
+++ b/core/modules/startup/load-modules.js
@@ -31,5 +31,7 @@ exports.startup = function() {
$tw.modules.applyMethods("tiddlerdeserializer",$tw.Wiki.tiddlerDeserializerModules);
$tw.macros = $tw.modules.getModulesByTypeAsHashmap("macro");
$tw.wiki.initParsers();
- $tw.Commander.initCommands();
+ if($tw.node) {
+ $tw.Commander.initCommands();
+ }
};
diff --git a/core/modules/startup/render.js b/core/modules/startup/render.js
index 13cbb03564..43ef48207a 100644
--- a/core/modules/startup/render.js
+++ b/core/modules/startup/render.js
@@ -33,10 +33,15 @@ exports.startup = function() {
});
$tw.titleContainer = $tw.fakeDocument.createElement("div");
$tw.titleWidgetNode.render($tw.titleContainer,null);
- document.title = $tw.titleContainer.textContent;
+ var publishTitle = function() {
+ $tw.titlePublisher.send({verb: "PAGETITLE",body: document.title});
+ document.title = $tw.titleContainer.textContent;
+ };
+ $tw.titlePublisher = new $tw.utils.BrowserMessagingPublisher({type: "PAGETITLE", onsubscribe: publishTitle});
+ publishTitle();
$tw.wiki.addEventListener("change",function(changes) {
if($tw.titleWidgetNode.refresh(changes,$tw.titleContainer,null)) {
- document.title = $tw.titleContainer.textContent;
+ publishTitle();
}
});
// Set up the styles
diff --git a/core/modules/startup/rootwidget.js b/core/modules/startup/rootwidget.js
index b30e03e7b8..30a6c960c8 100644
--- a/core/modules/startup/rootwidget.js
+++ b/core/modules/startup/rootwidget.js
@@ -74,9 +74,8 @@ exports.startup = function() {
$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,
- plainText: event.paramObject && event.paramObject.plainText
- },event.paramObject && event.paramObject.type);
+ failureNotification: event.paramObject && event.paramObject.failureNotification
+ });
});
// Install the tm-focus-selector message
$tw.rootWidget.addEventListener("tm-focus-selector",function(event) {
diff --git a/core/modules/startup/windows.js b/core/modules/startup/windows.js
index 8506a9866a..39a2f59d62 100644
--- a/core/modules/startup/windows.js
+++ b/core/modules/startup/windows.js
@@ -56,9 +56,11 @@ exports.startup = function() {
srcDocument.write("<!DOCTYPE html><head></head><body class='tc-body tc-single-tiddler-window'></body></html>");
srcDocument.close();
srcDocument.title = windowTitle;
+ $tw.eventBus.emit("window:opened",{windowID, window: srcWindow});
srcWindow.addEventListener("beforeunload",function(event) {
delete $tw.windows[windowID];
$tw.wiki.removeEventListener("change",refreshHandler);
+ $tw.eventBus.emit("window:closed",{windowID});
},false);
// Set up the styles
var styleWidgetNode = $tw.wiki.makeTranscludeWidget("$:/core/ui/PageStylesheet",{
diff --git a/core/modules/storyviews/classic.js b/core/modules/storyviews/classic.js
index c1f1c0e0f1..341c512214 100644
--- a/core/modules/storyviews/classic.js
+++ b/core/modules/storyviews/classic.js
@@ -47,16 +47,16 @@ ClassicStoryView.prototype.insert = function(widget) {
// Reset the margin once the transition is over
setTimeout(function() {
$tw.utils.setStyle(targetElement,[
- {transition: "none"},
{marginBottom: ""}
]);
+ $tw.utils.removeStyle(targetElement, "transition");
},duration);
// Set up the initial position of the element
$tw.utils.setStyle(targetElement,[
- {transition: "none"},
{marginBottom: (-currHeight) + "px"},
{opacity: "0.0"}
]);
+ $tw.utils.removeStyle(targetElement, "transition");
$tw.utils.forceLayout(targetElement);
// Transition to the final position
$tw.utils.setStyle(targetElement,[
@@ -64,7 +64,7 @@ ClassicStoryView.prototype.insert = function(widget) {
"margin-bottom " + duration + "ms " + easing},
{marginBottom: currMarginBottom + "px"},
{opacity: "1.0"}
- ]);
+ ]);
}
};
@@ -94,11 +94,9 @@ ClassicStoryView.prototype.remove = function(widget) {
setTimeout(removeElement,duration);
// Animate the closure
$tw.utils.setStyle(targetElement,[
- {transition: "none"},
- {transform: "translateX(0px)"},
{marginBottom: currMarginBottom + "px"},
- {opacity: "1.0"}
]);
+ $tw.utils.removeStyles(targetElement, ["transition", "transform", "opacity"]);
$tw.utils.forceLayout(targetElement);
$tw.utils.setStyle(targetElement,[
{transition: $tw.utils.roundTripPropertyName("transform") + " " + duration + "ms " + easing + ", " +
@@ -113,4 +111,4 @@ ClassicStoryView.prototype.remove = function(widget) {
}
};
-exports.classic = ClassicStoryView;
+exports.classic = ClassicStoryView;
\ No newline at end of file
diff --git a/core/modules/storyviews/pop.js b/core/modules/storyviews/pop.js
index cbf649b184..96bc6819ef 100644
--- a/core/modules/storyviews/pop.js
+++ b/core/modules/storyviews/pop.js
@@ -37,10 +37,7 @@ PopStoryView.prototype.insert = function(widget) {
}
// Reset once the transition is over
setTimeout(function() {
- $tw.utils.setStyle(targetElement,[
- {transition: "none"},
- {transform: "none"}
- ]);
+ $tw.utils.removeStyles(targetElement, ["transition", "transform"]);
$tw.utils.setStyle(widget.document.body,[
{"overflow-x": ""}
]);
@@ -51,10 +48,10 @@ PopStoryView.prototype.insert = function(widget) {
]);
// Set up the initial position of the element
$tw.utils.setStyle(targetElement,[
- {transition: "none"},
{transform: "scale(2)"},
{opacity: "0.0"}
]);
+ $tw.utils.removeStyle(targetElement, "transition");
$tw.utils.forceLayout(targetElement);
// Transition to the final position
$tw.utils.setStyle(targetElement,[
@@ -63,6 +60,9 @@ PopStoryView.prototype.insert = function(widget) {
{transform: "scale(1)"},
{opacity: "1.0"}
]);
+ setTimeout(function() {
+ $tw.utils.removeStyles(targetElement, ["transition", "transform", "opactity"]);
+ }, duration)
};
PopStoryView.prototype.remove = function(widget) {
@@ -81,11 +81,7 @@ PopStoryView.prototype.remove = function(widget) {
// Remove the element at the end of the transition
setTimeout(removeElement,duration);
// Animate the closure
- $tw.utils.setStyle(targetElement,[
- {transition: "none"},
- {transform: "scale(1)"},
- {opacity: "1.0"}
- ]);
+ $tw.utils.removeStyles(targetElement, ["transition", "transform", "opacity"]);
$tw.utils.forceLayout(targetElement);
$tw.utils.setStyle(targetElement,[
{transition: $tw.utils.roundTripPropertyName("transform") + " " + duration + "ms ease-in-out, " +
@@ -95,4 +91,4 @@ PopStoryView.prototype.remove = function(widget) {
]);
};
-exports.pop = PopStoryView;
+exports.pop = PopStoryView;
\ No newline at end of file
diff --git a/core/modules/storyviews/zoomin.js b/core/modules/storyviews/zoomin.js
index e5c5b88a80..4ddba71742 100644
--- a/core/modules/storyviews/zoomin.js
+++ b/core/modules/storyviews/zoomin.js
@@ -96,6 +96,9 @@ ZoominListView.prototype.navigateTo = function(historyInfo) {
{transform: "translateX(0px) translateY(0px) scale(1)"},
{zIndex: "500"},
]);
+ setTimeout(function() {
+ $tw.utils.removeStyles(targetElement, ["transition", "opacity", "transform", "zIndex"]);
+ }, duration);
// Transform the previous tiddler out of the way and then hide it
if(prevCurrentTiddler && prevCurrentTiddler !== targetElement) {
scale = zoomBounds.width / sourceBounds.width;
@@ -207,6 +210,9 @@ ZoominListView.prototype.remove = function(widget) {
{opacity: "0"},
{zIndex: "0"}
]);
+ setTimeout(function() {
+ $tw.utils.removeStyles(toWidgetDomNode, ["transformOrigin", "transform", "transition", "opacity", "zIndex"]);
+ }, duration);
setTimeout(removeElement,duration);
// Now the tiddler we're going back to
if(toWidgetDomNode) {
@@ -222,4 +228,4 @@ ZoominListView.prototype.logTextNodeRoot = function(node) {
this.textNodeLogger.log($tw.language.getString("Error/ZoominTextNode") + " " + node.textContent);
};
-exports.zoomin = ZoominListView;
+exports.zoomin = ZoominListView;
\ No newline at end of file
diff --git a/core/modules/utils/base64-utf8/base64-utf8.module.js b/core/modules/utils/base64-utf8/base64-utf8.module.js
deleted file mode 100644
index 8bd4e272de..0000000000
--- a/core/modules/utils/base64-utf8/base64-utf8.module.js
+++ /dev/null
@@ -1,142 +0,0 @@
-// From https://gist.github.com/Nijikokun/5192472
-//
-// UTF8 Module
-//
-// Cleaner and modularized utf-8 encoding and decoding library for javascript.
-//
-// copyright: MIT
-// author: Nijiko Yonskai, @nijikokun, nijikokun@gmail.com
-(function (name, definition, context, dependencies) {
- if (typeof context['module'] !== 'undefined' && context['module']['exports']) { if (dependencies && context['require']) { for (var i = 0; i < dependencies.length; i++) context[dependencies[i]] = context['require'](dependencies[i]); } context['module']['exports'] = definition.apply(context); }
- else if (typeof context['define'] !== 'undefined' && context['define'] === 'function' && context['define']['amd']) { define(name, (dependencies || []), definition); }
- else { context[name] = definition.apply(context); }
-})('utf8', function () {
- return {
- encode: function (string) {
- if (typeof string !== 'string') return string;
- else string = string.replace(/\r\n/g, "\n");
- var output = "", i = 0, charCode;
-
- for (i; i < string.length; i++) {
- charCode = string.charCodeAt(i);
-
- if (charCode < 128) {
- output += String.fromCharCode(charCode);
- } else if ((charCode > 127) && (charCode < 2048)) {
- output += String.fromCharCode((charCode >> 6) | 192);
- output += String.fromCharCode((charCode & 63) | 128);
- } else if ((charCode > 55295) && (charCode < 57344) && string.length > i+1) {
- // Surrogate pair
- var hiSurrogate = charCode;
- var loSurrogate = string.charCodeAt(i+1);
- i++; // Skip the low surrogate on the next loop pass
- var codePoint = (((hiSurrogate - 55296) << 10) | (loSurrogate - 56320)) + 65536;
- output += String.fromCharCode((codePoint >> 18) | 240);
- output += String.fromCharCode(((codePoint >> 12) & 63) | 128);
- output += String.fromCharCode(((codePoint >> 6) & 63) | 128);
- output += String.fromCharCode((codePoint & 63) | 128);
- } else {
- // Not a surrogate pair, or a dangling surrogate without its partner that we'll just encode as-is
- output += String.fromCharCode((charCode >> 12) | 224);
- output += String.fromCharCode(((charCode >> 6) & 63) | 128);
- output += String.fromCharCode((charCode & 63) | 128);
- }
- }
-
- return output;
- },
-
- decode: function (string) {
- if (typeof string !== 'string') return string;
- var output = "", i = 0, charCode = 0;
-
- while (i < string.length) {
- charCode = string.charCodeAt(i);
-
- if (charCode < 128) {
- output += String.fromCharCode(charCode),
- i++;
- } else if ((charCode > 191) && (charCode < 224)) {
- output += String.fromCharCode(((charCode & 31) << 6) | (string.charCodeAt(i + 1) & 63));
- i += 2;
- } else if ((charCode > 223) && (charCode < 240)) {
- output += String.fromCharCode(((charCode & 15) << 12) | ((string.charCodeAt(i + 1) & 63) << 6) | (string.charCodeAt(i + 2) & 63));
- i += 3;
- } else {
- var codePoint = ((charCode & 7) << 18) | ((string.charCodeAt(i + 1) & 63) << 12) | ((string.charCodeAt(i + 2) & 63) << 6) | (string.charCodeAt(i + 3) & 63);
- // output += String.fromCodePoint(codePoint); // Can't do this because Internet Explorer doesn't have String.fromCodePoint
- output += String.fromCharCode(((codePoint - 65536) >> 10) + 55296) + String.fromCharCode(((codePoint - 65536) & 1023) + 56320); // So we do this instead
- i += 4;
- }
- }
-
- return output;
- }
- };
-}, this);
-
-// Base64 Module
-//
-// Cleaner, modularized and properly scoped base64 encoding and decoding module for strings.
-//
-// copyright: MIT
-// author: Nijiko Yonskai, @nijikokun, nijikokun@gmail.com
-(function (name, definition, context, dependencies) {
- if (typeof context['module'] !== 'undefined' && context['module']['exports']) { if (dependencies && context['require']) { for (var i = 0; i < dependencies.length; i++) context[dependencies[i]] = context['require'](dependencies[i]); } context['module']['exports'] = definition.apply(context); }
- else if (typeof context['define'] !== 'undefined' && context['define'] === 'function' && context['define']['amd']) { define(name, (dependencies || []), definition); }
- else { context[name] = definition.apply(context); }
-})('base64', function (utf8) {
- var $this = this;
- var $utf8 = utf8 || this.utf8;
- var map = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
-
- return {
- encode: function (input) {
- if (typeof $utf8 === 'undefined') throw { error: "MissingMethod", message: "UTF8 Module is missing." };
- if (typeof input !== 'string') return input;
- else input = $utf8.encode(input);
- var output = "", a, b, c, d, e, f, g, i = 0;
-
- while (i < input.length) {
- a = input.charCodeAt(i++);
- b = input.charCodeAt(i++);
- c = input.charCodeAt(i++);
- d = a >> 2;
- e = ((a & 3) << 4) | (b >> 4);
- f = ((b & 15) << 2) | (c >> 6);
- g = c & 63;
-
- if (isNaN(b)) f = g = 64;
- else if (isNaN(c)) g = 64;
-
- output += map.charAt(d) + map.charAt(e) + map.charAt(f) + map.charAt(g);
- }
-
- return output;
- },
-
- decode: function (input) {
- if (typeof $utf8 === 'undefined') throw { error: "MissingMethod", message: "UTF8 Module is missing." };
- if (typeof input !== 'string') return input;
- else input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
- var output = "", a, b, c, d, e, f, g, i = 0;
-
- while (i < input.length) {
- d = map.indexOf(input.charAt(i++));
- e = map.indexOf(input.charAt(i++));
- f = map.indexOf(input.charAt(i++));
- g = map.indexOf(input.charAt(i++));
-
- a = (d << 2) | (e >> 4);
- b = ((e & 15) << 4) | (f >> 2);
- c = ((f & 3) << 6) | g;
-
- output += String.fromCharCode(a);
- if (f != 64) output += String.fromCharCode(b);
- if (g != 64) output += String.fromCharCode(c);
- }
-
- return $utf8.decode(output);
- }
- }
-}, this, [ "utf8" ]);
\ No newline at end of file
diff --git a/core/modules/utils/base64-utf8/base64-utf8.module.min.js b/core/modules/utils/base64-utf8/base64-utf8.module.min.js
deleted file mode 100644
index f2f808004a..0000000000
--- a/core/modules/utils/base64-utf8/base64-utf8.module.min.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// From https://gist.github.com/Nijikokun/5192472
-//
-// UTF8 Module
-//
-// Cleaner and modularized utf-8 encoding and decoding library for javascript.
-//
-// copyright: MIT
-// author: Nijiko Yonskai, @nijikokun, nijikokun@gmail.com
-!function(r,e,o,t){void 0!==o.module&&o.module.exports?o.module.exports=e.apply(o):void 0!==o.define&&"function"===o.define&&o.define.amd?define("utf8",[],e):o.utf8=e.apply(o)}(0,function(){return{encode:function(r){if("string"!=typeof r)return r;r=r.replace(/\r\n/g,"\n");for(var e,o="",t=0;t<r.length;t++)if((e=r.charCodeAt(t))<128)o+=String.fromCharCode(e);else if(e>127&&e<2048)o+=String.fromCharCode(e>>6|192),o+=String.fromCharCode(63&e|128);else if(e>55295&&e<57344&&r.length>t+1){var i=e,n=r.charCodeAt(t+1);t++;var d=65536+(i-55296<<10|n-56320);o+=String.fromCharCode(d>>18|240),o+=String.fromCharCode(d>>12&63|128),o+=String.fromCharCode(d>>6&63|128),o+=String.fromCharCode(63&d|128)}else o+=String.fromCharCode(e>>12|224),o+=String.fromCharCode(e>>6&63|128),o+=String.fromCharCode(63&e|128);return o},decode:function(r){if("string"!=typeof r)return r;for(var e="",o=0,t=0;o<r.length;)if((t=r.charCodeAt(o))<128)e+=String.fromCharCode(t),o++;else if(t>191&&t<224)e+=String.fromCharCode((31&t)<<6|63&r.charCodeAt(o+1)),o+=2;else if(t>223&&t<240)e+=String.fromCharCode((15&t)<<12|(63&r.charCodeAt(o+1))<<6|63&r.charCodeAt(o+2)),o+=3;else{var i=(7&t)<<18|(63&r.charCodeAt(o+1))<<12|(63&r.charCodeAt(o+2))<<6|63&r.charCodeAt(o+3);e+=String.fromCharCode(55296+(i-65536>>10))+String.fromCharCode(56320+(i-65536&1023)),o+=4}return e}}},this),function(r,e,o,t){if(void 0!==o.module&&o.module.exports){if(t&&o.require)for(var i=0;i<t.length;i++)o[t[i]]=o.require(t[i]);o.module.exports=e.apply(o)}else void 0!==o.define&&"function"===o.define&&o.define.amd?define("base64",t||[],e):o.base64=e.apply(o)}(0,function(r){var e=r||this.utf8,o="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";return{encode:function(r){if(void 0===e)throw{error:"MissingMethod",message:"UTF8 Module is missing."};if("string"!=typeof r)return r;r=e.encode(r);for(var t,i,n,d,f,a,h,C="",c=0;c<r.length;)d=(t=r.charCodeAt(c++))>>2,f=(3&t)<<4|(i=r.charCodeAt(c++))>>4,a=(15&i)<<2|(n=r.charCodeAt(c++))>>6,h=63&n,isNaN(i)?a=h=64:isNaN(n)&&(h=64),C+=o.charAt(d)+o.charAt(f)+o.charAt(a)+o.charAt(h);return C},decode:function(r){if(void 0===e)throw{error:"MissingMethod",message:"UTF8 Module is missing."};if("string"!=typeof r)return r;r=r.replace(/[^A-Za-z0-9\+\/\=]/g,"");for(var t,i,n,d,f,a,h="",C=0;C<r.length;)t=o.indexOf(r.charAt(C++))<<2|(d=o.indexOf(r.charAt(C++)))>>4,i=(15&d)<<4|(f=o.indexOf(r.charAt(C++)))>>2,n=(3&f)<<6|(a=o.indexOf(r.charAt(C++))),h+=String.fromCharCode(t),64!=f&&(h+=String.fromCharCode(i)),64!=a&&(h+=String.fromCharCode(n));return e.decode(h)}}},this,["utf8"]);
\ No newline at end of file
diff --git a/core/modules/utils/base64-utf8/tiddlywiki.files b/core/modules/utils/base64-utf8/tiddlywiki.files
deleted file mode 100644
index b12e7dfb92..0000000000
--- a/core/modules/utils/base64-utf8/tiddlywiki.files
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "tiddlers": [
- {
- "file": "base64-utf8.module.min.js",
- "fields": {
- "type": "application/javascript",
- "title": "$:/core/modules/utils/base64-utf8/base64-utf8.module.js",
- "module-type": "library"
- },
- "prefix": "(function(){",
- "suffix": "}).call(exports);"
- }
- ]
-}
diff --git a/core/modules/utils/dom/browser.js b/core/modules/utils/dom/browser.js
index 7501d4154c..11905a1fec 100644
--- a/core/modules/utils/dom/browser.js
+++ b/core/modules/utils/dom/browser.js
@@ -24,6 +24,26 @@ exports.setStyle = function(element,styles) {
}
};
+/*
+Remove style properties of an element
+ element: dom node
+ styleProperties: ordered array of string property names
+*/
+exports.removeStyles = function(element, styleProperties) {
+ for (var i=0; i<styleProperties.length; i++) {
+ element.style.removeProperty($tw.utils.convertStyleNameToPropertyName(styleProperties[i]));
+ }
+}
+
+/*
+Remove single style property of an element
+ element: dom node
+ styleProperty: string property name
+*/
+exports.removeStyle = function(element, styleProperty) {
+ $tw.utils.removeStyles(element, [styleProperty])
+}
+
/*
Converts a standard CSS property name into the local browser-specific equivalent. For example:
"background-color" --> "backgroundColor"
diff --git a/core/modules/utils/dom/dom.js b/core/modules/utils/dom/dom.js
index a5b14ff784..849c5a88b6 100644
--- a/core/modules/utils/dom/dom.js
+++ b/core/modules/utils/dom/dom.js
@@ -265,10 +265,9 @@ exports.copyStyles = function(srcDomNode,dstDomNode) {
/*
Copy plain text to the clipboard on browsers that support it
*/
-exports.copyToClipboard = function(text,options,type) {
- var text = text || "";
- var options = options || {};
- var type = type || "text/plain";
+exports.copyToClipboard = function(text,options) {
+ options = options || {};
+ text = text || "";
var textArea = document.createElement("textarea");
textArea.style.position = "fixed";
textArea.style.top = 0;
@@ -281,16 +280,10 @@ exports.copyToClipboard = function(text,options,type) {
textArea.style.outline = "none";
textArea.style.boxShadow = "none";
textArea.style.background = "transparent";
+ textArea.value = text;
document.body.appendChild(textArea);
textArea.select();
textArea.setSelectionRange(0,text.length);
- textArea.addEventListener("copy",function(event) {
- event.preventDefault();
- if (options.plainText) {
- event.clipboardData.setData("text/plain",options.plainText);
- }
- event.clipboardData.setData(type,text);
- });
var succeeded = false;
try {
succeeded = document.execCommand("copy");
diff --git a/core/modules/utils/dom/modal.js b/core/modules/utils/dom/modal.js
index cd827c3be8..a7b538ec3a 100644
--- a/core/modules/utils/dom/modal.js
+++ b/core/modules/utils/dom/modal.js
@@ -143,6 +143,7 @@ Modal.prototype.display = function(title,options) {
link.setAttribute("href",tiddler.fields.help);
link.setAttribute("target","_blank");
link.setAttribute("rel","noopener noreferrer");
+ link.setAttribute("class","tc-tiddlylink-external");
link.appendChild(this.srcDocument.createTextNode("Help"));
modalFooterHelp.appendChild(link);
modalFooterHelp.style.float = "left";
@@ -209,7 +210,7 @@ Modal.prototype.display = function(title,options) {
bodyWidgetNode.addEventListener("tm-close-tiddler",closeHandler,false);
footerWidgetNode.addEventListener("tm-close-tiddler",closeHandler,false);
// Whether to close the modal dialog when the mask (area outside the modal) is clicked
- if(tiddler.fields && (tiddler.fields["mask-closable"] === "yes" || tiddler.fields["mask-closable"] === "true")) {
+ if(tiddler.fields && (tiddler.fields["mask-closable"] === "yes" || tiddler.fields["mask-closable"] === "true" || tiddler.fields["mask-closable"] === "" || "mask-closable" in tiddler.fields === false)) {
modalBackdrop.addEventListener("click",closeHandler,false);
}
// Set the initial styles for the message
diff --git a/core/modules/utils/messaging.js b/core/modules/utils/messaging.js
new file mode 100644
index 0000000000..c7467f8b9d
--- /dev/null
+++ b/core/modules/utils/messaging.js
@@ -0,0 +1,126 @@
+/*\
+title: $:/core/modules/utils/messaging.js
+type: application/javascript
+module-type: utils-browser
+
+Messaging utilities for use with window.postMessage() etc.
+
+This module intentionally has no dependencies so that it can be included in non-TiddlyWiki projects
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+var RESPONSE_TIMEOUT = 2 * 1000;
+
+/*
+Class to handle subscribing to publishers
+
+target: Target window (eg iframe.contentWindow)
+type: String indicating type of item for which subscriptions are being provided (eg "SAVING")
+onsubscribe: Function to be invoked with err parameter when the subscription is established, or there is a timeout
+onmessage: Function to be invoked when a new message arrives, invoked with (data,callback). The callback is invoked with the argument (response)
+*/
+function BrowserMessagingSubscriber(options) {
+ var self = this;
+ this.target = options.target;
+ this.type = options.type;
+ this.onsubscribe = options.onsubscribe || function() {};
+ this.onmessage = options.onmessage;
+ this.hasConfirmed = false;
+ this.channel = new MessageChannel();
+ this.channel.port1.addEventListener("message",function(event) {
+ if(this.timerID) {
+ clearTimeout(this.timerID);
+ this.timerID = null;
+ }
+ if(event.data) {
+ if(event.data.verb === "SUBSCRIBED") {
+ self.hasConfirmed = true;
+ self.onsubscribe(null);
+ } else if(event.data.verb === self.type) {
+ self.onmessage(event.data,function(response) {
+ // Send the response back on the supplied port, and then close it
+ event.ports[0].postMessage(response);
+ event.ports[0].close();
+ });
+ }
+ }
+ });
+ // Set a timer so that if we don't hear from the iframe before a timeout we alert the user
+ this.timerID = setTimeout(function() {
+ if(!self.hasConfirmed) {
+ self.onsubscribe("NO_RESPONSE");
+ }
+ },RESPONSE_TIMEOUT);
+ this.channel.port1.start();
+ this.target.postMessage({verb: "SUBSCRIBE",to: self.type},"*",[this.channel.port2]);
+}
+
+exports.BrowserMessagingSubscriber = BrowserMessagingSubscriber;
+
+/*
+Class to handle publishing subscriptions
+
+type: String indicating type of item for which subscriptions are being provided (eg "SAVING")
+onsubscribe: Function to be invoked when a subscription occurs
+*/
+function BrowserMessagingPublisher(options) {
+ var self = this;
+ this.type = options.type;
+ this.hostIsListening = false;
+ this.port = null;
+ // Listen to connection requests from the host
+ window.addEventListener("message",function(event) {
+ if(event.data && event.data.verb === "SUBSCRIBE" && event.data.to === self.type) {
+ self.hostIsListening = true;
+ // Acknowledge
+ self.port = event.ports[0];
+ self.port.postMessage({verb: "SUBSCRIBED", to: self.type});
+ if(options.onsubscribe) {
+ options.onsubscribe(event.data);
+ }
+ }
+ });
+}
+
+BrowserMessagingPublisher.prototype.canSend = function() {
+ return !!this.hostIsListening && !!this.port;
+};
+
+BrowserMessagingPublisher.prototype.send = function(data,callback) {
+ var self = this;
+ callback = callback || function() {};
+ // Check that we've been initialised by the host
+ if(!this.hostIsListening || !this.port) {
+ return false;
+ }
+ // Create a channel for the confirmation
+ var channel = new MessageChannel();
+ channel.port1.addEventListener("message",function(event) {
+ if(event.data && event.data.verb === "OK") {
+ callback(null);
+ } else {
+ callback("BrowserMessagingPublisher for " + self.type + " error: " + (event.data || {}).verb);
+ }
+ channel.port1.close();
+ });
+ channel.port1.start();
+ // Send the save request with the port for the response
+ this.port.postMessage(data,[channel.port2]);
+};
+
+BrowserMessagingPublisher.prototype.close = function() {
+ if(this.port) {
+ this.port.close();
+ this.hostIsListening = false;
+ this.port = null;
+ }
+};
+
+exports.BrowserMessagingPublisher = BrowserMessagingPublisher;
+
+})();
diff --git a/core/modules/utils/parsetree.js b/core/modules/utils/parsetree.js
index 410f921818..ba0e48b298 100644
--- a/core/modules/utils/parsetree.js
+++ b/core/modules/utils/parsetree.js
@@ -119,3 +119,19 @@ exports.getParseTreeText = function getParseTreeText(tree) {
}
return output.join("");
};
+
+exports.getParser = function(type,options) {
+ options = options || {};
+ // Select a parser
+ var Parser = $tw.Wiki.parsers[type];
+ if(!Parser && $tw.utils.getFileExtensionInfo(type)) {
+ Parser = $tw.Wiki.parsers[$tw.utils.getFileExtensionInfo(type).type];
+ }
+ if(!Parser) {
+ Parser = $tw.Wiki.parsers[options.defaultType || "text/vnd.tiddlywiki"];
+ }
+ if(!Parser) {
+ return null;
+ }
+ return Parser;
+};
diff --git a/core/modules/utils/utils.js b/core/modules/utils/utils.js
index da12bba2d8..a9c05975d0 100644
--- a/core/modules/utils/utils.js
+++ b/core/modules/utils/utils.js
@@ -9,8 +9,6 @@ Various static utility functions.
"use strict";
-var base64utf8 = require("$:/core/modules/utils/base64-utf8/base64-utf8.module.js");
-
/*
Display a message, in colour if we're on a terminal
*/
@@ -854,22 +852,50 @@ if(typeof window !== 'undefined') {
}
}
+exports.base64ToBytes = function(base64) {
+ const binString = exports.atob(base64);
+ return Uint8Array.from(binString, (m) => m.codePointAt(0));
+};
+
+exports.bytesToBase64 = function(bytes) {
+ const binString = Array.from(bytes, (byte) => String.fromCodePoint(byte)).join("");
+ return exports.btoa(binString);
+};
+
+exports.base64EncodeUtf8 = function(str) {
+ if ($tw.browser) {
+ return exports.bytesToBase64(new TextEncoder().encode(str));
+ } else {
+ const buff = Buffer.from(str, "utf-8");
+ return buff.toString("base64");
+ }
+};
+
+exports.base64DecodeUtf8 = function(str) {
+ if ($tw.browser) {
+ return new TextDecoder().decode(exports.base64ToBytes(str));
+ } else {
+ const buff = Buffer.from(str, "base64");
+ return buff.toString("utf-8");
+ }
+};
+
/*
Decode a base64 string
*/
exports.base64Decode = function(string64,binary,urlsafe) {
- var encoded = urlsafe ? string64.replace(/_/g,'/').replace(/-/g,'+') : string64;
+ const encoded = urlsafe ? string64.replace(/_/g,'/').replace(/-/g,'+') : string64;
if(binary) return exports.atob(encoded)
- else return base64utf8.base64.decode.call(base64utf8,encoded);
+ else return exports.base64DecodeUtf8(encoded);
};
/*
Encode a string to base64
*/
exports.base64Encode = function(string64,binary,urlsafe) {
- var encoded;
+ let encoded;
if(binary) encoded = exports.btoa(string64);
- else encoded = base64utf8.base64.encode.call(base64utf8,string64);
+ else encoded = exports.base64EncodeUtf8(string64);
if(urlsafe) {
encoded = encoded.replace(/\+/g,'-').replace(/\//g,'_');
}
@@ -1035,7 +1061,7 @@ exports.makeCompareFunction = function(type,options) {
return compare(dateA,dateB);
},
"version": function(a,b) {
- return $tw.utils.compareVersions(a,b);
+ return compare($tw.utils.compareVersions(a,b),0);
},
"alphanumeric": function(a,b) {
if(!isCaseSensitive) {
diff --git a/core/modules/widgets/audio.js b/core/modules/widgets/audio.js
new file mode 100644
index 0000000000..7bd073c4f5
--- /dev/null
+++ b/core/modules/widgets/audio.js
@@ -0,0 +1,103 @@
+/*\
+title: $:/core/modules/widgets/audio.js
+type: application/javascript
+module-type: widget
+
+Basic Audio widget for displaying audio files.
+This is a simple implementation that can be overridden by plugins
+for more advanced functionality.
+
+\*/
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
+
+var AudioWidget = function(parseTreeNode,options) {
+ this.initialise(parseTreeNode,options);
+};
+
+/*
+Inherit from the base widget class
+*/
+AudioWidget.prototype = new Widget();
+
+/*
+Render this widget into the DOM
+*/
+AudioWidget.prototype.render = function(parent,nextSibling) {
+ this.parentDomNode = parent;
+ this.computeAttributes();
+ this.execute();
+
+ // Create audio element
+ var audioElement = this.document.createElement("audio");
+ audioElement.setAttribute("controls", this.getAttribute("controls", "controls"));
+ audioElement.setAttribute("style", this.getAttribute("style", "width: 100%; object-fit: contain"));
+ audioElement.className = "tw-audio-element";
+
+ // Set source
+ if(this.audioSource) {
+ if (this.audioSource.indexOf("data:") === 0) {
+ audioElement.setAttribute("src", this.audioSource);
+ } else {
+ var sourceElement = this.document.createElement("source");
+ sourceElement.setAttribute("src", this.audioSource);
+ if(this.audioType) {
+ sourceElement.setAttribute("type", this.audioType);
+ }
+ audioElement.appendChild(sourceElement);
+ }
+ }
+
+ // Insert the audio into the DOM
+ parent.insertBefore(audioElement, nextSibling);
+ this.domNodes.push(audioElement);
+};
+
+/*
+Compute the internal state of the widget
+*/
+AudioWidget.prototype.execute = function() {
+ // Get the audio source and type
+ this.audioSource = this.getAttribute("src");
+ this.audioType = this.getAttribute("type");
+ this.audioControls = this.getAttribute("controls", "controls");
+
+ // Try to get from tiddler attribute
+ if(!this.audioSource && this.getAttribute("tiddler")) {
+ var tiddlerTitle = this.getAttribute("tiddler");
+ var tiddler = this.wiki.getTiddler(tiddlerTitle);
+ if(tiddler) {
+ if(tiddler.fields._canonical_uri) {
+ this.audioSource = tiddler.fields._canonical_uri;
+ this.audioType = tiddler.fields.type;
+ } else if(tiddler.fields.text) {
+ this.audioSource = "data:" + tiddler.fields.type + ";base64," + tiddler.fields.text;
+ this.audioType = tiddler.fields.type;
+ }
+ }
+ }
+
+ // Make sure we have a tiddler for saving timestamps
+ this.tiddlerTitle = this.getAttribute("tiddler");
+};
+
+/*
+Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
+*/
+AudioWidget.prototype.refresh = function(changedTiddlers) {
+ var changedAttributes = this.computeAttributes();
+ if(changedAttributes.src || changedAttributes.type || changedAttributes.controls || changedAttributes.tiddler) {
+ this.refreshSelf();
+ return true;
+ } else {
+ return false;
+ }
+};
+
+exports.audio = AudioWidget;
+
+
diff --git a/core/modules/widgets/button.js b/core/modules/widgets/button.js
index 68f2fcd119..8f6f143763 100644
--- a/core/modules/widgets/button.js
+++ b/core/modules/widgets/button.js
@@ -61,6 +61,10 @@ ButtonWidget.prototype.render = function(parent,nextSibling) {
sourcePrefix: "data-",
destPrefix: "data-"
});
+ this.assignAttributes(domNode,{
+ sourcePrefix: "aria-",
+ destPrefix: "aria-"
+ });
// Assign other attributes
if(this.style) {
domNode.setAttribute("style",this.style);
@@ -68,9 +72,6 @@ ButtonWidget.prototype.render = function(parent,nextSibling) {
if(this.tooltip) {
domNode.setAttribute("title",this.tooltip);
}
- if(this["aria-label"]) {
- domNode.setAttribute("aria-label",this["aria-label"]);
- }
if (this.role) {
domNode.setAttribute("role", this.role);
}
@@ -215,7 +216,6 @@ ButtonWidget.prototype.execute = function() {
this.setTo = this.getAttribute("setTo");
this.popup = this.getAttribute("popup");
this.hover = this.getAttribute("hover");
- this["aria-label"] = this.getAttribute("aria-label");
this.role = this.getAttribute("role");
this.tooltip = this.getAttribute("tooltip");
this.style = this.getAttribute("style");
@@ -271,6 +271,10 @@ ButtonWidget.prototype.refresh = function(changedTiddlers) {
sourcePrefix: "data-",
destPrefix: "data-"
});
+ this.assignAttributes(this.domNodes[0],{
+ sourcePrefix: "aria-",
+ destPrefix: "aria-"
+ });
}
return this.refreshChildren(changedTiddlers);
};
diff --git a/core/modules/widgets/element.js b/core/modules/widgets/element.js
index 34fd3b9ffc..8b0a88e868 100755
--- a/core/modules/widgets/element.js
+++ b/core/modules/widgets/element.js
@@ -74,6 +74,8 @@ ElementWidget.prototype.render = function(parent,nextSibling) {
// Create the DOM node and render children
var domNode = this.document.createElementNS(this.namespace,this.tag);
this.assignAttributes(domNode,{excludeEventAttributes: true});
+ // Allow hooks to manipulate the DOM node. Eg: Add debug info
+ $tw.hooks.invokeHook("th-dom-rendering-element", domNode, this);
parent.insertBefore(domNode,nextSibling);
this.renderChildren(domNode,null);
this.domNodes.push(domNode);
diff --git a/core/modules/widgets/eventcatcher.js b/core/modules/widgets/eventcatcher.js
index 70dc992021..aac6519a48 100644
--- a/core/modules/widgets/eventcatcher.js
+++ b/core/modules/widgets/eventcatcher.js
@@ -44,7 +44,7 @@ EventWidget.prototype.render = function(parent,nextSibling) {
domNode.addEventListener(type,function(event) {
var selector = self.getAttribute("selector"),
matchSelector = self.getAttribute("matchSelector"),
- actions = self.getAttribute("$"+type) || self.getAttribute("actions-"+type),
+ actions = self.getAttribute("$"+type),
stopPropagation = self.getAttribute("stopPropagation","onaction"),
selectedNode = event.target,
selectedNodeRect,
@@ -122,9 +122,6 @@ EventWidget.prototype.execute = function() {
self.types.push(key.slice(1));
}
});
- if(!this.types.length) {
- this.types = this.getAttribute("events","").split(" ");
- }
this.elementTag = this.getAttribute("tag");
// Make child widgets
this.makeChildWidgets();
diff --git a/core/modules/widgets/importvariables.js b/core/modules/widgets/importvariables.js
index befee4a908..597b5bc565 100644
--- a/core/modules/widgets/importvariables.js
+++ b/core/modules/widgets/importvariables.js
@@ -49,7 +49,8 @@ ImportVariablesWidget.prototype.execute = function(tiddlerList) {
var parser = widgetPointer.wiki.parseTiddler(title,{parseAsInline:true, configTrimWhiteSpace:false});
if(parser) {
var parseTreeNode = parser.tree[0];
- while(parseTreeNode && ["setvariable","set","parameters"].indexOf(parseTreeNode.type) !== -1) {
+ // process AST nodes generated by pragma rules.
+ while(parseTreeNode && ["setvariable","set","parameters","void"].indexOf(parseTreeNode.type) !== -1) {
var node = {
type: "set",
attributes: parseTreeNode.attributes,
@@ -82,7 +83,7 @@ ImportVariablesWidget.prototype.execute = function(tiddlerList) {
// this widget. If it needs to refresh,
// it'll do so along with the the whole
// importvariable tree.
- if (widgetPointer != this) {
+ if(widgetPointer != this) {
widgetPointer.makeChildWidgets = function(){};
}
widgetPointer = widgetPointer.children[0];
@@ -93,7 +94,7 @@ ImportVariablesWidget.prototype.execute = function(tiddlerList) {
}
});
- if (widgetPointer != this) {
+ if(widgetPointer != this) {
widgetPointer.parseTreeNode.children = this.parseTreeNode.children;
} else {
widgetPointer.makeChildWidgets();
diff --git a/core/modules/widgets/link.js b/core/modules/widgets/link.js
index c8b54818dc..d2c5995424 100755
--- a/core/modules/widgets/link.js
+++ b/core/modules/widgets/link.js
@@ -45,6 +45,10 @@ LinkWidget.prototype.render = function(parent,nextSibling) {
sourcePrefix: "data-",
destPrefix: "data-"
});
+ this.assignAttributes(domNode,{
+ sourcePrefix: "aria-",
+ destPrefix: "aria-"
+ });
parent.insertBefore(domNode,nextSibling);
this.renderChildren(domNode,null);
this.domNodes.push(domNode);
@@ -125,9 +129,13 @@ LinkWidget.prototype.renderLink = function(parent,nextSibling) {
});
domNode.setAttribute("title",tooltipText);
}
- if(this["aria-label"]) {
- domNode.setAttribute("aria-label",this["aria-label"]);
+ if(this.role) {
+ domNode.setAttribute("role",this.role);
}
+ this.assignAttributes(domNode,{
+ sourcePrefix: "aria-",
+ destPrefix: "aria-"
+ })
// Add a click event handler
$tw.utils.addEventListeners(domNode,[
{name: "click", handlerObject: this, handlerMethod: "handleClickEvent"},
@@ -139,6 +147,8 @@ LinkWidget.prototype.renderLink = function(parent,nextSibling) {
dragTiddlerFn: function() {return self.to;},
widget: this
});
+ } else if(this.draggable === "no") {
+ domNode.setAttribute("draggable","false");
}
// Assign data- attributes
this.assignAttributes(domNode,{
@@ -188,7 +198,7 @@ LinkWidget.prototype.execute = function() {
// Pick up our attributes
this.to = this.getAttribute("to",this.getVariable("currentTiddler"));
this.tooltip = this.getAttribute("tooltip");
- this["aria-label"] = this.getAttribute("aria-label");
+ this.role = this.getAttribute("role");
this.linkClasses = this.getAttribute("class");
this.overrideClasses = this.getAttribute("overrideClass");
this.tabIndex = this.getAttribute("tabindex");
diff --git a/core/modules/widgets/list.js b/core/modules/widgets/list.js
index f86d2d5719..96ea44db16 100755
--- a/core/modules/widgets/list.js
+++ b/core/modules/widgets/list.js
@@ -519,36 +519,3 @@ ListJoinWidget.prototype.render = function() {}
ListJoinWidget.prototype.refresh = function() { return false; }
exports["list-join"] = ListJoinWidget;
-
-/*
-Make <$list-template> and <$list-empty> widgets that do nothing
-*/
-var ListTemplateWidget = function(parseTreeNode,options) {
- // Main initialisation inherited from widget.js
- this.initialise(parseTreeNode,options);
-};
-ListTemplateWidget.prototype = new Widget();
-ListTemplateWidget.prototype.render = function() {}
-ListTemplateWidget.prototype.refresh = function() { return false; }
-
-exports["list-template"] = ListTemplateWidget;
-
-var ListEmptyWidget = function(parseTreeNode,options) {
- // Main initialisation inherited from widget.js
- this.initialise(parseTreeNode,options);
-};
-ListEmptyWidget.prototype = new Widget();
-ListEmptyWidget.prototype.render = function() {}
-ListEmptyWidget.prototype.refresh = function() { return false; }
-
-exports["list-empty"] = ListEmptyWidget;
-
-var ListJoinWidget = function(parseTreeNode,options) {
- // Main initialisation inherited from widget.js
- this.initialise(parseTreeNode,options);
-};
-ListJoinWidget.prototype = new Widget();
-ListJoinWidget.prototype.render = function() {}
-ListJoinWidget.prototype.refresh = function() { return false; }
-
-exports["list-join"] = ListJoinWidget;
diff --git a/core/modules/widgets/range.js b/core/modules/widgets/range.js
index 8d039b1f19..7c2d60c45c 100644
--- a/core/modules/widgets/range.js
+++ b/core/modules/widgets/range.js
@@ -94,8 +94,6 @@ RangeWidget.prototype.getActionVariables = function(options) {
// actionsStart
RangeWidget.prototype.handleMouseDownEvent = function(event) {
- this.mouseDown = true; // TODO remove once IE is gone.
- this.startValue = this.inputDomNode.value; // TODO remove this line once IE is gone!
this.handleEvent(event);
// Trigger actions
if(this.actionsMouseDown) {
@@ -106,26 +104,16 @@ RangeWidget.prototype.handleMouseDownEvent = function(event) {
// actionsStop
RangeWidget.prototype.handleMouseUpEvent = function(event) {
- this.mouseDown = false; // TODO remove once IE is gone.
this.handleEvent(event);
// Trigger actions
if(this.actionsMouseUp) {
var variables = this.getActionVariables()
this.invokeActionString(this.actionsMouseUp,this,event,variables);
}
- // TODO remove the following if() once IE is gone!
- if ($tw.browser.isIE) {
- if (this.startValue !== this.inputDomNode.value) {
- this.handleChangeEvent(event);
- this.startValue = this.inputDomNode.value;
- }
- }
}
RangeWidget.prototype.handleChangeEvent = function(event) {
- if (this.mouseDown) { // TODO refactor this function once IE is gone.
- this.handleInputEvent(event);
- }
+ this.handleInputEvent(event);
};
RangeWidget.prototype.handleInputEvent = function(event) {
@@ -152,8 +140,6 @@ RangeWidget.prototype.handleEvent = function(event) {
Compute the internal state of the widget
*/
RangeWidget.prototype.execute = function() {
- // TODO remove the next 1 lines once IE is gone!
- this.mouseUp = true; // Needed for IE10
// Get the parameters from the attributes
this.tiddlerTitle = this.getAttribute("tiddler",this.getVariable("currentTiddler"));
this.tiddlerField = this.getAttribute("field","text");
diff --git a/core/modules/widgets/scrollable.js b/core/modules/widgets/scrollable.js
index f34d462e7f..42705a61bf 100644
--- a/core/modules/widgets/scrollable.js
+++ b/core/modules/widgets/scrollable.js
@@ -181,7 +181,7 @@ ScrollableWidget.prototype.render = function(parent,nextSibling) {
};
ScrollableWidget.prototype.listenerFunction = function(event) {
- self = this;
+ var self = this;
clearTimeout(this.timeout);
this.timeout = setTimeout(function() {
var existingTiddler = self.wiki.getTiddler(self.scrollableBind),
diff --git a/core/modules/widgets/void.js b/core/modules/widgets/void.js
new file mode 100755
index 0000000000..de009c5065
--- /dev/null
+++ b/core/modules/widgets/void.js
@@ -0,0 +1,23 @@
+/*\
+title: $:/core/modules/widgets/void.js
+type: application/javascript
+module-type: widget
+
+Void widget that corresponds to pragma and comment AST nodes, etc. It does not render itself but renders all its children.
+
+\*/
+
+"use strict";
+
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
+
+var VoidNodeWidget = function(parseTreeNode,options) {
+ this.initialise(parseTreeNode,options);
+};
+
+/*
+Inherit from the base widget class
+*/
+VoidNodeWidget.prototype = new Widget();
+
+exports.void = VoidNodeWidget;
diff --git a/core/modules/wiki.js b/core/modules/wiki.js
index 878b34eb25..eb690af236 100755
--- a/core/modules/wiki.js
+++ b/core/modules/wiki.js
@@ -1059,17 +1059,7 @@ Options include:
exports.parseText = function(type,text,options) {
text = text || "";
options = options || {};
- // Select a parser
- var Parser = $tw.Wiki.parsers[type];
- if(!Parser && $tw.utils.getFileExtensionInfo(type)) {
- Parser = $tw.Wiki.parsers[$tw.utils.getFileExtensionInfo(type).type];
- }
- if(!Parser) {
- Parser = $tw.Wiki.parsers[options.defaultType || "text/vnd.tiddlywiki"];
- }
- if(!Parser) {
- return null;
- }
+ var Parser = $tw.utils.getParser(type,options)
// Return the parser instance
return new Parser(type,text,{
parseAsInline: options.parseAsInline,
@@ -1083,7 +1073,7 @@ exports.parseText = function(type,text,options) {
Parse a tiddler according to its MIME type
*/
exports.parseTiddler = function(title,options) {
- options = $tw.utils.extend({},options);
+ options = options || {};
var cacheType = options.parseAsInline ? "inlineParseTree" : "blockParseTree",
tiddler = this.getTiddler(title),
self = this;
@@ -1173,7 +1163,7 @@ exports.getSubstitutedText = function(text,widget,options) {
output = $tw.utils.replaceString(output,new RegExp("\\$" + $tw.utils.escapeRegExp(substitute.name) + "\\$","mg"),substitute.value);
});
// Substitute any variable references with their values
- return output.replace(/\$\(([^\)\$]+)\)\$/g, function(match,varname) {
+ return output.replace(/\$\((.+?)\)\$/g, function(match,varname) {
return widget.getVariable(varname,{defaultValue: ""})
});
};
@@ -1443,7 +1433,7 @@ exports.search = function(text,options) {
// Don't search the text field if the content type is binary
var fieldName = searchFields[fieldIndex];
if(fieldName === "text" && contentTypeInfo.encoding !== "utf8") {
- break;
+ continue;
}
var str = tiddler.fields[fieldName],
t;
diff --git a/core/palettes/Blanca.tid b/core/palettes/Blanca.tid
index 7a6e7d97bb..dc68c23ffa 100644
--- a/core/palettes/Blanca.tid
+++ b/core/palettes/Blanca.tid
@@ -18,7 +18,7 @@ code-background: #f7f7f9
code-border: #e1e1e8
code-foreground: #dd1144
dirty-indicator: #ff0000
-download-background: #66cccc
+download-background: #3aafaf
download-foreground: <<colour background>>
dragger-background: <<colour foreground>>
dragger-foreground: <<colour background>>
@@ -26,7 +26,7 @@ dropdown-background: <<colour background>>
dropdown-border: <<colour muted-foreground>>
dropdown-tab-background-selected: #fff
dropdown-tab-background: #ececec
-dropzone-background: rgba(0,200,0,0.7)
+dropzone-background: #00d900
external-link-background-hover: inherit
external-link-background-visited: inherit
external-link-background: inherit
@@ -52,26 +52,30 @@ notification-border: #999999
page-background: #ffffff
pre-background: #f5f5f5
pre-border: #cccccc
-primary: #7897f3
+primary: #6387f1
select-tag-background:
select-tag-foreground:
sidebar-button-foreground: <<colour foreground>>
sidebar-controls-foreground-hover: #000000
-sidebar-controls-foreground: #ccc
-sidebar-foreground-shadow: rgba(255,255,255, 0.8)
+sidebar-controls-foreground: #aaaaaa
+sidebar-foreground-shadow: #ffffff
sidebar-foreground: #acacac
sidebar-muted-foreground-hover: #444444
-sidebar-muted-foreground: #c0c0c0
+sidebar-muted-foreground: #aaaaaa
sidebar-tab-background-selected: #ffffff
sidebar-tab-background: <<colour tab-background>>
sidebar-tab-border-selected: <<colour tab-border-selected>>
sidebar-tab-border: <<colour tab-border>>
sidebar-tab-divider: <<colour tab-divider>>
-sidebar-tab-foreground-selected:
+sidebar-tab-foreground-selected: <<colour tab-foreground>>
sidebar-tab-foreground: <<colour tab-foreground>>
sidebar-tiddler-link-foreground-hover: #444444
-sidebar-tiddler-link-foreground: #7897f3
+sidebar-tiddler-link-foreground: <<colour primary>>
site-title-foreground: <<colour tiddler-title-foreground>>
+stability-stable: #008000
+stability-experimental: #c07c00
+stability-deprecated: #ff0000
+stability-legacy: #0000ff
static-alert-foreground: #aaaaaa
tab-background-selected: #ffffff
tab-background: #eeeeee
@@ -83,10 +87,10 @@ tab-foreground: #666666
table-border: #dddddd
table-footer-background: #a8a8a8
table-header-background: #f0f0f0
-tag-background: #ffeedd
-tag-foreground: #000
+tag-background: #ffd5aa
+tag-foreground: #000000
tiddler-background: <<colour background>>
-tiddler-border: #eee
+tiddler-border: #eeeeee
tiddler-controls-foreground-hover: #888888
tiddler-controls-foreground-selected: #444444
tiddler-controls-foreground: #cccccc
@@ -97,7 +101,7 @@ tiddler-editor-fields-even: #e0e8e0
tiddler-editor-fields-odd: #f0f4f0
tiddler-info-background: #f8f8f8
tiddler-info-border: #dddddd
-tiddler-info-tab-background: #f8f8f8
+tiddler-info-tab-background: <<colour tiddler-info-background>>
tiddler-link-background: <<colour background>>
tiddler-link-foreground: <<colour primary>>
tiddler-subtitle-foreground: #c0c0c0
@@ -111,5 +115,6 @@ toolbar-close-button:
toolbar-delete-button:
toolbar-cancel-button:
toolbar-done-button:
-untagged-background: #999999
+untagged-background: #cccccc
very-muted-foreground: #888888
+network-activity-foreground: <<colour primary>>
\ No newline at end of file
diff --git a/core/palettes/BrightMute.tid b/core/palettes/BrightMute.tid
index 2762a995de..bda0282b37 100644
--- a/core/palettes/BrightMute.tid
+++ b/core/palettes/BrightMute.tid
@@ -47,6 +47,7 @@ modal-footer-background: #f5f5f5
modal-footer-border: #dddddd
modal-header-border: #eeeeee
muted-foreground: #bbb
+network-activity-foreground: <<colour primary>>
notification-background: #ffffdd
notification-border: #999999
page-background: #6f6f70
@@ -56,22 +57,26 @@ primary: #29a6ee
select-tag-background:
select-tag-foreground:
sidebar-button-foreground: <<colour foreground>>
-sidebar-controls-foreground-hover: #000000
+sidebar-controls-foreground-hover: #222222
sidebar-controls-foreground: #c2c1c2
-sidebar-foreground-shadow: rgba(255,255,255,0)
+sidebar-foreground-shadow: transparent
sidebar-foreground: #d3d2d4
-sidebar-muted-foreground-hover: #444444
+sidebar-muted-foreground-hover: #333333
sidebar-muted-foreground: #c0c0c0
sidebar-tab-background-selected: #6f6f70
sidebar-tab-background: #666667
sidebar-tab-border-selected: #999
sidebar-tab-border: #515151
sidebar-tab-divider: #999
-sidebar-tab-foreground-selected:
-sidebar-tab-foreground: #999
+sidebar-tab-foreground-selected: #bfbfbf
+sidebar-tab-foreground: #b0b0b0
sidebar-tiddler-link-foreground-hover: #444444
-sidebar-tiddler-link-foreground: #d1d0d2
+sidebar-tiddler-link-foreground: #aaaaaa
site-title-foreground: <<colour tiddler-title-foreground>>
+stability-deprecated: #bf616a
+stability-experimental: #d08770
+stability-legacy: #88c0d0
+stability-stable: #a3be8c
static-alert-foreground: #aaaaaa
tab-background-selected: #ffffff
tab-background: #d8d8d8
@@ -85,6 +90,7 @@ table-footer-background: #a8a8a8
table-header-background: #f0f0f0
tag-background: #d5ad34
tag-foreground: #ffffff
+testcase-accent-level-1: #b1b3e3
tiddler-background: <<colour background>>
tiddler-border: <<colour background>>
tiddler-controls-foreground-hover: #888888
diff --git a/core/palettes/ContrastDark.tid b/core/palettes/ContrastDark.tid
index 67552b30ef..cb40e015b1 100644
--- a/core/palettes/ContrastDark.tid
+++ b/core/palettes/ContrastDark.tid
@@ -5,11 +5,11 @@ description: High contrast and unambiguous (dark version)
tags: $:/tags/Palette
type: application/x-tiddler-dictionary
-alert-background: #f00
+alert-background: #ff0000
alert-border: <<colour background>>
alert-highlight: <<colour foreground>>
-alert-muted-foreground: #800
-background: #000
+alert-muted-foreground: #880000
+background: #000000
blockquote-bar: <<colour muted-foreground>>
button-background: <<colour background>>
button-foreground: <<colour foreground>>
@@ -17,24 +17,24 @@ button-border: <<colour foreground>>
code-background: <<colour background>>
code-border: <<colour foreground>>
code-foreground: <<colour foreground>>
-dirty-indicator: #f00
-download-background: #080
+dirty-indicator: #ff0000
+download-background: #48ff48
download-foreground: <<colour background>>
dragger-background: <<colour foreground>>
dragger-foreground: <<colour background>>
dropdown-background: <<colour background>>
dropdown-border: <<colour muted-foreground>>
-dropdown-tab-background-selected: <<colour foreground>>
-dropdown-tab-background: <<colour foreground>>
-dropzone-background: rgba(0,200,0,0.7)
+dropdown-tab-background-selected: #868686
+dropdown-tab-background: #515151
+dropzone-background: #1aff1a
external-link-background-hover: inherit
external-link-background-visited: inherit
external-link-background: inherit
external-link-foreground-hover: inherit
-external-link-foreground-visited: #00a
-external-link-foreground: #00e
+external-link-foreground-visited: #5353ff
+external-link-foreground: #9595ff
footnote-target-background: #4c4c4c
-foreground: #fff
+foreground: #ffffff
highlight-background: #ffff00
highlight-foreground: #000000
message-background: <<colour foreground>>
@@ -52,11 +52,11 @@ notification-border: <<colour foreground>>
page-background: <<colour background>>
pre-background: <<colour background>>
pre-border: <<colour foreground>>
-primary: #00f
+primary: #8a8aff
select-tag-background:
select-tag-foreground:
sidebar-button-foreground: <<colour foreground>>
-sidebar-controls-foreground-hover: <<colour background>>
+sidebar-controls-foreground-hover: #ffff00
sidebar-controls-foreground: <<colour foreground>>
sidebar-foreground-shadow: rgba(0,0,0, 0)
sidebar-foreground: <<colour foreground>>
@@ -72,6 +72,10 @@ sidebar-tab-foreground: <<colour tab-foreground>>
sidebar-tiddler-link-foreground-hover: <<colour foreground>>
sidebar-tiddler-link-foreground: <<colour primary>>
site-title-foreground: <<colour tiddler-title-foreground>>
+stability-stable: #00f400
+stability-experimental: #ffaf1c
+stability-deprecated: #ff2b2b
+stability-legacy: #ceceff
static-alert-foreground: #aaaaaa
tab-background-selected: <<colour background>>
tab-background: <<colour foreground>>
@@ -81,14 +85,15 @@ tab-divider: <<colour foreground>>
tab-foreground-selected: <<colour foreground>>
tab-foreground: <<colour background>>
table-border: #dddddd
-table-footer-background: #a8a8a8
-table-header-background: #f0f0f0
-tag-background: #fff
-tag-foreground: #000
+table-footer-background: #444444
+table-header-background: #444444
+tag-background: #ffffff
+tag-foreground: #000000
+testcase-accent-level-1: #144a8c
tiddler-background: <<colour background>>
tiddler-border: <<colour foreground>>
tiddler-controls-foreground-hover: #ddd
-tiddler-controls-foreground-selected: #fdd
+tiddler-controls-foreground-selected: #ae0000
tiddler-controls-foreground: <<colour foreground>>
tiddler-editor-background: <<colour background>>
tiddler-editor-border-image: <<colour foreground>>
@@ -102,14 +107,15 @@ tiddler-link-background: <<colour background>>
tiddler-link-foreground: <<colour primary>>
tiddler-subtitle-foreground: <<colour foreground>>
tiddler-title-foreground: <<colour foreground>>
-toolbar-new-button:
-toolbar-options-button:
-toolbar-save-button:
-toolbar-info-button:
-toolbar-edit-button:
-toolbar-close-button:
-toolbar-delete-button:
-toolbar-cancel-button:
-toolbar-done-button:
+toolbar-new-button:
+toolbar-options-button:
+toolbar-save-button:
+toolbar-info-button:
+toolbar-edit-button:
+toolbar-close-button:
+toolbar-delete-button:
+toolbar-cancel-button:
+toolbar-done-button:
untagged-background: <<colour foreground>>
very-muted-foreground: #888888
+network-activity-foreground: <<colour primary>>
\ No newline at end of file
diff --git a/core/palettes/ContrastLight.tid b/core/palettes/ContrastLight.tid
index a10a1b8ebd..4a68e59c78 100644
--- a/core/palettes/ContrastLight.tid
+++ b/core/palettes/ContrastLight.tid
@@ -5,7 +5,7 @@ description: High contrast and unambiguous (light version)
tags: $:/tags/Palette
type: application/x-tiddler-dictionary
-alert-background: #f00
+alert-background: #ff4a4a
alert-border: <<colour background>>
alert-highlight: <<colour foreground>>
alert-muted-foreground: #800
@@ -18,13 +18,13 @@ code-background: <<colour background>>
code-border: <<colour foreground>>
code-foreground: <<colour foreground>>
dirty-indicator: #f00
-download-background: #080
+download-background: #008200
download-foreground: <<colour background>>
dragger-background: <<colour foreground>>
dragger-foreground: <<colour background>>
dropdown-background: <<colour background>>
dropdown-border: <<colour muted-foreground>>
-dropdown-tab-background-selected: <<colour foreground>>
+dropdown-tab-background-selected: <<colour background>>
dropdown-tab-background: <<colour foreground>>
dropzone-background: rgba(0,200,0,0.7)
external-link-background-hover: inherit
@@ -52,13 +52,13 @@ notification-border: <<colour foreground>>
page-background: <<colour background>>
pre-background: <<colour background>>
pre-border: <<colour foreground>>
-primary: #00f
+primary: #0000ff
select-tag-background:
select-tag-foreground:
sidebar-button-foreground: <<colour foreground>>
-sidebar-controls-foreground-hover: <<colour background>>
+sidebar-controls-foreground-hover: #606060
sidebar-controls-foreground: <<colour foreground>>
-sidebar-foreground-shadow: rgba(0,0,0, 0)
+sidebar-foreground-shadow: #000000
sidebar-foreground: <<colour foreground>>
sidebar-muted-foreground-hover: #444444
sidebar-muted-foreground: <<colour foreground>>
@@ -72,6 +72,10 @@ sidebar-tab-foreground: <<colour tab-foreground>>
sidebar-tiddler-link-foreground-hover: <<colour foreground>>
sidebar-tiddler-link-foreground: <<colour primary>>
site-title-foreground: <<colour tiddler-title-foreground>>
+stability-deprecated: #ff0000
+stability-experimental: #b37400
+stability-legacy: #000075
+stability-stable: #008000
static-alert-foreground: #aaaaaa
tab-background-selected: <<colour background>>
tab-background: <<colour foreground>>
@@ -88,7 +92,7 @@ tag-foreground: #fff
tiddler-background: <<colour background>>
tiddler-border: <<colour foreground>>
tiddler-controls-foreground-hover: #ddd
-tiddler-controls-foreground-selected: #fdd
+tiddler-controls-foreground-selected: #c5abf3
tiddler-controls-foreground: <<colour foreground>>
tiddler-editor-background: <<colour background>>
tiddler-editor-border-image: <<colour foreground>>
@@ -113,3 +117,4 @@ toolbar-cancel-button:
toolbar-done-button:
untagged-background: <<colour foreground>>
very-muted-foreground: #888888
+network-activity-foreground: <<colour primary>>
\ No newline at end of file
diff --git a/core/palettes/CupertinoDark.tid b/core/palettes/CupertinoDark.tid
index f13fc1e16d..7031fb560d 100644
--- a/core/palettes/CupertinoDark.tid
+++ b/core/palettes/CupertinoDark.tid
@@ -5,30 +5,30 @@ name: Cupertino Dark
description: A macOS inspired dark palette
type: application/x-tiddler-dictionary
-alert-background: #FF453A
-alert-border: #FF453A
+alert-background: #ff4b42
+alert-border: #950700
alert-highlight: #FFD60A
-alert-muted-foreground: <<colour muted-foreground>>
+alert-muted-foreground: #323234
background: #282828
-blockquote-bar: <<colour page-background>>
+blockquote-bar: #8d8d8d
button-foreground: <<colour foreground>>
code-background: <<colour pre-background>>
code-border: <<colour pre-border>>
-code-foreground: rgba(255, 255, 255, 0.54)
+code-foreground: #c7c7c7
dirty-indicator: #FF453A
download-background: <<colour primary>>
-download-foreground: <<colour foreground>>
+download-foreground: <<colour background>>
dragger-background: <<colour foreground>>
dragger-foreground: <<colour background>>
dropdown-background: <<colour tiddler-info-background>>
dropdown-border: <<colour dropdown-background>>
dropdown-tab-background-selected: #3F638B
-dropdown-tab-background: #323232
+dropdown-tab-background: #707070
dropzone-background: #30D158
external-link-background-hover: transparent
external-link-background-visited: transparent
external-link-background: transparent
-external-link-foreground-hover:
+external-link-foreground-hover: #9511d5
external-link-foreground-visited: #BF5AF2
external-link-foreground: #32D74B
footnote-target-background: #747474
@@ -60,31 +60,36 @@ sidebar-controls-foreground-hover: #FF9F0A
sidebar-controls-foreground: #8E8E93
sidebar-foreground-shadow: transparent
sidebar-foreground: rgba(255, 255, 255, 0.54)
-sidebar-muted-foreground-hover: rgba(255, 255, 255, 0.54)
-sidebar-muted-foreground: rgba(255, 255, 255, 0.38)
+sidebar-muted-foreground-hover: #acacac
+sidebar-muted-foreground: #787878
sidebar-tab-background-selected: #3F638B
sidebar-tab-background: <<colour background>>
-sidebar-tab-border-selected: <<colour background>>
-sidebar-tab-border: <<colour background>>
-sidebar-tab-divider: <<colour background>>
-sidebar-tab-foreground-selected: rgba(255, 255, 255, 0.87)
-sidebar-tab-foreground: rgba(255, 255, 255, 0.54)
-sidebar-tiddler-link-foreground-hover: rgba(255, 255, 255, 0.7)
-sidebar-tiddler-link-foreground: rgba(255, 255, 255, 0.54)
+sidebar-tab-border-selected: #313131
+sidebar-tab-border: #404040
+sidebar-tab-divider: #282828
+sidebar-tab-foreground-selected: #d2d2d2
+sidebar-tab-foreground: #d2d2d2
+sidebar-tiddler-link-foreground-hover: #535353
+sidebar-tiddler-link-foreground: #949494
site-title-foreground: #ffffff
+stability-stable: #009f00
+stability-experimental: #c07c00
+stability-deprecated: #ff0000
+stability-legacy: #6c6cff
static-alert-foreground: #B4B4B4
tab-background-selected: #3F638B
tab-background: <<colour page-background>>
tab-border-selected: <<colour page-background>>
-tab-border: <<colour page-background>>
+tab-border: #4a4a4a
tab-divider: <<colour page-background>>
-tab-foreground-selected: rgba(255, 255, 255, 0.87)
-tab-foreground: rgba(255, 255, 255, 0.54)
+tab-foreground-selected: #ffffff
+tab-foreground: #adadad
table-border: #464646
-table-footer-background: <<colour tiddler-editor-fields-odd>>
-table-header-background: <<colour tiddler-editor-fields-even>>
+table-footer-background: #7f7f7f
+table-header-background: <<colour table-border>>
tag-background: #48484A
tag-foreground: #323232
+testcase-accent-level-1: #345173
tiddler-background: <<colour background>>
tiddler-border: transparent
tiddler-controls-foreground-hover: <<colour sidebar-controls-foreground-hover>>
@@ -92,9 +97,9 @@ tiddler-controls-foreground-selected: <<colour sidebar-controls-foreground-hover
tiddler-controls-foreground: #48484A
tiddler-editor-background: <<colour background>>
tiddler-editor-border-image:
-tiddler-editor-border: rgba(255, 255, 255, 0.08)
-tiddler-editor-fields-even: rgba(255, 255, 255, 0.1)
-tiddler-editor-fields-odd: rgba(255, 255, 255, 0.04)
+tiddler-editor-border: #444444
+tiddler-editor-fields-even: #1f1f1f
+tiddler-editor-fields-odd: #464646
tiddler-info-background: #1E1E1E
tiddler-info-border: #1E1E1E
tiddler-info-tab-background: #3F638B
@@ -111,8 +116,8 @@ toolbar-close-button:
toolbar-delete-button:
toolbar-cancel-button:
toolbar-done-button:
-untagged-background: <<colour very-muted-foreground>>
-very-muted-foreground: #464646
+untagged-background: #5f5f5f
+very-muted-foreground: #3f3f3f
selection-background: #3F638B
selection-foreground: #ffffff
wikilist-background: <<colour page-background>>
@@ -131,3 +136,4 @@ wikilist-title: <<colour foreground>>
wikilist-title-svg: <<colour foreground>>
wikilist-toolbar-foreground: <<colour foreground>>
wikilist-url: <<colour muted-foreground>>
+network-activity-foreground: <<colour primary>>
\ No newline at end of file
diff --git a/core/palettes/DarkPhotos.tid b/core/palettes/DarkPhotos.tid
index 5d086fc279..31afc138d4 100644
--- a/core/palettes/DarkPhotos.tid
+++ b/core/palettes/DarkPhotos.tid
@@ -20,7 +20,7 @@ code-background: #f7f7f9
code-border: #e1e1e8
code-foreground: #dd1144
dirty-indicator: #ff0000
-download-background: #34c734
+download-background: #30b830
download-foreground: <<colour background>>
dragger-background: <<colour foreground>>
dragger-foreground: <<colour background>>
@@ -58,22 +58,26 @@ primary: #5778d8
select-tag-background:
select-tag-foreground:
sidebar-button-foreground: <<colour foreground>>
-sidebar-controls-foreground-hover: #ccf
-sidebar-controls-foreground: #fff
-sidebar-foreground-shadow: rgba(0,0,0, 0.5)
-sidebar-foreground: #fff
-sidebar-muted-foreground-hover: #444444
-sidebar-muted-foreground: #eee
-sidebar-tab-background-selected: rgba(255,255,255, 0.8)
-sidebar-tab-background: rgba(255,255,255, 0.4)
+sidebar-controls-foreground-hover: #a6a6ff
+sidebar-controls-foreground: #eeeeee
+sidebar-foreground-shadow: transparent
+sidebar-foreground: #eeeeee
+sidebar-muted-foreground-hover: #999999
+sidebar-muted-foreground: #eeeeee
+sidebar-tab-background-selected: <<colour page-background>>
+sidebar-tab-background: #e0e0e0
sidebar-tab-border-selected: <<colour tab-border-selected>>
sidebar-tab-border: <<colour tab-border>>
-sidebar-tab-divider: rgba(255,255,255, 0.2)
-sidebar-tab-foreground-selected:
+sidebar-tab-divider: #e4e4e4
+sidebar-tab-foreground-selected: #ddddff
sidebar-tab-foreground: <<colour tab-foreground>>
-sidebar-tiddler-link-foreground-hover: #aaf
-sidebar-tiddler-link-foreground: #ddf
-site-title-foreground: #fff
+sidebar-tiddler-link-foreground-hover: #aaaaff
+sidebar-tiddler-link-foreground: #ddddff
+site-title-foreground: #ffffff
+stability-stable: #008000
+stability-experimental: #c07c00
+stability-deprecated: #ff0000
+stability-legacy: #0000ff
static-alert-foreground: #aaaaaa
tab-background-selected: #ffffff
tab-background: #d8d8d8
@@ -90,7 +94,7 @@ tag-foreground: #ffffff
tiddler-background: <<colour background>>
tiddler-border: <<colour background>>
tiddler-controls-foreground-hover: #888888
-tiddler-controls-foreground-selected: #444444
+tiddler-controls-foreground-selected: #6a6aff
tiddler-controls-foreground: #cccccc
tiddler-editor-background: #f8f8f8
tiddler-editor-border-image: #ffffff
@@ -115,3 +119,4 @@ toolbar-cancel-button:
toolbar-done-button:
untagged-background: #999999
very-muted-foreground: #888888
+network-activity-foreground: #11ff23
\ No newline at end of file
diff --git a/core/palettes/DesertSand.tid b/core/palettes/DesertSand.tid
index 12b06c948a..632d1f66cc 100644
--- a/core/palettes/DesertSand.tid
+++ b/core/palettes/DesertSand.tid
@@ -22,9 +22,9 @@ diff-equal-foreground: <<colour foreground>>
diff-insert-background: #91c093
diff-insert-foreground: <<colour foreground>>
diff-invisible-background:
-diff-invisible-foreground: <<colour muted-foreground>>
+diff-invisible-foreground: #d3d2cb
dirty-indicator: #ad3434
-download-background: #6ca16c
+download-background: #5eae62
download-foreground: <<colour background>>
dragger-background: <<colour foreground>>
dragger-foreground: <<colour background>>
@@ -32,14 +32,13 @@ dropdown-background: <<colour background>>
dropdown-border: <<colour muted-foreground>>
dropdown-tab-background-selected: #E9E0C7
dropdown-tab-background: #BAB29C
-dropzone-background: rgba(0,200,0,0.7)
+dropzone-background: #00c600
external-link-background-hover: inherit
external-link-background-visited: inherit
external-link-background: inherit
-external-link-foreground-hover: inherit
+external-link-foreground-hover: #7474ba
external-link-foreground-visited: #313163
external-link-foreground: #555592
-footnote-target-background: #fff7d9
foreground: #2D2A23
highlight-background: #ffff00
highlight-foreground: #000000
@@ -71,7 +70,7 @@ sidebar-controls-foreground: #867F69
sidebar-foreground-shadow: transparent
sidebar-foreground: #867F69
sidebar-muted-foreground-hover: #706A58
-sidebar-muted-foreground: #B3A98C
+sidebar-muted-foreground: #aba081
sidebar-tab-background-selected: #e0d3af
sidebar-tab-background: #A6A193
sidebar-tab-border-selected: #C3BAA1
@@ -82,6 +81,10 @@ sidebar-tab-foreground: #2D2A23
sidebar-tiddler-link-foreground-hover: #433F35
sidebar-tiddler-link-foreground: #706A58
site-title-foreground: <<colour tiddler-title-foreground>>
+stability-deprecated: #dc322f
+stability-experimental: #b58900
+stability-legacy: #268bd2
+stability-stable: #859900
static-alert-foreground: #A6A193
tab-background-selected: #E9E0C7
tab-background: #A6A193
@@ -95,6 +98,7 @@ table-footer-background: #8A8885
table-header-background: #B0AA98
tag-background: #706A58
tag-foreground: #E3D7B7
+testcase-accent-level-1: #b3adc9
tiddler-background: <<colour background>>
tiddler-border: <<colour background>>
tiddler-controls-foreground-hover: #9D947B
@@ -140,3 +144,4 @@ wikilist-toolbar-foreground: #2D2A23
wikilist-droplink-dragover: rgba(255,192,192,0.5)
wikilist-button-background: #A6A193
wikilist-button-foreground: #161512
+network-activity-foreground: <<colour primary>>
\ No newline at end of file
diff --git a/core/palettes/FlexokiDark.tid b/core/palettes/FlexokiDark.tid
index 05e53edf5d..5c9bb8edef 100644
--- a/core/palettes/FlexokiDark.tid
+++ b/core/palettes/FlexokiDark.tid
@@ -70,7 +70,7 @@ alert-border: <<colour flexoki-ye>>
alert-highlight: <<colour flexoki-re>>
alert-muted-foreground: <<colour flexoki-ye>>
background: #100F0F
-blockquote-bar: <<colour flexoki-ma-2>>
+blockquote-bar: <<colour flexoki-ma>>
button-background: <<colour flexoki-bg-2>>
button-foreground: <<colour flexoki-paper>>
button-border: <<colour flexoki-600>>
@@ -106,7 +106,7 @@ foreground: #CECDC3
highlight-background: <<colour flexoki-yellow-900>>
highlight-foreground: inherit
menubar-background: <<colour primary>>
-menubar-foreground: <<colour flexoki-paper>>
+menubar-foreground: <<colour flexoki-999>>
message-background: <<colour background>>
message-border: <<colour foreground>>
message-foreground: <<colour foreground>>
diff --git a/core/palettes/GruvBoxDark.tid b/core/palettes/GruvBoxDark.tid
index 16ac22d65d..60d1c702e5 100644
--- a/core/palettes/GruvBoxDark.tid
+++ b/core/palettes/GruvBoxDark.tid
@@ -9,13 +9,13 @@ license: https://github.com/morhetz/gruvbox
alert-background: #cc241d
alert-border: #cc241d
alert-highlight: #d79921
-alert-muted-foreground: #504945
+alert-muted-foreground: #272321
background: #3c3836
blockquote-bar: <<colour muted-foreground>>
button-foreground: <<colour foreground>>
code-background: #504945
code-border: #504945
-code-foreground: #fb4934
+code-foreground: #fc5e4b
diff-delete-background: #fb4934
diff-delete-foreground: <<colour foreground>>
diff-equal-background:
@@ -25,7 +25,7 @@ diff-insert-foreground: <<colour background>>
diff-invisible-background: #ffff97
diff-invisible-foreground: #444347
dirty-indicator: #fb4934
-download-background: #b8bb26
+download-background: #1daf24
download-foreground: <<colour background>>
dragger-background: <<colour foreground>>
dragger-foreground: <<colour background>>
@@ -46,52 +46,53 @@ highlight-background: #ffff79
highlight-foreground: #000000
menubar-background: #504945
menubar-foreground: <<colour foreground>>
-message-background: #83a598
+message-background: #b4c9c1
message-border: #83a598
message-foreground: #3c3836
-modal-backdrop: <<colour foreground>>
+modal-backdrop: #625a57
modal-background: <<colour background>>
modal-border: #504945
modal-footer-background: #3c3836
modal-footer-border: #3c3836
modal-header-border: #3c3836
muted-foreground: #d5c4a1
+network-activity-foreground: <<colour primary>>
notification-background: <<colour primary>>
notification-border: <<colour primary>>
page-background: #282828
pre-background: #504945
pre-border: #504945
-primary: #d79921
+primary: #da9921
select-tag-background: #665c54
select-tag-foreground: <<colour foreground>>
selection-background: #458588
selection-foreground: <<colour foreground>>
sidebar-button-foreground: <<colour foreground>>
-sidebar-controls-foreground-hover: #7c6f64
-sidebar-controls-foreground: #504945
+sidebar-controls-foreground-hover: #e3e0dd
+sidebar-controls-foreground: #978b84
sidebar-foreground-shadow: transparent
sidebar-foreground: #fbf1c7
-sidebar-muted-foreground-hover: #7c6f64
-sidebar-muted-foreground: #504945
+sidebar-muted-foreground-hover: <<colour sidebar-controls-foreground-hover>>
+sidebar-muted-foreground: <<colour sidebar-controls-foreground>>
sidebar-tab-background-selected: #bdae93
sidebar-tab-background: #3c3836
sidebar-tab-border-selected: <<colour tab-border-selected>>
sidebar-tab-border: #bdae93
sidebar-tab-divider: <<colour page-background>>
-sidebar-tab-foreground-selected: #282828
+sidebar-tab-foreground-selected: <<colour page-background>>
sidebar-tab-foreground: <<colour tab-foreground>>
sidebar-tiddler-link-foreground-hover: #458588
sidebar-tiddler-link-foreground: #98971a
site-title-foreground: <<colour tiddler-title-foreground>>
stability-deprecated: #cc241d
-stability-experimental: #d79921
-stability-legacy: #458588
-stability-stable: #98971a
+stability-experimental: #b37d1c
+stability-legacy: #529ca0
+stability-stable: #649618
static-alert-foreground: #B48EAD
tab-background-selected: #ebdbb2
tab-background: #665c54
-tab-border-selected: #665c54
-tab-border: #665c54
+tab-border-selected: <<colour tab-background-selected>>
+tab-border: #82746a
tab-divider: #bdae93
tab-foreground-selected: #282828
tab-foreground: #ebdbb2
@@ -100,6 +101,7 @@ table-footer-background: #665c54
table-header-background: #504945
tag-background: #d3869b
tag-foreground: #282828
+testcase-accent-level-1: #456d88
tiddler-background: <<colour background>>
tiddler-border: <<colour background>>
tiddler-controls-foreground-hover: #7c6f64
@@ -126,7 +128,7 @@ toolbar-close-button:
toolbar-delete-button:
toolbar-cancel-button:
toolbar-done-button:
-untagged-background: #504945
+untagged-background: #887b75
very-muted-foreground: #bdae93
wikilist-background: <<colour page-background>>
wikilist-button-background: #acacac
diff --git a/core/palettes/Nord.tid b/core/palettes/Nord.tid
index 87e9189270..b662c2bfad 100644
--- a/core/palettes/Nord.tid
+++ b/core/palettes/Nord.tid
@@ -7,15 +7,15 @@ type: application/x-tiddler-dictionary
license: MIT, arcticicestudio, https://github.com/arcticicestudio/nord/blob/develop/LICENSE.md
alert-background: #D08770
-alert-border: #D08770
-alert-highlight: #B48EAD
-alert-muted-foreground: #4C566A
+alert-border: <<colour alert-background>>
+alert-highlight: #a3436f
+alert-muted-foreground: #495367
background: #3b4252
blockquote-bar: <<colour muted-foreground>>
button-foreground: <<colour foreground>>
code-background: #2E3440
code-border: #2E3440
-code-foreground: #BF616A
+code-foreground: #c7747c
diff-delete-background: #BF616A
diff-delete-foreground: <<colour foreground>>
diff-equal-background:
@@ -48,31 +48,32 @@ menubar-background: #2E3440
menubar-foreground: #d8dee9
message-background: #2E3440
message-border: #2E3440
-message-foreground: #547599
-modal-backdrop: <<colour foreground>>
+message-foreground: #6485aa
+modal-backdrop: #435678
modal-background: <<colour background>>
modal-border: #3b4252
modal-footer-background: #3b4252
modal-footer-border: #3b4252
modal-header-border: #3b4252
-muted-foreground: #4C566A
+muted-foreground: #687693
+network-activity-foreground: <<colour primary>>
notification-background: <<colour primary>>
notification-border: #EBCB8B
page-background: #2e3440
pre-background: #2E3440
pre-border: #2E3440
-primary: #5E81AC
+primary: #7b98bb
select-tag-background: #3b4252
select-tag-foreground: <<colour foreground>>
-selection-background: #5E81AC
+selection-background: #52749e
selection-foreground: <<colour foreground>>
sidebar-button-foreground: <<colour foreground>>
sidebar-controls-foreground-hover: #D8DEE9
-sidebar-controls-foreground: #4C566A
+sidebar-controls-foreground: #5e6a84
sidebar-foreground-shadow: transparent
sidebar-foreground: #D8DEE9
-sidebar-muted-foreground-hover: #4C566A
-sidebar-muted-foreground: #4C566A
+sidebar-muted-foreground-hover: #9fa8bb
+sidebar-muted-foreground: #6c7b97
sidebar-tab-background-selected: #ECEFF4
sidebar-tab-background: #4C566A
sidebar-tab-border-selected: <<colour tab-border-selected>>
@@ -83,39 +84,40 @@ sidebar-tab-foreground: <<colour tab-foreground>>
sidebar-tiddler-link-foreground-hover: #A3BE8C
sidebar-tiddler-link-foreground: #81A1C1
site-title-foreground: <<colour tiddler-title-foreground>>
-stability-deprecated: #bf616a
-stability-experimental: #d08770
-stability-legacy: #88c0d0
-stability-stable: #a3be8c
+stability-deprecated: #ff595e
+stability-experimental: #f29d00
+stability-legacy: #2ddbca
+stability-stable: #04ff04
static-alert-foreground: #B48EAD
tab-background-selected: #ECEFF4
tab-background: #4C566A
tab-border-selected: #4C566A
-tab-border: #4C566A
+tab-border: #5c6883
tab-divider: #4C566A
-tab-foreground-selected: #4C566A
+tab-foreground-selected: #6c7a97
tab-foreground: #D8DEE9
table-border: #4C566A
table-footer-background: #2e3440
table-header-background: #2e3440
tag-background: #A3BE8C
tag-foreground: #4C566A
+testcase-accent-level-1: #455e7d
tiddler-background: <<colour background>>
tiddler-border: <<colour background>>
tiddler-controls-foreground-hover:
tiddler-controls-foreground-selected: #EBCB8B
-tiddler-controls-foreground: #4C566A
+tiddler-controls-foreground: #5e6a84
tiddler-editor-background: #2e3440
tiddler-editor-border-image: #2e3440
-tiddler-editor-border: #3b4252
+tiddler-editor-border: #232732
tiddler-editor-fields-even: #2e3440
-tiddler-editor-fields-odd: #2e3440
+tiddler-editor-fields-odd: #424a5b
tiddler-info-background: #2e3440
tiddler-info-border: #2e3440
tiddler-info-tab-background: #2e3440
tiddler-link-background: <<colour background>>
tiddler-link-foreground: <<colour primary>>
-tiddler-subtitle-foreground: #4C566A
+tiddler-subtitle-foreground: #5c6881
tiddler-title-foreground: #81A1C1
toolbar-new-button:
toolbar-options-button:
@@ -138,4 +140,4 @@ wikilist-button-open-hover: #A3BE8C
wikilist-button-reveal: #81A1C1
wikilist-button-reveal-hover: #81A1C1
wikilist-button-remove: #B48EAD
-wikilist-button-remove-hover: #B48EAD
+wikilist-button-remove-hover: #B48EAD
\ No newline at end of file
diff --git a/core/palettes/Rocker.tid b/core/palettes/Rocker.tid
index c6693eb523..9e3e89f010 100644
--- a/core/palettes/Rocker.tid
+++ b/core/palettes/Rocker.tid
@@ -11,7 +11,7 @@ alert-highlight: #881122
alert-muted-foreground: #b99e2f
background: #ffffff
blockquote-bar: <<colour muted-foreground>>
-button-background:
+button-background: #adadad
button-foreground:
button-border:
code-background: #f7f7f9
@@ -47,36 +47,41 @@ modal-footer-background: #f5f5f5
modal-footer-border: #dddddd
modal-header-border: #eeeeee
muted-foreground: #999999
+network-activity-foreground: <<colour primary>>
notification-background: #ffffdd
notification-border: #999999
page-background: #000
pre-background: #f5f5f5
pre-border: #cccccc
primary: #cc0000
-select-tag-background:
-select-tag-foreground:
+select-tag-background: <<colour foreground>>
+select-tag-foreground: <<colour foreground>>
sidebar-button-foreground: <<colour foreground>>
-sidebar-controls-foreground-hover: #000000
-sidebar-controls-foreground: #ffffff
+sidebar-controls-foreground-hover: #797979
+sidebar-controls-foreground: #cacaca
sidebar-foreground-shadow: rgba(255,255,255, 0.0)
sidebar-foreground: #acacac
sidebar-muted-foreground-hover: #444444
sidebar-muted-foreground: #c0c0c0
-sidebar-tab-background-selected: #000
+sidebar-tab-background-selected: #000000
sidebar-tab-background: <<colour tab-background>>
-sidebar-tab-border-selected: <<colour tab-border-selected>>
+sidebar-tab-border-selected: #7c7c7c
sidebar-tab-border: <<colour tab-border>>
sidebar-tab-divider: <<colour tab-divider>>
-sidebar-tab-foreground-selected:
+sidebar-tab-foreground-selected: #ff0909
sidebar-tab-foreground: <<colour tab-foreground>>
sidebar-tiddler-link-foreground-hover: #ffbb99
sidebar-tiddler-link-foreground: #cc0000
site-title-foreground: <<colour tiddler-title-foreground>>
+stability-deprecated: #ff0000
+stability-experimental: #c07c00
+stability-legacy: #0000ff
+stability-stable: #008000
static-alert-foreground: #aaaaaa
tab-background-selected: #ffffff
tab-background: #d8d8d8
tab-border-selected: #d8d8d8
-tab-border: #cccccc
+tab-border: #bbbbbb
tab-divider: #d8d8d8
tab-foreground-selected: <<colour tab-foreground>>
tab-foreground: #666666
@@ -85,6 +90,7 @@ table-footer-background: #a8a8a8
table-header-background: #f0f0f0
tag-background: #ffbb99
tag-foreground: #000
+testcase-accent-level-1: #9e9eff
tiddler-background: <<colour background>>
tiddler-border: <<colour background>>
tiddler-controls-foreground-hover: #888888
@@ -112,4 +118,4 @@ toolbar-delete-button:
toolbar-cancel-button:
toolbar-done-button:
untagged-background: #999999
-very-muted-foreground: #888888
+very-muted-foreground: #888888
\ No newline at end of file
diff --git a/core/palettes/SolarFlare.tid b/core/palettes/SolarFlare.tid
index ff6ddcf1db..08476ebcd3 100644
--- a/core/palettes/SolarFlare.tid
+++ b/core/palettes/SolarFlare.tid
@@ -5,24 +5,24 @@ description: Warm, relaxing earth colours
tags: $:/tags/Palette
type: application/x-tiddler-dictionary
-: Background Tones
+# Background Tones
base03: #002b36
base02: #073642
-: Content Tones
+# Content Tones
base01: #586e75
base00: #657b83
base0: #839496
base1: #93a1a1
-: Background Tones
+# Background Tones
base2: #eee8d5
base3: #fdf6e3
-: Accent Colors
+# Accent Colors
yellow: #b58900
orange: #cb4b16
@@ -33,7 +33,7 @@ blue: #268bd2
cyan: #2aa198
green: #859900
-: Additional Tones (RA)
+# Additional Tones (RA)
base10: #c0c4bb
violet-muted: #7c81b0
@@ -45,9 +45,9 @@ red-hot: #ff2222
blue-hot: #2298ee
green-hot: #98ee22
-: Palette
+# Palette
-: Do not use colour macro for background and foreground
+# Do not use colour macro for background and foreground
background: #fdf6e3
download-foreground: <<colour background>>
dragger-foreground: <<colour background>>
@@ -68,24 +68,28 @@ foreground: #657b83
sidebar-button-foreground: <<colour foreground>>
sidebar-controls-foreground: <<colour foreground>>
sidebar-foreground: <<colour foreground>>
-: base03
-: base02
-: base01
+# base03
+# base02
+# base01
alert-muted-foreground: <<colour base01>>
-: base00
+# base00
code-foreground: <<colour base00>>
message-foreground: <<colour base00>>
tag-foreground: <<colour base00>>
-: base0
+# base0
sidebar-tiddler-link-foreground: <<colour base0>>
-: base1
+# base1
muted-foreground: <<colour base1>>
blockquote-bar: <<colour muted-foreground>>
dropdown-border: <<colour muted-foreground>>
sidebar-muted-foreground: <<colour muted-foreground>>
tiddler-title-foreground: <<colour muted-foreground>>
site-title-foreground: <<colour tiddler-title-foreground>>
-: base2
+# base2
+ stability-deprecated: <<colour red>>
+ stability-experimental: <<colour yellow>>
+ stability-legacy: <<colour blue-hot>>
+ stability-stable: <<colour green>>
modal-footer-background: <<colour base2>>
page-background: <<colour base2>>
modal-backdrop: <<colour page-background>>
@@ -99,31 +103,31 @@ foreground: #657b83
tag-background: <<colour base2>>
tiddler-editor-background: <<colour base2>>
tiddler-info-background: <<colour base2>>
- tiddler-info-tab-background: <<colour base2>>
+ tiddler-info-tab-background: <<colour tiddler-info-border>>
tab-background: <<colour base2>>
- dropdown-tab-background: <<colour tab-background>>
-: base3
+dropdown-tab-background: <<colour tab-background>>
+# base3
alert-background: <<colour base3>>
message-background: <<colour base3>>
-: yellow
-: orange
-: red
-: magenta
+# yellow
+# orange
+# red
+# magenta
alert-highlight: <<colour magenta>>
-: violet
+# violet
external-link-foreground: <<colour violet>>
-: blue
-: cyan
-: green
-: base10
- tiddler-controls-foreground: <<colour base10>>
-: violet-muted
- external-link-foreground-visited: <<colour violet-muted>>
-: blue-muted
- primary: <<colour blue-muted>>
- download-background: <<colour primary>>
- tiddler-link-foreground: <<colour primary>>
+# blue
+# cyan
+# green
+# base10
+ tiddler-controls-foreground: <<colour base10>>
+# violet-muted
+ external-link-foreground-visited: <<colour violet-muted>>
+# blue-muted
+ primary: <<colour blue-muted>>
+ download-background: #5bb83d
+ tiddler-link-foreground: <<colour primary>>
alert-border: #b99e2f
diff-delete-background: <<colour red>>
diff-delete-foreground: <<colour background>>
@@ -134,7 +138,7 @@ diff-insert-foreground: <<colour background>>
diff-invisible-background: <<colour yellow>>
diff-invisible-foreground: <<colour background>>
dirty-indicator: #ff0000
-dropzone-background: rgba(0,200,0,0.7)
+dropzone-background: #008800
external-link-background-hover: inherit
external-link-background-visited: inherit
external-link-background: inherit
@@ -146,14 +150,10 @@ message-border: #cfd6e6
modal-border: #999999
select-tag-background:
select-tag-foreground:
-sidebar-controls-foreground-hover:
+sidebar-controls-foreground-hover: #000000
sidebar-muted-foreground-hover:
sidebar-tab-background: #ded8c5
sidebar-tiddler-link-foreground-hover:
-stability-deprecated: <<colour red>>
-stability-experimental: <<colour yellow>>
-stability-legacy: <<colour blue>>
-stability-stable: <<colour green>>
static-alert-foreground: #aaaaaa
tab-border: #cccccc
modal-footer-border: <<colour tab-border>>
@@ -166,6 +166,7 @@ tab-divider: #d8d8d8
sidebar-tab-divider: <<colour tab-divider>>
table-border: #dddddd
table-footer-background: #a8a8a8
+testcase-accent-level-1: #bec8cc
tiddler-controls-foreground-hover: #888888
tiddler-controls-foreground-selected: #444444
tiddler-editor-border-image: #ffffff
@@ -185,3 +186,4 @@ toolbar-cancel-button:
toolbar-done-button:
untagged-background: #999999
very-muted-foreground: #888888
+network-activity-foreground: <<colour primary>>
\ No newline at end of file
diff --git a/core/palettes/SolarizedDark.tid b/core/palettes/SolarizedDark.tid
index 9338998e9f..2069797f16 100644
--- a/core/palettes/SolarizedDark.tid
+++ b/core/palettes/SolarizedDark.tid
@@ -40,7 +40,7 @@ external-link-background: inherit
external-link-background-hover: inherit
external-link-background-visited: inherit
external-link-foreground: #268bd2
-external-link-foreground-hover:
+external-link-foreground-hover: #1d669c
external-link-foreground-visited: #268bd2
footnote-target-background: #073642
foreground: #839496
@@ -56,6 +56,7 @@ modal-footer-background: #073642
modal-footer-border: #586e75
modal-header-border: #586e75
muted-foreground: #93a1a1
+network-activity-foreground: <<colour primary>>
notification-background: #002b36
notification-border: #586e75
page-background: #073642
@@ -81,10 +82,10 @@ sidebar-tab-foreground-selected: #93a1a1
sidebar-tiddler-link-foreground: #2aa198
sidebar-tiddler-link-foreground-hover: #eee8d5
site-title-foreground: #d33682
-stability-deprecated: #dc322f
-stability-experimental: #b58900
-stability-legacy: #268bd2
-stability-stable: #859900
+stability-deprecated: #aa1a9f
+stability-experimental: #806000
+stability-legacy: #1d669c
+stability-stable: #00df11
static-alert-foreground: #93a1a1
tab-background: #073642
tab-background-selected: #002b36
@@ -98,6 +99,7 @@ table-footer-background: #073642
table-header-background: #073642
tag-background: #b58900
tag-foreground: #002b36
+testcase-accent-level-1: #073642
tiddler-background: #002b36
tiddler-border: #586e75
tiddler-controls-foreground: inherit
@@ -125,4 +127,4 @@ toolbar-new-button: #839496
toolbar-options-button: #839496
toolbar-save-button: inherit
untagged-background: #586e75
-very-muted-foreground: #586e75
+very-muted-foreground: #586e75
\ No newline at end of file
diff --git a/core/palettes/SolarizedLight.tid b/core/palettes/SolarizedLight.tid
index c01ff88218..ce2354fb04 100644
--- a/core/palettes/SolarizedLight.tid
+++ b/core/palettes/SolarizedLight.tid
@@ -27,7 +27,7 @@ diff-insert-foreground: #eee8d5
diff-invisible-background: #b58900
diff-invisible-foreground: #eee8d5
dirty-indicator: #dc322f
-download-background: #859900
+download-background: #00910b
download-foreground: #eee8d5
dragger-background: #eee8d5
dragger-foreground: #657b83
@@ -56,6 +56,7 @@ modal-footer-background: #eee8d5
modal-footer-border: #93a1a1
modal-header-border: #93a1a1
muted-foreground: #586e75
+network-activity-foreground: <<colour primary>>
notification-background: #fdf6e3
notification-border: #93a1a1
page-background: #eee8d5
@@ -81,10 +82,10 @@ sidebar-tab-foreground-selected: #586e75
sidebar-tiddler-link-foreground: #2aa198
sidebar-tiddler-link-foreground-hover: #002b36
site-title-foreground: #d33682
-stability-deprecated: #dc322f
-stability-experimental: #b58900
-stability-legacy: #268bd2
-stability-stable: #859900
+stability-deprecated: #d21a1a
+stability-experimental: #771e00
+stability-legacy: #227abb
+stability-stable: #576400
static-alert-foreground: #586e75
tab-background: #eee8d5
tab-background-selected: #fdf6e3
@@ -98,6 +99,7 @@ table-footer-background: #eee8d5
table-header-background: #eee8d5
tag-background: #b58900
tag-foreground: #fdf6e3
+testcase-accent-level-1: #afc2db
tiddler-background: #fdf6e3
tiddler-border: #93a1a1
tiddler-controls-foreground: inherit
diff --git a/core/palettes/Twilight.tid b/core/palettes/Twilight.tid
index d6b54673ad..bbd077218f 100644
--- a/core/palettes/Twilight.tid
+++ b/core/palettes/Twilight.tid
@@ -94,6 +94,7 @@ table-footer-background: rgba(0,0,0,.4)
table-header-background: rgba(0,0,0,.1)
tag-background: rgb(255, 201, 102)
tag-foreground: rgb(25, 25, 25)
+testcase-accent-level-1: rgb(13, 52, 99)
tiddler-background: rgb(38, 38, 38)
tiddler-border: rgba(240, 196, 117, 0.7)
tiddler-controls-foreground: rgb(128, 128, 128)
diff --git a/core/palettes/Vanilla.tid b/core/palettes/Vanilla.tid
index d981a485ef..2228fddf13 100644
--- a/core/palettes/Vanilla.tid
+++ b/core/palettes/Vanilla.tid
@@ -69,7 +69,7 @@ select-tag-foreground:
sidebar-button-foreground: <<colour foreground>>
sidebar-controls-foreground-hover: #000000
sidebar-controls-foreground: #aaaaaa
-sidebar-foreground-shadow: rgba(255,255,255, 0.8)
+sidebar-foreground-shadow: #ffffff
sidebar-foreground: #acacac
sidebar-muted-foreground-hover: #444444
sidebar-muted-foreground: #c0c0c0
@@ -83,7 +83,7 @@ sidebar-tab-foreground: <<colour tab-foreground>>
sidebar-tiddler-link-foreground-hover: #444444
sidebar-tiddler-link-foreground: #999999
site-title-foreground: <<colour tiddler-title-foreground>>
-stability-stable: #008000
+stability-stable: #00b700
stability-experimental: #c07c00
stability-deprecated: #ff0000
stability-legacy: #0000ff
@@ -138,13 +138,13 @@ wikilist-title: #666666
wikilist-title-svg: <<colour wikilist-title>>
wikilist-url: #aaaaaa
wikilist-button-open: #4fb82b
-wikilist-button-open-hover: green
+wikilist-button-open-hover: #009300
wikilist-button-reveal: #5778d8
-wikilist-button-reveal-hover: blue
+wikilist-button-reveal-hover: #0000ff
wikilist-button-remove: #d85778
-wikilist-button-remove-hover: red
+wikilist-button-remove-hover: #ff0000
wikilist-toolbar-background: #d3d3d3
wikilist-toolbar-foreground: #888888
-wikilist-droplink-dragover: rgba(255,192,192,0.5)
+wikilist-droplink-dragover: #ffc0c0
wikilist-button-background: #acacac
-wikilist-button-foreground: #000000
+wikilist-button-foreground: #000000
\ No newline at end of file
diff --git a/core/templates/external-js/save-all-external-js.tid b/core/templates/external-js/save-all-external-js.tid
index 1f49088781..36bdd9f68a 100644
--- a/core/templates/external-js/save-all-external-js.tid
+++ b/core/templates/external-js/save-all-external-js.tid
@@ -3,7 +3,7 @@ title: $:/core/save/all-external-js
\whitespace trim
\import [subfilter{$:/core/config/GlobalImportFilter}]
\define saveTiddlerFilter()
-[is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/core]] -[[$:/boot/boot.css]] -[is[system]type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]] $(publishFilter)$
+[is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/core]] -[[$:/boot/boot.css]] -[is[system]type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[has[plugin-type]field:platform[server]] +[sort[title]] $(publishFilter)$
\end
<!-- Important: core library is provided by serving URI encoded $:/core/templates/tiddlywiki5.js -->
diff --git a/core/templates/external-js/save-offline-external-js.tid b/core/templates/external-js/save-offline-external-js.tid
index 70cb8bbc0d..bae0d16fdb 100644
--- a/core/templates/external-js/save-offline-external-js.tid
+++ b/core/templates/external-js/save-offline-external-js.tid
@@ -3,7 +3,7 @@ title: $:/core/save/offline-external-js
\whitespace trim
\import [subfilter{$:/core/config/GlobalImportFilter}]
\define saveTiddlerFilter()
-[is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/core]] -[[$:/plugins/tiddlywiki/filesystem]] -[[$:/plugins/tiddlywiki/tiddlyweb]] -[[$:/boot/boot.css]] -[is[system]type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]] $(publishFilter)$
+[is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/core]] -[[$:/plugins/tiddlywiki/filesystem]] -[[$:/plugins/tiddlywiki/tiddlyweb]] -[[$:/boot/boot.css]] -[is[system]type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[has[plugin-type]field:platform[server]] +[sort[title]] $(publishFilter)$
\end
\define defaultCoreURL() tiddlywikicore-$(version)$.js
<$let coreURL={{{ [[coreURL]is[variable]then<coreURL>else<defaultCoreURL>] }}}>
diff --git a/core/templates/external-js/tiddlywiki5-external-js.html.tid b/core/templates/external-js/tiddlywiki5-external-js.html.tid
index b161584d71..39ded2b5e3 100644
--- a/core/templates/external-js/tiddlywiki5-external-js.html.tid
+++ b/core/templates/external-js/tiddlywiki5-external-js.html.tid
@@ -1,12 +1,13 @@
title: $:/core/templates/tiddlywiki5-external-js.html
<$set name="saveTiddlerAndShadowsFilter" filter="[subfilter<saveTiddlerFilter>] [subfilter<saveTiddlerFilter>plugintiddlers[]]">
+<$set name="rawMarkupFilter" filter="[enlist<saveTiddlerAndShadowsFilter>] +[[$:/core]plugintiddlers[]]">
`<!doctype html>
`{{$:/core/templates/MOTW.html}}`<html lang="`<$text text={{{ [{$:/language}get[name]] }}}/>`">
<head>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<!--~~ Raw markup for the top of the head section ~~-->
-`{{{ [enlist<saveTiddlerAndShadowsFilter>tag[$:/tags/RawMarkupWikified/TopHead]] ||$:/core/templates/raw-static-tiddler}}}`
+`{{{ [enlist<rawMarkupFilter>tag[$:/tags/RawMarkupWikified/TopHead]] ||$:/core/templates/raw-static-tiddler}}}`
<meta http-equiv="X-UA-Compatible" content="IE=Edge"/>
<meta name="application-name" content="TiddlyWiki" />
<meta name="generator" content="TiddlyWiki" />
@@ -22,13 +23,13 @@ title: $:/core/templates/tiddlywiki5-external-js.html
<!--~~ This is a Tiddlywiki file. The points of interest in the file are marked with this pattern ~~-->
<!--~~ Raw markup ~~-->
-`{{{ [enlist<saveTiddlerAndShadowsFilter>tag[$:/core/wiki/rawmarkup]] ||$:/core/templates/plain-text-tiddler}}}`
-`{{{ [enlist<saveTiddlerAndShadowsFilter>tag[$:/tags/RawMarkup]] ||$:/core/templates/plain-text-tiddler}}}`
-`{{{ [enlist<saveTiddlerAndShadowsFilter>tag[$:/tags/RawMarkupWikified]] ||$:/core/templates/raw-static-tiddler}}}`
+`{{{ [enlist<rawMarkupFilter>tag[$:/core/wiki/rawmarkup]] ||$:/core/templates/plain-text-tiddler}}}`
+`{{{ [enlist<rawMarkupFilter>tag[$:/tags/RawMarkup]] ||$:/core/templates/plain-text-tiddler}}}`
+`{{{ [enlist<rawMarkupFilter>tag[$:/tags/RawMarkupWikified]] ||$:/core/templates/raw-static-tiddler}}}`
</head>
<body class="tc-body">
<!--~~ Raw markup for the top of the body section ~~-->
-`{{{ [enlist<saveTiddlerAndShadowsFilter>tag[$:/tags/RawMarkupWikified/TopBody]] ||$:/core/templates/raw-static-tiddler}}}`
+`{{{ [enlist<rawMarkupFilter>tag[$:/tags/RawMarkupWikified/TopBody]] ||$:/core/templates/raw-static-tiddler}}}`
<!--~~ Static styles ~~-->
<div id="styleArea">
`{{$:/boot/boot.css||$:/core/templates/css-tiddler}}`
@@ -42,9 +43,10 @@ title: $:/core/templates/tiddlywiki5-external-js.html
<!--~~ Ordinary tiddlers ~~-->
`{{$:/core/templates/store.area.template.html}}`
<!--~~ Raw markup for the bottom of the body section ~~-->
-`{{{ [enlist<saveTiddlerAndShadowsFilter>tag[$:/tags/RawMarkupWikified/BottomBody]] ||$:/core/templates/raw-static-tiddler}}}`
+`{{{ [enlist<rawMarkupFilter>tag[$:/tags/RawMarkupWikified/BottomBody]] ||$:/core/templates/raw-static-tiddler}}}`
<!--~~ Load external JavaScripts ~~-->
<script src="`{{{ [<coreURL>] }}}`" onerror="alert('Error: Cannot load `{{{ [<coreURL>] }}}`');"></script>
</body>
</html>`
+</$set>
</$set>
\ No newline at end of file
diff --git a/core/templates/save-all.tid b/core/templates/save-all.tid
index a316d1954c..72fb9548dd 100644
--- a/core/templates/save-all.tid
+++ b/core/templates/save-all.tid
@@ -2,6 +2,6 @@ title: $:/core/save/all
\import [subfilter{$:/core/config/GlobalImportFilter}]
\define saveTiddlerFilter()
-[is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/boot/boot.css]] -[is[system]type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]] $(publishFilter)$
+[is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/boot/boot.css]] -[is[system]type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[has[plugin-type]field:platform[server]] +[sort[title]] $(publishFilter)$
\end
{{$:/core/templates/tiddlywiki5.html}}
diff --git a/core/templates/save-empty.tid b/core/templates/save-empty.tid
index 0b1c33b595..372d1c4a1f 100644
--- a/core/templates/save-empty.tid
+++ b/core/templates/save-empty.tid
@@ -1,6 +1,6 @@
title: $:/core/save/empty
\define saveTiddlerFilter()
-[is[system]] -[prefix[$:/state/popup/]] -[[$:/boot/boot.css]] -[is[system]type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]]
+[is[system]] -[prefix[$:/state/popup/]] -[[$:/boot/boot.css]] -[is[system]type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[has[plugin-type]field:platform[server]] +[sort[title]]
\end
{{$:/core/templates/tiddlywiki5.html}}
diff --git a/core/templates/save-lazy-all.tid b/core/templates/save-lazy-all.tid
index da4353fba6..1162b1155d 100644
--- a/core/templates/save-lazy-all.tid
+++ b/core/templates/save-lazy-all.tid
@@ -1,7 +1,7 @@
title: $:/core/save/lazy-all
\define saveTiddlerFilter()
-[is[system]] -[prefix[$:/state/popup/]] -[[$:/HistoryList]] -[[$:/boot/boot.css]] -[is[system]type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] [is[tiddler]type[application/javascript]] +[sort[title]]
+[is[system]] -[prefix[$:/state/popup/]] -[[$:/HistoryList]] -[[$:/boot/boot.css]] -[is[system]type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[has[plugin-type]field:platform[server]] [is[tiddler]type[application/javascript]] +[sort[title]]
\end
\define skinnySaveTiddlerFilter()
[!is[system]] -[type[application/javascript]]
diff --git a/core/templates/save-lazy-images.tid b/core/templates/save-lazy-images.tid
index b23b348f0a..369c1e7e06 100644
--- a/core/templates/save-lazy-images.tid
+++ b/core/templates/save-lazy-images.tid
@@ -1,7 +1,7 @@
title: $:/core/save/lazy-images
\define saveTiddlerFilter()
-[is[tiddler]] -[prefix[$:/state/popup/]] -[[$:/HistoryList]] -[[$:/boot/boot.css]] -[is[system]type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[!is[system]is[image]] +[sort[title]]
+[is[tiddler]] -[prefix[$:/state/popup/]] -[[$:/HistoryList]] -[[$:/boot/boot.css]] -[is[system]type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[has[plugin-type]field:platform[server]] -[!is[system]is[image]] +[sort[title]]
\end
\define skinnySaveTiddlerFilter()
[!is[system]is[image]]
diff --git a/core/ui/AdvancedSearch/Filter.tid b/core/ui/AdvancedSearch/Filter.tid
index 7369e4c400..4005ebbdc7 100644
--- a/core/ui/AdvancedSearch/Filter.tid
+++ b/core/ui/AdvancedSearch/Filter.tid
@@ -62,28 +62,34 @@ caption: {{$:/language/Search/Filter/Caption}}
</$list>
\end
+\procedure input-actions()
+<%if [<event-key-descriptor>match[((input-tab-right))]] %>
+<<set-next-input-tab>>
+<%elseif [<event-key-descriptor>match[((input-tab-left))]] %>
+<<set-previous-input-tab>>
+<%endif%>
+\end
+
\whitespace trim
<<lingo Filter/Hint>>
<div class="tc-search tc-advanced-search">
- <$keyboard key="((input-tab-right))" actions=<<set-next-input-tab>> class="tc-small-gap-right">
- <$keyboard key="((input-tab-left))" actions=<<set-previous-input-tab>>>
- <$transclude $variable="keyboard-driven-input"
- tiddler="$:/temp/advancedsearch/input"
- storeTitle="$:/temp/advancedsearch"
- refreshTitle="$:/temp/advancedsearch/refresh"
- selectionStateTitle="$:/temp/advancedsearch/selected-item"
- type="search"
- tag="input"
- focus={{$:/config/Search/AutoFocus}}
- configTiddlerFilter="[[$:/temp/advancedsearch]]"
- firstSearchFilterField="text"
- inputAcceptActions=<<input-accept-actions>>
- inputAcceptVariantActions=<<input-accept-variant-actions>>
- inputCancelActions=<<cancel-search-actions>>
- />
- </$keyboard>
+ <$keyboard key="((input-tab-right)) ((input-tab-left))" actions=<<input-actions>> class="tc-small-gap-right">
+ <$transclude $variable="keyboard-driven-input"
+ tiddler="$:/temp/advancedsearch/input"
+ storeTitle="$:/temp/advancedsearch"
+ refreshTitle="$:/temp/advancedsearch/refresh"
+ selectionStateTitle="$:/temp/advancedsearch/selected-item"
+ type="search"
+ tag="input"
+ focus={{$:/config/Search/AutoFocus}}
+ configTiddlerFilter="[[$:/temp/advancedsearch]]"
+ firstSearchFilterField="text"
+ inputAcceptActions=<<input-accept-actions>>
+ inputAcceptVariantActions=<<input-accept-variant-actions>>
+ inputCancelActions=<<cancel-search-actions>>
+ />
</$keyboard>
<$list filter="[all[shadows+tiddlers]tag[$:/tags/AdvancedSearch/FilterButton]!has[draft.of]]">
<$transclude/>
diff --git a/core/ui/AdvancedSearch/Shadows.tid b/core/ui/AdvancedSearch/Shadows.tid
index 1c7f15087a..6225dc3e68 100644
--- a/core/ui/AdvancedSearch/Shadows.tid
+++ b/core/ui/AdvancedSearch/Shadows.tid
@@ -53,13 +53,20 @@ first-search-filter: [all[shadows]search<userInput>sort[title]limit[250]] -[[$:/
</$list></$list>
\end
+\procedure input-actions()
+<%if [<event-key-descriptor>match[((input-tab-right))]] %>
+<<set-next-input-tab>>
+<%elseif [<event-key-descriptor>match[((input-tab-left))]] %>
+<<set-previous-input-tab>>
+<%endif%>
+\end
+
\whitespace trim
<<lingo Shadows/Hint>>
<div class="tc-search">
-<$keyboard key="((input-tab-right))" actions=<<set-next-input-tab>>>
-<$keyboard key="((input-tab-left))" actions=<<set-previous-input-tab>>>
+<$keyboard key="((input-tab-right)) ((input-tab-left))" actions=<<input-actions>>>
<$transclude $variable="keyboard-driven-input"
tiddler="$:/temp/advancedsearch/input"
storeTitle="$:/temp/advancedsearch"
@@ -74,7 +81,6 @@ first-search-filter: [all[shadows]search<userInput>sort[title]limit[250]] -[[$:/
inputAcceptVariantActions=<<input-accept-variant-actions>>
filterMinLength={{$:/config/Search/MinLength}}/>
</$keyboard>
-</$keyboard>
<$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
<$button class="tc-btn-invisible">
diff --git a/core/ui/AdvancedSearch/Standard.tid b/core/ui/AdvancedSearch/Standard.tid
index ae80ced350..cdf84f183d 100644
--- a/core/ui/AdvancedSearch/Standard.tid
+++ b/core/ui/AdvancedSearch/Standard.tid
@@ -17,15 +17,24 @@ caption: {{$:/language/Search/Standard/Caption}}
\procedure input-accept-variant-actions() <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]" emptyMessage="<$list filter='[<tiddler>get[text]!is[missing]] :else[<tiddler>get[text]is[shadow]]'><$list filter='[<tiddler>get[text]minlength[1]]'><$action-sendmessage $message='tm-edit-tiddler' $param={{{ [<tiddler>get[text]] }}}/></$list></$list>"><$list filter="[<tiddler>get[text]minlength[1]]"><$action-sendmessage $message="tm-edit-tiddler" $param={{{ [<tiddler>get[text]] }}}/></$list></$list>
+\procedure input-actions()
+<%if [<event-code>match[ArrowRight]] :and[<modifier>match[alt-shift]] %>
+<<next-search-tab>>
+<%elseif [<event-code>match[ArrowLeft]] :and[<modifier>match[alt-shift]] %>
+<<previous-search-tab>>
+<%elseif [<event-key-descriptor>match[((input-tab-right))]] %>
+<<set-next-input-tab>>
+<%elseif [<event-key-descriptor>match[((input-tab-left))]] %>
+<<set-previous-input-tab>>
+<%endif%>
+\end
+
\whitespace trim
<<lingo Standard/Hint>>
<div class="tc-search">
-<$keyboard key="((input-tab-right))" actions=<<set-next-input-tab>>>
-<$keyboard key="((input-tab-left))" actions=<<set-previous-input-tab>>>
-<$keyboard key="shift-alt-Right" actions=<<next-search-tab>>>
-<$keyboard key="shift-alt-Left" actions=<<previous-search-tab>>>
+<$keyboard key="((input-tab-right)) ((input-tab-left)) shift-alt-Right shift-alt-Left" actions=<<input-actions>>>
<$transclude $variable="keyboard-driven-input"
tiddler="$:/temp/advancedsearch/input"
storeTitle="$:/temp/advancedsearch"
@@ -40,9 +49,6 @@ caption: {{$:/language/Search/Standard/Caption}}
configTiddlerFilter="[[$:/state/advancedsearch/standard/currentTab]!is[missing]get[text]] :else[{$:/config/SearchResults/Default}]"
filterMinLength={{$:/config/Search/MinLength}}/>
</$keyboard>
-</$keyboard>
-</$keyboard>
-</$keyboard>
<$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
<$button class="tc-btn-invisible">
diff --git a/core/ui/AdvancedSearch/System.tid b/core/ui/AdvancedSearch/System.tid
index 90b5a95010..f9288d50be 100644
--- a/core/ui/AdvancedSearch/System.tid
+++ b/core/ui/AdvancedSearch/System.tid
@@ -52,13 +52,20 @@ first-search-filter: [is[system]search<userInput>sort[title]limit[250]] :except[
</$list></$list>
\end
+\procedure input-actions()
+<%if [<event-key-descriptor>match[((input-tab-right))]] %>
+<<set-next-input-tab>>
+<%elseif [<event-key-descriptor>match[((input-tab-left))]] %>
+<<set-previous-input-tab>>
+<%endif%>
+\end
+
\whitespace trim
<<lingo System/Hint>>
<div class="tc-search">
-<$keyboard key="((input-tab-right))" actions=<<set-next-input-tab>>>
-<$keyboard key="((input-tab-left))" actions=<<set-previous-input-tab>>>
+<$keyboard key="((input-tab-right)) ((input-tab-left))" actions=<<input-actions>>>
<$transclude $variable="keyboard-driven-input"
tiddler="$:/temp/advancedsearch/input"
storeTitle="$:/temp/advancedsearch"
@@ -73,7 +80,6 @@ first-search-filter: [is[system]search<userInput>sort[title]limit[250]] :except[
inputAcceptVariantActions=<<input-accept-variant-actions>>
filterMinLength={{$:/config/Search/MinLength}}/>
</$keyboard>
-</$keyboard>
<$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
<$button class="tc-btn-invisible">
diff --git a/core/ui/AlertTemplate.tid b/core/ui/AlertTemplate.tid
index d67586b8d3..de96121c28 100644
--- a/core/ui/AlertTemplate.tid
+++ b/core/ui/AlertTemplate.tid
@@ -2,9 +2,9 @@ code-body: yes
title: $:/core/ui/AlertTemplate
\whitespace trim
-<div class="tc-alert">
+<div class="tc-alert" role="alertdialog">
<div class="tc-alert-toolbar">
-<$button class="tc-btn-invisible"><$action-deletetiddler $tiddler=<<currentTiddler>>/>{{$:/core/images/cancel-button}}</$button>
+<$button class="tc-btn-invisible" aria-label={{$:/language/Buttons/Close/Caption}}><$action-deletetiddler $tiddler=<<currentTiddler>>/>{{$:/core/images/cancel-button}}</$button>
</div>
<div class="tc-alert-subtitle">
<$wikify name="format" text=<<lingo Tiddler/DateFormat>>>
@@ -19,7 +19,7 @@ title: $:/core/ui/AlertTemplate
</$reveal>
</$wikify>
</div>
-<div class="tc-alert-body">
+<div class="tc-alert-body" role="alert" aria-atomic="true">
<$transclude/>
diff --git a/core/ui/ControlPanel/Saving/TiddlySpot.tid b/core/ui/ControlPanel/Saving/TiddlySpot.tid
index 65613d87de..9cbdf57266 100644
--- a/core/ui/ControlPanel/Saving/TiddlySpot.tid
+++ b/core/ui/ControlPanel/Saving/TiddlySpot.tid
@@ -21,12 +21,6 @@ http://$(userName)$.tiddlyspot.com/$path$/
</$reveal>
\end
-<div class="tc-message-box">
-
-<<lingo ReadOnly>>
-
-</div>
-
<<lingo Description>>
|<<lingo UserName>> |<$edit-text tiddler="$:/UploadName" default="" tag="input"/> |
diff --git a/core/ui/ControlPanel/Saving/gitea.tid b/core/ui/ControlPanel/Saving/gitea.tid
index cc4d833692..c73973d174 100644
--- a/core/ui/ControlPanel/Saving/gitea.tid
+++ b/core/ui/ControlPanel/Saving/gitea.tid
@@ -3,7 +3,7 @@ tags: $:/tags/ControlPanel/Saving
caption: {{$:/language/ControlPanel/Saving/GitService/Gitea/Caption}}
\define lingo-base() $:/language/ControlPanel/Saving/GitService/
-\define service-name() ~Gitea
+\define service-name() Gitea
<<lingo Description>>
diff --git a/core/ui/ControlPanel/Settings/DefaultTiddlerInfoTab.tid b/core/ui/ControlPanel/Settings/DefaultTiddlerInfoTab.tid
new file mode 100644
index 0000000000..a662d6ff49
--- /dev/null
+++ b/core/ui/ControlPanel/Settings/DefaultTiddlerInfoTab.tid
@@ -0,0 +1,19 @@
+caption: {{$:/language/ControlPanel/Settings/DefaultTiddlerInfoTab/Caption}}
+tags: $:/tags/ControlPanel/Settings
+title: $:/core/ui/ControlPanel/Settings/DefaultTiddlerInfoTab
+
+\whitespace trim
+\define lingo-base() $:/language/ControlPanel/Settings/DefaultTiddlerInfoTab/
+
+<$link to="$:/config/TiddlerInfo/Default" class="tc-control-panel-item">
+ <<lingo Hint>>
+</$link>
+
+<$select tiddler="$:/config/TiddlerInfo/Default" class="tc-select">
+ <$list filter="[all[shadows+tiddlers]tag[$:/tags/TiddlerInfo]!is[draft]]">
+ <option value=<<currentTiddler>>><$transclude field="caption">
+ <$text text=<<currentTiddler>>/>
+ </$transclude>
+ </option>
+ </$list>
+</$select>
diff --git a/core/ui/EditTemplate/tags.tid b/core/ui/EditTemplate/tags.tid
index c8d4131feb..298120606d 100644
--- a/core/ui/EditTemplate/tags.tid
+++ b/core/ui/EditTemplate/tags.tid
@@ -17,15 +17,11 @@ tags: $:/tags/EditTemplate
<$let backgroundColor=<<colour>> >
<span class="tc-tag-label tc-tag-list-item tc-small-gap-right"
data-tag-title=<<currentTiddler>>
- style.color=<<foregroundColor>>
- style.fill=<<foregroundColor>>
- style.background-color=<<backgroundColor>>
+ style=`color:$(foregroundColor)$; background-color:$(backgroundColor)$;`
>
<$transclude tiddler=<<icon>>/>
<$view field="title" format="text"/>
- <$button class="tc-btn-invisible tc-remove-tag-button"
- style.fill=<<foregroundColor>>
- >
+ <$button class="tc-btn-invisible tc-remove-tag-button">
<$action-listops $tiddler=<<saveTiddler>> $field=<<tagField>> $subfilter="-[{!!title}]"/>
{{$:/core/images/close-button}}
</$button>
diff --git a/core/ui/EditTemplate/type.tid b/core/ui/EditTemplate/type.tid
index 259a701b76..eae2ebfee1 100644
--- a/core/ui/EditTemplate/type.tid
+++ b/core/ui/EditTemplate/type.tid
@@ -10,7 +10,7 @@ first-search-filter: [all[shadows+tiddlers]prefix[$:/language/Docs/Types/]sort[d
<em class="tc-edit tc-small-gap-right"><<lingo Type/Prompt>></em>
<div class="tc-type-selector-dropdown-wrapper">
<div class="tc-type-selector"><$fieldmangler>
-<$transclude $variable="keyboard-driven-input" tiddler=<<currentTiddler>> storeTitle=<<typeInputTiddler>> refreshTitle=<<refreshTitle>> selectionStateTitle=<<typeSelectionTiddler>> field="type" tag="input" default="" placeholder={{$:/language/EditTemplate/Type/Placeholder}} focusPopup=<<qualify "$:/state/popup/type-dropdown">> class="tc-edit-typeeditor tc-edit-texteditor tc-popup-handle" tabindex={{$:/config/EditTabIndex}} focus={{{ [{$:/config/AutoFocus}match[type]then[true]] :else[[false]] }}} cancelPopups="yes" configTiddlerFilter="[[$:/core/ui/EditTemplate/type]]" inputCancelActions=<<input-cancel-actions>>/><$button popup=<<qualify "$:/state/popup/type-dropdown">> class="tc-btn-invisible tc-btn-dropdown tc-small-gap" tooltip={{$:/language/EditTemplate/Type/Dropdown/Hint}} aria-label={{$:/language/EditTemplate/Type/Dropdown/Caption}}>{{$:/core/images/down-arrow}}</$button><$button message="tm-remove-field" param="type" class="tc-btn-invisible tc-btn-icon" tooltip={{$:/language/EditTemplate/Type/Delete/Hint}} aria-label={{$:/language/EditTemplate/Type/Delete/Caption}}>{{$:/core/images/delete-button}}<$action-deletetiddler $filter="[<typeInputTiddler>] [<storeTitle>] [<refreshTitle>] [<selectionStateTitle>]"/></$button>
+<$transclude $variable="keyboard-driven-input" tiddler=<<currentTiddler>> storeTitle=<<typeInputTiddler>> refreshTitle=<<refreshTitle>> selectionStateTitle=<<typeSelectionTiddler>> field="type" tag="input" default="" placeholder={{$:/language/EditTemplate/Type/Placeholder}} focusPopup=<<qualify "$:/state/popup/type-dropdown">> class="tc-edit-typeeditor tc-edit-texteditor tc-popup-handle tc-keep-focus" tabindex={{$:/config/EditTabIndex}} focus={{{ [{$:/config/AutoFocus}match[type]then[true]] :else[[false]] }}} cancelPopups="yes" configTiddlerFilter="[[$:/core/ui/EditTemplate/type]]" inputCancelActions=<<input-cancel-actions>>/><$button popup=<<qualify "$:/state/popup/type-dropdown">> class="tc-btn-invisible tc-btn-dropdown tc-small-gap" tooltip={{$:/language/EditTemplate/Type/Dropdown/Hint}} aria-label={{$:/language/EditTemplate/Type/Dropdown/Caption}}>{{$:/core/images/down-arrow}}</$button><$button message="tm-remove-field" param="type" class="tc-btn-invisible tc-btn-icon" tooltip={{$:/language/EditTemplate/Type/Delete/Hint}} aria-label={{$:/language/EditTemplate/Type/Delete/Caption}}>{{$:/core/images/delete-button}}<$action-deletetiddler $filter="[<typeInputTiddler>] [<storeTitle>] [<refreshTitle>] [<selectionStateTitle>]"/></$button>
</$fieldmangler></div>
<div class="tc-block-dropdown-wrapper">
diff --git a/core/ui/ImportListing.tid b/core/ui/ImportListing.tid
index 4db1d4757f..5bd89ba2b5 100644
--- a/core/ui/ImportListing.tid
+++ b/core/ui/ImportListing.tid
@@ -37,8 +37,6 @@ title: $:/core/ui/ImportListing
\define suppressedField() suppressed-$(payloadTiddler)$
-\define newImportTitleTiddler() $:/temp/NewImportTitle-$(payloadTiddler)$
-
\define previewPopupState() $(currentTiddler)$!!popup-$(payloadTiddler)$
\define renameFieldState() $(currentTiddler)$!!state-rename-$(payloadTiddler)$
@@ -51,6 +49,7 @@ title: $:/core/ui/ImportListing
\end
\whitespace trim
+<div class="tc-table-wrapper">
<table class="tc-import-table">
<tbody>
<tr>
@@ -101,19 +100,7 @@ title: $:/core/ui/ImportListing
<$reveal type="match" state=<<renameFieldState>> text="yes" tag="tr">
<td colspan="3">
<div class="tc-flex">
- <$edit-text tiddler=<<newImportTitleTiddler>> default={{{[subfilter<payloadTitleFilter>]}}} tag="input" class="tc-import-rename tc-flex-grow-1"/>
- <span class="tc-small-gap-left">
- <$button class="tc-btn-invisible" set=<<renameFieldState>> setTo="no" tooltip={{{[<lingo-base>addsuffix[Listing/Rename/CancelRename]get[text]]}}}>
- {{$:/core/images/close-button}}
- <$action-deletetiddler $tiddler=<<newImportTitleTiddler>>/>
- </$button>
- <span class="tc-small-gap-right"/>
- </span>
- <$button class="tc-btn-invisible" set=<<renameFieldState>> setTo="no" tooltip={{{[<lingo-base>addsuffix[Listing/Rename/ConfirmRename]get[text]]}}}>
- {{$:/core/images/done-button}}
- <$action-setfield $field=<<renameField>> $value={{{[<newImportTitleTiddler>get[text]minlength[1]else<payloadTiddler>]}}} />
- <$action-deletetiddler $tiddler=<<newImportTitleTiddler>>/>
- </$button>
+ <$edit-text field=<<renameField>> default={{{[<payloadTiddler>]}}} tag="input" class="tc-import-rename tc-flex-grow-1"/>
</div>
</td>
</$reveal>
@@ -129,3 +116,4 @@ title: $:/core/ui/ImportListing
</$list>
</tbody>
</table>
+</div>
diff --git a/core/ui/LayoutSwitcher.tid b/core/ui/LayoutSwitcher.tid
index 0f7e3f15e0..4b85083406 100644
--- a/core/ui/LayoutSwitcher.tid
+++ b/core/ui/LayoutSwitcher.tid
@@ -3,27 +3,26 @@ tags: $:/tags/ControlPanel/Appearance
caption: {{$:/language/ControlPanel/LayoutSwitcher/Caption}}
\whitespace trim
+\function layout.filter() [all[current]field:title[$:/core/ui/PageTemplate]]
+\function layout.empty.filter() [all[current]field:title{$:/layout}]
+
<$linkcatcher to="$:/layout">
-<div class="tc-chooser">
+<div class="tc-chooser" role="listbox">
<$list filter="[all[tiddlers+shadows]tag[$:/tags/Layout]] [[$:/core/ui/PageTemplate]] +[!is[draft]sort[name]]">
-<$list
- filter="[{$:/layout}!has[text]]"
- variable="ignore"
- emptyMessage="""\whitespace trim
- <$set name="cls" filter="[all[current]field:title{$:/layout}]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item">
- <div class=<<cls>>>
- <$link to={{!!title}}>
- ''<$transclude tiddler={{{ [<currentTiddler>get[icon]] }}}/><$transclude field="name"/>'' - <$transclude field="description"/>
- </$link></div></$set>
-""">
-<$set name="cls" filter="[all[current]field:title[$:/core/ui/PageTemplate]]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item">
-<div class=<<cls>>>
-<$link to={{!!title}}>
-''<$transclude tiddler={{{ [<currentTiddler>get[icon]] }}}/><$transclude field="name"/>'' - <$transclude field="description"/>
-</$link>
-</div>
-</$set>
-</$list>
+ <$list filter="[{$:/layout}!has[text]]" variable="ignore">
+ <$list-empty>
+ <div class={{{ [layout.empty.filter[]then[tc-chooser-item tc-chosen]else[tc-chooser-item]] }}}>
+ <$link to={{!!title}} role="option" aria-selected={{{ [layout.empty.filter[]then[true]else[false]] }}}>
+ ''<$transclude tiddler={{{ [<currentTiddler>get[icon]] }}}/><$transclude field="name"/>'' - <$transclude field="description"/>
+ </$link>
+ </div>
+ </$list-empty>
+ <div class={{{ [layout.filter[]then[tc-chooser-item tc-chosen]else[tc-chooser-item]] }}}>
+ <$link to={{!!title}} role="option" aria-selected={{{ [layout.filter[]then[true]else[false]] }}}>
+ ''<$transclude tiddler={{{ [<currentTiddler>get[icon]] }}}/><$transclude field="name"/>'' - <$transclude field="description"/>
+ </$link>
+ </div>
+ </$list>
</$list>
</div>
</$linkcatcher>
diff --git a/core/ui/PageTemplate/alerts.tid b/core/ui/PageTemplate/alerts.tid
index ce1b93db9a..339f642366 100644
--- a/core/ui/PageTemplate/alerts.tid
+++ b/core/ui/PageTemplate/alerts.tid
@@ -1,8 +1,8 @@
title: $:/core/ui/PageTemplate/alerts
tags: $:/tags/PageTemplate
-<div class="tc-alerts">
+<div class="tc-alerts" role="region" aria-label="Alerts">
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/Alert]!has[draft.of]]" template="$:/core/ui/AlertTemplate" storyview="pop"/>
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/Alert]!is[draft]]" template="$:/core/ui/AlertTemplate" storyview="pop"/>
</div>
diff --git a/core/ui/SideBar/Tools.tid b/core/ui/SideBar/Tools.tid
index 8a123b1c79..98b11b3a8f 100644
--- a/core/ui/SideBar/Tools.tid
+++ b/core/ui/SideBar/Tools.tid
@@ -2,31 +2,26 @@ title: $:/core/ui/SideBar/Tools
tags: $:/tags/SideBar
caption: {{$:/language/SideBar/Tools/Caption}}
-\define lingo-base() $:/language/ControlPanel/
-\define config-title()
-$:/config/PageControlButtons/Visibility/$(listItem)$
-\end
+\whitespace trim
-<<lingo Basics/Version/Prompt>> <<version>>
+\procedure lingo-base() $:/language/ControlPanel/
+\function config-title() [[$:/config/PageControlButtons/Visibility/$(listItem)$]substitute[]]
-<$set name="tv-config-toolbar-icons" value="yes">
+<<lingo Basics/Version/Prompt>><span class="tc-tiny-gap-left"><<version>></span>
-<$set name="tv-config-toolbar-text" value="yes">
-
-<$set name="tv-config-toolbar-class" value="">
-
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem">
-
-<div style="position:relative;" class={{{ [<listItem>encodeuricomponent[]addprefix[tc-btn-]] }}}>
-
-<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"/> <$transclude tiddler=<<listItem>>/> <i class="tc-muted"><$transclude tiddler=<<listItem>> field="description"/></i>
-
-</div>
-
-</$list>
-
-</$set>
-
-</$set>
-
-</$set>
+<$let tv-config-toolbar-icons="yes"
+ tv-config-toolbar-text="yes"
+ tv-config-toolbar-class=""
+>
+ <$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem">
+ <div class={{{ [<listItem>encodeuricomponent[]addprefix[tc-btn-]] tc-sidebar-tools-item +[join[ ]] }}}
+ data-title=<<listItem>>
+ >
+ <$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show" class="tc-tiny-gap-right"/>
+ <$transclude $tiddler=<<listItem>>/>
+ <i class="tc-tiny-gap-left tc-muted">
+ <$transclude $tiddler=<<listItem>> $field="description"/>
+ </i>
+ </div>
+ </$list>
+</$let>
diff --git a/core/ui/SideBarSegments/search.tid b/core/ui/SideBarSegments/search.tid
index d4aa7923f8..2af442281f 100644
--- a/core/ui/SideBarSegments/search.tid
+++ b/core/ui/SideBarSegments/search.tid
@@ -46,13 +46,21 @@ tags: $:/tags/SideBarSegment
\procedure advanced-search-actions() <$action-setfield $tiddler="$:/temp/advancedsearch" text={{$:/temp/search/input}}/><$action-setfield $tiddler="$:/temp/advancedsearch/input" text={{$:/temp/search/input}}/><<delete-state-tiddlers>><$action-navigate $to="$:/AdvancedSearch"/><$action-setfield $tiddler="$:/temp/advancedsearch/refresh" text="yes"/><$action-sendmessage $message="tm-focus-selector" $param="""[data-tiddler-title="$:/AdvancedSearch"] .tc-search input""" preventScroll="true"/><$action-deletetiddler $filter="$:/temp/search $:/temp/search/input $:/temp/search/refresh [<searchListState>]"/>
+\procedure input-actions()
+<%if [<event-key-descriptor>match[((input-tab-right))]] %>
+<<set-next-input-tab>>
+<%elseif [<event-key-descriptor>match[((input-tab-left))]] %>
+<<set-previous-input-tab>>
+<%elseif [<event-key-descriptor>match[((advanced-search-sidebar))]] %>
+<<advanced-search-actions>>
+<%endif%>
+\end
+
<div class="tc-sidebar-lists tc-sidebar-search">
<$vars editTiddler="$:/temp/search" searchTiddler="$:/temp/search/input" searchListState=<<qualify "$:/state/search-list/selected-item">>>
<div class="tc-search">
-<$keyboard key="((input-tab-right))" actions=<<set-next-input-tab>>>
-<$keyboard key="((input-tab-left))" actions=<<set-previous-input-tab>>>
-<$keyboard key="((advanced-search-sidebar))" actions=<<advanced-search-actions>>>
+<$keyboard key="((input-tab-right)) ((input-tab-left)) ((advanced-search-sidebar))" actions=<<input-actions>>>
<form class="tc-form-inline">
<$transclude $variable="keyboard-driven-input" tiddler=<<editTiddler>> storeTitle=<<searchTiddler>>
selectionStateTitle=<<searchListState>> refreshTitle="$:/temp/search/refresh" type="search"
@@ -62,8 +70,6 @@ tags: $:/tags/SideBarSegment
configTiddlerFilter="[[$:/state/search/currentTab]!is[missing]get[text]] :else[{$:/config/SearchResults/Default}]"/>
</form>
</$keyboard>
-</$keyboard>
-</$keyboard>
<$reveal state=<<searchTiddler>> type="nomatch" text="">
<$button tooltip={{$:/language/Buttons/AdvancedSearch/Hint}} aria-label={{$:/language/Buttons/AdvancedSearch/Caption}} class="tc-btn-invisible">
<<advanced-search-actions>>
diff --git a/core/ui/ViewTemplate/title.tid b/core/ui/ViewTemplate/title.tid
index b2cf1bd8e9..56b92efe84 100644
--- a/core/ui/ViewTemplate/title.tid
+++ b/core/ui/ViewTemplate/title.tid
@@ -2,7 +2,7 @@ title: $:/core/ui/ViewTemplate/title
tags: $:/tags/ViewTemplate
\whitespace trim
-\define title-styles() fill:$(foregroundColor)$;
+\define title-styles() color:$(foregroundColor)$;
<div class="tc-tiddler-title tc-clearfix">
<div class="tc-titlebar">
diff --git a/core/ui/WikiInformation.tid b/core/ui/WikiInformation.tid
new file mode 100644
index 0000000000..8b959d61db
--- /dev/null
+++ b/core/ui/WikiInformation.tid
@@ -0,0 +1,122 @@
+title: $:/core/ui/ControlPanel/WikiInformation
+tags: $:/tags/ControlPanel/Info
+caption: <%if [[$:/language/ControlPanel/WikiInformation/Caption]is[shadow]] %>{{$:/language/ControlPanel/WikiInformation/Caption}}<%else%>Wiki Information<%endif%>
+subtitle: <%if [[$:/language/ControlPanel/WikiInformation/Caption]is[shadow]] %>{{$:/language/ControlPanel/WikiInformation/Caption}}<%else%>Wiki Information<%endif%>
+
+\procedure lingo-base() $:/language/ControlPanel/WikiInformation/
+
+<!--
+A custom implementation of the lingo macro that works even if this tiddler has been copied to an earlier version of TiddlyWiki that doesn't include the necessary lingo tiddlers in the core.
+-->
+
+\procedure intrinsic-lingo-Hint()
+This page summarises high level information about the configuration of this ~TiddlyWiki. It is designed to enable users to quickly share relevant aspects of the configuration of their ~TiddlyWiki with others, for example when seeking help in one of the forums. No private or personal information is included, and nothing is shared without being explicitly copied and pasted elsewhere
+\end intrinsic-lingo-Hint
+
+\procedure intrinsic-lingo-Drag/Caption()
+Drag this link to copy this tool to another wiki
+\end intrinsic-lingo-Drag/Caption
+
+\procedure lingo(title,mode:"inline")
+<%if [<title>addprefix<lingo-base>is[shadow]] %>
+ <$transclude $tiddler={{{ [<title>addprefix<lingo-base>] }}} $mode=<<mode>>/>
+<%else%>
+ <$transclude $variable={{{ [<title>addprefix[intrinsic-lingo-]] }}} $mode=<<mode>>/>
+<%endif%>
+\end lingo
+
+\whitespace trim
+
+\procedure capture-item(label,value)
+<$action-setfield $tiddler=<<tempWikiInfo>> text={{{ [<tempWikiInfo>get[text]addsuffix<label>addsuffix[: ]addsuffix<value>addsuffix<crlf>] }}}/>
+\end capture-item
+
+\procedure capture-item-wikified(label,value)
+<$wikify name="text" text=<<value>> mode="inline">
+ <$transclude
+ $variable="capture-item"
+ label=<<label>>
+ value=<<text>>
+ />
+</$wikify>
+\end capture-item-wikified
+
+\procedure capture-wiki-info(tempWikiInfo)
+<$transclude $variable="capture-item-wikified" label="TiddlyWiki Version" value="<<version>>"/>
+<$transclude $variable="capture-item" label="Current palette" value={{$:/palette}}/>
+<$transclude $variable="capture-item" label="Current theme" value={{$:/theme}}/>
+<$transclude $variable="capture-item" label="Current layout" value={{$:/layout}}/>
+<$transclude $variable="capture-item" label="Browser language setting" value={{$:/info/browser/language}}/>
+<$transclude $variable="capture-item" label="Default type for missing tiddlers" value={{$:/config/DefaultMissingType}}/>
+<$transclude $variable="capture-item" label="Auto save setting" value={{$:/config/AutoSave}}/>
+<$transclude $variable="capture-item" label="Code wrapping setting" value={{$:/themes/tiddlywiki/vanilla/options/codewrapping}}/>
+<$transclude $variable="capture-item" label="Sticky titles setting" value={{$:/themes/tiddlywiki/vanilla/options/stickytitles}}/>
+<$transclude $variable="capture-item" label="Sidebar layout setting" value={{$:/themes/tiddlywiki/vanilla/options/sidebarlayout}}/>
+<$transclude $variable="capture-item" label="Auto focus field setting for new tiddlers" value={{$:/config/AutoFocus}}/>
+<$transclude $variable="capture-item" label="Current storyview setting" value={{$:/view}}/>
+<$transclude $variable="capture-item" label="Toolbar text setting" value={{$:/config/Toolbar/Text}}/>
+<$transclude $variable="capture-item" label="Toolbar icon setting" value={{$:/config/Toolbar/Icons}}/>
+<$transclude $variable="capture-item" label="Button class setting" value={{$:/config/Toolbar/ButtonClass}}/>
+<$transclude $variable="capture-item" label="Navigation address bar setting" value={{$:/config/Navigation/UpdateAddressBar}}/>
+<$transclude $variable="capture-item" label="Tiddler opening behaviour setting for navigations from outside the story river" value={{$:/config/Navigation/openLinkFromOutsideRiver}}/>
+<$transclude $variable="capture-item" label="Tiddler opening behaviour setting for navigations from within the story river" value={{$:/config/Navigation/openLinkFromInsideRiver}}/>
+<$transclude $variable="capture-item" label="CamelCase linking setting" value={{$:/config/WikiParserRules/Inline/wikilink}}/>
+<$transclude $variable="capture-item" label="Keyboard shortcuts that have been customised" value={{{ [all[tiddlers]prefix[$:/config/shortcuts]] +[join[,]] }}}/>
+<$transclude $variable="capture-item" label="Disabled plugins" value={{{ [all[tiddlers]prefix[$:/config/Plugins/Disabled/]] :filter[{!!text}match[yes]] :map[<currentTiddler>removeprefix[$:/config/Plugins/Disabled/]] +[join[,]] }}}/>
+<$transclude $variable="capture-item" label="Plugins" value={{{ [has[plugin-type]sort[]] :filter[<currentTiddler>addprefix[$:/config/Plugins/Disabled/]get[text]else[no]!match[yes]] :map[{!!version}addprefix[ - ]addprefix<currentTiddler>] +[addprefix[ ]addprefix<crlf>join[]] }}}/>
+\end capture-wiki-info
+
+\procedure template-header()
+<details><summary>Wiki Information</summary><pre><code>
+
+\end template-header
+
+\procedure template-footer()
+
+</code></pre></details>
+\end template-footer
+
+\procedure display-wiki-info-modal()
+<$let
+ tempWikiInfo="$:/temp/wiki-info"
+ crlf={{{ [charcode[13],[10]] }}}
+>
+ <$action-sendmessage
+ $message="tm-modal"
+ $param="$:/core/ui/ControlPanel/WikiInformation"
+ isModal="yes"
+ tempWikiInfo=<<tempWikiInfo>>
+ />
+ <$action-deletetiddler $tiddler=<<tempWikiInfo>>/>
+ <$action-setfield $tiddler=<<tempWikiInfo>> text=<<template-header>>/>
+ <$transclude
+ $variable="capture-wiki-info"
+ tempWikiInfo=<<tempWikiInfo>>
+ />
+ <$action-setfield $tiddler=<<tempWikiInfo>> text={{{ [<tempWikiInfo>get[text]addsuffix<template-footer>] }}}/>
+</$let>
+\end display-wiki-info-modal
+
+\procedure story-content()
+<<lingo title:"Hint" mode:"block">>
+
+<$button>
+<<display-wiki-info-modal>>
+Click to generate wiki information report
+</$button>
+
+<$link to="$:/core/ui/ControlPanel/WikiInformation">
+<<lingo title:"Drag/Caption" mode:"inline">>
+</$link>
+\end story-content
+
+\procedure modal-content()
+<p>
+ <$transclude $variable="copy-to-clipboard" src={{{ [<tempWikiInfo>get[text]] }}}/>
+</p>
+<p>
+ <$edit-text tiddler=<<tempWikiInfo>> tag="textarea" disabled="yes" class="tc-max-width"/>
+</p>
+\end modal-content
+
+<$transclude $variable={{{ [<isModal>match[yes]then[modal-content]else[story-content]] }}} $mode="block"/>
diff --git a/core/wiki/config/OfficialPluginLibrary.tid b/core/wiki/config/OfficialPluginLibrary.tid
index 88fd39abe7..bb55927a30 100644
--- a/core/wiki/config/OfficialPluginLibrary.tid
+++ b/core/wiki/config/OfficialPluginLibrary.tid
@@ -1,6 +1,6 @@
title: $:/config/OfficialPluginLibrary
tags: $:/tags/PluginLibrary
-url: https://tiddlywiki.com/library/v5.3.7/index.html
+url: https://tiddlywiki.com/library/v5.4.0/index.html
caption: {{$:/language/OfficialPluginLibrary}}
{{$:/language/OfficialPluginLibrary/Hint}}
diff --git a/core/wiki/config/TiddlerInfoMode.tid b/core/wiki/config/TiddlerInfoMode.tid
index 80947122b4..080165e0b5 100644
--- a/core/wiki/config/TiddlerInfoMode.tid
+++ b/core/wiki/config/TiddlerInfoMode.tid
@@ -1,2 +1,2 @@
title: $:/config/TiddlerInfo/Mode
-text: popup
\ No newline at end of file
+text: sticky
\ No newline at end of file
diff --git a/core/wiki/languageswitcher.tid b/core/wiki/languageswitcher.tid
index 7d79c0f5c4..a3c5ca97f2 100644
--- a/core/wiki/languageswitcher.tid
+++ b/core/wiki/languageswitcher.tid
@@ -1,20 +1,20 @@
title: $:/snippets/languageswitcher
\whitespace trim
+\function language.filter() [all[current]field:title{$:/language}]
+
<$linkcatcher to="$:/language">
-<div class="tc-chooser tc-language-chooser">
+<div class="tc-chooser tc-language-chooser" role="listbox">
<$list filter="[[$:/languages/en-GB]] [plugin-type[language]sort[description]]">
-<$set name="cls" filter="[all[current]field:title{$:/language}]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item">
-<div class=<<cls>> lang={{!!name}}>
-<$link>
-<$view field="description">
-<$view field="name">
-<$view field="title"/>
-</$view>
-</$view>
-</$link>
-</div>
-</$set>
+ <div class={{{ [language.filter[]then[tc-chooser-item tc-chosen]else[tc-chooser-item]] }}} lang={{!!name}}>
+ <$link role="option" aria-selected={{{ [language.filter[]then[true]else[false]] }}}>
+ <$view field="description">
+ <$view field="name">
+ <$view field="title"/>
+ </$view>
+ </$view>
+ </$link>
+ </div>
</$list>
</div>
</$linkcatcher>
\ No newline at end of file
diff --git a/core/wiki/macros/colour-picker.tid b/core/wiki/macros/colour-picker.tid
index 3c37dc9b5a..7a607a5512 100644
--- a/core/wiki/macros/colour-picker.tid
+++ b/core/wiki/macros/colour-picker.tid
@@ -1,55 +1,58 @@
title: $:/core/macros/colour-picker
tags: $:/tags/Macro
-\procedure colour-picker-update-recent()
+\define colour-picker-update-recent()
<$action-listops
$tiddler="$:/config/ColourPicker/Recent"
- $subfilter="[<colour-picker-value>] [list[$:/config/ColourPicker/Recent]remove<colour-picker-value>] +[limit[8]]"
+ $subfilter="$(colour-picker-value)$ [list[$:/config/ColourPicker/Recent]remove[$(colour-picker-value)$]] +[limit[8]]"
/>
\end
-\procedure colour-picker-inner(actions)
-<$button tag="a" tooltip=<<colour-picker-value>>>
-<<colour-picker-update-recent>>
-<$transclude $variable="actions"/>
-<span style.display="inline-block" style.backgroundColor=<<colour-picker-value>> style.width="100%" style.height="100%" style.borderRadius="50%"/>
+\define colour-picker-inner(actions)
+<$button tag="a" tooltip="""$(colour-picker-value)$""">
+$(colour-picker-update-recent)$
+<$transclude $variable="__actions__"/>
+
+<span style="display:inline-block; background-color: $(colour-picker-value)$; width: 100%; height: 100%; border-radius: 50%;"/>
+
</$button>
\end
+\define colour-picker-recent-inner(actions)
\whitespace trim
-\procedure colour-picker-recent-inner(actions)
-<$set name="colour-picker-value" value=<<recentColour>>>
-<$transclude $variable="colour-picker-inner" actions=<<actions>>/>
+<$set name="colour-picker-value" value="$(recentColour)$">
+<$macrocall $name="colour-picker-inner" actions=<<__actions__>>/>
</$set>
\end
-\procedure colour-picker-recent(actions)
+\define colour-picker-recent(actions)
+\whitespace trim
{{$:/language/ColourPicker/Recent}}<$list filter="[list[$:/config/ColourPicker/Recent]]" variable="recentColour">
-<$transclude $variable="colour-picker-recent-inner" actions=<<actions>>/>
+<$macrocall $name="colour-picker-recent-inner" actions=<<__actions__>>/>
</$list>
\end
-\procedure colour-picker(actions)
+\define colour-picker(actions)
+\whitespace trim
<div class="tc-colour-chooser">
-<$transclude $variable="colour-picker-recent" actions=<<actions>>/>
+<$macrocall $name="colour-picker-recent" actions=<<__actions__>>/>
---
<$list filter="LightPink Pink Crimson LavenderBlush PaleVioletRed HotPink DeepPink MediumVioletRed Orchid Thistle Plum Violet Magenta Fuchsia DarkMagenta Purple MediumOrchid DarkViolet DarkOrchid Indigo BlueViolet MediumPurple MediumSlateBlue SlateBlue DarkSlateBlue Lavender GhostWhite Blue MediumBlue MidnightBlue DarkBlue Navy RoyalBlue CornflowerBlue LightSteelBlue LightSlateGrey SlateGrey DodgerBlue AliceBlue SteelBlue LightSkyBlue SkyBlue DeepSkyBlue LightBlue PowderBlue CadetBlue Azure LightCyan PaleTurquoise Cyan Aqua DarkTurquoise DarkSlateGrey DarkCyan Teal MediumTurquoise LightSeaGreen Turquoise Aquamarine MediumAquamarine MediumSpringGreen MintCream SpringGreen MediumSeaGreen SeaGreen Honeydew LightGreen PaleGreen DarkSeaGreen LimeGreen Lime ForestGreen Green DarkGreen Chartreuse LawnGreen GreenYellow DarkOliveGreen YellowGreen OliveDrab Beige LightGoldenrodYellow Ivory LightYellow Yellow Olive DarkKhaki LemonChiffon PaleGoldenrod Khaki Gold Cornsilk Goldenrod DarkGoldenrod FloralWhite OldLace Wheat Moccasin Orange PapayaWhip BlanchedAlmond NavajoWhite AntiqueWhite Tan BurlyWood Bisque DarkOrange Linen Peru PeachPuff SandyBrown Chocolate SaddleBrown Seashell Sienna LightSalmon Coral OrangeRed DarkSalmon Tomato MistyRose Salmon Snow LightCoral RosyBrown IndianRed Red Brown FireBrick DarkRed Maroon White WhiteSmoke Gainsboro LightGrey Silver DarkGrey Grey DimGrey Black" variable="colour-picker-value">
-<$transclude $variable="colour-picker-inner" actions=<<actions>>/>
+<$macrocall $name="colour-picker-inner" actions=<<__actions__>>/>
</$list>
---
-<$edit-text tiddler="$:/config/ColourPicker/New" tag="input" default="" placeholder="" class="tc-tiny-gap-right"/>
+<$edit-text tiddler="$:/config/ColourPicker/New" tag="input" default="" placeholder=""/>
+
<$edit-text tiddler="$:/config/ColourPicker/New" type="color" tag="input"/>
<$set name="colour-picker-value" value={{$:/config/ColourPicker/New}}>
-<%if [{$:/config/ColourPicker/New}!is[blank]] %>
-<$transclude $variable="colour-picker-inner" actions=<<actions>>/>
-<%endif%>
+<$macrocall $name="colour-picker-inner" actions=<<__actions__>>/>
</$set>
</div>
diff --git a/core/wiki/macros/copy-to-clipboard.tid b/core/wiki/macros/copy-to-clipboard.tid
index f299cf955d..d05d014e2c 100644
--- a/core/wiki/macros/copy-to-clipboard.tid
+++ b/core/wiki/macros/copy-to-clipboard.tid
@@ -3,11 +3,9 @@ tags: $:/tags/Macro
\whitespace trim
-\procedure copy-to-clipboard(src,class:"tc-btn-invisible",style,type:"text/plain",plain)
-\procedure copy-to-clipboard-actions()
-<$action-sendmessage $message="tm-copy-to-clipboard" $param=<<src>> type=<<type>> plainText=<<plain>>/>
-\end copy-to-clipboard-actions
-<$button actions=<<copy-to-clipboard-actions>>
+\procedure copy-to-clipboard(src,class:"tc-btn-invisible",style)
+<$button message="tm-copy-to-clipboard"
+ param=<<src>>
class=<<class>>
style=<<style>>
tooltip={{$:/language/Buttons/CopyToClipboard/Hint}}
@@ -17,12 +15,12 @@ tags: $:/tags/Macro
<$text text={{$:/language/Buttons/CopyToClipboard/Caption}}/>
</span>
</$button>
-\end copy-to-clipboard
+\end
-\procedure copy-to-clipboard-above-right(src,class:"tc-btn-invisible",style,type:"text/plain")
-<div style.position="relative">
- <div style.position="absolute" style.bottom="0" style.right="0">
- <$transclude $variable="copy-to-clipboard" src=<<src>> class=<<class>> style=<<style>> type=<<type>> plain=<<plain>>/>
+\procedure copy-to-clipboard-above-right(src,class:"tc-btn-invisible",style)
+<div style="position: relative;">
+ <div style="position: absolute; bottom: 0; right: 0;">
+ <$macrocall $name="copy-to-clipboard" src=<<src>> class=<<class>> style=<<style>>/>
</div>
</div>
\end
diff --git a/core/wiki/macros/dumpvariables.tid b/core/wiki/macros/dumpvariables.tid
index 835cddabe0..0ab9e20010 100644
--- a/core/wiki/macros/dumpvariables.tid
+++ b/core/wiki/macros/dumpvariables.tid
@@ -1,7 +1,7 @@
title: $:/core/macros/dumpvariables
tags: $:/tags/Macro
-\procedure dumpvariables()
+\define dumpvariables()
\whitespace trim
<ul>
<$list filter="[variables[]]" variable="varname">
diff --git a/core/wiki/macros/image-picker.tid b/core/wiki/macros/image-picker.tid
index 5bda45bcae..5f09ced0db 100644
--- a/core/wiki/macros/image-picker.tid
+++ b/core/wiki/macros/image-picker.tid
@@ -1,36 +1,39 @@
+created: 20170715180840889
+modified: 20170715180914005
tags: $:/tags/Macro
title: $:/core/macros/image-picker
type: text/vnd.tiddlywiki
-\procedure image-picker-thumbnail(actions)
-<$button tag="a" tooltip=<<imageTitle>>><$transclude $variable="actions"/><$transclude tiddler=<<imageTitle>>/></$button>
+\define image-picker-thumbnail(actions)
+<$button tag="a" tooltip="""$(imageTitle)$"""><$transclude $variable="__actions__"/><$transclude tiddler=<<imageTitle>>/></$button>
\end
-\procedure image-picker-list(filter,actions)
+\define image-picker-list(filter,actions)
\whitespace trim
-<$list filter=<<filter>> variable="imageTitle">
-<$transclude $variable="image-picker-thumbnail" actions=<<actions>>/>
+<$list filter="""$filter$""" variable="imageTitle">
+<$macrocall $name="image-picker-thumbnail" actions=<<__actions__>>/>
</$list>
\end
-\procedure image-picker(actions,filter:"[all[shadows+tiddlers]is[image]] -[type[application/pdf]] +[!has[draft.of]$subfilter$sort[title]]",subfilter:"")
+\define image-picker(actions,filter:"[all[shadows+tiddlers]is[image]] -[type[application/pdf]] +[!has[draft.of]$subfilter$sort[title]]",subfilter:"")
\whitespace trim
<div class="tc-image-chooser">
-<$let state-system=<<qualify "$:/state/image-picker/system">> tv-filter={{{ [<filter>search-replace[$subfilter$],<subfilter>] }}}>
+<$vars state-system=<<qualify "$:/state/image-picker/system">>>
<$checkbox tiddler=<<state-system>> field="text" checked="show" unchecked="hide" default="hide">
-<span class="tc-tiny-gap-left">{{$:/language/SystemTiddlers/Include/Prompt}}</span>
+
+{{$:/language/SystemTiddlers/Include/Prompt}}
</$checkbox>
<$reveal state=<<state-system>> type="match" text="hide" default="hide" tag="div">
-<$transclude $variable="image-picker-list" filter=`$(tv-filter)$ +[!is[system]]` actions=<<actions>>/>
+<$macrocall $name="image-picker-list" filter="""$filter$ +[!is[system]]""" actions=<<__actions__>>/>
</$reveal>
<$reveal state=<<state-system>> type="nomatch" text="hide" default="hide" tag="div">
-<$transclude $variable="image-picker-list" filter=<<tv-filter>> actions=<<actions>>/>
+<$macrocall $name="image-picker-list" filter="""$filter$""" actions=<<__actions__>>/>
</$reveal>
-</$let>
+</$vars>
</div>
\end
-\procedure image-picker-include-tagged-images(actions)
-<$transclude $variable="image-picker" filter="[all[shadows+tiddlers]is[image]] [all[shadows+tiddlers]tag[$:/tags/Image]] -[type[application/pdf]] +[!has[draft.of]sort[title]]" actions=<<actions>>/>
+\define image-picker-include-tagged-images(actions)
+<$macrocall $name="image-picker" filter="[all[shadows+tiddlers]is[image]] [all[shadows+tiddlers]tag[$:/tags/Image]] -[type[application/pdf]] +[!has[draft.of]sort[title]]" actions=<<__actions__>>/>
\end
diff --git a/core/wiki/macros/keyboard-driven-input.tid b/core/wiki/macros/keyboard-driven-input.tid
index 5d28f1125c..a514f4c133 100644
--- a/core/wiki/macros/keyboard-driven-input.tid
+++ b/core/wiki/macros/keyboard-driven-input.tid
@@ -120,11 +120,21 @@ tags: $:/tags/Macro
\procedure keyboard-driven-input(tiddler,storeTitle,field:"text",index:"",tag:"input",type,focus:"",inputAcceptActions,inputAcceptVariantActions,inputCancelActions,placeholder:"",default:"",class,focusPopup,rows,minHeight,tabindex,size,autoHeight,filterMinLength:"0",refreshTitle,selectionStateTitle,cancelPopups:"",configTiddlerFilter,firstSearchFilterField:"first-search-filter",secondSearchFilterField:"second-search-filter")
\whitespace trim
-<$keyboard key="((input-accept))" actions=<<inputAcceptActions>>>
-<$keyboard key="((input-accept-variant))" actions=<<inputAcceptVariantActions>>>
-<$keyboard key="((input-up))" actions=<<input-next-actions-before>>>
-<$keyboard key="((input-down))" actions=<<input-next-actions-after>>>
-<$keyboard key="((input-cancel))" actions=<<inputCancelActions>>>
+\procedure keyboard-driven-input-actions()
+<%if [<event-key-descriptor>match[((input-accept))]] %>
+<<inputAcceptActions>>
+<%elseif [<event-key-descriptor>match[((input-accept-variant))]] %>
+<<inputAcceptVariantActions>>
+<%elseif [<event-key-descriptor>match[((input-up))]] %>
+<<input-next-actions-before>>
+<%elseif [<event-key-descriptor>match[((input-down))]] %>
+<<input-next-actions-after>>
+<%elseif [<event-key-descriptor>match[((input-cancel))]] %>
+<<inputCancelActions>>
+<%endif%>
+\end keyboard-driven-input-actions
+
+<$keyboard key="((input-accept)) ((input-accept-variant)) ((input-up)) ((input-down)) ((input-cancel))" actions=<<keyboard-driven-input-actions>>>
<$edit-text
tiddler=<<tiddler>> field=<<field>> index=<<index>>
inputActions=<<keyboard-input-actions>> tag=<<tag>> class=<<class>>
@@ -134,8 +144,4 @@ tags: $:/tags/Macro
refreshTitle=<<refreshTitle>> cancelPopups=<<cancelPopups>>
/>
</$keyboard>
-</$keyboard>
-</$keyboard>
-</$keyboard>
-</$keyboard>
-\end
+\end keyboard-driven-input
diff --git a/core/wiki/macros/list.tid b/core/wiki/macros/list.tid
index 4019e6617a..d4b0b0a0cb 100644
--- a/core/wiki/macros/list.tid
+++ b/core/wiki/macros/list.tid
@@ -1,18 +1,14 @@
title: $:/core/macros/list
tags: $:/tags/Macro
-\procedure list-links-draggable-drop-actions()
-<$action-listops $tiddler=<<targetTiddler>> $field=<<targetField>> $subfilter="+[insertbefore<actionTiddler>,<currentTiddler>]"/>
-\end
-
+\define list-links(filter,type:"ul",subtype:"li",class:"",emptyMessage,field:"caption")
\whitespace trim
-\procedure list-links(filter,type:"ul",subtype:"li",class:"",emptyMessage,field:"caption")
-<$genesis $type=<<type>> class=<<class>>>
- <$list filter=<<filter>> emptyMessage=<<emptyMessage>>>
- <$genesis $type=<<subtype>>>
+<$genesis $type=<<__type__>> class=<<__class__>>>
+ <$list filter=<<__filter__>> emptyMessage=<<__emptyMessage__>>>
+ <$genesis $type=<<__subtype__>>>
<$link to={{!!title}}>
<$let tv-wikilinks="no">
- <$transclude field=<<field>>>
+ <$transclude field=<<__field__>>>
<$view field="title"/>
</$transclude>
</$let>
@@ -22,91 +18,99 @@ tags: $:/tags/Macro
</$genesis>
\end
-\procedure list-links-draggable(tiddler,field:"list",emptyMessage,type:"ul",subtype:"li",class:"",itemTemplate)
-<span class="tc-links-draggable-list">
- <$let targetTiddler=<<tiddler>> targetField=<<field>>>
- <$genesis $type=<<type>> class=<<class>>>
- <$list filter="[<tiddler>get<field>enlist-input[]]" emptyMessage=<<emptyMessage>>>
- <$droppable
- actions=<<list-links-draggable-drop-actions>>
- tag=<<subtype>>
- enable=<<tv-enable-drag-and-drop>>
- >
- <div class="tc-droppable-placeholder"/>
- <div>
- <$transclude tiddler=<<itemTemplate>>>
- <$link to={{!!title}}>
- <$let tv-wikilinks="no">
- <$transclude field="caption">
- <$view field="title"/>
- </$transclude>
- </$let>
- </$link>
- </$transclude>
- </div>
- </$droppable>
- </$list>
- <$tiddler tiddler="">
- <$droppable
- actions=<<list-links-draggable-drop-actions>>
- tag="div"
- enable=<<tv-enable-drag-and-drop>>
- >
- <div class="tc-droppable-placeholder">
- {{$:/core/images/blank}}
- </div>
- <div style="height:0.5em;"/>
- </$droppable>
- </$tiddler>
- </$genesis>
- </$let>
-</span>
+\define list-links-draggable-drop-actions()
+<$action-listops $tiddler=<<targetTiddler>> $field=<<targetField>> $subfilter="+[insertbefore<actionTiddler>,<currentTiddler>]"/>
\end
-\procedure list-tagged-draggable-drop-actions(tag)
+\define list-links-draggable(tiddler,field:"list",emptyMessage,type:"ul",subtype:"li",class:"",itemTemplate)
+\whitespace trim
+<$set name="_tiddler" value="""$tiddler$""" emptyValue=<<currentTiddler>> >
+ <$let field-reference={{{ [<_tiddler>] "!!" [[$field$]] +[join[]] }}}
+ targetTiddler=<<_tiddler>>
+ targetField="""$field$"""
+ >
+ <span class="tc-links-draggable-list">
+ <$genesis $type=<<__type__>> class="$class$">
+ <$list filter="[list<field-reference>]" emptyMessage=<<__emptyMessage__>>>
+ <$droppable
+ actions=<<list-links-draggable-drop-actions>>
+ tag="""$subtype$"""
+ enable=<<tv-enable-drag-and-drop>>
+ >
+ <div class="tc-droppable-placeholder"/>
+ <div>
+ <$transclude tiddler="""$itemTemplate$""">
+ <$link to={{!!title}}>
+ <$let tv-wikilinks="no">
+ <$transclude field="caption">
+ <$view field="title"/>
+ </$transclude>
+ </$let>
+ </$link>
+ </$transclude>
+ </div>
+ </$droppable>
+ </$list>
+ <$tiddler tiddler="">
+ <$droppable
+ actions=<<list-links-draggable-drop-actions>>
+ tag="div"
+ enable=<<tv-enable-drag-and-drop>>
+ >
+ <div class="tc-droppable-placeholder">
+ {{$:/core/images/blank}}
+ </div>
+ <div style="height:0.5em;"/>
+ </$droppable>
+ </$tiddler>
+ </$genesis>
+ </span>
+ </$let>
+</$set>
+\end
+
+\define list-tagged-draggable-drop-actions(tag)
+\whitespace trim
<!-- Save the current ordering of the tiddlers with this tag -->
-<$set name="order" filter="[<tag>tagging[]]">
+<$set name="order" filter="[<__tag__>tagging[]]">
<!-- Remove any list-after or list-before fields from the tiddlers with this tag -->
- <$list filter="[<tag>tagging[]]">
+ <$list filter="[<__tag__>tagging[]]">
<$action-deletefield $field="list-before"/>
<$action-deletefield $field="list-after"/>
</$list>
<!-- Save the new order to the Tag Tiddler -->
- <$action-listops $tiddler=<<tag>> $field="list" $filter="+[enlist<order>] +[insertbefore<actionTiddler>,<currentTiddler>]"/>
+ <$action-listops $tiddler=<<__tag__>> $field="list" $filter="+[enlist<order>] +[insertbefore<actionTiddler>,<currentTiddler>]"/>
<!-- Make sure the newly added item has the right tag -->
<!-- Removing this line makes dragging tags within the dropdown work as intended -->
- <!--<$action-listops $tiddler=<<actionTiddler>> $tags=<<tag>>/>-->
+ <!--<$action-listops $tiddler=<<actionTiddler>> $tags=<<__tag__>>/>-->
<!-- Using the following 5 lines as replacement makes dragging titles from outside into the dropdown apply the tag -->
- <$list filter="[<actionTiddler>!contains:tags<tag>]">
+ <$list filter="[<actionTiddler>!contains:tags<__tag__>]">
<$fieldmangler tiddler=<<actionTiddler>>>
- <$action-sendmessage $message="tm-add-tag" $param=<<tag>>/>
+ <$action-sendmessage $message="tm-add-tag" $param=<<__tag__>>/>
</$fieldmangler>
</$list>
</$set>
\end
-\procedure list-tagged-draggable(tag,subFilter,emptyMessage,itemTemplate,elementTag:"div",storyview:"")
+\define list-tagged-draggable(tag,subFilter,emptyMessage,itemTemplate,elementTag:"div",storyview:"")
+\whitespace trim
<span class="tc-tagged-draggable-list">
- <$set name="tag" value=<<tag>>>
+ <$set name="tag" value=<<__tag__>>>
<$list
- filter=`[<tag>tagging[]$(subFilter)$]`
- emptyMessage=<<emptyMessage>>
- storyview=<<storyview>>
+ filter="[<__tag__>tagging[]$subFilter$]"
+ emptyMessage=<<__emptyMessage__>>
+ storyview=<<__storyview__>>
>
- <$genesis $type=<<elementTag>> class="tc-menu-list-item">
+ <$genesis $type=<<__elementTag__>> class="tc-menu-list-item">
<$droppable
- actions="""<$macrocall $name="list-tagged-draggable-drop-actions" tag=<<tag>>/>"""
+ actions="""<$macrocall $name="list-tagged-draggable-drop-actions" tag=<<__tag__>>/>"""
enable=<<tv-enable-drag-and-drop>>
>
- <$genesis $type=<<elementTag>> class="tc-droppable-placeholder"/>
- <$genesis $type=<<elementTag>>>
- <$transclude tiddler=<<itemTemplate>>>
+ <$genesis $type=<<__elementTag__>> class="tc-droppable-placeholder"/>
+ <$genesis $type=<<__elementTag__>>>
+ <$transclude tiddler="""$itemTemplate$""">
<$link to={{!!title}}>
- <$let tv-wikilinks="no">
- <$transclude field="caption">
- <$view field="title"/>
- </$transclude>
- </$let>
+ <$view field="title"/>
</$link>
</$transclude>
</$genesis>
@@ -115,11 +119,11 @@ tags: $:/tags/Macro
</$list>
<$tiddler tiddler="">
<$droppable
- actions="""<$macrocall $name="list-tagged-draggable-drop-actions" tag=<<tag>>/>"""
+ actions="""<$macrocall $name="list-tagged-draggable-drop-actions" tag=<<__tag__>>/>"""
enable=<<tv-enable-drag-and-drop>>
>
- <$genesis $type=<<elementTag>> class="tc-droppable-placeholder"/>
- <$genesis $type=<<elementTag>> style="height:0.5em;"/>
+ <$genesis $type=<<__elementTag__>> class="tc-droppable-placeholder"/>
+ <$genesis $type=<<__elementTag__>> style="height:0.5em;"/>
</$droppable>
</$tiddler>
</$set>
diff --git a/core/wiki/macros/tag.tid b/core/wiki/macros/tag.tid
index 2c539b42ef..1424036028 100644
--- a/core/wiki/macros/tag.tid
+++ b/core/wiki/macros/tag.tid
@@ -3,7 +3,6 @@ tags: $:/tags/Macro
\define tag-pill-styles()
background-color:$(backgroundColor)$;
-fill:$(foregroundColor)$;
color:$(foregroundColor)$;
\end
diff --git a/core/wiki/macros/thumbnails.tid b/core/wiki/macros/thumbnails.tid
index 213b6520c5..83e03b906c 100644
--- a/core/wiki/macros/thumbnails.tid
+++ b/core/wiki/macros/thumbnails.tid
@@ -21,7 +21,7 @@ tags: $:/tags/Macro
style="width:$width$px;height:$height$px;background-color:$background-color$;"
></$reveal></div><div
class="tc-thumbnail-icon"
- style="fill:$color$;color:$color$;"
+ style="color:$color$;"
>$icon$</div><div class="tc-thumbnail-caption">$caption$</div></div></$link>
\end
diff --git a/core/wiki/macros/translink.tid b/core/wiki/macros/translink.tid
index 34faaa7815..9cc4654228 100644
--- a/core/wiki/macros/translink.tid
+++ b/core/wiki/macros/translink.tid
@@ -1,28 +1,28 @@
title: $:/core/macros/translink
tags: $:/tags/Macro
-\procedure translink(title,mode:"block")
+\define translink(title,mode:"block")
\whitespace trim
-<%if [<mode>match[block]] %>
+<$list filter="[<__mode__>match[block]]">
<div class="tc-translink">
<div>
-<$link to=<<title>>>
-<h1><$text text=<<title>>/></h1>
+<$link to="""$title$""">
+<h1><$text text="""$title$"""/></h1>
</$link>
-<$transclude tiddler=<<title>> mode="block">
-<$set name="currentTiddler" value=<<title>>><$transclude tiddler="$:/language/MissingTiddler/Hint"/></$set>
+<$transclude tiddler="""$title$""" mode="block">
+<$set name="currentTiddler" value="""$title$"""><$transclude tiddler="$:/language/MissingTiddler/Hint"/></$set>
</$transclude>
</div>
</div>
-<%endif%>
-<%if [<mode>match[inline]] %>
+</$list>
+<$list filter="[<__mode__>match[inline]]">
<span class="tc-translink">
-<$link to=<<title>> class="tc-tiny-gap-right">
-<$text text=<<title>>/>
+<$link to="""$title$""">
+<$text text="""$title$"""/>
</$link>
-(<$transclude tiddler=<<title>> mode="inline">
-<$set name="currentTiddler" value=<<title>>><$transclude tiddler="$:/language/MissingTiddler/Hint"/></$set>
+ (<$transclude tiddler="""$title$""" mode="inline">
+<$set name="currentTiddler" value="""$title$"""><$transclude tiddler="$:/language/MissingTiddler/Hint"/></$set>
</$transclude>)
</span>
-<%endif%>
+</$list>
\end
diff --git a/core/wiki/macros/tree.tid b/core/wiki/macros/tree.tid
index 0d6d67b963..f73bd54fd0 100644
--- a/core/wiki/macros/tree.tid
+++ b/core/wiki/macros/tree.tid
@@ -1,58 +1,62 @@
title: $:/core/macros/tree
tags: $:/tags/Macro
-\procedure leaf-link(full-title,chunk,separator: "/")
-<$link to=<<full-title>>><$text text=<<chunk>>/></$link>
+\define leaf-link(full-title,chunk,separator: "/")
+<$link to=<<__full-title__>>><$text text=<<__chunk__>>/></$link>
\end
+\define leaf-node(prefix,chunk)
\whitespace trim
-\procedure leaf-node(prefix,chunk)
<li>
-<$list filter="[<prefix>addsuffix<chunk>is[shadow]] [<prefix>addsuffix<chunk>is[tiddler]]" variable="full-title">
-<$list filter="[<full-title>removeprefix<prefix>]" variable="chunk">
-<span class="tc-tiny-gap-right">{{$:/core/images/file}}</span><$transclude $variable="leaf-link" full-title=<<full-title>> chunk=<<chunk>>/>
+<$list filter="[<__prefix__>addsuffix<__chunk__>is[shadow]] [<__prefix__>addsuffix<__chunk__>is[tiddler]]" variable="full-title">
+<$list filter="[<full-title>removeprefix<__prefix__>]" variable="chunk">
+<span>{{$:/core/images/file}}</span> <$macrocall $name="leaf-link" full-title=<<full-title>> chunk=<<chunk>>/>
</$list>
</$list>
</li>
\end
-\procedure branch-node(prefix,chunk,separator: "/")
+\define branch-node(prefix,chunk,separator: "/")
+\whitespace trim
<li>
-<$set name="reveal-state" value={{{ [[$:/state/tree/]addsuffix<prefix>addsuffix<chunk>] }}}>
+<$set name="reveal-state" value={{{ [[$:/state/tree/]addsuffix<__prefix__>addsuffix<__chunk__>] }}}>
<$reveal type="nomatch" stateTitle=<<reveal-state>> text="show">
<$button setTitle=<<reveal-state>> setTo="show" class="tc-btn-invisible">
-{{$:/core/images/folder}} <$text text=<<chunk>>/>
+{{$:/core/images/folder}} <$text text=<<__chunk__>>/>
</$button>
</$reveal>
<$reveal type="match" stateTitle=<<reveal-state>> text="show">
<$button setTitle=<<reveal-state>> setTo="hide" class="tc-btn-invisible">
-{{$:/core/images/folder}} <$text text=<<chunk>>/>
+{{$:/core/images/folder}} <$text text=<<__chunk__>>/>
</$button>
</$reveal>
-<span class="tc-tiny-gap-left">(<$count filter="[all[shadows+tiddlers]removeprefix<prefix>removeprefix<chunk>] -[<prefix>addsuffix<chunk>]"/>)</span>
+
+<span>(<$count filter="[all[shadows+tiddlers]removeprefix<__prefix__>removeprefix<__chunk__>] -[<__prefix__>addsuffix<__chunk__>]"/>)</span>
<$reveal type="match" stateTitle=<<reveal-state>> text="show">
-<$transclude $variable="tree-node" prefix={{{ [<prefix>addsuffix<chunk>] }}} separator=<<separator>>/>
+<$macrocall $name="tree-node" prefix={{{ [<__prefix__>addsuffix<__chunk__>] }}} separator=<<__separator__>>/>
</$reveal>
</$set>
</li>
\end
-\procedure tree-node(prefix,separator: "/")
+\define tree-node(prefix,separator: "/")
+\whitespace trim
<ol>
-<$list filter="[all[shadows+tiddlers]removeprefix<prefix>splitbefore<separator>sort[]!suffix<separator>]" variable="chunk">
-<$transclude $variable="leaf-node" prefix=<<prefix>> chunk=<<chunk>> separator=<<separator>>/>
+<$list filter="[all[shadows+tiddlers]removeprefix<__prefix__>splitbefore<__separator__>sort[]!suffix<__separator__>]" variable="chunk">
+<$macrocall $name="leaf-node" prefix=<<__prefix__>> chunk=<<chunk>> separator=<<__separator__>>/>
</$list>
-<$list filter="[all[shadows+tiddlers]removeprefix<prefix>splitbefore<separator>sort[]suffix<separator>]" variable="chunk">
-<$transclude $variable="branch-node" prefix=<<prefix>> chunk=<<chunk>> separator=<<separator>>/>
+<$list filter="[all[shadows+tiddlers]removeprefix<__prefix__>splitbefore<__separator__>sort[]suffix<__separator__>]" variable="chunk">
+<$macrocall $name="branch-node" prefix=<<__prefix__>> chunk=<<chunk>> separator=<<__separator__>>/>
</$list>
</ol>
\end
-\procedure tree(prefix: "$:/",separator: "/")
+\define tree(prefix: "$:/",separator: "/")
+\whitespace trim
<div class="tc-tree">
-<span><$text text=<<prefix>>/></span>
+<span><$text text=<<__prefix__>>/></span>
<div>
-<$transclude $variable="tree-node" prefix=<<prefix>> separator=<<separator>>/>
+<$macrocall $name="tree-node" prefix=<<__prefix__>> separator=<<__separator__>>/>
</div>
</div>
\end
diff --git a/core/wiki/themeswitcher.tid b/core/wiki/themeswitcher.tid
index 6259af063f..79f4a09ba6 100644
--- a/core/wiki/themeswitcher.tid
+++ b/core/wiki/themeswitcher.tid
@@ -1,17 +1,18 @@
title: $:/snippets/themeswitcher
\whitespace trim
+\function theme.filter() [all[current]field:title{$:/theme}] [[$:/theme]!has[text]addsuffix[s/tiddlywiki/vanilla]field:title<currentTiddler>] +[limit[1]]
+
<$linkcatcher to="$:/theme">
-<div class="tc-chooser">
+<div class="tc-chooser" role="listbox">
<$list filter="[plugin-type[theme]sort[title]]">
-<$set name="cls" filter="[all[current]field:title{$:/theme}] [[$:/theme]!has[text]addsuffix[s/tiddlywiki/vanilla]field:title<currentTiddler>] +[limit[1]]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item">
-<div class=<<cls>>><$link to={{!!title}}>
-''<$view field="name" format="text"/>''
-
-<$view field="description" format="text"/>
-</$link>
-</div>
-</$set>
+ <div class={{{ [theme.filter[]then[tc-chooser-item tc-chosen]else[tc-chooser-item]] }}}>
+ <$link to={{!!title}} role="option" aria-selected={{{ [theme.filter[]then[true]else[false]] }}}>
+ ''<$view field="name" format="text"/>''
+
+ <$view field="description" format="text"/>
+ </$link>
+ </div>
</$list>
</div>
</$linkcatcher>
\ No newline at end of file
diff --git a/core/wiki/viewswitcher.tid b/core/wiki/viewswitcher.tid
index b82fcb2642..1ff289cdfe 100644
--- a/core/wiki/viewswitcher.tid
+++ b/core/wiki/viewswitcher.tid
@@ -4,13 +4,14 @@ title: $:/snippets/viewswitcher
$:/core/images/storyview-$(storyview)$
\end
\whitespace trim
+\function view.filter() [<storyview>prefix{$:/view}]
+
<$linkcatcher to="$:/view">
-<div class="tc-chooser tc-viewswitcher">
+<div class="tc-chooser tc-viewswitcher" role="listbox">
<$list filter="[storyviews[]]" variable="storyview">
-<$set name="cls" filter="[<storyview>prefix{$:/view}]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item"><div class=<<cls>>>
-<$button tag="a" class="tc-tiddlylink tc-btn-invisible" to=<<storyview>>><$transclude tiddler=<<icon>>/><$text text=<<storyview>>/></$button>
+<div class={{{ [view.filter[]then[tc-chooser-item tc-chosen]else[tc-chooser-item]] }}}>
+<$button tag="a" class="tc-tiddlylink tc-btn-invisible" role="option" to=<<storyview>> aria-selected={{{ [view.filter[]then[true]else[false]] }}}><$transclude tiddler=<<icon>>/><$text text=<<storyview>>/></$button>
</div>
-</$set>
</$list>
</div>
</$linkcatcher>
diff --git a/editions/codemirrordemo/tiddlers/HelloThere.tid b/editions/codemirrordemo/tiddlers/HelloThere.tid
index 11ec8ce0e3..85e3902d86 100644
--- a/editions/codemirrordemo/tiddlers/HelloThere.tid
+++ b/editions/codemirrordemo/tiddlers/HelloThere.tid
@@ -11,6 +11,7 @@ The ~CodeMirror plugin can be extended with ~AddOns for more functionality:
* Keymaps in the style of Emacs, Sublime Text or Vim
* Closing Brackets
* Closing Tags
+* Display trailing whitespace
NOTE: This demo has the ''Sublime Text'' keymap installed.
diff --git a/editions/codemirrordemo/tiddlywiki.info b/editions/codemirrordemo/tiddlywiki.info
index ef71f55c9a..fbcf8d6947 100644
--- a/editions/codemirrordemo/tiddlywiki.info
+++ b/editions/codemirrordemo/tiddlywiki.info
@@ -8,11 +8,16 @@
"tiddlywiki/codemirror-search-replace",
"tiddlywiki/codemirror-fullscreen-editing",
"tiddlywiki/codemirror-mode-xml",
+ "tiddlywiki/codemirror-mode-htmlembedded",
+ "tiddlywiki/codemirror-mode-htmlmixed",
"tiddlywiki/codemirror-mode-javascript",
"tiddlywiki/codemirror-mode-css",
"tiddlywiki/codemirror-mode-x-tiddlywiki",
"tiddlywiki/codemirror-mode-markdown",
- "tiddlywiki/codemirror-keymap-sublime-text"
+ "tiddlywiki/codemirror-trailingspace",
+ "tiddlywiki/codemirror-keymap-emacs",
+ "tiddlywiki/codemirror-keymap-sublime-text",
+ "tiddlywiki/codemirror-keymap-vim"
],
"themes": [
"tiddlywiki/vanilla",
diff --git a/editions/d3demo/tiddlers/CloudData.tid b/editions/d3demo/tiddlers/CloudData.tid
deleted file mode 100644
index 890f2c3f53..0000000000
--- a/editions/d3demo/tiddlers/CloudData.tid
+++ /dev/null
@@ -1,44 +0,0 @@
-title: CloudData
-type: application/json
-
-[
- {"text": "Tokyo/Yokohama", "size": 33.200},
- {"text": "New York Metro", "size": 17.800},
- {"text": "Sao Paulo", "size": 17.700},
- {"text": "Seoul/Incheon", "size": 17.500},
- {"text": "Mexico City", "size": 17.400},
- {"text": "Osaka/Kobe/Kyoto", "size": 16.425},
- {"text": "Manila", "size": 14.750},
- {"text": "Mumbai", "size": 14.350},
- {"text": "Delhi", "size": 14.300},
- {"text": "Jakarta", "size": 14.250},
- {"text": "Lagos", "size": 13.400},
- {"text": "Kolkata", "size": 12.700},
- {"text": "Cairo", "size": 12.200},
- {"text": "Los Angeles", "size": 11.789},
- {"text": "Buenos Aires", "size": 11.200},
- {"text": "Rio de Janeiro", "size": 10.800},
- {"text": "Moscow", "size": 10.500},
- {"text": "Shanghai", "size": 10.000},
- {"text": "Karachi", "size": 9.800},
- {"text": "Paris", "size": 9.645},
- {"text": "Istanbul", "size": 9.000},
- {"text": "Nagoya", "size": 9.000},
- {"text": "Beijing", "size": 8.614},
- {"text": "Chicago", "size": 8.308},
- {"text": "London", "size": 8.278},
- {"text": "Shenzhen", "size": 8.000},
- {"text": "Essen/Dusseldorf", "size": 7.350},
- {"text": "Tehran", "size": 7.250},
- {"text": "Bogota", "size": 7.000},
- {"text": "Lima", "size": 7.000},
- {"text": "Bangkok", "size": 6.500},
- {"text": "Johannesburg/East Rand", "size": 6.000},
- {"text": "Chennai", "size": 5.950},
- {"text": "Taipei", "size": 5.700},
- {"text": "Baghdad", "size": 5.500},
- {"text": "Santiago", "size": 5.425},
- {"text": "Bangalore", "size": 5.400},
- {"text": "Hyderabad", "size": 5.300},
- {"text": "St Petersburg", "size": 5.300}
-]
diff --git a/editions/d3demo/tiddlers/DefaultTiddlers.tid b/editions/d3demo/tiddlers/DefaultTiddlers.tid
deleted file mode 100644
index fe86054a58..0000000000
--- a/editions/d3demo/tiddlers/DefaultTiddlers.tid
+++ /dev/null
@@ -1,3 +0,0 @@
-title: $:/DefaultTiddlers
-
-[[HelloThere]]
diff --git a/editions/d3demo/tiddlers/GraphData.tid b/editions/d3demo/tiddlers/GraphData.tid
deleted file mode 100644
index 017131127e..0000000000
--- a/editions/d3demo/tiddlers/GraphData.tid
+++ /dev/null
@@ -1,10 +0,0 @@
-title: GraphData
-type: application/json
-
-{
- "layers": 4,
- "samples": 58,
- "data": [[{"x":0,"y":1.5465653425978438,"y0":0},{"x":1,"y":1.685317173883538,"y0":0},{"x":2,"y":1.8574362488718479,"y0":0},{"x":3,"y":1.8955971722736493,"y0":0},{"x":4,"y":1.9097577836599329,"y0":0},{"x":5,"y":1.8465434425997016,"y0":0},{"x":6,"y":1.633439930626274,"y0":0},{"x":7,"y":1.52631967808687,"y0":0},{"x":8,"y":1.254071127423236,"y0":0},{"x":9,"y":1.0827254551382322,"y0":0},{"x":10,"y":0.8638985445997883,"y0":0},{"x":11,"y":0.6413689486056139,"y0":0},{"x":12,"y":0.5413942661821705,"y0":0},{"x":13,"y":0.36278061239443893,"y0":0},{"x":14,"y":0.3256964071352306,"y0":0},{"x":15,"y":0.2137255237212198,"y0":0},{"x":16,"y":0.19963582829410498,"y0":0},{"x":17,"y":0.16830706117875752,"y0":0},{"x":18,"y":0.17206850583228236,"y0":0},{"x":19,"y":0.10830681834972318,"y0":0},{"x":20,"y":0.11873772657810025,"y0":0},{"x":21,"y":0.11084964578647072,"y0":0},{"x":22,"y":0.1484696893575204,"y0":0},{"x":23,"y":0.1867012666922508,"y0":0},{"x":24,"y":0.12949785228379762,"y0":0},{"x":25,"y":0.13160216135876143,"y0":0},{"x":26,"y":0.17191603579071696,"y0":0},{"x":27,"y":0.13015751294359376,"y0":0},{"x":28,"y":0.14401777421011913,"y0":0},{"x":29,"y":0.10201715281901944,"y0":0},{"x":30,"y":0.13096141940224687,"y0":0},{"x":31,"y":0.13007539913630495,"y0":0},{"x":32,"y":0.1548329677287279,"y0":0},{"x":33,"y":0.12825426147451768,"y0":0},{"x":34,"y":0.11173963750950311,"y0":0},{"x":35,"y":0.10009802752875707,"y0":0},{"x":36,"y":0.15986871614703402,"y0":0},{"x":37,"y":0.13176775383781347,"y0":0},{"x":38,"y":0.11931081113873895,"y0":0},{"x":39,"y":0.16285687568597873,"y0":0},{"x":40,"y":0.17962864991277508,"y0":0},{"x":41,"y":0.12206525453366346,"y0":0},{"x":42,"y":0.18058574651367965,"y0":0},{"x":43,"y":0.17203539919573813,"y0":0},{"x":44,"y":0.14411348106805236,"y0":0},{"x":45,"y":0.11210963563062251,"y0":0},{"x":46,"y":0.1381196621572599,"y0":0},{"x":47,"y":0.13853569640778007,"y0":0},{"x":48,"y":0.1413255832623691,"y0":0},{"x":49,"y":0.1174182482529442,"y0":0},{"x":50,"y":0.10530492262916305,"y0":0},{"x":51,"y":0.10311489694306446,"y0":0},{"x":52,"y":0.11639756702594588,"y0":0},{"x":53,"y":0.1319517292574534,"y0":0},{"x":54,"y":0.11580932540132466,"y0":0},{"x":55,"y":0.14951149305133773,"y0":0},{"x":56,"y":0.13733844893200403,"y0":0},{"x":57,"y":0.15683227159202287,"y0":0}],[{"x":0,"y":0.4205513236112361,"y0":1.5465653425978438},{"x":1,"y":0.5468517829897288,"y0":1.685317173883538},{"x":2,"y":0.968925897059711,"y0":1.8574362488718479},{"x":3,"y":1.4906540525791687,"y0":1.8955971722736493},{"x":4,"y":2.0955950901132407,"y0":1.9097577836599329},{"x":5,"y":2.4548437717415097,"y0":1.8465434425997016},{"x":6,"y":2.3871398992501094,"y0":1.633439930626274},{"x":7,"y":1.8956592631335767,"y0":1.52631967808687},{"x":8,"y":1.3310277640299937,"y0":1.254071127423236},{"x":9,"y":0.740004500538676,"y0":1.0827254551382322},{"x":10,"y":0.41341056933113224,"y0":0.8638985445997883},{"x":11,"y":0.25508869446689425,"y0":0.6413689486056139},{"x":12,"y":0.21465672884279616,"y0":0.5413942661821705},{"x":13,"y":0.2030322655655626,"y0":0.36278061239443893},{"x":14,"y":0.17778946560320333,"y0":0.3256964071352306},{"x":15,"y":0.13993989381581068,"y0":0.2137255237212198},{"x":16,"y":0.1509842264651427,"y0":0.19963582829410498},{"x":17,"y":0.14400590082193815,"y0":0.16830706117875752},{"x":18,"y":0.30062332723788887,"y0":0.17206850583228236},{"x":19,"y":0.47865475204719965,"y0":0.10830681834972318},{"x":20,"y":0.911871360864478,"y0":0.11873772657810025},{"x":21,"y":1.5099221362867215,"y0":0.11084964578647072},{"x":22,"y":1.9414749203225334,"y0":0.1484696893575204},{"x":23,"y":1.9571455162890212,"y0":0.1867012666922508},{"x":24,"y":1.4064503011974243,"y0":0.12949785228379762},{"x":25,"y":0.8310477425188015,"y0":0.13160216135876143},{"x":26,"y":0.4000029514079704,"y0":0.17191603579071696},{"x":27,"y":0.27666872064180015,"y0":0.13015751294359376},{"x":28,"y":0.1732079458981994,"y0":0.14401777421011913},{"x":29,"y":0.16434562900185226,"y0":0.10201715281901944},{"x":30,"y":0.10902278389939715,"y0":0.13096141940224687},{"x":31,"y":0.12130552647880047,"y0":0.13007539913630495},{"x":32,"y":0.13189499389209813,"y0":0.1548329677287279},{"x":33,"y":0.16701788078384439,"y0":0.12825426147451768},{"x":34,"y":0.19748827143641204,"y0":0.11173963750950311},{"x":35,"y":0.10048470402153871,"y0":0.10009802752875707},{"x":36,"y":0.1589328406733382,"y0":0.15986871614703402},{"x":37,"y":0.1260306214335577,"y0":0.13176775383781347},{"x":38,"y":0.12310005807202623,"y0":0.11931081113873895},{"x":39,"y":0.19081063238544746,"y0":0.16285687568597873},{"x":40,"y":0.11915995362201988,"y0":0.17962864991277508},{"x":41,"y":0.16775608610181492,"y0":0.12206525453366346},{"x":42,"y":0.11689659197281145,"y0":0.18058574651367965},{"x":43,"y":0.10478702228876778,"y0":0.17203539919573813},{"x":44,"y":0.11845520244093624,"y0":0.14411348106805236},{"x":45,"y":0.12148839301915355,"y0":0.11210963563062251},{"x":46,"y":0.10516531708389541,"y0":0.1381196621572599},{"x":47,"y":0.1443174046222646,"y0":0.13853569640778007},{"x":48,"y":0.21339332873273398,"y0":0.1413255832623691},{"x":49,"y":0.2712006000742741,"y0":0.1174182482529442},{"x":50,"y":0.5050451567911616,"y0":0.10530492262916305},{"x":51,"y":0.909821514076055,"y0":0.10311489694306446},{"x":52,"y":1.5406349016176095,"y0":0.11639756702594588},{"x":53,"y":1.9406928968291974,"y0":0.1319517292574534},{"x":54,"y":2.1437324147686923,"y0":0.11580932540132466},{"x":55,"y":1.8465368739328496,"y0":0.14951149305133773},{"x":56,"y":1.4092532224974688,"y0":0.13733844893200403},{"x":57,"y":0.8817856427333232,"y0":0.15683227159202287}],[{"x":0,"y":0.1944409988255144,"y0":1.96711666620908},{"x":1,"y":0.15033225801417882,"y0":2.2321689568732666},{"x":2,"y":0.14925294980475312,"y0":2.826362145931559},{"x":3,"y":0.13370916755531753,"y0":3.386251224852818},{"x":4,"y":0.19872840374154924,"y0":4.005352873773173},{"x":5,"y":0.13950762000676847,"y0":4.3013872143412115},{"x":6,"y":0.16267251262861193,"y0":4.020579829876383},{"x":7,"y":0.1577907670976032,"y0":3.4219789412204467},{"x":8,"y":0.21860201765439113,"y0":2.58509889145323},{"x":9,"y":0.18971610615072376,"y0":1.822729955676908},{"x":10,"y":0.3651241384995914,"y0":1.2773091139309205},{"x":11,"y":0.40364878074449406,"y0":0.8964576430725082},{"x":12,"y":0.641325222983355,"y0":0.7560509950249666},{"x":13,"y":0.7970356614298015,"y0":0.5658128779600016},{"x":14,"y":1.035079540774146,"y0":0.5034858727384339},{"x":15,"y":1.2114900571612826,"y0":0.3536654175370305},{"x":16,"y":1.2955027464964213,"y0":0.3506200547592477},{"x":17,"y":1.2704279232237192,"y0":0.3123129620006957},{"x":18,"y":1.1110482804839328,"y0":0.47269183307017126},{"x":19,"y":0.95265250419215,"y0":0.5869615703969229},{"x":20,"y":0.7625642407866274,"y0":1.0306090874425782},{"x":21,"y":0.48432505597654985,"y0":1.6207717820731922},{"x":22,"y":0.3605975129100767,"y0":2.089944609680054},{"x":23,"y":0.25079581943021645,"y0":2.143846782981272},{"x":24,"y":0.17992789872009896,"y0":1.5359481534812218},{"x":25,"y":0.15831991003627732,"y0":0.962649903877563},{"x":26,"y":0.209545591944138,"y0":0.5719189871986874},{"x":27,"y":0.1815386065993288,"y0":0.40682623358539394},{"x":28,"y":0.22451288616655046,"y0":0.3172257201083185},{"x":29,"y":0.18631048531302957,"y0":0.2663627818208717},{"x":30,"y":0.2693049686300363,"y0":0.23998420330164402},{"x":31,"y":0.4390040968595268,"y0":0.2513809256151054},{"x":32,"y":0.5561378323665368,"y0":0.28672796162082603},{"x":33,"y":0.9278805101372621,"y0":0.29527214225836207},{"x":34,"y":1.3353385179667492,"y0":0.3092279089459151},{"x":35,"y":1.7554694271042415,"y0":0.20058273155029577},{"x":36,"y":2.308524602434114,"y0":0.31880155682037226},{"x":37,"y":2.7798378587096577,"y0":0.25779837527137117},{"x":38,"y":3.0871471730848987,"y0":0.24241086921076518},{"x":39,"y":3.19362118064261,"y0":0.3536675080714262},{"x":40,"y":3.0580826674114436,"y0":0.29878860353479497},{"x":41,"y":2.8290814192483107,"y0":0.2898213406354784},{"x":42,"y":2.403204319807294,"y0":0.2974823384864911},{"x":43,"y":1.979503686260371,"y0":0.2768224214845059},{"x":44,"y":1.5386751122848177,"y0":0.2625686835089886},{"x":45,"y":1.22746871167621,"y0":0.23359802864977608},{"x":46,"y":1.0047814505063442,"y0":0.24328497924115533},{"x":47,"y":0.920231760634797,"y0":0.2828531010300447},{"x":48,"y":1.194396098267215,"y0":0.3547189119951031},{"x":49,"y":1.4579447933613743,"y0":0.38861884832721827},{"x":50,"y":1.8332767350779728,"y0":0.6103500794203246},{"x":51,"y":1.785497637913814,"y0":1.0129364110191195},{"x":52,"y":1.3961662093621368,"y0":1.6570324686435554},{"x":53,"y":0.9233138020734465,"y0":2.072644626086651},{"x":54,"y":0.535039156141422,"y0":2.259541740170017},{"x":55,"y":0.2889374100548123,"y0":1.9960483669841873},{"x":56,"y":0.1537458202547387,"y0":1.5465916714294727},{"x":57,"y":0.1883149606515614,"y0":1.038617914325346}],[{"x":0,"y":0.11051783803850412,"y0":2.1615576650345942},{"x":1,"y":0.13068661955185235,"y0":2.382501214887445},{"x":2,"y":0.1578517352230847,"y0":2.975615095736312},{"x":3,"y":0.1728128878166899,"y0":3.5199603924081355},{"x":4,"y":0.10202869654167444,"y0":4.204081277514723},{"x":5,"y":0.17840681280940773,"y0":4.44089483434798},{"x":6,"y":0.17828655322082343,"y0":4.1832523425049954},{"x":7,"y":0.19687224281951787,"y0":3.5797697083180497},{"x":8,"y":0.15308661116287114,"y0":2.803700909107621},{"x":9,"y":0.16337432491127402,"y0":2.0124460618276316},{"x":10,"y":0.19935019137337806,"y0":1.6424332524305119},{"x":11,"y":0.12992399381473663,"y0":1.3001064238170024},{"x":12,"y":0.19960449892096221,"y0":1.3973762180083216},{"x":13,"y":0.10027564393822104,"y0":1.362848539389803},{"x":14,"y":0.12569230108056217,"y0":1.53856541351258},{"x":15,"y":0.17503334458451777,"y0":1.565155474698313},{"x":16,"y":0.19269541966194062,"y0":1.646122801255669},{"x":17,"y":0.1962713932455704,"y0":1.582740885224415},{"x":18,"y":0.19479403514149154,"y0":1.583740113554104},{"x":19,"y":0.18478477013321984,"y0":1.539614074589073},{"x":20,"y":0.3903502085015326,"y0":1.7931733282292055},{"x":21,"y":2.113535902304932,"y0":2.105096838049742},{"x":22,"y":4.817339276092961,"y0":2.4505421225901305},{"x":23,"y":2.7301424058386385,"y0":2.394642602411489},{"x":24,"y":0.5160762371843461,"y0":1.7158760522013208},{"x":25,"y":0.18540916174249022,"y0":1.1209698139138404},{"x":26,"y":0.5677074867030829,"y0":0.7814645791428254},{"x":27,"y":1.1464075745324163,"y0":0.5883648401847228},{"x":28,"y":1.2876248090555846,"y0":0.541738606274869},{"x":29,"y":0.6980320380328242,"y0":0.45267326713390127},{"x":30,"y":0.24283358972081664,"y0":0.5092891719316803},{"x":31,"y":0.11682030700960003,"y0":0.6903850224746322},{"x":32,"y":0.15527601995343537,"y0":0.8428657939873628},{"x":33,"y":0.12116465080341,"y0":1.2231526523956242},{"x":34,"y":0.11856791414918837,"y0":1.6445664269126643},{"x":35,"y":0.18425266326500114,"y0":1.9560521586545372},{"x":36,"y":0.1885328239909346,"y0":2.627326159254486},{"x":37,"y":0.22762141668860758,"y0":3.0376362339810288},{"x":38,"y":0.30843369961151645,"y0":3.329558042295664},{"x":39,"y":0.5150686859947133,"y0":3.547288688714036},{"x":40,"y":0.7904080489023975,"y0":3.3568712709462387},{"x":41,"y":0.9969372223042159,"y0":3.118902759883789},{"x":42,"y":1.1835681067174746,"y0":2.700686658293785},{"x":43,"y":1.1976013965051904,"y0":2.256326107744877},{"x":44,"y":1.0675440751484562,"y0":1.8012437957938063},{"x":45,"y":0.7788761831088342,"y0":1.461066740325986},{"x":46,"y":0.5260592994869968,"y0":1.2480664297474995},{"x":47,"y":0.32297373237592664,"y0":1.2030848616648417},{"x":48,"y":0.23281612172581895,"y0":1.5491150102623181},{"x":49,"y":0.15490821516916609,"y0":1.8465636416885927},{"x":50,"y":0.19289989359183243,"y0":2.4436268144982973},{"x":51,"y":0.19691381881928033,"y0":2.7984340489329336},{"x":52,"y":0.16966840994286328,"y0":3.053198678005692},{"x":53,"y":0.10215978941475964,"y0":2.9959584281600975},{"x":54,"y":0.1131423233217642,"y0":2.7945808963114387},{"x":55,"y":0.11913954267715618,"y0":2.2849857770389996},{"x":56,"y":0.12786382707962554,"y0":1.7003374916842113},{"x":57,"y":0.1917928157522389,"y0":1.2269328749769075}]]
-}
-
-
diff --git a/editions/d3demo/tiddlers/HelloThere.tid b/editions/d3demo/tiddlers/HelloThere.tid
deleted file mode 100644
index 4923373462..0000000000
--- a/editions/d3demo/tiddlers/HelloThere.tid
+++ /dev/null
@@ -1,17 +0,0 @@
-title: HelloThere
-
-This is a demo of TiddlyWiki5 incorporating a plugin for the [[D3.js]] visualisation library.
-
-! Word Cloud
-
-<$d3cloud data="CloudData" spiral={{$:/spiral}}/>
-
-
-//[[Raw data|CloudData]]//
-
-! Bar Chart
-
-<$d3bar grouped={{$:/grouped}} data="GraphData"/>
-<$button set="$:/grouped" setTo="yes">grouped</$button> <$button set="$:/grouped" setTo="no">stacked</$button>
-
-//[[Raw data|GraphData]]//
\ No newline at end of file
diff --git a/editions/d3demo/tiddlers/SiteSubtitle.tid b/editions/d3demo/tiddlers/SiteSubtitle.tid
deleted file mode 100644
index 4b80d85ac0..0000000000
--- a/editions/d3demo/tiddlers/SiteSubtitle.tid
+++ /dev/null
@@ -1,3 +0,0 @@
-title: $:/SiteSubtitle
-
-a demo of the D3.js plugin for TiddlyWiki5
\ No newline at end of file
diff --git a/editions/d3demo/tiddlers/SiteTitle.tid b/editions/d3demo/tiddlers/SiteTitle.tid
deleted file mode 100644
index a3eebd2cf5..0000000000
--- a/editions/d3demo/tiddlers/SiteTitle.tid
+++ /dev/null
@@ -1,3 +0,0 @@
-title: $:/SiteTitle
-
-d3demo
\ No newline at end of file
diff --git a/editions/d3demo/tiddlers/grouped.tid b/editions/d3demo/tiddlers/grouped.tid
deleted file mode 100644
index 545960efce..0000000000
--- a/editions/d3demo/tiddlers/grouped.tid
+++ /dev/null
@@ -1,3 +0,0 @@
-title: $:/grouped
-
-yes
\ No newline at end of file
diff --git a/editions/d3demo/tiddlers/spiral.tid b/editions/d3demo/tiddlers/spiral.tid
deleted file mode 100644
index 62b6b38fd2..0000000000
--- a/editions/d3demo/tiddlers/spiral.tid
+++ /dev/null
@@ -1,3 +0,0 @@
-title: $:/spiral
-
-archimedean
\ No newline at end of file
diff --git a/editions/d3demo/tiddlywiki.info b/editions/d3demo/tiddlywiki.info
deleted file mode 100644
index e7a4dc3f8b..0000000000
--- a/editions/d3demo/tiddlywiki.info
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "description": "Demo of the D3 plugin",
- "plugins": [
- "tiddlywiki/d3"
- ],
- "themes": [
- "tiddlywiki/vanilla",
- "tiddlywiki/snowwhite"
- ],
- "includeWikis": [
- ],
- "build": {
- "index": [
- "--rendertiddler","$:/core/save/all","d3demo.html","text/plain"]
- }
-}
\ No newline at end of file
diff --git a/editions/de-AT/tiddlers/external/tiddlywiki.files b/editions/de-AT/tiddlers/external/tiddlywiki.files
index fd714a0df2..d1cc8572fe 100644
--- a/editions/de-AT/tiddlers/external/tiddlywiki.files
+++ b/editions/de-AT/tiddlers/external/tiddlywiki.files
@@ -1,9 +1,9 @@
{
"tiddlers": [
{
- "file": "../../../tw5.com/tiddlers/images/New Release Banner.png",
+ "file": "../../../tw5.com/tiddlers/images/New Release Banner.webp",
"fields": {
- "type": "image/jpeg",
+ "type": "image/webp",
"title": "New Release Banner",
"tags": "picture"
}
diff --git a/editions/de-AT/tiddlers/system/$__editions_de-AT-DE_download-empty.tid b/editions/de-AT/tiddlers/system/$__editions_de-AT-DE_download-empty.tid
index d14f6c4c99..0bc96ec9a1 100755
--- a/editions/de-AT/tiddlers/system/$__editions_de-AT-DE_download-empty.tid
+++ b/editions/de-AT/tiddlers/system/$__editions_de-AT-DE_download-empty.tid
@@ -4,7 +4,7 @@ title: $:/editions/de-AT-DE/download-empty
type: text/vnd.tiddlywiki
\define saveTiddlerFilter()
-[[$:/core]] [[$:/isEncrypted]] [[$:/themes/tiddlywiki/snowwhite]] [[$:/themes/tiddlywiki/vanilla]] [[$:/languages/de-DE]] [[$:/languages/de-AT]] [[$:/language]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]]
+[[$:/core]] [[$:/isEncrypted]] [[$:/themes/tiddlywiki/snowwhite]] [[$:/themes/tiddlywiki/vanilla]] [[$:/languages/de-DE]] [[$:/languages/de-AT]] [[$:/language]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[has[plugin-type]field:platform[server]] +[sort[title]]
\end
\define savingEmpty()
yes
diff --git a/editions/dev/tiddlers/How to Create a Custom Cascade Entry.tid b/editions/dev/tiddlers/How to Create a Custom Cascade Entry.tid
new file mode 100644
index 0000000000..d96ceb2bb7
--- /dev/null
+++ b/editions/dev/tiddlers/How to Create a Custom Cascade Entry.tid
@@ -0,0 +1,127 @@
+created: 20240802065815656
+modified: 20240802065836064
+title: How to Create a Custom Cascade Entry
+type: text/vnd.tiddlywiki
+
+This guide explains how to add a new [[cascade|https://tiddlywiki.com/#Cascades]] to the ~TiddlyWiki core or your own plugins. This allows third-party plugins to extend the functionality of the core or your plugin.
+
+!! How Cascade Works in the Core
+
+This section explains how the existing WikiText in the core interacts with the new WikiText you’ll add, only for learning purpose. You don’t need to modify the core WikiText when adding a new cascade.
+
+!!! The Default Template as a Fallback
+
+The default behavior in ~TiddlyWiki is defined by [[$:/core/ui/ViewTemplate/tags/default]].
+
+<pre>
+<$view tiddler="$:/core" subtiddler="$:/core/ui/ViewTemplate/tags/default" mode=block format=text/>
+</pre>
+
+!!! Transclusion of the Active Template
+
+[[$:/core/ui/ViewTemplate/tags]] uses a filter expression to find the cascade filter and the view template you’ll add.
+
+<pre>
+<$view tiddler="$:/core" subtiddler="$:/core/ui/ViewTemplate/tags" mode=block format=text/>
+</pre>
+
+The `:cascade` clause collects all tiddlers it finds and uses their filter text sequentially. Most filters won’t return any text and will be skipped. The first filter that returns a tiddler title becomes the result of the `:cascade` clause. If no filters return a result, the fallback default filter will be used.
+
+The `:and[!is[blank]else` clause provides additional fallback protection, though it’s often redundant because a fallback is typically tagged with `$:/tags/ViewTemplateTagsFilter`. However, including fallbacks is a good practice for defensive programming.
+
+!! Adding a New Cascade Entry
+
+This section contains the WikiText you’ll need to add to the core. Modify it to suit your needs instead of copying it directly.
+
+!!! Creating a Control Panel Tab
+
+To create a new tab under [[ControlPanel|$:/ControlPanel]] → Advanced → [[Cascade|$:/core/ui/ControlPanel/Cascades]], use the following code:
+
+[[$:/core/ui/ControlPanel/ViewTemplateTags]] uses a filter expression to find the cascade filter and the view template you’ll add.
+
+<pre>
+<$view tiddler="$:/core" subtiddler="$:/core/ui/ControlPanel/ViewTemplateTags" mode=block format=text/>
+</pre>
+
+Add the following metadata:
+
+```tid
+tags: $:/tags/ControlPanel/Cascades
+caption: {{$:/language/ControlPanel/ViewTemplateTags/Caption}}
+```
+
+!!! Adding a New Language Entry
+
+It’s important to add related language files. Create a file starting with `title: $:/language/ControlPanel/`:
+
+```multid
+title: $:/language/ControlPanel/
+
+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.
+```
+
+!!! Adding Default Configuration
+
+Similar to the language file, add a config file starting with `title: $:/config/ViewTemplateTagsFilters/`. For example:
+
+```tid
+title: $:/config/ViewTemplateTagsFilters/
+tags: $:/tags/ViewTemplateTagsFilter
+
+default: [[$:/core/ui/ViewTemplate/tags/default]]
+```
+
+Different templates may have their own config files. Ensure you’re adding to the correct file or creating a new one if it doesn’t exist.
+
+!! Using the New Cascade
+
+This section provides a simplified example based on a real-world use case. It demonstrates how to override the default template with a custom template.
+
+!!! Your Template
+
+Add the content you want to display conditionally. Update `publisher/plugin-name` to your plugin’s name.
+
+```tid
+code-body: yes
+title: $:/plugins/publisher/plugin-name/EditMode
+
+\whitespace trim
+<$reveal type="nomatch" stateTitle=<<folded-state>> text="hide" tag="div" retain="yes" animate="yes">
+ <div class="tc-tags-wrapper" style="display:flex">
+ <$transclude tiddler="$:/core/ui/EditTemplate/tags"/>
+ <$button class="tc-btn-invisible" style="margin-left:1em;">
+ {{$:/core/images/done-button}}
+ <$action-deletetiddler $tiddler={{{ [[$:/state/edit-view-mode-tags/]addsuffix<storyTiddler>] }}}/>
+ </$button>
+ </div>
+</$reveal>
+```
+
+!!! The Condition
+
+Write a filter that ends with `then[$:/plugins/publisher/plugin-name/EditMode]`.
+
+```tid
+code-body: yes
+tags: $:/tags/ViewTemplateTagsFilter
+title: $:/plugins/publisher/plugin-name/CascadeEditMode
+list-before: $:/config/ViewTemplateTagsFilters/default
+
+[[$:/state/edit-view-mode-tags/]addsuffix<currentTiddler>get[text]compare:string:eq[yes]then[$:/plugins/publisher/plugin-name/EditMode]]
+```
+
+!!! A Button to Trigger the Condition
+
+```tid
+code-body: yes
+tags: $:/tags/ViewTemplate/Tags
+title: $:/plugins/publisher/plugin-name/TriggerEdit
+
+\whitespace trim
+<%if [<storyTiddler>get[tags]!is[blank]] %>
+ <$button class="tc-btn-invisible" set={{{ [[$:/state/edit-view-mode-tags/]addsuffix<storyTiddler>] }}} setTo="yes" tooltip="add tags">
+ {{$:/core/images/new-here-button}}
+ </$button>
+<%endif%>
+```
diff --git a/editions/dev/tiddlers/build/Releasing a new version of TiddlyWiki.tid b/editions/dev/tiddlers/build/Releasing a new version of TiddlyWiki.tid
index 47ee3115c3..adf8ad0b3f 100644
--- a/editions/dev/tiddlers/build/Releasing a new version of TiddlyWiki.tid
+++ b/editions/dev/tiddlers/build/Releasing a new version of TiddlyWiki.tid
@@ -1,5 +1,5 @@
created: 20190809095728085
-modified: 20190809123445125
+modified: 20250707151538845
title: Releasing a new version of TiddlyWiki
type: text/vnd.tiddlywiki
@@ -11,36 +11,40 @@ type: text/vnd.tiddlywiki
# Move the latest release note from the prerelease edition into the tw5.com edition
# Adjust the release date and the ''released'' field of the latest release tiddler (eg, [[Release 5.1.3]])
# Also adjust the github.com comparison link to point to the tag for the new release
+# Adjust the tiddler [[TiddlyWiki Archive]] to include the new version number
# Ensure [[TiddlyWiki Releases]] has the new version as the default tab
# Adjust the modified time of HelloThere
# Make sure ''master'' is fully committed
-!! Update Readmes
+!! Update Readmes and release note
# Edit `package.json` to the new version number
# Run `./bin/readme-bld.sh` to build the readme files
# Commit the new readme files to ''master''
# Restore `package.json` to the previous version number
+# Adjust the link for "GitHub for detailed change history of this release" in the release note
+# Add the credits for the new release banner to the release note, including a link to the GitHub instance of the image from the commit history
!! Make New Release
-# Run `./bin/verbump "5.1.3"` (substituting the correct version number) to update the version number, assign it a tag
+# Run `./bin/verbump "5.1.3"` (substituting the correct version number) to update the version number and assign it a tag
# Run `./bin/npm-publish.sh` to publish the release to npm
# Verify that the new release of TiddlyWiki is available at https://www.npmjs.org/package/tiddlywiki
!! Update tiddlywiki.com release
# Update ''tiddlywiki-com'' from ''master'' and push to ~GitHub
+# Wait until https://tiddlywiki.com is updated with the new release
-!! Cleaning Up
+!! Announcements
-# Tweet the release with the text "TiddlyWiki v5.x.x released to https://tiddlywiki.com #newtiddlywikirelease"
+# Announce the new release on [[TalkTW|https://talk.tiddlywiki.org]]
!! Preparation for the next release in ''master''
# Adjust version number in `package.json`
# Adjust version number in `bin/build-site.sh`
# Adjust version number in [[$:/config/OfficialPluginLibrary]] (both in `editions/tw5.com` and `editions/prerelease/tiddlers/system`) and [[$:/config/LocalPluginLibrary]]
-# Adjust new release banner
+# Create temporary new release banner
# Create the release note for the new release
# Commit changes to ''master'' and push to ~GitHub
diff --git a/editions/dev/tiddlers/from Heigele and Jurke/RootWidget and Rendering Startup.tid b/editions/dev/tiddlers/from Heigele and Jurke/RootWidget and Rendering Startup.tid
index d6943c5590..165a98df69 100644
--- a/editions/dev/tiddlers/from Heigele and Jurke/RootWidget and Rendering Startup.tid
+++ b/editions/dev/tiddlers/from Heigele and Jurke/RootWidget and Rendering Startup.tid
@@ -1,9 +1,10 @@
chapter.of: UI and Rendering Pipeline
created: 20140717175203036
-modified: 20140717182314488
+modified: 20240802065804331
sub.num: 5
tags: doc
title: RootWidget and Rendering Startup
+type: text/vnd.tiddlywiki
The previous parts of this chapter showed how WikiText is transformed to DOM nodes which dynamically react to tiddler changes and a way to compose tiddlers from other tiddlers.
This last part describes how the TiddlyWiki core plug-in starts up a UI build from tiddlers and WikiText.
@@ -29,6 +30,9 @@ and a listener is registered at the store which executes the refresh function of
[[Techniques for including other tiddlers and Templates|Transclusion and TextReference]] are finally used in [[$:/core/ui/PageTemplate]] to build the TiddlyWiki UI only from tiddlers written in WikiText (with widgets implemented in javascript):
For example to implement the list of open wiki pages the [[$:/core/ui/PageTemplate]] contains a [[navigator widget|$:/core/modules/widgets/navigator.js]] which maintains a list of open tiddlers in a field of [[$:/StoryList]] and handles events like ``tm-navigate`` by adding a tiddler specified as parameter to the top of the list in [[$:/StoryList]].
+
The [[story tiddler|$:/core/ui/PageTemplate/story]] transcluded in [[$:/core/ui/PageTemplate]] then uses a ~ListWidget to transclude all tiddlers in [[$:/StoryList]] through a special template [[$:/core/ui/ViewTemplate]].
+The ViewTemplate here is a combination of different fragments, like title fragment and body fragment, each fragment can be override individually using [[Cascade Mechanism|How to Create a Custom Cascade Entry]].
+
A event of the type ``tm-close-tiddler`` would remove a specified tiddler from [[$:/StoryList]].
The [[Event Mechanism]] would trigger a changed event which triggers a call of the ~ListWidget's refresh function which would remove the tiddler from the list, closing the tiddler.
diff --git a/editions/es-ES/tiddlers/system/download-empty.tid b/editions/es-ES/tiddlers/system/download-empty.tid
index 64928eb2f4..8113ba50ad 100755
--- a/editions/es-ES/tiddlers/system/download-empty.tid
+++ b/editions/es-ES/tiddlers/system/download-empty.tid
@@ -2,7 +2,7 @@ title: $:/editions/es-ES/download-empty
type: text/vnd.tiddlywiki
\define saveTiddlerFilter()
-[[$:/core]] [[$:/isEncrypted]] [[$:/themes/tiddlywiki/snowwhite]] [[$:/themes/tiddlywiki/vanilla]] [[$:/languages/es-ES]] [[$:/language]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]]
+[[$:/core]] [[$:/isEncrypted]] [[$:/themes/tiddlywiki/snowwhite]] [[$:/themes/tiddlywiki/vanilla]] [[$:/languages/es-ES]] [[$:/language]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[has[plugin-type]field:platform[server]] +[sort[title]]
\end
\define savingEmpty()
yes
diff --git a/editions/fr-FR/tiddlers/ReleaseTemplate.tid b/editions/fr-FR/tiddlers/ReleaseTemplate.tid
index bde81b1ea3..bc7fc1bfa7 100644
--- a/editions/fr-FR/tiddlers/ReleaseTemplate.tid
+++ b/editions/fr-FR/tiddlers/ReleaseTemplate.tid
@@ -1,5 +1,6 @@
created: 20141115211411211
title: ReleaseTemplate
+code-body: yes
type: text/vnd.tiddlywiki
<h2><$link to=<<currentTab>>><$view tiddler=<<currentTab>> field="title"/></$link></h2>
diff --git a/editions/fr-FR/tiddlers/system/download-empty.tid b/editions/fr-FR/tiddlers/system/download-empty.tid
index d07088b63c..f90e602059 100755
--- a/editions/fr-FR/tiddlers/system/download-empty.tid
+++ b/editions/fr-FR/tiddlers/system/download-empty.tid
@@ -2,7 +2,7 @@ title: $:/editions/fr-FR/download-empty
type: text/vnd.tiddlywiki
\define saveTiddlerFilter()
-[[$:/core]] [[$:/isEncrypted]] [[$:/themes/tiddlywiki/snowwhite]] [[$:/themes/tiddlywiki/vanilla]] [[$:/languages/fr-FR]] [[$:/language]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]]
+[[$:/core]] [[$:/isEncrypted]] [[$:/themes/tiddlywiki/snowwhite]] [[$:/themes/tiddlywiki/vanilla]] [[$:/languages/fr-FR]] [[$:/language]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[has[plugin-type]field:platform[server]] +[sort[title]]
\end
\define savingEmpty()
yes
diff --git a/editions/ja-JP/tiddlers/concepts/Filters.tid b/editions/ja-JP/tiddlers/concepts/Filters.tid
new file mode 100644
index 0000000000..0938f0dd55
--- /dev/null
+++ b/editions/ja-JP/tiddlers/concepts/Filters.tid
@@ -0,0 +1,30 @@
+created: 20130827080000000
+list: [[Introduction to filter notation]] [[Filter Syntax]]
+modified: 20250218103107943
+original-modified: 20230710074511095
+tags: Reference Concepts TableOfContents
+title: Filters
+ja-title: フィルタ
+type: text/vnd.tiddlywiki
+
+\define openAdvancedSearch()
+<$action-setfield $tiddler="$:/state/tab--1498284803" text="$:/core/ui/AdvancedSearch/Filter"/>
+<$action-setfield $tiddler="$:/temp/advancedsearch/input" text="[tag[Filters]]"/>
+<$action-setfield $tiddler="$:/temp/advancedsearch" text="[tag[Filters]]"/>
+\end
+
+TiddlyWikiは、レコードがTiddlerであるデータベースと考えることができます。データベースは通常、どのレコードが特定のパターンに一致するかを発見する方法を提供します。~TiddlyWikiでは、これはフィルタを使用して行われます
+
+<<.def フィルタ>>は、その<<.def "アウトプット">>として特定の[[Tiddlerセット|Title Selection]]を選択するための簡潔な表記法です。~TiddlyWikiはフィルタに遭遇するたびにアウトプットを計算します。その後、それらのTiddlerを使って、[[数を数え|CountWidget]]たり、[[リストし|ListWidget]]たりするなど、さらなる処理を行うことができます
+
+次の例では、フィルタを<<.mlink list-links>>マクロに渡します。<<.olink2 tag tag>> <<.word フィルタ>>であるTiddlerのリストを表示します:
+
+<<wikitext-example-without-html """<<list-links "[tag[Filters]]">>""" >>
+
+Wiki内でTiddlerが追加や削除されると、フィルタのアウトプットが変更される可能性があります。~TiddlyWikiは即再計算し、フィルタベースのカウントやリストも自動的に更新します
+
+''さらに詳細:''
+
+* <$linkcatcher message="tm-navigate" actions=<<openAdvancedSearch>> >[[高度な検索|$:/AdvancedSearch]]</$linkcatcher> -- フィルタを簡単に試すことができる<<.advancedsearch-tab Filter>>タブがあります
+
+* [[WikiTextでのフィルタされたトランスクルージョン|Transclusion in WikiText]] -- テキスト内でフィルタ結果を使用したい場合
\ No newline at end of file
diff --git a/editions/ja-JP/tiddlers/concepts/Selection Constructors.tid b/editions/ja-JP/tiddlers/concepts/Selection Constructors.tid
new file mode 100644
index 0000000000..2e1682d553
--- /dev/null
+++ b/editions/ja-JP/tiddlers/concepts/Selection Constructors.tid
@@ -0,0 +1,19 @@
+created: 20150117204109000
+modified: 20250222112113766
+original-modified: 20240708201746542
+tags: Filters
+title: Selection Constructors
+ja-title: セレクションコンストラクタ
+type: text/vnd.tiddlywiki
+
+[[フィルタステップ|Filter Step]]のアウトプットはその[[オペレータ|Filter Operators]]によって異なります:
+
+* ほとんどのオペレータは、インプットからアウトプットを派生します。たとえば、それらの多くはインプットのサブセットをアウトプットし、まさに<<.word フィルタ>>の名にふさわしく、含んでいる[[ラン|Filter Run]]の全体的なアウトプットを絞り込みます。これらのオペレータは<<.def "セレクションモディファイア">>と呼ばれます。
+
+* いくつかのオペレータはインプットを無視し、代わりに独立したアウトプットを生成します。これらは<<.def "セレクションコンストラクタ">>と呼ばれ、完全に新しい[[セレクション|Title Selection]]を構築します。
+
+コンストラクタの良い例は<<.olink title>>です。`[title[A]title[B]]`のアウトプットは<<.tid B>>です。しかし、<<.olink field>>オペレータはモディファイアなので、`[title[A]field:title[B]`は何もアウトプットしません。
+
+次の[[フィルタオペレータ|filter Operator]]は<<tag>>でタグ付けされています:
+
+<<list-links "[tag<currentTiddler>]" class:"multi-columns">>
diff --git a/editions/ja-JP/tiddlers/filters/syntax/All Filter Run Prefix.tid b/editions/ja-JP/tiddlers/filters/syntax/All Filter Run Prefix.tid
new file mode 100644
index 0000000000..fc13d06b5c
--- /dev/null
+++ b/editions/ja-JP/tiddlers/filters/syntax/All Filter Run Prefix.tid
@@ -0,0 +1,20 @@
+created: 20230316150731234
+from-version: 5.1.23
+modified: 20250303102704427
+original-modified: 20230711084644541
+rp-input: 前回のフィルタランからのすべてのタイトル
+rp-output: アウトプットタイトルは、重複を排除せずに以前のフィルタランの出力に追加されます。
+rp-purpose: 重複を排除しない和集合
+tags: [[Named Filter Run Prefix]]
+title: All Filter Run Prefix
+ja-title: allフィルタランプレフィックス
+type: text/vnd.tiddlywiki
+
+<$railroad text="""
+\start none
+\end none
+( ":all" | - )
+[["ラン"|"Filter Run"]]
+"""/>
+
+このプレフィックスにはオプションの[[ショートカット構文|Shortcut Filter Run Prefix]]であるシンボル`=run`があります
\ No newline at end of file
diff --git a/editions/ja-JP/tiddlers/filters/syntax/And Filter Run Prefix.tid b/editions/ja-JP/tiddlers/filters/syntax/And Filter Run Prefix.tid
new file mode 100644
index 0000000000..76c1389204
--- /dev/null
+++ b/editions/ja-JP/tiddlers/filters/syntax/And Filter Run Prefix.tid
@@ -0,0 +1,20 @@
+created: 20230318142752854
+from-version: 5.1.23
+modified: 20250303103244036
+original-modified: 20230711084712170
+rp-purpose: フィルタステップの蓄積
+rp-input: これまでのすべてのランのフィルタアウトプット
+rp-output: アウトプットのタイトルは、以前のフィルターランのアウトプットを置換
+tags: [[Named Filter Run Prefix]]
+title: And Filter Run Prefix
+ja-title: andフィルタランプレフィックス
+type: text/vnd.tiddlywiki
+
+<$railroad text="""
+\start none
+\end none
+( ":and" | - )
+[["ラン"|"Filter Run"]]
+"""/>
+
+このプレフィックスにはオプションの[[ショートカット構文|Shortcut Filter Run Prefix]]であるシンボル+runがあります
\ No newline at end of file
diff --git a/editions/ja-JP/tiddlers/filters/syntax/Cascade Filter Run Prefix (Examples).tid b/editions/ja-JP/tiddlers/filters/syntax/Cascade Filter Run Prefix (Examples).tid
new file mode 100644
index 0000000000..8d4afe5317
--- /dev/null
+++ b/editions/ja-JP/tiddlers/filters/syntax/Cascade Filter Run Prefix (Examples).tid
@@ -0,0 +1,48 @@
+created: 20211130114857532
+filter1: [prefix[ca]then[ca]]
+filter2: [suffix[at]then[at]]
+filter3: other
+modified: 20250310110107153
+original-modified: 20230305125250563
+tags: [[Cascade Filter Run Prefix]]
+title: Cascade Filter Run Prefix (Examples)
+ja-title: cascadeフィルタランプレフィックス (例)
+type: text/vnd.tiddlywiki
+
+<<.op ":cascade">>フィルタランプレフィックスは、タグマクロによって生成されるタグピルで使用される各Tiddlerの配色を選択するために、~TiddlyWikiコアによって使用されます。
+
+`:cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]]`
+
+上記の<<.op :cascade>>フィルタラン内のフィルタ式は、<<tag $:/tags/TiddlerColourFilter>>でタグ付けされたTiddlerのテキストフィールドからフィルタのリストを返します。以下を参照:
+
+<ul>
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]]">
+<li><pre><$text text=<<currentTiddler>>/></pre></li>
+</$list>
+</ul>
+
+インプットタイトルごとに、これらのフィルタが順番に適用され、空でないリストを返す最初のフィルタが見つかるまで続きます。この空でないリストの最初の結果がそのインプットタイトルに置き換えられ、そのTiddlerの色として使用されます。
+
+<<.operator-example 1 """[all[shadows+tiddlers]] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] +[!is[blank]limit[10]]""">>
+
+!! 拡張例
+
+この例では、<<.op :cascade>>フィルタランがどのように機能するかを段階的に説明します。
+
+アウトプットがフィルタのリストを返すフィルタ式が必要です。通常、このようなフィルタ式は、一連のTiddler内のいくつかのフィールドを照会して(おそらくタグ経由で)フィルタのリストを作成します。この例を自己完結型にするために、このTiddlerの//filter1//、//filter2//、//filter3//フィールドに、3つのフィルタが格納されます。[[テキスト参照|TextReference]]と[[appendオペレータ|append Operator]]のインスタンスを使用して、フィールドをフィルタのリストに結合します。
+
+フィルター`[{!!filter1}append{!!filter2}append{!!filter3}]`は、次のフィルタリストを生成します:
+
+<ul>
+<$list filter="[{!!filter1}append{!!filter2}append{!!filter3}]">
+<li><pre><$text text=<<currentTiddler>>/></pre></li>
+</$list>
+</ul>
+
+この例では、`cat can bat bug`がインプットタイトルとして使用されます。各インプットタイトルは、上記の各フィルタに対して順番に<<.op :cascade>>で評価されます。<<.op :cascade>>の内部で何が起こっているかを理解しやすくするために、次の表では、[[mapフィルタランプレフィックス|Map Filter Run Prefix]]を使用して、各フィルタの結果を示しています。
+
+|^<<.operator-example c1.1 "cat can bat bug :map[prefix[ca]then[ca]]">>|^<<.operator-example c1.2 "cat can bat bug :map[suffix[at]then[at]]">>|^<<.operator-example c1.3 "cat can bat bug :map[[other]]">>|
+
+上記の3つの例で"Try it"をクリックします。<<.op :cascade>>を使用すると、各行の左から右に読み取られた最初の空白以外の値が返されます。最終結果を確認するには、下の"Try it"をクリックします。
+
+<<.operator-example c1.4 "cat can bat bug :cascade[{!!filter1}append{!!filter2}append{!!filter3}]">>
\ No newline at end of file
diff --git a/editions/ja-JP/tiddlers/filters/syntax/Cascade Filter Run Prefix.tid b/editions/ja-JP/tiddlers/filters/syntax/Cascade Filter Run Prefix.tid
new file mode 100644
index 0000000000..aeaeca3265
--- /dev/null
+++ b/editions/ja-JP/tiddlers/filters/syntax/Cascade Filter Run Prefix.tid
@@ -0,0 +1,27 @@
+created: 20211130114043280
+from-version: 5.2.1
+modified: 20250305112707026
+original-modified: 20230710073343947
+rp-input: これまでのすべてのランのフィルタアウトプット
+rp-output: このフィルタランによって返されるフィルタによって変更されたインプットタイトル
+rp-purpose: フィルターのリストを順に評価し、最初の結果を適用してインプットタイトルを変更
+tags: [[Named Filter Run Prefix]]
+title: Cascade Filter Run Prefix
+ja-title: cascadeフィルタランプレフィックス
+type: text/vnd.tiddlywiki
+
+<$railroad text="""
+\start none
+\end none
+( ":cascade" | - )
+[["ラン"|"Filter Run"]]
+"""/>
+
+この[[フィルタラン|Filter Run]]の[[フィルタ式|Filter Expression]]が評価され、フィルタのリストが返されます。次に、各インプットタイトルが各フィルタに対して順番に評価され、インプットタイトルは空でないリストを返す最初のフィルタの最初の結果に置き換えられます。どのフィルタもインプットタイトルの結果を返さない場合は、空の文字列に置き換えられます。
+
+フィルタラン内では、次の変数を使用できます:
+
+* <<.var currentTiddler>> - インプットタイトル
+* <<.var ..currentTiddler>> - フィルタラン外の変数<<.var currentTiddler>>の値。
+
+[[cascadeフィルタランプレフィックス (例)|Cascade Filter Run Prefix (Examples)]]
diff --git a/editions/ja-JP/tiddlers/filters/syntax/Else Filter Run Prefix.tid b/editions/ja-JP/tiddlers/filters/syntax/Else Filter Run Prefix.tid
new file mode 100644
index 0000000000..1ea57814d9
--- /dev/null
+++ b/editions/ja-JP/tiddlers/filters/syntax/Else Filter Run Prefix.tid
@@ -0,0 +1,22 @@
+created: 20230318142408662
+from-version: 5.1.23
+modified: 20250312102737003
+original-modified: 20230322140756821
+rp-input: 前のフィルタランからのすべてのタイトル
+rp-output: これまでのフィルタアウトプットが空のリストの場合、ランのアウトプットタイトルがフィルタアウトプットに[[追加|Dominant Append]]されます<br>これまでのフィルタアウトプットが空のリストでない場合、ランは無視されます
+rp-purpose: フィルタランは、これまでのすべてのランのフィルタアウトプットが空のリストである場合にのみ評価されます
+tags: [[Named Filter Run Prefix]]
+title: Else Filter Run Prefix
+ja-title: elseフィルタランプレフィックス
+type: text/vnd.tiddlywiki
+
+<$railroad text="""
+\start none
+\end none
+( ":else" | - )
+[[run|"Filter Run"]]
+"""/>
+
+このプレフィックスには[[ショートカットフィルタランプレフィックス|Shortcut Filter Run Prefix]] シンボル`~run`があります
+
+参照: [[thenフィルタランプレフィックス|Then Filter Run Prefix]] | [[thenオペレータ|then Operator]] と [[elseオペレータ|else Operator]]
diff --git a/editions/ja-JP/tiddlers/filters/syntax/Except Filter Run Prefix.tid b/editions/ja-JP/tiddlers/filters/syntax/Except Filter Run Prefix.tid
new file mode 100644
index 0000000000..58a6bdda8c
--- /dev/null
+++ b/editions/ja-JP/tiddlers/filters/syntax/Except Filter Run Prefix.tid
@@ -0,0 +1,20 @@
+created: 20230318142056008
+from-version: 5.1.23
+modified: 20250312104032308
+original-modified: 20230322140643066
+rp-input: 前のフィルタランからのすべてのタイトル
+rp-output: アウトプットタイトルはフィルタのアウトプットから取り除かれます（そのようなTiddlerが存在する場合）
+rp-purpose: このフィルタランのアウトプットタイトルが前のフィルタランのアウトプットに含まれている場合は取り除かれ、含まれていない場合は無視されます
+tags: [[Named Filter Run Prefix]]
+title: Except Filter Run Prefix
+ja-title: exceptフィルタランプレフィックス
+type: text/vnd.tiddlywiki
+
+<$railroad text="""
+\start none
+\end none
+( ":except" | - )
+[[run|"Filter Run"]]
+"""/>
+
+このプレフィックスには[[ショートカットフィルタランプレフィックス|Shortcut Filter Run Prefix]]シンボル`-run`があります
\ No newline at end of file
diff --git a/editions/ja-JP/tiddlers/filters/syntax/Filter Expression.tid b/editions/ja-JP/tiddlers/filters/syntax/Filter Expression.tid
new file mode 100644
index 0000000000..8b2dbc7ffc
--- /dev/null
+++ b/editions/ja-JP/tiddlers/filters/syntax/Filter Expression.tid
@@ -0,0 +1,23 @@
+created: 20150124182421000
+modified: 20250219114110986
+original-modified: 20230710074507466
+tags: [[Filter Syntax]]
+title: Filter Expression
+ja-title: フィルタ式
+type: text/vnd.tiddlywiki
+
+<<.def "フィルタ式">>は、[[フィルタのシンタックス|Filter Syntax]]の最も外側のレベルです。これは、[[フィルタランプレフィックス|Filter Run Prefix]]を備えた [[フィルタラン|Filter Run]]で構成されます。複数のフィルタ実行は[[ホワイトスペース|Filter Whitespace]]で区切られます。
+
+<$railroad text="""
+{ (
+ - |
+ : [[<"プレフィックス">|"Filter Run Prefix"]]
+ )
+ [["ラン"|"Filter Run"]]
+ + [["ホワイトスペース"|"Filter Whitespace"]]
+}
+"""/>
+
+<<.tip """上に示したように、図に開始線と終了線が1つある場合は、リンクされた上位レベルにさらに情報があることを意味します。パンくずリストはナビゲーションに使用できます""">>
+
+<<.tip """下位レベルで使用されているように、図に開始点と終了点がない場合は、読みやすさと単純さを高めるために、上位レベルのシンタックス要素が削除されていることを意味します。パンくずリストはナビゲーションに使用できます""">>
diff --git a/editions/ja-JP/tiddlers/filters/syntax/Filter Filter Run Prefix (Examples).tid b/editions/ja-JP/tiddlers/filters/syntax/Filter Filter Run Prefix (Examples).tid
new file mode 100644
index 0000000000..47d2129fda
--- /dev/null
+++ b/editions/ja-JP/tiddlers/filters/syntax/Filter Filter Run Prefix (Examples).tid
@@ -0,0 +1,33 @@
+created: 20211129022707404
+modified: 20250314105437481
+original-modified: 20230305125338118
+tags: [[Filter Filter Run Prefix]]
+title: Filter Filter Run Prefix (Examples)
+ja-title: filterフィルタランプレフィックス(例)
+type: text/vnd.tiddlywiki
+
+<<.operator-example 1 "[tag[HelloThere]] :filter[get[text]length[]compare:integer:gteq[1000]]">>
+<<.operator-example 2 "[tag[HelloThere]] :filter[get[text]length[]compare:integer:lteq[2000]]">>
+<<.operator-example 3 "[tag[HelloThere]] :filter[get[text]length[]compare:integer:gteq[1000]] :filter[get[text]length[]compare:integer:lteq[2000]]">>
+<<.operator-example 4 "[tag[Features]] :filter[links[]!is[shadow]is[missing]]">>
+
+<<.operator-example 5 "A B C D E F :filter[<index>remainder[2]compare:integer:eq[0]]" "インプットリストの要素を1つおきに返す">>
+
+
+<<.operator-example 6 "[tag[shopping]] :filter[{!!quantity}compare:integer:gt[4]] :map[addprefix[ ]addprefix{!!quantity}]">>
+<<.operator-example 7 "[tag[shopping]] :filter[{!!quantity}compare:integer:lteq[4]] :map[addprefix[ ]addprefix{!!quantity}]">>
+
+!! フィルタランプレフィックス`:filter`と`:and`/`+`の比較
+
+<<.op :filter>>フィルタランプレフィックスの機能は、<<.op :and>>プレフィックス(エイリアス<<.op +>>)と一部重複しています。上記のフィルタ式にはすべて、次の2 つのプロパティがあることに注意してください:
+
+# フィルタ式の先頭では、インプットタイトル(つまり、`get[text]length[]`、`links[]`、`<index>remainder[2]`、`{!!quantity}`)が変換されます。
+# フィルタ式の最後では、インプット項目が何らかの条件(つまり`compare`、`is`)を満たす場合にのみアウトプットに送信されます。
+
+<<.op :filter>>プレフィックスの目的はプロパティ#1によってインプットタイトルが変換されるにもかかわらず、元のインプットタイトルを返すことです。こうすることで、"何らかの条件を満たす"チェックを元のインプット以外のものに対して実行できます。一部のフィルタ式でプロパティ#1が必要ない場合は、代わりに<<.op :and>>プレフィックスを使用できます。
+
+| <<.op :filter>> | <<.op :and>> |
+|^<<.operator-example c1.1 "[tag[HelloThere]] :filter[get[text]length[]compare:integer:gteq[1000]]">>|^<<.operator-example c1.2 "[tag[HelloThere]] :and[get[text]length[]compare:integer:gteq[1000]]">>|
+|^<<.operator-example c2.1 "[tag[Features]] :filter[links[]!is[shadow]is[missing]]">>|^<<.operator-example c2.2 "[tag[Features]] :and[links[]!is[shadow]is[missing]]">>|
+|!結果は同じ|<|
+|^<<.operator-example c3.1 "cat can bat bug :filter[suffix[at]minlength[3]]">>|^<<.operator-example c3.2 "cat can bat bug :and[suffix[at]minlength[3]]">>|
\ No newline at end of file
diff --git a/editions/ja-JP/tiddlers/filters/syntax/Filter Filter Run Prefix.tid b/editions/ja-JP/tiddlers/filters/syntax/Filter Filter Run Prefix.tid
new file mode 100644
index 0000000000..b98e7b9d4e
--- /dev/null
+++ b/editions/ja-JP/tiddlers/filters/syntax/Filter Filter Run Prefix.tid
@@ -0,0 +1,34 @@
+created: 20211129022455873
+from-version: 5.1.23
+modified: 20250314105047035
+original-modified: 20230710073334078
+rp-input: これまでのすべてのランのフィルタアウトプット
+rp-output: フィルタランが空でないインプットタイトル
+rp-purpose: フィルタランアウトプットが空のリストであるすべてのインプットタイトルを除外
+tags: [[Named Filter Run Prefix]]
+title: Filter Filter Run Prefix
+ja-title: filterフィルタランプレフィックス
+type: text/vnd.tiddlywiki
+
+<$railroad text="""
+\start none
+\end none
+( ":filter" | - )
+[["ラン"|"Filter Run"]]
+"""/>
+
+これまでのフィルタアウトプットをインプットとして受け取ります。次のランはインプットの各タイトルに対して評価され、アウトプットが空のリストであるすべてのインプットタイトルが除かれます。
+
+フィルタラン内では、<<.var currentTiddler>>変数は処理中のTiddlerのタイトルに設定されていることに注意してください。これにより、`:filter[{!!price}multiply{!!cost}compare:integer:gteq[5]]`のようなフィルタランを計算に使用できるようになります。ラン外のcurrentTiddlerの値は、<<.var ..currentTiddler>>変数で使用できます。
+
+フィルターラン内では、次の変数を使用できます:
+
+* <<.var currentTiddler>> - インプットタイトル
+* <<.var ..currentTiddler>> - フィルタラン外の変数`currentTiddler`の値。
+* <<.var index>> - <<.from-version "5.2.1">> 現在のリスト項目の数値インデックス(リストの最初の項目はゼロです)。
+* <<.var revIndex>> - <<.from-version "5.2.1">> 現在のリスト項目の逆数値インデックス(リストの最後の項目はゼロです)。
+* <<.var length>> - <<.from-version "5.2.1">> インプットリストの長さの合計。
+
+<<.tip "名前付きフィルタランプレフィックス`:filter`を、この演算子は、すべてのインプットタイトルにサブフィルタを適用し、サブフィルタから空の結果を返すタイトルを除外する[[filterオペレータ|filter Operator]]と比べてください。">>
+
+[[filterフィルタランプレフィックス(例)|Filter Filter Run Prefix (Examples)]]
diff --git a/editions/ja-JP/tiddlers/filters/syntax/Filter Parameter.tid b/editions/ja-JP/tiddlers/filters/syntax/Filter Parameter.tid
new file mode 100644
index 0000000000..5b5bf953a7
--- /dev/null
+++ b/editions/ja-JP/tiddlers/filters/syntax/Filter Parameter.tid
@@ -0,0 +1,40 @@
+created: 20150220152540000
+modified: 20250223102930110
+original-modified: 20240708202234843
+tags: [[Filter Step]]
+title: Filter Parameter
+ja-title: フィルタパラメータ
+type: text/vnd.tiddlywiki
+
+<$railroad text="""
+\start none
+\end none
+( "[" [: <-"ハード"-> /"]以外"/] "]"
+ |
+ "{" [: <-"間接"-> /"}以外"/] "}"
+ |
+ "<" [: <-"変数"-> /">以外"/] ">"
+)
+"""/>
+
+[[フィルタオペレータ|Filter Operators]]のパラメーターは次のようになります:
+
+;<<.def ハード>>
+: `[パラメータ例]`
+: パラメータは、角括弧内のテキストそのものです。
+;<<.def ソフト>>
+: <<.def 間接>>
+:: `{パラメータ例}`
+:: パラメータは、中括弧内の名前の[[テキスト参照|TextReference]]によって示されるテキスト、つまり、指定されたTiddlerの[[フィールド|TiddlerFields]]、または指定された[[データTiddler|DataTiddlers]]のプロパティの値です。
+: <<.def 変数>>
+:: `<パラメータ例>`
+:: パラメータは、山括弧内の[[変数|Variables]]の現在値です。マクロパラメータは、v5.2.0まではサポートされて<<.em いません>>。
+::<<.from-version "5.2.0">> リテラルマクロパラメータがサポートされています。例: `[<now [UTC]YYYY0MM0DD0hh0mm0ssXXX>]`。
+
+<<.note """すべての[[フィルタオペレータ|filter Operator]]の後にはパラメータ式が続く必要があります。[[パラメータの無いオペレータ|Operators without parameters]]の場合、その式は空になります(`[<currentTiddler>links[]]`のフィルタオペレータ<<.olink links>>と同様)。""">>
+
+---
+
+<<.from-version "5.1.23">> [[フィルタステップ|Filter Step]]では、`,`文字で区切られた複数のパラメータがサポートされます。
+
+例えば: `[param1],[param2]`や`<param1>,{param2}`
diff --git a/editions/ja-JP/tiddlers/filters/syntax/Filter Run Prefix.tid b/editions/ja-JP/tiddlers/filters/syntax/Filter Run Prefix.tid
new file mode 100644
index 0000000000..54e79a2594
--- /dev/null
+++ b/editions/ja-JP/tiddlers/filters/syntax/Filter Run Prefix.tid
@@ -0,0 +1,21 @@
+created: 20230305130600148
+modified: 20250223105142349
+original-modified: 20230711090913687
+tags: [[Filter Expression]]
+title: Filter Run Prefix
+ja-title: フィルタランプレフィックス
+type: text/vnd.tiddlywiki
+
+There are 2 types of filter run prefixes that are interchangeable; [[named prefixes|Named Filter Run Prefix]] and [[shortcut prefixes|Shortcut Filter Run Prefix]].
+交換可能なフィルタランプレフィックスには、[[名前付きプレフィックス|Named Filter Run Prefix]]と[[ショートカットプレフィックス|Shortcut Filter Run Prefix]]の2種類があります。
+
+<$railroad text="""
+\start none
+\end none
+(
+ - |
+: [[<":名前付きプレフィクス"> /"v5.1.23以降"/ |"Named Filter Run Prefix"]] |
+ [[<"ショートカットプレフィックス"> /"v5.1.23以前"/ |"Shortcut Filter Run Prefix"]]
+)
+[[<"ラン">|"Filter Run"]]
+"""/>
diff --git a/editions/ja-JP/tiddlers/filters/syntax/Filter Run.tid b/editions/ja-JP/tiddlers/filters/syntax/Filter Run.tid
new file mode 100644
index 0000000000..00470a5dcf
--- /dev/null
+++ b/editions/ja-JP/tiddlers/filters/syntax/Filter Run.tid
@@ -0,0 +1,29 @@
+created: 20150124182117000
+modified: 20250220111652831
+original-modified: 20230710074357002
+tags: [[Filter Expression]]
+title: Filter Run
+ja-title: フィルタラン
+type: text/vnd.tiddlywiki
+
+<$railroad text="""
+\start none
+\end none
+( "[" { [[<"フィルタステップ">|"Filter Step"]] } "]"
+ |
+ [:{/"[ ]または空白以外の文字"/}]
+ |
+ '"' [:{/'"以外の文字'/}] '"'
+ |
+ "'" [:{/"'以外の文字"/}] "'"
+)
+"""/>
+
+<<.def ラン>>は[[ステップ|Filter Step]]で構成され、より大きな[[フィルタ式|Filter Expression]]に貢献する[[選択|Title Selection]]を出力します。
+
+ステップは左から右に処理されます。最初のステップへのインプットはランへのインプットと同じです。後続の各ステップのインプットは、前のステップのアウトプットです。
+
+
+図の下の3つのオプションは`HelloThere`、`"HelloThere"`、`'HelloThere'`と`"Filter Operators"`の構文と一致します。これらは`[title[...]]`の短縮形です。
+
+引用符で囲まれたオプションは、`"An [[[[Unusual]]]] Tiddler"`のように角括弧を含むタイトルをサポートするために存在します。
diff --git a/editions/ja-JP/tiddlers/filters/syntax/Filter Step.tid b/editions/ja-JP/tiddlers/filters/syntax/Filter Step.tid
new file mode 100644
index 0000000000..0c81c7c250
--- /dev/null
+++ b/editions/ja-JP/tiddlers/filters/syntax/Filter Step.tid
@@ -0,0 +1,37 @@
+created: 20150124182127000
+modified: 20250222110925130
+original-modified: 20230710074414361
+tags: [[Filter Run]]
+title: Filter Step
+ja-title: フィルタステップ
+type: text/vnd.tiddlywiki
+
+<<.def "フィルタステップ">>は、<<.def "フィルタラン">>内の単一の操作を表します。
+
+プログラミング用語では、ステップのインプットがパラメータとして渡される関数呼び出しに似ています。ステップのアウトプットは、[[フィルタラン|Filter Run]]、つまりそれを含む[[フィルタ式|Filter Expression]]全体に貢献する[[タイトルセレクション|Title Selection]]です。
+
+<$railroad text="""
+\start none
+\end none
+[:"!"]
+( / "省略の場合のデフォルト: title" /|:
+( - | :[[<"オペレータ">|"Filter Operators"]] )
+{ [:":" [[<"サフィックス">|"Filter Operators"]] ] } )
+{ [[<"パラメータ">|"Filter Parameter"]] + "," }
+"""/>
+
+ステップの<<.def オペレータ>>は、[[フィルタオペレータ|Filter Operators]]として知られている定義済みキーワードのリストです。
+
+多くのステップでは、ステップの実行内容をさらに定義する明示的な<<.def パラメータ>>が必要です。
+
+<<.def サフィックス>>は、特定のオペレータの意味を拡張する追加テキスト(多くの場合、[[フィールド|TiddlerFields]]名)です。
+
+ステップの<<.def オペレータ>>と<<.def サフィックス>>がすべて省略されている場合は、デフォルトで[[title|title Operator]]オペレータが使用されます。
+
+<<.from-version "5.1.23">> いくつかのステップでは、`,`文字で区切られた複数の<<.def パラメータ>>を受け入れます。
+
+認識されないオペレータは、<<.olink field>>オペレータのサフィックスであるかのように扱われます。
+
+フィルタオペレータはプラグインによって拡張できます。
+
+{{Selection Constructors}}
diff --git a/editions/ja-JP/tiddlers/filters/syntax/Filter Syntax.tid b/editions/ja-JP/tiddlers/filters/syntax/Filter Syntax.tid
new file mode 100644
index 0000000000..5d29f60130
--- /dev/null
+++ b/editions/ja-JP/tiddlers/filters/syntax/Filter Syntax.tid
@@ -0,0 +1,26 @@
+created: 20140210141217955
+list: [[Filter Expression]] [[Filter Run]] [[Filter Step]] [[Filter Parameter]] [[Filter Whitespace]]
+modified: 20250219112710650
+original-modified: 20230710074340943
+tags: Filters
+title: Filter Syntax
+ja-title: フィルタのシンタックス
+type: text/vnd.tiddlywiki
+
+<<.preamble """[[フィルタ|Filters]]は、正式な構文の説明が役立つと思われる人向けに、[[Railroadダイアグラム|Railroad Diagrams]]を使用して示されている文法に従います。ただし、このグループのTiddlerを理解していなくても、[[フィルタの書き方を学ぶ|Introduction to filter notation]]ことができます""">>
+
+<<.def フィルタ>>は、<<.def インプット>>を<<.def アウトプット>>に変換するためのパイプラインです。インプットとアウトプットはどちらも、Tiddlerとフィールドの[[タイトルの順序付き集合|Title Selection]]です
+
+フィルタは、''ラン''と呼ばれる小さな構成要素から構成される''式''であり、''ラン''は''ステップ''を使用して構築されます。それぞれがインプットをアウトプットに変換します
+
+フィルタは空のアウトプットから始まります。その実行は左から右に処理され、アウトプットが徐々に修正されます。
+
+"フィルタのシンタックス"の記述は次で始まります:
+
+<$railroad text="""
+\start double
+\end double
+[[<"フィルタ式">|"Filter Expression"]]
+"""/>
+
+<<.tip "上記のようなRailroadボックスを使用して移動できます。">>
\ No newline at end of file
diff --git a/editions/ja-JP/tiddlers/filters/syntax/Filter Whitespace.tid b/editions/ja-JP/tiddlers/filters/syntax/Filter Whitespace.tid
new file mode 100644
index 0000000000..e478a19f3a
--- /dev/null
+++ b/editions/ja-JP/tiddlers/filters/syntax/Filter Whitespace.tid
@@ -0,0 +1,15 @@
+created: 20150124182304000
+modified: 20250510104756224
+original-modified: 20230710074447240
+tags: [[Filter Expression]]
+title: Filter Whitespace
+ja-title: フィルタホワイトスペース
+type: text/vnd.tiddlywiki
+
+<$railroad text="""
+\start none
+\end none
+{( "スペース" | "タブ" | "ラインフィード" | "リターン" | "垂直タブ" | "改ページ" )}
+"""/>
+
+[[フィルタ式|Filter Expression]]の各ランの間にはホワイトスペース文字が出現します。
\ No newline at end of file
diff --git a/editions/ja-JP/tiddlers/filters/syntax/Interchangeable Filter Run Prefixes.tid b/editions/ja-JP/tiddlers/filters/syntax/Interchangeable Filter Run Prefixes.tid
new file mode 100644
index 0000000000..d1eda102ef
--- /dev/null
+++ b/editions/ja-JP/tiddlers/filters/syntax/Interchangeable Filter Run Prefixes.tid
@@ -0,0 +1,47 @@
+created: 20230316151518640
+modified: 20250225113139787
+original-modified: 20230327130626715
+tags: [[Filter Run Prefix]]
+title: Interchangeable Filter Run Prefixes
+ja-title: 交換可能なフィルターランプレフィックス
+type: text/vnd.tiddlywiki
+
+!! 交換可能なフィルターランプレフィックス
+
+技術的/論理的な用語で言えば：
+
+|!ラン |!同等の名前付きプレフィックス |!解釈 |!アウトプット |
+|`[run]` |`:or[run]` |重複を排除した和集合 |... OR ラン |
+|`+[run]` |`:and[run]` |フィルタステップの蓄積 |... AND ラン |
+|`-[run]` |`:except[run]` |差集合 |... AND NOT ラン |
+|`~[run]` |`:else[run]` |それ以外 |... ELSE ラン |
+|`=[run]` |`:all[run]` |重複を排除しない和集合 |... OR ラン |
+
+ランのインプットは通常、Wiki内の[[隠し|ShadowTiddlers]]Tiddler以外のすべてのTiddlerタイトルのリストです(順不同)。<br>ただし、`+`プレフィックスによってこれを変更できます:
+
+|プレフィックス|インプット|h
+|`-`, `~`, `=`, `:intersection` あるいは、無し| 最初の[[フィルタオペレータ|Filter Operators]]によって特に指定されない限り、<$link to="all Operator">`[all[]]`</$link> Tiddlerのタイトル|
+|`+`, `:filter`, `:map`, `:reduce`,`:sort` |これまでのすべてのランのフィルタアウトプット|
+
+インプットが変化するため、`-`と`+`の両方のプレフィックスが互いに逆の動作をしないことに注意してください。
+
+たとえば、次の2つの例では、`$:/baz`は実際に存在する場合にのみ削除されます:
+
+* <$link to="is Operator"> `foo bar $:/baz -[is[system]]`</$link>
+* <$link to="prefix Operator">`foo bar $:/baz -[prefix[$:/]]`</$link>
+
+理由を理解するには、両方の最後のランのインプットとその`-`プレフィックスを考慮してください。
+
+存在するかどうかに関係なく、`$:/baz`を削除するには、[[否定のフィルタオペレータ|Filter Operators]]とともに`+`プレフィックスを使用するだけです:
+
+* <$link to="is Operator">`foo bar $:/baz +[!is[system]]`</$link>
+* <$link to="prefix Operator">`foo bar $:/baz +[!prefix[$:/]]`</$link>
+
+!! +と和集合の違い
+
+`+`と`:intersection`の違いについては[[和集合フィルタランプレフィックス(例)|Intersection Filter Run Prefix (Examples)]]を参照してください。
+
+!! 開発者向け
+
+新しいフィルタランプレフィックスを作成するには、`filterrunprefix`の[[モジュールタイプ|ModuleType]]で
+[[Javascriptモジュール|Modules]]を作成します。
diff --git a/editions/ja-JP/tiddlers/filters/syntax/Intersection Filter Run Prefix (Examples).tid b/editions/ja-JP/tiddlers/filters/syntax/Intersection Filter Run Prefix (Examples).tid
new file mode 100644
index 0000000000..851d2ad2e4
--- /dev/null
+++ b/editions/ja-JP/tiddlers/filters/syntax/Intersection Filter Run Prefix (Examples).tid
@@ -0,0 +1,38 @@
+created: 20211128212902292
+modified: 20250319104544220
+original-modified: 20230305125354209
+tags: [[Intersection Filter Run Prefix]]
+title: Intersection Filter Run Prefix (Examples)
+ja-title: intersectionフィルタランプレフィックス(例)
+type: text/vnd.tiddlywiki
+
+<<.operator-example 1 "A B C D :intersection[enlist[C D E F]]">>
+
+<<.operator-example 2 "A B C D :intersection[enlist[A B C D]]">>
+
+<<.operator-example 3 "A B C D :intersection[enlist[E F G H]]">>
+
+<<.operator-example 4 ":intersection[enlist[A B C D]]" "最初のフィルタランでintersectionを使用することはあまり役に立ちません。結果は常に空になります。">>
+
+!! `+`と`:intersection`の違い
+
+プレフィックス`+`は、形式論理における"AND"として考えてください。たとえば、"条件A ''かつ'' 条件Bを満たすすべてのタイトルを取得する"などです。ただし、すべてのケースに適しているわけではありません。条件Bがインプットを置き換えるフィルタオペレータを使用する場合、プレフィックス`+`の使用は難しくなります。たとえば、2つのTiddlerに共通するタグを見つけたい場合は、次のようなフィルタ式を記述します:
+
+* <$link to="tags Operator">`[[field Operator]tags[]] +[[compare Operator]tags[]]`</$link>
+
+しかし、これは機能しません。2回目のフィルタランでインプットが破棄され、単一のtitle`[[compare Operator]]`で構成されるインプットに置き換えられるからです。そのため、このフィルタ式から得られる結果は、`compare Operator`Tiddlerのタグだけになります。
+
+このような場合、必要なのは`:intersection`プレフィックスです。これまでのフィルタアウトプットを取得して、//保留し//、すべてのTiddlerタイトルをインプットとして次のフィルタランを開始します。その後、最新のフィルタランが完了すると、最新のアウトプットを取得して保留していたアウトプットと比較し、保留していたアウトプットと最新のアウトプットの両方に表示されたタイトルのみを含む新しいアウトプットを生成します。したがって、`field Operator`と`compare Operator`に共通するタグのみを取得するには、次のようなフィルタ式を記述します。
+
+* <$link to="tags Operator">`[[field Operator]tags[]] :intersection[[compare Operator]tags[]]`</$link>
+
+次の例では、[[field Operator]]と[[compare Operator]]を使用して、Tiddlerとそれぞれのタグを比較します。
+
+<<.operator-example 5 "[[field Operator]tags[]]">>
+<<.operator-example 6 "[[compare Operator]tags[]]">>
+
+<<.operator-example 7 "[[field Operator]tags[]] +[[compare Operator]tags[]]" """"field Operator"Tiddlerのタグは失われるため、"compare Operator"Tiddlerのタグのみが返されます""">>
+
+<<.operator-example 8 "[[field Operator]tags[]] :intersection[[compare Operator]tags[]]" """両方のTiddlerに共通するタグを返します""">>
+
+
diff --git a/editions/ja-JP/tiddlers/filters/syntax/Intersection Filter Run Prefix.tid b/editions/ja-JP/tiddlers/filters/syntax/Intersection Filter Run Prefix.tid
new file mode 100644
index 0000000000..61872df3c3
--- /dev/null
+++ b/editions/ja-JP/tiddlers/filters/syntax/Intersection Filter Run Prefix.tid
@@ -0,0 +1,22 @@
+created: 20211128212902292
+from-version: 5.1.23
+modified: 20250317105829721
+original-modified: 20230710073322863
+rp-input: 前のフィルタランからのすべてのタイトル
+rp-output: このフィルタランの結果と前のランのアウトプットの両方に存在するタイトル
+rp-purpose: 前のランからのタイトルとこのフィルタのタイトルの共通部分を見つける
+tags: [[Named Filter Run Prefix]]
+title: Intersection Filter Run Prefix
+ja-title: intersectionフィルタランプレフィックス
+type: text/vnd.tiddlywiki
+
+<$railroad text="""
+\start none
+\end none
+( ":intersection" | - )
+[["ラン"|"Filter Run"]]
+"""/>
+
+前のランからのフィルタアウトプットは保留されます。`:intersection`フィルタランは、すべてのTiddlerタイトルをインプットとして開始されます。この最後のフィルタランが完了すると、最後のアウトプットが保留アウトプットと比較されます。保留アウトプットと最新アウトプットの両方に表われるタイトルのみを含む新しいアウトプットが生成されます。
+
+[[intersectionフィルタランプレフィックス(例)|Intersection Filter Run Prefix (Examples)]]
diff --git a/editions/ja-JP/tiddlers/filters/syntax/Map Filter Run Prefix (Examples).tid b/editions/ja-JP/tiddlers/filters/syntax/Map Filter Run Prefix (Examples).tid
new file mode 100644
index 0000000000..4132486df4
--- /dev/null
+++ b/editions/ja-JP/tiddlers/filters/syntax/Map Filter Run Prefix (Examples).tid
@@ -0,0 +1,60 @@
+created: 20210618134753828
+modified: 20250416110748088
+original-modified: 20230305125405422
+tags: [[Map Filter Run Prefix]]
+title: Map Filter Run Prefix (Examples)
+ja-title: mapフィルタランプレフィックス(例)
+type: text/vnd.tiddlywiki
+
+インプットタイトルが存在する場合はキャプションフィールドで置き換え、存在しない場合はインプットタイトルを保持します:
+
+<<.operator-example 1 "[tag[Widgets]] :map[get[caption]else{!!title}]">>
+
+<<.tip "上記の例は`[tag[Widgets]] :map[{!!caption}!is[blank]else{!!title}]`と同等です。フィールドを`{!!caption}`のようにテキスト参照として参照する場合、存在しない、または空のキャプションフィールドに対しては空文字列が返されることに注意してください。したがって、`else`オペレータの前に`is[blank]`のチェックが必要です。">>
+
+買い物リストの各タイトルについて、各アイテムの購入にかかる合計コストを計算します:
+
+<<.operator-example 2 "[tag[shopping]] :map[get[quantity]else[0]multiply{!!price}]">>
+
+`Widget:`でタグ付けされたすべてのTiddlerのタグを取得します:
+
+<<.operator-example 3 "[tag[Widgets]] :map:flat[tagging[]] :and[!is[blank]unique[]]">>
+<<.tip "`flat`サフィックスがない場合、`:map`フィルタランは各インプットタイトルの最初の結果のみを返します">>
+
+!! `:map`の`flat`サフィックスの有無の比較
+
+`:map`フィルタランは、少なくともインプットと同じ数のアウトプットを返します。デフォルトでは、1つのインプット項目に対して1つのアウトプット項目が生成されます。フィルタランによってインプット項目が空の結果に変換された場合、その項目のアウトプットは空の文字列になります。フィルタランによってインプット項目が複数の項目に変換された場合、アウトプットには最初の項目のみが表われます。この動作は、`flat`サフィックスを指定することで上書きできます。`flat`サフィックスを指定すると、すべての項目がアウトプットに表れます。
+
+| `:map` | `:map:flat` |
+|^<<.operator-example m0.1 "[range[4]] :map[match[this matches nothing]]">>|^<<.operator-example m0.2 "[range[4]] :map:flat[match[this matches nothing]]">>|
+|^<<.operator-example m1.1 "[range[4]] :map[range<currentTiddler>]">>|^<<.operator-example m1.2 "[range[4]] :map:flat[range<currentTiddler>]">>|
+|^<<.operator-example m2.1 "[range[4]] :map[range<currentTiddler>]">>|^<<.operator-example m2.2 "[range[4]] :map:flat[range<currentTiddler>first[]]">>|
+|^<<.operator-example m3.1 "[range[4]] :map[range<currentTiddler>sum[]]">>|^<<.operator-example m3.2 "[range[4]] :map:flat[range<currentTiddler>sum[]]">>|
+|^<<.operator-example m4.1 "[[1,2,3]] [[4,5]] :map[split[,]]">>|^<<.operator-example m4.2 "[[1,2,3]] [[4,5]] :map:flat[split[,]]">>|
+|^<<.operator-example m5.1 "[[1,2,3]] [[4,5]] :map[split[,]]">>|^<<.operator-example m5.2 "[[1,2,3]] [[4,5]] :map:flat[split[,]first[]]">>|
+
+
+!! `:map`と`:and`/`+`フィルタランプレフィックスの比較
+
+`:map`フィルタランプレフィックスの機能は、`:and` プレフィックス(別名`+`)と一部重複しています。これらは同じ結果を返す場合もありますが、少なくとも以下の場合には結果が異なります:
+
+# `:and`フィルタランによってアイテム数が変更される(増加や減少)場合があります。`:map`フィルタランによってアイテム数が変更されることはありません。
+# `:and`フィルタランのアイテム数は、[[重複排除|Dominant Append]]により減少します。`:map`ランは[[重複排除|Dominant Append]]は行われません。
+# "currentTiddler"変数への明示的な参照は異なる動作をします
+# TextReferenceを使用した"currentTiddler"への暗黙的な参照は異なる動作をします。
+
+| `:map` | `:and` |
+|!結果は同じ|<|
+|^<<.operator-example 1.1 "[range[5]] :map[add[1]]">>|^<<.operator-example 1.2 "[range[5]] :and[add[1]]">>|
+|^<<.operator-example 2.1 "[range[5]] :map[addsuffix[ hello]]">>|^<<.operator-example 2.2 "[range[5]] :and[addsuffix[ hello]]">>|
+|^<<.operator-example 3.1 "[tag[shopping]] :map[get[quantity]]">>|^<<.operator-example 3.2 "[tag[shopping]] :and[get[quantity]]">>|
+|!項目数が減少|<|
+|^<<.operator-example 4.1 "[range[5]] :map[sum[]]">>|^<<.operator-example 4.2 "[range[5]] :and[sum[]]">>|
+|^<<.operator-example 5.1 "[range[5]] :map[join[,]]">>|^<<.operator-example 5.2 "[range[5]] :and[join[,]]">>|
+|!項目数が増加|<|
+|^<<.operator-example 6.1 "[[1,2,3]] [[4,5]] :map[split[,]]">>|^<<.operator-example 6.2 "[[1,2,3]] [[4,5]] :and[split[,]]">>|
+|!重複排除|<|
+|^<<.operator-example 7.1 "[range[5]] :map[[hello]]">>|^<<.operator-example 7.2 "[range[5]] :and[[hello]]">>|
+|!currentTiddler|<|
+|^<<.operator-example 8.1 "[tag[shopping]] :map[<currentTiddler>]">>|^<<.operator-example 8.2 "[tag[shopping]] :and[<currentTiddler>]">>|
+|^<<.operator-example 9.1 "[tag[shopping]] :map[{!!quantity}]">>|^<<.operator-example 9.2 "[tag[shopping]] :and[{!!quantity}]">>|
diff --git a/editions/ja-JP/tiddlers/filters/syntax/Map Filter Run Prefix.tid b/editions/ja-JP/tiddlers/filters/syntax/Map Filter Run Prefix.tid
new file mode 100644
index 0000000000..401a13a89d
--- /dev/null
+++ b/editions/ja-JP/tiddlers/filters/syntax/Map Filter Run Prefix.tid
@@ -0,0 +1,35 @@
+created: 20210618133745003
+from-version: 5.2.0
+modified: 20250319105451115
+original-modified: 20240312202834547
+rp-input: 前回までのすべてのランのフィルタアウトプット
+rp-output: このフィルタランの結果によって変更されたインプットタイトル
+rp-purpose: 各項目に対してこのフィルタを実行した結果に基づいてインプットタイトルを変更
+rp-suffix: <<.from-version "5.2.3">> フィルタランからすべての結果を返す場合は<<.value flat>>、最初の結果のみを返す場合は省略(デフォルト)
+tags: [[Named Filter Run Prefix]]
+title: Map Filter Run Prefix
+ja-title: mapフィルタランプレフィックス
+type: text/vnd.tiddlywiki
+
+<$railroad text="""
+\start none
+\end none
+( ":map" (: ":flat" | - ) | - )
+[["ラン"|"Filter Run"]]
+"""/>
+
+以前のランからの各インプットタイトルは、順番にこのランに渡されます。フィルタランはインプットタイトルを変換し、このランのアウトプットはインプットタイトルを置き換えます。たとえば、フィルタラン`[get[caption]else{!!title}]`は、タイトルが保持されるフィールドが存在しない場合以外、各インプットタイトルをそのキャプションフィールドに置き換えます。
+
+フィルタラン内では、<<.var currentTiddler>>変数は処理中のTiddlerのタイトルに設定されていることに注意してください。これにより、`:map[{!!price}multiply{!!cost}]`のようなフィルタランが計算に使用できるようになります。
+
+フィルタラン内では、次の変数を使用できます:
+
+* <<.var currentTiddler>> - インプットタイトル
+* <<.var ..currentTiddler>> - フィルタランの外での変数`currentTiddler`の値。
+* <<.var index>> - <<.from-version "5.2.1">> 現在のリスト項目の数値インデックス(リストの最初の項目はゼロ)。
+* <<.var revIndex>> - <<.from-version "5.2.1">> 現在のリスト項目の逆数値インデックス(リストの最後の項目はゼロ)。
+* <<.var length>> - <<.from-version "5.2.1">> インプットリストの合計の長さ。
+
+`:map`プレフィックス付きで使用されるフィルタランは、渡された項目と少なくとも同じ数の項目を返す必要があります。フィルタランがアウトプットを返さないインプットタイトルは、空の文字列に置き換えられます。特に、[[getオペレータ|get Operator]]を使用してフィールドの値を取得する場合は、[[elseオペレータ|else Operator]] を使用してフィールド値が欠落しないようにすると役立ちます。たとえば、`[get[myfield]else[default-value]...`のようにします。
+
+[[mapフィルタランプレフィックス(例)|Map Filter Run Prefix (Examples)]]
\ No newline at end of file
diff --git a/editions/ja-JP/tiddlers/filters/syntax/Named Filter Run Prefix.tid b/editions/ja-JP/tiddlers/filters/syntax/Named Filter Run Prefix.tid
new file mode 100644
index 0000000000..bb856eee44
--- /dev/null
+++ b/editions/ja-JP/tiddlers/filters/syntax/Named Filter Run Prefix.tid
@@ -0,0 +1,38 @@
+created: 20201214044413473
+modified: 20250227102948619
+original-modified: 20230711090833212
+tags: [[Filter Run Prefix]]
+title: Named Filter Run Prefix
+ja-title: 名前付きフィルタランプレフィックス
+type: text/vnd.tiddlywiki
+
+<<.from-version "5.1.23">>で、名前付きフィルタランプレフィックスが実装されました。図に示すように、`:cascade`、`:map`、`:sort`が後から追加されました。
+
+名前付きフィルタランプレフィックスは、[[ショートカットランプレフィックス|Shortcut Filter Run Prefix]]の代わりに、[[フィルタ式|Filter Expression]]の[[ラン|Filter Run]]の前に置くことができます。
+
+<$railroad text="""
+\start none
+\end none
+(
+[[<":all"> |"All Filter Run Prefix"]] |
+[[<":and"> |"And Filter Run Prefix"]] |
+[[<":cascade"> /"v5.2.1"/ |"Cascade Filter Run Prefix"]] |
+[[<":else"> |"Else Filter Run Prefix"]] |
+[[<":except"> |"Except Filter Run Prefix"]] |
+[[<":filter"> |"Filter Filter Run Prefix"]] |
+[[<":intersection"> |"Intersection Filter Run Prefix"]] |
+[[<":map"> /"v5.2.0"/ |"Map Filter Run Prefix"]] |
+[[<":or"> |"Or Filter Run Prefix"]] |
+[[<":reduce"> |"Reduce Filter Run Prefix"]] |
+[[<":sort"> /"v5.2.0"/ |"Sort Filter Run Prefix"]] |
+[[<":then"> /"v5.3.0"/ |"Then Filter Run Prefix"]]) [[run|"Filter Run"]]
+"""/>
+
+
+<<.tip "名前付きフィルタランプレフィックス`:filter`を、すべてのインプットタイトルにサブフィルタを適用し、サブフィルタから空の結果を返すタイトルを除外する[[filterオペレータ|filter Operator]]と比較します">>
+
+<<.tip "名前付きフィルタランプレフィックス`:reduce`を、サブフィルタを繰り返し適用してアイテムのリストを単一のアイテムに平坦化するために使用される[[reduceオペレータ|reduce Operator]]と比較します">>
+
+<<.tip """フィルタランプレフィックス`:reduce`、`:sort`、`:map`、`:filter`内では、変数<<.var currentTiddler>>は処理中のTiddlerのタイトルに設定されます。<br>サブフィルタ外のcurrentTiddlerの値は、変数<<.var "..currentTiddler">>で使用できます <<.from-version "5.2.0">>""" >>
+
+参照: [[交換可能なフィルターランプレフィックス|Interchangeable Filter Run Prefixes]]
diff --git a/editions/ja-JP/tiddlers/filters/syntax/Or Filter Run Prefix.tid b/editions/ja-JP/tiddlers/filters/syntax/Or Filter Run Prefix.tid
new file mode 100644
index 0000000000..5bb7928dae
--- /dev/null
+++ b/editions/ja-JP/tiddlers/filters/syntax/Or Filter Run Prefix.tid
@@ -0,0 +1,20 @@
+created: 20230318135743766
+from-version: 5.1.23
+modified: 20250417105150020
+original-modified: 20230322140708372
+rp-input: 前回のフィルタランからのすべてのタイトル
+rp-output: アウトプットタイトルは主に、前回のフィルタランのアウトプットに[[重複排除して追加|Dominant Append]]されます。
+rp-purpose: Tiddlerセットの重複排除した結合
+tags: [[Named Filter Run Prefix]]
+title: Or Filter Run Prefix
+ja-title: orフィルタランプレフィックス
+type: text/vnd.tiddlywiki
+
+<$railroad text="""
+\start none
+\end none
+( ":or" | - )
+[["ラン"|"Filter Run Prefix"]]
+"""/>
+
+:or プレフィックスはプレフィックスを全く使用しないのと同じです。[[フィルタランプレフィックスのショートカット|Shortcut Filter Run Prefix]]で`run`を参照してください
diff --git a/editions/ja-JP/tiddlers/filters/syntax/Reduce Filter Run Prefix (Examples).tid b/editions/ja-JP/tiddlers/filters/syntax/Reduce Filter Run Prefix (Examples).tid
new file mode 100644
index 0000000000..2e006b52a9
--- /dev/null
+++ b/editions/ja-JP/tiddlers/filters/syntax/Reduce Filter Run Prefix (Examples).tid
@@ -0,0 +1,29 @@
+created: 20211124151912931
+modified: 20250419111355942
+original-modified: 20230305125430544
+tags: [[Reduce Filter Run Prefix]]
+title: Reduce Filter Run Prefix (Examples)
+ja-title: reduceフィルタランプレフィックス(例)
+type: text/vnd.tiddlywiki
+
+\define multiply-input() [multiply<accumulator>]
+
+次の例では、これらのデータTiddlerを使用します:
+
+<ul>
+<$list filter="[tag[shopping]!has[draft.of]]">
+<li>
+''<$link><$text text=<<currentTiddler>>/></$link>'' quantity: <$text text={{!!quantity}}/>, price: <$text text={{!!price}}/>
+</li>
+</$list>
+</ul>
+
+<<.operator-example 1 "[tag[shopping]] :reduce[get[quantity]add<accumulator>]">>
+<<.operator-example 2 "[tag[shopping]] :reduce[get[price]multiply{!!quantity}add<accumulator>]">>
+<<.operator-example 3 "[tag[shopping]] :reduce[<index>compare:number:gt[0]then<accumulator>addsuffix[, ]addsuffix<currentTiddler>else<currentTiddler>]" "最初の項目に対して他の項目とは異なる動作をさせるために`<index>`を使用します。これはあくまでもデモンストレーションです。このタスクを実行するには、[[joinオペレータ|join Operator]]を使うのがよいです">>
+<<.operator-example 4 "[tag[non-existent]] :reduce[get[price]multiply{!!quantity}add<accumulator>]" "空のインプットは空のアウトプットを生成します">>
+<<.operator-example 5 "[tag[non-existent]] :reduce[get[price]multiply{!!quantity}add<accumulator>] :else[[0]]" "インプットが空の場合に確実にアウトプットするために`:else`使用します">>
+
+<$macrocall $name=".tip" _="""[[reduceオペレータ|reduce Operator]]とは異なり、`:reduce`プレフィックスはaccumulatorの初期値を指定できないため、初期値は常に空(数学オペレータでは0として扱われます)になります。したがって`=1 =2 =3 :reduce[multiply<accumulator>]`は、6ではなく0が生成されます。accumulatorの初期値を指定する必要がある場合は、[[reduceオペレータ|reduce Operator]]を使用します。"""/>
+<<.operator-example 6 "=1 =2 =3 :reduce[multiply<accumulator>]" "空の初期値は数学オペレータによって0として扱われます">>
+<<.operator-example 7 "=1 =2 =3 +[reduce<multiply-input>,[1]]" "正しい結果を得るためには初期値の設定が必要な場合があります">>
\ No newline at end of file
diff --git a/editions/ja-JP/tiddlers/filters/syntax/Reduce Filter Run Prefix.tid b/editions/ja-JP/tiddlers/filters/syntax/Reduce Filter Run Prefix.tid
new file mode 100644
index 0000000000..5d314b15bf
--- /dev/null
+++ b/editions/ja-JP/tiddlers/filters/syntax/Reduce Filter Run Prefix.tid
@@ -0,0 +1,49 @@
+created: 20211124151912931
+from-version: 5.1.23
+modified: 20250417105804821
+original-modified: 20230710073305239
+rp-input: 前回のフィルタランからのすべてのフィルタアウトプット
+rp-output: 累積された単一アイテム
+rp-purpose: 各インプットタイトルにフィルタランを繰り返し適用して、前回までのすべてのフィルタアウトプットを単一の項目に置き換え
+tags: [[Named Filter Run Prefix]]
+title: Reduce Filter Run Prefix
+ja-title: reduceフィルタランプレフィックス
+type: text/vnd.tiddlywiki
+
+
+<$railroad text="""
+\start none
+\end none
+( ":reduce" | - )
+[["ラン"|"Filter Run"]]
+"""/>
+
+
+前回のランからの各インプットタイトルは、順番にこのランに渡されます。このランへの以前の呼び出しの結果は、変数<<.var accumulator>>を介して次の呼び出しで使用できます。このランへの最後の呼び出しの結果がアウトプットとして返されます。典型的な使用法は、各インプットタイトルの特定のフィールドの値を合計することです。
+
+上記のように、数式を各インプットタイトルに繰り返し適用して、これまでのすべてのフィルタアウトプットを1つの項目に置き換えます。
+
+フィルタラン内では、次の変数を使用できます:
+
+* <<.var accumulator>> - 前回のフィルタランの結果
+* <<.var currentTiddler>> - インプットタイトル
+* <<.var ..currentTiddler>> - フィルタラン外での変数`currentTiddler`の値。 <<.from-version "5.2.0">>
+* <<.var index>> - 現在のリスト項目の数値インデックス(リストの最初の項目は0)
+* <<.var revIndex>> - 現在のリスト項目の逆の数値インデックス(リストの最後の項目は0)
+* <<.var length>> - インプットリストの長さの合計
+
+<<.tip "名前付きフィルタランプレフィックス`:reduce`を、サブフィルタを繰り返し適用して項目リストを1つの項目に平坦化するために使用される[[reduceオペレータ|reduce Operator]]`:reduce`と比べてください。">>
+
+```
+[tag[shopping]] :reduce[get[quantity]add<accumulator>]
+```
+
+は以下と同等です:
+
+```
+\define num-items() [get[quantity]add<accumulator>]
+
+[tag[shopping]reduce<num-items>]
+```
+
+[[reduceフィルタランプレフィックス(例)|Reduce Filter Run Prefix (Examples)]]
\ No newline at end of file
diff --git a/editions/ja-JP/tiddlers/filters/syntax/Shortcut Filter Run Prefixes.tid b/editions/ja-JP/tiddlers/filters/syntax/Shortcut Filter Run Prefixes.tid
new file mode 100644
index 0000000000..ca286b3e7b
--- /dev/null
+++ b/editions/ja-JP/tiddlers/filters/syntax/Shortcut Filter Run Prefixes.tid
@@ -0,0 +1,30 @@
+created: 20230305131705188
+modified: 20250510102220175
+original-modified: 20230710074438655
+tags: [[Filter Run Prefix]]
+title: Shortcut Filter Run Prefix
+ja-title: ショートカットフィルタランプレフィックス
+type: text/vnd.tiddlywiki
+
+ショートカットのプレフィックスはタイピングが速いため、上級ユーザーによく使用されますが、経験の浅いユーザーには読みにくいという欠点があります。そのため、より詳細な情報を持つ[[名前付きプレフィックス|Named Filter Run Prefix]]が作成されました。ショートカットと名前付きフィルタランプレフィックスは、以下の表に示すように互換性があります。
+
+<$railroad text="""
+\start none
+\end none
+(-|:"+"|"-"|"~"|"=")
+[["ラン"|"Filter Run"]]
+"""/>
+
+ランに次の内容が含まれている場合:
+
+* プレフィックスが無い場合、アウトプットタイトルはフィルタのアウトプットに[[優先的に追加|Dominant Append]]されます
+
+* プレフィックス`+`は、前回までのフィルタアウトプットをインプットとして受け取り、そのアウトプットはこれまでのすべてのフィルタアウトプットを<<.em "置き換え">>、次のランのインプットを形成します
+
+* プレフィックス`-`は、アウトプットタイトルがフィルタのアウトプットから<<.em 取り除か>>れます(そのようなTiddlerが存在する場合)
+
+* プレフィックス`~`は、フィルタアウトプットが空リストの場合、ランの結果のタイトルがフィルタアウトプットに[[優先的に追加|Dominant Append]]されます。フィルタアウトプットが空リストでない場合、ランは無視されます。<<.from-version "5.1.18">>
+
+* プレフィックス`=`は、アウトプットタイトルが重複排除されずにフィルタのアウトプットに追加されます。<<.from-version "5.1.20">>
+
+{{Interchangeable Filter Run Prefixes}}
\ No newline at end of file
diff --git a/editions/ja-JP/tiddlers/filters/syntax/Sort Filter Run Prefix (Examples).tid b/editions/ja-JP/tiddlers/filters/syntax/Sort Filter Run Prefix (Examples).tid
new file mode 100644
index 0000000000..8df6adb1a6
--- /dev/null
+++ b/editions/ja-JP/tiddlers/filters/syntax/Sort Filter Run Prefix (Examples).tid
@@ -0,0 +1,35 @@
+created: 20210428074912172
+modified: 20250420104606860
+original-modified: 20230315165343329
+tags: [[Sort Filter Run Prefix]]
+title: Sort Filter Run Prefix (Examples)
+ja-title: sortフィルタランプレフィックス(例)
+type: text/vnd.tiddlywiki
+
+タイトルの長さで並べ替え:
+
+<<.operator-example 1 "[all[tiddlers]] :sort:number[length[]] +[limit[10]]">>
+
+タイトルの長さを逆順に並べ替え:
+
+<<.operator-example 2 "[all[tiddlers]] :sort:number:reverse[length[]] +[limit[10]]">>
+
+テキストの長さで並べ替え:
+
+<<.operator-example 3 "[all[tiddlers]] :sort:number[get[text]length[]] +[limit[10]]">>
+
+修正日の新しい順に並べ替え:
+
+<<.operator-example 4 "[tag[Field Operators]] :sort:date[get[modified]else[19700101]] +[limit[10]]">>
+
+タイトルで並べ替え:
+<<.operator-example 5 "[tag[Field Operators]] :sort:string:casesensitive[get[caption]] +[limit[10]]">>
+
+タイトルの逆順に並べ替え:
+<<.operator-example 6 "[tag[Field Operators]] :sort:string:casesensitive,reverse[get[caption]] +[limit[10]]">>
+
+大文字と小文字を区別してテキストとして並べ替え:
+<<.operator-example 7 "Apple Banana Orange Grapefruit guava DragonFruit Kiwi apple orange :sort:string:casesensitive[{!!title}]">>
+
+大文字と小文字を区別せずにテキストとして並べ替え:
+<<.operator-example 8 "Apple Banana Orange Grapefruit guava DragonFruit Kiwi apple orange :sort:string:caseinsensitive[{!!title}]">>
diff --git a/editions/ja-JP/tiddlers/filters/syntax/Sort Filter Run Prefix.tid b/editions/ja-JP/tiddlers/filters/syntax/Sort Filter Run Prefix.tid
new file mode 100644
index 0000000000..7dce33f71b
--- /dev/null
+++ b/editions/ja-JP/tiddlers/filters/syntax/Sort Filter Run Prefix.tid
@@ -0,0 +1,61 @@
+created: 20210428083929749
+from-version: 5.2.0
+modified: 20250419111702297
+original-modified: 20240717120111427
+rp-input: 前回までのすべてのランのフィルタアウトプット
+rp-output: アウトプットタイトルは、以前のフィルタランのアウトプットを置き換え
+rp-purpose: 各項目に対して実行されたこのフィルタの評価結果によってインプットタイトルを並べ替え
+rp-suffix: :sortフィルタランプレフィックスはリッチサフィックスを使用します。詳細については以下を参照
+rp-suffix-name: S
+tags: [[Named Filter Run Prefix]]
+title: Sort Filter Run Prefix
+ja-title: sortフィルタランプレフィックス
+type: text/vnd.tiddlywiki
+
+<$railroad text="""
+\start none
+\end none
+( ":sort" )
+( ":" )
+( : "string" | "alphanumeric" | "number" | "integer" | "version" | "date" )
+( ":" )
+{
+ (
+ (
+ ( : "caseinsensitive" /"stringとalphanumericには必須"/ | "casesensitive" /"stringとalphanumericには必須"/)
+ | "reverse" /"オプション"/
+ )
+ )
+ +","
+}
+[["ラン"|"Filter Run"]]
+"""/>
+
+前回のランからインプットされた各タイトルは、今回のランに順番に渡されます。フィルタランは、インプットタイトルをソートに必要な形式に変換します。例えば、フィルタラン`[length[]]`は各インプットタイトルをその長さを表す数値に変換し、インプットタイトルを長さに基づいてソートします。
+
+フィルタラン内では、<<.var currentTiddler>>変数が処理中のTiddlerのタイトルに設定されていることに注意してください。これにより、`:sort:number[{!!value}divide{!!cost}]`のようなフィルタランを計算に使用できます。ラン外の<<.var currentTiddler>>の値は、<<.var "..currentTiddler">>変数で使用できます。
+
+`:sort` <<.place S>>フィルタランプレフィックスでは、複数のサフィックスを許可する拡張構文が使用されます。その一部は必須です:
+
+```
+:sort:<type>:<flaglist>[...filter run...]
+
+```
+
+* ''type'': 必須。項目の比較方法を決定し、''string''、''alphanumeric''、''number''、''integer''、''version''、''date''のいずれかになります。
+
+* ''flaglist'': 次のフラグのコンマ区切りリスト:
+
+** ''casesensitive'' または ''caseinsensitive'' (typeが`string`や`alphanumeric`のとき必須)。
+*** フラグがない場合、デフォルトは: //caseinsensitive// です。
+*** 明確にするために、このパラメータは常に定義する必要があります。
+
+** フィルター実行の順序を反転するには、''reverse''を使用します(オプション)。
+
+<<.tip """`:sort`プレフィックス付きのフィルタランは、''渡された項目と同じ数の項目が返される''ことに注意してください。特に、[[getオペレータ|get Operator]]を使用してフィールドの値を取得する場合は、[[elseオペレータ|else Operator]]を使用してフィールド値が欠落するのを防ぐと便利です。例えば`...[get[myfield]else[default-value]]`。<br><br>
+
+''missing''エントリは''ゼロ''または''空文字列''として扱われます。
+
+参照: <<.olink sortsub>>オペレータ
+
+[[例|Sort Filter Run Prefix (Examples)]]
\ No newline at end of file
diff --git a/editions/ja-JP/tiddlers/filters/syntax/Then Filter Run Prefix (Examples).tid b/editions/ja-JP/tiddlers/filters/syntax/Then Filter Run Prefix (Examples).tid
new file mode 100644
index 0000000000..5d08134638
--- /dev/null
+++ b/editions/ja-JP/tiddlers/filters/syntax/Then Filter Run Prefix (Examples).tid
@@ -0,0 +1,53 @@
+created: 20230617183745774
+modified: 20250504103912315
+original-modified: 20230617183745774
+tags: [[Then Filter Run Prefix]]
+title: Then Filter Run Prefix (Examples)
+ja-title: thenフィルタランプレフィックス(例)
+type: text/vnd.tiddlywiki
+
+
+!! 条件実行
+
+<<.op :then>>フィルタランプレフィックスを使用すると、ネストした[[ListWidget]]や[[WikiText内のマクロ定義|Macro Definitions in WikiText]]の必要性を回避できます。
+
+<$macrocall $name='wikitext-example-without-html'
+src="""<$edit-text field="search" placeholder="Search title"/>
+
+<$let searchTerm={{!!search}}>
+<$list filter="[<searchTerm>minlength[3]] :then[!is[system]search:title<searchTerm>]" template="$:/core/ui/ListItemTemplate"/>
+</$let>"""/>
+
+
+!! 条件(サブ)フィルタ
+
+<<.op :then>>フィルターランプレフィックスを<<.op :else>>プレフィックスと組み合わせて条件フィルタを作成できます。この例では、<<.var searchSubfilter>>内の検索に使用されるフィールドは[[$:/temp/searchFields]]の値に依存し、<<.var sortSubfilter>>による並べ替え順序は[[$:/temp/searchSort]]の値に依存します。これらのTiddlerの値を設定するには、チェックボックスを使用します。
+
+<<.tip "サブフィルタ内の各フィルタランは、<<.olink subfilter>>オペレータのインプットをインプットとして受け取ることに注意してください">>
+
+<<.olink then>>と<<.olink else>>オペレータはサブフィルタを呼び出したり追加のフィルタステップを実行できないため、このようなアプリケーションには使用できません。
+
+<$macrocall $name='wikitext-example-without-html'
+src="""<$checkbox tiddler="$:/temp/searchSort"
+ field="text"
+ checked="chrono" unchecked="alpha" default="alpha">
+ 時系列順に並べ替え(新しい順)
+</$checkbox><br/>
+<$checkbox tiddler="$:/temp/searchFields"
+ field="text"
+ checked="title" unchecked="default" default="title">
+ <<.field title>>のみを検索
+</$checkbox><p/>
+<$let searchSubfilter="[{$:/temp/searchFields}match[default]] :then[search[prefix]] :else[search:title[prefix]]"
+ sortSubfilter="[{$:/temp/searchSort}match[chrono]] :then[!nsort[modified]] :else[sort[title]]"
+ limit=10 >
+ <$list filter="[all[tiddlers]!is[system]subfilter<searchSubfilter>subfilter<sortSubfilter>first<limit>]">
+ <$link/> (<$text text={{{ [{!!modified}format:date[YYYY-0MM-0DD]] }}} />)<br/>
+ </$list>
+ <$list filter="[all[tiddlers]!is[system]subfilter<searchSubfilter>rest<limit>count[]]">
+ ... and <<currentTiddler>> more.
+ </$list>
+</$let>"""/>
+
+時系列順に並べ替える（新しい順）
+検索titleのみ
\ No newline at end of file
diff --git a/editions/ja-JP/tiddlers/filters/syntax/then Filter Run Prefix.tid b/editions/ja-JP/tiddlers/filters/syntax/then Filter Run Prefix.tid
new file mode 100644
index 0000000000..4a483b2b75
--- /dev/null
+++ b/editions/ja-JP/tiddlers/filters/syntax/then Filter Run Prefix.tid
@@ -0,0 +1,41 @@
+created: 20210618133745003
+from-version: 5.3.0
+modified: 20250423104147235
+original-modified: 20230710074225410
+rp-input: <<.olink すべて>>のTiddlerタイトル
+rp-output: フィルタランのアウトプットは、空のリストでない限り、前回までのランのアウトプットを置き換えます(以下を参照)。
+rp-purpose: フィルタランへのインプットをそのアウトプットで置き換え、インプットがある場合にのみランを評価
+search:
+tags: [[Named Filter Run Prefix]]
+title: Then Filter Run Prefix
+ja-title: thenフィルタランプレフィックス
+type: text/vnd.tiddlywiki
+
+<$railroad text="""
+\start none
+\end none
+":then"
+[["ラン"|"Filter Run"]]
+"""/>
+
+<<.op :then>>フィルターランプレフィックスは、前回までのすべてのフィルタランの結果をそのアウトプットに置き換えるために使用されます。
+
+前回までのすべてのランの結果が空のリストの場合、<<.op :then>>プレフィックス付きフィルタランは評価されません。
+
+<<.op :then>>プレフィックス付きフィルタランのアウトプット自体が空のリストである場合、前回までのすべてのフィルタランの結果は変更されずに渡されます。
+
+<<.tip "空の文字列項目が1つ含まれるリストは空のリストではないことに注意してください。">>
+
+!! <<.op :then>>ランプレフィックスと<<.olink then>>オペレータの比較
+
+<<.op then>>オペレータと<<.op :then>>プレフィックス付きフィルタランの主な違いは、オペレータはインプット[[タイトルリスト|Title List]]の//各項目//をそのパラメータで置き換えるのに対し、<<.op :then>>オペレータは//インプットリスト全体//をそのラン結果で置き換える点です。
+
+|doc-op-comparison tc-center|k
+| !<<.op :then>>フィルタランプレフィックス | !<<.op then>>オペレータ |
+|^<<.operator-example m1-1 "[tag[WikiText]] :then[[true]]">>|^<<.operator-example m1-2 "[tag[WikiText]then[true]]">><p>これらを同等にするには、追加のフィルタステップを追加します:</p> <<.operator-example m1-3 "[tag[WikiText]count[]compare:number:gt[0]then[true]]">>|
+
+
+[[thenフィルタランプレフィックス(例)|Then Filter Run Prefix (Examples)]]
+
+参照: [[elseフィルタランプレフィックス|Else Filter Run Prefix]] | [[thenオペレータ|then Operator]] と [[elseオペレータ|else Operator]]
+
diff --git a/editions/ja-JP/tiddlers/system/download-empty.tid b/editions/ja-JP/tiddlers/system/download-empty.tid
index 79b98e462f..a61a20258f 100644
--- a/editions/ja-JP/tiddlers/system/download-empty.tid
+++ b/editions/ja-JP/tiddlers/system/download-empty.tid
@@ -2,7 +2,7 @@ title: $:/editions/ja-JP/download-empty
type: text/vnd.tiddlywiki
\define saveTiddlerFilter()
-[[$:/core]] [[$:/isEncrypted]] [[$:/themes/tiddlywiki/snowwhite]] [[$:/themes/tiddlywiki/vanilla]] [[$:/languages/ja-JP]] [[$:/language]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]]
+[[$:/core]] [[$:/isEncrypted]] [[$:/themes/tiddlywiki/snowwhite]] [[$:/themes/tiddlywiki/vanilla]] [[$:/languages/ja-JP]] [[$:/language]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[has[plugin-type]field:platform[server]] +[sort[title]]
\end
\define savingEmpty()
yes
diff --git a/editions/ko-KR/tiddlers/system/download-empty.tid b/editions/ko-KR/tiddlers/system/download-empty.tid
index 75f80307ff..940d087284 100644
--- a/editions/ko-KR/tiddlers/system/download-empty.tid
+++ b/editions/ko-KR/tiddlers/system/download-empty.tid
@@ -2,7 +2,7 @@ title: $:/editions/ko-KR/download-empty
type: text/vnd.tiddlywiki
\define saveTiddlerFilter()
-[[$:/core]] [[$:/isEncrypted]] [[$:/themes/tiddlywiki/snowwhite]] [[$:/themes/tiddlywiki/vanilla]] [[$:/languages/ko-KR]] [[$:/language]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]]
+[[$:/core]] [[$:/isEncrypted]] [[$:/themes/tiddlywiki/snowwhite]] [[$:/themes/tiddlywiki/vanilla]] [[$:/languages/ko-KR]] [[$:/language]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[has[plugin-type]field:platform[server]] +[sort[title]]
\end
\define savingEmpty()
yes
diff --git a/editions/prerelease/tiddlers/Release 5.3.7.tid b/editions/prerelease/tiddlers/Release 5.3.7.tid
deleted file mode 100644
index 1644c93000..0000000000
--- a/editions/prerelease/tiddlers/Release 5.3.7.tid
+++ /dev/null
@@ -1,98 +0,0 @@
-caption: 5.3.7
-created: 20241115171024144
-modified: 20241115171024144
-tags: ReleaseNotes
-title: Release 5.3.7
-type: text/vnd.tiddlywiki
-description: Under development
-
-//[[See GitHub for detailed change history of this release|https://github.com/TiddlyWiki/TiddlyWiki5/compare/v5.3.6...master]]//
-
-
-! Major Improvements
-
-! Translation improvements
-
-* French
-* German
-* Japanese
-
-! Plugin Improvements
-
-
-! Widget Improvements
-
-*
-
-! Filter Improvements
-
-*
-
-! Usability Improvements
-
-* <<.link-badge-added "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8783"> (and <<.link-badge-here "https://github.com/TiddlyWiki/TiddlyWiki5/commit/028c80782d105beb90f5d58a7f22e865c7e8c6f4">>) [[Hidden Setting: Default Type for Missing Tiddlers]]
-* <<.link-badge-added "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8661">> DiffTextWidget colours to several core palettes
-* <<.link-badge-improved "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8807">> (and <<.link-badge-here "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8911">>) Flexoki palette with additional colours
-* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8837">> [[incorrect|https://localizejs.com/articles/why-using-flag-icons-can-confuse-your-users/]] use of national flags to represent languages
-
-! Hackability Improvements
-
-* <<.link-badge-updated "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8768">> several macros such as [[colour-picker Macro]], [[dumpvariables Macro]], [[image-picker Macro]], [[translink Macro]], [[tree Macro]] and [[list-links-draggable Macro]] to use the newer syntax
-* <<.link-badge-extended "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8780">> rendered plain text template to support more languages
-* <<.link-badge-extended "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8816">> 'disabled' attribute to SelectWidget and BrowseWidget
-* <<.link-badge-extended "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8819">> 'tabindex' attribute to BrowseWidget, RangeWidget, CheckboxWidget and RadioWidget
-* <<.link-badge-updated "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8821">> the editor link dropdown to use newer syntax
-* <<.link-badge-added "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8911">> support for images in AVIF format
-* <<.link-badge-added "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8912">> support for custom MIME types to the [[WidgetMessage: tm-copy-to-clipboard]]
-
-! Bug Fixes
-
-* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8800">> problem with overwriting shadow tiddlers from plugins that do not have a `plugin-priority` field
-* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8831">> (and <<.link-badge-here "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8835">>) problem with switching language not correctly updating the `lang` attribute of the root `<html>` element
-* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/issues/8842">> bug with refreshing ExternalImages with a `_canonical_uri` field
-* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8882">> [[unusedtitle Macro]] to trim whitespace from the generated title
-* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8898">> file extensions and MIME types for font files
-* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8903">> bug where the wiki would be marked as dirty when a shadow tiddler is changed
-* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8895">> unnecessary refresh with GenesisWidget
-* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/commit/d4bc3fcd998902c17cd6bcefdc8d380e5c224458">> [[WidgetMessage: tm-http-request]] to pass custom variables to the progress actions
-* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8930">> FillWidget to no longer display its content
-* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/issues/8921">> inconsistent whitespace in page toolbar "More" dropdown
-* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8931">> RSOD with [[contains Operator]] if created field is accessed
-* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/issues/8881">> incorrect .html file extension of exported tiddlers on Android
-* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8951">> Arabic text using sans-serif font by adding "system-ui" to default font family
-* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/issues/8955">> refresh problem with "save" button
-* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8721">> [[list-tagged-draggable Macro]] to use the "caption" field if available
-* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8959">> problem with missing expandable arrow in [[toc-selective-expandable|Table-of-Contents Macros]]
-* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/issues/5930">> the default value does not working for the CheckboxWidget if it is bound to an index in a data tiddler
-* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/issues/8970">> [[median Operator]] to order values as numbers, not strings
-
-! Node.js Improvements
-
-* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8789">> incorrect redirect when combining a custom [[path-prefix|WebServer Parameter: path-prefix]] with manual HTTP Basic Authentication via the [[/login-basic|WebServer API: Force Basic Authentication Login]] endpoint
-
-! Developer Improvements
-
-*
-
-! Acknowledgements
-
-[[@Jermolene|https://github.com/Jermolene]] would like to thank the contributors to this release who have generously given their time to help improve TiddlyWiki:
-
-<<.contributors """
-DesignThinkerer
-flibbles
-galenhuntington
-IchijikuIchigo
-jeremyredhead
-jrbntt
-jryans
-Leilei332
-linonetwo
-michaeljmcd
-opn
-pmario
-Rhys-T
-saqimtiaz
-well-noted
-xcazin
-""">>
diff --git a/editions/prerelease/tiddlers/system/PrereleaseLocalPluginLibrary.tid b/editions/prerelease/tiddlers/system/PrereleaseLocalPluginLibrary.tid
index 0ad81e302f..bc2c62e1eb 100644
--- a/editions/prerelease/tiddlers/system/PrereleaseLocalPluginLibrary.tid
+++ b/editions/prerelease/tiddlers/system/PrereleaseLocalPluginLibrary.tid
@@ -1,6 +1,6 @@
title: $:/config/LocalPluginLibrary
tags: $:/tags/PluginLibrary
-url: http://127.0.0.1:8080/prerelease/library/v5.3.7/index.html
+url: http://127.0.0.1:8080/prerelease/library/v5.4.0/index.html
caption: {{$:/language/OfficialPluginLibrary}} (Prerelease Local)
A locally installed version of the official ~TiddlyWiki plugin library at tiddlywiki.com for testing and debugging. //Requires a local web server to share the library//
diff --git a/editions/prerelease/tiddlers/system/PrereleaseOfficialPluginLibrary.tid b/editions/prerelease/tiddlers/system/PrereleaseOfficialPluginLibrary.tid
index 2162c3b4b4..1ca7cbdb82 100644
--- a/editions/prerelease/tiddlers/system/PrereleaseOfficialPluginLibrary.tid
+++ b/editions/prerelease/tiddlers/system/PrereleaseOfficialPluginLibrary.tid
@@ -1,6 +1,6 @@
title: $:/config/OfficialPluginLibrary
tags: $:/tags/PluginLibrary
-url: https://tiddlywiki.com/prerelease/library/v5.3.7/index.html
+url: https://tiddlywiki.com/prerelease/library/v5.4.0/index.html
caption: {{$:/language/OfficialPluginLibrary}} (Prerelease)
The prerelease version of the official ~TiddlyWiki plugin library at tiddlywiki.com. Plugins, themes and language packs are maintained by the core team.
diff --git a/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid b/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid
index f35234cbfb..7483128e20 100644
--- a/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid
+++ b/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid
@@ -19,4 +19,5 @@ The pre-release is also available as an [[empty wiki|https://tiddlywiki.com/prer
</div>
<div class="tc-subtitle">Updated: <$view field="modified" format="date" template={{$:/language/Tiddler/DateFormat}}/></div>
<$transclude mode="block"/>
+
</$list>
diff --git a/editions/prerelease/tiddlers/system/download-empty.tid b/editions/prerelease/tiddlers/system/download-empty.tid
index 2c0eaa259a..0d91b9da6b 100644
--- a/editions/prerelease/tiddlers/system/download-empty.tid
+++ b/editions/prerelease/tiddlers/system/download-empty.tid
@@ -2,7 +2,7 @@ title: $:/editions/tw5.com/download-empty
code-body: yes
\define saveTiddlerFilter()
-[[$:/core]] [[$:/isEncrypted]] [[$:/themes/tiddlywiki/snowwhite]] [[$:/themes/tiddlywiki/vanilla]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] [[$:/config/OfficialPluginLibrary]] +[sort[title]]
+[[$:/core]] [[$:/isEncrypted]] [[$:/themes/tiddlywiki/snowwhite]] [[$:/themes/tiddlywiki/vanilla]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[has[plugin-type]field:platform[server]] [[$:/config/OfficialPluginLibrary]] +[sort[title]]
\end
\define savingEmpty()
yes
diff --git a/editions/prerelease/tiddlywiki.info b/editions/prerelease/tiddlywiki.info
index c469dcf996..9b37efef3f 100644
--- a/editions/prerelease/tiddlywiki.info
+++ b/editions/prerelease/tiddlywiki.info
@@ -3,20 +3,16 @@
"plugins": [
"tiddlywiki/browser-sniff",
"tiddlywiki/help",
- "tiddlywiki/stacked-view",
"tiddlywiki/powered-by-tiddlywiki",
"tiddlywiki/internals",
"tiddlywiki/highlight",
"tiddlywiki/bibtex",
- "tiddlywiki/savetrail",
- "tiddlywiki/external-attachments",
"tiddlywiki/dynaview",
"tiddlywiki/dynannotate",
"tiddlywiki/codemirror",
"tiddlywiki/menubar",
"tiddlywiki/jszip",
"tiddlywiki/confetti",
- "tiddlywiki/dynannotate",
"tiddlywiki/tour"
],
"themes": [
diff --git a/editions/tahoelafs/tiddlers/DefaultTiddlers.tid b/editions/tahoelafs/tiddlers/DefaultTiddlers.tid
deleted file mode 100644
index cc98f9dd61..0000000000
--- a/editions/tahoelafs/tiddlers/DefaultTiddlers.tid
+++ /dev/null
@@ -1,3 +0,0 @@
-title: $:/DefaultTiddlers
-
-HelloThere
diff --git a/editions/tahoelafs/tiddlers/HelloThere.tid b/editions/tahoelafs/tiddlers/HelloThere.tid
deleted file mode 100644
index c1ddb4949f..0000000000
--- a/editions/tahoelafs/tiddlers/HelloThere.tid
+++ /dev/null
@@ -1,6 +0,0 @@
-title: HelloThere
-
-This is an experimental edition of TiddlyWiki5 for use with [[Tahoe-LAFS|https://tahoe-lafs.org/]]. At this point it is largely for experimentation by @zooko. Click the ''save changes'' button to PUT the updated TiddlyWiki HTML file back to the server.
-
-<$button message="tm-new-tiddler">New Tiddler</$button>
-<$button message="tm-save-wiki">Save Changes</$button>
diff --git a/editions/tahoelafs/tiddlers/SiteSubtitle.tid b/editions/tahoelafs/tiddlers/SiteSubtitle.tid
deleted file mode 100644
index e7d536396e..0000000000
--- a/editions/tahoelafs/tiddlers/SiteSubtitle.tid
+++ /dev/null
@@ -1,3 +0,0 @@
-title: $:/SiteSubtitle
-
-Tahoe-LAFS edition
\ No newline at end of file
diff --git a/editions/tahoelafs/tiddlers/SiteTitle.tid b/editions/tahoelafs/tiddlers/SiteTitle.tid
deleted file mode 100644
index a6d5ea43fd..0000000000
--- a/editions/tahoelafs/tiddlers/SiteTitle.tid
+++ /dev/null
@@ -1,3 +0,0 @@
-title: $:/SiteTitle
-
-TiddlyWiki5
\ No newline at end of file
diff --git a/editions/tahoelafs/tiddlywiki.info b/editions/tahoelafs/tiddlywiki.info
deleted file mode 100644
index 53675187e6..0000000000
--- a/editions/tahoelafs/tiddlywiki.info
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "description": "Demo of TahoeLAFS plugin",
- "plugins": [
- "tiddlywiki/tahoelafs"
- ],
- "themes": [
- "tiddlywiki/vanilla",
- "tiddlywiki/snowwhite"
- ],
- "build": {
- "index": [
- "--rendertiddler","$:/core/save/all","tahoelafs.html","text/plain"]
- }
-}
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/Attribute.tid b/editions/test/tiddlers/tests/data/serialize/Attribute.tid
new file mode 100644
index 0000000000..3f986784ad
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/Attribute.tid
@@ -0,0 +1,5 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/Attribute
+type: text/vnd.tiddlywiki
+
+<$macrocall $name="rpn" a=<<rpn 2 2 *>> b="pi" operation="*" decimals="4"/>
diff --git a/editions/test/tiddlers/tests/data/serialize/BlockRule.tid b/editions/test/tiddlers/tests/data/serialize/BlockRule.tid
new file mode 100644
index 0000000000..316f745c6f
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/BlockRule.tid
@@ -0,0 +1,7 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/BlockRule
+type: text/vnd.tiddlywiki
+
+The speed of sound
+
+The light of speed
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/BoldEmphasis.tid b/editions/test/tiddlers/tests/data/serialize/BoldEmphasis.tid
new file mode 100644
index 0000000000..2caac9172a
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/BoldEmphasis.tid
@@ -0,0 +1,5 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/BoldEmphasis
+type: text/vnd.tiddlywiki
+
+This is ''bold'' text
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/CodeBlock.tid b/editions/test/tiddlers/tests/data/serialize/CodeBlock.tid
new file mode 100644
index 0000000000..7a03f3aeaa
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/CodeBlock.tid
@@ -0,0 +1,17 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/CodeBlock
+type: text/vnd.tiddlywiki
+
+Simple `JS` and complex
+
+---
+
+```js
+var match = reEnd.exec(this.parser.source)
+```
+
+```tid
+<$list filter="[tag[ExampleTag]sort[title]]"/>
+```
+
+end
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/CommentBlock.tid b/editions/test/tiddlers/tests/data/serialize/CommentBlock.tid
new file mode 100644
index 0000000000..c90b67c25c
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/CommentBlock.tid
@@ -0,0 +1,11 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/CommentBlock
+type: text/vnd.tiddlywiki
+
+<!-- This is a comment -->
+
+Some text
+
+<!-- Another comment -->
+
+More text
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/CommentInline.tid b/editions/test/tiddlers/tests/data/serialize/CommentInline.tid
new file mode 100644
index 0000000000..2d0e98513b
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/CommentInline.tid
@@ -0,0 +1,5 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/CommentInline
+type: text/vnd.tiddlywiki
+
+This is some text with an inline comment <!-- This is a comment --> and some more text.
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/Conditional.tid b/editions/test/tiddlers/tests/data/serialize/Conditional.tid
new file mode 100644
index 0000000000..4540e6eb44
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/Conditional.tid
@@ -0,0 +1,21 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/Conditional
+type: text/vnd.tiddlywiki
+
+This is a <%if [{something}] %>Elephant<%elseif [{else}] %>Pelican<%else%>Crocodile<%endif%> <%if [{something}] %>Elephant<%else%>Crocodile<%endif%>
+
+<%if [{$:/info/url/protocol}match[file:]]%>
+ Loaded from a file URI
+<%elseif [{$:/info/url/protocol}match[https:]]%>
+ Loaded from an HTTPS URI
+<%elseif [{$:/info/url/protocol}match[http:]]%>
+ Loaded from an HTTP URI
+<%else%>
+ Loaded from an unknown protocol
+<%endif%>
+
+Plain text in next paragraph.
+
+<%if [{$:/info/url/protocol}match[file:]]%>
+ Hidden.
+<%endif%>
diff --git a/editions/test/tiddlers/tests/data/serialize/Dash.tid b/editions/test/tiddlers/tests/data/serialize/Dash.tid
new file mode 100644
index 0000000000..b0a7ddc55f
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/Dash.tid
@@ -0,0 +1,7 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/Dash
+type: text/vnd.tiddlywiki
+
+This is an en-dash: --
+
+This is an em-dash: ---
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/Entity.tid b/editions/test/tiddlers/tests/data/serialize/Entity.tid
new file mode 100644
index 0000000000..d8891e4ed9
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/Entity.tid
@@ -0,0 +1,5 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/Entity
+type: text/vnd.tiddlywiki
+
+This is a copyright symbol: ©
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/ExtLink.tid b/editions/test/tiddlers/tests/data/serialize/ExtLink.tid
new file mode 100644
index 0000000000..de966452f3
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/ExtLink.tid
@@ -0,0 +1,7 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/ExtLink
+type: text/vnd.tiddlywiki
+
+An external link: https://www.tiddlywiki.com/
+
+A suppressed external link: ~http://www.tiddlyspace.com/
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/FilteredTranscludeBlock.tid b/editions/test/tiddlers/tests/data/serialize/FilteredTranscludeBlock.tid
new file mode 100644
index 0000000000..b1c526d9db
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/FilteredTranscludeBlock.tid
@@ -0,0 +1,13 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/FilteredTranscludeBlock
+type: text/vnd.tiddlywiki
+
+{{{ [tag[docs]] }}}
+
+{{{ [tag[docs]] |tooltip}}}
+
+{{{ [tag[docs]] ||TemplateTitle}}}
+
+{{{ [tag[docs]] |tooltip||TemplateTitle}}}
+
+{{{ [tag[docs]] }}width:40;height:50;}.class.class
diff --git a/editions/test/tiddlers/tests/data/serialize/FilteredTranscludeInline.tid b/editions/test/tiddlers/tests/data/serialize/FilteredTranscludeInline.tid
new file mode 100644
index 0000000000..8b3155882f
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/FilteredTranscludeInline.tid
@@ -0,0 +1,5 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/FilteredTranscludeInline
+type: text/vnd.tiddlywiki
+
+{{{ [tag[docs]] }}} {{{ [tag[docs]] |tooltip}}} {{{ [tag[docs]] ||TemplateTitle}}} {{{ [tag[docs]] |tooltip||TemplateTitle}}} {{{ [tag[docs]] }}width:40;height:50;}.class.class
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/FunctionDefinition.tid b/editions/test/tiddlers/tests/data/serialize/FunctionDefinition.tid
new file mode 100644
index 0000000000..3585564a98
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/FunctionDefinition.tid
@@ -0,0 +1,15 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/FunctionDefinition
+type: text/vnd.tiddlywiki
+
+\function name(param:"defaultvalue", param2:"defaultvalue")
+definition text
+\end
+
+\procedure name(param:"defaultvalue", param2:"defaultvalue")
+definition text
+\end
+
+\widget $mywidget(param:"defaultvalue", param2:"defaultvalue")
+definition text
+\end
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/HardLineBreaks.tid b/editions/test/tiddlers/tests/data/serialize/HardLineBreaks.tid
new file mode 100644
index 0000000000..b6ea0b9852
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/HardLineBreaks.tid
@@ -0,0 +1,12 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/HardLineBreaks
+type: text/vnd.tiddlywiki
+
+"""
+This is some text
+That is set like
+It is a Poem
+When it is
+Clearly
+Not
+"""
diff --git a/editions/test/tiddlers/tests/data/serialize/Heading.tid b/editions/test/tiddlers/tests/data/serialize/Heading.tid
new file mode 100644
index 0000000000..34152e50a3
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/Heading.tid
@@ -0,0 +1,29 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/Heading
+type: text/vnd.tiddlywiki
+
+! Heading 1
+
+!! Heading 2
+
+!!! Heading 3
+
+!!!! Heading 4
+
+!!!!! Heading 5
+
+!!!!!! Heading 6
+
+! AAA
+
+!! AAA
+
+!!! AAA
+
+!!!! AAA
+
+!!!!! AAA
+
+!!!!!! AAA
+
+AAA
diff --git a/editions/test/tiddlers/tests/data/serialize/Html.tid b/editions/test/tiddlers/tests/data/serialize/Html.tid
new file mode 100644
index 0000000000..76b86d5708
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/Html.tid
@@ -0,0 +1,15 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/Html
+type: text/vnd.tiddlywiki
+
+<aside>
+This is an HTML5 aside element
+</aside>
+
+<$slider target="MyTiddler">
+This is a widget invocation
+</$slider>
+
+<$list filter="[tag[ExampleTag]sort[title]]"/>
+
+Plain text in next paragraph.
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/Image.tid b/editions/test/tiddlers/tests/data/serialize/Image.tid
new file mode 100644
index 0000000000..8641df4cb5
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/Image.tid
@@ -0,0 +1,10 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/Image
+type: text/vnd.tiddlywiki
+
+[img[https://tiddlywiki.com/fractalveg.jpg]]
+[img width="23" height="24" [https://tiddlywiki.com/fractalveg.jpg]]
+[img width={{!!width}} height={{!!height}} [https://tiddlywiki.com/fractalveg.jpg]]
+[img[Description of image|https://tiddlywiki.com/fractalveg.jpg]]
+[img[TiddlerTitle]]
+[img[Description of image|TiddlerTitle]]
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/Import.tid b/editions/test/tiddlers/tests/data/serialize/Import.tid
new file mode 100644
index 0000000000..e467de5346
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/Import.tid
@@ -0,0 +1,6 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/Import
+type: text/vnd.tiddlywiki
+
+\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
+\import [[$:/core/ui/PageMacros]]
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/ItalicEmphasis.tid b/editions/test/tiddlers/tests/data/serialize/ItalicEmphasis.tid
new file mode 100644
index 0000000000..a06ca62cef
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/ItalicEmphasis.tid
@@ -0,0 +1,5 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/ItalicEmphasis
+type: text/vnd.tiddlywiki
+
+This is //italic// text
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/List.tid b/editions/test/tiddlers/tests/data/serialize/List.tid
new file mode 100644
index 0000000000..d25397799d
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/List.tid
@@ -0,0 +1,40 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/List
+type: text/vnd.tiddlywiki
+
+* This is an unordered list
+* It has two items
+
+# This is a numbered list
+## With a subitem
+# And a third item
+
+; This is a term that is being defined
+: This is the definition of that term
+
+#** One
+#* Two
+#** Three
+#**** Four
+#**# Five
+#**## Six
+## Seven
+### Eight
+## Nine
+
+* List item one
+*.active List item two has the class `active`
+* List item three
+
+# AAA
+## [[BBB]]
+### CCC
+# AAA
+## CCC
+## DDD
+## EEE
+# BBB
+## FF `/` FFF
+## FFF
+## GGG
+##
diff --git a/editions/test/tiddlers/tests/data/serialize/MacroCallBlock.tid b/editions/test/tiddlers/tests/data/serialize/MacroCallBlock.tid
new file mode 100644
index 0000000000..4bd30d4513
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/MacroCallBlock.tid
@@ -0,0 +1,9 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/MacroCallBlock
+type: text/vnd.tiddlywiki
+
+<<name "value" "value2">>
+
+<<.def "macro calls">>
+
+<<alert "primary" "primary alert" width:"60%">>
diff --git a/editions/test/tiddlers/tests/data/serialize/MacroCallInline.tid b/editions/test/tiddlers/tests/data/serialize/MacroCallInline.tid
new file mode 100644
index 0000000000..09127dce09
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/MacroCallInline.tid
@@ -0,0 +1,5 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/MacroCallInline
+type: text/vnd.tiddlywiki
+
+These are macro calls in a line: <<name "value" "value2">> and <<.def "macro calls">> <<alert "primary" "primary alert" width:"60%">>
diff --git a/editions/test/tiddlers/tests/data/serialize/MacroDef.tid b/editions/test/tiddlers/tests/data/serialize/MacroDef.tid
new file mode 100644
index 0000000000..132ee7053f
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/MacroDef.tid
@@ -0,0 +1,9 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/MacroDef
+type: text/vnd.tiddlywiki
+
+\define name(param:defaultvalue,param2:defaultvalue)
+definition text, including $param$ markers
+\end
+
+\define lingo-base() $:/language/ControlPanel/Basics/
diff --git a/editions/test/tiddlers/tests/data/serialize/Parameters.tid b/editions/test/tiddlers/tests/data/serialize/Parameters.tid
new file mode 100644
index 0000000000..5b107a73d9
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/Parameters.tid
@@ -0,0 +1,5 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/Parameters
+type: text/vnd.tiddlywiki
+
+\parameters(param:defaultvalue,param2:defaultvalue)
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/ParserMode.tid b/editions/test/tiddlers/tests/data/serialize/ParserMode.tid
new file mode 100644
index 0000000000..b4c31b66b3
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/ParserMode.tid
@@ -0,0 +1,9 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/ParserMode
+type: text/vnd.tiddlywiki
+
+\parsermode block
+
+\parsermode inline
+
+Test.
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/PrettyExtLink.tid b/editions/test/tiddlers/tests/data/serialize/PrettyExtLink.tid
new file mode 100644
index 0000000000..1b4002b94e
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/PrettyExtLink.tid
@@ -0,0 +1,6 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/PrettyExtLink
+type: text/vnd.tiddlywiki
+
+[ext[https://tiddlywiki.com/fractalveg.jpg]]
+[ext[Tooltip|https://tiddlywiki.com/fractalveg.jpg]]
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/PrettyLink.tid b/editions/test/tiddlers/tests/data/serialize/PrettyLink.tid
new file mode 100644
index 0000000000..8c7afbc7f1
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/PrettyLink.tid
@@ -0,0 +1,6 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/PrettyLink
+type: text/vnd.tiddlywiki
+
+[[Introduction]]
+[[Link description|TiddlerTitle]]
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/QuoteBlock.tid b/editions/test/tiddlers/tests/data/serialize/QuoteBlock.tid
new file mode 100644
index 0000000000..a2f698846c
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/QuoteBlock.tid
@@ -0,0 +1,7 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/QuoteBlock
+type: text/vnd.tiddlywiki
+
+<<<tc-quote
+Quote text
+<<<
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/RulesPragma.tid b/editions/test/tiddlers/tests/data/serialize/RulesPragma.tid
new file mode 100644
index 0000000000..c3e79f5ea4
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/RulesPragma.tid
@@ -0,0 +1,6 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/RulesPragma
+type: text/vnd.tiddlywiki
+
+\rules except ruleone ruletwo rulethree
+\rules only ruleone ruletwo rulethree
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/SimpleText.tid b/editions/test/tiddlers/tests/data/serialize/SimpleText.tid
new file mode 100644
index 0000000000..c05b5044d7
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/SimpleText.tid
@@ -0,0 +1,5 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/SimpleText
+type: text/vnd.tiddlywiki
+
+The quick brown fox
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/SoftLineBreak.tid b/editions/test/tiddlers/tests/data/serialize/SoftLineBreak.tid
new file mode 100644
index 0000000000..e22202549c
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/SoftLineBreak.tid
@@ -0,0 +1,6 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/SoftLineBreak
+type: text/vnd.tiddlywiki
+
+The rain in Spain
+falls mainly on the plain
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/StrikethroughEmphasis.tid b/editions/test/tiddlers/tests/data/serialize/StrikethroughEmphasis.tid
new file mode 100644
index 0000000000..5ca1b1d2ea
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/StrikethroughEmphasis.tid
@@ -0,0 +1,5 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/StrikethroughEmphasis
+type: text/vnd.tiddlywiki
+
+This is ~~strikethrough~~ text
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/StyleBlock.tid b/editions/test/tiddlers/tests/data/serialize/StyleBlock.tid
new file mode 100644
index 0000000000..4d0ac83b65
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/StyleBlock.tid
@@ -0,0 +1,17 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/StyleBlock
+type: text/vnd.tiddlywiki
+
+@@background-color:red;
+@@.myClass
+This paragraph will have the CSS class `myClass`.
+
+* The `<ul>` around this list will also have the class `myClass`
+* List item 2
+@@
+
+@@font-size:1.5em;
+@@.coloured-text.coloured-bg
+* Block content
+* With custom style and classes
+@@
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/StyleBlock2.tid b/editions/test/tiddlers/tests/data/serialize/StyleBlock2.tid
new file mode 100644
index 0000000000..cdd31254e9
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/StyleBlock2.tid
@@ -0,0 +1,13 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/StyleBlock2
+type: text/vnd.tiddlywiki
+
+@@width:100px;
+@@.myFirstClass.mySecondClass.myThirdClass
+This is a paragraph
+@@
+
+@@background-color:lightcyan;
+* Item one
+* Item two
+@@
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/StyleInline.tid b/editions/test/tiddlers/tests/data/serialize/StyleInline.tid
new file mode 100644
index 0000000000..c491767f53
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/StyleInline.tid
@@ -0,0 +1,7 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/StyleInline
+type: text/vnd.tiddlywiki
+
+@@.myClass This is some text with a class@@
+@@background-color:red; This is some text with a background colour@@
+@@width:100px;.myClass This is some text with a class and a width@@
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/SubscriptEmphasis.tid b/editions/test/tiddlers/tests/data/serialize/SubscriptEmphasis.tid
new file mode 100644
index 0000000000..b39d7f6d5f
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/SubscriptEmphasis.tid
@@ -0,0 +1,5 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/SubscriptEmphasis
+type: text/vnd.tiddlywiki
+
+This is ,,subscript,, text
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/SuperscriptEmphasis.tid b/editions/test/tiddlers/tests/data/serialize/SuperscriptEmphasis.tid
new file mode 100644
index 0000000000..9683f9e54b
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/SuperscriptEmphasis.tid
@@ -0,0 +1,5 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/SuperscriptEmphasis
+type: text/vnd.tiddlywiki
+
+This is ^^superscript^^ text
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/SysLink.tid b/editions/test/tiddlers/tests/data/serialize/SysLink.tid
new file mode 100644
index 0000000000..fdbc982fe7
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/SysLink.tid
@@ -0,0 +1,6 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/SysLink
+type: text/vnd.tiddlywiki
+
+$:TiddlerTitle
+~$:TiddlerTitle
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/Table.tid b/editions/test/tiddlers/tests/data/serialize/Table.tid
new file mode 100644
index 0000000000..bd92db4bcc
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/Table.tid
@@ -0,0 +1,11 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/Table
+type: text/vnd.tiddlywiki
+
+|!|!Alpha|!Beta|!Gamma|!Delta|
+|!One|||||
+|!Two|||||
+|!Three|||||
+
+|cell one|cell two|
+|cell three|cell four|
diff --git a/editions/test/tiddlers/tests/data/serialize/TranscludeBlock.tid b/editions/test/tiddlers/tests/data/serialize/TranscludeBlock.tid
new file mode 100644
index 0000000000..344171af04
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/TranscludeBlock.tid
@@ -0,0 +1,21 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/TranscludeBlock
+type: text/vnd.tiddlywiki
+
+{{MyTiddler}}
+
+{{MyTiddler||TemplateTitle}}
+
+{{||TemplateTitle}}
+
+{{MyTiddler|Parameter}}
+
+{{MyTiddler||TemplateTitle|Parameter|SecondParameter}}
+
+{{MyTiddler!!field}}
+
+{{!!field}}
+
+{{MyTiddler##index}}
+
+{{##index}}
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/TranscludeInline.tid b/editions/test/tiddlers/tests/data/serialize/TranscludeInline.tid
new file mode 100644
index 0000000000..df20658cf6
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/TranscludeInline.tid
@@ -0,0 +1,5 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/TranscludeInline
+type: text/vnd.tiddlywiki
+
+{{MyTiddler}} {{MyTiddler||TemplateTitle}}
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/TypedBlock1.tid b/editions/test/tiddlers/tests/data/serialize/TypedBlock1.tid
new file mode 100644
index 0000000000..06362d0624
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/TypedBlock1.tid
@@ -0,0 +1,15 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/TypedBlock1
+type: text/vnd.tiddlywiki
+
+$$$text/vnd.tiddlywiki > text/plain
+This is ''some'' wikitext
+$$$
+
+$$$text/unknown
+Some plain text, which will not be //formatted//.
+
+$$$text/vnd.tiddlywiki > text/html
+This is ''some'' wikitext
+$$$
+
diff --git a/editions/test/tiddlers/tests/data/serialize/TypedBlock2.tid b/editions/test/tiddlers/tests/data/serialize/TypedBlock2.tid
new file mode 100644
index 0000000000..082ca533aa
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/TypedBlock2.tid
@@ -0,0 +1,19 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/TypedBlock2
+type: text/vnd.tiddlywiki
+
+$$$.js
+This will be rendered as JavaScript
+$$$
+
+$$$.svg
+<svg xmlns="http://www.w3.org/2000/svg" width="150" height="100">
+ <circle cx="100" cy="50" r="40" stroke="black" stroke-width="2" fill="red" />
+</svg>
+$$$
+
+$$$image/svg+xml
+<svg xmlns="http://www.w3.org/2000/svg" width="150" height="100">
+ <circle cx="100" cy="50" r="40" stroke="black" stroke-width="2" fill="green" />
+</svg>
+$$$
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/UnderscoreEmphasis.tid b/editions/test/tiddlers/tests/data/serialize/UnderscoreEmphasis.tid
new file mode 100644
index 0000000000..73dc6425c1
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/UnderscoreEmphasis.tid
@@ -0,0 +1,5 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/UnderscoreEmphasis
+type: text/vnd.tiddlywiki
+
+This is __underscore__ text
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/WikiLink.tid b/editions/test/tiddlers/tests/data/serialize/WikiLink.tid
new file mode 100644
index 0000000000..18b04caf18
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/WikiLink.tid
@@ -0,0 +1,7 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/WikiLink
+type: text/vnd.tiddlywiki
+
+AWikiLink
+AnotherLink
+~SuppressedLink
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/serialize/WikiLinkPrefix.tid b/editions/test/tiddlers/tests/data/serialize/WikiLinkPrefix.tid
new file mode 100644
index 0000000000..982ed90711
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/serialize/WikiLinkPrefix.tid
@@ -0,0 +1,5 @@
+tags: $:/tags/wikitext-serialize-test-spec
+title: Serialize/WikiLinkPrefix
+type: text/vnd.tiddlywiki
+
+~SuppressedLink
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/transclude/Parameterised-ParseTreeNodes.tid b/editions/test/tiddlers/tests/data/transclude/Parameterised-ParseTreeNodes.tid
index 916e2abfb8..fc0d785f8a 100644
--- a/editions/test/tiddlers/tests/data/transclude/Parameterised-ParseTreeNodes.tid
+++ b/editions/test/tiddlers/tests/data/transclude/Parameterised-ParseTreeNodes.tid
@@ -26,4 +26,4 @@ title: TiddlerOne
+
title: ExpectedResult
-<p>[{"type":"element","tag":"p","children":[{"type":"text","text":"This is a block","start":68,"end":83}],"start":68,"end":83}]</p><p>[{"type":"text","text":"This is inline","start":136,"end":152}]</p>
\ No newline at end of file
+<p>[{"type":"element","tag":"p","children":[{"type":"text","text":"This is a block","start":68,"end":83}],"start":68,"end":83,"rule":"parseblock"}]</p><p>[{"type":"text","text":"This is inline","start":136,"end":152}]</p>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/widgets/SubstitutedAttributes.tid b/editions/test/tiddlers/tests/data/widgets/SubstitutedAttributes.tid
index 9d5538573e..cdaee17d18 100644
--- a/editions/test/tiddlers/tests/data/widgets/SubstitutedAttributes.tid
+++ b/editions/test/tiddlers/tests/data/widgets/SubstitutedAttributes.tid
@@ -7,9 +7,9 @@ title: Output
\whitespace trim
<$set name="var with spaces" value="spaces">
-<$let project="TiddlyWiki" disabled="true" var-with-dashes="dashes">
+<$let project="TiddlyWiki" disabled="true" $tiddler="Getting Started" var-with-dashes="dashes">
<div class=`$(project)$
-${ [[Hello]addsuffix[There]] }$` attrib=`myvalue` otherattrib=`$(1)$` blankattrib=`` quoted="here" disabled=```$(disabled)$``` dashes=`$(var-with-dashes)$` spaces=`$(var with spaces)$`>
+${ [[Hello]addsuffix[There]] }$` attrib=`myvalue` otherattrib=`$(1)$` blankattrib=`` quoted="here" disabled=```$(disabled)$``` dollar=`p-$($tiddler)$-s` dashes=`$(var-with-dashes)$` spaces=`$(var with spaces)$`>
</div>
</$let>
</$set>
@@ -18,4 +18,4 @@ ${ [[Hello]addsuffix[There]] }$` attrib=`myvalue` otherattrib=`$(1)$` blankattri
title: ExpectedResult
<p><div attrib="myvalue" blankattrib="" class="TiddlyWiki
-HelloThere" dashes="dashes" disabled="true" otherattrib="" quoted="here" spaces="spaces"></div></p>
\ No newline at end of file
+HelloThere" dashes="dashes" disabled="true" dollar="p-Getting Started-s" otherattrib="" quoted="here" spaces="spaces"></div></p>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/test-checkbox-widget.js b/editions/test/tiddlers/tests/test-checkbox-widget.js
index 83ed66421f..52a71d0c0a 100644
--- a/editions/test/tiddlers/tests/test-checkbox-widget.js
+++ b/editions/test/tiddlers/tests/test-checkbox-widget.js
@@ -103,7 +103,7 @@ Tests the checkbox widget thoroughly.
];
var indexModeTests = fieldModeTests.map(data => {
- var newData = {...data};
+ var newData = Object.assign({}, data);
var newName = data.testName.replace('field mode', 'index mode');
var tiddlerOneAlreadyExists = false;
var newTiddlers = data.tiddlers.map(tiddler => {
@@ -274,14 +274,13 @@ Tests the checkbox widget thoroughly.
listModeTests
.filter(data => data.widgetText.includes("listField='colors'"))
.map(data => {
- var newData = {
- ...data,
- tiddlers: data.tiddlers.map(tiddler => ({...tiddler, list: tiddler.colors, colors: undefined})),
+ var newData = Object.assign({}, data, {
+ tiddlers: data.tiddlers.map(tiddler => Object.assign({}, tiddler, {list: tiddler.colors, colors: undefined})),
widgetText: data.widgetText.replace("listField='colors'", "listField='list'"),
expectedChange: {
"Colors": { list: data.expectedChange.Colors.colors.split(' ') }
},
- }
+ })
return newData;
})
);
@@ -289,20 +288,19 @@ Tests the checkbox widget thoroughly.
listModeTests
.filter(data => data.widgetText.includes("listField='colors'"))
.map(data => {
- var newData = {
- ...data,
- tiddlers: data.tiddlers.map(tiddler => ({...tiddler, tags: tiddler.colors, colors: undefined})),
+ var newData = Object.assign({}, data, {
+ tiddlers: data.tiddlers.map(tiddler => Object.assign({}, tiddler, {tags: tiddler.colors, colors: undefined})),
widgetText: data.widgetText.replace("listField='colors'", "listField='tags'"),
expectedChange: {
"Colors": { tags: data.expectedChange.Colors.colors.split(' ') }
},
- }
+ })
return newData;
})
);
var indexListModeTests = listModeTests.map(data => {
- var newData = {...data};
+ var newData = Object.assign({}, data);
var newName = data.testName.replace('list mode', 'index list mode');
var newTiddlers = data.tiddlers.map(tiddler => {
if (tiddler.hasOwnProperty('colors')) {
diff --git a/editions/test/tiddlers/tests/test-deserialize-operator.js b/editions/test/tiddlers/tests/test-deserialize-operator.js
index cc465dfbb6..0acd4ff018 100644
--- a/editions/test/tiddlers/tests/test-deserialize-operator.js
+++ b/editions/test/tiddlers/tests/test-deserialize-operator.js
@@ -29,11 +29,11 @@ Tests deserialize[] filter operator with various core deserializers
expect($tw.wiki.filterTiddlers("[{dezerializer test data case 5}deserialize[text/html]]")).toEqual(['[{"type":"text/vnd.tiddlywiki","text":"Abacus","title":"Hello \\"There\\""},{"title":"Hello \\"There\\"","text":"Calculator"},{"title":"Hello \\"There\\"","text":"Protractor"}]']);
// Deserialize JSON payload containing tiddlers
- expect($tw.wiki.filterTiddlers("[{dezerializer test data case 6}deserialize[application/json]]")).toEqual( [ `[{"created":"20230601125557184","text":"Before you start storing important information in ~TiddlyWiki it is vital to make sure that you can reliably save changes. See https://tiddlywiki.com/#GettingStarted for details\\n\\n","title":"GettingStarted","modified":"20230601125601619"},{"created":"20230601125507054","text":"Welcome to \\"TiddlyWiki\\".\\n\\nThis is a test tiddler.","tags":"","title":"Hello There \\"Welcome\\"","modified":"20230601125551144"},{"title":"TiddlyWiki","created":"20130822170700000","modified":"20170127221451610","tags":"Concepts","type":"text/vnd.tiddlywiki","text":"~TiddlyWiki is a rich, interactive tool for manipulating complex data with structure that doesn't easily fit into conventional tools like spreadsheets or wordprocessors.\\n\\n~TiddlyWiki is designed to fit around your brain, helping you deal with the things that won't fit."}]` ]);
- expect($tw.wiki.filterTiddlers("[{dezerializer test data case 6}deserialize[application/json]jsonindexes[]] :map[{dezerializer test data case 6}jsonget<currentTiddler>,[title]]")).toEqual([ 'GettingStarted', 'Hello There "Welcome"', 'TiddlyWiki' ]);
+ expect($tw.wiki.filterTiddlers("[{dezerializer test data case 6}deserialize[application/json]]")).toEqual( [ "[{\"created\":\"20230601125557184\",\"text\":\"Before you start storing important information in ~TiddlyWiki it is vital to make sure that you can reliably save changes. See https://tiddlywiki.com/#GettingStarted for details\\n\\n\",\"title\":\"GettingStarted\",\"modified\":\"20230601125601619\"},{\"created\":\"20230601125507054\",\"text\":\"Welcome to \\\"TiddlyWiki\\\".\\n\\nThis is a test tiddler.\",\"tags\":\"\",\"title\":\"Hello There \\\"Welcome\\\"\",\"modified\":\"20230601125551144\"},{\"title\":\"TiddlyWiki\",\"created\":\"20130822170700000\",\"modified\":\"20170127221451610\",\"tags\":\"Concepts\",\"type\":\"text/vnd.tiddlywiki\",\"text\":\"~TiddlyWiki is a rich, interactive tool for manipulating complex data with structure that doesn't easily fit into conventional tools like spreadsheets or wordprocessors.\\n\\n~TiddlyWiki is designed to fit around your brain, helping you deal with the things that won't fit.\"}]" ]);
+ expect($tw.wiki.filterTiddlers("[{dezerializer test data case 6}deserialize[application/json]jsonindexes[]] :map[{dezerializer test data case 6}jsonget<currentTiddler>,[title]]")).toEqual([ "GettingStarted", 'Hello There "Welcome"', "TiddlyWiki" ]);
//Deserialize TiddlyWiki file with an mismatched deserializer
- expect($tw.wiki.filterTiddlers("[{dezerializer test data case 5}deserialize[application/json]]")).toEqual([jasmine.stringMatching('JSON error')]);
+ expect($tw.wiki.filterTiddlers("[{dezerializer test data case 5}deserialize[application/json]]")).toEqual([jasmine.stringMatching("JSON error")]);
});
});
diff --git a/editions/test/tiddlers/tests/test-deserializers.js b/editions/test/tiddlers/tests/test-deserializers.js
index d207debf1a..497f618aaa 100644
--- a/editions/test/tiddlers/tests/test-deserializers.js
+++ b/editions/test/tiddlers/tests/test-deserializers.js
@@ -22,14 +22,14 @@ Tests various core deserializers
});
}
- executeTestCase("dezerializer test data case 1",[ { text: '<!doctype html>\n', type: 'text/html' } ]);
+ executeTestCase("dezerializer test data case 1",[ { text: "<!doctype html>\n", type: "text/html" } ]);
- executeTestCase("dezerializer test data case 2",[ { text: '<!doctype html>\n<html lang="en">\n<head>\n\t<meta charset="utf-8">\n\t<title>Test Data\n\n\n\n