Revert "Migrate some old macros to new syntax (#8768)"

This reverts commit 2801eee905.

.github/workflows/pr-check-build-size.yml

@@ -5,8 +5,8 @@ on:
     paths:
       - 'boot/**'
       - 'core/**'
-      - 'themes/snowwhite/**'
-      - 'themes/vanilla/**'
+      - 'themes/tiddlywiki/snowwhite/**'
+      - 'themes/tiddlywiki/vanilla/**'
 
 jobs:
   calculate-build-size:

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.7
+    TW5_BUILD_VERSION=v5.3.8
 fi
 
 echo "Using TW5_BUILD_VERSION as [$TW5_BUILD_VERSION]"

core/wiki/config/OfficialPluginLibrary.tid

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

core/wiki/macros/colour-picker.tid

@@ -1,55 +1,58 @@
 title: $:/core/macros/colour-picker
 tags: $:/tags/Macro
 
-\procedure colour-picker-update-recent()
+\define colour-picker-update-recent()
 <$action-listops
 	$tiddler="$:/config/ColourPicker/Recent"
-	$subfilter="[<colour-picker-value>] [list[$:/config/ColourPicker/Recent]remove<colour-picker-value>] +[limit[8]]"
+	$subfilter="$(colour-picker-value)$ [list[$:/config/ColourPicker/Recent]remove[$(colour-picker-value)$]] +[limit[8]]"
 />
 \end
 
-\procedure colour-picker-inner(actions)
-<$button tag="a" tooltip=<<colour-picker-value>>>
-<<colour-picker-update-recent>>
-<$transclude $variable="actions"/>
-<span style.display="inline-block" style.backgroundColor=<<colour-picker-value>> style.width="100%" style.height="100%" style.borderRadius="50%"/>
+\define colour-picker-inner(actions)
+<$button tag="a" tooltip="""$(colour-picker-value)$""">
+$(colour-picker-update-recent)$
+<$transclude $variable="__actions__"/>
+
+<span style="display:inline-block; background-color: $(colour-picker-value)$; width: 100%; height: 100%; border-radius: 50%;"/>
+
 </$button>
 \end
 
+\define colour-picker-recent-inner(actions)
 \whitespace trim
-\procedure colour-picker-recent-inner(actions)
-<$set name="colour-picker-value" value=<<recentColour>>>
-<$transclude $variable="colour-picker-inner" actions=<<actions>>/>
+<$set name="colour-picker-value" value="$(recentColour)$">
+<$macrocall $name="colour-picker-inner" actions=<<__actions__>>/>
 </$set>
 \end
 
-\procedure colour-picker-recent(actions)
+\define colour-picker-recent(actions)
+\whitespace trim
 {{$:/language/ColourPicker/Recent}}<$list filter="[list[$:/config/ColourPicker/Recent]]" variable="recentColour">
 &#32;
-<$transclude $variable="colour-picker-recent-inner" actions=<<actions>>/>
+<$macrocall $name="colour-picker-recent-inner" actions=<<__actions__>>/>
 </$list>
 \end
 
-\procedure colour-picker(actions)
+\define colour-picker(actions)
+\whitespace trim
 <div class="tc-colour-chooser">
 
-<$transclude $variable="colour-picker-recent" actions=<<actions>>/>
+<$macrocall $name="colour-picker-recent" actions=<<__actions__>>/>
 
 ---
 
 <$list filter="LightPink Pink Crimson LavenderBlush PaleVioletRed HotPink DeepPink MediumVioletRed Orchid Thistle Plum Violet Magenta Fuchsia DarkMagenta Purple MediumOrchid DarkViolet DarkOrchid Indigo BlueViolet MediumPurple MediumSlateBlue SlateBlue DarkSlateBlue Lavender GhostWhite Blue MediumBlue MidnightBlue DarkBlue Navy RoyalBlue CornflowerBlue LightSteelBlue LightSlateGrey SlateGrey DodgerBlue AliceBlue SteelBlue LightSkyBlue SkyBlue DeepSkyBlue LightBlue PowderBlue CadetBlue Azure LightCyan PaleTurquoise Cyan Aqua DarkTurquoise DarkSlateGrey DarkCyan Teal MediumTurquoise LightSeaGreen Turquoise Aquamarine MediumAquamarine MediumSpringGreen MintCream SpringGreen MediumSeaGreen SeaGreen Honeydew LightGreen PaleGreen DarkSeaGreen LimeGreen Lime ForestGreen Green DarkGreen Chartreuse LawnGreen GreenYellow DarkOliveGreen YellowGreen OliveDrab Beige LightGoldenrodYellow Ivory LightYellow Yellow Olive DarkKhaki LemonChiffon PaleGoldenrod Khaki Gold Cornsilk Goldenrod DarkGoldenrod FloralWhite OldLace Wheat Moccasin Orange PapayaWhip BlanchedAlmond NavajoWhite AntiqueWhite Tan BurlyWood Bisque DarkOrange Linen Peru PeachPuff SandyBrown Chocolate SaddleBrown Seashell Sienna LightSalmon Coral OrangeRed DarkSalmon Tomato MistyRose Salmon Snow LightCoral RosyBrown IndianRed Red Brown FireBrick DarkRed Maroon White WhiteSmoke Gainsboro LightGrey Silver DarkGrey Grey DimGrey Black" variable="colour-picker-value">
 &#32;
