tiddlywiki 5.2.0 → 5.2.3

package/core/ui/ViewTemplate/title.tid

@@ -12,25 +12,14 @@ fill:$(foregroundColor)$;
 </span>
 <$set name="tv-wikilinks" value={{$:/config/Tiddlers/TitleLinks}}>
 <$link>
-<$set name="foregroundColor" value={{!!color}}>
-<$list filter="[all[current]has[icon]]~[[$:/config/DefaultTiddlerIcon]has[text]]">
+<$list filter="[<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerIconFilter]!is[draft]get[text]] +[!is[blank]]" variable="ignore">
+<$let foregroundColor={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}}>
 <span class="tc-tiddler-title-icon" style=<<title-styles>>>
-<$transclude tiddler={{!!icon}}>
-<$transclude tiddler={{$:/config/DefaultTiddlerIcon}}/>
-</$transclude>
+{{||$:/core/ui/TiddlerIcon}}
 </span>
+</$let>
 </$list>
-</$set>
-<$list filter="[all[current]removeprefix[$:/]]">
-<h2 class="tc-title" title={{$:/language/SystemTiddler/Tooltip}}>
-<span class="tc-system-title-prefix">$:/</span><$text text=<<currentTiddler>>/>
-</h2>
-</$list>
-<$list filter="[all[current]!prefix[$:/]]">
-<h2 class="tc-title">
-<$view field="title"/>
-</h2>
-</$list>
+<$transclude tiddler={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/ViewTemplateTitleFilter]!is[draft]get[text]] :and[!is[blank]else[$:/core/ui/ViewTemplate/title/default]] }}} />
 </$link>
 </$set>
 </div>

package/core/ui/ViewTemplate/unfold.tid

@@ -1,6 +1,7 @@
 title: $:/core/ui/ViewTemplate/unfold
 tags: $:/tags/ViewTemplate
 
+\whitespace trim
 <$reveal tag="div" type="nomatch" state="$:/config/ViewToolbarButtons/Visibility/$:/core/ui/Buttons/fold-bar" text="hide">
 <$reveal tag="div" type="nomatch" stateTitle=<<folded-state>> text="hide" default="show" retain="yes" animate="yes">
 <$button tooltip={{$:/language/Buttons/Fold/Hint}} aria-label={{$:/language/Buttons/Fold/Caption}} class="tc-fold-banner">

package/core/ui/ViewTemplate.tid

@@ -7,7 +7,7 @@ $:/state/folded/$(currentTiddler)$
 \define cancel-delete-tiddler-actions(message) <$action-sendmessage $message="tm-$message$-tiddler"/>
 \import [all[shadows+tiddlers]tag[$:/tags/Macro/View]!has[draft.of]]
 <$vars storyTiddler=<<currentTiddler>> tiddlerInfoState=<<qualify "$:/state/popup/tiddler-info">>>
-<div data-tiddler-title=<<currentTiddler>> data-tags={{!!tags}} class={{{ tc-tiddler-frame tc-tiddler-view-frame [<currentTiddler>is[tiddler]then[tc-tiddler-exists]] [<currentTiddler>is[missing]!is[shadow]then[tc-tiddler-missing]] [<currentTiddler>is[shadow]then[tc-tiddler-exists tc-tiddler-shadow]] [<currentTiddler>is[shadow]is[tiddler]then[tc-tiddler-overridden-shadow]] [<currentTiddler>is[system]then[tc-tiddler-system]] [{!!class}] [<currentTiddler>tags[]encodeuricomponent[]addprefix[tc-tagged-]] +[join[ ]] }}}>
+<div data-tiddler-title=<<currentTiddler>> data-tags={{!!tags}} class={{{ tc-tiddler-frame tc-tiddler-view-frame [<currentTiddler>is[tiddler]then[tc-tiddler-exists]] [<currentTiddler>is[missing]!is[shadow]then[tc-tiddler-missing]] [<currentTiddler>is[shadow]then[tc-tiddler-exists tc-tiddler-shadow]] [<currentTiddler>is[shadow]is[tiddler]then[tc-tiddler-overridden-shadow]] [<currentTiddler>is[system]then[tc-tiddler-system]] [{!!class}] [<currentTiddler>tags[]encodeuricomponent[]addprefix[tc-tagged-]] +[join[ ]] }}} role="article">
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewTemplate]!has[draft.of]]" variable="listItem">
 <$transclude tiddler=<<listItem>>/>
 </$list>

