Merge branch 'master' into multi-wiki-support

2024-01-18 16:43:43 +00:00 · 2024-01-18 16:43:43 +00:00 · a16338ce11
parent 50d0b1412d 38187d26f4
commit a16338ce11
29 changed files with 227 additions and 74 deletions
--- a/core/copyright.tid
+++ b/core/copyright.tid
@ -4,7 +4,7 @@ type: text/plain
 TiddlyWiki created by Jeremy Ruston, (jeremy [at] jermolene [dot] com)

 Copyright (c) 2004-2007, Jeremy Ruston
-Copyright (c) 2007-2023, UnaMesa Association
+Copyright (c) 2007-2024, UnaMesa Association
 All rights reserved.

 Redistribution and use in source and binary forms, with or without
--- a/core/language/en-GB/Fields.multids
+++ b/core/language/en-GB/Fields.multids
@ -4,6 +4,7 @@ _canonical_uri: The full URI of an external image tiddler
 author: Name of the author of a plugin
 bag: The name of the bag from which a tiddler came
 caption: The text to be displayed on a tab or button
+class: The CSS class applied to a tiddler when rendering it - see [[Custom styles by user-class]].  Also used for [[Modals]]
 code-body: The view template will display the tiddler as code if set to ''yes''
 color: The CSS color value associated with a tiddler
 component: The name of the component responsible for an [[alert tiddler|AlertMechanism]]
--- a/core/modules/parsers/wikiparser/wikiparser.js
+++ b/core/modules/parsers/wikiparser/wikiparser.js
@ -216,6 +216,8 @@ WikiParser.prototype.parsePragmas = function() {
 			subTree[0].children = [];
 			currentTreeBranch = subTree[0].children;
 		}
+		// Skip whitespace after the pragma
+		this.skipWhitespace();
 	}
 	return currentTreeBranch;
 };
--- a/core/modules/widgets/link.js
+++ b/core/modules/widgets/link.js
@ -217,7 +217,7 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
 */
 LinkWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
