Add new safe mode layout

Fixes #7354

boot/boot.js

@@ -1542,6 +1542,8 @@ $tw.Wiki.prototype.processSafeMode = function() {
 	this.addTiddler(new $tw.Tiddler({title: titleReportTiddler, text: report.join("\n\n")}));
 	// Set $:/DefaultTiddlers to point to our report
 	this.addTiddler(new $tw.Tiddler({title: "$:/DefaultTiddlers", text: "[[" + titleReportTiddler + "]]"}));
+	// Switch to the safe mode layout
+	this.addTiddler({title: "$:/layout", text: "$:/core/ui/SafeLayout"});
 };
 
 /*

core/language/en-GB/Misc.multids

@@ -40,6 +40,7 @@ Error/RetrievingSkinny: Error retrieving skinny tiddler list
 Error/SavingToTWEdit: Error saving to TWEdit
 Error/WhileSaving: Error while saving
 Error/XMLHttpRequest: XMLHttpRequest error code
+Error/ZoominTextNode: Story View Error: It appears you tried to interact with a tiddler that displays in a custom container. This is most likely caused by using `$:/tags/StoryTiddlerTemplateFilter` with a template that contains text or whitespace at the start. Please use the pragma `\whitespace trim` and ensure the whole contents of the tiddler is wrapped in a single HTML element. The text that caused this issue:
 InternalJavaScriptError/Title: Internal JavaScript Error
 InternalJavaScriptError/Hint: Well, this is embarrassing. It is recommended that you restart TiddlyWiki by refreshing your browser
 LayoutSwitcher/Description: Open the layout switcher
@@ -55,6 +56,7 @@ Manager/Controls/Show/Option/Tiddlers: tiddlers
 Manager/Controls/Show/Prompt: Show:
 Manager/Controls/Sort/Prompt: Sort by:
 Manager/Item/Colour: Colour
+Manager/Item/Editor: Editor
 Manager/Item/Fields: Fields
 Manager/Item/Icon/None: (none)
 Manager/Item/Icon: Icon

core/modules/config.js

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

core/modules/filters/strings.js

@@ -74,6 +74,113 @@ exports.join = makeStringReducingOperator(
 	},null
 );
 
+var dmp = require("$:/core/modules/utils/diff-match-patch/diff_match_patch.js");
+
+exports.levenshtein = makeStringBinaryOperator(
+	function(a,b) {
+		var dmpObject = new dmp.diff_match_patch(),
+			diffs = dmpObject.diff_main(a,b);
+		return [dmpObject.diff_levenshtein(diffs) + ""];
+	}
+);
+
+// these two functions are adapted from https://github.com/google/diff-match-patch/wiki/Line-or-Word-Diffs
+function diffLineWordMode(text1,text2,mode) {
+	var dmpObject = new dmp.diff_match_patch();
+	var a = diffPartsToChars(text1,text2,mode);
+	var lineText1 = a.chars1;
+	var lineText2 = a.chars2;
+	var lineArray = a.lineArray;
+	var diffs = dmpObject.diff_main(lineText1,lineText2,false);
+	dmpObject.diff_charsToLines_(diffs,lineArray);
+	return diffs;
+}
+
+function diffPartsToChars(text1,text2,mode) {
+	var lineArray = [];
+	var lineHash = {};
+	lineArray[0] = '';
+
+    function diff_linesToPartsMunge_(text,mode) {
+        var chars = '';
+        var lineStart = 0;
+        var lineEnd = -1;
+        var lineArrayLength = lineArray.length,
+            regexpResult;
+        var searchRegexp = /\W+/g;
+        while(lineEnd < text.length - 1) {
+	        if(mode === "words") {
+                regexpResult = searchRegexp.exec(text);
+                lineEnd = searchRegexp.lastIndex;
+                if(regexpResult === null) {
+                lineEnd = text.length;
+                }
+                lineEnd = --lineEnd;
+            } else {
+                lineEnd = text.indexOf('\n', lineStart);
+                if(lineEnd == -1) {
+                    lineEnd = text.length - 1;
+                }
+            }
+            var line = text.substring(lineStart, lineEnd + 1);
+
+            if(lineHash.hasOwnProperty ? lineHash.hasOwnProperty(line) : (lineHash[line] !== undefined)) {
+				chars += String.fromCharCode(lineHash[line]);
+            } else {
+                if (lineArrayLength == maxLines) {
+                  line = text.substring(lineStart);
+                  lineEnd = text.length;
+                }
+                chars += String.fromCharCode(lineArrayLength);
+                lineHash[line] = lineArrayLength;
+                lineArray[lineArrayLength++] = line;
+            }
+            lineStart = lineEnd + 1;
+        }
+        return chars;
+    }
+    var maxLines = 40000;
+    var chars1 = diff_linesToPartsMunge_(text1,mode);
+    maxLines = 65535;
+    var chars2 = diff_linesToPartsMunge_(text2,mode);
+    return {chars1: chars1, chars2: chars2, lineArray: lineArray};
+};
+
+exports.makepatches = function(source,operator,options) {
+	var dmpObject = new dmp.diff_match_patch(),
+		suffix = operator.suffix || "",
+		result = [];
+		
+		source(function(tiddler,title) {
+			var diffs, patches;
+			if(suffix === "lines" || suffix === "words") {
+				diffs = diffLineWordMode(title,operator.operand,suffix);
+				patches = dmpObject.patch_make(title,diffs);
+			} else {
+				patches = dmpObject.patch_make(title,operator.operand);
+			}
+			Array.prototype.push.apply(result,[dmpObject.patch_toText(patches)]);
+		});
+
+	return result;
+};
+
+exports.applypatches = makeStringBinaryOperator(
+	function(a,b) {
+		var dmpObject = new dmp.diff_match_patch(),
+			patches;
+		try {
+			patches = dmpObject.patch_fromText(b);
+		} catch(e) {
+		}
+		if(patches) {
+			return [dmpObject.patch_apply(patches,a)[0]];
+		} else {
+			return [a];
+		}
+	}
+);
+
 function makeStringBinaryOperator(fnCalc) {
 	return function(source,operator,options) {
 		var result = [];
@@ -184,4 +291,4 @@ exports.charcode = function(source,operator,options) {
 	return [chars.join("")];
 };
 
-})();
+})();

core/modules/startup/story.js

@@ -214,7 +214,7 @@ function updateLocationHash(options) {
 			break;
 	}
 	// Only change the location hash if we must, thus avoiding unnecessary onhashchange events
-	if($tw.utils.getLocationHash() !== $tw.locationHash) {
+	if($tw.utils.getLocationHash() !== $tw.locationHash && !$tw.safeMode) {
 		if(options.updateHistory === "yes") {
 			// Assign the location hash so that history is updated
 			window.location.hash = $tw.locationHash;

core/modules/storyviews/zoomin.js

@@ -17,6 +17,10 @@ var easing = "cubic-bezier(0.645, 0.045, 0.355, 1)"; // From http://easings.net/
 var ZoominListView = function(listWidget) {
 	var self = this;
 	this.listWidget = listWidget;
+	this.textNodeLogger = new $tw.utils.Logger("zoomin story river view", {
+		enable: true,
+		colour: 'red'
+	});
 	// Get the index of the tiddler that is at the top of the history
 	var history = this.listWidget.wiki.getTiddlerDataCached(this.listWidget.historyTitle,[]),
 		targetTiddler;
@@ -48,7 +52,10 @@ ZoominListView.prototype.navigateTo = function(historyInfo) {
 	var listItemWidget = this.listWidget.children[listElementIndex],
 		targetElement = listItemWidget.findFirstDomNode();
 	// Abandon if the list entry isn't a DOM element (it might be a text node)
-	if(!targetElement || targetElement.nodeType === Node.TEXT_NODE) {
+	if(!targetElement) {
+		return;
+	} else if (targetElement.nodeType === Node.TEXT_NODE) {
+		this.logTextNodeRoot(targetElement);
 		return;
 	}
 	// Make the new tiddler be position absolute and visible so that we can measure it
@@ -130,7 +137,10 @@ function findTitleDomNode(widget,targetClass) {
 ZoominListView.prototype.insert = function(widget) {
 	var targetElement = widget.findFirstDomNode();
 	// Abandon if the list entry isn't a DOM element (it might be a text node)
-	if(!targetElement || targetElement.nodeType === Node.TEXT_NODE) {
+	if(!targetElement) {
+		return;
+	} else if (targetElement.nodeType === Node.TEXT_NODE) {
+		this.logTextNodeRoot(targetElement);
 		return;
 	}
 	// Make the newly inserted node position absolute and hidden
@@ -173,16 +183,21 @@ ZoominListView.prototype.remove = function(widget) {
 	var toWidgetDomNode = toWidget && toWidget.findFirstDomNode();
 	// Set up the tiddler we're moving back in
 	if(toWidgetDomNode) {
-		$tw.utils.addClass(toWidgetDomNode,"tc-storyview-zoomin-tiddler");
-		$tw.utils.setStyle(toWidgetDomNode,[
-			{display: "block"},
-			{transformOrigin: "50% 50%"},
-			{transform: "translateX(0px) translateY(0px) scale(10)"},
-			{transition: $tw.utils.roundTripPropertyName("transform") + " " + duration + "ms " + easing + ", opacity " + duration + "ms " + easing},
-			{opacity: "0"},
-			{zIndex: "500"}
-		]);
-		this.currentTiddlerDomNode = toWidgetDomNode;
+		if (toWidgetDomNode.nodeType === Node.TEXT_NODE) {
+			this.logTextNodeRoot(toWidgetDomNode);
+			toWidgetDomNode = null;
+		} else {
+			$tw.utils.addClass(toWidgetDomNode,"tc-storyview-zoomin-tiddler");
+			$tw.utils.setStyle(toWidgetDomNode,[
+				{display: "block"},
+				{transformOrigin: "50% 50%"},
+				{transform: "translateX(0px) translateY(0px) scale(10)"},
+				{transition: $tw.utils.roundTripPropertyName("transform") + " " + duration + "ms " + easing + ", opacity " + duration + "ms " + easing},
+				{opacity: "0"},
+				{zIndex: "500"}
+			]);
+			this.currentTiddlerDomNode = toWidgetDomNode;
+		}
 	}
 	// Animate them both
 	// Force layout
@@ -206,6 +221,10 @@ ZoominListView.prototype.remove = function(widget) {
 	return true; // Indicate that we'll delete the DOM node
 };
 
+ZoominListView.prototype.logTextNodeRoot = function(node) {
+	this.textNodeLogger.log($tw.language.getString("Error/ZoominTextNode") + " " + node.textContent);
+};
+
 exports.zoomin = ZoominListView;
 
 })();

core/modules/widgets/let.js

@@ -53,7 +53,9 @@ LetWidget.prototype.computeAttributes = function() {
 			name = attribute.name;
 		// Now that it's prepped, we're allowed to look this variable up
 		// when defining later variables
-		self.currentValueFor[name] = value;
+		if(value !== undefined) {
+			self.currentValueFor[name] = value;
+		}
 	});
 	// Run through again, setting variables and looking for differences
 	$tw.utils.each(this.currentValueFor,function(value,name) {
@@ -74,9 +76,7 @@ LetWidget.prototype.getVariableInfo = function(name,options) {
 			text: this.currentValueFor[name]
 		};
 	}
-	return Widget.prototype.getVariableInfo.call(this,name,$tw.utils.extend(Object.create(null),options,{
-		defaultValue: ""
-	}));
+	return Widget.prototype.getVariableInfo.call(this,name,options);
 };
 
 /*

core/ui/Manager/ItemMainEditor.tid

@@ -0,0 +1,5 @@
+title: $:/Manager/ItemMain/Editor
+tags: $:/tags/Manager/ItemMain
+caption: {{$:/language/Manager/Item/Editor}}
+
+<$edit-text tag="textarea" class="tc-edit-texteditor tc-edit-texteditor-body tc-max-width"/>

core/ui/Manager/ItemSidebarTools.tid

@@ -13,3 +13,8 @@ caption: {{$:/language/Manager/Item/Tools}}
 {{$:/core/images/edit-button}} edit
 </$button>
 </p>
+<p>
+<$button message="tm-delete-tiddler" param=<<currentTiddler>>>
+{{$:/core/images/delete-button}}&#32;delete
+</$button>
+</p>

core/ui/SafeModeLayout.tid

@@ -0,0 +1,37 @@
+title: $:/core/ui/SafeLayout
+tags: $:/tags/Layout
+name: Safe Mode Layout
+description: Safe Mode Layout
+icon: $:/core/images/list
+
+\whitespace trim
+
+\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
+
+\define tv-config-toolbar-class() tc-btn-invisible
+\define tv-config-toolbar-icons() yes
+\define tv-config-toolbar-text() no
+
+<div style="margin: 1em;">
+
+<$navigator story="$:/StoryList" history="$:/HistoryList">
+
+<h2>Layout</h2>
+
+{{$:/snippets/LayoutSwitcher}}
+
+<h2>Controls</h2>
+
+<div class="tc-page-controls">
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]]">
+<$transclude mode="inline"/>
+</$list>
+</div>
+
+<h2>Tiddlers</h2>
+
+<$transclude tiddler="$:/Manager" mode="block"/>
+
+</$navigator>
+
+</div>

core/ui/ViewToolbar/new-here.tid

@@ -6,7 +6,7 @@ description: {{$:/language/Buttons/NewHere/Hint}}
 \whitespace trim
 \define newHereActions()
 \whitespace trim
-<$set name="tags" filter="[<currentTiddler>] [{$:/config/NewTiddler/Tags}]">
+<$set name="tags" filter="[<currentTiddler>] [enlist{$:/config/NewTiddler/Tags}]">
 <$action-sendmessage $message="tm-new-tiddler" tags=<<tags>>/>
 </$set>
 \end

core/wiki/config/ManagerItemState.multids

@@ -1,3 +1,4 @@
 title: $:/state/popup/manager/item/$:/Manager/
 
-ItemMain/RawText: hide
+ItemMain/RawText: hide
+ItemMain/Editor: hide

editions/de-AT/tiddlers/beispiele/TaskManagement.tid

@@ -1,11 +1,11 @@
 created: 20140923173639039
 creator: pmario
-modified: 20140924155046340
+modified: 20230307080008193
 modifier: pmario
 title: TaskManagement
 type: text/vnd.tiddlywiki
 
-In dieser Edition sind folgende Task Management Varianten beschreiben:
+In dieser Edition sind folgende Task Management Varianten beschrieben:
 
 <<list-links filter:"[tag[TaskManagement]]">>
 

editions/de-AT/tiddlers/beispiele/done.tid

@@ -2,7 +2,7 @@ color: #37d011
 created: 20140923104300415
 creator: pmario
 icon: $:/core/images/done-button
-modified: 20140923105208878
+modified: 20230307080039831
 modifier: ChrisK
 tags: done
 title: done
@@ -12,5 +12,5 @@ Diese Tag wird verwendet um "Tasks" als erledigt zu markieren.
 
 Siehe auch:
 
-* [[Task Management]] .. Beispiel
+* [[Task Management|TaskManagement]] .. Beispiel
 * [[Tag Manager|$:/TagManager]] .. Zuweisung der Farben und Symbole

editions/de-AT/tiddlers/howto/Importieren von Tiddlern.tid

@@ -0,0 +1,6 @@
+created: 20230307080413903
+modified: 20230307080417122
+title: Importieren von Tiddlern
+type: text/vnd.tiddlywiki
+
+https://tiddlywiki.com/#Importing%20Tiddlers

editions/de-AT/tiddlers/howto/Liste aller HowTo's.tid

@@ -1,11 +1,11 @@
 created: 20140918094051245
 creator: pmario
-modified: 20140918094948642
+modified: 20230307080301079
 modifier: pmario
 tags: Referenz
 title: Liste aller HowTo's
 type: text/vnd.tiddlywiki
 
-Hier finden Sie eine Auflistung aller HowTo's
+Hier finden Sie eine Auflistung aller ~HowTo's
 
 <<list-links "[tag[howto]]">>

editions/de-AT/tiddlers/konzept/Tagging.tid

@@ -0,0 +1,6 @@
+created: 20230307081437974
+modified: 20230307081439303
+title: Tagging
+type: text/vnd.tiddlywiki
+
+https://tiddlywiki.com/#Tagging

editions/de-AT/tiddlers/system/$__themes_tiddlywiki_vanilla_options_sidebarlayout.tid

@@ -0,0 +1,6 @@
+created: 20230307080103029
+modified: 20230307080103029
+title: $:/themes/tiddlywiki/vanilla/options/sidebarlayout
+type: text/vnd.tiddlywiki
+
+fluid-fixed

editions/de-AT/tiddlers/widgets/ListWidget.tid

@@ -0,0 +1,7 @@
+created: 20230307081923415
+modified: 20230307081953759
+tags: Widgets
+title: ListWidget
+type: text/vnd.tiddlywiki
+
+https://tiddlywiki.com/#ListWidget

editions/de-AT/tiddlers/widgets/TranscludeWidget.tid

@@ -0,0 +1,7 @@
+created: 20230307082002353
+modified: 20230307082023207
+tags: Widgets
+title: TranscludeWidget
+type: text/vnd.tiddlywiki
+
+https://tiddlywiki.com/#TranscludeWidget

editions/de-AT/tiddlers/wikitext/Bilder in WikiText.tid

@@ -1,7 +1,7 @@
 caption: Bilder
 created: 20131205160221762
 creator: pmario
-modified: 20140921170652909
+modified: 20230307081713229
 modifier: pmario
 tags: WikiText
 title: Bilder in WikiText
@@ -25,7 +25,7 @@ oder
 
 Wenn die Bildquelle der Titel eines existierenden Tiddlers ist, dann wird dieser direkt angezeigt. Ansonsten wird die Quelle als URL angesehen und ein HTML `<img>` Element wird erzeugt. Das `src` Attribut wird auf die [[URL]] gesetzt. 
 
-Ein [[Tooltip]] kann ebenfalls angegeben werden:
+Ein Tooltip kann ebenfalls angegeben werden:
 
 ```
 [img[Ich bin der Tooltip text|Motovun Jack.jpg]]
@@ -33,7 +33,7 @@ Ein [[Tooltip]] kann ebenfalls angegeben werden:
 
 [img width=100 [Ich bin der Tooltip text|Motovun Jack.jpg]]
 
-Attribute wie zB: CSS Klassen oder die Höhe und Breite können ebenfalls angegeben werden. 
+Attribute wie z.B: CSS Klassen oder die Höhe und Breite können ebenfalls angegeben werden. 
 
 ```
 [img width=64 [Motovun Jack.jpg]]

editions/de-AT/tiddlers/wikitext/Makros in WikiText.tid

@@ -1,7 +1,7 @@
 caption: Makros
 created: 20131205160746466
 creator: pmario
-modified: 20140922124415476
+modified: 20230307080132949
 modifier: ChrisK
 tags: WikiText
 title: Makros in WikiText
@@ -15,7 +15,7 @@ Hallo, Ich bin $name$ und lebe in $adresse$
 Hallo, Ich bin $name$ und würde gerne mal wieder nach $adresse$ fahren:)
 \end
 
-!! Makros Definieren
+!! Makros definieren
 
 !!! Für die Ungeduldigen
 
@@ -76,7 +76,7 @@ Für einzeilige Makros kann die `\end` Markierung entfallen!
 
 * Makros können mit dem ImportVariablesWidget importiert werden. (Für geübte Anwender)
 
-!! Makros Verwenden
+!! Makros verwenden
 
 ```
 <<meinErstesMakro>>

editions/de-AT/tiddlers/wikitext/Transclusion in WikiText.tid

@@ -0,0 +1,7 @@
+created: 20230307081757660
+modified: 20230307081814992
+tags: WikiText
+title: Transclusion in WikiText
+type: text/vnd.tiddlywiki
+
+https://tiddlywiki.com/#Transclusion%20in%20WikiText

editions/prerelease/tiddlers/$__StoryList.tid

@@ -1,5 +0,0 @@
-created: 20201222190149806
-list: [[Release 5.1.23]]
-modified: 20201222190149806
-title: $:/StoryList
-type: text/vnd.tiddlywiki

editions/prerelease/tiddlers/Release 5.2.6.tid

@@ -1,39 +1,63 @@
 caption: 5.2.6
-created: 20230119221001957
-modified: 20230119221001957
+created: 20230304213950684
+modified: 20230304213950684
 tags: ReleaseNotes
 title: Release 5.2.6
 type: text/vnd.tiddlywiki
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.2.5...master]]//
 
+! Major Improvements
+
+!! Improved Markdown Plugin
+
+* <<.link-badge-updated "https://github.com/Jermolene/TiddlyWiki5/pull/6528">> the [[Markdown Plugin]] to use the newer and better maintained [[markdown-it|https://github.com/markdown-it/markdown-it]] library. The previous Markdown plugin remains available as "markdown-legacy"
+
+!! Better Handling of Loss of Network Connectivity with Client Server Configuration
+
+* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7169">> integration between the [[BrowserStorage Plugin]] and the client-server configuration to allow changes to be made while offline and then later resynchronised with the server
+
+!! New Diff-Match-Patch Primitives
+
+* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7290">> three new operators exposing previously hidden features of the [[Diff-Match-Patch|https://neil.fraser.name/software/diff_match_patch]] library that is integrated with TiddlyWiki:
+** new [[levenshtein Operator]] to calculate the similarity of two strings as the number of characters that need to be inserted, deleted or modified in order to turn one into the other
+** new [[makepatches Operator]] and [[applypatches Operator]] that can be used to make and apply patches that represent the difference between two different texts. See the [[examples|makepatches and applypatches Operator (Examples)]]
+
 ! Translation Improvements
 
 Improvements to the following translations:
 
 * Chinese
 * Italian
+* Polish
 
 ! Plugin Improvements
 
-* <<.link-badge-updated "https://github.com/Jermolene/TiddlyWiki5/pull/6528">> the [[Markdown Plugin]] to use the newer and better maintained [[markdown-it|https://github.com/markdown-it/markdown-it]] library. The previous Markdown plugin remains available as "markdown-legacy"
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7176">> [[Innerwiki Plugin]] to allow the `<$data>` widget to override existing tiddler fields
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7207">>, <<.link-badge-here "https://github.com/Jermolene/TiddlyWiki5/commit/c39ef398bffae12c0ed7324d9b6d9d29f0f2f9ff">> and <<.link-badge-here "https://github.com/Jermolene/TiddlyWiki5/commit/8f7441f296351a4dd0852c3c782f8874d398e052">> problem preventing [[Share Plugin]] from working properly
+* <<.link-badge-updated "https://github.com/Jermolene/TiddlyWiki5/commit/524cee1489f260375cac8cfe878fdc5942a4596e">> [[XLSX Plugin|XLSX Utilities Edition]] to handle importing numeric fields
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/81f514116657d0d567be7a4c45762a85beaa8bc0">> Dynannotate plugin crash when using the fake DOM used for static rendering
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7281">> bug where pasting text into the CodeMirror editor also opened an `$:/Import` tiddler
 
+! Accessibility Improvements
+
+* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7232">> appearance of save wiki button so that it is accessible to users without colour vision
 
 ! Usability Improvements
 
 * <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7217">> consistency of tiddler deletion by allowing missing tiddlers to be 'deleted', which just results in them being closed
 * <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/commit/34643a42790777f1b235f57b5093bb29bd0b3a14">> layout switcher to include an optional icon for each layout
 * <<.link-badge-removed "https://github.com/Jermolene/TiddlyWiki5/commit/c0615e20ecf7d5d5e66d8a2acd28b80e8d59688d">> [[improvements to table layout|https://github.com/Jermolene/TiddlyWiki5/pull/7010]] from v5.2.5 that have proved to not be backwards compatible
+* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7323">> support for `&dollar;` HTML entity
 
 ! Widget Improvements
 
-* 
+* <<.link-badge-extended "https://github.com/Jermolene/TiddlyWiki5/pull/7222">> EditTextWidget to support `focusSelectFromStart` and `focusSelectFromEnd` attributes to give better control over text selection
 
 ! Filter improvements
 
 * <<.link-badge-extended "https://github.com/Jermolene/TiddlyWiki5/pull/7121">> [[encodeuricomponent Operator]] to encode characters such as `*` that are illegal in Windows filenames
+* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/commit/89fd8871b6217634c9896b9402069757ca5ea189">> [[encodebase64 Operator]] and [[decodebase64 Operator]]
 
 ! Hackability Improvements
 
@@ -41,6 +65,7 @@ Improvements to the following translations:
 * <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7118">> readability of [[tag-picker Macro]] and [[keyboard-driven-input Macro]]
 * <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7129">> reliability of [[list-links-draggable Macro]] and [[list-tagged-draggable Macro]] by using the new GenesisWidget instead of textual substitution
 * <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7210">> [[external JavaScript core support|Using the external JavaScript template]] to make it possible to save an external JS wiki as a standard single file wiki
+* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7007">> a warning message in the browser console when the Zoomin storyview fails due to the tiddler view template lacking a single containing element
 
 ! Bug Fixes
 
@@ -50,42 +75,58 @@ Improvements to the following translations:
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7121">> (and <<.link-badge-here "https://github.com/Jermolene/TiddlyWiki5/pull/7219">>) overriding `toc-caption` macro for [[Table-of-Contents Macros]]
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7212">> rendering of $:/core/ui/MoreSideBar/Tags when viewed within the story river
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7156">> undefined variable crash in [[reduce Operator]], [[filter Operator]] and [[sortsub Operator]]
-* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/7153">> GenesisWidget not to create anything if the `$type` attribute is blank or missing
+* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/issues/7153">> GenesisWidget not to create anything if the `$type` attribute is blank or missing
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7230">> GenesisWidget to pass `isBlock` flag to the generated widget
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/7160">> crash using [[jsonget Operator]] with "fixed" as key name
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/0b39e47ce88c7620b7a66c1553a71efaff06edb9">> importing of MP3 files to match current browser implementations
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7122">> crash when attempting to create an element with a blank tag name
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7224">> layout issue with "save tiddler" button
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/3d0ec5b1bdc157f87d65b8c9b76e681c14337eb4">> (and <<.link-badge-here "https://github.com/Jermolene/TiddlyWiki5/commit/4e5c957e975459350cd7df3038e5fb3c7aea859f">>) handling of whitespace in lists to cover all Unicode whitespace characters
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7228">> test spacing of parser rule checkboxes in control panel
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/f249b79e81e51d48364ea8147fe27850df9f577f">> CSS classes assigned to edit toolbar buttons
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/7247">> usage of broken CSS class `tc-storyview-zoomin-tiddler` in Zoomin story view
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7243">> usage of `importTitle` and `autoOpenOnImport` options for [[WidgetMessage: tm-import-tiddlers]]
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7276">> fixed text editor refresh when the palette is changed
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/7270">> crash with LetWidget when referencing a variable that exists but has an undefined value
 
 ! Node.js Improvements
 
-* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7169">> integration between the [[BrowserStorage Plugin]] and the client-server configuration to allow changes to be made while offline and then later resynchronised with the server
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7130">> duplicate fields in internal templates used in client-server configuration
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/7138">> lazy loading not triggering a sync from the server
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/bf8e1ca5b0587787bf80692b0213bb7b038c7868">> crash on creating a new tiddler if anonymous users manage to create syncable tiddlers in a read only wiki
 * <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/commit/95e61688397ff1bc9be04193bc4ce2e3c8c48dce">> handling of logout in the client-server configuration to avoid 404 errors
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/7238">> problem with saving tiddlers with `_canonical_uri` field as `.tid` files
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/6953">> missing meta viewport to static river template
 
 ! Performance Improvements
 
-* 
+* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7297">> wikitext parsing to use "sticky" flag for improved performance
+* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7299">> field indexer to more efficiently process lookups
 
 ! Acknowledgements
 
 [[@Jermolene|https://github.com/Jermolene]] would like to thank the contributors to this release who have generously given their time to help improve TiddlyWiki:
 
 <<.contributors """
+andrigamerita
 AnthonyMuscio
 BramChen
 btheado
 cdruan
 CrossEye
 cs8425
+EvidentlyCube
 fkmiec
 flibbles
 GameDungeon
+hffqyd
 jeffrey4l
 joebordes
 kookma
+linonetwo
 m42e
 Marxsal
+mateuszwilczek
 newmedicine
 pippep
 pmario
@@ -94,4 +135,4 @@ Telumire
 twMat
 wincentbalin
 yaisog
-""">>
+""">>

editions/test/tiddlers/tests/data/filters/DiffMergePatch1.tid

@@ -0,0 +1,28 @@
+title: Filters/DiffMergePatch1
+description: Tests for diff-merge-patch derived operators
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+
+\whitespace trim
+\define text1()
+the cat sat on the mat
+\end
+
+\define text2()
+the hat saw in every category
+\end
+
+<$text text={{{ [<text1>makepatches<text2>] }}}/>
++
+title: ExpectedResult
+
+<p>@@ -1,22 +1,29 @@
+ the 
+-c
++h
+ at sa
+-t on the mat
++w in every category
+</p>

editions/test/tiddlers/tests/data/filters/DiffMergePatch2.tid

@@ -0,0 +1,25 @@
+title: Filters/DiffMergePatch2
+description: Tests for diff-merge-patch derived operators
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+
+\whitespace trim
+\define text1()
+the cat sat on the mat
+\end
+
+\define text2()
+the hat saw in every category
+\end
+
+<$let patches={{{ [<text1>makepatches<text2>] }}}>
+
+<$text text={{{ [<text1>applypatches<patches>] }}}/>
+
+</$let>
++
+title: ExpectedResult
+
+the hat saw in every category

editions/test/tiddlers/tests/data/filters/DiffMergePatch3.tid

@@ -0,0 +1,22 @@
+title: Filters/DiffMergePatch3
+description: Tests for diff-merge-patch derived operators
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+
+\whitespace trim
+\define text1()
+the cat sat on the mat
+\end
+
+\define patches()
+**NOT A VALID PATCH**
+\end
+
+<$text text={{{ [<text1>applypatches<patches>] }}}/>
+
++
+title: ExpectedResult
+
+the cat sat on the mat

editions/test/tiddlers/tests/data/widgets/LetWidgetSelfReferences.tid

@@ -0,0 +1,15 @@
+title: Widgets/LetWidgetSelfReferences
+description: Test let widget self references
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+
+\whitespace trim
+<$let default={{{ [[default]is[variable]then[aa]else[bb]] }}} >
+<<default>>
+</$let>
++
+title: ExpectedResult
+
+<p>bb</p>

editions/test/tiddlers/tests/data/widgets/LetWidgetUndefinedVariable.tid

@@ -0,0 +1,15 @@
+title: Widgets/LetWidgetUndefinedVariable
+description: Test let widget undefined variable
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+
+\whitespace trim
+<$let test1=<<test>> test2={{{ [<test1>] }}}>
+<<test2>>
+</$let>
++
+title: ExpectedResult
+
+<p></p>

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

@@ -1071,6 +1071,20 @@ Tests the filtering mechanism.
 			expect(wiki.filterTiddlers("[charcode[9],[10]]").join(" ")).toBe(String.fromCharCode(9) + String.fromCharCode(10));
 			expect(wiki.filterTiddlers("[charcode[]]").join(" ")).toBe("");
 		});
+		
+		it("should handle the levenshtein operator", function() {
+			expect(wiki.filterTiddlers("[[apple]levenshtein[apple]]").join(" ")).toBe("0");
+			expect(wiki.filterTiddlers("[[apple]levenshtein[banana]]").join(" ")).toBe("9");
+			expect(wiki.filterTiddlers("[[representation]levenshtein[misreprehensionisation]]").join(" ")).toBe("10");
+			expect(wiki.filterTiddlers("[[the cat sat on the mat]levenshtein[the hat saw in every category]]").join(" ")).toBe("13");
+		});
+		
+		it("should handle the makepatches operator", function() {
+			expect(wiki.filterTiddlers("[[apple]makepatches[apple]]").join(" ")).toBe("");
+			expect(wiki.filterTiddlers("[[apple]makepatches[banana]]").join(" ")).toBe("@@ -1,5 +1,6 @@\n-apple\n+banana\n");
+			expect(wiki.filterTiddlers("[[representation]makepatches[misreprehensionisation]]").join(" ")).toBe("@@ -1,13 +1,21 @@\n+mis\n repre\n-sent\n+hensionis\n atio\n");
+			expect(wiki.filterTiddlers("[[the cat sat on the mat]makepatches[the hat saw in every category]]").join(" ")).toBe("@@ -1,22 +1,29 @@\n the \n-c\n+h\n at sa\n-t on the mat\n+w in every category\n");
+		});
 	
 		it("should parse filter variable parameters", function(){
 		  expect($tw.utils.parseFilterVariable("currentTiddler")).toEqual(

editions/tw5.com/tiddlers/concepts/Date Fields.tid

@@ -1,5 +1,5 @@
 created: 20150117190213631
-modified: 20201201154211507
+modified: 20230226144641763
 tags: Concepts
 title: Date Fields
 type: text/vnd.tiddlywiki
@@ -21,6 +21,8 @@ Values of date fields are 17 or 18-character strings:
 
 To avoid problems arising from differences of time zone, TiddlyWiki always uses [[UTC|https://en.wikipedia.org/wiki/Coordinated_Universal_Time]].
 
+The [[DateFormat]] template for storage of dates in these fields is `[UTC]YYYY0MM0DD0hh0mm0ss0XXX`.
+
 As an example, the <<.field created>> field of this tiddler has the value <<.value """<$view field="created"/>""">>.
 
 Dates can be [[converted to other formats|DateFormat]] for display:

editions/tw5.com/tiddlers/concepts/WikiText.tid

@@ -1,15 +1,15 @@
 created: 20131205155227468
-modified: 20140919191220377
+modified: 20230303214711802
 tags: Concepts Reference
 title: WikiText
 type: text/vnd.tiddlywiki
 
-~WikiText is a concise, expressive way of typing a wide range of text formatting, hypertext and interactive features. It allows you to focus on writing without a complex user interface getting in the way. It is designed to be familiar for users of [[MarkDown|http://daringfireball.net/projects/markdown/]], but with more of a focus on linking and the interactive features.
+~WikiText is a concise, expressive way of typing a wide range of text formatting, hypertext and interactive features. It allows you to focus on writing without a complex user interface getting in the way. It is designed to be familiar for users of [[Markdown]] but with more of a focus on linking and the interactive features.
 
-~WikiText can also be inserted to the text field using the [[Editor toolbar]].
+~WikiText can also be inserted to the text field using the [[Editor toolbar]] buttons.
 
-See [[Formatting text in TiddlyWiki]] for an introduction to WikiText.
+See [[Formatting in WikiText]] and [[Formatting text in TiddlyWiki]] for an introduction to ~WikiText.
 
-The following elements of WikiText syntax are built into the core:
+The following elements of ~WikiText syntax are built into the core:
 
-<<list-links "[tag[WikiText]]">>
+<<list-links filter:"[tag[WikiText]]" class:"multi-columns">>

editions/tw5.com/tiddlers/definitions/Markdown.tid

@@ -0,0 +1,10 @@
+created: 20220727090611178
+modified: 20220728191637376
+tags: Definitions
+title: Markdown
+
+<<<
+Markdown is a text-to-HTML conversion tool for web writers. Markdown allows you to write using an easy-to-read, easy-to-write plain text format, then convert it to structurally valid XHTML (or HTML).
+<<<https://daringfireball.net/projects/markdown/
+
+~TiddlyWiki and Markdown share some formatting rules eg: [[inline code|Formatting in WikiText]] and [[code blocks|Code Blocks in WikiText]] but WikiText also offers advanced functions like [[transclusions|Transclusion in WikiText]] and [[macros|Macro Calls in WikiText]]

editions/tw5.com/tiddlers/features/DateFormat.tid

@@ -1,12 +1,12 @@
 created: 20140418142957325
-modified: 20221121131150032
+modified: 20230226144359284
 tags: Features
 title: DateFormat
 type: text/vnd.tiddlywiki
 
-The default representation of dates is a compact string such as `20211002153802059`. For example, the `created` and `modified` fields are stored like this.
+The default representation of dates is a compact string such as <<.value 20211002153802059>>. The associated template is `[UTC]YYYY0MM0DD0hh0mm0ss0XXX`. For example, the <<.field created>> and <<.field modified>> fields are stored like this.
 
-The display format for this string can be controlled with a template. For example, transcluding the `modified` field automatically applies a template to display the date as `Sat Oct 02 2021 17:40:50 GMT+0200 (Central European Summer Time)`. A few widgets and filter operators allow you to manually specify a template, for example the ViewWidget:
+The display format for this string can be controlled with a template. For example, transcluding the <<.field modified>> field automatically applies a template to display the date as <<.value "Sat Oct 02 2021 17:40:50 GMT+0200 (Central European Summer Time)">>. A few widgets and filter operators allow you to manually specify a template, for example the ViewWidget:
 
 `<$view field=modified format=date template="DDth mmm YYYY 0hh:0mm:0ss" />`
 
@@ -52,7 +52,7 @@ The date string is processed with the following substitutions:
 
 Note that other text is passed through unchanged, allowing commas, colons or other separators to be used.
 
-The `{era:BCE||CE}` notation can specify different strings for years that are negative, zero or positive. For example `{era:BC|Z|AD}` would display `BC` for negative years, `AD` for positive years, and `Z` for year zero.
+The `{era:BCE||CE}` notation can specify different strings for years that are negative, zero or positive. For example `{era:BC|Z|AD}` would display <<.value BC>> for negative years, <<.value AD>> for positive years, and <<.value Z>> for year zero.
 
 ! Examples
 
@@ -61,7 +61,7 @@ The `{era:BCE||CE}` notation can specify different strings for years that are ne
 |`DDth MMM \M\M\M YYYY` |16th February MMM 2011 |
 |`DDth mmm YYYY 0hh:0mm:0ss` |16th Feb 2011 11:38:42 |
 
-!! Using `TIMESTAMP` to calculate time difference
+!! Using <<.value TIMESTAMP>> to calculate time difference
 
 You can calculate the difference between two dates by doing the following:
 
@@ -71,8 +71,9 @@ You can calculate the difference between two dates by doing the following:
 
 Here is an example of calculating the number of days that passed between creation and last modification of current tiddler:
 
-* Fields `modified` and `created` contain their respective datetimes in the format `[UTC]YYYY0MM0DD0hh0mm0ssXXX` so convert them to timestamps
-* `86400000` is the number of milliseconds in a day (1000 * 60 * 60 * 24)
+* Convert the <<.field created>> and <<.field modified>> fields to timestamps
+* Divide their difference by <<.value 86400000>> which is the number of milliseconds in a day
+** 1000 milliseconds per second × 60 seconds per minute × 60 minutes per hour × 24 hours per day = 86,400,000 milliseconds per day
 
 <$macrocall $name=".example" n="0" eg="""<$let
 	timestamp-modified={{{ [{!!modified}format:date[TIMESTAMP]] }}}

editions/tw5.com/tiddlers/filters/applypatches Operator.tid

@@ -0,0 +1,15 @@
+caption: applypatches
+created: 20230304154824762
+modified: 20230304154826621
+op-purpose: applies a set of patches to transform the input
+op-input: a [[selection of titles|Title Selection]]
+op-parameter: a string containing patches from the [[makepatches Operator]]
+op-parameter-name: P
+op-output: the transformed input to which the patches <<.place P>> have been applied
+tags: [[Filter Operators]] [[String Operators]]
+title: applypatches Operator
+type: text/vnd.tiddlywiki
+
+<<.from-version "5.2.6">>
+
+<<.operator-examples "makepatches and applypatches">>

editions/tw5.com/tiddlers/filters/examples/Hamlet.tid

@@ -0,0 +1,11 @@
+created: 20230304161453213
+modified: 20230304162156826
+tags: [[Operator Examples]]
+title: Hamlet
+type: application/json
+
+{
+    "Shakespeare-old": "Hamlet: Do you see yonder cloud that's almost in shape of a camel?\nPolonius: By the mass, and 'tis like a camel, indeed.\nHamlet: Methinks it is like a weasel.\nPolonius: It is backed like a weasel.\nHamlet: Or like a whale?\nPolonius: Very like a whale.\n-- Shakespeare",
+    "Shakespeare-new": "Hamlet: Do you see the cloud over there that's almost the shape of a camel?\nPolonius: By golly, it is like a camel, indeed.\nHamlet: I think it looks like a weasel.\nPolonius: It is shaped like a weasel.\nHamlet: Or like a whale?\nPolonius: It's totally like a whale.\n-- Shakespeare",
+    "Trekkie-old": "Kirk: Do you see yonder cloud that's almost in shape of a Klingon?\nSpock: By the mass, and 'tis like a Klingon, indeed.\nKirk: Methinks it is like a Vulcan.\nSpock: It is backed like a Vulcan.\nKirk: Or like a Romulan?\nSpock: Very like a Romulan.\n-- Trekkie"
+}

editions/tw5.com/tiddlers/filters/examples/levenshtein Operator (Examples).tid

@@ -0,0 +1,21 @@
+created: 20230304183158728
+modified: 20230304183159654
+tags: [[levenshtein Operator]] [[Operator Examples]]
+title: levenshtein Operator (Examples)
+type: text/vnd.tiddlywiki
+
+Determine the Levenshtein distance between two words:
+
+<<.operator-example 1 "[[motel]levenshtein[money]]">>
+
+List the 10 tiddler titles with the smallest Levenstein distance to "~TiddlyWiki":
+
+<$macrocall $name='wikitext-example-without-html'
+src="""<ul>
+<$list filter="[all[tiddlers]!is[system]] :sort:number[levenshtein[TiddlyWiki]] :and[first[10]]">
+<li>
+<$link /> (<$text text={{{ [all[current]levenshtein[TiddlyWiki]] }}} />)
+</li>
+</$list>
+</ul>
+"""/>

editions/tw5.com/tiddlers/filters/examples/makepatches and applypatches Operator (Examples).tid

@@ -0,0 +1,43 @@
+created: 20230304160331362
+modified: 20230304160332927
+tags: [[makepatches Operator]] [[applypatches Operator]] [[Operator Examples]]
+title: makepatches and applypatches Operator (Examples)
+type: text/vnd.tiddlywiki
+
+These examples use the example texts in [[Hamlet]], taken from [[https://neil.fraser.name/software/diff_match_patch/demos/patch.html]]
+
+|^!Shakespeare's original |@@white-space: pre-wrap;{{Hamlet##Shakespeare-old}}@@ |
+|^!Modern English |@@white-space: pre-wrap;{{Hamlet##Shakespeare-new}}@@ |
+|^!Trekkie's Copy |@@white-space: pre-wrap;{{Hamlet##Trekkie-old}}@@ |
+
+<div class="doc-examples-hard-breaks">
+
+Use `makepatches` to generate the set of patches to transform Shakepeare's original into Modern English:
+
+<<.operator-example 1 "[{Hamlet##Shakespeare-old}makepatches{Hamlet##Shakespeare-new}]">>
+
+Use `applypatches` to apply the patches to Shakespeare's original text:
+
+<<.operator-example 2 "[{Hamlet##Shakespeare-old}makepatches{Hamlet##Shakespeare-new}] :map[{Hamlet##Shakespeare-old}applypatches<currentTiddler>]">>
+
+In the above example, the [[Map Filter Run Prefix]] is used to pass the patches information as a parameter to `applypatches`. Inside `:map`, <<.value currentTiddler>> is set to the input title (i.e. the previously generated patches).
+
+The patch information from the Shakepeare texts can also be used to transform the //Trekkie's Copy// to a Modern English version:
+
+<<.operator-example 3 "[{Hamlet##Shakespeare-old}makepatches{Hamlet##Shakespeare-new}] :map[{Hamlet##Trekkie-old}applypatches<currentTiddler>]">>
+
+The above examples used the character mode of `makepatches`. The `word` mode yields very similar results in this case, even when applied to the //Trekkie's Copy//.
+
+<<.operator-example 4 "[{Hamlet##Shakespeare-old}makepatches:words{Hamlet##Shakespeare-new}]">>
+
+<<.operator-example 5 "[{Hamlet##Shakespeare-old}makepatches:words{Hamlet##Shakespeare-new}] :map[{Hamlet##Trekkie-old}applypatches<currentTiddler>]">>
+
+The `lines` mode doesn't work as well in this application:
+
+<<.operator-example 6 "[{Hamlet##Shakespeare-old}makepatches:lines{Hamlet##Shakespeare-new}]">>
+
+<<.operator-example 7 "[{Hamlet##Shakespeare-old}makepatches:lines{Hamlet##Shakespeare-new}] :map[{Hamlet##Trekkie-old}applypatches<currentTiddler>]">>
+
+It is better suited as a very fast algorithm to detect line-wise incremental changes to texts and store only the changes instead of multiple versions of the whole texts.
+
+</div>

editions/tw5.com/tiddlers/filters/levenshtein Operator.tid

@@ -0,0 +1,17 @@
+caption: levenshtein
+created: 20230304181639768
+modified: 20230304181642365
+op-purpose: determine the Levenshtein distance of the input title(s) and a given string
+op-input: a [[selection of titles|Title Selection]]
+op-parameter: a string
+op-parameter-name: S
+op-output: the Levenshtein distance between the input title(s) and <<.place S>>
+tags: [[Filter Operators]] [[String Operators]]
+title: levenshtein Operator
+type: text/vnd.tiddlywiki
+
+<<.from-version "5.2.6">>
+
+The Levenshtein distance is a metric for measuring the difference between two strings. Informally, the Levenshtein distance between two strings is the //minimum// number of single-character edits required to change one string into the other.
+
+<<.operator-examples "levenshtein">>

editions/tw5.com/tiddlers/filters/makepatches Operator.tid

@@ -0,0 +1,23 @@
+caption: makepatches
+created: 20230304122354967
+modified: 20230304122400128
+op-purpose: returns a set of patches that transform the input to a given string
+op-input: a [[selection of titles|Title Selection]]
+op-parameter: a string of characters
+op-parameter-name: S
+op-output: a set of patch instructions per input title to be used by the [[applypatches Operator]] to transform the input title(s) into the string <<.place S>>
+op-suffix: `lines` to operate in line mode, `words` to operate in word mode. If omitted (default), the algorithm operates in character mode. See notes below.
+op-suffix-name: T
+tags: [[Filter Operators]] [[String Operators]]
+title: makepatches Operator
+type: text/vnd.tiddlywiki
+
+<<.from-version "5.2.6">>
+
+The difference algorithm operates in character mode by default. This produces the most detailed diff possible. In `words` mode, each word in the input text is transformed into a meta-character, upon which the algorithm then operates. In the default character mode, the filter would find two patches between "ActionWidget" and "Action-Widgets" (the hyphen and the plural s), while in `words` mode, the whole word is found to be changed. In `lines` mode, the meta-character is formed from the whole line, delimited by newline characters, and is found to be changed independent of the number of changes within the line.
+
+The different modes influence the result when the patches are applied to texts other than the original, as well as the runtime.
+
+<<.tip "The calculation in `words` mode is roughly 10 times faster than the default character mode, while `lines` mode can be more than 100 times faster than the default.">>
+
+<<.operator-examples "makepatches and applypatches">>

editions/tw5.com/tiddlers/howtos/Formatting List Results as Tables with CSS - Specified Columns Methods.tid

@@ -33,29 +33,17 @@ Note the various places you need to indicate the number of columns
 
 ```
 @@.fourcolumns
-<$list filter="[tag[Filter Operators]]" variable="foo"><br>
-<<foo>>
+<$list filter="[tag[Filter Operators]]" variable="foo">
+<<foo>><br>
 </$list>
 @@
 ```
 
 !! Example showing partial list of filter operators
 
-<style>
-.fourcolumns {
-   display:block;
-   column-count:4;
-   column-gap:1em;
-   -moz-column-count:4;
-   -moz-column-gap:1em;
-   -webkit-column-count: 4;
-   -webkit-column-gap:1em;
-}
-</style>
-
-
 @@.fourcolumns
-<$list filter="[tag[Filter Operators]limit[24]]" variable="foo"><br>
-<<foo>>
+<$list filter="[tag[Filter Operators]limit[24]]" variable="foo">
+<<foo>><br>
 </$list>
 @@
+

editions/tw5.com/tiddlers/learning/Introduction to Lists.tid

@@ -6,7 +6,7 @@ type: text/vnd.tiddlywiki
 
 Making lists of items plays a central role in working with TiddlyWiki. The following is a brief run-through of some of the more common techniques.
 
-~TiddlyWiki [[uses|The Extended Listops Filters]] lists [[internally|ListField]] for many purposes so the word can have several meanings. Here we are concerned with displaying sequences of items, but not necessarily presented as a conventional bullet list.
+~TiddlyWiki [[uses|Extended Listops Filters]] lists [[internally|ListField]] for many purposes so the word can have several meanings. Here we are concerned with displaying sequences of items, but not necessarily presented as a conventional bullet list.
 
 ! Manually Typed Lists
 

editions/tw5.com/tiddlers/releasenotes/Release 5.1.16.tid

@@ -112,7 +112,7 @@ Prompted by the [[General Data Protection Regulation (GDPR)|https://en.wikipedia
 * [[Fixed|https://github.com/Jermolene/TiddlyWiki5/pull/3093]] problem with crash when dragging over TiddlyWiki on some browsers
 * [[Fixed|https://github.com/Jermolene/TiddlyWiki5/pull/3079]] issue with new journal button
 * [[Fixed|https://github.com/Jermolene/TiddlyWiki5/pull/3164]] problem with ''filter'' and ''value'' attributes of SetWidget
-* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/pull/3190]] problem with numeric operands in the [[The Extended Listops Filters]]
+* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/pull/3190]] problem with numeric operands in the [[Extended Listops Filters]]
 * [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/df1f7e9798b5f6c3d2c3fd82e438cbc9713ade04]] problem with "put" saver and 412 return codes
 * [[Fixed|https://github.com/Jermolene/TiddlyWiki5/pull/3048]] problem with variable references in field values in the edit template
 * [[Extended|https://github.com/Jermolene/TiddlyWiki5/pull/3219]] behaviour of list-after field so that the tiddler is placed at the end of the list if the list-after field is present but empty 

editions/tw5.com/tiddlers/saving/Saving via a Minimal Web Server.tid

@@ -0,0 +1,49 @@
+caption: tw5-server
+color: #70c9a0
+community-author: hffqyd
+created: 20230302011710789
+delivery: Server-side Script
+description: Web server for saving and uploading
+method: save
+modified: 20230302055929311
+tags: Android Chrome Firefox [[Internet Explorer]] Linux Mac Opera Safari Saving Windows iOS Edge
+title: Saving via a Minimal Web Server
+type: text/vnd.tiddlywiki
+
+A local server for TiddlyWiki5 that saves and backups wikis, inspired by
+[[tw5-server.rb | https://gist.github.com/jimfoltz/ee791c1bdd30ce137bc23cce826096da]].
+
+tw5-server provides features of:
+
+* Server for TiddlyWiki5, as well as other files (e.g. images used in TW5 `[img[images/*.png]]`);
+* Easy to save wiki via browsers;
+* Backup wiki in compress format (.gz), to save disk space;
+* Auto clean backups: keep one newest per previous month, keep all backups in current month.
+* Upload files/images to server, for use in tiddlywiki as external links.
+* Offer binary executable for Linux, macos and windows.
+
+Download executable script and binary at the github.com [[tw5-server|https://github.com/hffqyd/tw5-server]].
+
+! Usage
+
+```bash
+# python script:
+python tw5-server.py -p 8000 -d ./ -b backup_dir
+
+# binary file:
+tw5server -a:192.168.0.10 -p:8000 -d:./ -b:backup
+
+-h usage help
+-a address, defautl localhost
+-p port, default 8000
+-d directory to servering, default `current dir`
+-b backup directory name, default `backup`
+-l log saving messages to stdout
+
+Backups auto-clean strategy:
+Keep all backups in current month, keep only the newest one for previous months.
+```
+
+In Unix/Linux, just excute `./tw5-server.py` (with `chmod +x tw5-server.py`).
+
+Then go to http://localhost:8000 (or other address:port specified in command) in your web browser, and click on your wiki html file.

editions/tw5.com/tiddlers/system/doc-styles.tid

@@ -133,6 +133,10 @@ td svg {
 	padding-left: 20px;
 }
 
+.doc-examples-hard-breaks .doc-example-result li {
+    white-space: pre-wrap;
+}
+
 .doc-bad-example code, .doc-bad-example pre, table.doc-bad-example {
   background-color:#ffff80;
 }

editions/tw5.com/tiddlers/system/tw5.com-styles.tid

@@ -325,3 +325,22 @@ type: text/vnd.tiddlywiki
 .tc-btn-download:active {
 	box-shadow: none;
 }
+
+/* WikiText rules */
+
+.multi-columns,
+.fourcolumns {
+	display: block;
+	column-count: 4;
+	column-gap: 1em;
+	-moz-column-count: 4;
+	-moz-column-gap: 1em;
+	-webkit-column-count: 4;
+	-webkit-column-gap: 1em;
+}
+
+@media (max-width: {{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}}) {
+	.multi-columns {
+		column-count: 2;
+	}
+}

