tiddlywiki 5.3.6 → 5.3.7

package/core/ui/PageControls/savewiki.tid

@@ -4,10 +4,17 @@ caption: {{$:/core/images/save-button-dynamic}} {{$:/language/Buttons/SaveWiki/C
 description: {{$:/language/Buttons/SaveWiki/Hint}}
 
 \whitespace trim
-<$button tooltip={{$:/language/Buttons/SaveWiki/Hint}} aria-label={{$:/language/Buttons/SaveWiki/Caption}} class=<<tv-config-toolbar-class>>>
+\procedure saveActions()
 <$wikify name="site-title" text={{$:/config/SaveWikiButton/Filename}}>
-<$action-sendmessage $message="tm-save-wiki" $param={{$:/config/SaveWikiButton/Template}} filename=<<site-title>>/>
+	<$action-sendmessage $message="tm-save-wiki" $param={{$:/config/SaveWikiButton/Template}} filename=<<site-title>>/>
 </$wikify>
+\end
+
+<$button actions=<<saveActions>>
+	tooltip={{$:/language/Buttons/SaveWiki/Hint}}
+	aria-label={{$:/language/Buttons/SaveWiki/Caption}}
+	class=<<tv-config-toolbar-class>>
+>
 <span class="tc-dirty-indicator">
 <%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/save-button-dynamic}}

package/core/ui/PageControls/tag-button.tid

@@ -5,6 +5,7 @@ description: {{$:/language/Buttons/TagManager/Hint}}
 
 \whitespace trim
 \procedure control-panel-button(class)
+\whitespace trim
 <$button to="$:/TagManager" tooltip={{$:/language/Buttons/TagManager/Hint}} aria-label={{$:/language/Buttons/TagManager/Caption}} class=`$(tv-config-toolbar-class)$ $(class)$`>
 <%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/tag-button}}

package/core/ui/SideBar/Tools.tid

@@ -2,31 +2,26 @@ title: $:/core/ui/SideBar/Tools
 tags: $:/tags/SideBar
 caption: {{$:/language/SideBar/Tools/Caption}}
 
-\define lingo-base() $:/language/ControlPanel/
-\define config-title()
-$:/config/PageControlButtons/Visibility/$(listItem)$
-\end
+\whitespace trim
 
-<<lingo Basics/Version/Prompt>> <<version>>
-
-<$set name="tv-config-toolbar-icons" value="yes">
-
-<$set name="tv-config-toolbar-text" value="yes">
-
-<$set name="tv-config-toolbar-class" value="">
-
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem">
-
-<div style="position:relative;" class={{{ [<listItem>encodeuricomponent[]addprefix[tc-btn-]] }}}>
+\procedure lingo-base() $:/language/ControlPanel/
+\function config-title() [[$:/config/PageControlButtons/Visibility/$(listItem)$]substitute[]]
 
-<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"/> <$transclude tiddler=<<listItem>>/> <i class="tc-muted"><$transclude tiddler=<<listItem>> field="description"/></i>
-
-</div>
-
-</$list>
-
-</$set>
-
-</$set>
+<<lingo Basics/Version/Prompt>> <<version>>
 
-</$set>
+<$let tv-config-toolbar-icons="yes"
+	tv-config-toolbar-text="yes"
+	tv-config-toolbar-class=""
+>
+	<$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem">
+		<div class={{{ [<listItem>encodeuricomponent[]addprefix[tc-btn-]] tc-sidebar-tools-item +[join[ ]] }}}
+			data-title=<<listItem>>
+		>
+			<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show" class="tc-tiny-gap-right"/>
+				<$transclude $tiddler=<<listItem>>/>
+				<i class="tc-tiny-gap-left tc-muted">
+					<$transclude $tiddler=<<listItem>> $field="description"/>
+				</i>
+		</div>
+	</$list>
+</$let>

package/core/ui/ViewTemplate/body/{rendered-plain-text.tid → rendered-plain-text/css.tid}

