tiddlywiki 5.2.3 → 5.2.5

package/editions/test/tiddlers/tests/data/macros/NestedMacros.tid

@@ -0,0 +1,36 @@
+title: Macros/NestedMacros
+description: Nested Macros
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+
+\whitespace trim
+
+\define outer()
+\whitespace trim
+
+\define middle()
+\whitespace trim
+
+\define inner()
+\whitespace trim
+
+Jaguar
+
+\end inner
+
+<<inner>>
+
+\end middle
+
+<<middle>>
+
+\end outer
+
+<<outer>>
+
++
+title: ExpectedResult
+
+<p>Jaguar</p>

package/editions/test/tiddlers/tests/data/pragmas/Parsermode.tid

@@ -0,0 +1,36 @@
+title: Pragmas/Parsermode
+description: parsermode pragma
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+
+{{AlwaysInline}}
+
+{{AlwaysBlock}}
+
+{{AlwaysInline}}{{AlwaysBlock}}
+
++
+title: AlwaysInline
+
+\parsermode inline
+! Not Heading
+
+Text with ''bold''
++
+title: AlwaysBlock
+
+\parsermode block
+! Heading
+
+Text with ''bold''
++
+title: ExpectedResult
+
+! Not Heading
+
+Text with <strong>bold</strong><h1 class="">Heading</h1><p>Text with <strong>bold</strong></p><p>! Not Heading
+
+Text with <strong>bold</strong><h1 class="">Heading</h1><p>Text with <strong>bold</strong></p>
+</p>

package/editions/test/tiddlers/tests/data/transclude/Recursion.tid

@@ -0,0 +1,13 @@
+title: Transclude/Recursion
+description: Transclusion recursion detection
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+
+\whitespace trim
+<$transclude $tiddler="Output"/>
++
+title: ExpectedResult
+
+<p><span class="tc-error">Recursive transclusion error in transclude widget</span></p>

package/editions/test/tiddlers/tests/modules/utils/test-csv.js

@@ -0,0 +1,33 @@
+/*\
+title: modules/utils/test-csv.js
+type: application/javascript
+tags: [[$:/tags/test-spec]]
+
+Tests the backlinks mechanism.
+
+\*/
+(function(){
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+describe('CSV Parsing', function() {
+	var tid = $tw.wiki.getTiddler('csv-cases');
+	var testCases = JSON.parse(tid.fields.text);
+	
+	$tw.utils.each(testCases, function(testCase) {
+		if (testCase.skip) {
+			return;
+		}
+		it("Test case: " + testCase.name, function() {
+			var parsedCsv = $tw.utils.parseCsvString(testCase.csv, testCase.options);
+			expect(parsedCsv).withContext("The generated CSV should match the expected one").toEqual(testCase.json);
+			
+			var parsedCsvWithHeaders = $tw.utils.parseCsvStringWithHeader(testCase.csv, testCase.options);
+			expect(parsedCsvWithHeaders).withContext("The generated CSV with headers should match the expected one").toEqual(testCase.jsonWithHeaders);
+		});
+	})
+	
+});
+
+})();

package/editions/test/tiddlers/tests/test-checkbox-widget.js

@@ -234,6 +234,38 @@ Tests the checkbox widget thoroughly.
             },
         ];
 
