Fix broken merge

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -21,7 +21,7 @@ body:
     attributes:
       label: To Reproduce
       description: "Steps to reproduce the behavior:"
-      placeholder: |
+      value: |
         1. Go to '...'
         2. Click on '....'
         3. Scroll down to '....'
@@ -41,7 +41,7 @@ body:
     attributes:
       label: TiddlyWiki Configuration
       description: please complete the following information
-      placeholder: |
+      value: |
         - Version [e.g. v5.1.24]
         - Saving mechanism [e.g. Node.js, TiddlyDesktop, TiddlyHost etc]
         - Plugins installed [e.g. Freelinks, TiddlyMap]

.github/ISSUE_TEMPLATE/config.yml

@@ -1,7 +1,7 @@
 blank_issues_enabled: false
 contact_links:
   - name: Discuss feature request
-    url: https://github.com/TiddlyWiki/TiddlyWiki5/discussions
+    url: https://github.com/Jermolene/TiddlyWiki5/discussions
     about: Open new discussion about new feature
   - name: Talk.Tiddlywiki Forum
     url: https://talk.tiddlywiki.org

.github/workflows/cla-check.yml

@@ -1,30 +0,0 @@
-name: Check CLA Signature
-on:
-  pull_request_target:
-    types:
-      - opened
-      - reopened
-    paths-ignore:
-      - 'licenses/cla-individual.md'
-jobs:
-  check_cla:
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-    if: ${{ (github.event.pull_request.user.login != github.repository_owner) }}
-    steps:
-    - run: |
-        if ! curl -s https://raw.githubusercontent.com/Jermolene/TiddlyWiki5/tiddlywiki-com/licenses/cla-individual.md | grep -io "@$USER,"; then
-          echo "CLA not signed"
-          gh pr comment "$NUMBER" -b "@$USER It appears that this is your first contribution to the project, welcome.
-          
-          With apologies for the bureaucracy, please could you prepare a separate PR to the 'tiddlywiki-com' branch with your signature for the Contributor License Agreement (see [contributing.md](https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/contributing.md))."
-        else
-          echo "CLA already signed"
-          gh pr comment "$NUMBER" -b "Confirmed: **$USER** has already signed the Contributor License Agreement (see [contributing.md](https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/contributing.md))"
-        fi
-      env:
-        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        GH_REPO: ${{ github.repository }}
-        NUMBER: ${{ github.event.pull_request.number }}
-        USER: ${{ github.actor }}

.github/workflows/cla-signed.yml

@@ -1,70 +0,0 @@
-name: CLA Signed
-
-on:
-  pull_request_target:
-    types:
-      - opened
-      - closed
-    paths:
-      - 'licenses/cla-individual.md'
-
-env:
-  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  GH_REPO: ${{ github.repository }}
-  NUMBER: ${{ github.event.pull_request.number }}
-  AUTHOR: ${{ github.event.pull_request.user.login }}
-
-jobs:
-  # check if PRs updating the CLA are targetting the tiddlywiki-com branch
-  check-signature-branch:
-    if: (github.event.pull_request.merged != true) && (github.event.pull_request.user.login != github.repository_owner)
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-    steps:
-    - run: |
-        if [[ "$BRANCH" != "tiddlywiki-com" ]]; then
-          echo "This CLA signature targets the wrong branch: $BRANCH"
-          gh pr comment "$NUMBER" -b "@$AUTHOR Signatures to the CLA must target the 'tiddlywiki-com' branch."
-        fi
-      env:
-        BRANCH: ${{ github.event.pull_request.base.ref }}
-
-  # leave a comment on each open PR by a given author when their signature is added to the CLA
-  cla-signed:
-    if: (github.event.pull_request.merged == true) && (github.event.pull_request.user.login != github.repository_owner)
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-    steps:
-    - name: List open PRs by user
-      id: list-prs
-      uses: actions/github-script@v6
-      with:
-        result-encoding: string
-        script: |
-          const owner = context.repo.owner,
-            repo = context.repo.repo,
-            author = context.payload.pull_request.user.login;
-
-          const { data: pullRequests } = await github.rest.pulls.list({
-            owner: owner,
-            repo: repo,
-            state: 'open',
-            sort: 'created',
-            direction: 'desc',
-            per_page: 100
-          });
-          const userPullRequests = pullRequests.filter(pr => pr.user.login === author),
-            prNumbers = userPullRequests.map(pr => pr.number).join(',');
-          console.log(`Open pull requests by ${author}:${prNumbers}`);
-          return prNumbers;
-          
-    - name: Comment open PRs by the same author
-      run: |
-        prs=($(echo ${{ steps.list-prs.outputs.result }} | tr "," "\n"))  
-  
-        for number in "${prs[@]}"  
-        do  
-          gh pr comment "$number" -b "**$AUTHOR** has signed the Contributor License Agreement (see [contributing.md](https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/contributing.md))"
-        done     

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.5
+    TW5_BUILD_VERSION=v5.3.3
 fi
 
 echo "Using TW5_BUILD_VERSION as [$TW5_BUILD_VERSION]"
@@ -164,6 +164,20 @@ node $TW5_BUILD_TIDDLYWIKI \
 	--rendertiddler $:/core/save/all tour.html text/plain \
 	|| exit 1
 
+# /dev/index.html			Developer docs
+# /dev/favicon.ico			Favicon for dev site
+# /dev/static.html			Static rendering of default tiddlers
+# /dev/alltiddlers.html		Static rendering of all tiddlers
+# /dev/static/*				Static single tiddlers
+# /dev/static/static.css	Static stylesheet
+node $TW5_BUILD_TIDDLYWIKI \
+	./editions/dev \
+	--verbose \
+	--load $TW5_BUILD_OUTPUT/build.tid \
+	--output $TW5_BUILD_OUTPUT/dev \
+	--build index favicon static \
+	|| exit 1
+
 # /share.html				Custom edition for sharing via the URL
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/share \

bin/ci-pre-build.sh

@@ -7,4 +7,4 @@ npm --force install tiddlywiki || exit 1
 
 # Pull existing GitHub pages content
 
-git clone --depth=1 --branch=master "https://github.com/TiddlyWiki/tiddlywiki.com-gh-pages.git" output
+git clone --depth=1 --branch=master "https://github.com/Jermolene/jermolene.github.io.git" output

bin/ci-push.sh

@@ -10,6 +10,6 @@ git config --global user.email "actions@github.com"
 git config --global user.name "GitHub Actions"
 git add -A .
 git commit --message "GitHub build: $GITHUB_RUN_NUMBER of $TW5_BUILD_BRANCH ($(date +'%F %T %Z'))"
-git remote add deploy "https://$GH_TOKEN@github.com/TiddlyWiki/tiddlywiki.com-gh-pages.git" &>/dev/null
+git remote add deploy "https://$GH_TOKEN@github.com/Jermolene/jermolene.github.io.git" &>/dev/null
 git push deploy master &>/dev/null
 cd ..

bin/readme-bld.sh

@@ -15,11 +15,3 @@ node $TW5_BUILD_TIDDLYWIKI \
 	--output . \
 	--build readmes \
 	|| exit 1
-
-# tw.org readmes
-node $TW5_BUILD_TIDDLYWIKI \
-	editions/tw.org \
-	--verbose \
-	--output . \
-	--build readmes \
-	|| exit 1

code-of-conduct.md

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

core/images/input-button.tid

@@ -1,5 +0,0 @@
-title: $:/core/images/input-button
-tags: $:/tags/Image
-
-\parameters (size:"22pt")
-<svg width=<<size>> height=<<size>> class="tc-image-input-button tc-image-button" viewBox="0 0 22 22"><path d="M1.375 22h19.249c.365 0 .716-.145.973-.404v.001c.258-.257.404-.607.403-.972v-11a1.376 1.376 0 0 0-2.75 0v9.625H2.75V9.625a1.376 1.376 0 0 0-2.75 0v11C0 21.384.617 22 1.375 22Z"/><path d="m9.732 11.904-1.541-1.541a1.375 1.375 0 1 0-1.944 1.944l3.887 3.888c.258.258.608.402.973.402h-.001c.353 0 .705-.134.974-.402l3.888-3.889a1.376 1.376 0 0 0 .001-1.944 1.377 1.377 0 0 0-1.946 0l-1.541 1.542V1.376a1.375 1.375 0 1 0-2.75 0v10.528Z"/></svg>

core/language/en-GB/Buttons.multids

@@ -104,8 +104,6 @@ ShowSideBar/Caption: show sidebar
 ShowSideBar/Hint: Show sidebar
 TagManager/Caption: tag manager
 TagManager/Hint: Open tag manager
-TestCaseImport/Caption: import tiddlers
-TestCaseImport/Hint: Import tiddlers
 Timestamp/Caption: timestamps
 Timestamp/Hint: Choose whether modifications update timestamps
 Timestamp/On/Caption: timestamps are on

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

@@ -65,10 +65,6 @@ sidebar-tab-foreground-selected: Sidebar tab foreground for selected tabs
 sidebar-tab-foreground: Sidebar tab foreground
 sidebar-tiddler-link-foreground-hover: Sidebar tiddler link foreground hover
 sidebar-tiddler-link-foreground: Sidebar tiddler link foreground
-stability-stable: Badge for stability level "stable"
-stability-experimental: Badge for stability level "experimental"
-stability-deprecated: Badge for stability level "deprecated"
-stability-legacy: Badge for stability level "legacy"
 testcase-accent-level-1: Test case accent colour with no nesting
 testcase-accent-level-2: Test case accent colour with 2nd level nesting
 testcase-accent-level-3: Test case accent colour with 3rd level nesting or higher

core/modules/commands/fetch.js

@@ -120,7 +120,7 @@ Command.prototype.fetchFile = function(url,options,callback,redirectCount) {
 	        }
 	   	});
 	   	response.on("error",function(e) {
-			console.log("Error on GET request: " + e);
+			self.commander.log("Error on GET request: " + e);
 			callback(e);
 	   	});
 	});

core/modules/commands/render.js

@@ -47,7 +47,7 @@ Render individual tiddlers and save the results to the specified files
 		$tw.utils.each(tiddlers,function(title) {
 			var filepath = path.resolve(self.commander.outputPath,wiki.filterTiddlers(filenameFilter,$tw.rootWidget,wiki.makeTiddlerIterator([title]))[0]);
 			if(self.commander.verbose) {
-				console.log("Rendering \"" + title + "\" to \"" + filepath + "\"");
+				self.commander.log("Rendering \"" + title + "\" to \"" + filepath + "\"");
 			}
 			var parser = wiki.parseTiddler(template || title),
 				widgetNode = wiki.makeWidget(parser,{variables: $tw.utils.extend({},variables,{currentTiddler: title,storyTiddler: title})}),
@@ -63,4 +63,4 @@ Render individual tiddlers and save the results to the specified files
 	exports.Command = Command;
 	
 	})();
-	
+	

core/modules/commands/save.js