editions/tw5.com/tiddlers/widgets/ActionListopsWidget.tid

@@ -1,25 +1,11 @@
 caption: action-listops
 created: 20141025120850184
-list: efg hlm pqr
-modified: 20211115091121133
+modified: 20230301183438774
 myfield: 
-revision: 0
 tags: ActionWidgets Widgets
 title: ActionListopsWidget
 type: text/vnd.tiddlywiki
 
-\define .operator-rows(filter)
-<$list filter="$filter$"><tr>
-<td><$link>{{!!caption}}</$link></td>
-<td>{{!!op-purpose}} <$list filter="[all[current]tag[Common Operators]]">{{$:/core/images/done-button}}</$list></td>
-<td align="center"><$list filter="[all[current]tag[Negatable Operators]]">`!`</$list></td>
-</tr></$list>
-\end
-
-\define .group-heading(_)
-<tr class="doc-table-subheading"><th colspan="3" align="center">$_$</th></tr>
-\end
-
 ! Introduction
 
 The ''action-listops'' widget is an [[action widget|ActionWidgets]] that manipulates user lists in any field or data index. ActionWidgets are used within triggering widgets such as the ButtonWidget.
@@ -34,9 +20,9 @@ The ''action-listops'' widget is invisible. Any content within it is ignored.
 |$index |Optional index of a property in a [[data tiddler|DataTiddlers]] index to be manipulated as a list |
 |$filter |An optional filter expression, the output of which will be saved to the field/index being manipulated |
 |$subfilter |An optional subfilter expression, which takes the list being manipulated as input, and saves the modified list back to the field/index being manipulated |