-	if($tw.utils.count(changedAttributes) > 0) {
+	if($tw.utils.count(changedAttributes) > 0 || changedTiddlers[this.to]) {
 		this.refreshSelf();
 		return true;
 	}
--- a/core/modules/widgets/list.js
+++ b/core/modules/widgets/list.js
@ -109,6 +109,7 @@ ListWidget.prototype.findExplicitTemplates = function() {
 	this.explicitJoinTemplate = null;
 	this.hasTemplateInBody = false;
 	var searchChildren = function(childNodes) {
+		var foundInlineTemplate = false;
 		$tw.utils.each(childNodes,function(node) {
 			if(node.type === "list-template") {
 				self.explicitListTemplate = node.children;
@ -118,12 +119,14 @@ ListWidget.prototype.findExplicitTemplates = function() {
 				self.explicitJoinTemplate = node.children;
 			} else if(node.type === "element" && node.tag === "p") {
 				searchChildren(node.children);
+				foundInlineTemplate = true;
 			} else {
-				self.hasTemplateInBody = true;
+				foundInlineTemplate = true;
 			}
 		});
+		return foundInlineTemplate;
 	};
-	searchChildren(this.parseTreeNode.children);
+	this.hasTemplateInBody = searchChildren(this.parseTreeNode.children);
 }

 ListWidget.prototype.getTiddlerList = function() {
--- a/core/modules/widgets/select.js
+++ b/core/modules/widgets/select.js
@ -43,7 +43,7 @@ SelectWidget.prototype.render = function(parent,nextSibling) {
 	//Create element
 	var domNode = this.document.createElement("select");
 	if(this.selectClass) {
-		domNode.classname = this.selectClass;
+		domNode.className = this.selectClass;
 	}
 	// Assign data- attributes
 	this.assignAttributes(domNode,{
@ -62,8 +62,8 @@ SelectWidget.prototype.render = function(parent,nextSibling) {
 	if(this.selectTooltip) {
 		domNode.setAttribute("title",this.selectTooltip);
 	}
-	this.renderChildren(domNode,nextSibling);
 	this.parentDomNode.insertBefore(domNode,nextSibling);
+	this.renderChildren(domNode,null);
 	this.domNodes.push(domNode);
 	this.setSelectValue();
 	if(this.selectFocus == "yes") {
--- a/core/templates/html-json-skinny-tiddler.tid
+++ b/core/templates/html-json-skinny-tiddler.tid
@ -1,3 +1,3 @@
 title: $:/core/templates/html-json-skinny-tiddler

-<$jsontiddler tiddler=<<currentTiddler>> exclude="text" escapeUnsafeScriptChars="yes"/>
+<$text text=<<join>>/><$jsontiddler tiddler=<<currentTiddler>> exclude="text" escapeUnsafeScriptChars="yes"/>
--- a/core/templates/store.area.template.html.tid
+++ b/core/templates/store.area.template.html.tid
@ -9,9 +9,7 @@ title: $:/core/templates/store.area.template.html
            <$let newline={{{ [charcode[10]] }}} join=`,$(newline)$`>
                <$text text=<<newline>>/>
                <$list filter=<<saveTiddlerFilter>> join=<<join>> template="$:/core/templates/html-json-tiddler"/>
-                <$vars numTiddlers={{{ [subfilter<saveTiddlerFilter>count[]] }}}>
-                    <$list filter={{{ [<skinnySaveTiddlerFilter>] }}} join=<<join>> template="$:/core/templates/html-json-skinny-tiddler"/>
-                </$vars>
+                <$list filter="[subfilter<skinnySaveTiddlerFilter>]"  template="$:/core/templates/html-json-skinny-tiddler"/>
                <$text text=<<newline>>/>
            </$let>
        `]</script>`
@ -22,8 +20,8 @@ title: $:/core/templates/store.area.template.html
        <!-- Old-style DIV/PRE-based store area -->
        <$reveal type="nomatch" state="$:/isEncrypted" text="yes">
            `<div id="storeArea" style="display:none;">`
-                <$list filter=<<saveTiddlerFilter>> template="$:/core/templates/html-div-tiddler"/>
-                <$list filter={{{ [<skinnySaveTiddlerFilter>] }}} template="$:/core/templates/html-div-skinny-tiddler"/>
+                <$list filter={{{ [<saveTiddlerFilter>] }}} template="$:/core/templates/html-div-tiddler"/>
+                <$list filter="[subfilter<skinnySaveTiddlerFilter>]" template="$:/core/templates/html-div-skinny-tiddler"/>
            `</div>`
        </$reveal>
    </$list>
--- a/core/ui/EditTemplate/body/default.tid
+++ b/core/ui/EditTemplate/body/default.tid
@ -1,9 +1,5 @@
 title: $:/core/ui/EditTemplate/body/default

-\function edit-preview-state()
-[{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[<qualify "$:/state/showeditpreview">] +[get[text]] :else[[no]]
-\end
-
 \define config-visibility-title()
 $:/config/EditorToolbarButtons/Visibility/$(currentTiddler)$
 \end
@ -14,15 +10,16 @@ $:/config/EditorToolbarButtons/Visibility/$(currentTiddler)$

 \whitespace trim
 <$let
+	editPreviewStateTiddler={{{ [{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[<qualify "$:/state/showeditpreview">] }}}
 	importTitle=<<qualify $:/ImportImage>>
 	importState=<<qualify $:/state/ImportImage>> >
 <$dropzone importTitle=<<importTitle>> autoOpenOnImport="no" contentTypesFilter={{$:/config/Editor/ImportContentTypesFilter}} class="tc-dropzone-editor" enable={{{ [{$:/config/DragAndDrop/Enable}match[no]] :else[subfilter{$:/config/Editor/EnableImportFilter}then[yes]else[no]] }}} filesOnly="yes" actions=<<importFileActions>> >
 <div>
-<div class={{{ [function[edit-preview-state]match[yes]then[tc-tiddler-preview]else[tc-tiddler-preview-hidden]] [[tc-tiddler-editor]] +[join[ ]] }}}>
+<div class={{{ [<editPreviewStateTiddler>get[text]match[yes]then[tc-tiddler-preview]else[tc-tiddler-preview-hidden]] [[tc-tiddler-editor]] +[join[ ]] }}}>

 <$transclude tiddler="$:/core/ui/EditTemplate/body/editor" mode="inline"/>

-<$list filter="[function[edit-preview-state]match[yes]]" variable="ignore">
+<$list filter="[<editPreviewStateTiddler>get[text]match[yes]]" variable="ignore">

 <div class="tc-tiddler-preview-preview" data-tiddler-title={{!!draft.title}} data-tags={{!!tags}}>

--- a/core/ui/EditorToolbar/preview.tid
+++ b/core/ui/EditorToolbar/preview.tid
@ -9,17 +9,8 @@ button-classes: tc-text-editor-toolbar-item-start-group
 shortcuts: ((preview))

 \whitespace trim
-<$let
-	edit-preview-state={{{ [{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[<qualify "$:/state/showeditpreview">] }}}
->
-<$reveal state=<<edit-preview-state>> type="match" text="yes" tag="span">
-{{$:/core/images/preview-open}}
-<$action-setfield $tiddler=<<edit-preview-state>> $value="no"/>
-<$action-sendmessage $message="tm-edit-text-operation" $param="focus-editor"/>
-</$reveal>
-<$reveal state=<<edit-preview-state>> type="nomatch" text="yes" tag="span">
-{{$:/core/images/preview-closed}}
-<$action-setfield $tiddler=<<edit-preview-state>> $value="yes"/>
-<$action-sendmessage $message="tm-edit-text-operation" $param="focus-editor"/>
-</$reveal>
-</$let>
+<span>
+	<$transclude $tiddler={{{ [<editPreviewStateTiddler>get[text]match[yes]then[$:/core/images/preview-open]else[$:/core/images/preview-closed]] }}} />
+</span>
+<$action-setfield $tiddler=<<editPreviewStateTiddler>> $value={{{ [<editPreviewStateTiddler>get[text]toggle[yes],[no]] }}} />
+<$action-sendmessage $message="tm-edit-text-operation" $param="focus-editor"/>
--- a/editions/prerelease/tiddlers/Release
+++ b/editions/prerelease/tiddlers/Release
@ -1,12 +1,15 @@
-caption: 5.3.3
-created: 20231213080754563
-modified: 20231213080754563
+caption: 5.3.4
+created: 20231223102229103
+modified: 20231223102229103
 tags: ReleaseNotes
-title: Release 5.3.3
+title: Release 5.3.4
 type: text/vnd.tiddlywiki
 description: Under development

-//[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.3.2...master]]//
+//[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.3.3...master]]//
+
+! Major Improvements
+

 ! Translation improvements

--- a/editions/test/tiddlers/tests/data/list-widget/WithEmptyParagraphTemplate.tid
+++ b/editions/test/tiddlers/tests/data/list-widget/WithEmptyParagraphTemplate.tid
@ -0,0 +1,13 @@
+title: ListWidget/WithEmptyParagraphTemplate
+description: List widget with an empty paragraph as inline template
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+
+title: Output
+
+<$list filter="1"><p/></$list>
+
+title: ExpectedResult
+
+<p><p></p></p>
--- a/editions/test/tiddlers/tests/data/pragmas/WhitespaceAfterPragma.tid
+++ b/editions/test/tiddlers/tests/data/pragmas/WhitespaceAfterPragma.tid
@ -0,0 +1,64 @@
+title: Pragmas/WhitespaceAfterPragma
+description: parsermode pragma
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+
+<$wikify name="parsetree" text={{Text}} mode="inline" output="parsetree">
+<$text text=<<parsetree>>/>
+</$wikify>
+
+title: Text
+
+\procedure this-is-a-definition() Something
+
+
+
+
+Now!
+
+
+title: ExpectedResult
+
+<p>
+[
+    {
+        "type": "set",
+        "attributes": {
+            "name": {
+                "name": "name",
+                "type": "string",
+                "value": "this-is-a-definition"
+            },
+            "value": {
+                "name": "value",
+                "type": "string",
+                "value": "Something"
+            }
+        },
+        "children": [
+            {
+                "type": "text",
+                "text": "Now!\n",
+                "start": 48,
+                "end": 53
+            }
+        ],
+        "params": [],
+        "orderedAttributes": [
+            {
+                "name": "name",
+                "type": "string",
+                "value": "this-is-a-definition"
+            },
+            {
+                "name": "value",
+                "type": "string",
+                "value": "Something"
+            }
+        ],
+        "isProcedureDefinition": true
+    }
+]
+</p>
--- a/editions/test/tiddlers/tests/data/pragmas/WhitespaceNoPragma.tid
+++ b/editions/test/tiddlers/tests/data/pragmas/WhitespaceNoPragma.tid
@ -0,0 +1,32 @@
+title: Pragmas/WhitespaceNoPragma
+description: parsermode pragma
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+
+<$wikify name="parsetree" text={{Text}} mode="inline" output="parsetree">
+<$text text=<<parsetree>>/>
+</$wikify>
+
+title: Text
+
+
+
+
+
+Now!
+
+
+title: ExpectedResult
+
+<p>
+[
+    {
+        "type": "text",
+        "text": "\n\n\n\nNow!\n",
+        "start": 0,
+        "end": 9
+    }
+]
+</p>
--- a/editions/test/tiddlers/tests/data/widgets/DataAttributes/SelectWidget-DataAttributes.tid
+++ b/editions/test/tiddlers/tests/data/widgets/DataAttributes/SelectWidget-DataAttributes.tid
@ -6,7 +6,7 @@ tags: [[$:/tags/wiki-test-spec]]
 title: Output

 \whitespace trim
-<$select tiddler='New Tiddler' field='text' default='Choose a new text' data-title={{Temp}} style.color={{{ [[Temp]get[color]] }}} onclick="clicked">
+<$select tiddler='New Tiddler' class="myclass" field='text' default='Choose a new text' data-title={{Temp}} style.color={{{ [[Temp]get[color]] }}} onclick="clicked">
 <option disabled>Choose a new text</option>
 <option>A Tale of Two Cities</option>
 <option>A New Kind of Science</option>
@ -24,4 +24,4 @@ Title1
 +
 title: ExpectedResult

-<p><select data-title="Title2" value="Choose a new text" style="color:red;"><option disabled="true">Choose a new text</option><option>A Tale of Two Cities</option><option>A New Kind of Science</option><option>The Dice Man</option></select></p>
+<p><select class="myclass" data-title="Title2" value="Choose a new text" style="color:red;"><option disabled="true">Choose a new text</option><option>A Tale of Two Cities</option><option>A New Kind of Science</option><option>The Dice Man</option></select></p>
--- a/editions/tw5.com/tiddlers/concepts/TiddlerFields.tid
+++ b/editions/tw5.com/tiddlers/concepts/TiddlerFields.tid
@ -24,7 +24,7 @@ The standard fields are:
 Other fields used by the core are:

 |!Field Name |!Description |
-|`class` |<<lingo class>> |
+|`class` |<<.from-version "5.1.16">> <<lingo class>> |
 |`code-body` |<<.from-version "5.2.1">> <<lingo code-body>> |
 |`color` |<<lingo color>> |
 |`description` |<<lingo description>> |
--- a/editions/tw5.com/tiddlers/hellothere/HelloThere.tid
+++ b/editions/tw5.com/tiddlers/hellothere/HelloThere.tid
@ -1,6 +1,6 @@
 created: 20130822170200000
 list: [[A Gentle Guide to TiddlyWiki]] [[Discover TiddlyWiki]] [[Some of the things you can do with TiddlyWiki]] [[Ten reasons to switch to TiddlyWiki]] Examples [[What happened to the original TiddlyWiki?]]
-modified: 20231213080637781
+modified: 20231223102201587
 tags: TableOfContents
 title: HelloThere
 type: text/vnd.tiddlywiki
--- a/editions/tw5.com/tiddlers/images/New
+++ b/editions/tw5.com/tiddlers/images/New
--- a/editions/tw5.com/tiddlers/releasenotes/BetaReleases.tid
+++ b/editions/tw5.com/tiddlers/releasenotes/BetaReleases.tid
@ -1,9 +1,9 @@
 created: 20131109105400007
-modified: 20211117230125737
+modified: 20231220113054682
 tags: Releases BetaReleaseNotes
 title: BetaReleases
 type: text/vnd.tiddlywiki

 Here are the details of the beta releases of TiddlyWiki5. See [[TiddlyWiki5 Versioning]] for details of how releases are named.

-<<tabs "[tag[BetaReleaseNotes]!sort[created]]" "Release 5.0.18-beta" "$:/state/tab2" "tc-vertical" "ReleaseTemplate">>
+<<tabs "[tag[BetaReleaseNotes]!sort[created]] -[<currentTiddler>]" "Release 5.0.18-beta" "$:/state/tab2" "tc-vertical" "ReleaseTemplate">>
--- a/editions/tw5.com/tiddlers/releasenotes/Release
+++ b/editions/tw5.com/tiddlers/releasenotes/Release
@ -0,0 +1,30 @@
+caption: 5.3.3
+created: 20231223102201587
+modified: 20231223102201587
+released: 20231223102201587
+tags: ReleaseNotes
+title: Release 5.3.3
+type: text/vnd.tiddlywiki
+description: Under development
+
+//[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.3.2...v5.3.3]]//
+
+<<.banner-credits
+	credit:"""Congratulations to [[catter-fly|https://talk.tiddlywiki.org/u/catter-fly]] for their winning design for the banner for this release (here is the [[competition thread|https://talk.tiddlywiki.org/t/banner-image-competition-for-v5-3-2/8569]]).
+"""
+	url:"https://raw.githubusercontent.com/Jermolene/TiddlyWiki5/5cb31b7adb0a6b226c0c215ddbed62e297ce89e1/editions/tw5.com/tiddlers/images/New%20Release%20Banner.png"
+>>
+
+This is a bug fix release to address a number of bugs that were introduced with [[Release 5.3.2]].
+
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7903">> handling of a list widget with an empty paragraph as inline template
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7900">> broken per-tiddler previews
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7897">> missing comma before skinny tiddlers in JSON store area
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7895">> handling of whitespace immediately after pragmas
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7905">> SelectWidget handling of classes and rendering typo
+
+Since v5.3.3 replaces v5.3.2 after only a couple of weeks, here is the release note for v5.3.2.
+
+! Release Note for v5.3.2
+
+{{Release 5.3.2}}
--- a/editions/tw5.com/tiddlers/releasenotes/alpha/AlphaReleases.tid
+++ b/editions/tw5.com/tiddlers/releasenotes/alpha/AlphaReleases.tid
@ -1,9 +1,9 @@
 created: 20131109105400007
-modified: 20211117225858830
+modified: 20231220113044942
 tags: Releases AlphaReleaseNotes
 title: AlphaReleases
 type: text/vnd.tiddlywiki

 Here are the details of the alpha releases of TiddlyWiki5. See [[TiddlyWiki5 Versioning]] for details of how releases are named.

-<<tabs "[tag[AlphaReleaseNotes]!sort[created]]" "Release 5.0.1-alpha" "$:/state/tab2" "tc-vertical" "ReleaseTemplate">>
+<<tabs "[tag[AlphaReleaseNotes]!sort[created]] -[<currentTiddler>]" "Release 5.0.1-alpha" "$:/state/tab2" "tc-vertical" "ReleaseTemplate">>
--- a/editions/tw5.com/tiddlers/widgets/ScrollableWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/ScrollableWidget.tid
@ -60,6 +60,16 @@ This wiki text shows how to display a list within the scrollable widget:
 Set current scroll position to 100,100
 </$button>

+<$button>
+<$action-setfield $tiddler="$:/my-scroll-position" scroll-top={{{ [{$:/my-scroll-position!!scroll-top}subtract[10]] }}}/>
+Scroll up by 10 pixels
+</$button>
+
+<$button>
+<$action-setfield $tiddler="$:/my-scroll-position" scroll-top={{{ [{$:/my-scroll-position!!scroll-top}add[10]] }}}/>
+Scroll down by 10 pixels
+</$button>
+
 <<wikitext-example-without-html "<$scrollable class='tc-scrollable-demo' bind='$:/my-scroll-position'>
 <$list filter='[tag[Reference]]'>

--- a/2
+++ b/2
@ -1,7 +1,7 @@
 TiddlyWiki created by Jeremy Ruston, (jeremy [at] jermolene [dot] com)

 Copyright (c) 2004-2007, Jeremy Ruston
-Copyright (c) 2007-2023, UnaMesa Association
+Copyright (c) 2007-2024, UnaMesa Association
 All rights reserved.

 Redistribution and use in source and binary forms, with or without
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
  "name": "tiddlywiki",
  "preferGlobal": "true",
-  "version": "5.3.3-prerelease",
+  "version": "5.3.4-prerelease",
  "author": "Jeremy Ruston <jeremy@jermolene.com>",
  "description": "a non-linear personal web notebook",
  "contributors": [
--- a/plugins/tiddlywiki/classictools/modules/recipe.js
+++ b/plugins/tiddlywiki/classictools/modules/recipe.js
@ -69,6 +69,15 @@ exports["text/vnd.tiddlywiki2-recipe"] = function(text,fields) {
 		},
 		sourcePath = fields.title; // Bit of a hack to take advantage of the default title being the path to the tiddler file
 	processRecipe(sourcePath,text);
+	// Add a $:/RecipeTiddlers tiddler with the titles of the loaded tiddlers in order
+	var titles = [];
+	$tw.utils.each(tiddlers,function(tiddler) {
+		titles.push(tiddler.title);
+	});
+	tiddlers.push({
+		title: "$:/RecipeTiddlers",
+		list: $tw.utils.stringifyList(titles)
+	});
 	return tiddlers;
 };

--- a/plugins/tiddlywiki/classictools/templates/tiddlywiki2.externaljs.template.html.tid
+++ b/plugins/tiddlywiki/classictools/templates/tiddlywiki2.externaljs.template.html.tid
@ -1,7 +1,7 @@
 title: $:/core/templates/tiddlywiki2.externaljs.template.html

-{{{ [prefix[{prejs}]] ||$:/core/templates/plain-text-tiddler-strip-comments}}}
-{{{ [prefix[{js}]] ||$:/core/templates/plain-text-tiddler-strip-comments}}}
-{{{ [prefix[{postjs}]] ||$:/core/templates/plain-text-tiddler-strip-comments}}}
-{{{ [prefix[{jsext}]] ||$:/core/templates/plain-text-tiddler-strip-comments}}}
+{{{ [list[$:/RecipeTiddlers]prefix[{prejs}]] ||$:/core/templates/plain-text-tiddler-strip-comments}}}
+{{{ [list[$:/RecipeTiddlers]prefix[{js}]] ||$:/core/templates/plain-text-tiddler-strip-comments}}}
+{{{ [list[$:/RecipeTiddlers]prefix[{postjs}]] ||$:/core/templates/plain-text-tiddler-strip-comments}}}
+{{{ [list[$:/RecipeTiddlers]prefix[{jsext}]] ||$:/core/templates/plain-text-tiddler-strip-comments}}}

--- a/plugins/tiddlywiki/classictools/templates/tiddlywiki2.template.html.tid
+++ b/plugins/tiddlywiki/classictools/templates/tiddlywiki2.template.html.tid
@ -6,35 +6,35 @@ title: $:/core/templates/tiddlywiki2.template.html
 <head>
 <script id="versionArea" type="text/javascript">
 //<![CDATA[
-{{{ [prefix[{version}]] ||$:/core/templates/plain-text-tiddler}}}
+{{{ [list[$:/RecipeTiddlers]prefix[{version}]] ||$:/core/templates/plain-text-tiddler}}}
 //]]>
 </script>
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="copyright" content="
-{{{ [prefix[{copyright}]] ||$:/core/templates/plain-text-tiddler}}}
+{{{ [list[$:/RecipeTiddlers]prefix[{copyright}]] ||$:/core/templates/plain-text-tiddler}}}
 " />
 <!--PRE-HEAD-START-->
-{{{ [prefix[{prehead}]] ||$:/core/templates/plain-text-tiddler}}}
+{{{ [list[$:/RecipeTiddlers]prefix[{prehead}]] ||$:/core/templates/plain-text-tiddler}}}
 <!--PRE-HEAD-END-->
 <title>
-{{{ [prefix[{title}]] ||$:/core/templates/plain-text-tiddler}}}
+{{{ [list[$:/RecipeTiddlers]prefix[{title}]] ||$:/core/templates/plain-text-tiddler}}}
 </title>
 <style id="styleArea" type="text/css">
-{{{ [prefix[{style}]] ||$:/core/templates/plain-text-tiddler}}}
+{{{ [list[$:/RecipeTiddlers]prefix[{style}]] ||$:/core/templates/plain-text-tiddler}}}
 </style>
 <!--POST-HEAD-START-->
-{{{ [prefix[{posthead}]] ||$:/core/templates/plain-text-tiddler}}}
+{{{ [list[$:/RecipeTiddlers]prefix[{posthead}]] ||$:/core/templates/plain-text-tiddler}}}
 <!--POST-HEAD-END-->
 </head>
 <body onload="main();" onunload="if(window.unload) unload();">
 <!--PRE-BODY-START-->
-{{{ [prefix[{prebody}]] ||$:/core/templates/plain-text-tiddler}}}
+{{{ [list[$:/RecipeTiddlers]prefix[{prebody}]] ||$:/core/templates/plain-text-tiddler}}}
 <!--PRE-BODY-END-->
 <div id="copyright">
 Welcome to TiddlyWiki created by Jeremy Ruston; Copyright &copy; 2004-2007 Jeremy Ruston, Copyright &copy; 2007-2011 UnaMesa Association
 </div>
 <noscript>
-{{{ [prefix[{noscript}]] ||$:/core/templates/plain-text-tiddler}}}
+{{{ [list[$:/RecipeTiddlers]prefix[{noscript}]] ||$:/core/templates/plain-text-tiddler}}}
 </noscript>
 <div id="saveTest"></div>
 <div id="backstageCloak"></div>
@ -46,39 +46,39 @@ Welcome to TiddlyWiki created by Jeremy Ruston; Copyright &copy; 2004-2007 Jerem
 <div id="contentWrapper"></div>
 <div id="contentStash"></div>
 <div id="shadowArea">
-{{{ [prefix[{shadow}]] +[sortcs[title]] ||$:/core/templates/html-div-tiddler-remove-prefix}}}
+{{{ [list[$:/RecipeTiddlers]prefix[{shadow}]] +[sortcs[title]] ||$:/core/templates/html-div-tiddler-remove-prefix}}}
 </div>
 <!--POST-SHADOWAREA-->
 <div id="storeArea">
-{{{ [prefix[{tiddler}]] +[sortcs[title]] ||$:/core/templates/html-div-tiddler-remove-prefix}}}
-{{{ [prefix[{plugin}]] ||$:/core/templates/plain-text-tiddler}}}
-{{{ [prefix[{posttiddlers}]] ||$:/core/templates/plain-text-tiddler}}}
+{{{ [list[$:/RecipeTiddlers]prefix[{tiddler}]] +[sortcs[title]] ||$:/core/templates/html-div-tiddler-remove-prefix}}}
+{{{ [list[$:/RecipeTiddlers]prefix[{plugin}]] ||$:/core/templates/plain-text-tiddler}}}
+{{{ [list[$:/RecipeTiddlers]prefix[{posttiddlers}]] ||$:/core/templates/plain-text-tiddler}}}
 </div>
 <!--POST-STOREAREA-->
 <!--POST-BODY-START-->
-{{{ [prefix[{postbody}]] ||$:/core/templates/plain-text-tiddler}}}
+{{{ [list[$:/RecipeTiddlers]prefix[{postbody}]] ||$:/core/templates/plain-text-tiddler}}}
 <!--POST-BODY-END-->
 <script id="jsArea" type="text/javascript">
 //<![CDATA[
-{{{ [prefix[{prejs}]] ||$:/core/templates/plain-text-tiddler-strip-comments}}}
-{{{ [prefix[{js}]] ||$:/core/templates/plain-text-tiddler-strip-comments}}}
-{{{ [prefix[{postjs}]] ||$:/core/templates/plain-text-tiddler-strip-comments}}}
+{{{ [list[$:/RecipeTiddlers]prefix[{prejs}]] ||$:/core/templates/plain-text-tiddler-strip-comments}}}
+{{{ [list[$:/RecipeTiddlers]prefix[{js}]] ||$:/core/templates/plain-text-tiddler-strip-comments}}}
+{{{ [list[$:/RecipeTiddlers]prefix[{postjs}]] ||$:/core/templates/plain-text-tiddler-strip-comments}}}
 //]]>
 </script>
-{{{ [prefix[{jsext}]] ||$:/core/templates/plain-text-tiddler-strip-comments}}}
+{{{ [list[$:/RecipeTiddlers]prefix[{jsext}]] ||$:/core/templates/plain-text-tiddler-strip-comments}}}
 <script id="jsdeprecatedArea" type="text/javascript">
 //<![CDATA[
-{{{ [prefix[{jsdeprecated}]] ||$:/core/templates/plain-text-tiddler-strip-comments}}}
+{{{ [list[$:/RecipeTiddlers]prefix[{jsdeprecated}]] ||$:/core/templates/plain-text-tiddler-strip-comments}}}
 //]]>
 </script>
 <script id="jslibArea" type="text/javascript">
 //<![CDATA[
-{{{ [prefix[{jslib}]] ||$:/core/templates/plain-text-tiddler-strip-comments}}}
+{{{ [list[$:/RecipeTiddlers]prefix[{jslib}]] ||$:/core/templates/plain-text-tiddler-strip-comments}}}
 //]]>
 </script>
 <script id="jqueryArea" type="text/javascript">
 //<![CDATA[
-{{{ [prefix[{jquery}]] ||$:/core/templates/plain-text-tiddler-strip-comments}}}
+{{{ [list[$:/RecipeTiddlers]prefix[{jquery}]] ||$:/core/templates/plain-text-tiddler-strip-comments}}}
 //]]>
 </script>
 <script type="text/javascript">
@ -88,7 +88,7 @@ if(useJavaSaver)
 //]]>
 </script>
 <!--POST-SCRIPT-START-->
-{{{ [prefix[{postscript}]] ||$:/core/templates/plain-text-tiddler}}}
+{{{ [list[$:/RecipeTiddlers]prefix[{postscript}]] ||$:/core/templates/plain-text-tiddler}}}
 <!--POST-SCRIPT-END-->
 </body>
 </html>
--- a/plugins/tiddlywiki/tiddlyweb/html-json-skinny-tiddler.tid
+++ b/plugins/tiddlywiki/tiddlyweb/html-json-skinny-tiddler.tid
@ -1,3 +1,3 @@
 title: $:/core/templates/html-json-skinny-tiddler

-<$jsontiddler tiddler=<<currentTiddler>> exclude="text" escapeUnsafeScriptChars="yes" $revision=<<changecount>> $bag="default" $_is_skinny=""/>
+<$text text=<<join>>/><$jsontiddler tiddler=<<currentTiddler>> exclude="text" escapeUnsafeScriptChars="yes" $revision=<<changecount>> $bag="default" $_is_skinny=""/>
--- a/readme.md
+++ b/readme.md
@ -1,7 +1,7 @@
 <p>Welcome to <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a>, a non-linear personal web notebook that anyone can use and keep forever, independently of any corporation.</p><p><a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> is a complete interactive wiki in <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/JavaScript.html">JavaScript</a>. It can be used as a single HTML file in the browser or as a powerful Node.js application. It is highly customisable: the entire user interface is itself implemented in hackable <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/WikiText.html">WikiText</a>.</p><p>Learn more and see it in action at <a class="tc-tiddlylink-external" href="https://tiddlywiki.com/" rel="noopener noreferrer" target="_blank">https://tiddlywiki.com/</a></p><p>Developer documentation is in progress at <a class="tc-tiddlylink-external" href="https://tiddlywiki.com/dev/" rel="noopener noreferrer" target="_blank">https://tiddlywiki.com/dev/</a></p><h1 class="">Join the Community</h1><p>
 <h2 class="">Official Forums</h2><p>The new official forum for talking about TiddlyWiki: requests for help, announcements of new releases and plugins, debating new features, or just sharing experiences. You can participate via the associated website, or subscribe via email.</p><p><a class="tc-tiddlylink-external" href="https://talk.tiddlywiki.org/" rel="noopener noreferrer" target="_blank">https://talk.tiddlywiki.org/</a></p><p>Note that talk.tiddlywiki.org is a community run service that we host and maintain ourselves. The modest running costs are covered by community contributions.</p><p>For the convenience of existing users, we also continue to operate the original TiddlyWiki group (hosted on Google Groups since 2005):</p><p><a class="tc-tiddlylink-external" href="https://groups.google.com/group/TiddlyWiki" rel="noopener noreferrer" target="_blank">https://groups.google.com/group/TiddlyWiki</a></p><h2 class="">Developer Forums</h2><p>There are several resources for developers to learn more about <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> and to discuss and contribute to its development.</p><ul><li><a class="tc-tiddlylink-external" href="https://tiddlywiki.com/dev" rel="noopener noreferrer" target="_blank">tiddlywiki.com/dev</a> is the official developer documentation</li><li>Get involved in the <a class="tc-tiddlylink-external" href="https://github.com/Jermolene/TiddlyWiki5" rel="noopener noreferrer" target="_blank">development on GitHub</a><ul><li><a class="tc-tiddlylink-external" href="https://github.com/Jermolene/TiddlyWiki5/discussions" rel="noopener noreferrer" target="_blank">Discussions</a> are for Q&amp;A and open-ended discussion</li><li><a class="tc-tiddlylink-external" href="https://github.com/Jermolene/TiddlyWiki5/issues" rel="noopener noreferrer" target="_blank">Issues</a> are for raising bug reports and proposing specific, actionable new ideas</li></ul></li><li>The older TiddlyWikiDev Google Group is now closed in favour of <a class="tc-tiddlylink-external" href="https://github.com/Jermolene/TiddlyWiki5/discussions" rel="noopener noreferrer" target="_blank">GitHub Discussions</a> but remains a useful archive: <a class="tc-tiddlylink-external" href="https://groups.google.com/group/TiddlyWikiDev" rel="noopener noreferrer" target="_blank">https://groups.google.com/group/TiddlyWikiDev</a><ul><li>An enhanced group search facility is available on <a class="tc-tiddlylink-external" href="https://www.mail-archive.com/tiddlywikidev@googlegroups.com/" rel="noopener noreferrer" target="_blank">mail-archive.com</a></li></ul></li><li>Follow <a class="tc-tiddlylink-external" href="http://twitter.com/#!/TiddlyWiki" rel="noopener noreferrer" target="_blank">@TiddlyWiki on Twitter</a> for the latest news</li><li>Chat at <a class="tc-tiddlylink-external" href="https://gitter.im/TiddlyWiki/public" rel="noopener noreferrer" target="_blank">https://gitter.im/TiddlyWiki/public</a> (development room coming soon)</li></ul><h2 class="">Other Forums</h2><ul><li><a class="tc-tiddlylink-external" href="https://www.reddit.com/r/TiddlyWiki5/" rel="noopener noreferrer" target="_blank">TiddlyWiki Subreddit</a></li><li>Chat with Gitter at <a class="tc-tiddlylink-external" href="https://gitter.im/TiddlyWiki/public" rel="noopener noreferrer" target="_blank">https://gitter.im/TiddlyWiki/public</a> !</li><li>Chat on Discord at <a class="tc-tiddlylink-external" href="https://discord.gg/HFFZVQ8" rel="noopener noreferrer" target="_blank">https://discord.gg/HFFZVQ8</a></li></ul><h3 class="">Documentation</h3><p>There is also a discussion group specifically for discussing <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> documentation improvement initiatives: <a class="tc-tiddlylink-external" href="https://groups.google.com/group/tiddlywikidocs" rel="noopener noreferrer" target="_blank">https://groups.google.com/group/tiddlywikidocs</a>
 </p>
-</p><h1 class="">Installing <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> on Node.js</h1><ol><li>Install <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/Node.js.html">Node.js</a><ul><li>Linux: <blockquote><div><em>Debian/Ubuntu</em>:<br><code>apt install nodejs</code><br>May need to be followed up by:<br><code>apt install npm</code></div><div><em>Arch Linux</em><br><code>yay -S tiddlywiki</code> <br>(installs node and tiddlywiki)</div></blockquote></li><li>Mac<blockquote><div><code>brew install node</code></div></blockquote></li><li>Android<blockquote><div><a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/Serving%2520TW5%2520from%2520Android.html">Termux for Android</a></div></blockquote></li><li>Other <blockquote><div>See <a class="tc-tiddlylink-external" href="http://nodejs.org" rel="noopener noreferrer" target="_blank">http://nodejs.org</a></div></blockquote></li></ul></li><li>Open a command line terminal and type:<blockquote><div><code>npm install -g tiddlywiki</code></div><div>If it fails with an error you may need to re-run the command as an administrator:</div><div><code>sudo npm install -g tiddlywiki</code> (Mac/Linux)</div></blockquote></li><li>Ensure TiddlyWiki is installed by typing:<blockquote><div><code>tiddlywiki --version</code></div></blockquote><ul><li>In response, you should see <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> report its current version (eg "5.3.2". You may also see other debugging information reported.)</li></ul></li><li>Try it out:<ol><li><code>tiddlywiki mynewwiki --init server</code> to create a folder for a new wiki that includes server-related components</li><li><code>tiddlywiki mynewwiki --listen</code> to start <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a></li><li>Visit <a class="tc-tiddlylink-external" href="http://127.0.0.1:8080/" rel="noopener noreferrer" target="_blank">http://127.0.0.1:8080/</a> in your browser</li><li>Try editing and creating tiddlers</li></ol></li><li>Optionally, make an offline copy:<ul><li>click the <span class="doc-icon"><svg class="tc-image-save-button-dynamic tc-image-button" height="22pt" viewBox="0 0 128 128" width="22pt">
+</p><h1 class="">Installing <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> on Node.js</h1><ol><li>Install <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/Node.js.html">Node.js</a><ul><li>Linux: <blockquote><div><em>Debian/Ubuntu</em>:<br><code>apt install nodejs</code><br>May need to be followed up by:<br><code>apt install npm</code></div><div><em>Arch Linux</em><br><code>yay -S tiddlywiki</code> <br>(installs node and tiddlywiki)</div></blockquote></li><li>Mac<blockquote><div><code>brew install node</code></div></blockquote></li><li>Android<blockquote><div><a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/Serving%2520TW5%2520from%2520Android.html">Termux for Android</a></div></blockquote></li><li>Other <blockquote><div>See <a class="tc-tiddlylink-external" href="http://nodejs.org" rel="noopener noreferrer" target="_blank">http://nodejs.org</a></div></blockquote></li></ul></li><li>Open a command line terminal and type:<blockquote><div><code>npm install -g tiddlywiki</code></div><div>If it fails with an error you may need to re-run the command as an administrator:</div><div><code>sudo npm install -g tiddlywiki</code> (Mac/Linux)</div></blockquote></li><li>Ensure TiddlyWiki is installed by typing:<blockquote><div><code>tiddlywiki --version</code></div></blockquote><ul><li>In response, you should see <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> report its current version (eg "5.3.3". You may also see other debugging information reported.)</li></ul></li><li>Try it out:<ol><li><code>tiddlywiki mynewwiki --init server</code> to create a folder for a new wiki that includes server-related components</li><li><code>tiddlywiki mynewwiki --listen</code> to start <a class="tc-tiddlylink tc-tiddlylink-resolves" href="https://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a></li><li>Visit <a class="tc-tiddlylink-external" href="http://127.0.0.1:8080/" rel="noopener noreferrer" target="_blank">http://127.0.0.1:8080/</a> in your browser</li><li>Try editing and creating tiddlers</li></ol></li><li>Optionally, make an offline copy:<ul><li>click the <span class="doc-icon"><svg class="tc-image-save-button-dynamic tc-image-button" height="22pt" viewBox="0 0 128 128" width="22pt">
 <g class="tc-image-save-button-dynamic-clean">
 <path d="M120.783 34.33c4.641 8.862 7.266 18.948 7.266 29.646 0 35.347-28.653 64-64 64-35.346 0-64-28.653-64-64 0-35.346 28.654-64 64-64 18.808 0 35.72 8.113 47.43 21.03l2.68-2.68c3.13-3.13 8.197-3.132 11.321-.008 3.118 3.118 3.121 8.193-.007 11.32l-4.69 4.691zm-12.058 12.058a47.876 47.876 0 013.324 17.588c0 26.51-21.49 48-48 48s-48-21.49-48-48 21.49-48 48-48c14.39 0 27.3 6.332 36.098 16.362L58.941 73.544 41.976 56.578c-3.127-3.127-8.201-3.123-11.32-.005-3.123 3.124-3.119 8.194.006 11.319l22.617 22.617a7.992 7.992 0 005.659 2.347c2.05 0 4.101-.783 5.667-2.349l44.12-44.12z" fill-rule="evenodd"></path>
 </g>