@@ -2,6 +2,7 @@ title: $:/core/ui/ViewTemplate/body/rendered-plain-text
 code-body: yes
 
 \whitespace trim
+\parameters (language:"css")
 <$wikify name="text" text={{!!text}} type={{!!type}}>
-<$codeblock code=<<text>> language="css"/>
+<$codeblock code=<<text>> language=<<language>>/>
 </$wikify>

package/core/ui/ViewTemplate/body/rendered-plain-text/html.tid

@@ -0,0 +1,4 @@
+title: $:/core/ui/ViewTemplate/body/rendered-plain-text/html
+code-body: yes
+
+{{||$:/core/ui/ViewTemplate/body/rendered-plain-text|html}}

package/core/ui/WikiInformation.tid

@@ -0,0 +1,122 @@
+title: $:/core/ui/ControlPanel/WikiInformation
+tags: $:/tags/ControlPanel/Info
+caption: <%if [[$:/language/ControlPanel/WikiInformation/Caption]is[shadow]] %>{{$:/language/ControlPanel/WikiInformation/Caption}}<%else%>Wiki Information<%endif%>
+subtitle: <%if [[$:/language/ControlPanel/WikiInformation/Caption]is[shadow]] %>{{$:/language/ControlPanel/WikiInformation/Caption}}<%else%>Wiki Information<%endif%>
+
+\procedure lingo-base() $:/language/ControlPanel/WikiInformation/
+
+<!--
+A custom implementation of the lingo macro that works even if this tiddler has been copied to an earlier version of TiddlyWiki that doesn't include the necessary lingo tiddlers in the core.
+-->
+
+\procedure intrinsic-lingo-Hint()
+This page summarises high level information about the configuration of this ~TiddlyWiki. It is designed to enable users to quickly share relevant aspects of the configuration of their ~TiddlyWiki with others, for example when seeking help in one of the forums. No private or personal information is included, and nothing is shared without being explicitly copied and pasted elsewhere
+\end intrinsic-lingo-Hint
+
+\procedure intrinsic-lingo-Drag/Caption()
+Drag this link to copy this tool to another wiki
+\end intrinsic-lingo-Drag/Caption
+
+\procedure lingo(title,mode:"inline")
+<%if [<title>addprefix<lingo-base>is[shadow]] %>
+	<$transclude $tiddler={{{ [<title>addprefix<lingo-base>] }}} $mode=<<mode>>/>
+<%else%>
+	<$transclude $variable={{{ [<title>addprefix[intrinsic-lingo-]] }}} $mode=<<mode>>/>
+<%endif%>
+\end lingo
+
+\whitespace trim
+
+\procedure capture-item(label,value)
+<$action-setfield $tiddler=<<tempWikiInfo>> text={{{ [<tempWikiInfo>get[text]addsuffix<label>addsuffix[: ]addsuffix<value>addsuffix<crlf>] }}}/>
+\end capture-item
+
+\procedure capture-item-wikified(label,value)
+<$wikify name="text" text=<<value>> mode="inline">
+	<$transclude
+		$variable="capture-item"
+		label=<<label>>
+		value=<<text>>
+	/>
+</$wikify>
+\end capture-item-wikified
+
+\procedure capture-wiki-info(tempWikiInfo)
+<$transclude $variable="capture-item-wikified" label="TiddlyWiki Version" value="<<version>>"/>
+<$transclude $variable="capture-item" label="Current palette" value={{$:/palette}}/>
+<$transclude $variable="capture-item" label="Current theme" value={{$:/theme}}/>
+<$transclude $variable="capture-item" label="Current layout" value={{$:/layout}}/>
+<$transclude $variable="capture-item" label="Browser language setting" value={{$:/info/browser/language}}/>
+<$transclude $variable="capture-item" label="Default type for missing tiddlers" value={{$:/config/DefaultMissingType}}/>
+<$transclude $variable="capture-item" label="Auto save setting" value={{$:/config/AutoSave}}/>
+<$transclude $variable="capture-item" label="Code wrapping setting" value={{$:/themes/tiddlywiki/vanilla/options/codewrapping}}/>
+<$transclude $variable="capture-item" label="Sticky titles setting" value={{$:/themes/tiddlywiki/vanilla/options/stickytitles}}/>
+<$transclude $variable="capture-item" label="Sidebar layout setting" value={{$:/themes/tiddlywiki/vanilla/options/sidebarlayout}}/>
+<$transclude $variable="capture-item" label="Auto focus field setting for new tiddlers" value={{$:/config/AutoFocus}}/>
+<$transclude $variable="capture-item" label="Current storyview setting" value={{$:/view}}/>
+<$transclude $variable="capture-item" label="Toolbar text setting" value={{$:/config/Toolbar/Text}}/>
+<$transclude $variable="capture-item" label="Toolbar icon setting" value={{$:/config/Toolbar/Icons}}/>
+<$transclude $variable="capture-item" label="Button class setting" value={{$:/config/Toolbar/ButtonClass}}/>
+<$transclude $variable="capture-item" label="Navigation address bar setting" value={{$:/config/Navigation/UpdateAddressBar}}/>
+<$transclude $variable="capture-item" label="Tiddler opening behaviour setting for navigations from outside the story river" value={{$:/config/Navigation/openLinkFromOutsideRiver}}/>
+<$transclude $variable="capture-item" label="Tiddler opening behaviour setting for navigations from within the story river" value={{$:/config/Navigation/openLinkFromInsideRiver}}/>
+<$transclude $variable="capture-item" label="CamelCase linking setting" value={{$:/config/WikiParserRules/Inline/wikilink}}/>
+<$transclude $variable="capture-item" label="Keyboard shortcuts that have been customised" value={{{ [all[tiddlers]prefix[$:/config/shortcuts]] +[join[,]] }}}/>
+<$transclude $variable="capture-item" label="Disabled plugins" value={{{ [all[tiddlers]prefix[$:/config/Plugins/Disabled/]] :filter[{!!text}match[yes]] :map[<currentTiddler>removeprefix[$:/config/Plugins/Disabled/]] +[join[,]] }}}/>
+<$transclude $variable="capture-item" label="Plugins" value={{{ [has[plugin-type]sort[]] :filter[<currentTiddler>addprefix[$:/config/Plugins/Disabled/]get[text]else[no]!match[yes]] :map[{!!version}addprefix[ - ]addprefix<currentTiddler>] +[addprefix[  ]addprefix<crlf>join[]] }}}/>
+\end capture-wiki-info
+
+\procedure template-header()
+<details><summary>Wiki Information</summary><pre><code>
+
+\end template-header
+
+\procedure template-footer()
+
+</code></pre></details>
+\end template-footer
+
+\procedure display-wiki-info-modal()
+<$let
+	tempWikiInfo="$:/temp/wiki-info"
+	crlf={{{ [charcode[13],[10]] }}}
+>
+	<$action-sendmessage
+		$message="tm-modal"
+		$param="$:/core/ui/ControlPanel/WikiInformation"
+		isModal="yes"
+		tempWikiInfo=<<tempWikiInfo>>
+	/>
+	<$action-deletetiddler $tiddler=<<tempWikiInfo>>/>
+	<$action-setfield $tiddler=<<tempWikiInfo>> text=<<template-header>>/>
+	<$transclude
+		$variable="capture-wiki-info"
+		tempWikiInfo=<<tempWikiInfo>>
+	/>
+	<$action-setfield $tiddler=<<tempWikiInfo>> text={{{ [<tempWikiInfo>get[text]addsuffix<template-footer>] }}}/>
+</$let>
+\end display-wiki-info-modal
+
+\procedure story-content()
+<<lingo title:"Hint" mode:"block">>
+
+<$button>
+<<display-wiki-info-modal>>
+Click to generate wiki information report
+</$button>
+
+<$link to="$:/core/ui/ControlPanel/WikiInformation">
+<<lingo title:"Drag/Caption" mode:"inline">>
+</$link>
+\end story-content
+
+\procedure modal-content()
+<p>
+	<$transclude $variable="copy-to-clipboard" src={{{ [<tempWikiInfo>get[text]] }}}/>
+</p>
+<p>
+	<$edit-text tiddler=<<tempWikiInfo>> tag="textarea" disabled="yes" class="tc-max-width"/>
+</p>
+\end modal-content
+
+<$transclude $variable={{{ [<isModal>match[yes]then[modal-content]else[story-content]] }}} $mode="block"/>