-|$tags |An optional subfilter expression, which takes the 'tags' field of the target tiddler as input, and saves the modified list of tags back to the 'tags' field |
+|$tags |An optional subfilter expression, which takes the <<.field tags>> field of the target tiddler as input, and saves the modified list of tags back to the <<.field tags>> field |
 
-! $filter vs. $subfilter
+!! Using $filter or $subfilter
 
 Standalone use of the `$subfilter` attribute can be replaced by using a (more complicated) `$filter` attribute value.
 
@@ -49,12 +35,12 @@ For example, the items "abc" and "123" can be appended to the field `myfield` us
 The same can be achieved using the `$filter` attribute and prepending the [[Filter Run]] `[all[current]get[myfield]enlist-input[]]` to the [[Filter Expression]]:
 
 ```
-<$action-listops $field="myfield" $filter="[all[current]get[myfield]enlist-input[]] abc 123"/>
+<$action-listops $field="myfield" $filter="[enlist{!!myfield}] abc 123"/>
 ```
 
 The short form is more convenient, but the long form is useful for live-debugging complicated `$subfilter` values using the filter tab of [[$:/AdvancedSearch]]. By using [[$:/AdvancedSearch]], the [[Filter Expression]] can be tested before using ''action-listops'' to modify actual tiddler fields. For this use case, the `all[current]` portion of the expression needs to be changed to select the proper test tiddler.
 