-<$transclude $variable="colour-picker-inner" actions=<<actions>>/>
+<$macrocall $name="colour-picker-inner" actions=<<__actions__>>/>
 </$list>
 
 ---
 
-<$edit-text tiddler="$:/config/ColourPicker/New" tag="input" default="" placeholder="" class="tc-tiny-gap-right"/>
+<$edit-text tiddler="$:/config/ColourPicker/New" tag="input" default="" placeholder=""/>
+&#32;
 <$edit-text tiddler="$:/config/ColourPicker/New" type="color" tag="input"/>
 <$set name="colour-picker-value" value={{$:/config/ColourPicker/New}}>
-<%if [{$:/config/ColourPicker/New}!is[blank]] %>
-<$transclude $variable="colour-picker-inner" actions=<<actions>>/>
-<%endif%>
+<$macrocall $name="colour-picker-inner" actions=<<__actions__>>/>
 </$set>
 
 </div>

core/wiki/macros/dumpvariables.tid

@@ -1,7 +1,7 @@
 title: $:/core/macros/dumpvariables
 tags: $:/tags/Macro
 
-\procedure dumpvariables()
+\define dumpvariables()
 \whitespace trim
 <ul>
 <$list filter="[variables[]]" variable="varname">

core/wiki/macros/image-picker.tid

@@ -1,36 +1,39 @@
+created: 20170715180840889
+modified: 20170715180914005
 tags: $:/tags/Macro
 title: $:/core/macros/image-picker
 type: text/vnd.tiddlywiki
 
-\procedure image-picker-thumbnail(actions)
-<$button tag="a" tooltip=<<imageTitle>>><$transclude $variable="actions"/><$transclude tiddler=<<imageTitle>>/></$button>
+\define image-picker-thumbnail(actions)
+<$button tag="a" tooltip="""$(imageTitle)$"""><$transclude $variable="__actions__"/><$transclude tiddler=<<imageTitle>>/></$button>
 \end
 
-\procedure image-picker-list(filter,actions)
+\define image-picker-list(filter,actions)
 \whitespace trim
-<$list filter=<<filter>> variable="imageTitle">
-<$transclude $variable="image-picker-thumbnail" actions=<<actions>>/>
+<$list filter="""$filter$""" variable="imageTitle">
+<$macrocall $name="image-picker-thumbnail" actions=<<__actions__>>/>
 &#32;
 </$list>
 \end
 
-\procedure image-picker(actions,filter:"[all[shadows+tiddlers]is[image]] -[type[application/pdf]] +[!has[draft.of]$subfilter$sort[title]]",subfilter:"")
+\define image-picker(actions,filter:"[all[shadows+tiddlers]is[image]] -[type[application/pdf]] +[!has[draft.of]$subfilter$sort[title]]",subfilter:"")
 \whitespace trim
 <div class="tc-image-chooser">
-<$let state-system=<<qualify "$:/state/image-picker/system">> tv-filter={{{ [<filter>search-replace[$subfilter$],<subfilter>] }}}>
+<$vars state-system=<<qualify "$:/state/image-picker/system">>>
 <$checkbox tiddler=<<state-system>> field="text" checked="show" unchecked="hide" default="hide">
-<span class="tc-tiny-gap-left">{{$:/language/SystemTiddlers/Include/Prompt}}</span>
+&#32;
+{{$:/language/SystemTiddlers/Include/Prompt}}
 </$checkbox>
 <$reveal state=<<state-system>> type="match" text="hide" default="hide" tag="div">
-<$transclude $variable="image-picker-list" filter=`$(tv-filter)$ +[!is[system]]` actions=<<actions>>/>
+<$macrocall $name="image-picker-list" filter="""$filter$ +[!is[system]]""" actions=<<__actions__>>/>
 </$reveal>
 <$reveal state=<<state-system>> type="nomatch" text="hide" default="hide" tag="div">
-<$transclude $variable="image-picker-list" filter=<<tv-filter>> actions=<<actions>>/>
+<$macrocall $name="image-picker-list" filter="""$filter$""" actions=<<__actions__>>/>
 </$reveal>
-</$let>
+</$vars>
 </div>
 \end
 
-\procedure image-picker-include-tagged-images(actions)
-<$transclude $variable="image-picker" filter="[all[shadows+tiddlers]is[image]] [all[shadows+tiddlers]tag[$:/tags/Image]] -[type[application/pdf]] +[!has[draft.of]sort[title]]" actions=<<actions>>/>
+\define image-picker-include-tagged-images(actions)
+<$macrocall $name="image-picker" filter="[all[shadows+tiddlers]is[image]] [all[shadows+tiddlers]tag[$:/tags/Image]] -[type[application/pdf]] +[!has[draft.of]sort[title]]" actions=<<__actions__>>/>
 \end

core/wiki/macros/list.tid