package/core/wiki/config/OfficialPluginLibrary.tid

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

package/core/wiki/config/ViewTemplateBodyFilters.multids

@@ -3,6 +3,7 @@ tags: $:/tags/ViewTemplateBodyFilter
 
 testcase: [tag[$:/tags/wiki-test-spec]type[text/vnd.tiddlywiki-multiple]] [tag[$:/tags/wiki-test-spec-failing]type[text/vnd.tiddlywiki-multiple]] :then[[$:/core/ui/TestCaseTemplate]]
 stylesheet: [tag[$:/tags/Stylesheet]then[$:/core/ui/ViewTemplate/body/rendered-plain-text]]
+html: [tag[$:/tags/RawMarkupWikified]] [tag[$:/tags/RawMarkupWikified/TopHead]] [tag[$:/tags/RawMarkupWikified/TopBody]] [tag[$:/tags/RawMarkupWikified/BottomBody]] :then[[$:/core/ui/ViewTemplate/body/rendered-plain-text/html]]
 core-ui-tags: [tag[$:/tags/PageTemplate]] [tag[$:/tags/EditTemplate]] [tag[$:/tags/ViewTemplate]] [tag[$:/tags/KeyboardShortcut]] [tag[$:/tags/ImportPreview]] [tag[$:/tags/EditPreview]] [tag[$:/tags/EditorToolbar]] [tag[$:/EditorTools]] [tag[$:/tags/Actions]] [tag[$:/tags/ToolbarButtonStyle]] :then[[$:/core/ui/ViewTemplate/body/code]]
 system: [prefix[$:/boot/]] [prefix[$:/core/macros]] [prefix[$:/core/save/]] [prefix[$:/core/templates/]]  [prefix[$:/config/]] [prefix[$:/core/config/]] [prefix[$:/info/]] [prefix[$:/language/]] [prefix[$:/languages/]] [prefix[$:/snippets/]]  [prefix[$:/info/]] [prefix[$:/state/]] [prefix[$:/status/]] [prefix[$:/temp/]] :and[!is[image]]  :then[[$:/core/ui/ViewTemplate/body/code]]
 code-body: [field:code-body[yes]then[$:/core/ui/ViewTemplate/body/code]]

