Fix refreshing transcluded functions (#7755)

We store the previous result of the filter function and recalculate it
when the transclude widget needs to be refreshed, refreshing the widget
if the result is different.

bin/build-site.sh

@@ -5,7 +5,7 @@
 # Default to the current version number for building the plugin library
 
 if [  -z "$TW5_BUILD_VERSION" ]; then
-    TW5_BUILD_VERSION=v5.3.1
+    TW5_BUILD_VERSION=v5.3.2
 fi
 
 echo "Using TW5_BUILD_VERSION as [$TW5_BUILD_VERSION]"

core/language/en-GB/Help/server.tid

@@ -1,5 +1,5 @@
 title: $:/language/Help/server
-description: Provides an HTTP server interface to TiddlyWiki (deprecated in favour of the new listen command)
+description: (deprecated: see 'listen' command) Provides an HTTP server interface to TiddlyWiki
 
 Legacy command to serve a wiki over HTTP.
 

core/modules/widgets/transclude.js

@@ -109,6 +109,7 @@ TranscludeWidget.prototype.collectAttributes = function() {
 		this.recursionMarker = this.getAttribute("recursionMarker","yes");
 	} else {
 		this.transcludeVariable = this.getAttribute("$variable");
+		this.transcludeVariableIsFunction = false;
 		this.transcludeType = this.getAttribute("$type");
 		this.transcludeOutput = this.getAttribute("$output","text/html");
 		this.transcludeTitle = this.getAttribute("$tiddler",this.getVariable("currentTiddler"));
@@ -184,7 +185,9 @@ TranscludeWidget.prototype.getTransclusionTarget = function() {
 		if(this.transcludeVariable) {
 			// Transcluding a variable
 			var variableInfo = this.getVariableInfo(this.transcludeVariable,{params: this.getOrderedTransclusionParameters()});
+			this.transcludeVariableIsFunction = variableInfo.srcVariable && variableInfo.srcVariable.isFunctionDefinition;
 			text = variableInfo.text;
+			this.transcludeFunctionResult = text;
 			return {
 				text: variableInfo.text,
 				type: this.transcludeType
@@ -219,21 +222,24 @@ TranscludeWidget.prototype.parseTransclusionTarget = function(parseAsInline) {
 			// Transcluding a variable
 			var variableInfo = this.getVariableInfo(this.transcludeVariable,{params: this.getOrderedTransclusionParameters()}),
 				srcVariable = variableInfo && variableInfo.srcVariable;
+			if(srcVariable && srcVariable.isFunctionDefinition) {
+				this.transcludeVariableIsFunction = true;
+				this.transcludeFunctionResult = (variableInfo.resultList ? variableInfo.resultList[0] : variableInfo.text) || "";
+			}
 			if(variableInfo.text) {
 				if(srcVariable && srcVariable.isFunctionDefinition) {
-					var result = (variableInfo.resultList ? variableInfo.resultList[0] : variableInfo.text) || "";
 					parser = {
 						tree: [{
 							type: "text",
-							text: result
+							text: this.transcludeFunctionResult
 						}],
-						source: result,
+						source: this.transcludeFunctionResult,
 						type: "text/vnd.tiddlywiki"
 					};
 					if(parseAsInline) {
 						parser.tree[0] = {
 							type: "text",
-							text: result
+							text: this.transcludeFunctionResult
 						};
 					} else {
 						parser.tree[0] = {
@@ -241,7 +247,7 @@ TranscludeWidget.prototype.parseTransclusionTarget = function(parseAsInline) {
 							tag: "p",
 							children: [{
 								type: "text",
-								text: result
+								text: this.transcludeFunctionResult
 							}]
 						}
 					}
@@ -430,12 +436,19 @@ TranscludeWidget.prototype.parserNeedsRefresh = function() {
 	return (this.sourceText === undefined || parserInfo.sourceText !== this.sourceText || parserInfo.parserType !== this.parserType)
 };
 
+TranscludeWidget.prototype.functionNeedsRefresh = function() {
+	var oldResult = this.transcludeFunctionResult;
+	var variableInfo = this.getVariableInfo(this.transcludeVariable,{params: this.getOrderedTransclusionParameters()});
+	var newResult = (variableInfo.resultList ? variableInfo.resultList[0] : variableInfo.text) || "";
+	return oldResult !== newResult;
+}
+
 /*
 Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
 */
 TranscludeWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
-	if(($tw.utils.count(changedAttributes) > 0) || (!this.transcludeVariable && changedTiddlers[this.transcludeTitle] && this.parserNeedsRefresh())) {
+	if(($tw.utils.count(changedAttributes) > 0) || (this.transcludeVariableIsFunction && this.functionNeedsRefresh()) || (!this.transcludeVariable && changedTiddlers[this.transcludeTitle] && this.parserNeedsRefresh())) {
 		this.refreshSelf();
 		return true;
 	} else {

core/wiki/config/OfficialPluginLibrary.tid

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

core/wiki/macros/tag.tid

@@ -10,7 +10,7 @@ color:$(foregroundColor)$;
 <!-- This has no whitespace trim to avoid modifying $actions$. Closing tags omitted for brevity. -->
 \define tag-pill-inner(tag,icon,colour,fallbackTarget,colourA,colourB,element-tag,element-attributes,actions)
 \whitespace trim
-<$vars
+<$let
 	foregroundColor=<<contrastcolour target:"""$colour$""" fallbackTarget:"""$fallbackTarget$""" colourA:"""$colourA$""" colourB:"""$colourB$""">>
 	backgroundColor=<<__colour__>>
 >
@@ -23,6 +23,7 @@ color:$(foregroundColor)$;
 	<$transclude tiddler=<<__icon__>>/>
 	<$view tiddler=<<__tag__>> field="title" format="text" />
 </$element-tag$>
+</$let>
 \end
 
 \define tag-pill-body(tag,icon,colour,palette,element-tag,element-attributes,actions)

editions/prerelease/tiddlers/system/PrereleaseLocalPluginLibrary.tid

@@ -1,6 +1,6 @@
 title: $:/config/LocalPluginLibrary
 tags: $:/tags/PluginLibrary
-url: http://127.0.0.1:8080/prerelease/library/v5.3.1/index.html
+url: http://127.0.0.1:8080/prerelease/library/v5.3.2/index.html
 caption: {{$:/language/OfficialPluginLibrary}} (Prerelease Local)
 
 A locally installed version of the official ~TiddlyWiki plugin library at tiddlywiki.com for testing and debugging. //Requires a local web server to share the library//

editions/prerelease/tiddlers/system/PrereleaseOfficialPluginLibrary.tid

@@ -1,6 +1,6 @@
 title: $:/config/OfficialPluginLibrary
 tags: $:/tags/PluginLibrary
-url: https://tiddlywiki.com/prerelease/library/v5.3.1/index.html
+url: https://tiddlywiki.com/prerelease/library/v5.3.2/index.html
 caption: {{$:/language/OfficialPluginLibrary}} (Prerelease)
 
 The prerelease version of the official ~TiddlyWiki plugin library at tiddlywiki.com. Plugins, themes and language packs are maintained by the core team.

editions/test/tiddlers/tests/data/transclude/Variable-Refreshing.tid

@@ -0,0 +1,27 @@
+title: Transclude/Variable/Refreshing
+description: Transcluding and refreshing a function
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+
+\function list-join(filter, sep:", ") [subfilter<filter>join<sep>]
+
+<$tiddler tiddler="TestData">
+
+<<list-join "[enlist{!!items}]">>
+
+</$tiddler>
+
++
+title: TestData
+
+
++
+title: Actions
+
+<$action-setfield $tiddler="TestData" items={{{ [range[10]join[ ]] }}}/>
++
+title: ExpectedResult
+
+<p>1, 2, 3, 4, 5, 6, 7, 8, 9, 10</p>

editions/test/tiddlers/tests/data/transclude/Variable-Static.tid

@@ -0,0 +1,15 @@
+title: Transclude/Variable/Static
+description: Transcluding a function
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+items: 1 2 3 4 5 6 7 8 9 10
+
+\function list-join(filter, sep:", ") [subfilter<filter>join<sep>]
+
+<<list-join "[enlist{!!items}]">>
++
+title: ExpectedResult
+
+<p>1, 2, 3, 4, 5, 6, 7, 8, 9, 10</p>

editions/tw5.com/tiddlers/about/Archive.tid

@@ -1,82 +0,0 @@
-title: TiddlyWiki Archive
-created: 20231005205623086
-modified: 20231005210538879
-tags: About
-
-\procedure versions()
-5.1.0 5.1.1 5.1.2 5.1.3 5.1.4 5.1.5 5.1.6 5.1.7 5.1.8 5.1.9
-5.1.10 5.1.11 5.1.12 5.1.13 5.1.14 5.1.15 5.1.16 5.1.17 5.1.18 5.1.19
-5.1.20 5.1.21 5.1.22 5.1.23
-5.2.0 5.2.1 5.2.2 5.2.3 5.2.4 5.2.5 5.2.6 5.2.7
-5.3.0 5.3.1
-\end
-
-Older versions of TiddlyWiki are available in the [[archive|https://github.com/Jermolene/jermolene.github.io/tree/master/archive]]:
-
-<table>
-	<tbody>
-		<tr>
-			<th>
-				Version
-			</th>
-			<th>
-				Released
-			</th>
-			<th>
-				Lifetime
-			</th>
-			<th>
-				Summary
-			</th>
-			<th>
-				Download
-			</th>
-		</tr>
-		<$list filter="[enlist<versions>reverse[]]" variable="version">
-			<$let
-				filename=`TiddlyWiki-$(version)$`
-				emptyFilename=`Empty-$(filename)$`
-				releaseTiddler={{{ [<version>addprefix[Release ]] }}}
-				releaseDate={{{ [<releaseTiddler>get[released]format:date[TIMESTAMP]] }}}
-				nextVersion={{{ [enlist<versions>after<version>] }}}
-				nextReleaseTiddler={{{ [<nextVersion>addprefix[Release ]] }}}
-				nextReleaseDate={{{ [<nextReleaseTiddler>get[released]format:date[TIMESTAMP]] }}}
-				lifetime={{{ [<nextReleaseDate>subtract<releaseDate>divide[86400000]add[0.5]fixed[0]] }}}
-			>
-				<tr>
-					<td>
-						<$link to=<<releaseTiddler>>>
-							<$text text=`v$(version)$`/>
-						</$link>
-					</td>
-					<td>
-						<$view tiddler=<<releaseTiddler>> field="released" format="date" template="DDth mmm YYYY"/>
-					</td>
-					<td>
-						<$list filter="[<lifetime>compare:number:lt[0]]" variable="ignore">
-							Current
-						</$list>
-						<$list filter="[<lifetime>compare:number:gteq[0]]" variable="ignore">
-							<$text text=<<lifetime>>/>
-							day<$list filter="[<lifetime>!compare:number:eq[1]]" variable="ignore">s</$list>
-						</$list>
-					</td>
-					<td>
-						<$transclude $tiddler=<<releaseTiddler>> $field="description" $format="inline">
-							(none)
-						</$transclude>
-					</td>
-					<td>
-						<a href={{{ [<filename>addprefix[https://tiddlywiki.com/archive/full/]]}}} rel="noopener noreferrer" target="_blank">
-							Complete
-						</a>
-						|
-						<a href={{{ [<emptyFilename>addprefix[https://tiddlywiki.com/archive/empty/]]}}} rel="noopener noreferrer" target="_blank">
-							Empty
-						</a>
-					</td>
-				</tr>
-			</$let>
-		</$list>
-	</tbody>
-</table>

editions/tw5.com/tiddlers/community/Chinese Community.tid

@@ -1,20 +0,0 @@
-title: 中文社区 - Chinese Community
-tags: Community
-
-# A Chinese community tutorial program that people can edit together:
-#* Main site: [ext[https://tw-cn.netlify.app/]]
-#* Accelerated access: [ext[https://tw-cn.cpolar.top/]]
-#* Alternate: [ext[https://tiddly-wiki-chinese-tutorial.vercel.app]]
-# Tiddlywiki Chinese Chat Forum: [ext[https://talk.tidgi.fun/topic/6]]
-# Chinese translation of Tiddlywiki official website [ext[https://bramchen.github.io/tw5-docs/zh-Hans/]]
-# The best Chinese introductory tutorial for newbies [ext[https://keatonlao.github.io/tiddlywiki-xp/]]
-
----
-
-# 大家可以一起编辑的中文社区教程项目：
-#* 主站：[ext[https://tw-cn.netlify.app/]]
-#* 加速访问：[ext[https://tw-cn.cpolar.top/]]
-#* 备用：[ext[https://tiddly-wiki-chinese-tutorial.vercel.app]]
-# 太微中文交流论坛：[ext[https://talk.tidgi.fun/topic/6]]
-# 太微官网汉化版：[ext[https://bramchen.github.io/tw5-docs/zh-Hans/]]
-# 最适合新手的中文入门教程：[ext[https://keatonlao.github.io/tiddlywiki-xp/]]

editions/tw5.com/tiddlers/community/editions/TiddlyMemo by oflg.tid

@@ -0,0 +1,16 @@
+created: 20220417010615742
+modified: 20220417011547812
+tags: [[Community Plugins]] [[Community Editions]] Resources
+title: TiddlyMemo by oflg
+type: text/vnd.tiddlywiki
+url: https://tiddlymemo.org/
+
+Lifelong knowledge, deep in the Sea of Mind.
+
+{{!!url}}
+
+~TiddlyMemo uses advanced [[Incremental Learning|https://help.supermemo.org/wiki/Incremental_learning]] concepts to make it your powerful second brain for acquiring lifelong knowledge.
+
+* [[Read Articles|https://tiddlymemo.org/#Read%20Articles]] like ~SuperMemo
+* [[Learn languages|https://tiddlymemo.org/#Learn%20languages]] like ~LingQ
+* [[Memory Notes|https://tiddlymemo.org/#Memory%20Notes]] like Anki

editions/tw5.com/tiddlers/community/editions/Tidme by oflg.tid

@@ -1,16 +0,0 @@
-created: 20220417010615742
-modified: 20231005060241771
-tags: [[Community Editions]]
-title: Tidme by oflg
-type: text/vnd.tiddlywiki
-url: https://github.com/oflg/Tidme
-
-Lifelong knowledge, deep in Mind.
-
-{{!!url}}
-
-Tidme uses advanced [[Incremental Learning|https://help.supermemo.org/wiki/Incremental_learning]] concepts to make it your powerful second brain for acquiring lifelong knowledge.
-
-* Read Articles like SuperMemo
-* Learn languages like LingQ
-* Memory Notes like Anki

editions/tw5.com/tiddlers/community/plugins/FSRS4TW by oflg.tid

@@ -1,10 +0,0 @@
-created: 20220417010615742
-modified: 20231005060241771
-tags: [[Community Plugins]]
-title: Free Spaced Repetition Scheduler for TiddlyWiki by oflg
-type: text/vnd.tiddlywiki
-url: https://github.com/open-spaced-repetition/fsrs4tw
-
-TiddlyWiki-based memory programme using advanced FSRS algorithm
-
-{{!!url}}

editions/tw5.com/tiddlers/community/tutorials/Install and run TiddlyWiki on a CentOS 6 VPS using Nginx.tid

@@ -1,16 +0,0 @@
-created: 20140312085406905
-modified: 20140312084543862
-tags: Tutorials
-title: "Install and run TiddlyWiki on a CentOS 6 VPS using Nginx" from RoseHosting
-type: text/vnd.tiddlywiki
-url: http://www.rosehosting.com/blog/install-and-run-tiddlywiki-on-a-centoos-6-vps-using-nginx/
-
-A step by step guide to running TiddlyWiki on a ~CentOS Virtual Private Server.
-
-{{!!url}}
-
-<<<
-In this tutorial we will guide you through the steps of installing and running TiddlyWiki on a ~CentOS 6 VPS.
-
-We will also install and configure Nginx as a reverse proxy, so you can run TiddlyWiki behind Nginx.
-<<<

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

@@ -0,0 +1,9 @@
+created: 20171029155046637
+modified: 20171029155227382
+tags: [[Operator Examples]] [[stringify Operator]]
+title: jsonstringify Operator (Examples)
+type: text/vnd.tiddlywiki
+
+<<.operator-example 1 """[[Title with "double quotes" and single ' and \backslash]] +[jsonstringify[]]""">>
+<<.operator-example 2 """[[Accents and emojis -> äñøßπ ⌛🎄🍪🍓 without suffix]] +[jsonstringify[]]""">>
+<<.operator-example 3 """[[Accents and emojis -> äñøßπ ⌛🎄🍪🍓 with rawunicode suffix]] +[jsonstringify:rawunicode[]]""">>

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

@@ -1,9 +1,9 @@
 created: 20161017154944352
-modified: 20230919124059118
+modified: 20171029155233487
 tags: [[Operator Examples]] [[stringify Operator]]
 title: stringify Operator (Examples)
 type: text/vnd.tiddlywiki
 
 <<.operator-example 1 """[[Title with "double quotes" and single ' and \backslash]] +[stringify[]]""">>
 <<.operator-example 2 """[[Accents and emojis -> äñøßπ ⌛🎄🍪🍓 without suffix]] +[stringify[]]""">>
-<<.operator-example 3 """[[Accents and emojis -> äñøßπ ⌛🎄🍪🍓 with rawunicode suffix]] +[stringify:rawunicode[]]""">>
+<<.operator-example 3 """[[Accents and emojis -> äñøßπ ⌛🎄🍪🍓 with rawunicode suffix]] +[stringify:rawunicode[]]""">>

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

@@ -1,12 +1,36 @@
 caption: jsonstringify
 created: 20171029155051467
 from-version: 5.1.14
-modified: 20230919124826880
+modified: 20171029155143797
+op-input: a [[selection of titles|Title Selection]]
+op-output: the input with JSON string encodings applied
 op-parameter: 
 op-parameter-name: 
-op-purpose: deprecated, use <<.olink stringify>> instead
+op-purpose: apply JSON string encoding to a string
+op-suffix: <<.from-version "5.1.23">> optionally, the keyword `rawunicode`
 op-suffix-name: R
 tags: [[Filter Operators]] [[String Operators]]
 title: jsonstringify Operator
 type: text/vnd.tiddlywiki
 
+The following substitutions are made:
+
+|!Character |!Replacement |!Condition |
+|`\` |`\\` |Always |
+|`"` |`\"` |Always |
+|Carriage return (0x0d) |`\\r` |Always |
+|Line feed (0x0a) |`\\n` |Always |
+|Backspace (0x08) |`\\b` |Always |
+|Form field (0x0c) |`\\f` |Always |
+|Tab (0x09) |`\\t` |Always |
+|Characters from 0x00 to 0x1f |`\\u####` where #### is four hex digits |Always |
+|Characters from 0x80 to 0xffff|`\\u####` where #### is four hex digits |If `rawunicode` suffix is not present (default) |
+|Characters from 0x80 to 0xffff|Unchanged |If `rawunicode` suffix is present <<.from-version "5.1.23">> |
+
+<<.from-version "5.1.23">> If the suffix `rawunicode` is present, Unicode characters above 0x80 (such as ß, ä, ñ or 🎄) will be passed through unchanged. Without the suffix, they will be substituted with `\\u` codes, which was the default behavior before 5.1.23.
+
+<<.note """Technical note: Characters outside the Basic Multilingual Plane, such as 🎄 and other emojis, will be encoded as a UTF-16 surrogate pair, i.e. with two `\u` sequences.""">>
+
+Also see the [[stringify Operator]].
+
+<<.operator-examples "jsonstringify">>

editions/tw5.com/tiddlers/filters/stringify_Operator.tid

@@ -1,7 +1,6 @@
 caption: stringify
 created: 20161017153038029
-from-version: 5.1.14
-modified: 20230919130847809
+modified: 20171029155143797
 op-input: a [[selection of titles|Title Selection]]
 op-output: the input with ~JavaScript string encodings applied
 op-parameter: 
@@ -12,25 +11,26 @@ op-suffix-name: R
 tags: [[Filter Operators]] [[String Operators]]
 title: stringify Operator
 type: text/vnd.tiddlywiki
+from-version: 5.1.14
 
 The following substitutions are made:
 
 |!Character |!Replacement |!Condition |
 |`\` |`\\` |Always |
 |`"` |`\"` |Always |
-|Carriage return (0x0d) |`\r` |Always |
-|Line feed (0x0a) |`\n` |Always |
-|Backspace (0x08) |`\b` |Always |
-|Form field (0x0c) |`\f` |Always |
-|Tab (0x09) |`\t` |Always |
-|Characters from 0x00 to 0x1f |`\x##` where ## is two hex digits |Always |
-|Characters from 0x80 to 0xffff|`\u####` where #### is four hex digits |If `rawunicode` suffix is not present (default) |
+|Carriage return (0x0d) |`\\r` |Always |
+|Line feed (0x0a) |`\\n` |Always |
+|Backspace (0x08) |`\\b` |Always |
+|Form field (0x0c) |`\\f` |Always |
+|Tab (0x09) |`\\t` |Always |
+|Characters from 0x00 to 0x1f |`\\x##` where ## is two hex digits |Always |
+|Characters from 0x80 to 0xffff|`\\u####` where #### is four hex digits |If `rawunicode` suffix is not present (default) |
 |Characters from 0x80 to 0xffff|<<.from-version "5.1.23">> Unchanged |If `rawunicode` suffix is present |
 
-<<.from-version "5.1.23">> If the suffix `rawunicode` is present, Unicode characters above 0x80 (such as ß, ä, ñ or 🎄) will be passed through unchanged. Without the suffix, they will be substituted with `\u` codes, which was the default behavior before 5.1.23.
+<<.from-version "5.1.23">> If the suffix `rawunicode` is present, Unicode characters above 0x80 (such as ß, ä, ñ or 🎄) will be passed through unchanged. Without the suffix, they will be substituted with `\\u` codes, which was the default behavior before 5.1.23.
 
-<<.note """Characters outside the Basic Multilingual Plane, such as 🎄 and other emojis, will be encoded as a UTF-16 surrogate pair, i.e. with two `\u` sequences.""">>
+<<.note """Technical note: Characters outside the Basic Multilingual Plane, such as 🎄 and other emojis, will be encoded as a UTF-16 surrogate pair, i.e. with two `\u` sequences.""">>
 
-<<.olink jsonstringify>> is considered deprecated, as it duplicates the functionality of <<.op stringify>>.
+Also see the [[jsonstringify Operator]].
 
-<<.operator-examples "stringify">>
+<<.operator-examples "stringify">>

editions/tw5.com/tiddlers/filters/syntax/Filter Expression.tid

@@ -50,7 +50,7 @@ In technical / logical terms:
 |`~run` |`:else[run]` |else |... ELSE run |
 ||`:intersection`|intersection of sets||
 
-For the difference between `+` and `:intersection`, see [[Intersection Filter Run Prefix (Examples)]].
+For the difference between `+` and `:intersection`, see [[Filter Run Prefix (Examples)]].
 
 The input of a run is normally a list of all the non-[[shadow|ShadowTiddlers]] tiddler titles in the wiki (in no particular order). But the `+` prefix can change this:
 

editions/tw5.com/tiddlers/hellothere/HelloThere.tid

@@ -18,11 +18,6 @@ TiddlyWiki lets you choose where to keep your data, guaranteeing that in the dec
 <$macrocall $name="flex-card" bordercolor={{!!color}} textcolor={{!!text-color}} backgroundcolor={{!!background-color}} captionField="caption" descriptionField="text"/>
 </$list>
 </div>
-<div class="tc-cards tc-small">
-<$link to="中文社区 - Chinese Community" class="tc-btn-big-green tc-card">
-中文社区 - Chinese Community
-</$link>
-</div>
 
 !! ''Find Out More''
 

editions/tw5.com/tiddlers/howtos/Constructing JSON tiddlers.tid

@@ -1,7 +1,7 @@
-created: 20220427174702859
-modified: 20230809113620964
-tags: [[JSON in TiddlyWiki]] Learning
 title: Constructing JSON tiddlers
+tags: [[JSON in TiddlyWiki]] [[Learning]]
+created: 20220427174702859
+modified: 20220427174702859
 
 See [[JSON in TiddlyWiki]] for an overview of using JSON in TiddlyWiki.
 
@@ -13,4 +13,4 @@ At a high level, we have several ways to generate JSON data in TiddlyWiki's own
 * [[jsontiddler Macro]]
 * [[jsontiddlers Macro]]
 
-When constructing JSON data manually, the [[stringify Operator]] is needed to ensure that any special characters are properly escaped.
+When constructing JSON data manually, the [[jsonstringify Operator]] is needed to ensure that any special characters are properly escaped.

editions/tw5.com/tiddlers/pragmas/Pragma_ _whitespace.tid

@@ -1,17 +1,13 @@
 created: 20220917113002350
-modified: 20230921180332436
+modified: 20230419103154329
 tags: Pragmas
 title: Pragma: \whitespace
 type: text/vnd.tiddlywiki
 
-<<.from-version "5.1.15">> The ''\whitespace'' [[pragma|Pragmas]] determines how spaces and newlines are treated within wikitext.
+<<.from-version "5.1.15">> The ''\whitespace'' [[pragma|Pragmas]] determines how spaces and newlines are treated within wikitext. Note that this only applies to the printable text, and not to other text, such as the values of attributes.
 
 * ''notrim'' -- whitespace text is not subject to special processing (the default)
-* ''trim'' -- whitespace text is ignored
-
-Note that the processing only applies to the printable text, and not to other text, such as the values of attributes.
-
-The whitespace setting only applies to the parsed content in which it appears. The setting is inherited by embedded [[Procedure Definitions]] and [[Custom Widgets]] definitions, but is not inherited by [[Macro definitions]].
+* ''trim'' -- whitespace text is removed
 
 ```
 \whitespace trim|notrim

editions/tw5.com/tiddlers/procedures/Procedure Definitions.tid

@@ -1,5 +1,5 @@
 created: 20221007125701001
-modified: 20230921180332436
+modified: 20230419103154329
 tags: WikiText Procedures
 title: Procedure Definitions
 type: text/vnd.tiddlywiki
@@ -18,8 +18,6 @@ This is the procedure text (param=<<param>>)
 \end
 ```
 
-Note that the [[Pragma: \whitespace]] setting is inherited from the parsing context in which the procedure definition occurs. That means that a tiddler containing multiple procedure definitions only needs a single whitespace pragma at the top of the tiddler, and the setting will be automatically inherited by the procedure definitions without needing the pragma to be repeated.
-
 !! Procedure Definition with Set Widget
 
 Procedures are implemented as a special kind of [[variable|Variables]] and so internally are actually defined with a <<.wlink SetWidget>> widget.

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

@@ -5,7 +5,6 @@ tags: ReleaseNotes
 title: Release 5.1.0
 type: text/vnd.tiddlywiki
 released: 201409201500
-description: First non-beta release
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.0.18-beta...v5.1.0]]//
 

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

@@ -5,7 +5,6 @@ tags: ReleaseNotes
 title: Release 5.1.1
 type: text/vnd.tiddlywiki
 released: 201409221100
-description: [[KaTeX Plugin]]
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.0...v5.1.1]]//
 

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

@@ -5,7 +5,6 @@ tags: ReleaseNotes
 title: Release 5.1.10
 type: text/vnd.tiddlywiki
 released: 20160107231609312
-description: Text slicer, fold/unfold, performance optimisations, translations, external text tiddlers
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.9...v5.1.10]]//
 

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

@@ -5,7 +5,6 @@ tags: ReleaseNotes
 title: Release 5.1.11
 type: text/vnd.tiddlywiki
 released: 20160130124109312
-description: Bug fix release for v5.1.10
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.10...v5.1.11]]//
 

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

@@ -5,7 +5,6 @@ tags: ReleaseNotes
 title: Release 5.1.12
 type: text/vnd.tiddlywiki
 released: 20160713104714652
-description: Editor toolbars, improved bitmap editor, Internals plugin, WikifyWidget
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.11...v5.1.12]]//
 

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

@@ -5,7 +5,6 @@ released: 20160725084810809
 tags: ReleaseNotes
 title: Release 5.1.13
 type: text/vnd.tiddlywiki
-description: Bug fix release for v5.1.12
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.12...v5.1.13]]//
 

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

@@ -5,7 +5,6 @@ released: 20170426160031661
 tags: ReleaseNotes
 title: Release 5.1.14
 type: text/vnd.tiddlywiki
-description: Drag and drop improvements, initial RTL support, plugins for XLSX import, QR Codes, ~BibTeX, Google Analytics, Twitter
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.13...v5.1.14]]//
 

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

@@ -5,7 +5,6 @@ released: 20171113161124237
 tags: ReleaseNotes
 title: Release 5.1.15
 type: text/vnd.tiddlywiki
-description: Explorer tab, whitespace pragma, save and render commands
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.14...v5.1.15]]//
 

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

@@ -5,7 +5,6 @@ released: 20180425155658451
 tags: ReleaseNotes
 title: Release 5.1.16
 type: text/vnd.tiddlywiki
-description: [[Dynaview Plugin]], import previews, DiffTextWidget, rotate left in bitmap editor, StartupActions
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.15...v5.1.16]]//
 

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

@@ -5,7 +5,6 @@ released: 20180512104329616
 tags: ReleaseNotes
 title: Release 5.1.17
 type: text/vnd.tiddlywiki
-description: Minor bug fix release
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.16...v5.1.17]]//
 

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

@@ -5,7 +5,6 @@ released: 20181206090053690
 tags: ReleaseNotes
 title: Release 5.1.18
 type: text/vnd.tiddlywiki
-description: Global keyboard shortcuts, HTTP server improvements, support for splash screens, `~` filter run prefix, external JS support
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.17...v5.1.18]]//
 

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

@@ -5,7 +5,6 @@ released: 20181220163418974
 tags: ReleaseNotes
 title: Release 5.1.19
 type: text/vnd.tiddlywiki
-description: Bug fix release for v5.1.18
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.18...v5.1.19]]//
 

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

@@ -5,7 +5,6 @@ tags: ReleaseNotes
 title: Release 5.1.2
 type: text/vnd.tiddlywiki
 released: 20140927162659979
-description: Minor fixes
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.1...v5.1.2]]//
 

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

@@ -5,7 +5,6 @@ released: 20190809141328809
 tags: ReleaseNotes
 title: Release 5.1.20
 type: text/vnd.tiddlywiki
-description: New conditional, mathematics and string operators, GitHub Saver, save wiki folder command, [[Innerwiki Plugin]]
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.19...v5.1.20]]//
 

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

@@ -5,7 +5,6 @@ released: 20190910152313608
 tags: ReleaseNotes
 title: Release 5.1.21
 type: text/vnd.tiddlywiki
-description: Bug fix release for v5.1.20
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.20...v5.1.21]]//
 

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

@@ -5,7 +5,6 @@ released: 20200415160825341
 tags: ReleaseNotes
 title: Release 5.1.22
 type: text/vnd.tiddlywiki
-description: Dynamic plugin loading, compare operator, new plugins: Menubar, Freelinks, Dynannotate, Share
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.21...v5.1.22]]//
 

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

@@ -5,7 +5,6 @@ released: 20201224132933812
 tags: ReleaseNotes
 title: Release 5.1.23
 type: text/vnd.tiddlywiki
-description: Switchable page templates, EventCatcherWidget, Rename during import, many plugin and filter improvements
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.22...v5.1.23]]//
 

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