@@ -1,18 +1,14 @@
 title: $:/core/macros/list
 tags: $:/tags/Macro
 
-\procedure list-links-draggable-drop-actions()
-<$action-listops $tiddler=<<targetTiddler>> $field=<<targetField>> $subfilter="+[insertbefore<actionTiddler>,<currentTiddler>]"/>
-\end
-
+\define list-links(filter,type:"ul",subtype:"li",class:"",emptyMessage,field:"caption")
 \whitespace trim
-\procedure list-links(filter,type:"ul",subtype:"li",class:"",emptyMessage,field:"caption")
-<$genesis $type=<<type>> class=<<class>>>
-	<$list filter=<<filter>> emptyMessage=<<emptyMessage>>>
-		<$genesis $type=<<subtype>>>
+<$genesis $type=<<__type__>> class=<<__class__>>>
+	<$list filter=<<__filter__>> emptyMessage=<<__emptyMessage__>>>
+		<$genesis $type=<<__subtype__>>>
 			<$link to={{!!title}}>
 				<$let tv-wikilinks="no">
-					<$transclude field=<<field>>>
+					<$transclude field=<<__field__>>>
 						<$view field="title"/>
 					</$transclude>
 				</$let>
@@ -22,19 +18,24 @@ tags: $:/tags/Macro
 </$genesis>
 \end
 
-\procedure list-links-draggable(tiddler,field:"list",emptyMessage,type:"ul",subtype:"li",class:"",itemTemplate)
+\define list-links-draggable-drop-actions()
+<$action-listops $tiddler=<<targetTiddler>> $field=<<targetField>> $subfilter="+[insertbefore<actionTiddler>,<currentTiddler>]"/>
+\end
+
+\define list-links-draggable(tiddler,field:"list",emptyMessage,type:"ul",subtype:"li",class:"",itemTemplate)
+\whitespace trim
 <span class="tc-links-draggable-list">
-	<$let targetTiddler=<<tiddler>> targetField=<<field>>>
-		<$genesis $type=<<type>> class=<<class>>>
-			<$list filter="[<tiddler>get<field>enlist-input[]]" emptyMessage=<<emptyMessage>>>
+	<$vars targetTiddler="""$tiddler$""" targetField="""$field$""">
+		<$genesis $type=<<__type__>> class="$class$">
+			<$list filter="[list[$tiddler$!!$field$]]" emptyMessage=<<__emptyMessage__>>>
 				<$droppable
 					actions=<<list-links-draggable-drop-actions>>
-					tag=<<subtype>>
+					tag="""$subtype$"""
 					enable=<<tv-enable-drag-and-drop>>
 				>
 					<div class="tc-droppable-placeholder"/>
 					<div>
-						<$transclude tiddler=<<itemTemplate>>>
+						<$transclude tiddler="""$itemTemplate$""">
 							<$link to={{!!title}}>
 								<$let tv-wikilinks="no">
 									<$transclude field="caption">
@@ -59,48 +60,50 @@ tags: $:/tags/Macro
 				</$droppable>
 			</$tiddler>
 		</$genesis>
-	</$let>
+	</$vars>
 </span>
 \end
 
-\procedure list-tagged-draggable-drop-actions(tag)
+\define list-tagged-draggable-drop-actions(tag)
+\whitespace trim
 <!-- Save the current ordering of the tiddlers with this tag -->
-<$set name="order" filter="[<tag>tagging[]]">
+<$set name="order" filter="[<__tag__>tagging[]]">
 	<!-- Remove any list-after or list-before fields from the tiddlers with this tag -->
-	<$list filter="[<tag>tagging[]]">
+	<$list filter="[<__tag__>tagging[]]">
 		<$action-deletefield $field="list-before"/>
 		<$action-deletefield $field="list-after"/>
 	</$list>
 	<!-- Save the new order to the Tag Tiddler -->
-	<$action-listops $tiddler=<<tag>> $field="list" $filter="+[enlist<order>] +[insertbefore<actionTiddler>,<currentTiddler>]"/>
+	<$action-listops $tiddler=<<__tag__>> $field="list" $filter="+[enlist<order>] +[insertbefore<actionTiddler>,<currentTiddler>]"/>
 	<!-- Make sure the newly added item has the right tag -->
 	<!-- Removing this line makes dragging tags within the dropdown work as intended -->
-	<!--<$action-listops $tiddler=<<actionTiddler>> $tags=<<tag>>/>-->
+	<!--<$action-listops $tiddler=<<actionTiddler>> $tags=<<__tag__>>/>-->
 	<!-- Using the following 5 lines as replacement makes dragging titles from outside into the dropdown apply the tag -->
-	<$list filter="[<actionTiddler>!contains:tags<tag>]">
+	<$list filter="[<actionTiddler>!contains:tags<__tag__>]">
 		<$fieldmangler tiddler=<<actionTiddler>>>
-			<$action-sendmessage $message="tm-add-tag" $param=<<tag>>/>
+			<$action-sendmessage $message="tm-add-tag" $param=<<__tag__>>/>
 		</$fieldmangler>
 	</$list>
 </$set>
 \end
 