+        // https://github.com/Jermolene/TiddlyWiki5/issues/6871
+        const listModeTestsWithListField = (
+            listModeTests
+            .filter(data => data.widgetText.includes("listField='colors'"))
+            .map(data => {
+                const newData = {
+                    ...data,
+                    tiddlers: data.tiddlers.map(tiddler => ({...tiddler, list: tiddler.colors, colors: undefined})),
+                    widgetText: data.widgetText.replace("listField='colors'", "listField='list'"),
+                    expectedChange: {
+                        "Colors": { list: data.expectedChange.Colors.colors.split(' ') }
+                    },
+                }
+                return newData;
+            })
+        );
+        const listModeTestsWithTagsField = (
+            listModeTests
+            .filter(data => data.widgetText.includes("listField='colors'"))
+            .map(data => {
+                const newData = {
+                    ...data,
+                    tiddlers: data.tiddlers.map(tiddler => ({...tiddler, tags: tiddler.colors, colors: undefined})),
+                    widgetText: data.widgetText.replace("listField='colors'", "listField='tags'"),
+                    expectedChange: {
+                        "Colors": { tags: data.expectedChange.Colors.colors.split(' ') }
+                    },
+                }
+                return newData;
+            })
+        );
+
         const indexListModeTests = listModeTests.map(data => {
             const newData = {...data};
             const newName = data.testName.replace('list mode', 'index list mode');
@@ -453,6 +485,8 @@ Tests the checkbox widget thoroughly.
         const checkboxTestData = fieldModeTests.concat(
             indexModeTests,
             listModeTests,
+            listModeTestsWithListField,
+            listModeTestsWithTagsField,
             indexListModeTests,
             filterModeTests,
         );
@@ -495,7 +529,7 @@ Tests the checkbox widget thoroughly.
                     for (const fieldName of Object.keys(change)) {
                         const expectedValue = change[fieldName];
                         const fieldValue = tiddler.fields[fieldName];
-                        expect(fieldValue).toBe(expectedValue);
+                        expect(fieldValue).toEqual(expectedValue);
                     }
                 }
             })

package/editions/test/tiddlers/tests/test-json-filters.js