@@ -5,7 +5,6 @@ tags: ReleaseNotes
 title: Release 5.1.3
 type: text/vnd.tiddlywiki
 released: 20141020171015200
-description: Journals, ActionWidgets, <<.olink addprefix>> and <<.olink addsuffix>> operators, "includeWikis"
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.2...v5.1.3]]//
 

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

@@ -5,7 +5,6 @@ tags: ReleaseNotes
 title: Release 5.1.4
 type: text/vnd.tiddlywiki
 released: 20141022155524581
-description: Dragging links into text boxes, coloured errors and warnings under Node.js
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.3...v5.1.4]]//
 

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

@@ -5,7 +5,6 @@ tags: ReleaseNotes
 title: Release 5.1.5
 type: text/vnd.tiddlywiki
 released: 20141126153016142
-description: Export button, more ActionWidgets, Danish and Greek translations
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.4...v5.1.5]]//
 

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

@@ -5,7 +5,6 @@ tags: ReleaseNotes
 title: Release 5.1.6
 type: text/vnd.tiddlywiki
 released: 20141219155007260
-description: Minor bug fix release for v5.1.5
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.5...v5.1.6]]//
 

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

@@ -5,7 +5,6 @@ tags: ReleaseNotes
 title: Release 5.1.7
 type: text/vnd.tiddlywiki
 released: 20141219215007260