-\procedure list-tagged-draggable(tag,subFilter,emptyMessage,itemTemplate,elementTag:"div",storyview:"")
+\define list-tagged-draggable(tag,subFilter,emptyMessage,itemTemplate,elementTag:"div",storyview:"")
+\whitespace trim
 <span class="tc-tagged-draggable-list">
-	<$set name="tag" value=<<tag>>>
+	<$set name="tag" value=<<__tag__>>>
 		<$list
-			filter=`[<tag>tagging[]$(subFilter)$]`
-			emptyMessage=<<emptyMessage>>
-			storyview=<<storyview>>
+			filter="[<__tag__>tagging[]$subFilter$]"
+			emptyMessage=<<__emptyMessage__>>
+			storyview=<<__storyview__>>
 		>
-			<$genesis $type=<<elementTag>> class="tc-menu-list-item">
+			<$genesis $type=<<__elementTag__>> class="tc-menu-list-item">
 				<$droppable
-					actions="""<$macrocall $name="list-tagged-draggable-drop-actions" tag=<<tag>>/>"""
+					actions="""<$macrocall $name="list-tagged-draggable-drop-actions" tag=<<__tag__>>/>"""
 					enable=<<tv-enable-drag-and-drop>>
 				>
-					<$genesis $type=<<elementTag>> class="tc-droppable-placeholder"/>
-					<$genesis $type=<<elementTag>>>
-						<$transclude tiddler=<<itemTemplate>>>
+					<$genesis $type=<<__elementTag__>> class="tc-droppable-placeholder"/>
+					<$genesis $type=<<__elementTag__>>>
+						<$transclude tiddler="""$itemTemplate$""">
 							<$link to={{!!title}}>
 								<$let tv-wikilinks="no">
 									<$transclude field="caption">
@@ -115,11 +118,11 @@ tags: $:/tags/Macro
 		</$list>
 		<$tiddler tiddler="">
 			<$droppable
-				actions="""<$macrocall $name="list-tagged-draggable-drop-actions" tag=<<tag>>/>"""
+				actions="""<$macrocall $name="list-tagged-draggable-drop-actions" tag=<<__tag__>>/>"""
 				enable=<<tv-enable-drag-and-drop>>
 			>
-				<$genesis $type=<<elementTag>> class="tc-droppable-placeholder"/>
-				<$genesis $type=<<elementTag>> style="height:0.5em;"/>
+				<$genesis $type=<<__elementTag__>> class="tc-droppable-placeholder"/>
+				<$genesis $type=<<__elementTag__>> style="height:0.5em;"/>
 			</$droppable>
 		</$tiddler>
 	</$set>

core/wiki/macros/translink.tid

@@ -1,28 +1,28 @@
 title: $:/core/macros/translink
 tags: $:/tags/Macro
 
-\procedure translink(title,mode:"block")
+\define translink(title,mode:"block")
 \whitespace trim
-<%if [<mode>match[block]] %>
+<$list filter="[<__mode__>match[block]]">
 <div class="tc-translink">
 <div>
-<$link to=<<title>>>
-<h1><$text text=<<title>>/></h1>
+<$link to="""$title$""">
+<h1><$text text="""$title$"""/></h1>
 </$link>
-<$transclude tiddler=<<title>> mode="block">
-<$set name="currentTiddler" value=<<title>>><$transclude tiddler="$:/language/MissingTiddler/Hint"/></$set>
+<$transclude tiddler="""$title$""" mode="block">
+<$set name="currentTiddler" value="""$title$"""><$transclude tiddler="$:/language/MissingTiddler/Hint"/></$set>
 </$transclude>
 </div>
 </div>
-<%endif%>
-<%if [<mode>match[inline]] %>
+</$list>
+<$list filter="[<__mode__>match[inline]]">
 <span class="tc-translink">
-<$link to=<<title>> class="tc-tiny-gap-right">
-<$text text=<<title>>/>
+<$link to="""$title$""">
+<$text text="""$title$"""/>
 </$link>
-(<$transclude tiddler=<<title>> mode="inline">
-<$set name="currentTiddler" value=<<title>>><$transclude tiddler="$:/language/MissingTiddler/Hint"/></$set>
+&#32;(<$transclude tiddler="""$title$""" mode="inline">
+<$set name="currentTiddler" value="""$title$"""><$transclude tiddler="$:/language/MissingTiddler/Hint"/></$set>
 </$transclude>)
 </span>
-<%endif%>
+</$list>
 \end

core/wiki/macros/tree.tid

@@ -1,58 +1,62 @@
 title: $:/core/macros/tree
 tags: $:/tags/Macro
 
-\procedure leaf-link(full-title,chunk,separator: "/")
-<$link to=<<full-title>>><$text text=<<chunk>>/></$link>
+\define leaf-link(full-title,chunk,separator: "/")
+<$link to=<<__full-title__>>><$text text=<<__chunk__>>/></$link>
 \end
 
+\define leaf-node(prefix,chunk)
 \whitespace trim
-\procedure leaf-node(prefix,chunk)
 <li>