-! $tags vs. $field + $subfilter
+!! Using $tags or $subfilter
 
 [[Tagging]] is implemented using a tiddler's 'tags' field, so appending the tags "abc" and "123" using the `$tags` attribute like this:
 
@@ -68,110 +54,53 @@ is mostly equivalent to using `$subfilter` along with "tags" for the value of `$
 <$action-listops $field="tags" $subfilter="abc 123"/>
 ```
 
-! $action-listops widget vs. $action-setfield widget
+!! Comparison to [[ActionSetFieldWidget]]
 
-The ActionSetFieldWidget replaces a field's value using `$field`/`$value` attributes. A single ActionSetFieldWidget can be used to set any number of fields by using attributes not starting with $.
+In general, ActionSetFieldWidget is better for setting multiple fields at once and for replacing the value of a field, which can also be a list. The ActionListopsWidget is better for modifying a list field based on the existing list and for using a [[Filter Expression]] to derive the value of the field.
 
-The ActionListopsWidget replaces or modifies a single field's value. The new value is generated using filters.
+The ~ActionSetFieldWidget sets the value of a field using `$field` and `$value` attribute pairs or attributes that do not start with a `$`. A single ~ActionSetFieldWidget can be used to set any number of fields of a single tiddler.
 
-The following two examples are functionally equivalent:
+The ~ActionListopsWidget replaces or modifies a single field's value using filter expressions.
+
+The following widgets are functionally equivalent:
 
 ```
 <$action-setfield $field="myfield" $value="abc 123"/>
-```
-
-```
+<$action-setfield myfield="abc 123"/>
 <$action-listops $field="myfield" $filter="abc 123"/>
 ```