package/core/ui/ViewToolbar/new-here.tid

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

package/core/wiki/allfields.tid

@@ -1,7 +1,13 @@
 title: $:/snippets/allfields
 
 \define renderfield(title)
-<tr class="tc-view-field"><td class="tc-view-field-name">''$title$'':</td><td class="tc-view-field-value">//{{$:/language/Docs/Fields/$title$}}//</td></tr>
+<tr class="tc-view-field"><td class="tc-view-field-name">''<$text text=<<__title__>>/>'':</td><td class="tc-view-field-value">//{{$:/language/Docs/Fields/$title$}}//</td></tr>
 \end
-<table class="tc-view-field-table"><tbody><$list filter="[fields[]sort[title]]" variable="listItem"><$macrocall $name="renderfield" title=<<listItem>>/></$list>
-</tbody></table>
+\whitespace trim
+<table class="tc-view-field-table">
+<tbody>
+<$list filter="[fields[]sort[title]]" variable="listItem">
+<$macrocall $name="renderfield" title=<<listItem>>/>
+</$list>
+</tbody>
+</table>

package/core/wiki/config/EditTemplateBodyFilters.multids

@@ -0,0 +1,5 @@
+title: $:/config/EditTemplateBodyFilters/
+tags: $:/tags/EditTemplateBodyFilter
+
+canonical-uri: [has[_canonical_uri]then[$:/core/ui/EditTemplate/body/canonical-uri]]
+default: [[$:/core/ui/EditTemplate/body/default]]

package/core/wiki/config/FieldEditorFilters.multids

@@ -0,0 +1,4 @@
+title: $:/config/FieldEditorFilters/
+tags: $:/tags/FieldEditorFilter
+
+default: [[$:/core/ui/EditTemplate/fieldEditor/default]]

package/core/wiki/config/OfficialPluginLibrary.tid

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

package/core/wiki/config/StoryTiddlerTemplateFilters.multids

@@ -0,0 +1,5 @@
+title: $:/config/StoryTiddlerTemplateFilters/
+tags: $:/tags/StoryTiddlerTemplateFilter
+
+draft: [is[draft]then{$:/config/ui/EditTemplate}]
+default: [{$:/config/ui/ViewTemplate}]

package/core/wiki/config/TiddlerColourFilters.multids

@@ -0,0 +1,5 @@
+title: $:/config/TiddlerColourFilters/
+tags: $:/tags/TiddlerColourFilter
+
+color-field: [has[color]then{!!color}]
+default: [[$:/config/DefaultTiddlerColour]has[text]get[text]trim[]]

package/core/wiki/config/TiddlerIconFilters.multids

@@ -0,0 +1,5 @@
+title: $:/config/TiddlerIconFilters/
+tags: $:/tags/TiddlerIconFilter
+
+icon-field: [has[icon]then{!!icon}]
+default: [{$:/config/DefaultTiddlerIcon}has[text]]

package/core/wiki/config/ViewTemplateBodyFilters.multids

@@ -0,0 +1,10 @@
+title: $:/config/ViewTemplateBodyFilters/
+tags: $:/tags/ViewTemplateBodyFilter
+
+stylesheet: [tag[$:/tags/Stylesheet]then[$:/core/ui/ViewTemplate/body/rendered-plain-text]]
+system: [prefix[$:/boot/]] [prefix[$:/config/]] [prefix[$:/core/macros]] [prefix[$:/core/save/]] [prefix[$:/core/templates/]] [prefix[$:/core/ui/]split[/]count[]compare:number:eq[4]] [prefix[$:/info/]] [prefix[$:/language/]] [prefix[$:/languages/]] [prefix[$:/snippets/]] [prefix[$:/state/]] [prefix[$:/status/]] [prefix[$:/info/]] [prefix[$:/temp/]] +[!is[image]limit[1]then[$:/core/ui/ViewTemplate/body/code]]
+code-body: [field:code-body[yes]then[$:/core/ui/ViewTemplate/body/code]]
+import: [field:plugin-type[import]then[$:/core/ui/ViewTemplate/body/import]]
+plugin: [has[plugin-type]then[$:/core/ui/ViewTemplate/body/plugin]]
+hide-body: [field:hide-body[yes]then[$:/core/ui/ViewTemplate/body/blank]]
+default: [[$:/core/ui/ViewTemplate/body/default]]