-<$list filter="[<prefix>addsuffix<chunk>is[shadow]] [<prefix>addsuffix<chunk>is[tiddler]]" variable="full-title">
-<$list filter="[<full-title>removeprefix<prefix>]" variable="chunk">
-<span class="tc-tiny-gap-right">{{$:/core/images/file}}</span><$transclude $variable="leaf-link" full-title=<<full-title>> chunk=<<chunk>>/>
+<$list filter="[<__prefix__>addsuffix<__chunk__>is[shadow]] [<__prefix__>addsuffix<__chunk__>is[tiddler]]" variable="full-title">
+<$list filter="[<full-title>removeprefix<__prefix__>]" variable="chunk">
+<span>{{$:/core/images/file}}</span>&#32;<$macrocall $name="leaf-link" full-title=<<full-title>> chunk=<<chunk>>/>
 </$list>
 </$list>
 </li>
 \end
 
-\procedure branch-node(prefix,chunk,separator: "/")
+\define branch-node(prefix,chunk,separator: "/")
+\whitespace trim
 <li>
-<$set name="reveal-state" value={{{ [[$:/state/tree/]addsuffix<prefix>addsuffix<chunk>] }}}>
+<$set name="reveal-state" value={{{ [[$:/state/tree/]addsuffix<__prefix__>addsuffix<__chunk__>] }}}>
 <$reveal type="nomatch" stateTitle=<<reveal-state>> text="show">
 <$button setTitle=<<reveal-state>> setTo="show" class="tc-btn-invisible">
-{{$:/core/images/folder}}&#32;<$text text=<<chunk>>/>
+{{$:/core/images/folder}}&#32;<$text text=<<__chunk__>>/>
 </$button>
 </$reveal>
 <$reveal type="match" stateTitle=<<reveal-state>> text="show">
 <$button setTitle=<<reveal-state>> setTo="hide" class="tc-btn-invisible">
-{{$:/core/images/folder}}&#32;<$text text=<<chunk>>/>
+{{$:/core/images/folder}}&#32;<$text text=<<__chunk__>>/>
 </$button>
 </$reveal>
-<span class="tc-tiny-gap-left">(<$count filter="[all[shadows+tiddlers]removeprefix<prefix>removeprefix<chunk>] -[<prefix>addsuffix<chunk>]"/>)</span>
+&#32;
+<span>(<$count filter="[all[shadows+tiddlers]removeprefix<__prefix__>removeprefix<__chunk__>] -[<__prefix__>addsuffix<__chunk__>]"/>)</span>
 <$reveal type="match" stateTitle=<<reveal-state>> text="show">
-<$transclude $variable="tree-node" prefix={{{ [<prefix>addsuffix<chunk>] }}} separator=<<separator>>/>
+<$macrocall $name="tree-node" prefix={{{ [<__prefix__>addsuffix<__chunk__>] }}} separator=<<__separator__>>/>
 </$reveal>
 </$set>
 </li>
 \end
 
-\procedure tree-node(prefix,separator: "/")
+\define tree-node(prefix,separator: "/")
+\whitespace trim
 <ol>
-<$list filter="[all[shadows+tiddlers]removeprefix<prefix>splitbefore<separator>sort[]!suffix<separator>]" variable="chunk">
-<$transclude $variable="leaf-node" prefix=<<prefix>> chunk=<<chunk>> separator=<<separator>>/>
+<$list filter="[all[shadows+tiddlers]removeprefix<__prefix__>splitbefore<__separator__>sort[]!suffix<__separator__>]" variable="chunk">
+<$macrocall $name="leaf-node" prefix=<<__prefix__>> chunk=<<chunk>> separator=<<__separator__>>/>
 </$list>
-<$list filter="[all[shadows+tiddlers]removeprefix<prefix>splitbefore<separator>sort[]suffix<separator>]" variable="chunk">
-<$transclude $variable="branch-node" prefix=<<prefix>> chunk=<<chunk>> separator=<<separator>>/>
+<$list filter="[all[shadows+tiddlers]removeprefix<__prefix__>splitbefore<__separator__>sort[]suffix<__separator__>]" variable="chunk">
+<$macrocall $name="branch-node" prefix=<<__prefix__>> chunk=<<chunk>> separator=<<__separator__>>/>
 </$list>
 </ol>
 \end
 
-\procedure tree(prefix: "$:/",separator: "/")
+\define tree(prefix: "$:/",separator: "/")
+\whitespace trim
 <div class="tc-tree">
-<span><$text text=<<prefix>>/></span>
+<span><$text text=<<__prefix__>>/></span>
 <div>
-<$transclude $variable="tree-node" prefix=<<prefix>> separator=<<separator>>/>
+<$macrocall $name="tree-node" prefix=<<__prefix__>> separator=<<__separator__>>/>
 </div>
 </div>
 \end

editions/dev/tiddlers/build/Releasing a new version of TiddlyWiki.tid

@@ -1,5 +1,5 @@
 created: 20190809095728085
-modified: 20190809123445125
+modified: 20250707151538845
 title: Releasing a new version of TiddlyWiki
 type: text/vnd.tiddlywiki
 