+Note that <<.value "abc 123">> in the first two cases is a literal string that is assigned to the field <<.field myfield>>, but in the third case a filter expression which evaluates to the same string.
 
-In general, ActionSetFieldWidget is better for setting multiple fields at once and for replacing a field's value. The ActionListopsWidget is better for modifying a field based on the field's existing value and for using a [[Filter Expression]] to derive the value.
+!! Extended Filter Operators
 
-! Extended Filter Operators
+A number of [[Extended Listops Filters]] are necessary for the manipulation of lists. These operators have been designed primarily for use in subfilter expressions whereby the modified current list is returned in place of the current list.
 
-A number of [[extended filter operators|The Extended Listops Filters]] are necessary for the manipulation of lists. These operators have been designed primarily for use in subfilter expressions whereby the modified current list is returned in place of the current list.
+!! Notes on de-duplication
 
-<table>
-<<.group-heading "Listops Operators">>
-<tr>
-<th align="left">Operator</th>
-<th align="left">Purpose</th>
-<th></th>
-</tr>
-<<.operator-rows "[tag[Filter Operators]tag[Listops Operators]tag[Order Operators]!tag[String Operators]!tag[Tag Operators]!tag[Special Operators]sort[]]">>
-</table>
+In some cases, there may occur unexpected de-duplication of lists.
 
-! Examples
+!!! Assignments to the <<.field list>> field
 
-In this example we shall populate and then clear a list in an ordinary field (myfield) of this tiddler (the default.)
+When assigning filter results to the <<.field list>> field (default), the generated list is automatically de-duplicated, so
+
+```
+<$action-listops $filter="[[1]] :and[[1]]"/>
+```
+will result in the <<.field list>> field of the current tiddler containing the string <<.value 1>>, but not <<.value "1 1">>.
+
+!!! Input to the subfilter expression
+
+The input to the subfilter expression in the `$subfilter` attribute is also de-duplicated. If you rely on lists containing duplicates, consider using this alternative using the `$filter` attribute:
 
 <$macrocall $name='wikitext-example-without-html'
 src="""<$button>
-<$action-listops $field="myfield" $subfilter="efg hlm pqr"/>
-Populate 'myfield'
-</$button>
-<$button>
-<$action-listops $field="myfield" $subfilter="abc xyz"/>
-Append More Items
-</$button>
-<$button>
-<$action-listops $field="myfield" $subfilter="-abc -hlm"/>
-Remove Items
-</$button>
-<$button>
-<$action-listops $field="myfield" $filter="[[]]"/>
-Clear 'myfield'
+<$action-listops $field="myfield" $filter="[enlist:raw{!!myfield}] :all[[abc]]" />
+Add 'abc' to 'myfield'
 </$button>
 
-<$list filter="[list[!!myfield]]">
+<$list filter="[enlist:raw{!!myfield}]" template="$:/core/ui/ListItemTemplate" />
+"""/>
+The [[enlist Operator]] with `raw` suffix will enlist the list saved in <<.field myfield>> of the current tiddler without de-duplication, while e.g. the [[list Operator]] will always de-duplicate. The widget then adds the item <<.value abc>> -- whether or not it is already included in the list -- and replaces the original list in <<.field myfield>>.
 