@@ -48,7 +48,7 @@ Saves individual tiddlers in their raw text or binary format to the specified fi
 						}
 					});
 					if(self.commander.verbose) {
-						console.log("Saving \"" + title + "\" to \"" + fileInfo.filepath + "\"");
+						self.commander.log("Saving \"" + title + "\" to \"" + filepath + "\"");
 					}
 					try {
 						$tw.utils.saveTiddlerToFileSync(tiddler,fileInfo);

core/modules/filters/backtranscludes.js

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

core/modules/filters/strings.js

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

core/modules/filters/transcludes.js

@@ -20,7 +20,7 @@ exports.transcludes = function(source,operator,options) {
 	source(function(tiddler,title) {
 		results.pushTop(options.wiki.getTiddlerTranscludes(title));
 	});
-	return results.makeTiddlerIterator(options.wiki);
+	return results.toArray();
 };
 
 })();

core/modules/indexers/back-indexer.js

@@ -75,7 +75,7 @@ BackSubIndexer.prototype._getTarget = function(tiddler) {
 	}
 	var parser = this.wiki.parseText(tiddler.fields.type, tiddler.fields.text, {});
 	if(parser) {
-		return this.wiki[this.extractor](parser.tree, tiddler.fields.title);
+		return this.wiki[this.extractor](parser.tree);
 	}
 	return [];
 }

core/modules/parsers/parseutils.js