@@ -15,32 +15,35 @@ type: text/vnd.tiddlywiki
 # Adjust the modified time of HelloThere
 # Make sure ''master'' is fully committed
 
-!! Update Readmes
+!! Update Readmes and release note
 
 # Edit `package.json` to the new version number
 # Run `./bin/readme-bld.sh` to build the readme files
 # Commit the new readme files to ''master''
 # Restore `package.json` to the previous version number
+# Adjust the link for "GitHub for detailed change history of this release" in the release note
+# Add the credits for the new release banner to the release note, including a link to the GitHub instance of the image from the commit history
 
 !! Make New Release
 
-# Run `./bin/verbump "5.1.3"` (substituting the correct version number) to update the version number, assign it a tag 
+# Run `./bin/verbump "5.1.3"` (substituting the correct version number) to update the version number and assign it a tag 
 # Run `./bin/npm-publish.sh` to publish the release to npm
 # Verify that the new release of TiddlyWiki is available at https://www.npmjs.org/package/tiddlywiki
 
 !! Update tiddlywiki.com release
 
 # Update ''tiddlywiki-com'' from ''master'' and push to ~GitHub
+# Wait until https://tiddlywiki.com is updated with the new release
 
-!! Cleaning Up
+!! Announcements
 
-# Tweet the release with the text "TiddlyWiki v5.x.x released to https://tiddlywiki.com #newtiddlywikirelease"
+# Announce the new release on [[TalkTW|https://talk.tiddlywiki.org]]
 
 !! Preparation for the next release in ''master''
 
 # Adjust version number in `package.json`
 # Adjust version number in `bin/build-site.sh`
 # Adjust version number in [[$:/config/OfficialPluginLibrary]] (both in `editions/tw5.com` and `editions/prerelease/tiddlers/system`) and [[$:/config/LocalPluginLibrary]]
-# Adjust new release banner
+# Create temporary new release banner
 # Create the release note for the new release
 # Commit changes to ''master'' and push to ~GitHub

editions/prerelease/tiddlers/Release 5.3.8.tid

@@ -0,0 +1,62 @@
+caption: 5.3.8
+created: 20250717140646135
+modified: 20250717140646135
+tags: ReleaseNotes
+title: Release 5.3.8
+type: text/vnd.tiddlywiki
+description: Under development
+
+//[[See GitHub for detailed change history of this release|https://github.com/TiddlyWiki/TiddlyWiki5/compare/v5.3.7...master]]//
+
+
+
+! New Features
+
+-
+
+! Translation improvements
+
+* Chinese
+
+! Plugin Improvements
+
+* 
+
+! Widget Improvements
+
+* 
+
+! Usability Improvements
+
+*
+
+! Palette Improvements
+
+*
+
+! Hackability Improvements
+
+*
+
+! Bug Fixes
+
+* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/commit/93d30f374da4a6b2037b335f7f7d4eddce8192db">> display of field names longer than the available width in the info panel
+
+! Node.js Improvements
+
+* 
+
+! Performance Improvements
+
+* 
+
+! Developer Improvements
+
+* 
+
+! 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 """
+""">>

editions/prerelease/tiddlers/system/PrereleaseOfficialPluginLibrary.tid

@@ -1,6 +1,6 @@
 title: $:/config/OfficialPluginLibrary
 tags: $:/tags/PluginLibrary
-url: https://tiddlywiki.com/prerelease/library/v5.3.7/index.html
+url: https://tiddlywiki.com/prerelease/library/v5.3.8/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/tw5.com/tiddlers/_tw_shared/doc-utilities/doc-macros.tid