package/core/wiki/config/ViewTemplateTitleFilters.multids

@@ -0,0 +1,5 @@
+title: $:/config/ViewTemplateTitleFilters/
+tags: $:/tags/ViewTemplateTitleFilter
+
+system: [prefix[$:/]then[$:/core/ui/ViewTemplate/title/system]]
+default: [[$:/core/ui/ViewTemplate/title/default]]

package/core/wiki/currpalettepreview.tid

@@ -11,31 +11,36 @@ title: $:/snippets/currpalettepreview
 background-color: $(swatchColour)$;
 \end
 \define swatch-inner()
+\whitespace trim
 <$set name="swatchColour" value={{##$(colourResolved)$}}>
 <$list filter="[<swatchColour>!prefix[<<colour ]!suffix[>>]]" variable="ignore">
 <div class="tc-swatch" style=<<swatchStyle>> title=<<swatchTitle>>/>
+&#32;
 </$list>
 <$list filter="[<swatchColour>prefix[<<colour ]suffix[>>]]" variable="ignore">
-<$wikify name="colourResolved" text="""<$macrocall $name="resolve-colour" macrocall=<<swatchColour>>/>""">
+<$wikify name="colourResolved" text="<$macrocall $name='resolve-colour' macrocall=<<swatchColour>>/>">
 <<swatch-inner>>
 </$wikify>
 </$list>
 </$set>
 \end
 \define swatch()
+\whitespace trim
 <$set name="swatchColour" value={{##$(colour)$}}>
 <$set name="swatchTitle" value=<<colour>>>
 <$list filter="[<swatchColour>!prefix[<<colour ]!suffix[>>]]" variable="ignore">
 <div class="tc-swatch" style=<<swatchStyle>> title=<<swatchTitle>>/>
+&#32;
 </$list>
 <$list filter="[<swatchColour>prefix[<<colour ]suffix[>>]]" variable="ignore">
-<$wikify name="colourResolved" text="""<$macrocall $name="resolve-colour" macrocall=<<swatchColour>>/>""">
+<$wikify name="colourResolved" text="<$macrocall $name='resolve-colour' macrocall=<<swatchColour>>/>">
 <<swatch-inner>>
 </$wikify>
 </$list>
 </$set>
 </$set>
 \end
+\whitespace trim
 <div class="tc-swatches-horiz"><$list filter="
 foreground
 background

package/core/wiki/debugstylesheets.tid

@@ -0,0 +1,10 @@
+title: $:/snippets/DebugStylesheets
+
+\whitespace trim
+<style>[test]{list-style:'❌'}</style>
+<ul>
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/Stylesheet]has[modified]]" counter="n">
+<style>{{!!text}}[test="<<n>>"]{list-style:disc;}</style>
+<li test=<<n>>><$link/></li>
+</$list>
+</ul>

package/core/wiki/download-wiki-button.tid

@@ -1,7 +1,8 @@
 title: $:/snippets/download-wiki-button
 
 \define lingo-base() $:/language/ControlPanel/Tools/Download/
+\whitespace trim
 <$button class="tc-btn-big-green">
 <$action-sendmessage $message="tm-download-file" $param="$:/core/save/all" filename="index.html"/>
-<<lingo Full/Caption>> {{$:/core/images/save-button}}
+<<lingo Full/Caption>>&#32;{{$:/core/images/save-button}}
 </$button>

package/core/wiki/languageswitcher.tid

@@ -3,6 +3,7 @@ title: $:/snippets/languageswitcher
 \define flag-title()
 $(languagePluginTitle)$/icon
 \end
+\whitespace trim
 
 <$linkcatcher to="$:/language">
 <div class="tc-chooser tc-language-chooser">
@@ -18,6 +19,7 @@ $(languagePluginTitle)$/icon
 </$transclude>
 </$set>
 </span>
+&#32;
 <$view field="description">
 <$view field="name">
 <$view field="title"/>

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

@@ -21,17 +21,22 @@ $actions$
 \end
 
 \define colour-picker-recent-inner(actions)
+\whitespace trim
 <$set name="colour-picker-value" value="$(recentColour)$">
 <$macrocall $name="colour-picker-inner" actions="""$actions$"""/>
 </$set>
 \end
 
 \define colour-picker-recent(actions)
-{{$:/language/ColourPicker/Recent}} <$list filter="[list[$:/config/ColourPicker/Recent]]" variable="recentColour">
-<$macrocall $name="colour-picker-recent-inner" actions="""$actions$"""/></$list>
+\whitespace trim
+{{$:/language/ColourPicker/Recent}}<$list filter="[list[$:/config/ColourPicker/Recent]]" variable="recentColour">
+&#32;
+<$macrocall $name="colour-picker-recent-inner" actions="""$actions$"""/>
+</$list>
 \end
 
 \define colour-picker(actions)
+\whitespace trim
 <div class="tc-colour-chooser">
 
 <$macrocall $name="colour-picker-recent" actions="""$actions$"""/>
@@ -39,12 +44,14 @@ $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$"""/>
 </$list>
 
 ---
 
 <$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}}>
 <$macrocall $name="colour-picker-inner" actions="""$actions$"""/>

package/core/wiki/macros/copy-to-clipboard.tid

@@ -2,16 +2,19 @@ title: $:/core/macros/copy-to-clipboard
 tags: $:/tags/Macro
 
 \define copy-to-clipboard(src,class:"tc-btn-invisible",style)
+\whitespace trim
 <$button class=<<__class__>> style=<<__style__>> message="tm-copy-to-clipboard" param=<<__src__>> tooltip={{$:/language/Buttons/CopyToClipboard/Hint}}>
-{{$:/core/images/copy-clipboard}} <$text text={{$:/language/Buttons/CopyToClipboard/Caption}}/>
+{{$:/core/images/copy-clipboard}}
+&#32;
+<$text text={{$:/language/Buttons/CopyToClipboard/Caption}}/>
 </$button>
 \end
 
 \define copy-to-clipboard-above-right(src,class:"tc-btn-invisible",style)
+\whitespace trim
 <div style="position: relative;">
 <div style="position: absolute; bottom: 0; right: 0;">
 <$macrocall $name="copy-to-clipboard" src=<<__src__>> class=<<__class__>> style=<<__style__>>/>
 </div>
 </div>
 \end
-

package/core/wiki/macros/diff.tid

@@ -2,6 +2,7 @@ title: $:/core/macros/diff
 tags: $:/tags/Macro
 
 \define compareTiddlerText(sourceTiddlerTitle,sourceSubTiddlerTitle,destTiddlerTitle,destSubTiddlerTitle)
+\whitespace trim
 <$set name="source" tiddler=<<__sourceTiddlerTitle__>> subtiddler=<<__sourceSubTiddlerTitle__>>>
 <$set name="dest" tiddler=<<__destTiddlerTitle__>> subtiddler=<<__destSubTiddlerTitle__>>>
 <$diff-text source=<<source>> dest=<<dest>>/>
@@ -10,6 +11,7 @@ tags: $:/tags/Macro
 \end
 
 \define compareTiddlers(sourceTiddlerTitle,sourceSubTiddlerTitle,destTiddlerTitle,destSubTiddlerTitle,exclude)
+\whitespace trim
 <table class="tc-diff-tiddlers">
 <tbody>
 <$set name="sourceFields" filter="[<__sourceTiddlerTitle__>fields[]sort[]]">
@@ -17,13 +19,12 @@ tags: $:/tags/Macro
 <$list filter="[enlist<sourceFields>] [enlist<destFields>] -[enlist<__exclude__>] +[sort[]]" variable="fieldName">
 <tr>
 <th>
-<$text text=<<fieldName>>/> 
+<$text text=<<fieldName>>/>
 </th>
 <td>
 <$set name="source" tiddler=<<__sourceTiddlerTitle__>> subtiddler=<<__sourceSubTiddlerTitle__>> field=<<fieldName>>>
 <$set name="dest" tiddler=<<__destTiddlerTitle__>> subtiddler=<<__destSubTiddlerTitle__>> field=<<fieldName>>>
-<$diff-text source=<<source>> dest=<<dest>>>
-</$diff-text>
+<$diff-text source=<<source>> dest=<<dest>>>&#32;</$diff-text>
 </$set>
 </$set>
 </td>

package/core/wiki/macros/dumpvariables.tid

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

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

@@ -5,22 +5,23 @@ title: $:/core/macros/image-picker
 type: text/vnd.tiddlywiki
 
 \define image-picker-thumbnail(actions)
-<$button tag="a" tooltip="""$(imageTitle)$""">
-$actions$
-<$transclude tiddler=<<imageTitle>>/>
-</$button>
+<$button tag="a" tooltip="""$(imageTitle)$""">$actions$<$transclude tiddler=<<imageTitle>>/></$button>
 \end
 
 \define image-picker-list(filter,actions)
+\whitespace trim
 <$list filter="""$filter$""" variable="imageTitle">
 <$macrocall $name="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:"")
+\whitespace trim
 <div class="tc-image-chooser">
 <$vars state-system=<<qualify "$:/state/image-picker/system">>>
 <$checkbox tiddler=<<state-system>> field="text" checked="show" unchecked="hide" default="hide">
+&#32;
 {{$:/language/SystemTiddlers/Include/Prompt}}
 </$checkbox>
 <$reveal state=<<state-system>> type="match" text="hide" default="hide" tag="div">

package/core/wiki/macros/keyboard-driven-input.tid

@@ -2,17 +2,21 @@ title: $:/core/macros/keyboard-driven-input
 tags: $:/tags/Macro
 
 \define change-input-tab(stateTitle,tag,beforeafter,defaultState,actions)
+\whitespace trim
 <$set name="tabsList" filter="[all[shadows+tiddlers]tag<__tag__>!has[draft.of]]">
-<$vars currentState={{{ [<__stateTitle__>!is[missing]get[text]] ~[<__defaultState__>] }}} firstTab={{{ [enlist<tabsList>nth[1]] }}} lastTab={{{ [enlist<tabsList>last[]] }}}>
-<$set name="nextTab" value={{{ [all[shadows+tiddlers]tag<__tag__>!has[draft.of]$beforeafter$<currentState>] ~[[$beforeafter$]removeprefix[after]suffix[]addprefix<firstTab>] ~[[$beforeafter$]removeprefix[before]suffix[]addprefix<lastTab>] }}}>
+<$let
+	currentState={{{ [<__stateTitle__>!is[missing]get[text]] ~[<__defaultState__>] }}}
+	firstTab={{{ [enlist<tabsList>nth[1]] }}}
+	lastTab={{{ [enlist<tabsList>last[]] }}}
+	nextTab={{{ [all[shadows+tiddlers]tag<__tag__>!has[draft.of]$beforeafter$<currentState>] ~[[$beforeafter$]removeprefix[after]suffix[]addprefix<firstTab>] ~[[$beforeafter$]removeprefix[before]suffix[]addprefix<lastTab>] }}}>
 <$action-setfield $tiddler=<<__stateTitle__>> text=<<nextTab>>/>
 $actions$
-</$set>
-</$vars>
+</$let>
 </$set>
 \end
 
 \define keyboard-input-actions()
+\whitespace trim
 <$list filter="[<__index__>match[]]">
 <$action-setfield $tiddler=<<__storeTitle__>> text={{{ [<__tiddler__>get<__field__>] }}}/>
 </$list>
@@ -22,6 +26,7 @@ $actions$
 \end
 
 \define input-next-actions-inner()
+\whitespace trim
 <$list filter="[<nextItem>minlength[1]]" variable="ignore">
 <$action-setfield $tiddler=<<__selectionStateTitle__>> text=<<nextItem>>/>
 <$list filter="[<__index__>match[]]">
@@ -35,12 +40,19 @@ $actions$
 \end
 
 \define input-next-actions(afterOrBefore:"after",reverse:"")
+\whitespace trim
 <$list filter="[<__storeTitle__>get[text]minlength<__filterMinLength__>] [<__filterMinLength__>match[0]] +[limit[1]]" variable="ignore">
-<$vars userInput={{{ [<__storeTitle__>get[text]] }}} selectedItem={{{ [<__selectionStateTitle__>get[text]] }}}>
-<$set name="configTiddler" value={{{ [subfilter<__configTiddlerFilter__>] }}}>
-<$vars primaryListFilter={{{ [<configTiddler>get<__firstSearchFilterField__>] }}} secondaryListFilter={{{ [<configTiddler>get<__secondSearchFilterField__>] }}}>
+<$let
+	userInput={{{ [<__storeTitle__>get[text]] }}}
+	selectedItem={{{ [<__selectionStateTitle__>get[text]] }}}
+	configTiddler={{{ [subfilter<__configTiddlerFilter__>] }}}
+	primaryListFilter={{{ [<configTiddler>get<__firstSearchFilterField__>] }}}
+	secondaryListFilter={{{ [<configTiddler>get<__secondSearchFilterField__>] }}}>
 <$set name="filteredList" filter="[subfilter<primaryListFilter>addsuffix[-primaryList]] =[subfilter<secondaryListFilter>addsuffix[-secondaryList]]">
-<$vars nextItem={{{ [enlist<filteredList>$afterOrBefore$<selectedItem>] ~[enlist<filteredList>$reverse$nth[1]] }}} firstItem={{{ [enlist<filteredList>nth[1]] }}} lastItem={{{ [enlist<filteredList>last[]] }}}>
+<$let
+	nextItem={{{ [enlist<filteredList>$afterOrBefore$<selectedItem>] ~[enlist<filteredList>$reverse$nth[1]] }}}
+	firstItem={{{ [enlist<filteredList>nth[1]] }}}
+	lastItem={{{ [enlist<filteredList>last[]] }}}>
 <$list filter="[<selectedItem>match<firstItem>!match<lastItem>]" variable="ignore">
 <$set name="nextItem" value={{{ [[$afterOrBefore$]match[before]then<userInput>addsuffix[-userInput]] ~[<nextItem>] }}}>
 <<input-next-actions-inner>>
@@ -59,11 +71,9 @@ $actions$
 <$list filter="[<selectedItem>!match<firstItem>!match<lastItem>]" variable="ignore">
 <<input-next-actions-inner>>
 </$list>
-</$vars>
-</$set>
-</$vars>
+</$let>
 </$set>
-</$vars>
+</$let>
 </$list>
 \end
 

package/core/wiki/macros/list.tid

@@ -7,9 +7,11 @@ tags: $:/tags/Macro
 <$list filter="$filter$" emptyMessage=<<__emptyMessage__>>>
 <$subtype$>
 <$link to={{!!title}}>
+<$let tv-wikilinks="no">
 <$transclude field="caption">
 <$view field="title"/>
 </$transclude>
+</$let>
 </$link>
 </$subtype$>
 </$list>
@@ -17,23 +19,25 @@ tags: $:/tags/Macro
 \end
 
 \define list-links-draggable-drop-actions()
-<$action-listops $tiddler=<<targetTiddler>> $field=<<targetField>> $subfilter="+[insertbefore:currentTiddler<actionTiddler>]"/>
+<$action-listops $tiddler=<<targetTiddler>> $field=<<targetField>> $subfilter="+[insertbefore<actionTiddler>,<currentTiddler>]"/>
 \end
 
-\define list-links-draggable(tiddler,field:"list",type:"ul",subtype:"li",class:"",itemTemplate)
+\define list-links-draggable(tiddler,field:"list",emptyMessage,type:"ul",subtype:"li",class:"",itemTemplate)
 \whitespace trim
 <span class="tc-links-draggable-list">
 <$vars targetTiddler="""$tiddler$""" targetField="""$field$""">
 <$type$ class="$class$">
-<$list filter="[list[$tiddler$!!$field$]]">
+<$list filter="[list[$tiddler$!!$field$]]" emptyMessage=<<__emptyMessage__>>>
 <$droppable actions=<<list-links-draggable-drop-actions>> tag="""$subtype$""" enable=<<tv-enable-drag-and-drop>>>
 <div class="tc-droppable-placeholder"/>
 <div>
 <$transclude tiddler="""$itemTemplate$""">
 <$link to={{!!title}}>
+<$let tv-wikilinks="no">
 <$transclude field="caption">
 <$view field="title"/>
 </$transclude>
+</$let>
 </$link>
 </$transclude>
 </div>
@@ -53,6 +57,7 @@ tags: $:/tags/Macro
 \end
 
 \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[]]">
 <!-- Remove any list-after or list-before fields from the tiddlers with this tag -->
@@ -61,7 +66,7 @@ tags: $:/tags/Macro
 <$action-deletefield $field="list-after"/>
 </$list>
 <!-- Save the new order to the Tag Tiddler -->
-<$action-listops $tiddler=<<__tag__>> $field="list" $filter="+[enlist<order>] +[insertbefore:currentTiddler<actionTiddler>]"/>
+<$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__>>/>-->

package/core/wiki/macros/tabs.tid

@@ -1,38 +1,63 @@
 title: $:/core/macros/tabs
 tags: $:/tags/Macro
+code-body: yes
 
-\define tabs(tabsList,default,state:"$:/state/tab",class,template,buttonTemplate,retain,actions,explicitState)
-<$set name="qualifiedState" value=<<qualify "$state$">>>
-<$vars tabsState={{{ [<__explicitState__>minlength[1]] ~[<qualifiedState>] }}}>
-<div class="tc-tab-set $class$">
-<div class="tc-tab-buttons $class$">
-<$list filter="$tabsList$" variable="currentTab" storyview="pop"><$set name="save-currentTiddler" value=<<currentTiddler>>><$tiddler tiddler=<<currentTab>>><$button set=<<tabsState>> setTo=<<currentTab>> default="$default$" selectedClass="tc-tab-selected" tooltip={{!!tooltip}}>
-<$tiddler tiddler=<<save-currentTiddler>>>
-<$set name="tv-wikilinks" value="no">
-<$transclude tiddler="$buttonTemplate$" mode="inline">
-<$transclude tiddler=<<currentTab>> field="caption">
-<$macrocall $name="currentTab" $type="text/plain" $output="text/plain"/>
-</$transclude>
-</$transclude>
-</$set></$tiddler>$actions$</$button></$tiddler></$set></$list>
-</div>
-<div class="tc-tab-divider $class$"/>
-<div class="tc-tab-content $class$">
-<$list filter="$tabsList$" variable="currentTab">
-
-<$reveal type="match" state=<<tabsState>> text=<<currentTab>> default="$default$" retain="""$retain$""">
-
-<$transclude tiddler="$template$" mode="block">
-
-<$transclude tiddler=<<currentTab>> mode="block"/>
+\define tabs-button()
+\whitespace trim
+<$button set=<<tabsState>> setTo=<<currentTab>> default=<<__default__>> selectedClass="tc-tab-selected" tooltip={{!!tooltip}} role="switch">
+	<$tiddler tiddler=<<save-currentTiddler>>>
+		<$set name="tv-wikilinks" value="no">
+			<$transclude tiddler=<<__buttonTemplate__>> mode="inline">
+				<$transclude tiddler=<<currentTab>> field="caption">
+					<$macrocall $name="currentTab" $type="text/plain" $output="text/plain"/>
+				</$transclude>
+			</$transclude>
+		</$set>
+	</$tiddler>
+	<<__actions__>>
+</$button>
+\end
 
-</$transclude>
+\define tabs-tab()
+\whitespace trim
+<$set name="save-currentTiddler" value=<<currentTiddler>>>
+	<$tiddler tiddler=<<currentTab>>>
+		<<tabs-button>>
+	</$tiddler>
+</$set>
+\end
 
-</$reveal>
+\define tabs-tab-list()
+\whitespace trim
+<$list filter=<<__tabsList__>> variable="currentTab" storyview="pop">
+	<<tabs-tab>>
+</$list>
+\end
 
+\define tabs-tab-body()
+\whitespace trim
+<$list filter=<<__tabsList__>> variable="currentTab">
+	<$reveal type="match" state=<<tabsState>> text=<<currentTab>> default=<<__default__>> retain=<<__retain__>> tag="div">
+		<$transclude tiddler=<<__template__>> mode="block">
+			<$transclude tiddler=<<currentTab>> mode="block"/>
+		</$transclude>
+	</$reveal>
 </$list>
-</div>
-</div>
-</$vars>
-</$set>
+\end
+
+\define tabs(tabsList,default,state:"$:/state/tab",class,template,buttonTemplate,retain,actions,explicitState)
+\whitespace trim
+<$qualify title=<<__state__>> name="qualifiedState">
+	<$let tabsState={{{ [<__explicitState__>minlength[1]] ~[<qualifiedState>] }}}>
+		<div class={{{ [[tc-tab-set]addsuffix[ ]addsuffix<__class__>] }}}>
+			<div class={{{ [[tc-tab-buttons]addsuffix[ ]addsuffix<__class__>] }}}>
+				<<tabs-tab-list>>
+			</div>
+			<div class={{{ [[tc-tab-divider]addsuffix[ ]addsuffix<__class__>] }}}/>
+			<div class={{{ [[tc-tab-content]addsuffix[ ]addsuffix<__class__>] }}}>
+				<<tabs-tab-body>>
+			</div>
+		</div>
+	</$let>
+</$qualify>
 \end