package/core/wiki/languageswitcher.tid

@@ -1,25 +1,12 @@
 title: $:/snippets/languageswitcher
 
-\define flag-title()
-$(languagePluginTitle)$/icon
-\end
 \whitespace trim
-
 <$linkcatcher to="$:/language">
 <div class="tc-chooser tc-language-chooser">
 <$list filter="[[$:/languages/en-GB]] [plugin-type[language]sort[description]]">
-<$set name="cls" filter="[all[current]field:title{$:/language}]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item"><div class=<<cls>>>
+<$set name="cls" filter="[all[current]field:title{$:/language}]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item">
+<div class=<<cls>> lang={{!!name}}>
 <$link>
-<span class="tc-image-button">
-<$set name="languagePluginTitle" value=<<currentTiddler>>>
-<$transclude subtiddler=<<flag-title>>>
-<$list filter="[all[current]field:title[$:/languages/en-GB]]">
-<$transclude tiddler="$:/languages/en-GB/icon"/>
-</$list>
-</$transclude>
-</$set>
-</span>
-&#32;
 <$view field="description">
 <$view field="name">
 <$view field="title"/>

package/core/wiki/macros/colour-picker.tid

@@ -1,58 +1,55 @@
 title: $:/core/macros/colour-picker
 tags: $:/tags/Macro
 
-\define colour-picker-update-recent()
+\procedure 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
 