@@ -0,0 +1,112 @@
+/*\
+title: test-json-filters.js
+type: application/javascript
+tags: [[$:/tags/test-spec]]
+
+Tests the JSON filters and the format:json operator
+
+\*/
+(function(){
+
+/* jslint node: true, browser: true */
+/* eslint-env node, browser, jasmine */
+/* eslint no-mixed-spaces-and-tabs: ["error", "smart-tabs"]*/
+/* global $tw, require */
+"use strict";
+
+describe("json filter tests", function() {
+
+	var wiki = new $tw.Wiki();
+	var tiddlers = [{
+		title: "First",
+		text: '{"a":"one","b":"","c":1.618,"d": {"e": "four","f": ["five","six",true,false,null]}}',
+		type: "application/json"
+	},{
+		title: "Second",
+		text: '["une","deux","trois",["quatre","cinq"]]',
+		type: "application/json"
+	},{
+		title: "Third",
+		text: "This is not JSON",
+		type: "text/vnd.tiddlywiki"
+	}];
+	wiki.addTiddlers(tiddlers);
+
+	it("should support the getindex operator", function() {
+		expect(wiki.filterTiddlers("[{First}getindex[b]]")).toEqual([]);
+	});
+
+	it("should support the jsonget operator", function() {
+		expect(wiki.filterTiddlers("[{Third}jsonget[]]")).toEqual(["This is not JSON"]);
+		expect(wiki.filterTiddlers("[{Second}jsonget[]]")).toEqual(["une","deux","trois","quatre","cinq"]);
+		expect(wiki.filterTiddlers("[{First}jsonget[]]")).toEqual(["one","","1.618","four","five","six","true","false","null"]);
+		expect(wiki.filterTiddlers("[{First}jsonget[a]]")).toEqual(["one"]);
+		expect(wiki.filterTiddlers("[{First}jsonget[b]]")).toEqual([""]);
+		expect(wiki.filterTiddlers("[{First}jsonget[missing-property]]")).toEqual([]);
+		expect(wiki.filterTiddlers("[{First}jsonget[d]]")).toEqual(["four","five","six","true","false","null"]);
+		expect(wiki.filterTiddlers("[{First}jsonget[d],[e]]")).toEqual(["four"]);
+		expect(wiki.filterTiddlers("[{First}jsonget[d],[f]]")).toEqual(["five","six","true","false","null"]);
+		expect(wiki.filterTiddlers("[{First}jsonget[d],[f],[0]]")).toEqual(["five"]);
+		expect(wiki.filterTiddlers("[{First}jsonget[d],[f],[1]]")).toEqual(["six"]);
+		expect(wiki.filterTiddlers("[{First}jsonget[d],[f],[2]]")).toEqual(["true"]);
+		expect(wiki.filterTiddlers("[{First}jsonget[d],[f],[3]]")).toEqual(["false"]);
+		expect(wiki.filterTiddlers("[{First}jsonget[d],[f],[4]]")).toEqual(["null"]);
+	});
+
+	it("should support the jsonextract operator", function() {
+		expect(wiki.filterTiddlers("[{Third}jsonextract[]]")).toEqual(['"This is not JSON"']);
+		expect(wiki.filterTiddlers("[{First}jsonextract[]]")).toEqual(['{"a":"one","b":"","c":1.618,"d":{"e":"four","f":["five","six",true,false,null]}}']);
+		expect(wiki.filterTiddlers("[{First}jsonextract[a]]")).toEqual(['"one"']);
+		expect(wiki.filterTiddlers("[{First}jsonextract[b]]")).toEqual(['""']);
+		expect(wiki.filterTiddlers("[{First}jsonextract[missing-property]]")).toEqual([]);
+		expect(wiki.filterTiddlers("[{First}jsonextract[d]]")).toEqual(['{"e":"four","f":["five","six",true,false,null]}']);
+		expect(wiki.filterTiddlers("[{First}jsonextract[d]jsonextract[f]]")).toEqual(['["five","six",true,false,null]']);
+		expect(wiki.filterTiddlers("[{First}jsonextract[d],[e]]")).toEqual(['"four"']);
+		expect(wiki.filterTiddlers("[{First}jsonextract[d],[f]]")).toEqual(['["five","six",true,false,null]']);
+		expect(wiki.filterTiddlers("[{First}jsonextract[d],[f],[0]]")).toEqual(['"five"']);
+		expect(wiki.filterTiddlers("[{First}jsonextract[d],[f],[1]]")).toEqual(['"six"']);
+		expect(wiki.filterTiddlers("[{First}jsonextract[d],[f],[2]]")).toEqual(["true"]);
+		expect(wiki.filterTiddlers("[{First}jsonextract[d],[f],[3]]")).toEqual(["false"]);
+		expect(wiki.filterTiddlers("[{First}jsonextract[d],[f],[4]]")).toEqual(["null"]);
+	});
+
+	it("should support the jsonindexes operator", function() {
+		expect(wiki.filterTiddlers("[{Second}jsonindexes[]]")).toEqual(["0","1","2","3"]);
+		expect(wiki.filterTiddlers("[{First}jsonindexes[]]")).toEqual(["a","b","c","d"]);
+		expect(wiki.filterTiddlers("[{First}jsonindexes[a]]")).toEqual([]);
+		expect(wiki.filterTiddlers("[{First}jsonindexes[b]]")).toEqual([]);
+		expect(wiki.filterTiddlers("[{First}jsonindexes[d]]")).toEqual(["e","f"]);
+		expect(wiki.filterTiddlers("[{First}jsonindexes[d],[e]]")).toEqual([]);
+		expect(wiki.filterTiddlers("[{First}jsonindexes[d],[f]]")).toEqual(["0","1","2","3","4"]);
+		expect(wiki.filterTiddlers("[{First}jsonindexes[d],[f],[0]]")).toEqual([]);
+		expect(wiki.filterTiddlers("[{First}jsonindexes[d],[f],[1]]")).toEqual([]);
+		expect(wiki.filterTiddlers("[{First}jsonindexes[d],[f],[2]]")).toEqual([]);
+		expect(wiki.filterTiddlers("[{First}jsonindexes[d],[f],[3]]")).toEqual([]);
+		expect(wiki.filterTiddlers("[{First}jsonindexes[d],[f],[4]]")).toEqual([]);
+	});
+
+	it("should support the jsontype operator", function() {
+		expect(wiki.filterTiddlers("[{Third}jsontype[]]")).toEqual(["string"]);
+		expect(wiki.filterTiddlers("[{First}jsontype[]]")).toEqual(["object"]);
+		expect(wiki.filterTiddlers("[{First}jsontype[a]]")).toEqual(["string"]);
+		expect(wiki.filterTiddlers("[{First}jsontype[b]]")).toEqual(["string"]);
+		expect(wiki.filterTiddlers("[{First}jsontype[c]]")).toEqual(["number"]);
+		expect(wiki.filterTiddlers("[{First}jsontype[d]]")).toEqual(["object"]);
+		expect(wiki.filterTiddlers("[{First}jsontype[d],[e]]")).toEqual(["string"]);
+		expect(wiki.filterTiddlers("[{First}jsontype[d],[f]]")).toEqual(["array"]);
+		expect(wiki.filterTiddlers("[{First}jsontype[d],[f],[0]]")).toEqual(["string"]);
+		expect(wiki.filterTiddlers("[{First}jsontype[d],[f],[1]]")).toEqual(["string"]);
+		expect(wiki.filterTiddlers("[{First}jsontype[d],[f],[2]]")).toEqual(["boolean"]);
+		expect(wiki.filterTiddlers("[{First}jsontype[d],[f],[3]]")).toEqual(["boolean"]);
+		expect(wiki.filterTiddlers("[{First}jsontype[d],[f],[4]]")).toEqual(["null"]);
+	});
+
+	it("should support the format:json operator", function() {
+		expect(wiki.filterTiddlers("[{First}format:json[]]")).toEqual(["{\"a\":\"one\",\"b\":\"\",\"c\":1.618,\"d\":{\"e\":\"four\",\"f\":[\"five\",\"six\",true,false,null]}}"]);
+		expect(wiki.filterTiddlers("[{First}format:json[4]]")).toEqual(["{\n    \"a\": \"one\",\n    \"b\": \"\",\n    \"c\": 1.618,\n    \"d\": {\n        \"e\": \"four\",\n        \"f\": [\n            \"five\",\n            \"six\",\n            true,\n            false,\n            null\n        ]\n    }\n}"]);
+		expect(wiki.filterTiddlers("[{First}format:json[  ]]")).toEqual(["{\n  \"a\": \"one\",\n  \"b\": \"\",\n  \"c\": 1.618,\n  \"d\": {\n    \"e\": \"four\",\n    \"f\": [\n      \"five\",\n      \"six\",\n      true,\n      false,\n      null\n    ]\n  }\n}"]);
+	});
+
+});
+
+})();