-</$list>"""/>
 
----
-In this example we shall append and remove items from a list in an ordinary field (myfield) of this tiddler (the default) and sort the resultant list. We shall then remove some of the appended items and sort the resulting list in reverse order.
-
-<$macrocall $name='wikitext-example-without-html'
-src="""<$button>
-<$action-listops $field="myfield" $subfilter="-efg ijk xyz [[this is a title]] +[sort[]]"/>
-Mangle List
-</$button>
-<$button>
-<$action-listops $field="myfield" $subfilter="-xyz -[[this is a title]] +[!sort[]]"/>
-Unmangle List
-</$button>
-
-<$list filter="[list[!!myfield]]">
-
-</$list>"""/>
-
----
-In this example we shall append a few tags to the 'tags' field of this tiddler (the default.) We shall then remove some of the appended tags. 
-
-<$macrocall $name='wikitext-example-without-html'
-src="""<$button>
-<$action-listops $tags="+[append{Days of the Week!!short}] $:/tag1 $:/tag2 $:/tag3"/>
-Populate 'tags'
-</$button>
-<$button>
-<$action-listops $tags="+[!remove:2{!!tags}]"/>
-Remove Last Two Tags
-</$button>
-<$button>
-<$action-listops $tags="+[!prefix[$:/]]"/>
-Remove System Tags
-</$button>
-<$button>
-<$action-listops $tags="-Mon -Tue"/>
-Remove Mon and Tue
-</$button>
-<$button>
-<$action-listops $tags="+[prefix[$:/]] ActionWidgets Widgets"/>
-Remove User Tags
-</$button>
-<$button>
-<$action-listops $tags="+[[]] ActionWidgets Widgets"/>
-Clear Tags
-</$button>
-
-<$list filter="[list[!!tags]]">
-
-</$list>"""/>
+! [[Examples|ActionListopsWidget (Examples)]]

editions/tw5.com/tiddlers/widgets/BrowseWidget.tid

@@ -11,7 +11,7 @@ The browse widget displays an HTML file browser button that allows the user to c
 
 ! Content and Attributes
 
-The content of the `<$browse>` widget is ignored.
+The content of the <<.wid BrowseWidget>> widget is ignored.
 
 |!Attribute |!Description |
 |multiple |Set to "multiple" to select multiple file upload |
@@ -26,10 +26,10 @@ On iPhone/iPad choosing the multiple option will remove the ability to take phot
 ''e.g.''
 
 ```
-<$browse>
+<$browse/>
 ```
 
 renders as:
 
-<$browse>
+<$browse/>
 

editions/tw5.com/tiddlers/widgets/Extended Listops Filters.tid

@@ -0,0 +1,138 @@
+created: 20151014170727812
+days: Fri Wed Mon Tue
+dofwks: Mon Tue Wed Thu Fri Sat Sun
+item1: six
+item2: seven
+item3: eight
+list: Yesterday Today Tomorrow
+marker: Thursday
+modified: 20230227175501965
+myfield: Monday Tuesday [[Middle of the Week]] Thursday Friday Saturday Sunday
+numbers: 1 2 3 4 five 6 7 8 9
+tags: Filters
+title: Extended Listops Filters
+
+\define .operator-rows(filter)
+<$list filter="$filter$"><tr>
+<td><$link>{{!!caption}}</$link></td>
+<td>{{!!op-purpose}}</td>
+<td align="center"><$list filter="[all[current]tag[Common Operators]]">✓</$list></td>
+<td align="center"><$list filter="[all[current]tag[Negatable Operators]]">`!`</$list></td>
+</tr></$list>
+\end
+
+\define .group-heading(_)
+<tr class="doc-table-subheading"><th colspan="4" align="center">$_$</th></tr>
+\end
+
+! Introduction
+
+A number of filters are used to manipulate lists. 
+
+Some filters are designed to move items from the tail of the list and insert them at specified locations in the list, e.g. [[putafter|putafter Operator]] or [[putbefore|putbefore Operator]]. Items are often appended to the list before using these filters. In general, these filters accept a suffix specifying the number of items to move (default to 1.) 
+
+Some filters are designed to either add or remove from the list, a selected range of items from an array, e.g. [[append|append Operator]] or [[remove|remove Operator]]. These filters are best used with a reference to an array, stored in a field or data index elsewhere in the wiki (they may be used with a simple list of items, provided the items do not include white space.) In general, these filters accept a suffix specifying the number of items to move (default to All.)
+
+<table>
+<<.group-heading "Listops Operators">>
+<tr>
+<th align="left">Operator</th>
+<th align="left">Purpose</th>
+<th>✓</th>
+<th>`!`</th>
+</tr>
+<<.operator-rows "[tag[Filter Operators]tag[Listops Operators]tag[Order Operators]!tag[String Operators]!tag[Tag Operators]!tag[Special Operators]sort[]]">>
+</table>
+
+! Examples
+
+In this example we shall populate the '~DataIndex' index of the tiddler '~MyData' with the names of the days of the week, then clear this list. 
+
+<$macrocall $name='wikitext-example-without-html'
+src="""<$button>
+<$action-listops $tiddler="ListopsData" $index="DataIndex" $filter="[list[Days of the Week]]"/>
+Get days-of-the-week
+</$button> 
+<$button>
+<$action-listops $tiddler="ListopsData" $index="DataIndex" $filter="[[]]"/>
+Clear
+</$button>
+
+{{ListopsData}}"""/>
+
+---
+In this example we shall slice the populated list from the 'DaysOfTheWeek' index of the tiddler '~MyData' in order to insert items before and after a marker item (Wednesday) that are first appended to the list.
+
+<$macrocall $name='wikitext-example-without-html'
+src="""<$button>
+<$action-listops $tiddler="ListopsData" $index="DataIndex" $subfilter="one two +[putbefore:2[Wednesday]]"/>
+Put 2 Items Before Wednesday
+</$button> 
+<$button>
+<$action-listops $tiddler="ListopsData" $index="DataIndex" $subfilter="four five +[putafter:2[Wednesday]] three +[putbefore[Wednesday]]"/>
+Put One Item Before & Two Items After Wednesday
+</$button>
+
+{{ListopsData}}"""/>
+
+---
+In this example we shall slice the populated list from the 'DaysOfTheWeek' index of the tiddler '~MyData' in order to replace the marker item (Wednesday) with items which are first appended to the list. We shall then move 3 items to the head of the list which have first been appended to the list from referenced fields.
+
+<$macrocall $name='wikitext-example-without-html'
+src="""<$button>
+<$action-listops $tiddler="ListopsData" $index="DataIndex" $subfilter="[[---o]] [[o---]] +[replace:2{!!marker}]"/>
+Replace '!!marker' with 2 Items
+</$button>
+<$button>
+<$action-listops $tiddler="ListopsData" $index="DataIndex" $subfilter="[{!!item1}] [{!!item2}] [{!!item3}] +[putfirst:3[]]"/>
+Put 3 Items First
+</$button>
+
+{{ListopsData}}"""/>
+
+---
+In this example we shall slice the populated list from the 'DaysOfTheWeek' index of the tiddler '~MyData' in order to append to the truncated list, items from a referenced field. We shall then remove the first two of the items added.
+
+<$macrocall $name='wikitext-example-without-html'
+src="""|list: |<$view field="list"/> |
+
+<$button>
+<$action-listops $tiddler="ListopsData" $index="DataIndex" $subfilter="+[allbefore:include[Wednesday]] +[prepend{!!list}]"/>
+Prepend '!!list' to items before 'Wednesday'
+</$button> 
+<$button>
+<$action-listops $tiddler="ListopsData" $index="DataIndex" $subfilter="+[remove:2{!!list}]"/>
+Remove first two items in '!!list' from current list
+</$button>
+<$button>
+<$action-listops $tiddler="ListopsData" $index="DataIndex" $subfilter="+[!remove:1{!!list}]"/>
+Remove last item in '!!list' from current list
+</$button>
+
+{{ListopsData}}"""/>
+
+---
+In this example we shall populate the list with numbers, then move items one by one from the head to the tail and from the tail to the head (best seen by clicking the lower buttons several times.) 
+
+This example illustrates that the append[] and prepend[] operators do not enforce unique instances of an item and that, with the next run, any duplicates are removed.
+
+<$macrocall $name='wikitext-example-without-html'
+src="""<$button>
+<$action-listops $tiddler="ListopsData" $index="DataIndex" $filter="[[]]" $subfilter="+[append:3{!!numbers}]"/>
+Setup some numbers
+</$button>
+<$button>
+<$action-listops $tiddler="ListopsData" $index="DataIndex" $subfilter="+[!append:6{!!numbers}]"/>
+Append more numbers
+</$button>
+
+<$button>
+<$action-listops $tiddler="ListopsData" $index="DataIndex" $subfilter="+[putfirst:2[]]"/>
+Move last 2 items to the head
+</$button>
+<$button>
+<$action-listops $tiddler="ListopsData" $index="DataIndex" $subfilter="+[putlast[]]"/>
+Move the head to the last item
+</$button>
+
+{{ListopsData}}"""/>

editions/tw5.com/tiddlers/widgets/The Extended Listops Filters.tid

@@ -1,114 +1,5 @@
-created: 20151014170727812
-days: Fri Wed Mon Tue
-dofwks: Mon Tue Wed Thu Fri Sat Sun
-item1: six
-item2: seven
-item3: eight
-list: Yesterday Today Tomorrow
-marker: Thursday
-modified: 20211114011103356
-myfield: Monday Tuesday [[Middle of the Week]] Thursday Friday Saturday Sunday
-numbers: 1 2 3 4 five 6 7 8 9
-tags: Filters
+created: 20230301172832597
+modified: 20230301172832597
 title: The Extended Listops Filters
 
-! Introduction
-
-A number of extended filters are necessary to manipulate lists. 
-
-The first set of filters are designed to move items from the tail of the list and insert them at specified locations in the list. Items are often appended to the list before using these filters. In general, these filters accept a suffix specifying the number of items to move (default to 1.) 
-
-A second set of filters are designed to either add or remove from the list, a selected range of items from an array. These filters are best used with a reference to an array, stored in a field or data index elsewhere in the wiki (they may be used with a simple list of items, provided the items do not include white space.) In general, these filters accept a suffix specifying the number of items to move (default to All.)
-
-! Examples
-
-In this example we shall populate the '~DataIndex' index of the tiddler '~MyData' with the names of the days of the week, then clear this list. 
-
-<$macrocall $name='wikitext-example-without-html'
-src="""<$button>
-<$action-listops $tiddler="ListopsData" $index="DataIndex" $filter="[list[Days of the Week]]"/>
-Get days-of-the-week
-</$button> 
-<$button>
-<$action-listops $tiddler="ListopsData" $index="DataIndex" $filter="[[]]"/>
-Clear
-</$button>
-
-{{ListopsData}}"""/>
-
----
-In this example we shall slice the populated list from the 'DaysOfTheWeek' index of the tiddler '~MyData' in order to insert items before and after a marker item (Wednesday) that are first appended to the list.
-
-<$macrocall $name='wikitext-example-without-html'
-src="""<$button>
-<$action-listops $tiddler="ListopsData" $index="DataIndex" $subfilter="one two +[putbefore:2[Wednesday]]"/>
-Put 2 Items Before Wednesday
-</$button> 
-<$button>
-<$action-listops $tiddler="ListopsData" $index="DataIndex" $subfilter="four five +[putafter:2[Wednesday]] three +[putbefore[Wednesday]]"/>
-Put One Item Before & Two Items After Wednesday
-</$button>
-
-{{ListopsData}}"""/>
-
----
-In this example we shall slice the populated list from the 'DaysOfTheWeek' index of the tiddler '~MyData' in order to replace the marker item (Wednesday) with items which are first appended to the list. We shall then move 3 items to the head of the list which have first been appended to the list from referenced fields.
-
-<$macrocall $name='wikitext-example-without-html'
-src="""<$button>
-<$action-listops $tiddler="ListopsData" $index="DataIndex" $subfilter="[[---o]] [[o---]] +[replace:2{!!marker}]"/>
-Replace '!!marker' with 2 Items
-</$button>
-<$button>
-<$action-listops $tiddler="ListopsData" $index="DataIndex" $subfilter="[{!!item1}] [{!!item2}] [{!!item3}] +[putfirst:3[]]"/>
-Put 3 Items First
-</$button>
-
-{{ListopsData}}"""/>
-
----
-In this example we shall slice the populated list from the 'DaysOfTheWeek' index of the tiddler '~MyData' in order to append to the truncated list, items from a referenced field. We shall then remove the first two of the items added.
-
-<$macrocall $name='wikitext-example-without-html'
-src="""|list: |<$view field="list"/> |
-
-<$button>
-<$action-listops $tiddler="ListopsData" $index="DataIndex" $subfilter="+[allbefore:include[Wednesday]] +[prepend{!!list}]"/>
-Prepend '!!list' to items before 'Wednesday'
-</$button> 
-<$button>
-<$action-listops $tiddler="ListopsData" $index="DataIndex" $subfilter="+[remove:2{!!list}]"/>
-Remove first two items in '!!list' from current list
-</$button>
-<$button>
-<$action-listops $tiddler="ListopsData" $index="DataIndex" $subfilter="+[!remove:1{!!list}]"/>
-Remove last item in '!!list' from current list
-</$button>
-
-{{ListopsData}}"""/>
-
----
-In this example we shall populate the list with numbers, then move items one by one from the head to the tail and from the tail to the head (best seen by clicking the lower buttons several times.) 
-
-This example illustrates that the append[] and prepend[] operators do not enforce unique instances of an item and that, with the next run, any duplicates are removed.
-
-<$macrocall $name='wikitext-example-without-html'
-src="""<$button>
-<$action-listops $tiddler="ListopsData" $index="DataIndex" $filter="[[]]" $subfilter="+[append:3{!!numbers}]"/>
-Setup some numbers
-</$button>
-<$button>
-<$action-listops $tiddler="ListopsData" $index="DataIndex" $subfilter="+[!append:6{!!numbers}]"/>
-Append more numbers
-</$button>
-
-<$button>
-<$action-listops $tiddler="ListopsData" $index="DataIndex" $subfilter="+[putfirst:2[]]"/>
-Move last 2 items to the head
-</$button>
-<$button>
-<$action-listops $tiddler="ListopsData" $index="DataIndex" $subfilter="+[putlast[]]"/>
-Move the head to the last item
-</$button>
-
-{{ListopsData}}"""/>
+See [[Extended Listops Filters]]

editions/tw5.com/tiddlers/widgets/examples/ActionListopsWidget (Examples).tid

@@ -0,0 +1,81 @@
+created: 20230301174431218
+list: efg hlm pqr
+modified: 20230301174431218
+myfield: 
+revision: 0
+title: ActionListopsWidget (Examples)
+type: text/vnd.tiddlywiki
+
+In this example we shall populate and then clear a list in an ordinary field (myfield) of this tiddler (the default).
+
+<$macrocall $name='wikitext-example-without-html'
+src="""<$button>
+<$action-listops $field="myfield" $filter="efg hlm pqr"/>
+Populate 'myfield'
+</$button>
+<$button>
+<$action-listops $field="myfield" $subfilter="abc xyz"/>
+Append More Items
+</$button>
+<$button>
+<$action-listops $field="myfield" $subfilter="-abc -hlm"/>
+Remove Items
+</$button>
+<$button>
+<$action-listops $field="myfield" $filter="[[]]"/>
+Clear 'myfield'
+</$button>
+
+<$list filter="[list[!!myfield]]">
+
+</$list>"""/>
+
+---
+In this example we shall append and remove items from a list in an ordinary field (myfield) of this tiddler (the default) and sort the resultant list. We shall then remove some of the appended items and sort the resulting list in reverse order.
+
+<$macrocall $name='wikitext-example-without-html'
+src="""<$button>
+<$action-listops $field="myfield" $subfilter="-efg ijk xyz [[this is a title]] +[sort[]]"/>
+Mangle List
+</$button>
+<$button>
+<$action-listops $field="myfield" $subfilter="-xyz -[[this is a title]] +[!sort[]]"/>
+Unmangle List
+</$button>
+
+<$list filter="[list[!!myfield]]">
+
+</$list>"""/>
+
+---
+In this example we shall append a few tags to the 'tags' field of this tiddler (the default). We shall then remove some of the appended tags. 
+
+<$macrocall $name='wikitext-example-without-html'
+src="""<$button>
+<$action-listops $tags="+[append{Days of the Week!!short}] $:/tag1 $:/tag2 $:/tag3"/>
+Populate 'tags'
+</$button>
+<$button>
+<$action-listops $tags="+[!remove:2{!!tags}]"/>
+Remove Last Two Tags
+</$button>
+<$button>
+<$action-listops $tags="+[!prefix[$:/]]"/>
+Remove System Tags
+</$button>
+<$button>
+<$action-listops $tags="-Mon -Tue"/>
+Remove Mon and Tue
+</$button>
+<$button>
+<$action-listops $tags="+[prefix[$:/]] ActionWidgets Widgets"/>
+Remove User Tags
+</$button>
+<$button>
+<$action-listops $tags="+[[]] ActionWidgets Widgets"/>
+Clear Tags
+</$button>
+
+<$list filter="[list[!!tags]]">
+
+</$list>"""/>

editions/tw5.com/tiddlers/wikitext/Formatting in WikiText.tid

@@ -1,19 +1,60 @@
 caption: Formatting
 created: 20131205155959399
-modified: 20220513120211686
+modified: 20230303215447403
 tags: WikiText
 title: Formatting in WikiText
 type: text/vnd.tiddlywiki
 
-Available character formatting includes:
+!! Overview
 
-* <code>&#96;backticks&#96;</code> for `code` (<<.icon $:/core/images/mono-line>>)
-** Alternatively, <code>&#96;&#96;double backticks allows &#96;embedded&#96; backticks&#96;&#96;</code><br><br>
-* `''bold''` for ''bold text'' (<<.icon $:/core/images/bold>>)<br><br>
-* `//italic//` for //italic text// (<<.icon $:/core/images/italic>>)<br><br>
-* `__underscore__` for __underscored text__ (<<.icon $:/core/images/underline>>)<br><br>
-* `^^superscript^^` for ^^superscripted^^ text (<<.icon $:/core/images/superscript>>)<br><br>
-* `,,subscript,,` for ,,subscripted,, text (<<.icon $:/core/images/subscript>>)<br><br>
-* `~~strikethrough~~` for ~~strikethrough~~ text (<<.icon $:/core/images/strikethrough>>)
+Available character formatting in WikiText includes:
 
-See also: [[Code Blocks in WikiText]]
+|Wikitext | Button | Shortcut |Rendered Output |h
+|Double single quotes are used for `''bold text''`| <kbd><<.icon $:/core/images/bold>></kbd> | <kbd><<displayshortcuts "((bold))">></kbd> |Double single quotes are used for ''bold text'' |
+|Double slashes are used for `//italic text//`| <kbd><<.icon $:/core/images/italic>></kbd> | <kbd><<displayshortcuts "((italic))">></kbd> |Double slashes are used for //italic text//|
+|Double underscores are used for `__underlined text__`| <kbd><<.icon $:/core/images/underline>></kbd> | <kbd><<displayshortcuts "((underline))">></kbd>  |Double underscores are used for __underlined text__ |
+|Double circumflex accents are used for `^^superscripted^^` text | <kbd><<.icon $:/core/images/superscript>></kbd> | <kbd><<displayshortcuts "((superscript))">></kbd> |Double circumflex accents are used for ^^superscripted^^ text |
+|Double commas are used for `,,subscripted,,` text | <kbd><<.icon $:/core/images/subscript>></kbd> | <kbd><<displayshortcuts "((subscript))">></kbd> |Double commas are used for ,,subscripted,, text |
+|Double  tilde signs are used for `~~strikethrough~~` text | <kbd><<.icon $:/core/images/strikethrough>></kbd> | <kbd><<displayshortcuts "((strikethrough))">></kbd> |Double   tilde signs are used for ~~strikethrough~~ text |
+|Single backticks are used for ```code` `` | <kbd><<.icon $:/core/images/mono-line>></kbd> | <kbd><<displayshortcuts "((mono-line))">></kbd> |Single backticks are used for `code` |
+|Double @ characters are used to create a `@@highlight@@` | - | - |Double @ characters are used to create a @@highlight@@ |
+
+See [[Styles and Classes in WikiText]] for more formatting options
+
+!! Embedded Backticks
+
+|Wikitext |Rendered Output|h
+|<code>&#96;&#96;double backticks allows &#96;embedded&#96; backticks&#96;&#96;</code>|``double backticks allows `embedded` backticks``|
+
+!! Keyboard Shortcuts
+
+The full list of KeyboardShortcuts can be found in the $:/ControlPanel -> ''Keyboard Shortcuts'' tab. 
+
+!! Semantic Information
+
+|Wikitext | Resulting HTML Code  |h
+|Double single quotes are used for `''bold text''`|Double single quotes are used for `<strong>bold text</strong>` |
+|Double slashes are used for `//italic text//`|Double slashes are used for `<em>italic text</em>` |
+|Double underscores are used for `__underlined text__`|Double underscores are used for `<u>underlined text<u>` |
+|Double circumflex accents are used for `^^superscripted^^` text |Double circumflex accents are used for `<sup>superscripted</sup>` text |
+|Double commas are used for `,,subscripted,,` text |Double commas are used for `<sub>subscripted</sub>` text |
+|Double tilde signs are used for `~~strikethrough~~` text |Double tilde signs are used for `<strike>strikethrough</strike>` text |
+|Single backticks are used for ```code` `` |Single backticks are used for `<code>code</code>` |
+|Double @ characters are used to create a `@@highlight@@` |Double @ characters are used to create a `<span class="tc-inline-style">highlighted</span>` |
+
+!! Bold vs Strong
+
+In TW we use the term "bold" instead of "strong" because most users are used to it. ... The rendering process converts our "bold text" into the STRONG HTML element. 
+
+>The `<strong>` element is for content that is of greater importance, while the `<b>` element is used to draw attention to text without indicating that it's more important.
+>https://developer.mozilla.org/en-US/docs/Web/HTML/Element/strong#b_vs._strong
+
+!! Underline vs. Underscore
+
+>Use underline to describe text formatting that puts a line under the characters. Use underscore to refer to the underscore character ( _ ).
+>https://learn.microsoft.com/en-us/style-guide/a-z-word-list-term-collections/u/underline-vs-underscore
+
+!! Emphasis vs Italics
+
+>The `<em>` element represents stress emphasis of its contents, while the `<i>` element represents text that is set off from the normal prose, such as a foreign word, fictional character thoughts, or when the text refers to the definition of a word instead of representing its semantic meaning. (The title of a work, such as the name of a book or movie, should use `<cite>`.)
+>https://developer.mozilla.org/en-US/docs/Web/HTML/Element/em#i_vs._em

editions/tw5.com/tiddlers/wikitext/HTML Entities.tid

@@ -0,0 +1,66 @@
+created: 20130204165019000
+modified: 20221025124615415
+tags: WikiText
+title: HTML Entities
+type: text/vnd.tiddlywiki
+
+!! Summary
+
+Use HTML entities to enter characters that cannot easily be typed on an ordinary keyboard. They take the form of an ampersand (`&`), an identifying string, and a terminating semi-colon (`;`), e.g. `&` for the ''&'' character.
+
+!! Markup
+
+```
+The value of Tiddlers™ cannot even be expressed in £, € or $.
+```
+
+''Displays as:''
+
+The value of Tiddlers™ cannot even be expressed in £, € or $.
+
+!! Entity References
+
+Comprehensive lists of html entities can be found at...
+
+* [[Mozilla Developer Network -- Entities|https://developer.mozilla.org/en-US/docs/Glossary/Entity]]
+
+* [[HTML Spec official list -- Entities|https://html.spec.whatwg.org/multipage/named-characters.html#named-character-references]]
+
+
+!! Examples Of Common And Useful Entities
+
+|>|>|>|>|>|>| ! HTML Entities |
+|   |   | no-break space |    | ' | ' | single quote, apostrophe |
+| – | – | en dash |~| " | " | quotation mark |
+| — | — | em dash |~| ′ | ′ | prime; minutes; feet |
+| … | … |	horizontal ellipsis |~| ″ | ″ | double prime; seconds; inches |
+| © | © | Copyright symbol |~| ‘ | ‘ | left single quote |
+| ® | ® | Registered symbol |~| ’ | ’ | right  single quote |
+| ™ | ™ | Trademark symbol |~| “ | “ | left double quote |
+| † | † | dagger |~| ” | ” | right double quote |
+| ‡ | ‡ | double dagger |~| « | « | left angle quote |
+| ¶ | ¶ | paragraph sign |~| » | » | right angle quote |
+| § | § | section sign |~| × | × | multiplication symbol |
+| ↑ | ↑ | up arrow |~| ↓ | ↓ | down arrow |
+| ← | ← | left arrow |~| → | → | right arrow |
+| ⇐ | ⇐ | double left arrow |~| ⇒ | ⇒ | double right arrow |
+| ↔ | ↔ | left right arrow |~| ⇔ | ⇔ | double left right arrow |
+
+!! Accented Characters
+
+The table below shows how accented characters can be built up by //substituting// the 
+underscore (_) in the second table into the corresponding character. eg:
+
+|Code |Character |Example |Result |h
+|`Ä` |Ä | `Äpfel` |Äpfel |
+
+
+|>|>|>|>|>|>|>|>|>|>|>|>|>|>|>|>|>| ! Accented Characters |
+| grave accent | &_grave; | À | à | È | è | Ì | ì | Ò | ò | Ù | ù |   |   |   |   |   |   |
+| acute accent | &_acute; | Á | á | É | é | Í | í | Ó | ó | Ú | ú |   |   | Ý | ý |   |   |
+| circumflex accent | &_circ; | Â | â | Ê | ê | Î | î | Ô | ô | Û | û |   |   |   |   |   |   |
+| umlaut mark | &_uml; | Ä | ä |  Ë | ë | Ï | ï | Ö | ö | Ü | ü |   |   | Ÿ | ÿ |   |   |
+| tilde | &_tilde; | Ã | ã |   |   |   |   | Õ | õ |   |   | Ñ | ñ |   |   |   |   |
+| ring | &_ring; | Å | å |   |   |   |   |   |   |   |   |   |   |   |   |   |   |
+| slash | &_slash; |   |   |   |   |   |   | Ø | ø |   |   |   |   |   |   |   |   |
+| cedilla | &_cedil; |   |   |   |   |   |   |   |   |   |   |   |   |   |   | Ç | ç |

editions/tw5.com/tiddlers/wikitext/Styles and Classes in WikiText.tid

@@ -5,26 +5,36 @@ title: Styles and Classes in WikiText
 type: text/vnd.tiddlywiki
 caption: Styles and Classes
 
-You can use this construction to cause the wrapped content to be assigned specified CSS classes or styles:
+Content can be wrapped in `@@`double at signs`@@`  to apply specified CSS styles or classes to it. There are multiple ways to use this syntax, as presented below.
 
-<<wikitext-example src:"@@.myStyle
-* List One
-* List Two
+Inline content wrapped in `@@`double at signs`@@` without specifying style or class will be assigned the `.tc-inline-style` and displayed as highlighted text. The foreground and background colours of the highlighted text are defined as `highlight-background` and `highlight-foreground` in the current palette.
+
+<<wikitext-example src:"@@some highlighted text@@">>
+
+Style attributes, e.g. `color`, each followed by `;` semicolon can be introduced immediately after the opening `@@`.
+
+<<wikitext-example src:"@@color:steelblue;background-color:lightcyan;some styled text@@">>
+
+Similarly a style can be applied to a multiline content:
+
+<<wikitext-example src:"@@background-color:lightcyan;
+* Item one
+* Item two
 @@
 ">>
 
-Similar syntax is used to assign styles. For example:
+A class may be applied to a multiline content only:
 
-<<wikitext-example src:"@@background-color:red;
-* List One
-* List Two
-@@
-">>
-
-Multiple styles and classes can be mixed. For example:
-
-<<wikitext-example src:"@@.tc-tiddler-frame
-@@width:400px;
-Some text
+<<wikitext-example src:"@@.tc-double-spaced-list
+* Item one
+* Item two
+@@">>
+
+Multiple classes and styles can be used together:
+
+<<wikitext-example src:"@@.tc-double-spaced-list
+@@width:400px;background-color:lightcyan;
+* Item one
+* Item two
 @@
 ">>

languages/zh-Hans/Misc.multids

@@ -40,6 +40,7 @@ Error/RetrievingSkinny: 简要条目清单提取错误
 Error/SavingToTWEdit: 保存到 TWEdit 时，发生错误
 Error/WhileSaving: 保存时，发生错误
 Error/XMLHttpRequest: XMLHttpRequest 错误代码
+Error/ZoominTextNode: 故事视图错误：您似乎尝试与显示在自定义容器中的条目进行交互。这很可能是由于将 `$:/tags/StoryTiddlerTemplateFilter` 与开头包含文本或空格的模板一起使用引起的。请使用编译指示 `\whitespace trim`，并确保条目的全部内容都包含在单个 HTML 元素中。导致此问题的文本：
 InternalJavaScriptError/Title: 内部的 JavaScript 错误
 InternalJavaScriptError/Hint: 喔，真是令人尴尬。建议刷新您的浏览器，重新启动 TiddlyWiki
 LayoutSwitcher/Description: 打开布局切换器

languages/zh-Hant/Misc.multids

@@ -40,6 +40,7 @@ Error/RetrievingSkinny: 簡要條目清單擷取錯誤
 Error/SavingToTWEdit: 儲存到 TWEdit 時，發生錯誤
 Error/WhileSaving: 儲存時，發生錯誤
 Error/XMLHttpRequest: XMLHttpRequest 錯誤代碼
+Error/ZoominTextNode: 故事視圖錯誤：您似乎嘗試與顯示在自定義容器中的條目進行互動。這很可能是由於將 `$:/tags/StoryTiddlerTemplateFilter` 與開頭包含文字或空格的範本一起使用引起的。請使用編譯指示 `\whitespace trim`，並確保條目的全部內容都包含在單個 HTML 元素中。導致此問題的文字：
 InternalJavaScriptError/Title: 內部的 JavaScript 錯誤
 InternalJavaScriptError/Hint: 喔，真是令人尷尬。建議刷新您的瀏覽器，重新啟動 TiddlyWiki
 LayoutSwitcher/Description: 開啟版面切換器

licenses/cla-individual.md

@@ -519,3 +519,9 @@ Scott Sauye, @CrossEye, 2023-01-04
 Marcus Winter, @yaisog, 2023-01-07
 
 Ethan Weller, @gamedungeon, 2023-01-17
+
+Mateusz Wilczek, @mateuszwilczek, 2023/02/16
+
+Andrea Octo, @andrigamerita, 2023/02/24
+
+HuanC Fu, @hffqyd, 2023/03/03

plugins/tiddlywiki/filesystem/filesystemadaptor.js

@@ -140,7 +140,7 @@ FileSystemAdaptor.prototype.deleteTiddler = function(title,callback,options) {
 				}
 			}
 			// Remove the tiddler from self.boot.files & return null adaptorInfo
-			delete self.boot.files[title];
+			self.removeTiddlerFileInfo(title);
 			return callback(null,null);
 		});
 	} else {
@@ -148,6 +148,16 @@ FileSystemAdaptor.prototype.deleteTiddler = function(title,callback,options) {
 	}
 };
 
+/*
+Delete a tiddler in cache, without modifying file system.
+*/
+FileSystemAdaptor.prototype.removeTiddlerFileInfo = function(title) {
+	// Only delete the tiddler info if we have writable information for the file
+	if(this.boot.files[title]) {
+		delete this.boot.files[title];
+	};
+};
+
 if(fs) {
 	exports.adaptorClass = FileSystemAdaptor;
 }

plugins/tiddlywiki/markdown/wrapper.js

@@ -6,17 +6,13 @@ module-type: parser
 Wraps up the markdown-it parser for use as a Parser in TiddlyWiki
 
 \*/
-(function(realRequire){
+(function(){
 
 /*jslint node: true, browser: true */
 /*global $tw: false */
 "use strict";
 
-var require = function(m) {
-	return realRequire("$:/plugins/tiddlywiki/markdown/" + m + ".js");
-};
-
-var MarkdownIt = require("markdown-it");
+var MarkdownIt = require("./markdown-it");
 
 function parseAsBoolean(tiddlerName) {
 	return $tw.wiki.getTiddlerText(tiddlerName,"false").trim().toLowerCase() === "true";
@@ -61,8 +57,10 @@ function setupWikiRules(pluginOptions) {
 		return rulesInfo;
 	}
 
+	var WikiParser = require("$:/core/modules/parsers/wikiparser/wikiparser.js")["text/vnd.tiddlywiki"];
+
 	// first pass: get all rule classes
-	var wikiParser = new $tw.Wiki.parsers["text/vnd.tiddlywiki"](null, '', {parseAsInline: true, wiki: $tw.wiki});
+	var wikiParser = new WikiParser(null, '', {parseAsInline: true, wiki: $tw.wiki});
 
 	// restore all possible rules from each rule class
 	wikiParser.pragmaRules = collectAllRules(wikiParser.pragmaRuleClasses,'pragma');
@@ -100,12 +98,12 @@ function setupWikiRules(pluginOptions) {
 // Creates markdown-it parser
 function createMarkdownEngine(markdownItOptions, pluginOptions) {
 	var md = new MarkdownIt(markdownItOptions)
-				.use(require("markdown-it-sub"))
-				.use(require("markdown-it-sup"))
-				.use(require("markdown-it-ins"))
-				.use(require("markdown-it-mark"))
-				.use(require("markdown-it-footnote"))
-				.use(require("markdown-it-deflist"));
+				.use(require("./markdown-it-sub"))
+				.use(require("./markdown-it-sup"))
+				.use(require("./markdown-it-ins"))
+				.use(require("./markdown-it-mark"))
+				.use(require("./markdown-it-footnote"))
+				.use(require("./markdown-it-deflist"));
 
 	var results = setupWikiRules(pluginOptions);
 
@@ -116,10 +114,10 @@ function createMarkdownEngine(markdownItOptions, pluginOptions) {
 	MarkdownParser.prototype.inlineRules = results.inlineRules;
 
 	if(pluginOptions.renderWikiText && $tw.modules.titles["$:/plugins/tiddlywiki/katex/katex.min.js"]) {
-		md.use(require("markdown-it-katex"));
+		md.use(require("./markdown-it-katex"));
 	}
 
-	md.use(require("markdown-it-tiddlywiki"),{
+	md.use(require("./markdown-it-tiddlywiki"),{
 			renderWikiText: pluginOptions.renderWikiText,
 			blockRules: results.blockRules,
 			inlineRules: results.inlineRules
@@ -263,4 +261,4 @@ function MarkdownParser(type,text,options) {
 
 exports["text/markdown"] = MarkdownParser;
 exports["text/x-markdown"] = MarkdownParser;
-})(require);
+})();

plugins/tiddlywiki/railroad/doc/example-transclusion.tid

@@ -0,0 +1,3 @@
+title: $:/plugins/tiddlywiki/railroad/example-transclusion
+
+"railroad transclusion example" text

plugins/tiddlywiki/railroad/doc/syntax.tid

@@ -2,6 +2,7 @@ created: 20150103184022184
 modified: 20150119220342000
 title: $:/plugins/tiddlywiki/railroad/syntax
 
+
 The railroad widget uses a special notation to construct the components defined below.
 
 `x` and `y` here stand for any component.
@@ -12,9 +13,28 @@ Names (as opposed to quoted strings) are available when a value starts with a le
 
 ; sequence
 : <$railroad text=""" ["<-"] {x} ["->"] """/>
+
 * A sequence of components
 * The `<-` and `->` delimiters allow you to force a single component to be treated as a sequence. This is occasionally useful for spacing a diagram out
 
+examples
+
+<<<
+
+```
+x y z			sequence
+```
+<$railroad text=""" x y z """/>
+
+```
+<-x y z->		explicit sequence
+```
+
+<$railroad text=""" <- x y z -> """/>
+
+<<<
+
+
 ---
 
 ; optional
@@ -22,6 +42,24 @@ Names (as opposed to quoted strings) are available when a value starts with a le
 * A component that can be omitted
 * The colon makes `x` appear straight ahead
 
+examples
+
+<<<
+
+```
+[:x]			optional, normally included
+```
+<$railroad text=""" [:x] """/>
+
+```
+[x]				optional, normally omitted
+```
+
+<$railroad text=""" [x] """/>
+
+<<<
+
+
 ---
 
 ; repeated
@@ -29,12 +67,62 @@ Names (as opposed to quoted strings) are available when a value starts with a le
 * A list of one or more `x`
 * The `+` suffix adds `y` as a separator between each `x` and the next
 
+examples
+
+<<<
+
+```
+{x}				one or more
+```
+<$railroad text=""" {x} """/>
+
+```
+{x +","}		one or more, comma-separated
+```
+
+<$railroad text=""" {x +","} """/>
+
+<<<
+
+
 ---
 
 ; optional repeated
 : <$railroad text=""" "[{" [":"] x [:"+" y] "}]" """/>
 * An optional list of `x`, i.e. a list of zero or more `x`
 
+examples
+
+<<<
+
+```
+[{:x}]			zero or more, normally included
+```
+
+<$railroad text=""" [{:x}] """/>
+
+```
+[{:x +","}]		zero or more, comma-separated, normally included
+```
+
+<$railroad text=""" [{:x +","}] """/>
+
+```
+[{x}]			zero or more, normally omitted
+```
+
+<$railroad text=""" [{x}] """/>
+
+```
+[{x +","}]		zero or more, comma-separated, normally omitted
+```
+
+<$railroad text=""" [{x +","}] """/>
+
+<<<
+
+
+
 ---
 
 ; choice
@@ -42,6 +130,25 @@ Names (as opposed to quoted strings) are available when a value starts with a le
 * A set of alternatives
 * The colon indicates which branch appears straight ahead. By default, it's the first branch
 
+examples
+
+<<<
+
+```
+(x|y|z)			alternatives
+```
+
+<$railroad text=""" (x|y|z) """/>
+
+```
+(x|:y|z)		alternatives, normally y
+```
+
+<$railroad text=""" (x|:y|z) """/>
+
+<<<
+
+
 ---
 
 ; string / terminal
@@ -49,36 +156,117 @@ Names (as opposed to quoted strings) are available when a value starts with a le
 * A literal or terminal component
 * This follows the normal ~TiddlyWiki rules for quoted strings
 
+examples
+
+<<<
+
+```
+"x"				terminal
+```
+
+<$railroad text=""" "x" """/>
+
+<<<
+
+
 ---
 
 ; nonterminal
 : <$railroad text=""" (name | "<" string ">") """/>
 * A nonterminal component, i.e. the name of another diagram
 
+examples
+
+<<<
+
+```
+<"x">			nonterminal
+```
+
+<$railroad text=""" <"x"> """/>
+
+<<<
+
+
 ---
 
 ; comment
 : <$railroad text=""" "/" string "/" """/>
 * A comment
 
+examples
+
+<<<
+
+```
+/ "comment" /		comment
+```
+
+<$railroad text=""" / "comment" / """/>
+
+<<<
+
+
 ---
 
 ; dummy
 : <$railroad text=""" "-" """/>
 * The absence of a component
 
+examples
+
+<<<
+
+```
+-		dummy
+```
+
+<$railroad text=""" - """/>
+
+<<<
+
+
 ---
 
 ; link
 : <$railroad text=""" "[[" x "|" (name|string) "]]" """/>
 * A link to the tiddler title or URI given by the string or name
 
+examples
+
+<<<
+
+```
+[[x|"tiddler"]]		link
+```
+
+<$railroad text=""" [[x|"tiddler"]] """/>
+
+<<<
+
+
 ---
 
 ; transclusion
 : <$railroad text=""" "{{" (name|string) "}}" """/>
 * Treats the content of another tiddler as diagram syntax and transcludes it into the current diagram
 
+examples
+
+<<<
+
+```
+{{"$:/plugins/tiddlywiki/railroad/example-transclusion"}}		transclusion
+
+// "railroad transclusion example" text		<- text in the tidlder
+
+```
+
+<$railroad text=""" {{ "$:/plugins/tiddlywiki/railroad/example-transclusion" }} """/>
+
+<<<
+
+
 ---
 
 ; arrow pragma
@@ -86,14 +274,76 @@ Names (as opposed to quoted strings) are available when a value starts with a le
 * Controls whether repeat paths have an arrow on them
 * Can be toggled on and off in mid-diagram, if desired
 
+examples
+
+<<<
+```
+<$railroad text="""
+\arrow yes
+[{:x}]
+"""/>
+
+```
+
+<$railroad text="""\arrow yes [{:x}] """/>
+
+```
+<$railroad text="""
+\arrow no
+[{:x}]
+"""/>
+```
+
+<$railroad text="""\arrow no [{:x}] """/>
+
+<<<
+
+
 ---
 
 ; debug pragma
 : <$railroad text=""" "\debug" """/>
 * Causes the diagram to display its parse tree
 
+examples
+
+<<<
+
+```
+\debug
+x
+```
+
+<$railroad text="""\debug x """/>
+
+<<<
+
+
 ---
 
 ; start/end pragma
 : <$railroad text=""" ("\start" |: "\end") ("none" |: "single" | "double") """/>
 * Controls the style of the diagram's startpoint or endpoint
+examples
+
+<<<
+
+```
+\start none x
+```
+
+<$railroad text=""" \start none x """/>
+
+```
+\start double 
+\end double
+ x
+```
+
+<$railroad text=""" \start double 
+\end double
+x
+"""/>
+
+<<<
+

plugins/tiddlywiki/railroad/parser.js

@@ -5,6 +5,8 @@ module-type: library
 
 Parser for the source of a railroad diagram.
 
+x y z			sequence
+<-x y z->		explicit sequence
 [:x]			optional, normally included
 [x]				optional, normally omitted
 {x}				one or more
@@ -13,8 +15,6 @@ Parser for the source of a railroad diagram.
 [{:x +","}]		zero or more, comma-separated, normally included
 [{x}]			zero or more, normally omitted
 [{x +","}]		zero or more, comma-separated, normally omitted
-x y z			sequence
-<-x y z->		explicit sequence
 (x|y|z)			alternatives
 (x|:y|z)		alternatives, normally y
 "x"				terminal