-description: Hot fix release for v5.1.7
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.6...v5.1.7]]//
 

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

@@ -5,7 +5,6 @@ tags: ReleaseNotes
 title: Release 5.1.8
 type: text/vnd.tiddlywiki
 released: 2015041716307227
-description: Plugin library, Railroad Plugin, sticky titles, 7 new translations
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.7...v5.1.8]]//
 

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

@@ -5,7 +5,6 @@ tags: ReleaseNotes
 title: Release 5.1.9
 type: text/vnd.tiddlywiki
 released: 20150703153725652
-description: Fluid-fixed layout, vars widget, open in new window
 
 \define custom-colour-picker(tiddler,colour)
 <$edit-text tiddler="""$tiddler$""" index="""$colour$""" type="color" tag="input"/>

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

@@ -5,7 +5,6 @@ released: 20211003151502543
 tags: ReleaseNotes
 title: Release 5.2.0
 type: text/vnd.tiddlywiki
-description: JSON store area, nestable macros, counter attribute for ListWidget, MessageCatcherWidget
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.23...v5.2.0]]//
 

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

@@ -5,7 +5,6 @@ released: 20211208115833846
 tags: ReleaseNotes
 title: Release 5.2.1
 type: text/vnd.tiddlywiki
-description: Filter cascades, LetWidget, trigonometric operators
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.2.0...v5.2.1]]//
 

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