package/editions/test/tiddlers/tests/test-linked-list.js

@@ -59,10 +59,35 @@ describe("LinkedList class tests", function() {
 		return pair;
 	};
 
+	// This returns an array in reverse using a LinkList's prev member. Thus
+	// testing that prev is not corrupt. It doesn't exist in the LinkList module
+	// itself to avoid full support for it. Maybe that will change later.
+	function toReverseArray(list) {
+		var visits = Object.create(null),
+			value = list.prev.get(null),
+			array = [];
+		while(value !== null) {
+			array.push(value);
+			var prev = list.prev.get(value);
+			if(Array.isArray(prev)) {
+				var i = (visits[value] || prev.length) - 1;
+				visits[value] = i;
+				value = prev[i];
+			} else {
+				value = prev;
+			}
+		}
+		return array;
+	};
+
 	// compares an array and a linked list to make sure they match up
 	function compare(pair) {
-		expect(pair.list.toArray()).toEqual(pair.array);
+		var forward = pair.list.toArray();
+		expect(forward).toEqual(pair.array);
 		expect(pair.list.length).toBe(pair.array.length);
+		// Now we reverse the linked list and test it back to front, thus
+		// confirming that the list.prev isn't corrupt.
+		expect(toReverseArray(pair.list)).toEqual(forward.reverse());
 		return pair;
 	};
 
@@ -115,7 +140,7 @@ describe("LinkedList class tests", function() {
 		// for list.last to be anything other than a string, but I
 		// can't figure out how to make that corruption manifest a problem.
 		// So I dig into its private members. Bleh...
-		expect(typeof pair.list.last).toBe("string");
+		expect(typeof pair.list.prev.get(null)).toBe("string");
 	});
 
 	it("can pushTop value linked to by a repeat item", function() {
@@ -137,6 +162,21 @@ describe("LinkedList class tests", function() {
 		compare(pushTop(newPair(["C", "X", "A", "A"]), "X")); // CAAX
 	});
 
+	it("can remove all instances of a multi-instance value #7059", function() {
+		// Remove duplicate items when one or more items between the duplicates
+		// are not removed and the first of those duplicates is not the first item.
+		// These tests used to fail prior to the fix to #7059
+		compare(remove(newPair(["A", "A", "C", "B", "A"]), ["A", "C", "A", "A"])); // B
+		compare(remove(newPair(["A", "A", "C", "B", "A"]), ["C", "A", "A", "A"])); // B
+		compare(remove(newPair(["A", "A", "C", "B", "A"]), ["A", "A", "A"])); // CB
+		compare(remove(newPair(["A", "A", "C", "B", "A"]), ["A", "A", "A", "C"])); // B
+		compare(remove(newPair(["A", "A", "B", "A"]), ["A", "A", "A"])); // B
+		compare(remove(newPair(["A", "A", "B", "A"]), ["A", "A", "A", "B"])); //
+		compare(remove(newPair(["C", "A", "B", "A"]), ["C", "A", "A"])); // B
+		compare(remove(newPair(["C", "A", "B", "A", "C"]), ["C", "A", "A", "C"])); // B
+		compare(remove(newPair(["B", "A", "B", "A"]), ["B", "A", "A"])); // B
+	});
+
 	it("can handle particularly nasty pushTop pitfall", function() {
 		var pair = newPair(["A", "B", "A", "C"]);
 		pushTop(pair, "A"); // BACA

package/editions/test/tiddlers/tests/test-popup.js

@@ -0,0 +1,63 @@
+/*\
+title: test-popup.js
+type: application/javascript
+tags: [[$:/tags/test-spec]]
+
+Tests some utility function of the Popup prototype.
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+describe("Popup tests", function() {
+
+	it("parseCoordinates should parse valid coordinates", function() {
+		var popup = require("$:/core/modules/utils/dom/popup.js");
+
+		expect(popup.parseCoordinates("(1,2,3,4)")).toEqual({absolute: false, left: 1, top: 2, width: 3, height: 4});
+		expect(popup.parseCoordinates("(1.5,2.6,3.7,4.8)")).toEqual({absolute: false, left: 1.5, top: 2.6, width: 3.7, height: 4.8});
+		expect(popup.parseCoordinates("@(1,2,3,4)")).toEqual({absolute: true, left: 1, top: 2, width: 3, height: 4});
+		expect(popup.parseCoordinates("@(1.5,2.6,3.7,4.8)")).toEqual({absolute: true, left: 1.5, top: 2.6, width: 3.7, height: 4.8});
+	});
+
+	it("parseCoordinates should not parse invalid coordinates", function() {
+		var popup = require("$:/core/modules/utils/dom/popup.js");
+
+		expect(popup.parseCoordinates("#(1,2,3,4)")).toEqual(false);
+		expect(popup.parseCoordinates("(1,2,3,4")).toEqual(false);
+		expect(popup.parseCoordinates("(1,2,3)")).toEqual(false);
+	});
+
+	it("buildCoordinates should create valid coordinates", function() {
+		var popup = require("$:/core/modules/utils/dom/popup.js");
+
+		var coordinates = {
+			left: 1.5,
+			top: 2.6,
+			width: 3.7,
+			height: 4.8
+		};
+
+		expect(popup.buildCoordinates(popup.coordinatePrefix.csOffsetParent, coordinates)).toEqual("(1.5,2.6,3.7,4.8)");
+		expect(popup.buildCoordinates(popup.coordinatePrefix.csAbsolute, coordinates)).toEqual("@(1.5,2.6,3.7,4.8)");
+	});
+
+	it("buildCoordinates should detect invalid input", function() {
+		var popup = require("$:/core/modules/utils/dom/popup.js");
+
+		var coordinates = {
+			left: "invalid",
+			top: 2.6,
+			width: 3.7,
+			height: 4.8
+		};
+
+		expect(popup.buildCoordinates(popup.coordinatePrefix.csOffsetParent, coordinates)).toEqual("(0,0,0,0)");
+		expect(popup.buildCoordinates("dummy", coordinates)).toEqual("(0,0,0,0)");
+	});
+});
+
+})();

package/editions/test/tiddlers/tests/test-utils.js

@@ -78,6 +78,7 @@ describe("Utility tests", function() {
 		expect(fds(d,"ddd hh mm ssss")).toBe("Sun 17 41 2828");
 		expect(fds(d,"MM0DD")).toBe("1109");
 		expect(fds(d,"MM0\\D\\D")).toBe("110DD");
+		expect(fds(d,"TIMESTAMP")).toBe(d.getTime().toString());
 		const day = d.getUTCDate();
 		const dayStr = ("" + day).padStart(2, '0');
 		const hours = d.getUTCHours();

package/editions/test/tiddlers/tests/test-wikitext.js

@@ -63,6 +63,22 @@ describe("WikiText tests", function() {
 		expect(wiki.renderText("text/html","text/vnd-tiddlywiki","@@color:red;\n<div>\n\nContent</div>\n@@")).toBe("<div style=\"color:red;\"><p>Content</p></div>");
 		expect(wiki.renderText("text/html","text/vnd-tiddlywiki","@@color:red;\n---\n@@")).toBe("<hr style=\"color:red;\">");
 	});
+	it("handles inline style wikitext notation", function() {
+		expect(wiki.renderText("text/html","text/vnd-tiddlywiki",
+			"some @@highlighted@@ text")).toBe('<p>some <span class="tc-inline-style">highlighted</span> text</p>');
+		expect(wiki.renderText("text/html","text/vnd-tiddlywiki",
+			"some @@color:green;.tc-inline-style 1 style and 1 class@@ text")).toBe('<p>some <span class=" tc-inline-style " style="color:green;">1 style and 1 class</span> text</p>');
+		expect(wiki.renderText("text/html","text/vnd-tiddlywiki",
+			"some @@background-color:red;red@@ text")).toBe('<p>some <span style="background-color:red;">red</span> text</p>');
+		expect(wiki.renderText("text/html","text/vnd-tiddlywiki",
+			"some @@.myClass class@@ text")).toBe('<p>some <span class=" myClass ">class</span> text</p>');
+		expect(wiki.renderText("text/html","text/vnd-tiddlywiki",
+			"some @@.myClass.secondClass 2 classes@@ text")).toBe('<p>some <span class=" myClass secondClass ">2 classes</span> text</p>');
+		expect(wiki.renderText("text/html","text/vnd-tiddlywiki",
+			"some @@background:red;.myClass style and class@@ text")).toBe('<p>some <span class=" myClass " style="background:red;">style and class</span> text</p>');
+		expect(wiki.renderText("text/html","text/vnd-tiddlywiki",
+			"some @@background:red;color:white;.myClass 2 style and 1 class@@ text")).toBe('<p>some <span class=" myClass " style="background:red;color:white;">2 style and 1 class</span> text</p>');
+	});
 });
 
 })();

package/editions/test/tiddlywiki.info

@@ -9,6 +9,7 @@
 	],
 	"build": {
 		"index": [
-			"--rendertiddler","$:/core/save/all","test.html","text/plain"]
+			"--rendertiddler","$:/core/save/all","test.html","text/plain",
+			"--test"]
 	}
 }

package/editions/translators/tiddlers/system/PageControlButtonsVisibility.multids

@@ -13,4 +13,5 @@ core/ui/Buttons/more-page-actions: show
 core/ui/Buttons/new-journal: hide
 core/ui/Buttons/permaview: hide
 core/ui/Buttons/storyview: hide
+core/ui/Buttons/layout: hide
 core/ui/Buttons/theme: hide

package/editions/translators/tiddlywiki.info

@@ -12,7 +12,6 @@
 		"de-CH",
 		"de-DE",
 		"el-GR",
-		"en-GB",
 		"en-US",
 		"es-ES",
 		"fa-IR",

package/editions/tw.org/tiddlers/Code of Conduct.tid

@@ -1,5 +1,5 @@
 created: 20220721200137586
-modified: 20220721200137586
+modified: 20220819200137586
 tags: [[Table of Contents]]
 title: Code of Conduct
 type: text/vnd.tiddlywiki
@@ -17,6 +17,7 @@ These principles guide technical and non-technical decisions, and help contribut
 * 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 ''thank the people who enrich the community by sharing what they have created''
 * 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 ''avoid unnecessarily mixing contentious topics like religion and politics''
 * We treat each other with respect, and start with the assumption that ''others are acting in good faith''
+* We avoid discriminatory language
 * We try to use our strength as a community to help others
 * We avoid responding when angry or upset because we try to de-escalate conflict
 * We make sure we critique ideas, not people
@@ -27,4 +28,6 @@ These principles guide technical and non-technical decisions, and help contribut
 
 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.
 
+It is not acceptable to make jokes or other comments that discriminate by race, gender, sexuality, or other protected characteristic.
+
 As an inclusive community, we are committed to making sure that TiddlyWiki is an accessible tool that understands the needs of people with disabilities.

package/editions/tw.org/tiddlers/Fundraising.tid

@@ -14,10 +14,10 @@ We do need a small amount of money on an ongoing basis to pay the costs of runni
 
 We use Open Collective to allow you to contribute towards these costs. You can contribute a one-off donation, or make an ongoing monthly commitment. Find out more:
 
-https://opencollective.com/tiddlywikidotorg
+https://opencollective.com/tiddlywiki
 
 !! Community Projects
 
 We also use Open Collective to raise funds to support the development of major new features, plugins or community infrastructure. These projects generally involve a small team of individuals getting together and making a proposal to the rest of the community.
 
-For example, the [[File Upload Plugin Project|https://opencollective.com/tiddlywikidotorg/projects/tiddlywiki-file-upload]] aims to radically simplify working with attached images.
+For example, the [[File Upload Plugin Project|https://opencollective.com/tiddlywiki/projects/tiddlywiki-file-upload]] aims to radically simplify working with attached images.

package/editions/tw5.com/tiddlers/Tables in WikiText CSS Utility Classes.tid

@@ -0,0 +1,81 @@
+created: 20220817153236691
+modified: 20221010074314452
+tags: [[Tables in WikiText]]
+title: Tables in WikiText CSS Utility Classes
+type: text/vnd.tiddlywiki
+
+~WikiText tables can be styled by applying CSS classes. For basic information on wiktext tables and how to style them, see [[Tables in WikiText]].
+
+{{Table Classes, Captions, Headers and Footers}}
+
+As seen above, the resulting table is left aligned and grows to fit the content. This is the browser default layout behaviour for tables. To get another behaviour, various CSS classes can be added into the "`k` row".
+
+! Utility Classes
+
+{{Utility Classes}}
+
+! Examples
+
+The following examples apply the style classes to tables but the "General Utility Classes" can as well be used on DIVs or other [[HTML block elements|HTML Block Elements]]
+
+!! Centred Table
+
+To center a table horizontally, use `tc-center`:
+
+<<wikitext-example-without-html src:"""|tc-center|k
+|This is a caption |c
+|Cell1 |Cell2 |
+|Cell3 |Cell4 |
+|Header|Header|h
+|Footer|Footer|f
+""">>
+
+!! Centred Table, 80% Width
+
+To add empty left and right margins to a table that is otherwise full-tiddler-width, you can use `tc-max-width-80`
+
+<<wikitext-example-without-html src:"""|tc-center tc-max-width-80|k
+|This is a caption |c
+|Cell1 |<<.lorem>> |
+|<<.lorem>> |Cell4 |
+|Header|Header|h
+""">>
+
+!! Table with Maximum Width
+
+To expand a table to full tiddler width, use `tc-max-width`
+
+<<wikitext-example-without-html src:"""|tc-max-width|k
+|Header|Header|h
+|Cell1 |Cell2 |
+|Cell3 |Cell4 |
+""">>
+
+!! Table with First Column Minimum Width
+
+The following example shows a simple "form" where the first columns width is adjusted to its content by means of `tc-first-col-min-width`
+
+<<wikitext-example-without-html src:"""|tc-max-width tc-first-col-min-width|k
+|Header|Header|h
+|Cell1 |<$edit-text tiddler="$:/temp/test-table-input" tag="input" field="test"/> |
+|Cell3 |<$edit-text tiddler="$:/temp/test-table-input" field="text"/>  |
+""">>
+
+!! Table with Maximum Width ~TextWidgets
+
+Here, the previous "form" is styled further to give the [[TextWidget]]s full width by adding the class `tc-edit-max-width`
+
+<<wikitext-example-without-html src:"""|tc-max-width tc-first-col-min-width tc-edit-max-width|k
+|Header|Header|h
+|Cell1 |<$edit-text tiddler="$:/temp/test-table-input" tag="input" field="test"/> |
+|Cell3 |<$edit-text tiddler="$:/temp/test-table-input" field="text"/>  |
+""">>
+
+!! Table with No Borders
+
+The following is a table with maximum width. It contains [[TextWidget]]s with maximum width. The first column is set to be minimum width. Further, all links in the first column are set to __not__ line break (wrap) regardless of window resize.
+
+<<wikitext-example-without-html src:"""|tc-max-width tc-first-col-min-width tc-edit-max-width tc-table-no-border tc-first-link-nowrap|k
+| Cell1|<$edit-text tiddler="$:/temp/test-table-input" tag="input" field="test"/> |
+|^ [[Link to a tiddler]]<br>some more text|<$edit-text tiddler="$:/temp/test-table-input" field="text"/>  |
+""">>

package/editions/tw5.com/tiddlers/_tw_shared/favicons/markplace.png.meta

@@ -0,0 +1,3 @@
+title: $:/_tw_shared/favicons/marketplace
+type: image/png
+tags: TiddlyWikiSitesMenu

package/editions/tw5.com/tiddlers/_tw_shared/sites/marketplace.tid

@@ -0,0 +1,6 @@
+title: $:/_tw_shared/sites/marketplace
+tags: $:/tags/TiddlyWikiSites TiddlyWikiSitesMenu
+caption: marketplace
+description: Commercial Products and Services
+url: https://talk.tiddlywiki.org/c/marketplace/22
+icon: $:/_tw_shared/favicons/marketplace

package/editions/tw5.com/tiddlers/_tw_shared/tags-TiddlyWikiSites.tid

@@ -1,3 +1,3 @@
 title: $:/tags/TiddlyWikiSites
-list: $:/_tw_shared/sites/tiddlywiki.com $:/_tw_shared/sites/tiddlywiki.org $:/_tw_shared/sites/talk.tiddlywiki.org $:/_tw_shared/sites/links.tiddlywiki.org $:/_tw_shared/sites/tiddlywiki.com.upgrade $:/_tw_shared/sites/tiddlywiki.com.dev $:/_tw_shared/sites/tiddlywiki.com.prerelease $:/_tw_shared/sites/classic.tiddlywiki.com
+list: $:/_tw_shared/sites/tiddlywiki.com $:/_tw_shared/sites/tiddlywiki.org $:/_tw_shared/sites/talk.tiddlywiki.org $:/_tw_shared/sites/links.tiddlywiki.org $:/_tw_shared/sites/tiddlywiki.com.upgrade $:/_tw_shared/sites/tiddlywiki.com.dev $:/_tw_shared/sites/tiddlywiki.com.prerelease $:/_tw_shared/sites/classic.tiddlywiki.com $:/_tw_shared/sites/marketplace
 tags: TiddlyWikiSitesMenu

package/editions/tw5.com/tiddlers/about/Funding TiddlyWiki.tid

@@ -0,0 +1,19 @@
+title: Funding TiddlyWiki
+tags: About HelloThere
+modified: 20221204165636777
+created: 20221204165636777
+
+TiddlyWiki is more useful to everybody if it is free to use, with no financial barriers to long term adoption. It is not altruism; we believe that removing or reducing barriers to adoption will help to ensure TiddlyWiki's future by making the community larger and stronger.
+
+Nonetheless, TiddlyWiki is a relatively big, complex machine that requires a significant amount of ongoing work to maintain and improve. Some community infrastructure also requires monthly fees to operate (notably the [[TiddlyWiki forum|Forums]]).
+
+The people in the community that do the work have widely varying needs:
+
+* At one end, a good proportion of the work on TiddlyWiki is performed by community members on a purely voluntary basis. For those people, the satisfaction of helping others is sufficient reward. Indeed, for many people, unpaid voluntary activities are a satisfying antidote to everyday paid work
+* At the other extreme, JeremyRuston and some other contributors are trying to make a full-time living working on TiddlyWiki by offering commercial products and services around it
+* In between, there are other people who would appreciate an ocassional token to reward them for their work
+
+To support these needs in the community, we have two initiatives:
+
+* We use [[Open Collective]] to collect donations for the infrastructure costs of the Community and to crowdfund specific developments by individuals or organisations
+* The [[TiddlyWiki Marketplace]] provides a shop window for individuals and organisations offering commercial products and services