-\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%;"/>
-
+\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%"/>
 </$button>
 \end
 
-\define colour-picker-recent-inner(actions)
 \whitespace trim
-<$set name="colour-picker-value" value="$(recentColour)$">
-<$macrocall $name="colour-picker-inner" actions=<<__actions__>>/>
+\procedure colour-picker-recent-inner(actions)
+<$set name="colour-picker-value" value=<<recentColour>>>
+<$transclude $variable="colour-picker-inner" actions=<<actions>>/>
 </$set>
 \end
 
-\define colour-picker-recent(actions)
-\whitespace trim
+\procedure colour-picker-recent(actions)
 {{$:/language/ColourPicker/Recent}}<$list filter="[list[$:/config/ColourPicker/Recent]]" variable="recentColour">
 &#32;
-<$macrocall $name="colour-picker-recent-inner" actions=<<__actions__>>/>
+<$transclude $variable="colour-picker-recent-inner" actions=<<actions>>/>
 </$list>
 \end
 
-\define colour-picker(actions)
-\whitespace trim
+\procedure colour-picker(actions)
 <div class="tc-colour-chooser">
 
-<$macrocall $name="colour-picker-recent" actions=<<__actions__>>/>
+<$transclude $variable="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;
-<$macrocall $name="colour-picker-inner" actions=<<__actions__>>/>
+<$transclude $variable="colour-picker-inner" actions=<<actions>>/>
 </$list>
 
 ---
 
-<$edit-text tiddler="$:/config/ColourPicker/New" tag="input" default="" placeholder=""/>
-&#32;
+<$edit-text tiddler="$:/config/ColourPicker/New" tag="input" default="" placeholder="" class="tc-tiny-gap-right"/>
 <$edit-text tiddler="$:/config/ColourPicker/New" type="color" tag="input"/>
 <$set name="colour-picker-value" value={{$:/config/ColourPicker/New}}>
-<$macrocall $name="colour-picker-inner" actions=<<__actions__>>/>
+<%if [{$:/config/ColourPicker/New}!is[blank]] %>
+<$transclude $variable="colour-picker-inner" actions=<<actions>>/>
+<%endif%>
 </$set>
 
 </div>

package/core/wiki/macros/dumpvariables.tid

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

package/core/wiki/macros/export.tid

@@ -39,6 +39,7 @@ tags: $:/tags/Macro
 							$param=<<currentTiddler>>
 							exportFilter=<<exportFilter>>
 							filename={{{ [<baseFilename>addsuffix{!!extension}] }}}
+							type={{!!file-type}}
 						/>
 						<$action-deletetiddler $tiddler=<<qualify "$:/state/popup/export">>/>
 						<$transclude field="description"/>

package/core/wiki/macros/image-picker.tid

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

package/core/wiki/macros/list.tid

@@ -1,14 +1,18 @@
 title: $:/core/macros/list
 tags: $:/tags/Macro
 
-\define list-links(filter,type:"ul",subtype:"li",class:"",emptyMessage,field:"caption")
+\procedure list-links-draggable-drop-actions()
+<$action-listops $tiddler=<<targetTiddler>> $field=<<targetField>> $subfilter="+[insertbefore<actionTiddler>,<currentTiddler>]"/>
+\end
+
 \whitespace trim
-<$genesis $type=<<__type__>> class=<<__class__>>>
-	<$list filter=<<__filter__>> emptyMessage=<<__emptyMessage__>>>
-		<$genesis $type=<<__subtype__>>>
+\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>>>
 			<$link to={{!!title}}>
 				<$let tv-wikilinks="no">
-					<$transclude field=<<__field__>>>
+					<$transclude field=<<field>>>
 						<$view field="title"/>
 					</$transclude>
 				</$let>
@@ -18,24 +22,19 @@ tags: $:/tags/Macro
 </$genesis>
 \end
 
-\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
+\procedure list-links-draggable(tiddler,field:"list",emptyMessage,type:"ul",subtype:"li",class:"",itemTemplate)
 <span class="tc-links-draggable-list">