@@ -5,7 +5,6 @@ released: 20220325130817150
 tags: ReleaseNotes
 title: Release 5.2.2
 type: text/vnd.tiddlywiki
-description: Minor bug fix release
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.2.1...v5.2.2]]//
 

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

@@ -5,7 +5,6 @@ released: 20220802122551819
 tags: ReleaseNotes
 title: Release 5.2.3
 type: text/vnd.tiddlywiki
-description: Minor fixes and improvements
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.2.2...v5.2.3]]//
 

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

@@ -5,7 +5,6 @@ released: 20221213163110439
 tags: ReleaseNotes
 title: Release 5.2.4
 type: text/vnd.tiddlywiki
-description: Hot fixes for v5.2.3, Twitter archivist plugin, GenesisWidget, JSON read operators, nested macro definitions
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.2.3...v5.2.4]]//
 

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

@@ -5,7 +5,6 @@ released: 20221219184500440
 tags: ReleaseNotes
 title: Release 5.2.5
 type: text/vnd.tiddlywiki
-description: Hot fix release for v5.2.4
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.2.4...v5.2.5]]//
 

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

@@ -5,7 +5,6 @@ released: 20230320184352916
 tags: ReleaseNotes
 title: Release 5.2.6
 type: text/vnd.tiddlywiki