@@ -207,6 +207,7 @@ This is an example tiddler. See [[Table-of-Contents Macros (Examples)]].
 \procedure .link-badge-removed(link,colour:#a9aabc)  <$macrocall $name=".link-badge" text="removed"  link=<<link>> colour=<<colour>>/>
 \procedure .link-badge-renamed(link,colour:#b4b995)  <$macrocall $name=".link-badge" text="renamed"  link=<<link>> colour=<<colour>>/>
 \procedure .link-badge-updated(link,colour:#91ba66)  <$macrocall $name=".link-badge" text="updated"  link=<<link>> colour=<<colour>>/>
+\procedure .link-badge-reverted(link,colour:#ba8e66)  <$macrocall $name=".link-badge" text="reverted"  link=<<link>> colour=<<colour>>/>
 
 \procedure .banner-credits(credit,url)
 <img src=<<url>> width="140" style="float:left;margin-right:0.5em;"/>

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

@@ -8,7 +8,7 @@ title: TiddlyWiki Archive
 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 5.3.2 5.3.3 5.3.4 5.3.5 5.3.6
+5.3.0 5.3.1 5.3.2 5.3.3 5.3.4 5.3.5 5.3.6 5.3.7
 \end
 
 Older versions of TiddlyWiki are available in the [[archive|https://github.com/TiddlyWiki/tiddlywiki.com-gh-pages/tree/master/archive]]:

editions/tw5.com/tiddlers/community/Community Survey 2025 Sidebar Segment Styles.tid

@@ -0,0 +1,9 @@
+title: Community Survey 2025 Sidebar Segment Styles
+tags: $:/tags/Stylesheet
+
+\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline macrocallblock
+
+.community-survey-sidebar-image {
+	width: 100%;
+	box-shadow: 0 0 10px rgba(0,0,0,0.1);
+}

editions/tw5.com/tiddlers/community/Community Survey 2025 Sidebar Segment.tid

@@ -0,0 +1,11 @@
+title: Community Survey 2025 Sidebar Segment
+created: 20250708130030654
+modified: 20250708130030654
+tags: $:/tags/SideBarSegment
+list-after: $:/core/ui/SideBarSegments/site-subtitle
+
+<div style.padding-right="3em" style.max-width="20em">
+<$link to="Community Survey 2025">
+<$image source="Community Survey 2025.png" alt="Shape the future by taking the TiddlyWiki Community Survey 2025" class="community-survey-sidebar-image"/>
+</$link>
+</div>

editions/tw5.com/tiddlers/community/Community Survey 2025.tid

@@ -0,0 +1,34 @@
+title: Community Survey 2025
+created: 20250708130030654
+modified: 20250708130030654
+
+<div style.float="right" style.padding-left="1em">
+<$image source="Community Survey 2025.png" alt="Shape the future by taking the TiddlyWiki Community Survey 2025" width="280"/>
+</div>
+
+The core developers work hard year by year to continuously improve ~TiddlyWiki. Part of the satisfaction is that we are not just building software for ourselves, we’re serving the needs of a wider community of users.
+
+That begs the question of how we can understand the needs of these other users. We do it in an informal way through every interaction with users on the forum, or on GitHub, but once in a while it can be useful to do take a more formal approach, such as survey.
+
+So, we would like to invite you to participate in the ~TiddlyWiki Community Survey 2025. This brief, anonymous survey is designed to give us insight into the needs of TiddlyWiki users, with a mix of structured and freeform questions.
+
+The results of this survey will help inform future developments, helping us focus on what would make TiddlyWiki better for you, both as software and as a community. Even longer-term, it will help us refine the future vision of the project, ensuring it is based on the needs of our community.
+
+The survey will remain open until Monday 11th August 2025. Shortly afterwards, we will aggregate and share the findings.
+
+Take the survey here:
+
+https://ec.europa.eu/eusurvey/runner/tiddlywiki-users-2025
+
+!! The Great Viral TiddlyWiki Interview Project (2010)
+
+In 2010, we invited TiddlyWiki users to join the interview project with these words:
+
+> For many people that use it. there is a distinct discovery moment when TiddlyWiki explodes in their brain. For others, it is a challenge to get their heads around TiddlyWiki at all.
+>
+> This project explores how people think about TiddlyWiki by collecting together responses to a set of questions about it.
+
+You can explore the questions and responses on this new site:
+
+https://tiddlywiki.com/surveys.html
+

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

@@ -1,5 +1,5 @@
 created: 20150414070451144
-list: [[HelloThumbnail - Twenty Years of TiddlyWiki]] [[HelloThumbnail - Introduction Video]] [[HelloThumbnail - TiddlyWiki Privacy]] [[HelloThumbnail - Latest Version]] [[HelloThumbnail - Newsletter]] [[HelloThumbnail - Grok TiddlyWiki]] [[HelloThumbnail - TiddlyWikiLinks]] [[HelloThumbnail - MultiWikiServer]] [[HelloThumbnail - Funding]] [[HelloThumbnail - Marketplace]] [[HelloThumbnail - Intertwingled Innovations]]
+list: [[HelloThumbnail - Community Survey 2025]] [[HelloThumbnail - Twenty Years of TiddlyWiki]] [[HelloThumbnail - Introduction Video]] [[HelloThumbnail - TiddlyWiki Privacy]] [[HelloThumbnail - Latest Version]] [[HelloThumbnail - Newsletter]] [[HelloThumbnail - Grok TiddlyWiki]] [[HelloThumbnail - TiddlyWikiLinks]] [[HelloThumbnail - MultiWikiServer]] [[HelloThumbnail - Funding]] [[HelloThumbnail - Marketplace]] [[HelloThumbnail - Intertwingled Innovations]]
 modified: 20150414070948246
 title: HelloThumbnail
 type: text/vnd.tiddlywiki

editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Community Survey.tid

@@ -0,0 +1,9 @@
+title: HelloThumbnail - Community Survey 2025
+tags: HelloThumbnail
+color:rgb(234, 205, 183)
+image: Community Survey 2025.png
+caption: Community Survey
+link: Community Survey 2025
+ribbon-text: NEW
+
+Shape the future of TiddlyWiki by taking part in the 2025 community survey

editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Grok TiddlyWiki.tid

@@ -4,6 +4,5 @@ color: #D5B7EA
 image: Grok TiddlyWiki Banner
 caption: Grok ~TiddlyWiki 2.0
 link: "Grok TiddlyWiki" by Soren Bjornstad
-ribbon-text: NEW 2.0
 
 A comprehensive interactive guide to ~TiddlyWiki, from the very basics to the advanced concepts, featuring exercises and takeaways to aid learning

editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - MultiWikiServer.tid

@@ -5,6 +5,5 @@ background-color: #fff
 caption: ~MultiWikiServer
 link: MultiWikiServer
 image: MWS Banner.png
-ribbon-text: SOON
 
 Find out more about the new ~MultiWikiServer plugin that turns ~TiddlyWiki into a full-fledged server system supporting multiple user accounts and tiddler sharing

editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - TiddlyWiki Privacy.tid

@@ -4,6 +4,5 @@ color: #D5B7EA
 image: TiddlyWiki Privacy Badge.png
 caption: Your Privacy and Security
 link: TiddlyWiki Privacy and Security
-ribbon-text: NEW
 
 With care, ~TiddlyWiki can be used totally privately, without needing to trust anything or anyone but your own device

editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Twenty Years of TiddlyWiki.tid

@@ -4,6 +4,5 @@ color: #D5B7EA
 image: Twenty Years of TiddlyWiki
 caption: Twenty Years of ~TiddlyWiki
 link: History of TiddlyWiki
-ribbon-text: NEW
 
 Celebrating 20 years since the launch of ~TiddlyWiki

editions/tw5.com/tiddlers/images/Community Survey 2025.png.meta

@@ -0,0 +1,6 @@
+alt-text: Shape the future by taking the TiddlyWiki Community Survey 2025
+created: 20250708125233847
+modified: 20250708125233847
+tags: picture
+title: Community Survey 2025.png
+type: image/png

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

@@ -7,7 +7,13 @@ title: Release 5.3.7
 type: text/vnd.tiddlywiki
 description: Under development
 
-//[[See GitHub for detailed change history of this release|https://github.com/TiddlyWiki/TiddlyWiki5/compare/v5.3.6...master]]//
+//[[See GitHub for detailed change history of this release|https://github.com/TiddlyWiki/TiddlyWiki5/compare/v5.3.6...v5.3.7]]//
+
+<<.banner-credits
+	credit:"""Congratulations to [[Christian Byron|https://talk.tiddlywiki.org/u/Christian_Byron]] 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-7]]).
+"""
+	url:"https://raw.githubusercontent.com/TiddlyWiki/TiddlyWiki5/71232fbea2632280029de29147ec9cde4aebaae5/editions/tw5.com/tiddlers/images/New%20Release%20Banner.png"
+>>
 
 This is a minor bug fix release before introducing the major changes planned for v5.4.0. The changes planned for that release do involve some minor breaks in backwards compatibility so this release is intended to be a stable point for users before they upgrade.
 

languages/zh-Hans/ControlPanel.multids

@@ -253,3 +253,6 @@ ViewTemplateSubtitle/Caption: 查看模板副标题
 ViewTemplateSubtitle/Hint: 默认的查看模板使用此规则级联，动态选择模板以显示条目的副标题。
 ViewTemplateTags/Caption: 查看模板标签区
 ViewTemplateTags/Hint: 默认的查看模板使用此规则级联，动态选择模板以显示条目的标签区域。
+WikiInformation/Caption: 维基信息
+WikiInformation/Hint: 此页面总结了有关此 ~TiddlyWiki 配置的高阶信息。旨在让用户能够快速与他人共享其 ~TiddlyWiki 配置的相关信息，例如，在其中一个论坛中寻求帮助时。不包含隐私或个人信息，没有明确复制和粘贴在其他地方的情况
+WikiInformation/Drag/Caption: 拖动此链接可将此工具复制到另一个维基

languages/zh-Hant/ControlPanel.multids

@@ -252,4 +252,7 @@ ViewTemplateTitle/Hint: 預設的檢視範本使用此規則級聯，動態選
 ViewTemplateSubtitle/Caption: 檢視範本副標題
 ViewTemplateSubtitle/Hint: 預設的檢視範本使用此規則級聯，動態選擇範本以顯示條目的副標題。
 ViewTemplateTags/Caption: 檢視範本標籤
-ViewTemplateTags/Hint: 預設的檢視範本使用此規則級聯，動態選擇範本以顯示條目的標籤。
+ViewTemplateTags/Hint: 預設的檢視範本使用此規則級聯，動態選擇範本以顯示條目的標籤。
+WikiInformation/Caption: 維基資訊
+WikiInformation/Hint: 此頁面總結了有關此 ~TiddlyWiki 配置的高階資訊。旨在讓使用者能夠快速與他人共享其 ~TiddlyWiki 配置的相關資訊，例如，在其中一個論壇中尋求幫助時。不包含隱私或個人資訊，沒有明確複製和粘貼在其他地方的情況
+WikiInformation/Drag/Caption: 拖動此連結可將此工具複製到另一個維基

package.json

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

themes/tiddlywiki/vanilla/base.tid

@@ -1146,7 +1146,6 @@ button.tc-btn-invisible.tc-remove-tag-button {
 
 .tc-view-field-name {
 	width: 1%; /* Makes this column be as narrow as possible */
-	white-space: nowrap;
 	vertical-align: top;
 	text-align: right;
 	font-style: italic;