@@ -114,7 +114,7 @@ exports.parseStringLiteral = function(source,pos) {
 	var match = reString.exec(source);
 	if(match && match.index === pos) {
 		node.value = match[1] !== undefined ? match[1] :(
-			match[2] !== undefined ? match[2] : match[3]
+			match[2] !== undefined ? match[2] : match[3] 
 					);
 		node.end = pos + match[0].length;
 		return node;

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

@@ -29,16 +29,13 @@ exports.init = function(parser) {
 
 exports.parse = function() {
 	var reEnd = /(\r?\n```$)/mg;
-	var languageStart = this.parser.pos + 3,
-		languageEnd = languageStart + this.match[1].length;
 	// Move past the match
 	this.parser.pos = this.matchRegExp.lastIndex;
 
 	// Look for the end of the block
 	reEnd.lastIndex = this.parser.pos;
 	var match = reEnd.exec(this.parser.source),
-		text,
-		codeStart = this.parser.pos;
+		text;
 	// Process the block
 	if(match) {
 		text = this.parser.source.substring(this.parser.pos,match.index);
@@ -51,8 +48,8 @@ exports.parse = function() {
 	return [{
 			type: "codeblock",
 			attributes: {
-					code: {type: "string", value: text, start: codeStart, end: this.parser.pos},
-					language: {type: "string", value: this.match[1], start: languageStart, end: languageEnd}
+					code: {type: "string", value: text},
+					language: {type: "string", value: this.match[1]}
 			}
 	}];
 };

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

@@ -33,8 +33,7 @@ exports.parse = function() {
 	// Look for the end marker
 	reEnd.lastIndex = this.parser.pos;
 	var match = reEnd.exec(this.parser.source),
-		text,
-		start = this.parser.pos;
+		text;
 	// Process the text
 	if(match) {
 		text = this.parser.source.substring(this.parser.pos,match.index);
@@ -48,9 +47,7 @@ exports.parse = function() {
 		tag: "code",
 		children: [{
 			type: "text",
-			text: text,
-			start: start,
-			end: this.parser.pos
+			text: text
 		}]
 	}];
 };

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

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

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

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

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

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

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

@@ -45,11 +45,10 @@ exports.parse = function() {
 		reEnd.lastIndex = this.parser.pos;
 		match = reEnd.exec(this.parser.source);
 		if(match) {
-			var start = this.parser.pos;
 			this.parser.pos = reEnd.lastIndex;
 			// Add a line break if the terminator was a line break
 			if(match[2]) {
-				tree.push({type: "element", tag: "br", start: start, end: this.parser.pos});
+				tree.push({type: "element", tag: "br"});
 			}
 		}
 	} while(match && !match[1]);

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

@@ -30,17 +30,15 @@ exports.parse = function() {
 	// Move past the !s
 	this.parser.pos = this.matchRegExp.lastIndex;
 	// Parse any classes, whitespace and then the heading itself
-	var classStart = this.parser.pos;
 	var classes = this.parser.parseClasses();
-	var classEnd = this.parser.pos;
 	this.parser.skipWhitespace({treatNewlinesAsNonWhitespace: true});
 	var tree = this.parser.parseInlineRun(/(\r?\n)/mg);
 	// Return the heading
 	return [{
 		type: "element",
-		tag: "h" + headingLevel,
+		tag: "h" + headingLevel, 
 		attributes: {
-			"class": {type: "string", value: classes.join(" "), start: classStart, end: classEnd}
+			"class": {type: "string", value: classes.join(" ")}
 		},
 		children: tree
 	}];

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

@@ -44,10 +44,6 @@ Parse the most recent match
 exports.parse = function() {
 	// Retrieve the most recent match so that recursive calls don't overwrite it
 	var tag = this.nextTag;
-	if (!tag.isSelfClosing) {
-		tag.openTagStart = tag.start;
-		tag.openTagEnd = tag.end;
-	}
 	this.nextTag = null;
 	// Advance the parser position to past the tag
 	this.parser.pos = tag.end;
@@ -64,27 +60,6 @@ exports.parse = function() {
 			var reEnd = new RegExp("(" + reEndString + ")","mg");
 			tag.children = this.parser.parseInlineRun(reEnd,{eatTerminator: true});
 		}
-		tag.end = this.parser.pos;
-		tag.closeTagEnd = tag.end;
-		if (tag.closeTagEnd === tag.openTagEnd || this.parser.source[tag.closeTagEnd - 1] !== '>') {
-			tag.closeTagStart = tag.end;
-		} else {
-			tag.closeTagStart = tag.closeTagEnd - 2;
-			var closeTagMinPos = tag.children.length > 0 ? tag.children[tag.children.length-1].end : tag.openTagEnd;
-			if (!Number.isSafeInteger(closeTagMinPos)) closeTagMinPos = tag.openTagEnd;
-			while (tag.closeTagStart >= closeTagMinPos) {
-				var char = this.parser.source[tag.closeTagStart];
-				if (char === '>') {
-					tag.closeTagStart = -1;
-					break;
-				}
-				if (char === '<') break;
-				tag.closeTagStart -= 1;
-			}
-			if (tag.closeTagStart < closeTagMinPos) {
-				tag.closeTagStart = tag.end;
-			}
-		}
 	}
 	// Return the tag
 	return [tag];

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

@@ -122,9 +122,9 @@ exports.parseImage = function(source,pos) {
 	}
 	pos = token.end;
 	if(token.match[1]) {
-		node.attributes.tooltip = {type: "string", value: token.match[1].trim(),start: token.start,end:token.start + token.match[1].length - 1};
+		node.attributes.tooltip = {type: "string", value: token.match[1].trim()};
 	}
-	node.attributes.source = {type: "string", value: (token.match[2] || "").trim(), start: token.start + (token.match[1] ? token.match[1].length : 0), end: token.end - 2};
+	node.attributes.source = {type: "string", value: (token.match[2] || "").trim()};
 	// Update the end position
 	node.end = pos;
 	return node;

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

@@ -38,14 +38,13 @@ exports.parse = function() {
 	// Parse the filter terminated by a line break
 	var reMatch = /(.*)(?:$|\r?\n)/mg;
 	reMatch.lastIndex = this.parser.pos;
-	var filterStart = this.parser.source;
 	var match = reMatch.exec(this.parser.source);
 	this.parser.pos = reMatch.lastIndex;
 	// Parse tree nodes to return
 	return [{
 		type: "importvariables",
 		attributes: {
-			filter: {type: "string", value: match[1], start: filterStart, end: this.parser.pos}
+			filter: {type: "string", value: match[1]}
 		},
 		children: []
 	}];

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

@@ -74,7 +74,6 @@ exports.parse = function() {
 		// Match the list marker
 		var reMatch = /([\*#;:>]+)/mg;
 		reMatch.lastIndex = this.parser.pos;
-		var start = this.parser.pos;
 		var match = reMatch.exec(this.parser.source);
 		if(!match || match.index !== this.parser.pos) {
 			break;
@@ -95,21 +94,9 @@ exports.parse = function() {
 			}
 			// Construct the list element or reuse the previous one at this level
 			if(listStack.length <= t) {
-				var listElement = {
-					type: "element",
-					tag: listInfo.listTag,
-					children: [
-						{
-							type: "element",
-							tag: listInfo.itemTag,
-							children: [],
-							start: start,
-							end: this.parser.pos,
-						}
-					],
-					start: start,
-					end: this.parser.pos,
-				};
+				var listElement = {type: "element", tag: listInfo.listTag, children: [
+					{type: "element", tag: listInfo.itemTag, children: []}
+				]};
 				// Link this list element into the last child item of the parent list item
 				if(t) {
 					var prevListItem = listStack[t-1].children[listStack[t-1].children.length-1];
@@ -118,33 +105,21 @@ exports.parse = function() {
 				// Save this element in the stack
 				listStack[t] = listElement;
 			} else if(t === (match[0].length - 1)) {
-				listStack[t].children.push({
-					type: "element",
-					tag: listInfo.itemTag,
-					children: [],
-					start: start,
-					end: this.parser.pos,
-				});
+				listStack[t].children.push({type: "element", tag: listInfo.itemTag, children: []});
 			}
 		}
 		if(listStack.length > match[0].length) {
 			listStack.splice(match[0].length,listStack.length - match[0].length);
 		}
 		// Process the body of the list item into the last list item
-		var classStart = this.parser.pos;
 		var lastListChildren = listStack[listStack.length-1].children,
 			lastListItem = lastListChildren[lastListChildren.length-1],
 			classes = this.parser.parseClasses();
-		var classEnd = this.parser.pos;
 		this.parser.skipWhitespace({treatNewlinesAsNonWhitespace: true});
 		var tree = this.parser.parseInlineRun(/(\r?\n)/mg);
 		lastListItem.children.push.apply(lastListItem.children,tree);
-		lastListItem.end = this.parser.pos;
-		listStack[listStack.length-1].end = this.parser.pos;
 		if(classes.length > 0) {
 			$tw.utils.addClassToParseTreeNode(lastListItem,classes.join(" "));
-			lastListItem.attributes.class.start = classStart;
-			lastListItem.attributes.class.end = classEnd;
 		}
 		// Consume any whitespace following the list item
 		this.parser.skipWhitespace();

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

@@ -96,20 +96,15 @@ exports.parseLink = function(source,pos) {
 		splitPos = null;
 	}
 	// Pull out the tooltip and URL
-	var tooltip, URL, urlStart;
-	textNode.start = pos;
+	var tooltip, URL;
 	if(splitPos) {
-		urlStart = splitPos + 1;
 		URL = source.substring(splitPos + 1,closePos).trim();
 		textNode.text = source.substring(pos,splitPos).trim();
-		textNode.end = splitPos;
 	} else {
-		urlStart = pos;
 		URL = source.substring(pos,closePos).trim();
 		textNode.text = URL;
-		textNode.end = closePos;
 	}
-	node.attributes.href = {type: "string", value: URL, start: urlStart, end: closePos};
+	node.attributes.href = {type: "string", value: URL};
 	node.attributes.target = {type: "string", value: "_blank"};
 	node.attributes.rel = {type: "string", value: "noopener noreferrer"};
 	// Update the end position

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

@@ -29,39 +29,32 @@ exports.init = function(parser) {
 
 exports.parse = function() {
 	// Move past the match
-	var start = this.parser.pos + 2;
 	this.parser.pos = this.matchRegExp.lastIndex;
 	// Process the link
 	var text = this.match[1],
-		link = this.match[2] || text,
-		textEndPos = this.parser.source.indexOf("|", start);
-	if (textEndPos < 0 || textEndPos > this.matchRegExp.lastIndex) {
-		textEndPos = this.matchRegExp.lastIndex - 2;
-	}
-	var linkStart = this.match[2] ? (start + this.match[1].length + 1) : start;
-	var linkEnd = linkStart + link.length;
+		link = this.match[2] || text;
 	if($tw.utils.isLinkExternal(link)) {
 		return [{
 			type: "element",
 			tag: "a",
 			attributes: {
-				href: {type: "string", value: link, start: linkStart, end: linkEnd},
+				href: {type: "string", value: link},
 				"class": {type: "string", value: "tc-tiddlylink-external"},
 				target: {type: "string", value: "_blank"},
 				rel: {type: "string", value: "noopener noreferrer"}
 			},
 			children: [{
-				type: "text", text: text, start: start, end: textEndPos
+				type: "text", text: text
 			}]
 		}];
 	} else {
 		return [{
 			type: "link",
 			attributes: {
-				to: {type: "string", value: link, start: linkStart, end: linkEnd}
+				to: {type: "string", value: link}
 			},
 			children: [{
-				type: "text", text: text, start: start, end: textEndPos
+				type: "text", text: text
 			}]
 		}];
 	}

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

@@ -28,13 +28,9 @@ exports.parse = function() {
 	// Move past the <s
 	this.parser.pos = this.matchRegExp.lastIndex;
 	// Parse any classes, whitespace and then the optional cite itself
-	var classStart = this.parser.pos;
 	classes.push.apply(classes, this.parser.parseClasses());
-	var classEnd = this.parser.pos;
 	this.parser.skipWhitespace({treatNewlinesAsNonWhitespace: true});
-	var citeStart = this.parser.pos;
 	var cite = this.parser.parseInlineRun(/(\r?\n)/mg);
-	var citeEnd = this.parser.pos;
 	// before handling the cite, parse the body of the quote
 	var tree = this.parser.parseBlocks(reEndString);
 	// If we got a cite, put it before the text
@@ -42,24 +38,18 @@ exports.parse = function() {
 		tree.unshift({
 			type: "element",
 			tag: "cite",
-			children: cite,
-			start: citeStart,
-			end: citeEnd
+			children: cite
 		});
 	}
 	// Parse any optional cite
 	this.parser.skipWhitespace({treatNewlinesAsNonWhitespace: true});
-	citeStart = this.parser.pos;
 	cite = this.parser.parseInlineRun(/(\r?\n)/mg);
-	citeEnd = this.parser.pos;
 	// If we got a cite, push it
 	if(cite.length > 0) {
 		tree.push({
 			type: "element",
 			tag: "cite",
-			children: cite,
-			start: citeStart,
-			end: citeEnd
+			children: cite
 		});
 	}
 	// Return the blockquote element
@@ -67,7 +57,7 @@ exports.parse = function() {
 		type: "element",
 		tag: "blockquote",
 		attributes: {
-			class: { type: "string", value: classes.join(" "), start: classStart, end: classEnd },
+			class: { type: "string", value: classes.join(" ") },
 		},
 		children: tree
 	}];

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

@@ -29,11 +29,10 @@ exports.init = function(parser) {
 exports.parse = function() {
 	var match = this.match[0];
 	// Move past the match
-	var start = this.parser.pos;
 	this.parser.pos = this.matchRegExp.lastIndex;
 	// Create the link unless it is suppressed
 	if(match.substr(0,1) === "~") {
-		return [{type: "text", text: match.substr(1), start: start+1, end: this.parser.pos}];
+		return [{type: "text", text: match.substr(1)}];
 	} else {
 		return [{
 			type: "link",
@@ -42,12 +41,10 @@ exports.parse = function() {
 			},
 			children: [{
 				type: "text",
-				text: match,
-				start: start,
-				end: this.parser.pos
+				text: match
 			}]
 		}];
 	}
 };
 
-})();
+})();

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

@@ -150,7 +150,7 @@ exports.parse = function() {
 		} else {
 			// Otherwise, create a new row if this one is of a different type
 			if(rowType !== currRowType) {
-				rowContainer = {type: "element", tag: rowContainerTypes[rowType], children: [], start: this.parser.pos, end: this.parser.pos};
+				rowContainer = {type: "element", tag: rowContainerTypes[rowType], children: []};
 				table.children.push(rowContainer);
 				currRowType = rowType;
 			}
@@ -178,7 +178,6 @@ exports.parse = function() {
 				// Increment the row count
 				rowCount++;
 			}
-			rowContainer.end = this.parser.pos;
 		}
 		rowMatch = rowRegExp.exec(this.parser.source);
 	}

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

@@ -46,7 +46,6 @@ exports.parse = function() {
 		renderType = this.match[2];
 	// Move past the match
 	this.parser.pos = this.matchRegExp.lastIndex;
-	var start = this.parser.pos;
 	// Look for the end of the block
 	reEnd.lastIndex = this.parser.pos;
 	var match = reEnd.exec(this.parser.source),
@@ -75,9 +74,7 @@ exports.parse = function() {
 			tag: "pre",
 			children: [{
 				type: "text",
-				text: text,
-				start: start,
-				end: this.parser.pos
+				text: text
 			}]
 		}];
 	}

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

@@ -36,7 +36,6 @@ exports.parse = function() {
 	// Get the details of the match
 	var linkText = this.match[0];
 	// Move past the macro call
-	var start = this.parser.pos;
 	this.parser.pos = this.matchRegExp.lastIndex;
 	// If the link starts with the unwikilink character then just output it as plain text
 	if(linkText.substr(0,1) === $tw.config.textPrimitives.unWikiLink) {
@@ -58,9 +57,7 @@ exports.parse = function() {
 		},
 		children: [{
 			type: "text",
-			text: linkText,
-			start: start,
-			end: this.parser.pos
+			text: linkText
 		}]
 	}];
 };

core/modules/parsers/wikiparser/wikiparser.js

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

core/modules/saver-handler.js

@@ -95,7 +95,6 @@ function SaverHandler(options) {
 	if($tw.browser) {
 		$tw.rootWidget.addEventListener("tm-save-wiki",function(event) {
 			self.saveWiki({
-				wiki: event.widget.wiki,
 				template: event.param,
 				downloadType: "text/plain",
 				variables: event.paramObject
@@ -103,7 +102,6 @@ function SaverHandler(options) {
 		});
 		$tw.rootWidget.addEventListener("tm-download-file",function(event) {
 			self.saveWiki({
-				wiki: event.widget.wiki,
 				method: "download",
 				template: event.param,
 				downloadType: "text/plain",
@@ -149,22 +147,20 @@ Save the wiki contents. Options are:
 	method: "save", "autosave" or "download"
 	template: the tiddler containing the template to save
 	downloadType: the content type for the saved file
-	wiki: optional wiki, overriding the default wiki specified in the constructor
 */
 SaverHandler.prototype.saveWiki = function(options) {
 	options = options || {};
 	var self = this,
-		wiki = options.wiki || this.wiki,
 		method = options.method || "save";
 	// Ignore autosave if disabled
-	if(method === "autosave" && ($tw.config.disableAutoSave || wiki.getTiddlerText(this.titleAutoSave,"yes") !== "yes")) {
+	if(method === "autosave" && ($tw.config.disableAutoSave || this.wiki.getTiddlerText(this.titleAutoSave,"yes") !== "yes")) {
 		return false;
 	}
 	var	variables = options.variables || {},
 		template = (options.template || 
-		           wiki.getTiddlerText("$:/config/SaveWikiButton/Template","$:/core/save/all")).trim(),
+		           this.wiki.getTiddlerText("$:/config/SaveWikiButton/Template","$:/core/save/all")).trim(),
 		downloadType = options.downloadType || "text/plain",
-		text = wiki.renderTiddler(downloadType,template,options),
+		text = this.wiki.renderTiddler(downloadType,template,options),
 		callback = function(err) {
 			if(err) {
 				alert($tw.language.getString("Error/WhileSaving") + ":\n\n" + err);

core/modules/server/authenticators/header.js

@@ -37,9 +37,7 @@ HeaderAuthenticator.prototype.authenticateRequest = function(request,response,st
 		return false;
 	} else {
 		// authenticatedUsername will be undefined for anonymous users
-		if(username) {
-			state.authenticatedUsername = $tw.utils.decodeURIComponentSafe(username);
-		}
+		state.authenticatedUsername = $tw.utils.decodeURIComponentSafe(username);
 		return true;
 	}
 };

core/modules/server/server.js

@@ -33,7 +33,13 @@ function Server(options) {
 	this.routes = options.routes || [];
 	this.authenticators = options.authenticators || [];
 	this.wiki = options.wiki;
+	this.logger = new $tw.utils.Logger("server",{colour: "cyan"});
+	this.logger.setPrefix(":" + process.pid + "-" + (Number(new Date()) - 1095776640000));
 	this.boot = options.boot || $tw.boot;
+	// Name the server and init the boot state
+	this.servername = $tw.utils.transliterateToSafeASCII(this.get("server-name") || this.wiki.getTiddlerText("$:/SiteTitle") || "TiddlyWiki5");
+	this.boot.origin = this.get("origin")? this.get("origin"): this.protocol+"://"+this.get("host")+":"+this.get("port");
+	this.boot.pathPrefix = this.get("path-prefix") || "";
 	// Initialise the variables
 	this.variables = $tw.utils.extend({},this.defaultVariables);
 	if(options.variables) {
@@ -92,10 +98,6 @@ function Server(options) {
 		this.protocol = "https";
 	}
 	this.transport = require(this.protocol);
-	// Name the server and init the boot state
-	this.servername = $tw.utils.transliterateToSafeASCII(this.get("server-name") || this.wiki.getTiddlerText("$:/SiteTitle") || "TiddlyWiki5");
-	this.boot.origin = this.get("origin")? this.get("origin"): this.protocol+"://"+this.get("host")+":"+this.get("port");
-	this.boot.pathPrefix = this.get("path-prefix") || "";
 }
 
 /*
@@ -287,9 +289,9 @@ Server.prototype.requestHandler = function(request,response,options) {
 	var route = self.findMatchingRoute(request,state);
 	// Optionally output debug info
 	if(self.get("debug-level") !== "none") {
-		console.log("Request path:",JSON.stringify(state.urlInfo));
-		console.log("Request headers:",JSON.stringify(request.headers));
-		console.log("authenticatedUsername:",state.authenticatedUsername);
+		self.logger.log("Request path:",JSON.stringify(state.urlInfo.href));
+		self.logger.log("Request headers:",JSON.stringify(request.headers));
+		self.logger.log("authenticatedUsername:",state.authenticatedUsername);
 	}
 	// Return a 404 if we didn't find a route
 	if(!route) {

core/modules/startup/plugins.js

@@ -61,7 +61,7 @@ exports.startup = function() {
 				// Collect the shadow tiddlers of any modified plugins
 				$tw.utils.each(changes.modifiedPlugins,function(pluginTitle) {
 					var pluginInfo = $tw.wiki.getPluginInfo(pluginTitle);
-					if(pluginInfo && pluginInfo.tiddlers) {
+					if(pluginInfo) {
 						$tw.utils.each(Object.keys(pluginInfo.tiddlers),function(title) {
 							changedShadowTiddlers[title] = false;
 						});

core/modules/utils/logger.js

@@ -21,6 +21,7 @@ function Logger(componentName,options) {
 	options = options || {};
 	this.componentName = componentName || "";
 	this.colour = options.colour || "white";
+	this.prefix = options.prefix || "";
 	this.enable = "enable" in options ? options.enable : true;
 	this.save = "save" in options ? options.save : true;
 	this.saveLimit = options.saveLimit || 100 * 1024;
@@ -33,6 +34,20 @@ Logger.prototype.setSaveBuffer = function(logger) {
 	this.saveBufferLogger = logger;
 };
 
+/*
+Change the output colour
+*/
+Logger.prototype.setColour = function(colour) {
+	this.colour = colour || "white";
+};
+
+/*
+Change the prefix
+*/
+Logger.prototype.setPrefix = function(prefix) {
+	this.prefix = prefix || "";
+};
+
 /*
 Log a message
 */

core/modules/widgets/action-log.js

@@ -66,12 +66,7 @@ LogWidget.prototype.log = function() {
 	});
 
 	for(var v in this.variables) {
-		var variable = this.parentWidget && this.parentWidget.variables[v];
-		if(variable && variable.isFunctionDefinition) {
-			allVars[v] = variable.value;
-		} else {
-			allVars[v]  = this.getVariable(v,{defaultValue:""});
-		}
+		allVars[v] = this.getVariable(v,{defaultValue:""});
 	}
 	if(this.filter) {
 		filteredVars = this.wiki.compileFilter(this.filter).call(this.wiki,this.wiki.makeTiddlerIterator(allVars));

core/modules/widgets/button.js

@@ -262,7 +262,7 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
 */
 ButtonWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
-	if(changedAttributes.tooltip || changedAttributes.actions || changedAttributes.to || changedAttributes.message || changedAttributes.param || changedAttributes.set || changedAttributes.setTo || changedAttributes.popup || changedAttributes.hover || changedAttributes.selectedClass || changedAttributes.style || changedAttributes.dragFilter || changedAttributes.dragTiddler || (this.set && changedTiddlers[this.set]) || (this.popup && changedTiddlers[this.popup]) || (this.popupTitle && changedTiddlers[this.popupTitle]) || changedAttributes.popupAbsCoords || changedAttributes.setTitle || changedAttributes.setField || changedAttributes.setIndex || changedAttributes.popupTitle || changedAttributes.disabled || changedAttributes["default"]) {
+	if(changedAttributes.actions || changedAttributes.to || changedAttributes.message || changedAttributes.param || changedAttributes.set || changedAttributes.setTo || changedAttributes.popup || changedAttributes.hover || changedAttributes.selectedClass || changedAttributes.style || changedAttributes.dragFilter || changedAttributes.dragTiddler || (this.set && changedTiddlers[this.set]) || (this.popup && changedTiddlers[this.popup]) || (this.popupTitle && changedTiddlers[this.popupTitle]) || changedAttributes.popupAbsCoords || changedAttributes.setTitle || changedAttributes.setField || changedAttributes.setIndex || changedAttributes.popupTitle || changedAttributes.disabled || changedAttributes["default"]) {
 		this.refreshSelf();
 		return true;
 	} else {

core/modules/widgets/data.js

@@ -91,9 +91,7 @@ DataWidget.prototype.computeDataTiddlerValues = function() {
 			var titles = this.wiki.filterTiddlers(filter);
 			$tw.utils.each(titles,function(title) {
 				var tiddler = self.wiki.getTiddler(title);
-				if(tiddler) {
-					tiddlers.push(tiddler);
-				}
+				tiddlers.push(tiddler);
 			});
 		}
 	}

core/modules/wiki.js

@@ -551,41 +551,28 @@ exports.getTiddlerBacklinks = function(targetTitle) {
 
 
 /*
-Return an array of tiddler titles that are directly transcluded within the given parse tree. `title` is the tiddler being parsed, we will ignore its self-referential transclusions, only return
+Return an array of tiddler titles that are directly transcluded within the given parse tree
  */
-exports.extractTranscludes = function(parseTreeRoot, title) {
+exports.extractTranscludes = function(parseTreeRoot) {
 	// Count up the transcludes
 	var transcludes = [],
 		checkParseTree = function(parseTree, parentNode) {
 			for(var t=0; t<parseTree.length; t++) {
 				var parseTreeNode = parseTree[t];
-				if(parseTreeNode.type === "transclude") {
-					if(parseTreeNode.attributes.$tiddler && parseTreeNode.attributes.$tiddler.type === "string") {
-						var value;
-						// if it is Transclusion with Templates like `{{Index||$:/core/ui/TagTemplate}}`, the `$tiddler` will point to the template. We need to find the actual target tiddler from parent node
-						if(parentNode && parentNode.type === "tiddler" && parentNode.attributes.tiddler && parentNode.attributes.tiddler.type === "string") {
-							// Empty value (like `{{!!field}}`) means self-referential transclusion. 
-							value = parentNode.attributes.tiddler.value || title;
-						} else {
-							value = parseTreeNode.attributes.$tiddler.value;
-						}
-					} else if(parseTreeNode.attributes.tiddler && parseTreeNode.attributes.tiddler.type === "string") {
-						// Old transclude widget usage
-						value = parseTreeNode.attributes.tiddler.value;
-					} else if(parseTreeNode.attributes.$field && parseTreeNode.attributes.$field.type === "string") {
-						// Empty value (like `<$transclude $field='created'/>`) means self-referential transclusion. 
-						value = title;
-					} else if(parseTreeNode.attributes.field && parseTreeNode.attributes.field.type === "string") {
-						// Old usage with Empty value (like `<$transclude field='created'/>`)
-						value = title;
+				if(parseTreeNode.type === "transclude" && parseTreeNode.attributes.$tiddler && parseTreeNode.attributes.$tiddler.type === "string") {
+					var value;
+					// if it is Transclusion with Templates like `{{Index||$:/core/ui/TagTemplate}}`, the `$tiddler` will point to the template. We need to find the actual target tiddler from parent node
+					if(parentNode && parentNode.type === "tiddler" && parentNode.attributes.tiddler && parentNode.attributes.tiddler.type === "string") {
+						value = parentNode.attributes.tiddler.value;
+					} else {
+						value = parseTreeNode.attributes.$tiddler.value;
 					}
-					// Deduplicate the result.
-					if(value && transcludes.indexOf(value) === -1) {
-						$tw.utils.pushTop(transcludes,value);
+					if(transcludes.indexOf(value) === -1) {
+						transcludes.push(value);
 					}
 				}
 				if(parseTreeNode.children) {
-					checkParseTree(parseTreeNode.children,parseTreeNode);
+					checkParseTree(parseTreeNode.children, parseTreeNode);
 				}
 			}
 		};
@@ -604,8 +591,7 @@ exports.getTiddlerTranscludes = function(title) {
 		// Parse the tiddler
 		var parser = self.parseTiddler(title);
 		if(parser) {
-			// this will ignore self-referential transclusions from `title`
-			return self.extractTranscludes(parser.tree,title);
+			return self.extractTranscludes(parser.tree);
 		}
 		return [];
 	});

core/palettes/GruvBoxDark.tid

@@ -82,10 +82,6 @@ sidebar-tab-foreground: <<colour tab-foreground>>
 sidebar-tiddler-link-foreground-hover: #458588
 sidebar-tiddler-link-foreground: #98971a
 site-title-foreground: <<colour tiddler-title-foreground>>
-stability-deprecated: #cc241d
-stability-experimental: #d79921
-stability-legacy: #458588
-stability-stable: #98971a
 static-alert-foreground: #B48EAD
 tab-background-selected: #ebdbb2
 tab-background: #665c54

core/palettes/Nord.tid

@@ -82,10 +82,6 @@ sidebar-tab-foreground: <<colour tab-foreground>>
 sidebar-tiddler-link-foreground-hover: #A3BE8C
 sidebar-tiddler-link-foreground: #81A1C1
 site-title-foreground: <<colour tiddler-title-foreground>>
-stability-deprecated: #bf616a
-stability-experimental: #d08770
-stability-legacy: #88c0d0
-stability-stable: #a3be8c
 static-alert-foreground: #B48EAD
 tab-background-selected: #ECEFF4
 tab-background: #4C566A

core/palettes/SolarizedDark.tid

@@ -18,7 +18,7 @@ button-foreground: #93a1a1
 code-background: #073642
 code-border: #586e75
 code-foreground: #93a1a1
-dirty-indicator: #dc322f
+dirty-indicator: inherit
 download-background: #859900
 download-foreground: #073642
 dragger-background: #073642
@@ -72,10 +72,6 @@ sidebar-tab-foreground-selected: #93a1a1
 sidebar-tiddler-link-foreground: #2aa198
 sidebar-tiddler-link-foreground-hover: #eee8d5
 site-title-foreground: #d33682
-stability-deprecated: #dc322f
-stability-experimental: #b58900
-stability-legacy: #268bd2
-stability-stable: #859900
 static-alert-foreground: #93a1a1
 tab-background: #073642
 tab-background-selected: #002b36

core/palettes/SolarizedLight.tid

@@ -18,7 +18,7 @@ button-foreground: #586e75
 code-background: #eee8d5
 code-border: #93a1a1
 code-foreground: #586e75
-dirty-indicator: #dc322f
+dirty-indicator: inherit
 download-background: #859900
 download-foreground: #eee8d5
 dragger-background: #eee8d5
@@ -72,10 +72,6 @@ sidebar-tab-foreground-selected: #586e75
 sidebar-tiddler-link-foreground: #2aa198
 sidebar-tiddler-link-foreground-hover: #002b36
 site-title-foreground: #d33682
-stability-deprecated: #dc322f
-stability-experimental: #b58900
-stability-legacy: #268bd2
-stability-stable: #859900
 static-alert-foreground: #586e75
 tab-background: #eee8d5
 tab-background-selected: #fdf6e3

core/palettes/Vanilla.tid

@@ -82,10 +82,6 @@ sidebar-tab-foreground: <<colour tab-foreground>>
 sidebar-tiddler-link-foreground-hover: #444444
 sidebar-tiddler-link-foreground: #999999
 site-title-foreground: <<colour tiddler-title-foreground>>
-stability-stable: #008000
-stability-experimental: #c07c00
-stability-deprecated: #ff0000
-stability-legacy: #0000ff
 static-alert-foreground: #aaaaaa
 tab-background-selected: #ffffff
 tab-background: #d8d8d8
@@ -99,7 +95,7 @@ table-footer-background: #a8a8a8
 table-header-background: #f0f0f0
 tag-background: #ec6
 tag-foreground: #ffffff
-testcase-accent-level-1: #c1eaff
+testcase-accent-level-1: #84C5E6
 testcase-accent-level-2: #E3B740
 testcase-accent-level-3: #5FD564
 tiddler-background: <<colour background>>

core/ui/ControlPanel/TiddlyWiki.tid

@@ -9,7 +9,7 @@ list-before:
 
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Settings]]">
 
-<div class="tc-control-panel-setting" data-setting-title=<<currentTiddler>> >
+<div class="tc-control-panel-setting" data-setting-title=<<currentTiddler>> style="border-top:1px solid #eee;">
 
 !!.tc-control-panel-accent <$link><$transclude field="caption"/></$link>
 

core/ui/TestCases/DefaultTemplate.tid

@@ -15,7 +15,7 @@ title: $:/core/ui/testcases/DefaultTemplate
 	<div class="tc-test-case-wrapper">
 		<div class="tc-test-case-header">
 			<h2>
-				<$genesis $type={{{ [<linkTarget>!match[]then[$link]else[span]] }}} to=<<testcaseTiddler>>>
+				<$genesis $type={{{ [<linkTarget>!match[]then[$link]else[div]] }}} to=<<testcaseTiddler>>>
 					<%if [<testResult>!match[]] %>
 						<span class={{{ tc-test-case-result-icon [<testResult>!match[fail]then[tc-test-case-result-icon-pass]] [<testResult>match[fail]then[tc-test-case-result-icon-fail]] +[join[ ]] }}}>
 							<%if [<testResult>!match[fail]] %>
@@ -27,31 +27,6 @@ title: $:/core/ui/testcases/DefaultTemplate
 					<%endif%>
 					<$view tiddler="Description" mode="inline"/>
 				</$genesis>
-				<span class="tc-test-case-toolbar">
-					<$button popup=`$(state)$-more`
-						tooltip={{$:/language/Buttons/More/Hint}}
-						aria-label={{$:/language/Buttons/More/Caption}}
-						class="tc-btn-invisible"
-						selectedClass="tc-selected"
-					>
-						{{$:/core/images/down-arrow}}
-					</$button>
-					<$let 
-						tv-config-toolbar-icons="yes"
-						tv-config-toolbar-text="yes"
-						tv-config-toolbar-class="tc-btn-invisible"
-					>
-						<$reveal state=`$(state)$-more` type="popup" position="belowleft" animate="yes">
-							<div class="tc-drop-down">
-								<$list filter="[all[shadows+tiddlers]tag[$:/tags/TestCase/Actions]!has[draft.of]]"
-									variable="listItem"
-								>
-									<$transclude tiddler=<<listItem>> mode="inline"/>
-								</$list>
-							</div>
-						</$reveal>
-					</$let>
-				</span>
 			</h2>
 		</div>
 		<%if [[Narrative]is[tiddler]] %>
@@ -71,7 +46,7 @@ title: $:/core/ui/testcases/DefaultTemplate
 		<%endif%>
 		<div class="tc-test-case-panes">
 			<div class="tc-test-case-source">
-				<$macrocall $name="tabs" tabsList="[all[tiddlers]sort[]] -[prefix<state>] -Description -Narrative -Output Output +[putfirst[]] -[has[plugin-type]]" state=<<state>> default="Output" template="$:/core/ui/testcases/DefaultTemplate/SourceTabs"/>
+				<$macrocall $name="tabs" tabsList="[all[tiddlers]sort[]] -[prefix<state>] -Description -Narrative -ExpectedResult -Output Output +[putfirst[]] -[has[plugin-type]]" state=<<state>> default="Output" template="$:/core/ui/testcases/DefaultTemplate/SourceTabs"/>
 			</div>
 			<div class="tc-test-case-divider">
 			</div>

core/ui/TestCases/DefaultTemplateSourceTabs.tid

@@ -19,9 +19,6 @@ title: $:/core/ui/testcases/DefaultTemplate/SourceTabs
 	</table>
 </$list>
 <$edit class="tc-edit-texteditor" tiddler=<<currentTab>>/>
-<div class="tc-test-case-footer-toolbar">
-<$macrocall $name="copy-to-clipboard" src={{{ [<currentTab>get[text]] }}}/>
-</div>
 \end
 
 <$transclude $variable="body" $mode="inline"/>

core/ui/TestCases/actions/Export.tid

@@ -1,4 +0,0 @@
-title: $:/core/ui/testcases/actions/Export
-tags: $:/tags/TestCase/Actions
-
-<$macrocall $name="exportButton" exportFilter="[all[tiddlers]sort[]] -[prefix[$:/state/]] -Description -Narrative -ExpectedResult -Output Output +[putfirst[]] -[has[plugin-type]]" lingoBase="$:/language/Buttons/ExportTiddlers/"/>

core/ui/TestCases/actions/Import.tid

@@ -1,11 +0,0 @@
-title: $:/core/ui/testcases/actions/Import
-tags: $:/tags/TestCase/Actions
-
-\whitespace trim
-<$button tooltip={{$:/language/Buttons/TestCaseImport/Hint}} aria-label={{$:/language/Buttons/TestCaseImport/Caption}} class=<<tv-config-toolbar-class>>>
-<$action-sendmessage $message="tm-import-tiddlers" $param=<<payloadTiddlers>>/>
-{{$:/core/images/input-button}}
-<span class="tc-btn-text">
-<$text text={{$:/language/Buttons/TestCaseImport/Caption}}/>
-</span>
-</$button>

core/wiki/config/OfficialPluginLibrary.tid

@@ -1,6 +1,6 @@
 title: $:/config/OfficialPluginLibrary
 tags: $:/tags/PluginLibrary
-url: https://tiddlywiki.com/library/v5.3.5/index.html
+url: https://tiddlywiki.com/library/v5.3.4/index.html
 caption: {{$:/language/OfficialPluginLibrary}}
 
 {{$:/language/OfficialPluginLibrary/Hint}}

core/wiki/macros/CSS.tid

@@ -1,17 +1,18 @@
 title: $:/core/macros/CSS
 tags: $:/tags/Macro $:/tags/Global
 
-<!-- Needs to stay that way for backwards compatibility. See GH issue: #8326 -->
-\define colour(name)
+\procedure colour(name)
 \whitespace trim
-<$transclude tiddler={{$:/palette}} index="$name$">
-	<$transclude tiddler="$:/palettes/Vanilla" index="$name$">
-		<$transclude tiddler="$:/config/DefaultColourMappings/$name$"/>
+<$transclude $tiddler={{$:/palette}} $index=`$(name)$`>
+	<$transclude $tiddler="$:/palettes/Vanilla" $index=`$(name)$`>
+		<$transclude $tiddler=`$:/config/DefaultColourMappings/$(name)$`/>
 	</$transclude>
 </$transclude>
 \end
 
-\define color(name) <<colour $name$>>
+\procedure color(name)
+<$macrocall $name=colour name=`$(name)$`/>
+\end
 
 \function box-shadow(shadow)
 [[ -webkit-box-shadow: $(shadow)$;

core/wiki/macros/tag-picker.tid

@@ -1,12 +1,9 @@
 title: $:/core/macros/tag-picker
-tags: $:/tags/Macro $:/tags/Global
-first-search-filter: [subfilter<tagListFilter>!is[system]search:title<userInput>]
-second-search-filter: [subfilter<tagListFilter>is[system]search:title<userInput>]
+tags: tags: $:/tags/Macro $:/tags/Global
+first-search-filter: [subfilter<tagListFilter>!is[system]search:title<userInput>sort[]]
+second-search-filter: [subfilter<tagListFilter>is[system]search:title<userInput>sort[]]
 
-<!--
-	Fields: "first-search-filter", "second-search-filter" are assigned to the keyboard-driven input macro with parameter: "configTiddlerFilter"
-	They __need to be the same__ as used for variables: "nonSystemTagsFilter" and "systemTagsFilter". See code below!
--->
+<!-- first-search-filter and second-search-filter fields are not used here in the code, but they are defined as parameters for keyboard-driven-input macro -->
 
 \whitespace trim
 
@@ -153,15 +150,12 @@ The second ESC tries to close the "draft tiddler"
 \end
 
 <!-- prepare all variables for tag-picker keyboard handling -->
-\procedure tag-picker(actions, tagField:"tags", tiddler, tagListFilter:"[tags[]sort[]]")
+\procedure tag-picker(actions, tagField:"tags", tiddler, tagListFilter:"[tags[]]")
 
 \function _tf.getUserInput() [<storeTitle>get[text]]
 \function _tf.getTag() [<newTagNameTiddler>get[text]]
-<!-- Use this function if tag-picker is a stand alone macro. Otherwise use "newTagNameTiddler" defined for fieldmangler in EditTemplate -->
-\function _tf.makeTagNameTiddler() [[$:/temp/NewTagName]] [<tagField>!match[tags]] +[join[/]] [<qualify>] +[join[]]
 
-<!-- keep those variables because they may "bleed" into macros using old syntax -->
-<!-- "nonSystemTagsFilter", "systemTagsFilter" __need to be the same__ as fields: "first-search-filter", "second-search-filter" -->
+<!-- keep those variables because they may "blead" into macros using old syntax -->
 <$let
 	palette={{$:/palette}}
 	colourA={{{ [<palette>getindex[foreground]] }}}
@@ -170,7 +164,7 @@ The second ESC tries to close the "draft tiddler"
 
 	saveTiddler={{{ [<tiddler>is[blank]then<currentTiddler>else<tiddler>] }}}
 
-	newTagNameTiddler={{{ [[newTagNameTiddler]is[variable]then<newTagNameTiddler>] :else[<_tf.makeTagNameTiddler>] }}}
+	newTagNameTiddler={{{ [[$:/temp/NewTagName]] [<tagField>!match[tags]] +[join[/]] [<qualify>] +[join[]] }}}
 	storeTitle={{{ [[$:/temp/NewTagName/input]] [<tagField>!match[tags]] +[join[/]] [<qualify>] +[join[]] }}}
 
 	newTagNameSelectionTiddlerQualified=<<qualify "$:/temp/NewTagName/selected-item">>
@@ -178,11 +172,11 @@ The second ESC tries to close the "draft tiddler"
 
 	refreshTitle=<<qualify "$:/temp/NewTagName/refresh">>
 
-	nonSystemTagsFilter="[subfilter<tagListFilter>!is[system]search:title<userInput>]"
-	systemTagsFilter="[subfilter<tagListFilter>is[system]search:title<userInput>]"
+	nonSystemTagsFilter="[subfilter<tagListFilter>!is[system]search:title<userInput>sort[]]"
+	systemTagsFilter="[subfilter<tagListFilter>is[system]search:title<userInput>sort[]]"
 
 	cancelPopups="yes"
 >
 	<$macrocall $name="tag-picker-inner"/>
 </$let>
-\end
+\end

core/wiki/tags/TestCaseActions.tid

@@ -1,2 +0,0 @@
-title: $:/tags/TestCase/Actions
-list:

editions/de-AT/tiddlers/HelloThere.tid

@@ -27,7 +27,7 @@ Anders, als bei herkömmlichen Online-Diensten, lässt Ihnen ~TiddlyWiki die Fre
 <a href="https://twitter.com/TiddlyWiki" class="tc-btn-big-green" style="background-color:#5E9FCA;" target="_blank">
 {{$:/core/images/twitter}} @~TiddlyWiki on Twitter
 </a>
-<a href="https://github.com/TiddlyWiki/TiddlyWiki5" class="tc-btn-big-green" style="background-color:#444;" target="_blank">
+<a href="https://github.com/Jermolene/TiddlyWiki5" class="tc-btn-big-green" style="background-color:#444;" target="_blank">
 {{$:/core/images/github}} ~TiddlyWiki on ~GitHub
 </a>
 <a href="https://tiddlywiki.com" class="tc-btn-big-green" style="background-color:#green;" target="_blank">

editions/de-AT/tiddlers/community/Fur_Entwickler.tid

@@ -8,4 +8,4 @@ Es gibt mehrere Ressourcen für Entwickler, um mehr über das TiddlyWiki Projekt
 
 * [[tiddlywiki.com/dev|https://tiddlywiki.com/dev]] Offizielle Entwickler Doku.
 * [[TiddlyWikiDev group|https://talk.tiddlywiki.org/c/devs/]] Diskussionsforum für Entwickler.
-* https://github.com/TiddlyWiki/TiddlyWiki5 .. Github Repository. 
+* https://github.com/Jermolene/TiddlyWiki5 .. Github Repository. 

editions/de-AT/tiddlers/community/Wie_kann_ich_helfen_.tid

@@ -13,7 +13,7 @@ OpenSource-Projekte, wie ~TiddlyWiki wachsen und gedeihen ''nur'' durch das Enga
 ~TiddlyWiki wird umso besser, je mehr Menschen es benutzen. ''Die beste Möglichkeit um die Zukunft zu sichern, ist ~TiddlyWiki 100 mal populärer zu machen, als es heute ist!''
 
 * Zwitschern sie über ~TiddlyWiki :) [[I love TiddlyWiki because...|https://twitter.com/intent/tweet?text=I+love+TiddlyWiki+because...&source=tiddlywiki5]]
-* Klicken sie den [[TiddlyWiki5 Star Button auf  GitHub|https://github.com/TiddlyWiki/TiddlyWiki5]]
+* Klicken sie den [[TiddlyWiki5 Star Button auf  GitHub|https://github.com/Jermolene/TiddlyWiki5]]
 * [[Veröffentlichen Sie das TiddlyWiki Poster|https://tiddlywiki.com/poster]]
 
 [img width=232 [Tiddler Poster.png]]
@@ -28,7 +28,7 @@ Es gibt unzählige Möglichkeiten dem Projekt zu helfen:
 
 * Und vor allem: ''Lassen Sie uns das auch wissen :)''
 ** [[Google Diskussions Forum|https://groups.google.com/forum/#!forum/tiddlywiki]] oder
-** [[GitHub Ticket|https://github.com/TiddlyWiki/TiddlyWiki5/issues]]
+** [[GitHub Ticket|https://github.com/Jermolene/TiddlyWiki5/issues]]
 
 Die ~TiddlyWiki Dokumentation und die Programme werden auf GitHub verwaltet. "Pull-Requests" werden gerne entgegen genommen.
 

editions/de-AT/tiddlers/lexikon/GitHub.tid

@@ -7,5 +7,5 @@ type: text/vnd.tiddlywiki
 
 ~GitHub ist eine, für OpenSource Projekte kostenlose, Plattform, die es erlaubt gemeinsam an einem Projekt zu arbeiten und zu kommunizieren. 
 
-* ~TiddlyWiki: https://github.com/TiddlyWiki/TiddlyWiki5
+* ~TiddlyWiki: https://github.com/Jermolene/TiddlyWiki5
 * ~GitHub: http://github.com

editions/de-AT/tiddlers/maintainer/Wer pflegt diese Edition_.tid

@@ -24,7 +24,7 @@ type: text/vnd.tiddlywiki
 
 !! GitHub
 
-siehe: https://github.com/TiddlyWiki/TiddlyWiki5/tree/master/languages
+siehe: https://github.com/Jermolene/TiddlyWiki5/tree/master/languages
 
 !! Feedback
 

editions/de-AT/tiddlers/referenz/Lizenzen.tid

@@ -7,7 +7,7 @@ title: Lizenzen
 type: text/vnd.tiddlywiki
 
 * ~TiddlyWiki Kern
-** https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/licenses/copyright.md
+** https://github.com/Jermolene/TiddlyWiki5/blob/master/licenses/copyright.md
 * ~TiddlyWiki Editionen 
-** https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/licenses/cla-individual.md
-** https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/licenses/cla-entity.md
+** https://github.com/Jermolene/TiddlyWiki5/blob/master/licenses/cla-individual.md
+** https://github.com/Jermolene/TiddlyWiki5/blob/master/licenses/cla-entity.md

editions/dev/tiddlers/Continuous Deployment.tid

@@ -5,4 +5,4 @@ type: text/vnd.tiddlywiki
 
 TiddlyWiki 5 uses [[GitHub Actions|https://docs.github.com/en/actions]] for continuous deployment. It is driven by the workflow file `.github/workflows/ci.yml` in the repo, along with the scripts in the `bin` folder that it invokes.
 
-The build history can be seen at https://github.com/TiddlyWiki/TiddlyWiki5/actions
+The build history can be seen at https://github.com/Jermolene/TiddlyWiki5/actions

editions/dev/tiddlers/GitHub Branches.tid

@@ -3,7 +3,7 @@ modified: 20190115173645658
 title: GitHub Branches
 type: text/vnd.tiddlywiki
 
-Development of TiddlyWiki 5 in the GitHub repo at https://github.com/TiddlyWiki/TiddlyWiki5  uses two branches:
+Development of TiddlyWiki 5 in the GitHub repo at https://github.com/Jermolene/TiddlyWiki5  uses two branches:
 
 * `master` contains the latest version of the code, and is deployed to https://tiddlywiki.com/prerelease
 * `tiddlywiki-com` contains the latest version of the documentation, and is deployed to https://tiddlywiki.com/, built by the latest released version of TiddlyWiki

editions/dev/tiddlers/build/Scripts for building tiddlywiki.com.tid

@@ -6,7 +6,7 @@ Nonetheless, you may find techniques that are useful for your own scripts.
 
 ! Hosting
 
-https://tiddlywiki.com is served by [[GitHub Pages|https://pages.github.com]] from the repository https://github.com/TiddlyWiki/tiddlywiki.com-gh-pages
+https://tiddlywiki.com is served by [[GitHub Pages|https://pages.github.com]] from the repository https://github.com/Jermolene/jermolene.github.io
 
 The scripts live in the repository https://github.com/Jermolene/build.jermolene.github.io
 
@@ -15,8 +15,8 @@ The scripts live in the repository https://github.com/Jermolene/build.jermolene.
 These scripts require the following directories to be siblings:
 
 * `build.jermolene.github.io` - a local copy of https://github.com/Jermolene/build.jermolene.github.io
-* `jermolene.github.io` - a local copy of the repo https://github.com/TiddlyWiki/tiddlywiki.com-gh-pages
-* `TiddlyWiki5` - a local copy of the repo https://github.com/TiddlyWiki/TiddlyWiki5
+* `jermolene.github.io` - a local copy of the repo https://github.com/Jermolene/jermolene.github.io
+* `TiddlyWiki5` - a local copy of the repo https://github.com/Jermolene/TiddlyWiki5
 
 The scripts are designed to be executed with the current directory being the `TiddlyWiki5` directory.
 

editions/dev/tiddlers/from tw5.com/Developing plugins using Node.js and GitHub.tid

@@ -36,7 +36,7 @@ mkdir TW5
 !!! 2. Make a local read-only copy of the ~TiddlyWiki5 repository
 
 ```bash
-git clone https://github.com/TiddlyWiki/TiddlyWiki5.git TW5
+git clone https://github.com/Jermolene/TiddlyWiki5.git TW5
 
 ```
 

editions/dev/tiddlers/from tw5.com/How to create a translation for TiddlyWiki.tid

@@ -11,7 +11,7 @@ type: text/vnd.tiddlywiki
 
 ! Setting Up
 
-# Fork the TiddlyWiki GitHub repository (https://github.com/TiddlyWiki/TiddlyWiki5)
+# Fork the TiddlyWiki GitHub repository (https://github.com/Jermolene/TiddlyWiki5)
 #* If your GitHub username is JoeBloggs, your fork will be https://github.com/JoeBloggs/TiddlyWiki5
 # Create a branch with the name of the translation you intend to create (eg "cy-GB" for "Welsh (United Kingdom)")
 #* IETF language codes: http://www.lingoes.net/en/translator/langcode.htm
@@ -45,4 +45,4 @@ Content of `plugin.info` for Joe Bloggs' Welsh translation:
 
 Sometimes the master en-GB language tiddlers are updated with revised content or new items. The best way to keep track of language-related commits to ~TiddlyWiki5:master is to monitor this RSS/Atom feed:
 
-https://github.com/TiddlyWiki/TiddlyWiki5/commits/master/core/language.atom
+https://github.com/Jermolene/TiddlyWiki5/commits/master/core/language.atom

editions/dev/tiddlers/from tw5.com/JavaScript Macros.tid

@@ -22,7 +22,7 @@ Note that if the ''params'' array is missing or blank, then all the supplied par
 
 There are several JavaScript macros built into the core which can serve as a jumping off point for your own macros:
 
-https://github.com/TiddlyWiki/TiddlyWiki5/tree/master/core/modules/macros
+https://github.com/Jermolene/TiddlyWiki5/tree/master/core/modules/macros
 
 Note that JavaScript macros work on both the client and the server, and so do not have access to the browser DOM.
 

editions/dev/tiddlers/from tw5.com/moduletypes/SyncAdaptorModules.tid

@@ -14,7 +14,7 @@ SyncAdaptorModules encapsulate storage mechanisms that can be used by the SyncMe
 
 SyncAdaptorModules are represented as JavaScript tiddlers with the field `module-type` set to `syncadaptor`.
 
-See [[this pull request|https://github.com/TiddlyWiki/TiddlyWiki5/pull/4373]] for background on the evolution of this API.
+See [[this pull request|https://github.com/Jermolene/TiddlyWiki5/pull/4373]] for background on the evolution of this API.
 
 ! Exports
 

editions/dev/tiddlers/new/Filter Operators.tid

@@ -25,7 +25,7 @@ The function should return either a new [[tiddler iterator|Tiddler Iterators]],
 
 There are several filter operators built into the core which can serve as a jumping off point for your own filter operators:
 
-https://github.com/TiddlyWiki/TiddlyWiki5/tree/master/core/modules/filters
+https://github.com/Jermolene/TiddlyWiki5/tree/master/core/modules/filters
 
 ! Example
 

editions/dev/tiddlers/new/Using TiddlyWiki as a library.tid

@@ -2,4 +2,4 @@ title: Using TiddlyWiki as a library in another Node.js application
 
 Node.js applications can include TiddlyWiki as a library so that they can use wikitext rendering.
 
-See the demo at https://github.com/TiddlyWiki/TiddlyWiki5DemoApp
+See the demo at https://github.com/Jermolene/TiddlyWiki5DemoApp

editions/dev/tiddlers/system/ContributionBanner.tid

@@ -3,7 +3,7 @@ tags: $:/tags/EditTemplate
 list-after: $:/core/ui/EditTemplate/title
 
 \define base-github()
-https://github.com/TiddlyWiki/TiddlyWiki5/edit/master/editions/dev/tiddlers/
+https://github.com/Jermolene/TiddlyWiki5/edit/master/editions/dev/tiddlers/
 \end
 
 <$set name="draft-of" value={{{ [<currentTiddler>get[draft.of]] }}}>

editions/dev/tiddlers/system/Sources.tid

@@ -3,7 +3,7 @@ tags: $:/tags/TiddlerInfo
 caption: Sources
 
 \define github-link-base()
-https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/editions/dev/tiddlers/$(title)$
+https://github.com/Jermolene/TiddlyWiki5/blob/master/editions/dev/tiddlers/$(title)$
 \end
 
 \define make-github-link()

editions/dev/tiddlers/system/github-fork-ribbon.tid

@@ -3,4 +3,4 @@ tags: $:/tags/PageTemplate
 caption: ~GitHub ribbon
 description: ~GitHub ribbon for tw5.com/dev
 
-<div class="github-fork-ribbon-wrapper right" style><div class="github-fork-ribbon" style="background-color:#DF4848;"><a href="https://github.com/TiddlyWiki/TiddlyWiki5" target="_blank" rel="noopener noreferrer">Find me on ~GitHub</a></div></div>
+<div class="github-fork-ribbon-wrapper right" style><div class="github-fork-ribbon" style="background-color:#DF4848;"><a href="https://github.com/Jermolene/TiddlyWiki5" target="_blank" rel="noopener noreferrer">Find me on ~GitHub</a></div></div>

editions/es-ES/tiddlers/$__ContributionBanner.tid

@@ -6,7 +6,7 @@ title: $:/ContributionBanner
 type: text/vnd.tiddlywiki
 
 \define base-github()
-https://github.com/TiddlyWiki/TiddlyWiki5/edit/master/editions/es-ES/tiddlers/
+https://github.com/Jermolene/TiddlyWiki5/edit/master/editions/es-ES/tiddlers/
 \end
 
 <$set name="draft-of" value={{{ [<currentTiddler>get[draft.of]] }}}>

editions/es-ES/tiddlers/Articles.tid

@@ -8,7 +8,7 @@ type: text/vnd.tiddlywiki
 
 Estos son algunos artículos recientes publicados sobre ~TiddlyWiki. 
 
-Envía nuevos artículos que encuentres via [[GitHub|https://github.com/TiddlyWiki/TiddlyWiki5]] o [[Twitter|https://twitter.com/tiddlywiki]], o publícalas en el [[grupo|https://groups.google.com/forum/?hl=es#!forum/tiddlywiki]]
+Envía nuevos artículos que encuentres via [[GitHub|https://github.com/Jermolene/TiddlyWiki5]] o [[Twitter|https://twitter.com/tiddlywiki]], o publícalas en el [[grupo|https://groups.google.com/forum/?hl=es#!forum/tiddlywiki]]
 
 <div class="tc-link-info">
 

editions/es-ES/tiddlers/Contributing.tid

@@ -12,7 +12,7 @@ Estamos encantados de recibir contribuciones al código y la documentación de T
 
 * Ayudando a [[mejorar la documentación|Improving TiddlyWiki Documentation]]
 
-* Aportando código a través de [[GitHub|https://github.com/TiddlyWiki/TiddlyWiki5]]
+* Aportando código a través de [[GitHub|https://github.com/Jermolene/TiddlyWiki5]]
 ** Más detalles en https://tiddlywiki.com/dev 
 
 Hay, además, más formas de 

editions/es-ES/tiddlers/Contributor_License_Agreement.tid

@@ -10,6 +10,6 @@ Al igual que sucede en otros proyectos de Código Abierto, TiddlyWiki5 necesita
 
 Es un acuerdo legal que permite a quien contribuye afirmar que los derechos de su contribución son exclusivamente suyos y que está de acuerdo en licenciarlos a la Asociación UnaMesa (entidad legal que, en nombre de la comunidad, es propietaria de TiddlyWiki).
 
-* Si eres persona física, necesitas firmar la [[licencia individual|https://github.com/TiddlyWiki/TiddlyWiki5/tree/master/licenses/cla-individual.md]]
+* Si eres persona física, necesitas firmar la [[licencia individual|https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-individual.md]]
 
-*Si eres persona fiscal, la de [[entidades|https://github.com/TiddlyWiki/TiddlyWiki5/tree/master/licenses/cla-entity.md]]
+*Si eres persona fiscal, la de [[entidades|https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-entity.md]]

editions/es-ES/tiddlers/Contributors.tid

@@ -6,7 +6,7 @@ tags: About
 title: Contributors
 type: text/vnd.tiddlywiki
 
-Las siguientes personas han dedicado generosamente su tiempo a [[contribuir al desarrollo de TiddlyWiki|https://github.com/TiddlyWiki/TiddlyWiki5/graphs/contributors]]:
+Las siguientes personas han dedicado generosamente su tiempo a [[contribuir al desarrollo de TiddlyWiki|https://github.com/Jermolene/TiddlyWiki5/graphs/contributors]]:
 
 * Jeremy Ruston ([[@Jermolene|https://github.com/Jermolene]])
 * Dave Gifford ([[@giffmex|https://github.com/giffmex]])

editions/es-ES/tiddlers/Examples.tid

@@ -8,7 +8,7 @@ type: text/vnd.tiddlywiki
 
 Esta es una muestra de algunos interesantes ejemplos  de uso de ~TiddlyWiki en la web.
 
-Envía más ejemplos que encuentres para ampliar esta lista via [[GitHub|https://github.com/TiddlyWiki/TiddlyWiki5]] o [[Twitter|https://twitter.com/tiddlywiki]], o publícalas en el [[grupo|https://groups.google.com/forum/?hl=es#!forum/tiddlywiki]]
+Envía más ejemplos que encuentres para ampliar esta lista via [[GitHub|https://github.com/Jermolene/TiddlyWiki5]] o [[Twitter|https://twitter.com/tiddlywiki]], o publícalas en el [[grupo|https://groups.google.com/forum/?hl=es#!forum/tiddlywiki]]
 
 <div class="tc-link-info">
 

editions/es-ES/tiddlers/Forums.tid

@@ -29,10 +29,10 @@ o síguenos [[en Twitter|http://twitter.com/TiddlyWiki]] si quieres recibir las
 
 [[Foro de desarrollo de TiddlyWiki|https://talk.tiddlywiki.org/c/devs]]
 
-Accede a nuestra [[página de desarrollo|https://github.com/TiddlyWiki/TiddlyWiki5]] en GitHub y haz tu contribución.
+Accede a nuestra [[página de desarrollo|https://github.com/Jermolene/TiddlyWiki5]] en GitHub y haz tu contribución.
 
 Síguenos [[en Twitter|http://twitter.com/TiddlyWiki]] si quieres estar al tanto de las últimas noticias
 
 Las nuevas ediciones de TiddlyWiki, TiddlyDesktop y TiddlyFox se anuncian en los foros de discusión y en [[Twitter|https://twitter.com/TiddlyWiki]]. 
 
-También puedes suscribirte al feed de [[versiones|https://github.com/TiddlyWiki/TiddlyWiki5/releases.atom]] en ~GitHub
+También puedes suscribirte al feed de [[versiones|https://github.com/jermolene/tiddlywiki5/releases.atom]] en ~GitHub

editions/es-ES/tiddlers/HelloThere.tid

@@ -29,7 +29,7 @@ Al revés que los servicios online convencionales, TiddlyWiki te deja escoger d
 <a href="https://twitter.com/TiddlyWiki" class="tc-btn-big-green" style="background-color:#5E9FCA;" target="_blank" rel="noopener noreferrer">
 {{$:/core/images/twitter}} @~TiddlyWiki en Twitter
 </a>
-<a href="https://github.com/TiddlyWiki/TiddlyWiki5" class="tc-btn-big-green" style="background-color:#444;" target="_blank" rel="noopener noreferrer">
+<a href="https://github.com/Jermolene/TiddlyWiki5" class="tc-btn-big-green" style="background-color:#444;" target="_blank" rel="noopener noreferrer">
 {{$:/core/images/github}} ~TiddlyWiki en ~GitHub
 </a>
 </div>

editions/es-ES/tiddlers/Installing_TiddlyWiki_on_Node.js.tid

@@ -44,6 +44,6 @@ type: text/vnd.tiddlywiki
 
 > ''Nota:'' El argumento `-g` hace que TiddlyWiki se instale globalmente (es decir, en todo el equipo). Sin él, TiddlyWiki estará disponible __únicamente en el directorio desde el que lo instales__.
 
-> ''Si usas Debian'' o un sistema basado en Debian y recibes un mensaje del tipo `node: command not found` pese a haber instalado node.js, puede que necesites crear un enlace simbólico entre `nodejs` y `node`. En tal caso, consulta el manual de tu distribución de Linux y `whereis` ([[más información sobre este comando|https://en.wikipedia.org/wiki/Whereis]]) para crearlo correctamente (ver también [[issue 1434|http://github.com/TiddlyWiki/TiddlyWiki5/issues/1434]] en GitHub).
+> ''Si usas Debian'' o un sistema basado en Debian y recibes un mensaje del tipo `node: command not found` pese a haber instalado node.js, puede que necesites crear un enlace simbólico entre `nodejs` y `node`. En tal caso, consulta el manual de tu distribución de Linux y `whereis` ([[más información sobre este comando|https://en.wikipedia.org/wiki/Whereis]]) para crearlo correctamente (ver también [[issue 1434|http://github.com/Jermolene/TiddlyWiki5/issues/1434]] en GitHub).
 
 >Ejemplo en Debian v8.0: `sudo ln -s /usr/bin/nodejs /usr/bin/node`

editions/es-ES/tiddlers/Resources.tid

@@ -8,7 +8,7 @@ type: text/vnd.tiddlywiki
 
 Páginas con recursos creados por la [[comunidad|Community]] para ayudarte a sacarle todo el jugo a ~TiddlyWiki: Plugins, macros, utilidades y mucho más.
 
-Envía más recursos que encuentres para ampliar esta lista via [[GitHub|https://github.com/TiddlyWiki/TiddlyWiki5]] o [[Twitter|https://twitter.com/tiddlywiki]], o publícalas en el [[grupo|https://groups.google.com/forum/?hl=es#!forum/tiddlywiki]]
+Envía más recursos que encuentres para ampliar esta lista via [[GitHub|https://github.com/Jermolene/TiddlyWiki5]] o [[Twitter|https://twitter.com/tiddlywiki]], o publícalas en el [[grupo|https://groups.google.com/forum/?hl=es#!forum/tiddlywiki]]
 
 <div class="tc-link-info">
 

editions/es-ES/tiddlers/Signing_the_Contributor_License_Agreement.tid

@@ -11,9 +11,9 @@ Crea un //pull request// en GitHub para añadir tu nombre a `cla-individual.md`
 ''paso a paso''
 
 # Según seas persona física o fiscal, ve a  
-#*[[licenses/CLA-individual|https://github.com/TiddlyWiki/TiddlyWiki5/tree/master/licenses/cla-individual.md]] o a
+#*[[licenses/CLA-individual|https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-individual.md]] o a
 
-#*[[licenses/CLA-entity|https://github.com/TiddlyWiki/TiddlyWiki5/tree/master/licenses/cla-entity.md]] 
+#*[[licenses/CLA-entity|https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-entity.md]] 
 
 #Haz clic en el botón ''Edit'' arriba a la derecha (al hacerlo se creará un fork del repositorio para que puedas editar el archivo)
 

editions/es-ES/tiddlers/Tutorials.tid

@@ -8,7 +8,7 @@ type: text/vnd.tiddlywiki
 
 Páginas con tutoriales y consejos relacionados con ~TiddlyWiki.
 
-Envía más tutoriales que encuentres para ampliar esta lista via [[GitHub|https://github.com/TiddlyWiki/TiddlyWiki5]] o [[Twitter|https://twitter.com/tiddlywiki]], o publícalas en el [[grupo|https://groups.google.com/forum/?hl=es#!forum/tiddlywiki]]
+Envía más tutoriales que encuentres para ampliar esta lista via [[GitHub|https://github.com/Jermolene/TiddlyWiki5]] o [[Twitter|https://twitter.com/tiddlywiki]], o publícalas en el [[grupo|https://groups.google.com/forum/?hl=es#!forum/tiddlywiki]]
 
 <div class="tc-link-info">
 

editions/fr-FR/tiddlers/$__ContributionBanner.tid

@@ -6,7 +6,7 @@ title: $:/ContributionBanner
 type: text/vnd.tiddlywiki
 
 \define base-github()
-https://github.com/TiddlyWiki/TiddlyWiki5/edit/master/editions/fr-FR/tiddlers/
+https://github.com/Jermolene/TiddlyWiki5/edit/master/editions/fr-FR/tiddlers/
 \end
 
 <$set name="draft-of" value={{{ [<currentTiddler>get[draft.of]] }}}>

editions/fr-FR/tiddlers/Contributing.tid

@@ -9,7 +9,7 @@ Nous accueillons les contributions au code et à la documentation de TiddlyWiki
 
 * [[SignalerBugs|ReportingBugs]]
 * Aider à [[améliorer notre documentation|Improving TiddlyWiki Documentation]]
-* Contribuer au code via [[GitHub|https://github.com/TiddlyWiki/TiddlyWiki5]]
+* Contribuer au code via [[GitHub|https://github.com/Jermolene/TiddlyWiki5]]
 ** Voir https://tiddlywiki.com/dev pour plus de détails
 
 Il existe encore plusieurs façons d'[[aider TiddlyWiki|HelpingTiddlyWiki]].
@@ -18,8 +18,8 @@ Il existe encore plusieurs façons d'[[aider TiddlyWiki|HelpingTiddlyWiki]].
 
 À l'instar d'autres projets OpenSource, TiddlyWiki5 a besoin que ses contributeurs signent un accord de licence pour leurs contributions. C'est un accord contractuel qui permet aux contributeurs de confirmer qu'ils sont propriétaires des droits d'auteur de leurs contributions, et qu'ils acceptent de les licencier à l'Association UnaMesa (l'entité juridique qui possède TiddlyWiki au nom de la communauté).
 
-* Pour les licences individuelles<<dp>> [[licenses/CLA-individuelle|https://github.com/TiddlyWiki/TiddlyWiki5/tree/master/licenses/cla-individual.md]]
-* Pour les licences d'organisation<<dp>> [[licenses/CLA-organisation|https://github.com/TiddlyWiki/TiddlyWiki5/tree/master/licenses/cla-entity.md]]
+* Pour les licences individuelles<<dp>> [[licenses/CLA-individuelle|https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-individual.md]]
+* Pour les licences d'organisation<<dp>> [[licenses/CLA-organisation|https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-entity.md]]
 
 ! Comment signer la CLA
 
@@ -27,7 +27,7 @@ Proposez une contribution (PullRequest) sur GitHub en ajoutant à `cla-individua
 
 ''pas à pas''
 
-# Cliquez [[licenses/CLA-individuelle|https://github.com/TiddlyWiki/TiddlyWiki5/tree/master/licenses/cla-individual.md]] ou [[licenses/CLA-organisation|https://github.com/TiddlyWiki/TiddlyWiki5/tree/master/licenses/cla-entity.md]]
+# Cliquez [[licenses/CLA-individuelle|https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-individual.md]] ou [[licenses/CLA-organisation|https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-entity.md]]
 # Dans le document `cla-individual.md` ou le `cla-entity.md` cliquez sur l'icone dans le coin en haut à droite, ce qui créera une copie modifiable du projet, un ''fork'', dans votre espace de propositions et vous permettra de modifier ses différents documents
 # Modifiez la licence en ajoutant votre nom en bas comme dans l'exemple, eg<<:>> `Jeremy Ruston, @Jermolene, 2011/11/22`
 # Validez par un PullRequest

editions/fr-FR/tiddlers/Contributors.tid

@@ -5,7 +5,7 @@ tags: About
 title: Contributors
 type: text/vnd.tiddlywiki
 
-Les personnes ci-dessous ont généreusement donné de leur temps pour [[contribuer au développement de TiddlyWiki|https://github.com/TiddlyWiki/TiddlyWiki5/graphs/contributors]]:
+Les personnes ci-dessous ont généreusement donné de leur temps pour [[contribuer au développement de TiddlyWiki|https://github.com/Jermolene/TiddlyWiki5/graphs/contributors]]:
 
 * Jeremy Ruston ([[@Jermolene|https://github.com/Jermolene]])
 * Dave Gifford ([[@giffmex|https://github.com/giffmex]])

editions/fr-FR/tiddlers/Developers.tid

@@ -8,10 +8,10 @@ type: text/vnd.tiddlywiki
 Plusieurs ressources permettent aux développeurs d'en apprendre plus sur <<tw>>, de collaborer et de discuter de son développement.
 
 * [[tiddlywiki.com/dev|https://tiddlywiki.com/dev]] est la documentation officielle des développeurs
-* Vous pouvez vous impliquer dans le développement de <<tw>> sur [[GitHub|https://github.com/TiddlyWiki/TiddlyWiki5]]
-** Les [[discussions|https://github.com/TiddlyWiki/TiddlyWiki5/discussions]] sont disponibles pour les questions ouvertes et les questions/réponses.
-** Les [[problèmes|https://github.com/TiddlyWiki/TiddlyWiki5/issues]] permettent de signaler les bogues et de proposer de nouvelles idées spécifiques, réalistes et raisonnables
-* L'ancien groupe ~TiddlyWikiDev sur Google Group est maintenant fermé, et remplacé par les [[discussions GitHub|https://github.com/TiddlyWiki/TiddlyWiki5/discussions]], mais une archive reste disponible<<:>> https://groups.google.com/group/TiddlyWikiDev
+* Vous pouvez vous impliquer dans le développement de <<tw>> sur [[GitHub|https://github.com/Jermolene/TiddlyWiki5]]
+** Les [[discussions|https://github.com/Jermolene/TiddlyWiki5/discussions]] sont disponibles pour les questions ouvertes et les questions/réponses.
+** Les [[problèmes|https://github.com/Jermolene/TiddlyWiki5/issues]] permettent de signaler les bogues et de proposer de nouvelles idées spécifiques, réalistes et raisonnables
+* L'ancien groupe ~TiddlyWikiDev sur Google Group est maintenant fermé, et remplacé par les [[discussions GitHub|https://github.com/Jermolene/TiddlyWiki5/discussions]], mais une archive reste disponible<<:>> https://groups.google.com/group/TiddlyWikiDev
 ** Une fonctionnalité de recherche étendue du groupe est disponible sur [[mail-archive.com|https://www.mail-archive.com/tiddlywikidev@googlegroups.com/]]
 * Pour les dernières nouvelles, suivez [[@TiddlyWiki sur Twitter|http://twitter.com/#!/TiddlyWiki]]
 * Tchatchez sur https://gitter.im/TiddlyWiki/public (une salle dédiée au développement arrive bientôt)

editions/fr-FR/tiddlers/GitHub.tid

@@ -9,4 +9,4 @@ type: text/vnd.tiddlywiki
 
 Le code et la documentation de ~TiddlyWiki est hébergé sur ~GitHub à l'adresse<<dp>>
 
-https://github.com/TiddlyWiki/TiddlyWiki5
+https://github.com/Jermolene/TiddlyWiki5

editions/fr-FR/tiddlers/HelloThere.tid

@@ -29,7 +29,7 @@ Contrairement aux services en ligne classiques, TiddlyWiki vous permet de choisi
 <a href="https://twitter.com/TiddlyWiki" class="tc-btn-big-green" style="border-radius:4px;background-color:#5E9FCA;" target="_blank" rel="noopener noreferrer">
 {{$:/core/images/twitter}} Twitter
 </a>
-<a href="https://github.com/TiddlyWiki/TiddlyWiki5" class="tc-btn-big-green" style="border-radius:4px;background-color:#444;" target="_blank" rel="noopener noreferrer">
+<a href="https://github.com/Jermolene/TiddlyWiki5" class="tc-btn-big-green" style="border-radius:4px;background-color:#444;" target="_blank" rel="noopener noreferrer">
 {{$:/core/images/github}} ~GitHub
 </a>
 <a href="https://gitter.im/TiddlyWiki/public" class="tc-btn-big-green" style="border-radius:4px;background-color:#753a88;background-image:linear-gradient(to left,#cc2b5e,#753a88);" target="_blank" rel="noopener noreferrer">

editions/fr-FR/tiddlers/HelpingTiddlyWiki.tid

@@ -14,7 +14,7 @@ Les Projets OpenSource comme << tw >> prospèrent grâce aux réactions et à l'
 * [img[https://img.shields.io/twitter/url/http/tiddlywiki.com.svg?style=social]]
 * Tweeter sur ~TiddlyWiki: [[I love TiddlyWiki because...|https://twitter.com/intent/tweet?text=I+love+TiddlyWiki+because...&source=tiddlywiki5]]
 * [img[https://img.shields.io/github/stars/jermolene/tiddlywiki5.svg?style=social&label=Star]]
-* [[Etoiler le référentiel TiddlyWiki5 sur GitHub|https://github.com/TiddlyWiki/TiddlyWiki5]]
+* [[Etoiler le référentiel TiddlyWiki5 sur GitHub|https://github.com/Jermolene/TiddlyWiki5]]
 * [[Afficher la bannière TiddlyWiki|https://tiddlywiki.com/poster]]
 
 [img width=232 [Tiddler Poster.png]]
@@ -30,5 +30,5 @@ Vous pouvez contribuer à ~TiddlyWiki de plusieurs façons<<dp>>
 
 Le code et la documentation principal de ~TiddlyWiki se trouvent sur GitHub, où sont accueillies les différentes [[contributions|Contributing]]:
 
-* https://github.com/TiddlyWiki/TiddlyWiki5
+* https://github.com/Jermolene/TiddlyWiki5