-	<$vars targetTiddler="""$tiddler$""" targetField="""$field$""">
-		<$genesis $type=<<__type__>> class="$class$">
-			<$list filter="[list[$tiddler$!!$field$]]" emptyMessage=<<__emptyMessage__>>>
+	<$let targetTiddler=<<tiddler>> targetField=<<field>>>
+		<$genesis $type=<<type>> class=<<class>>>
+			<$list filter="[<tiddler>get<field>enlist-input[]]" 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">
@@ -60,52 +59,54 @@ tags: $:/tags/Macro
 				</$droppable>
 			</$tiddler>
 		</$genesis>
-	</$vars>
+	</$let>
 </span>
 \end
 
-\define list-tagged-draggable-drop-actions(tag)
-\whitespace trim
+\procedure list-tagged-draggable-drop-actions(tag)
 <!-- 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
 
-\define list-tagged-draggable(tag,subFilter,emptyMessage,itemTemplate,elementTag:"div",storyview:"")
-\whitespace trim
+\procedure list-tagged-draggable(tag,subFilter,emptyMessage,itemTemplate,elementTag:"div",storyview:"")
 <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}}>
-								<$view field="title"/>
+								<$let tv-wikilinks="no">
+									<$transclude field="caption">
+										<$view field="title"/>
+									</$transclude>
+								</$let>
 							</$link>
 						</$transclude>
 					</$genesis>
@@ -114,11 +115,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>

package/core/wiki/macros/toc.tid

@@ -1,7 +1,6 @@
 title: $:/core/macros/toc
 tags: $:/tags/Macro
 
-
 \define toc-open-icon() $:/core/images/down-arrow
 \define toc-closed-icon() $:/core/images/right-arrow
 
@@ -121,7 +120,7 @@ tags: $:/tags/Macro
   <$set name="toc-item-class" filter=<<__itemClassFilter__>> emptyValue="toc-item-selected" value="toc-item" >
     <li class=<<toc-item-class>>>
       <$link to={{{ [<currentTiddler>get[target]else<currentTiddler>] }}}>
-          <$list filter="[all[current]tagging[]$sort$limit[1]]  -[subfilter<__exclude__>]" variable="ignore" emptyMessage="<$button class='tc-btn-invisible'>{{$:/core/images/blank}}</$button>">
+          <$list filter="[all[current]tagging[]$sort$]  -[subfilter<__exclude__>] +[limit[1]]" variable="ignore" emptyMessage="<$button class='tc-btn-invisible'>{{$:/core/images/blank}}</$button>">
           <$reveal type="nomatch" stateTitle=<<toc-state>> text="open">
             <$button setTitle=<<toc-state>> setTo="open" class="tc-btn-invisible tc-popup-keep">
             <$transclude tiddler=<<toc-closed-icon>> />
@@ -148,7 +147,7 @@ tags: $:/tags/Macro
 <$qualify name="toc-state" title={{{ [[$:/state/toc]addsuffix<__path__>addsuffix[-]addsuffix<currentTiddler>] }}}>
   <$set name="toc-item-class" filter=<<__itemClassFilter__>> emptyValue="toc-item-selected" value="toc-item">
     <li class=<<toc-item-class>>>
-      <$list filter="[all[current]tagging[]$sort$limit[1]] -[subfilter<__exclude__>]" variable="ignore" emptyMessage="""<$button class="tc-btn-invisible">{{$:/core/images/blank}}</$button><span class="toc-item-muted"><<toc-caption>></span>""">
+      <$list filter="[all[current]tagging[]$sort$] -[subfilter<__exclude__>] +[limit[1]]" variable="ignore" emptyMessage="""<$button class="tc-btn-invisible">{{$:/core/images/blank}}</$button><span class="toc-item-muted"><<toc-caption>></span>""">
         <$reveal type="nomatch" stateTitle=<<toc-state>> text="open">
           <$button setTitle=<<toc-state>> setTo="open" class="tc-btn-invisible tc-popup-keep">
             <$transclude tiddler=<<toc-closed-icon>> />