tiddlywiki 5.2.0 → 5.2.3

package/core/ui/AdvancedSearch/Shadows.tid

@@ -5,26 +5,68 @@ first-search-filter: [all[shadows]search<userInput>sort[title]limit[250]] -[[$:/
 
 \define lingo-base() $:/language/Search/
 
-\define set-next-input-tab(beforeafter:"after") <$macrocall $name="change-input-tab" stateTitle="$:/state/tab--1498284803" tag="$:/tags/AdvancedSearch" beforeafter="$beforeafter$" defaultState="$:/core/ui/AdvancedSearch/System" actions="""<$action-setfield $tiddler="$:/state/advancedsearch/currentTab" text=<<nextTab>>/>"""/>
-
-\define cancel-search-actions() <$list filter="[{$:/temp/advancedsearch}!match{$:/temp/advancedsearch/input}]" emptyMessage="""<$action-deletetiddler $filter="[[$:/temp/advancedsearch]] [[$:/temp/advancedsearch/input]] [[$:/temp/advancedsearch/selected-item]]" />"""><$action-setfield $tiddler="$:/temp/advancedsearch/input" text={{$:/temp/advancedsearch}}/><$action-setfield $tiddler="$:/temp/advancedsearch/refresh" text="yes"/></$list><$action-sendmessage $message="tm-focus-selector" $param=""".tc-advanced-search input"""/>
+\define set-next-input-tab(beforeafter:"after")
+<$macrocall $name="change-input-tab"
+	stateTitle="$:/state/tab--1498284803"
+	tag="$:/tags/AdvancedSearch"
+	beforeafter="$beforeafter$"
+	defaultState="$:/core/ui/AdvancedSearch/System"
+	actions="<$action-setfield $tiddler='$:/state/advancedsearch/currentTab' text=<<nextTab>>/>"/>
+\end
+
+\define cancel-search-actions()
+\whitespace trim
+<$list
+	filter="[{$:/temp/advancedsearch}!match{$:/temp/advancedsearch/input}]"
+	emptyMessage="<$action-deletetiddler $filter='[[$:/temp/advancedsearch]] [[$:/temp/advancedsearch/input]] [[$:/temp/advancedsearch/selected-item]]' />">
+	<$action-setfield $tiddler="$:/temp/advancedsearch/input" text={{$:/temp/advancedsearch}}/>
+	<$action-setfield $tiddler="$:/temp/advancedsearch/refresh" text="yes"/>
+</$list>
+<$action-sendmessage $message="tm-focus-selector" $param=".tc-advanced-search input"/>
+\end
+
+\define input-accept-actions()
+\whitespace trim
+<$list
+	filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]"
+	emptyMessage="<$list filter='[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]'><$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/></$list>">
+	<$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/>
+</$list>
+\end
 
-\define input-accept-actions() <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]" emptyMessage="""<$list filter="[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]"><$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/></$list>"""><$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/></$list>
+\define input-accept-variant-actions()
+\whitespace trim
+<$list
+	filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]"
+	emptyMessage="<$list filter='[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]'><$list filter='[<__tiddler__>get[text]minlength[1]]'><$action-sendmessage $message='tm-edit-tiddler' $param={{{  [<__tiddler__>get[text]] }}}/></$list></$list>">
+	<$list filter="[<__tiddler__>get[text]minlength[1]]">
+		<$action-sendmessage $message="tm-edit-tiddler" $param={{{  [<__tiddler__>get[text]] }}}/>
+</$list></$list>
+\end
 
-\define input-accept-variant-actions() <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]" emptyMessage="""<$list filter="[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]"><$list filter="[<__tiddler__>get[text]minlength[1]]"><$action-sendmessage $message="tm-edit-tiddler" $param={{{  [<__tiddler__>get[text]] }}}/></$list></$list>"""><$list filter="[<__tiddler__>get[text]minlength[1]]"><$action-sendmessage $message="tm-edit-tiddler" $param={{{  [<__tiddler__>get[text]] }}}/></$list></$list>
+\whitespace trim
 
 <<lingo Shadows/Hint>>
 
 <div class="tc-search">
 <$keyboard key="((input-tab-right))" actions=<<set-next-input-tab>>>
 <$keyboard key="((input-tab-left))" actions=<<set-next-input-tab "before">>>
-<$macrocall $name="keyboard-driven-input" tiddler="$:/temp/advancedsearch/input" storeTitle="$:/temp/advancedsearch"
-		refreshTitle="$:/temp/advancedsearch/refresh" selectionStateTitle="$:/temp/advancedsearch/selected-item" type="search"
-		tag="input" focus={{$:/config/Search/AutoFocus}} configTiddlerFilter="[[$:/core/ui/AdvancedSearch/Shadows]]"
-		inputCancelActions=<<cancel-search-actions>> inputAcceptActions=<<input-accept-actions>> 
-		inputAcceptVariantActions=<<input-accept-variant-actions>>  filterMinLength={{$:/config/Search/MinLength}}/>
+<$macrocall $name="keyboard-driven-input"
+	tiddler="$:/temp/advancedsearch/input"
+	storeTitle="$:/temp/advancedsearch"
+	refreshTitle="$:/temp/advancedsearch/refresh"
+	selectionStateTitle="$:/temp/advancedsearch/selected-item"
+	type="search"
+	tag="input"
+	focus={{$:/config/Search/AutoFocus}}
+	configTiddlerFilter="[[$:/core/ui/AdvancedSearch/Shadows]]"
+	inputCancelActions=<<cancel-search-actions>>
+	inputAcceptActions=<<input-accept-actions>>
+	inputAcceptVariantActions=<<input-accept-variant-actions>>
+	filterMinLength={{$:/config/Search/MinLength}}/>
 </$keyboard>
 </$keyboard>
+&#32;
 <$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
 <$button class="tc-btn-invisible">
 <<cancel-search-actions>>
@@ -35,9 +77,9 @@ first-search-filter: [all[shadows]search<userInput>sort[title]limit[250]] -[[$:/
 
 <$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
 
-<$list filter="[{$:/temp/advancedsearch}minlength{$:/config/Search/MinLength}limit[1]]" emptyMessage="""<div class="tc-search-results">{{$:/language/Search/Search/TooShort}}</div>""" variable="listItem">
+<$list filter="[{$:/temp/advancedsearch}minlength{$:/config/Search/MinLength}limit[1]]" emptyMessage="<div class='tc-search-results'>{{$:/language/Search/Search/TooShort}}</div>" variable="listItem">
 
-<$set name="resultCount" value="""<$count filter="[all[shadows]search{$:/temp/advancedsearch}] -[[$:/temp/advancedsearch]] -[[$:/temp/advancedsearch/input]]"/>""">
+<$set name="resultCount" value="<$count filter='[all[shadows]search{$:/temp/advancedsearch}] -[[$:/temp/advancedsearch]] -[[$:/temp/advancedsearch/input]]'/>">
 
 <div class="tc-search-results">
 

package/core/ui/AdvancedSearch/Standard.tid

@@ -3,15 +3,17 @@ tags: $:/tags/AdvancedSearch
 caption: {{$:/language/Search/Standard/Caption}}
 
 \define lingo-base() $:/language/Search/
-\define set-next-input-tab(beforeafter:"after") <$macrocall $name="change-input-tab" stateTitle="$:/state/tab--1498284803" tag="$:/tags/AdvancedSearch" beforeafter="$beforeafter$" defaultState="$:/core/ui/AdvancedSearch/System" actions="""<$action-setfield $tiddler="$:/state/advancedsearch/currentTab" text=<<nextTab>>/>"""/>
+\define set-next-input-tab(beforeafter:"after") <$macrocall $name="change-input-tab" stateTitle="$:/state/tab--1498284803" tag="$:/tags/AdvancedSearch" beforeafter="$beforeafter$" defaultState="$:/core/ui/AdvancedSearch/System" actions="<$action-setfield $tiddler='$:/state/advancedsearch/currentTab' text=<<nextTab>>/>"/>
 
-\define next-search-tab(beforeafter:"after") <$macrocall $name="change-input-tab" stateTitle="$:/state/tab/search-results/advancedsearch" tag="$:/tags/SearchResults" beforeafter="$beforeafter$" defaultState={{$:/config/SearchResults/Default}} actions="""<$action-setfield $tiddler="$:/state/advancedsearch/standard/currentTab" text=<<nextTab>>/>"""/>
+\define next-search-tab(beforeafter:"after") <$macrocall $name="change-input-tab" stateTitle="$:/state/tab/search-results/advancedsearch" tag="$:/tags/SearchResults" beforeafter="$beforeafter$" defaultState={{$:/config/SearchResults/Default}} actions="<$action-setfield $tiddler='$:/state/advancedsearch/standard/currentTab' text=<<nextTab>>/>"/>
 
-\define cancel-search-actions() <$list filter="[{$:/temp/advancedsearch}!match{$:/temp/advancedsearch/input}]" emptyMessage="""<$action-deletetiddler $filter="[[$:/temp/advancedsearch]] [[$:/temp/advancedsearch/input]] [[$:/temp/advancedsearch/selected-item]]" />"""><$action-setfield $tiddler="$:/temp/advancedsearch/input" text={{$:/temp/advancedsearch}}/><$action-setfield $tiddler="$:/temp/advancedsearch/refresh" text="yes"/></$list><$action-sendmessage $message="tm-focus-selector" $param=""".tc-advanced-search input"""/>
+\define cancel-search-actions() <$list filter="[{$:/temp/advancedsearch}!match{$:/temp/advancedsearch/input}]" emptyMessage="<$action-deletetiddler $filter='[[$:/temp/advancedsearch]] [[$:/temp/advancedsearch/input]] [[$:/temp/advancedsearch/selected-item]]' />"><$action-setfield $tiddler="$:/temp/advancedsearch/input" text={{$:/temp/advancedsearch}}/><$action-setfield $tiddler="$:/temp/advancedsearch/refresh" text="yes"/></$list><$action-sendmessage $message="tm-focus-selector" $param=".tc-advanced-search input"/>
 
-\define input-accept-actions() <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]" emptyMessage="""<$list filter="[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]"><$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/></$list>"""><$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/></$list>
+\define input-accept-actions() <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]" emptyMessage="<$list filter='[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]'><$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/></$list>"><$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/></$list>
 
-\define input-accept-variant-actions() <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]" emptyMessage="""<$list filter="[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]"><$list filter="[<__tiddler__>get[text]minlength[1]]"><$action-sendmessage $message="tm-edit-tiddler" $param={{{  [<__tiddler__>get[text]] }}}/></$list></$list>"""><$list filter="[<__tiddler__>get[text]minlength[1]]"><$action-sendmessage $message="tm-edit-tiddler" $param={{{  [<__tiddler__>get[text]] }}}/></$list></$list>
+\define input-accept-variant-actions() <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]" emptyMessage="<$list filter='[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]'><$list filter='[<__tiddler__>get[text]minlength[1]]'><$action-sendmessage $message='tm-edit-tiddler' $param={{{  [<__tiddler__>get[text]] }}}/></$list></$list>"><$list filter="[<__tiddler__>get[text]minlength[1]]"><$action-sendmessage $message="tm-edit-tiddler" $param={{{  [<__tiddler__>get[text]] }}}/></$list></$list>
+
+\whitespace trim
 
 <<lingo Standard/Hint>>
 
@@ -20,12 +22,19 @@ caption: {{$:/language/Search/Standard/Caption}}
 <$keyboard key="((input-tab-left))" actions=<<set-next-input-tab "before">>>
 <$keyboard key="shift-alt-Right" actions=<<next-search-tab>>>
 <$keyboard key="shift-alt-Left" actions=<<next-search-tab "before">>>
-<$macrocall $name="keyboard-driven-input" tiddler="$:/temp/advancedsearch/input" storeTitle="$:/temp/advancedsearch"
-		refreshTitle="$:/temp/advancedsearch/refresh" selectionStateTitle="$:/temp/advancedsearch/selected-item" type="search"
-		tag="input" focus={{$:/config/Search/AutoFocus}} inputCancelActions=<<cancel-search-actions>> 
-		inputAcceptActions=<<input-accept-actions>> inputAcceptVariantActions=<<input-accept-variant-actions>> 
-		configTiddlerFilter="[[$:/state/search/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}]"
-		filterMinLength={{$:/config/Search/MinLength}}/>
+<$macrocall $name="keyboard-driven-input"
+	tiddler="$:/temp/advancedsearch/input"
+	storeTitle="$:/temp/advancedsearch"
+	refreshTitle="$:/temp/advancedsearch/refresh"
+	selectionStateTitle="$:/temp/advancedsearch/selected-item"
+	type="search"
+	tag="input"
+	focus={{$:/config/Search/AutoFocus}}
+	inputCancelActions=<<cancel-search-actions>>
+	inputAcceptActions=<<input-accept-actions>>
+	inputAcceptVariantActions=<<input-accept-variant-actions>>
+	configTiddlerFilter="[[$:/state/search/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}]"
+	filterMinLength={{$:/config/Search/MinLength}}/>
 </$keyboard>
 </$keyboard>
 </$keyboard>
@@ -39,14 +48,22 @@ caption: {{$:/language/Search/Standard/Caption}}
 </div>
 
 <$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
-<$list filter="[{$:/temp/advancedsearch}minlength{$:/config/Search/MinLength}limit[1]]" emptyMessage="""<div class="tc-search-results">{{$:/language/Search/Search/TooShort}}</div>""" variable="listItem">
-<$vars userInput={{{ [[$:/temp/advancedsearch]get[text]] }}} configTiddler={{{ [[$:/state/search/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}] }}} searchListState="$:/temp/advancedsearch/selected-item">
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]butfirst[]limit[1]]" emptyMessage="""
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]]">
-<$transclude/>
-</$list>
-""">
-<$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]]" default={{$:/config/SearchResults/Default}} actions="""<$action-setfield $tiddler="$:/state/advancedsearch/standard/currentTab" text=<<currentTab>>/>""" explicitState="$:/state/tab/search-results/advancedsearch" />
+<$list
+	filter="[{$:/temp/advancedsearch}minlength{$:/config/Search/MinLength}limit[1]]"
+	emptyMessage="<div class='tc-search-results'>{{$:/language/Search/Search/TooShort}}</div>"
+	variable="listItem">
+<$vars
+	userInput={{{ [[$:/temp/advancedsearch]get[text]] }}}
+	configTiddler={{{ [[$:/state/search/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}] }}}
+	searchListState="$:/temp/advancedsearch/selected-item">
+<$list
+	filter="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]butfirst[]limit[1]]"
+	emptyMessage="<$list filter='[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]]'><$transclude/></$list>">
+<$macrocall $name="tabs"
+	tabsList="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]]"
+	default={{$:/config/SearchResults/Default}}
+	actions="<$action-setfield $tiddler='$:/state/advancedsearch/standard/currentTab' text=<<currentTab>>/>"
+	explicitState="$:/state/tab/search-results/advancedsearch" />
 </$list>
 </$vars>
 </$list>

package/core/ui/AdvancedSearch/System.tid

@@ -4,26 +4,68 @@ caption: {{$:/language/Search/System/Caption}}
 first-search-filter: [is[system]search<userInput>sort[title]limit[250]] -[[$:/temp/advancedsearch]] -[[$:/temp/advancedsearch/input]] -[[$:/temp/advancedsearch/selected-item]]
 
 \define lingo-base() $:/language/Search/
-\define set-next-input-tab(beforeafter:"after",stateTitle,tag,defaultState,currentTabTiddler) <$macrocall $name="change-input-tab" stateTitle="$:/state/tab--1498284803" tag="$:/tags/AdvancedSearch" beforeafter="$beforeafter$" defaultState="$:/core/ui/AdvancedSearch/System" actions="""<$action-setfield $tiddler="$:/state/advancedsearch/currentTab" text=<<nextTab>>/>"""/>
-
-\define cancel-search-actions() <$list filter="[{$:/temp/advancedsearch}!match{$:/temp/advancedsearch/input}]" emptyMessage="""<$action-deletetiddler $filter="[[$:/temp/advancedsearch]] [[$:/temp/advancedsearch/input]] [[$:/temp/advancedsearch/selected-item]]" />"""><$action-setfield $tiddler="$:/temp/advancedsearch/input" text={{$:/temp/advancedsearch}}/><$action-setfield $tiddler="$:/temp/advancedsearch/refresh" text="yes"/></$list><$action-sendmessage $message="tm-focus-selector" $param=""".tc-advanced-search input"""/>
+\define set-next-input-tab(beforeafter:"after",stateTitle,tag,defaultState,currentTabTiddler)
+<$macrocall $name="change-input-tab"
+	stateTitle="$:/state/tab--1498284803"
+	tag="$:/tags/AdvancedSearch"
+	beforeafter="$beforeafter$"
+	defaultState="$:/core/ui/AdvancedSearch/System"
+	actions="<$action-setfield $tiddler='$:/state/advancedsearch/currentTab' text=<<nextTab>>/>"/>
+\end
+
+\define cancel-search-actions()
+\whitespace trim
+<$list
+	filter="[{$:/temp/advancedsearch}!match{$:/temp/advancedsearch/input}]"
+	emptyMessage="<$action-deletetiddler $filter='[[$:/temp/advancedsearch]] [[$:/temp/advancedsearch/input]] [[$:/temp/advancedsearch/selected-item]]' />">
+	<$action-setfield $tiddler="$:/temp/advancedsearch/input" text={{$:/temp/advancedsearch}}/>
+	<$action-setfield $tiddler="$:/temp/advancedsearch/refresh" text="yes"/>
+</$list>
+<$action-sendmessage $message="tm-focus-selector" $param=".tc-advanced-search input"/>
+\end
+
+\define input-accept-actions()
+\whitespace trim
+<$list
+	filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]"
+	emptyMessage="<$list filter='[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]'><$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/></$list>">
+	<$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/>
+</$list>
+\end
 
-\define input-accept-actions() <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]" emptyMessage="""<$list filter="[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]"><$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/></$list>"""><$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/></$list>
+\define input-accept-variant-actions()
+\whitespace trim
+<$list
+	filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]"
+	emptyMessage="<$list filter='[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]'><$list filter='[<__tiddler__>get[text]minlength[1]]'><$action-sendmessage $message='tm-edit-tiddler' $param={{{  [<__tiddler__>get[text]] }}}/></$list></$list>">
+	<$list filter="[<__tiddler__>get[text]minlength[1]]">
+		<$action-sendmessage $message="tm-edit-tiddler" $param={{{  [<__tiddler__>get[text]] }}}/>
+</$list></$list>
+\end
 
-\define input-accept-variant-actions() <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]" emptyMessage="""<$list filter="[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]"><$list filter="[<__tiddler__>get[text]minlength[1]]"><$action-sendmessage $message="tm-edit-tiddler" $param={{{  [<__tiddler__>get[text]] }}}/></$list></$list>"""><$list filter="[<__tiddler__>get[text]minlength[1]]"><$action-sendmessage $message="tm-edit-tiddler" $param={{{  [<__tiddler__>get[text]] }}}/></$list></$list>
+\whitespace trim
 
 <<lingo System/Hint>>
 
 <div class="tc-search">
 <$keyboard key="((input-tab-right))" actions=<<set-next-input-tab>>>
 <$keyboard key="((input-tab-left))" actions=<<set-next-input-tab "before">>>
-<$macrocall $name="keyboard-driven-input" tiddler="$:/temp/advancedsearch/input" storeTitle="$:/temp/advancedsearch"
-		refreshTitle="$:/temp/advancedsearch/refresh" selectionStateTitle="$:/temp/advancedsearch/selected-item"
-		type="search" tag="input" focus={{$:/config/Search/AutoFocus}} configTiddlerFilter="[[$:/core/ui/AdvancedSearch/System]]"
-		inputCancelActions=<<cancel-search-actions>> inputAcceptActions=<<input-accept-actions>> 
-		inputAcceptVariantActions=<<input-accept-variant-actions>> filterMinLength={{$:/config/Search/MinLength}}/>
+<$macrocall $name="keyboard-driven-input"
+	tiddler="$:/temp/advancedsearch/input"
+	storeTitle="$:/temp/advancedsearch"
+	refreshTitle="$:/temp/advancedsearch/refresh"
+	selectionStateTitle="$:/temp/advancedsearch/selected-item"
+	type="search"
+	tag="input"
+	focus={{$:/config/Search/AutoFocus}}
+	configTiddlerFilter="[[$:/core/ui/AdvancedSearch/System]]"
+	inputCancelActions=<<cancel-search-actions>>
+	inputAcceptActions=<<input-accept-actions>>
+	inputAcceptVariantActions=<<input-accept-variant-actions>>
+	filterMinLength={{$:/config/Search/MinLength}}/>
 </$keyboard>
 </$keyboard>
+&#32;
 <$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
 <$button class="tc-btn-invisible">
 <<cancel-search-actions>>
@@ -34,9 +76,9 @@ first-search-filter: [is[system]search<userInput>sort[title]limit[250]] -[[$:/te
 
 <$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
 
-<$list filter="[{$:/temp/advancedsearch}minlength{$:/config/Search/MinLength}limit[1]]" emptyMessage="""<div class="tc-search-results">{{$:/language/Search/Search/TooShort}}</div>""" variable="listItem">
+<$list filter="[{$:/temp/advancedsearch}minlength{$:/config/Search/MinLength}limit[1]]" emptyMessage="<div class='tc-search-results'>{{$:/language/Search/Search/TooShort}}</div>" variable="listItem">
 
-<$set name="resultCount" value="""<$count filter="[is[system]search{$:/temp/advancedsearch}] -[[$:/temp/advancedsearch]] -[[$:/temp/advancedsearch/input]] -[[$:/temp/advancedsearch/selected-item]]"/>""">
+<$set name="resultCount" value="<$count filter='[is[system]search{$:/temp/advancedsearch}] -[[$:/temp/advancedsearch]] -[[$:/temp/advancedsearch/input]] -[[$:/temp/advancedsearch/selected-item]]'/>">
 
 <div class="tc-search-results">
 

package/core/ui/AdvancedSearch.tid

@@ -2,6 +2,7 @@ title: $:/AdvancedSearch
 icon: $:/core/images/advanced-search-button
 color: #bbb
 
+\whitespace trim
 <div class="tc-advanced-search">
 <$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/AdvancedSearch]!has[draft.of]]" default="$:/core/ui/AdvancedSearch/System" actions="""<$action-setfield $tiddler="$:/state/advancedsearch/currentTab" text=<<currentTab>>/>""" explicitState="$:/state/tab--1498284803"/>
 </div>

package/core/ui/AlertTemplate.tid

@@ -1,12 +1,21 @@
 title: $:/core/ui/AlertTemplate
 
+\whitespace trim
 <div class="tc-alert">
 <div class="tc-alert-toolbar">
 <$button class="tc-btn-invisible"><$action-deletetiddler $tiddler=<<currentTiddler>>/>{{$:/core/images/cancel-button}}</$button>
 </div>
 <div class="tc-alert-subtitle">
 <$wikify name="format" text=<<lingo Tiddler/DateFormat>>>
-<$view field="component"/> - <$view field="modified" format="date" template=<<format>>/> <$reveal type="nomatch" state="!!count" text=""><span class="tc-alert-highlight">({{$:/language/Count}}: <$view field="count"/>)</span></$reveal>
+<$view field="component"/>
+&#32;-&#32;
+<$view field="modified" format="date" template=<<format>>/>
+&#32;
+<$reveal type="nomatch" state="!!count" text="">
+<span class="tc-alert-highlight">
+({{$:/language/Count}}:&#32;<$view field="count"/>)
+</span>
+</$reveal>
 </$wikify>
 </div>
 <div class="tc-alert-body">

package/core/ui/Components/tag-link.tid

@@ -1,7 +1,8 @@
 title: $:/core/ui/Components/tag-link
 
+\whitespace trim
 <$link>
-<$set name="backgroundColor" value={{!!color}}>
+<$set name="backgroundColor" value={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}}>
 <span style=<<tag-styles>> class="tc-tag-label">
 <$view field="title" format="text"/>
 </span>

package/core/ui/ControlPanel/Advanced.tid

@@ -2,6 +2,7 @@ title: $:/core/ui/ControlPanel/Advanced
 tags: $:/tags/ControlPanel/Info
 caption: {{$:/language/ControlPanel/Advanced/Caption}}
 
+\whitespace trim
 {{$:/language/ControlPanel/Advanced/Hint}}
 
 <div class="tc-control-panel">

package/core/ui/ControlPanel/Appearance.tid

@@ -2,6 +2,7 @@ title: $:/core/ui/ControlPanel/Appearance
 tags: $:/tags/ControlPanel
 caption: {{$:/language/ControlPanel/Appearance/Caption}}
 
+\whitespace trim
 {{$:/language/ControlPanel/Appearance/Hint}}
 
 <div class="tc-control-panel">

package/core/ui/ControlPanel/Basics.tid

@@ -5,6 +5,7 @@ caption: {{$:/language/ControlPanel/Basics/Caption}}
 \define lingo-base() $:/language/ControlPanel/Basics/
 
 \define show-filter-count(filter)
+\whitespace trim
 <$button class="tc-btn-invisible">
 <$action-setfield $tiddler="$:/temp/advancedsearch" $value="""$filter$"""/>
 <$action-setfield $tiddler="$:/temp/advancedsearch/input" $value="""$filter$"""/>
@@ -13,9 +14,11 @@ caption: {{$:/language/ControlPanel/Basics/Caption}}
 <$action-navigate $to="$:/AdvancedSearch"/>
 <$action-sendmessage $message="tm-focus-selector" $param=".tc-advanced-search input"/>
 ''<$count filter="""$filter$"""/>''
+&#32;
 {{$:/core/images/advanced-search-button}}
 </$button>
 \end
+\whitespace trim
 
 |<<lingo Version/Prompt>> |''<<version>>'' |
 |<$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |

package/core/ui/ControlPanel/Cascades/EditTemplateBody.tid

@@ -0,0 +1,9 @@
+title: $:/core/ui/ControlPanel/EditTemplateBody
+tags: $:/tags/ControlPanel/Cascades
+caption: {{$:/language/ControlPanel/EditTemplateBody/Caption}}
+
+\define lingo-base() $:/language/ControlPanel/EditTemplateBody/
+
+<<lingo Hint>>
+
+{{$:/tags/EditTemplateBodyFilter||$:/snippets/ListTaggedCascade}}

package/core/ui/ControlPanel/Cascades/FieldEditor.tid

@@ -0,0 +1,9 @@
+title: $:/core/ui/ControlPanel/FieldEditor
+tags: $:/tags/ControlPanel/Cascades
+caption: {{$:/language/ControlPanel/FieldEditor/Caption}}
+
+\define lingo-base() $:/language/ControlPanel/FieldEditor/
+
+<<lingo Hint>>
+
+{{$:/tags/FieldEditorFilter||$:/snippets/ListTaggedCascade}}

package/core/ui/ControlPanel/Cascades/StoryTiddler.tid

@@ -0,0 +1,9 @@
+title: $:/core/ui/ControlPanel/StoryTiddler
+tags: $:/tags/ControlPanel/Cascades
+caption: {{$:/language/ControlPanel/StoryTiddler/Caption}}
+
+\define lingo-base() $:/language/ControlPanel/StoryTiddler/
+
+<<lingo Hint>>
+
+{{$:/tags/StoryTiddlerTemplateFilter||$:/snippets/ListTaggedCascade}}

package/core/ui/ControlPanel/Cascades/TiddlerColour.tid

@@ -0,0 +1,9 @@
+title: $:/core/ui/ControlPanel/TiddlerColour
+tags: $:/tags/ControlPanel/Cascades
+caption: {{$:/language/ControlPanel/TiddlerColour/Caption}}
+
+\define lingo-base() $:/language/ControlPanel/TiddlerColour/
+
+<<lingo Hint>>
+
+{{$:/tags/TiddlerColourFilter||$:/snippets/ListTaggedCascade}}

package/core/ui/ControlPanel/Cascades/TiddlerIcon.tid

@@ -0,0 +1,9 @@
+title: $:/core/ui/ControlPanel/TiddlerIcon
+tags: $:/tags/ControlPanel/Cascades
+caption: {{$:/language/ControlPanel/TiddlerIcon/Caption}}
+
+\define lingo-base() $:/language/ControlPanel/TiddlerIcon/
+
+<<lingo Hint>>
+
+{{$:/tags/TiddlerIconFilter||$:/snippets/ListTaggedCascade}}

package/core/ui/ControlPanel/Cascades/ViewTemplateBody.tid

@@ -0,0 +1,9 @@
+title: $:/core/ui/ControlPanel/ViewTemplateBody
+tags: $:/tags/ControlPanel/Cascades
+caption: {{$:/language/ControlPanel/ViewTemplateBody/Caption}}
+
+\define lingo-base() $:/language/ControlPanel/ViewTemplateBody/
+
+<<lingo Hint>>
+
+{{$:/tags/ViewTemplateBodyFilter||$:/snippets/ListTaggedCascade}}

package/core/ui/ControlPanel/Cascades/ViewTemplateTitle.tid

@@ -0,0 +1,9 @@
+title: $:/core/ui/ControlPanel/ViewTemplateTitle
+tags: $:/tags/ControlPanel/Cascades
+caption: {{$:/language/ControlPanel/ViewTemplateTitle/Caption}}
+
+\define lingo-base() $:/language/ControlPanel/ViewTemplateTitle/
+
+<<lingo Hint>>
+
+{{$:/tags/ViewTemplateTitleFilter||$:/snippets/ListTaggedCascade}}

package/core/ui/ControlPanel/Cascades.tid

@@ -0,0 +1,10 @@
+title: $:/core/ui/ControlPanel/Cascades
+tags: $:/tags/ControlPanel/Advanced
+caption: {{$:/language/ControlPanel/Cascades/Caption}}
+
+\whitespace trim
+{{$:/language/ControlPanel/Cascades/Hint}}
+
+<div class="tc-control-panel">
+<$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Cascades]!has[draft.of]]" default="$:/core/ui/ControlPanel/StoryTiddler"/>
+</div>

package/core/ui/ControlPanel/EditorTypes.tid

@@ -3,6 +3,7 @@ tags: $:/tags/ControlPanel/Advanced
 caption: {{$:/language/ControlPanel/EditorTypes/Caption}}
 
 \define lingo-base() $:/language/ControlPanel/EditorTypes/
+\whitespace trim
 
 <<lingo Hint>>
 

package/core/ui/ControlPanel/Info.tid

@@ -2,6 +2,7 @@ title: $:/core/ui/ControlPanel/Info
 tags: $:/tags/ControlPanel
 caption: {{$:/language/ControlPanel/Info/Caption}}
 
+\whitespace trim
 {{$:/language/ControlPanel/Info/Hint}}
 
 <div class="tc-control-panel">

package/core/ui/ControlPanel/KeyboardShortcuts.tid

@@ -5,8 +5,11 @@ caption: {{$:/language/ControlPanel/KeyboardShortcuts/Caption}}
 \define lingo-base() $:/language/ControlPanel/KeyboardShortcuts/
 
 \define new-shortcut(title)
+\whitespace trim
 <div class="tc-dropdown-item-plain">
-<$edit-shortcut tiddler="$title$" placeholder={{$:/language/ControlPanel/KeyboardShortcuts/Add/Prompt}} focus="true" style="width:auto;"/> <$button>
+<$edit-shortcut tiddler="$title$" placeholder={{$:/language/ControlPanel/KeyboardShortcuts/Add/Prompt}} focus="true" style="width:auto;"/>
+&#32;
+<$button>
 <<lingo Add/Caption>>
 <$action-listops
 	$tiddler="$(shortcutTitle)$"
@@ -21,6 +24,7 @@ caption: {{$:/language/ControlPanel/KeyboardShortcuts/Caption}}
 \end
 
 \define shortcut-list-item(caption)
+\whitespace trim
 <td>
 </td>
 <td style="text-align:right;font-size:0.7em;">
@@ -31,16 +35,16 @@ caption: {{$:/language/ControlPanel/KeyboardShortcuts/Caption}}
 <$button popup=<<qualify "$:/state/dropdown/$(shortcutTitle)$">> class="tc-btn-invisible">
 {{$:/core/images/edit-button}}
 </$button>
+&#32;
 <$macrocall $name="displayshortcuts" $output="text/html" shortcuts={{$(shortcutTitle)$}} prefix="<kbd>" separator="</kbd> <kbd>" suffix="</kbd>"/>
 
 <$reveal state=<<qualify "$:/state/dropdown/$(shortcutTitle)$">> type="popup" position="below" animate="yes">
 <div class="tc-block-dropdown-wrapper">
 <div class="tc-block-dropdown tc-edit-type-dropdown tc-popup-keep">
-<$list filter="[list[$(shortcutTitle)$!!text]sort[title]]" variable="shortcut" emptyMessage="""
-<div class="tc-dropdown-item-plain">
-//<<lingo NoShortcuts/Caption>>//
-</div>
-""">
+<$list
+	filter="[list[$(shortcutTitle)$!!text]sort[title]]"
+	variable="shortcut"
+	emptyMessage="<div class='tc-dropdown-item-plain'>//<<lingo NoShortcuts/Caption>>//</div>">
 <div class="tc-dropdown-item-plain">
 <$button class="tc-btn-invisible" tooltip={{$:/language/ControlPanel/KeyboardShortcuts/Remove/Hint}}>
 <$action-listops
@@ -50,6 +54,7 @@ caption: {{$:/language/ControlPanel/KeyboardShortcuts/Caption}}
 />
 <small>{{$:/core/images/close-button}}</small>
 </$button>
+&#32;
 <kbd>
 <$macrocall $name="displayshortcuts" $output="text/html" shortcuts=<<shortcut>>/>
 </kbd>
@@ -65,6 +70,7 @@ caption: {{$:/language/ControlPanel/KeyboardShortcuts/Caption}}
 \end
 
 \define shortcut-list(caption,prefix)
+\whitespace trim
 <tr>
 <$list filter="[[$prefix$$(shortcutName)$]]" variable="shortcutTitle">
 <<shortcut-list-item "$caption$">>
@@ -73,7 +79,8 @@ caption: {{$:/language/ControlPanel/KeyboardShortcuts/Caption}}
 \end
 
 \define shortcut-editor()
-<<shortcut-list "All" "$:/config/shortcuts/">>
+\whitespace trim
+<<shortcut-list "All" "$:/config/shortcuts/">> 
 <<shortcut-list "Mac" "$:/config/shortcuts-mac/">>
 <<shortcut-list "NonMac" "$:/config/shortcuts-not-mac/">>
 <<shortcut-list "Linux" "$:/config/shortcuts-linux/">>
@@ -87,6 +94,7 @@ caption: {{$:/language/ControlPanel/KeyboardShortcuts/Caption}}
 \end
 
 \define shortcut-item-inner()
+\whitespace trim
 <tr>
 <td>
 <$reveal type="nomatch" state=<<dropdownStateTitle>> text="open">
@@ -107,6 +115,7 @@ caption: {{$:/language/ControlPanel/KeyboardShortcuts/Caption}}
 {{$:/core/images/down-arrow}}
 </$button>
 </$reveal>
+&#32;
 ''<$text text=<<shortcutName>>/>''
 </td>
 <td>
@@ -126,10 +135,12 @@ caption: {{$:/language/ControlPanel/KeyboardShortcuts/Caption}}
 \end
 
 \define shortcut-item()
+\whitespace trim
 <$set name="dropdownStateTitle" value=<<qualify "$:/state/dropdown/keyboardshortcut/$(shortcutName)$">>>
 <<shortcut-item-inner>>
 </$set>
 \end
+\whitespace trim
 
 <table>
 <tbody>