-description: Markdown improvements, indentable pragmas, accessible save wiki button
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.2.5...v5.2.6]]//
 

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

@@ -5,7 +5,6 @@ released: 20230326083239710
 tags: ReleaseNotes
 title: Release 5.2.7
 type: text/vnd.tiddlywiki
-description: Bug fix release for v5.2.6
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.2.6...v5.2.7]]//
 

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

@@ -5,7 +5,6 @@ released: 20230701123439630
 tags: ReleaseNotes
 title: Release 5.3.0
 type: text/vnd.tiddlywiki
-description: Parameterised transclusions, procedures, functions, custom widgets
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.2.7...v5.3.0]]//
 

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

@@ -5,7 +5,6 @@ released: 20230820112855583
 tags: ReleaseNotes
 title: Release 5.3.1
 type: text/vnd.tiddlywiki
-description: Bug fix release for v5.3.0
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.3.0...v5.3.1]]//
 

editions/tw5.com/tiddlers/releasenotes/Releases.tid

@@ -1,11 +1,9 @@
 created: 20150419144523070
-modified: 20231005205612322
+modified: 20220802100223019
 tags: About
 title: Releases
 type: text/vnd.tiddlywiki
 
 New releases of TiddlyWiki and TiddlyDesktop are announced via the [[official discussion groups|Forums]] and [[Twitter|https://twitter.com/TiddlyWiki]]
 
-See the [[TiddlyWiki Archive]] to download older versions.
-
 <<tabs "[[TiddlyWiki Releases]] [[TiddlyDesktop Releases]]" "TiddlyWiki Releases" "$:/state/tab">>

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

@@ -147,10 +147,6 @@ type: text/vnd.tiddlywiki
 	gap: 1em;
 }
 
-.tc-cards.tc-small {
-	font-size: 0.7em;
-}
-
 .tc-cards.tc-action-card {
 	text-align: center;
 	background: none;

editions/tw5.com/tiddlers/widgets/Custom Widgets.tid

@@ -1,5 +1,5 @@
 created: 20221007144237585
-modified: 20230921180332436
+modified: 20230419103154328
 tags: Concepts Reference
 title: Custom Widgets
 type: text/vnd.tiddlywiki
@@ -22,8 +22,6 @@ This is the widget, and the attribute is <<attribute>>.
 
 The name of the widget must start with a dollar sign. If it is a user defined widget that does not override an existing widget then it must include at least one period (dot) within the name (for example `$my.widget` or `$acme.logger`).
 
-Note that the [[Pragma: \whitespace]] setting is inherited from the parsing context in which the procedure definition occurs. That means that a tiddler containing multiple procedure definitions only needs a single whitespace pragma at the top of the tiddler, and the setting will be automatically inherited by the procedure definitions without needing the pragma to be repeated.
-
 !! Using Custom Widgets
 
 Custom widgets are called in the same way as ordinary built-in widgets:

languages/zh-Hans/Help/server.tid

@@ -1,5 +1,5 @@
 title: $:/language/Help/server
-description: 提供一个 HTTP 服务器界面到 TiddlyWiki (已弃用，支持新的 listen 命令)
+description: （已弃用：请参阅 'listen' 命令）提供一个 HTTP 服务器界面到 TiddlyWiki
 
 在服务器中内置 TiddlyWiki5 是非常简单。虽与 TiddlyWeb 兼容，但不支持许多健全互联网面向的使用方式所需的功能。
 

languages/zh-Hant/Help/server.tid

@@ -1,5 +1,5 @@
 title: $:/language/Help/server
-description: 提供一個 HTTP 伺服器介面到 TiddlyWiki (已棄用，支持新的 listen 命令)
+description: （已棄用：請參閱 'listen' 命令）提供一個 HTTP 伺服器介面到 TiddlyWiki
 
 在伺服器中內建 TiddlyWiki5 是非常簡單。雖與 TiddlyWeb 相容，但不支援許多健全網際網路面向的使用方式所需的功能。
 

licenses/cla-individual.md

@@ -549,7 +549,3 @@ Eric Haberstroh, @pille1842, 2023/07/23
 @cmo-pomerium, 2023/08/03
 
 BuckarooBanzay, @BuckarooBanzay, 2023/09/01
-
-Timur, @T1mL3arn, 2023/10/04
-
-Wang Ke, @Gk0Wk, 2023/10/17

package.json

@@ -1,7 +1,7 @@
 {
   "name": "tiddlywiki",
   "preferGlobal": "true",
-  "version": "5.3.1",
+  "version": "5.3.2-prerelease",
   "author": "Jeremy Ruston <jeremy@jermolene.com>",
   "description": "a non-linear personal web notebook",
   "contributors": [