tiddlywiki 5.2.2 → 5.2.4

package/core/ui/EditorToolbar/excise-dropdown.tid

@@ -3,9 +3,10 @@ title: $:/core/ui/EditorToolbar/excise-dropdown
 \define lingo-base() $:/language/Buttons/Excise/
 
 \define body(config-title)
+\whitespace trim
 ''<<lingo Hint>>''
 
-<<lingo Caption/NewTitle>> <$edit-text tag="input" tiddler="$config-title$/new-title" default="" focus="true"/>
+<<lingo Caption/NewTitle>>&#32;<$edit-text tag="input" tiddler="$config-title$/new-title" default="" focus="true"/>
 
 <$set name="new-title" value={{$config-title$/new-title}}>
 <$list filter="""[<new-title>is[tiddler]]""">
@@ -15,16 +16,16 @@ title: $:/core/ui/EditorToolbar/excise-dropdown
 </$list>
 </$set>
 
-<$checkbox tiddler="""$config-title$/tagnew""" field="text" checked="yes" unchecked="no" default="false"> <<lingo Caption/Tag>></$checkbox>
+<$checkbox tiddler="""$config-title$/tagnew""" field="text" checked="yes" unchecked="no" default="false">&#32;<<lingo Caption/Tag>></$checkbox>
 
-<<lingo Caption/Replace>> <$select tiddler="""$config-title$/type""" default="transclude">
+<<lingo Caption/Replace>>&#32;<$select tiddler="""$config-title$/type""" default="transclude">
 <option value="link"><<lingo Caption/Replace/Link>></option>
 <option value="transclude"><<lingo Caption/Replace/Transclusion>></option>
 <option value="macro"><<lingo Caption/Replace/Macro>></option>
 </$select>
 
 <$reveal state="""$config-title$/type""" type="match" text="macro">
-<<lingo Caption/MacroName>> <$edit-text tag="input" tiddler="""$config-title$/macro-title""" default="translink"/>
+<<lingo Caption/MacroName>>&#32;<$edit-text tag="input" tiddler="""$config-title$/macro-title""" default="translink"/>
 </$reveal>
 
 <$button>

package/core/ui/EditorToolbar/file-import.tid

@@ -13,6 +13,7 @@ condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]
 \define replacement-text-file() [[$title$]]
 
 \define postImportActions()
+\whitespace trim
 <$list filter="[<importTitle>links[]] :reduce[get[type]prefix[image]then<replacement-text-image>else<replacement-text-file>search-replace[$title$],<currentTiddler>addprefix<accumulator>]" variable="imageTitle">
 <$action-sendmessage
 	$message="tm-edit-text-operation"
@@ -24,10 +25,13 @@ condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]
 \end
 
 \define buttons()
+\whitespace trim
 <$button class="tc-btn-invisible" actions=<<closePopupActions>> ><<lingo Listing/Cancel/Caption>></$button>
+&#32;
 <$button class="tc-btn-invisible" message="tm-perform-import" param=<<importTitle>> actions=<<postImportActions>> ><<lingo Listing/Import/Caption>></$button>
 \end
 
+\whitespace trim
 <$reveal type="popup" state=<<importState>> tag="div" class="tc-editor-importpopup">
 <div class="tc-editor-import">
 <$list filter="[<importTitle>field:plugin-type[import]]">

package/core/ui/EditorToolbar/link-dropdown.tid

@@ -3,6 +3,7 @@ title: $:/core/ui/EditorToolbar/link-dropdown
 \define lingo-base() $:/language/Buttons/Link/
 
 \define add-link-actions()
+\whitespace trim
 <$action-sendmessage $message="tm-edit-text-operation" $param="make-link" text={{$(linkTiddler)$}} />
 <$action-deletetiddler $filter="[<dropdown-state>] [<searchTiddler>] [<linkTiddler>] [<storeTitle>] [<searchListState>]"/>
 \end
@@ -10,20 +11,22 @@ title: $:/core/ui/EditorToolbar/link-dropdown
 \define get-focus-selector() [data-tiddler-title="$(cssEscapedTitle)$"] .tc-create-wikitext-link input
 
 \define cancel-search-actions-inner()
-<$set name="userInput" value={{{ [<storeTitle>get[text]] }}}><$list filter="[<searchTiddler>get[text]!match<userInput>]" emptyMessage="""<$action-deletetiddler $filter="[<searchTiddler>] [<linkTiddler>] [<storeTitle>] [<searchListState>]"/>"""><$action-setfield $tiddler=<<searchTiddler>> text=<<userInput>>/><$action-setfield $tiddler=<<refreshTitle>> text="yes"/></$list></$set>
+<$set name="userInput" value={{{ [<storeTitle>get[text]] }}}><$list filter="[<searchTiddler>get[text]!match<userInput>]" emptyMessage="<$action-deletetiddler $filter='[<searchTiddler>] [<linkTiddler>] [<storeTitle>] [<searchListState>]'/>"><$action-setfield $tiddler=<<searchTiddler>> text=<<userInput>>/><$action-setfield $tiddler=<<refreshTitle>> text="yes"/></$list></$set>
 \end
 
-\define cancel-search-actions() <$list filter="[<storeTitle>!has[text]] +[<searchTiddler>!has[text]]" emptyMessage="""<<cancel-search-actions-inner>>"""><$action-sendmessage $message="tm-edit-text-operation" $param="focus-editor"/></$list>
+\define cancel-search-actions() <$list filter="[<storeTitle>!has[text]] +[<searchTiddler>!has[text]]" emptyMessage="<<cancel-search-actions-inner>>"><$action-sendmessage $message="tm-edit-text-operation" $param="focus-editor"/></$list>
 
 \define external-link()
+\whitespace trim
 <$button class="tc-btn-invisible" style="width: auto; display: inline-block; background-colour: inherit;" actions=<<add-link-actions>>>
 {{$:/core/images/chevron-right}}
 </$button>
 \end
 
-\define set-next-input-tab(beforeafter:"after") <$macrocall $name="change-input-tab" stateTitle="$:/state/tab/search-results/sidebar" tag="$:/tags/SearchResults" beforeafter="$beforeafter$" defaultState={{$:/config/SearchResults/Default}} actions="""<$action-setfield $tiddler="$:/state/search/currentTab" text=<<nextTab>>/>"""/>
+\define set-next-input-tab(beforeafter:"after") <$macrocall $name="change-input-tab" stateTitle="$:/state/tab/search-results/sidebar" tag="$:/tags/SearchResults" beforeafter="$beforeafter$" defaultState={{$:/config/SearchResults/Default}} actions="<$action-setfield $tiddler='$:/state/search/currentTab' text=<<nextTab>>/>"/>
 
 \define body(config-title)
+\whitespace trim
 ''<<lingo Hint>>''
 
 <$vars searchTiddler="""$config-title$/search""" linkTiddler="""$config-title$/link""" linktext="" searchListState=<<qualify "$:/temp/link-search/selected-item">> refreshTitle=<<qualify "$:/temp/link-search/refresh">> storeTitle=<<qualify "$:/temp/link-search/input">>>
@@ -33,13 +36,15 @@ title: $:/core/ui/EditorToolbar/link-dropdown
 <$keyboard key="((input-tab-left))" actions=<<set-next-input-tab "before">> class="tc-create-wikitext-link">
 <$macrocall $name="keyboard-driven-input" tiddler=<<searchTiddler>> storeTitle=<<storeTitle>>
 		selectionStateTitle=<<searchListState>> refreshTitle=<<refreshTitle>> type="search" filterMinLength="1"
-		tag="input" focus="true" class="tc-popup-handle" inputCancelActions=<<cancel-search-actions>> 
-		inputAcceptActions=<<add-link-actions>> placeholder={{$:/language/Search/Search}} default="" 
+		tag="input" focus="true" class="tc-popup-handle" inputCancelActions=<<cancel-search-actions>>
+		inputAcceptActions=<<add-link-actions>> placeholder={{$:/language/Search/Search}} default=""
 		configTiddlerFilter="[[$:/state/search/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}]" />
 </$keyboard>
 </$keyboard>
+&#32;
 <$reveal tag="span" state=<<storeTitle>> type="nomatch" text="">
 <<external-link>>
+&#32;
 <$button class="tc-btn-invisible" style="width: auto; display: inline-block; background-colour: inherit;">
 <<cancel-search-actions>><$set name="cssEscapedTitle" value={{{ [<storyTiddler>escapecss[]] }}}><$action-sendmessage $message="tm-focus-selector" $param=<<get-focus-selector>>/></$set>
 {{$:/core/images/close-button}}

package/core/ui/EditorToolbar/more-dropdown.tid

@@ -5,10 +5,14 @@ $:/config/EditorToolbarButtons/Visibility/$(toolbarItem)$
 \end
 
 \define conditional-button()
+\whitespace trim
 <$list filter={{$(toolbarItem)$!!condition}} variable="condition">
-<$transclude tiddler="$:/core/ui/EditTemplate/body/toolbar/button" mode="inline"/> <$transclude tiddler=<<toolbarItem>> field="description"/>
+<$transclude tiddler="$:/core/ui/EditTemplate/body/toolbar/button" mode="inline"/>
+&#32;
+<$transclude tiddler=<<toolbarItem>> field="description"/>
 </$list>
 \end
+\whitespace trim
 
 <div class="tc-text-editor-toolbar-more">
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/EditorToolbar]!has[draft.of]] -[[$:/core/ui/EditorToolbar/more]]">

package/core/ui/EditorToolbar/paint.tid

@@ -9,6 +9,7 @@ dropdown: $:/core/ui/EditorToolbar/paint-dropdown
 \define toolbar-paint()
 <div style="display: inline-block; vertical-align: middle; background-color: $(colour-picker-value)$; width: 1em; height: 1em; border-radius: 50%;"/>
 \end
+\whitespace trim
 <$set name="colour-picker-value" value={{$:/config/BitmapEditor/Colour}}>
 <<toolbar-paint>>
 </$set>

package/core/ui/EditorToolbar/preview.tid

@@ -8,6 +8,7 @@ condition: [<targetTiddler>]
 button-classes: tc-text-editor-toolbar-item-start-group
 shortcuts: ((preview))
 
+\whitespace trim
 <$reveal state=<<edit-preview-state>> type="match" text="yes" tag="span">
 {{$:/core/images/preview-open}}
 <$action-setfield $tiddler=<<edit-preview-state>> $value="no"/>

package/core/ui/EditorToolbar/size-dropdown.tid

@@ -33,9 +33,14 @@ title: $:/core/ui/EditorToolbar/size-dropdown
 \end
 
 \define toolbar-button-size(config-title)
+\whitespace trim
 ''{{$:/language/Buttons/Size/Hint}}''
 
-<<lingo Caption/Width>> <$edit-text tag="input" tiddler="""$config-title$/new-width""" default=<<tv-bitmap-editor-width>> focus="true" size="8"/> <<lingo Caption/Height>> <$edit-text tag="input" tiddler="""$config-title$/new-height""" default=<<tv-bitmap-editor-height>> size="8"/> <$button popup="""$config-title$/presets-popup""" class="tc-btn-invisible tc-popup-keep" style="width: auto; display: inline-block; background-colour: inherit;" selectedClass="tc-selected">
+<<lingo Caption/Width>>&#32;<$edit-text tag="input" tiddler="""$config-title$/new-width""" default=<<tv-bitmap-editor-width>> focus="true" size="8"/>
+&#32;
+<<lingo Caption/Height>>&#32;<$edit-text tag="input" tiddler="""$config-title$/new-height""" default=<<tv-bitmap-editor-height>> size="8"/>
+&#32;
+<$button popup="""$config-title$/presets-popup""" class="tc-btn-invisible tc-popup-keep" style="width: auto; display: inline-block; background-colour: inherit;" selectedClass="tc-selected">
 {{$:/core/images/down-arrow}}
 </$button>
 

package/core/ui/ExportTiddlyWikiCore.tid

@@ -3,20 +3,30 @@ title: $:/core/ui/ExportTiddlyWikiCore
 \define jsFileName() tiddlywikicore-$(version)$.js
 \define noExportMsg()
 It appears that you have a wiki with an external ~TiddlyWiki core. The export action cannot be performed.
-<p>You will need to view the page source in your browser. Then go to the very bottom the the source, find the last `<script>` 
+<p>You will need to view the page source in your browser. Then go to the very bottom the the source, find the last `<script>`
 element, and right-click its `src` URI. Save the link as ''$(jsFileName)$''</p>
 \end
+\rules except wikilink
+\whitespace trim
 
 ''For advanced users''
 
-Export the ~TiddlyWiki core ~JavaScript code for running with external ~JavaScript:
+Export the TiddlyWiki core JavaScript code for running with external JavaScript:
 
-<$button tooltip="Export the ~TiddlyWiki core code for running with external ~JavaScript" aria-label="export TiddlyWiki core" class="tc-btn-big-green">
-<$list filter="[[$:/boot/boot.js]is[missing]]" variable="ignore" emptyMessage="""<$action-sendmessage $message="tm-download-file" $param="$:/core/templates/tiddlywiki5.js" filename=<<jsFileName>>/>""" >
+<$button
+	tooltip="Export the TiddlyWiki core code for running with external JavaScript"
+	aria-label="export TiddlyWiki core"
+	class="tc-btn-big-green">
+<$list
+	filter="[[$:/boot/boot.js]is[missing]]"
+	variable="ignore"
+	emptyMessage="<$action-sendmessage $message='tm-download-file' $param='$:/core/templates/tiddlywiki5.js' filename=<<jsFileName>>/>" >
 <$action-setfield $tiddler=<<qualify "$:/temp/alert">> text=<<noExportMsg>> subtitle="Export ~TiddllyWiki Core"/>
 <$action-sendmessage $message="tm-modal" $param=<<qualify "$:/temp/alert">>/>
 </$list>
-{{$:/core/images/download-button}} Download ~TiddlyWiki core
+{{$:/core/images/download-button}}
+&#32;
+Download TiddlyWiki core
 </$button>
 
 [[Further information|https://tiddlywiki.com/#Using%20the%20external%20JavaScript%20template]]

package/core/ui/ImportListing.tid

@@ -7,6 +7,7 @@ title: $:/core/ui/ImportListing
 \define payloadTitleFilter() [<currentTiddler>get<renameField>minlength[1]else<payloadTiddler>]
 
 \define overWriteWarning()
+\whitespace trim
 <$list filter="[<currentTiddler>!has<suppressedField>]">
 <$text text={{{[subfilter<payloadTitleFilter>!is[tiddler]then[]] ~[<lingo-base>addsuffix[Listing/Rename/OverwriteWarning]get[text]]}}}/>
 </$list>
@@ -43,16 +44,19 @@ title: $:/core/ui/ImportListing
 \define renameFieldState() $(currentTiddler)$!!state-rename-$(payloadTiddler)$
 
 \define select-all-actions()
+\whitespace trim
 <$list filter="[all[current]plugintiddlers[]sort[title]]" variable="payloadTiddler">
 <$action-setfield $field={{{ [<payloadTiddler>addprefix[selection-]] }}} $value={{$:/state/import/select-all}}/>
 </$list>
 \end
 
+\whitespace trim
 <table class="tc-import-table">
 <tbody>
 <tr>
 <th align="left">
 <$checkbox tiddler="$:/state/import/select-all" field="text" checked="checked" unchecked="unchecked" default="checked" actions=<<select-all-actions>>>
+&#32;
 <<lingo Listing/Select/Caption>>
 </$checkbox>
 </th>
@@ -88,26 +92,40 @@ title: $:/core/ui/ImportListing
 </td>
 <td>
 <<selectionInfo>>
+&#32;
 <<libraryInfo>>
+&#32;
 <<overWriteWarning>>
 </td>
 </tr>
 <$reveal type="match" state=<<renameFieldState>> text="yes" tag="tr">
-<td colspan="3">
-<div class="tc-flex">
-<$edit-text tiddler=<<newImportTitleTiddler>>  default={{{[subfilter<payloadTitleFilter>]}}} tag="input" class="tc-import-rename tc-flex-grow-1"/><span class="tc-small-gap-left"><$button  class="tc-btn-invisible" set=<<renameFieldState>> setTo="no" tooltip={{{[<lingo-base>addsuffix[Listing/Rename/CancelRename]get[text]]}}}>{{$:/core/images/close-button}}<$action-deletetiddler $tiddler=<<newImportTitleTiddler>>/></$button><span class="tc-small-gap-right"/></span><$button  class="tc-btn-invisible" set=<<renameFieldState>> setTo="no" tooltip={{{[<lingo-base>addsuffix[Listing/Rename/ConfirmRename]get[text]]}}}>{{$:/core/images/done-button}}<$action-setfield $field=<<renameField>> $value={{{[<newImportTitleTiddler>get[text]minlength[1]else<payloadTiddler>]}}} /><$action-deletetiddler $tiddler=<<newImportTitleTiddler>>/></$button>
-</div>
-</td>
+	<td colspan="3">
+		<div class="tc-flex">
+			<$edit-text tiddler=<<newImportTitleTiddler>>  default={{{[subfilter<payloadTitleFilter>]}}} tag="input" class="tc-import-rename tc-flex-grow-1"/>
+			<span class="tc-small-gap-left">
+				<$button  class="tc-btn-invisible" set=<<renameFieldState>> setTo="no" tooltip={{{[<lingo-base>addsuffix[Listing/Rename/CancelRename]get[text]]}}}>
+					{{$:/core/images/close-button}}
+					<$action-deletetiddler $tiddler=<<newImportTitleTiddler>>/>
+				</$button>
+				<span class="tc-small-gap-right"/>
+			</span>
+			<$button  class="tc-btn-invisible" set=<<renameFieldState>> setTo="no" tooltip={{{[<lingo-base>addsuffix[Listing/Rename/ConfirmRename]get[text]]}}}>
+				{{$:/core/images/done-button}}
+				<$action-setfield $field=<<renameField>> $value={{{[<newImportTitleTiddler>get[text]minlength[1]else<payloadTiddler>]}}} />
+				<$action-deletetiddler $tiddler=<<newImportTitleTiddler>>/>
+			</$button>
+		</div>
+	</td>
 </$reveal>
-<tr>
+<$reveal type="match" text="yes" state=<<previewPopupState>> tag="tr">
 <td colspan="3">
-<$reveal type="match" text="yes" state=<<previewPopupState>> tag="div">
 <$list filter="[{$:/state/importpreviewtype}has[text]]" variable="listItem" emptyMessage={{$:/core/ui/ImportPreviews/Text}}>
-<$transclude tiddler={{$:/state/importpreviewtype}}/>
+	<div>
+		<$transclude tiddler={{$:/state/importpreviewtype}}/>
+	</div>
 </$list>
-</$reveal>
 </td>
-</tr>
+</$reveal>
 </$list>
 </tbody>
 </table>

package/core/ui/ImportPreviews/Fields.tid

@@ -2,6 +2,7 @@ title: $:/core/ui/ImportPreviews/Fields
 tags: $:/tags/ImportPreview
 caption: {{$:/language/Import/Listing/Preview/Fields}}
 
+\whitespace trim
 <table class="tc-view-field-table">
 <tbody>
 <$list filter="[<payloadTiddler>subtiddlerfields<currentTiddler>sort[]] -text" variable="fieldName">

package/core/ui/KeyboardShortcuts/advanced-search.tid

@@ -2,7 +2,8 @@ title: $:/core/ui/KeyboardShortcuts/advanced-search
 tags: $:/tags/KeyboardShortcut
 key: ((advanced-search))
 
+\whitespace trim
 <$navigator story="$:/StoryList" history="$:/HistoryList">
-<$action-navigate $to="$:/AdvancedSearch"/>
+<$action-navigate $to="$:/AdvancedSearch" $scroll="yes"/>
 <$action-sendmessage $message="tm-focus-selector" $param="""[data-tiddler-title="$:/AdvancedSearch"] .tc-search input""" preventScroll="true"/>
 </$navigator>

package/core/ui/KeyboardShortcuts/change-sidebar-layout.tid

@@ -2,7 +2,9 @@ title: $:/core/ui/KeyboardShortcuts/change-sidebar-layout
 tags: $:/tags/KeyboardShortcut
 key: ((change-sidebar-layout))
 
-<$list filter="[{$:/themes/tiddlywiki/vanilla/options/sidebarlayout}match[fixed-fluid]]" 
-emptyMessage="""<$action-setfield $tiddler="$:/themes/tiddlywiki/vanilla/options/sidebarlayout" text="fixed-fluid"/>""">
+\whitespace trim
+<$list
+	filter="[{$:/themes/tiddlywiki/vanilla/options/sidebarlayout}match[fixed-fluid]]"
+	emptyMessage="<$action-setfield $tiddler='$:/themes/tiddlywiki/vanilla/options/sidebarlayout' text='fixed-fluid'/>">
 <$action-setfield $tiddler="$:/themes/tiddlywiki/vanilla/options/sidebarlayout" text="fluid-fixed"/>
 </$list>

package/core/ui/KeyboardShortcuts/new-image.tid

@@ -2,6 +2,7 @@ title: $:/core/ui/KeyboardShortcuts/new-image
 tags: $:/tags/KeyboardShortcut
 key: ((new-image))
 
+\whitespace trim
 <$navigator story="$:/StoryList" history="$:/HistoryList" openLinkFromInsideRiver={{$:/config/Navigation/openLinkFromInsideRiver}} openLinkFromOutsideRiver={{$:/config/Navigation/openLinkFromOutsideRiver}} relinkOnRename={{$:/config/RelinkOnRename}}>
 {{$:/core/ui/Actions/new-image}}
 </$navigator>

package/core/ui/KeyboardShortcuts/new-journal.tid

@@ -2,6 +2,7 @@ title: $:/core/ui/KeyboardShortcuts/new-journal
 tags: $:/tags/KeyboardShortcut
 key: ((new-journal))
 
+\whitespace trim
 <$navigator story="$:/StoryList" history="$:/HistoryList" openLinkFromInsideRiver={{$:/config/Navigation/openLinkFromInsideRiver}} openLinkFromOutsideRiver={{$:/config/Navigation/openLinkFromOutsideRiver}} relinkOnRename={{$:/config/RelinkOnRename}}>
 {{$:/core/ui/Actions/new-journal}}
 </$navigator>

package/core/ui/KeyboardShortcuts/new-tiddler.tid

@@ -2,6 +2,7 @@ title: $:/core/ui/KeyboardShortcuts/new-tiddler
 tags: $:/tags/KeyboardShortcut
 key: ((new-tiddler))
 
+\whitespace trim
 <$navigator story="$:/StoryList" history="$:/HistoryList" openLinkFromInsideRiver={{$:/config/Navigation/openLinkFromInsideRiver}} openLinkFromOutsideRiver={{$:/config/Navigation/openLinkFromOutsideRiver}} relinkOnRename={{$:/config/RelinkOnRename}}>
 {{$:/core/ui/Actions/new-tiddler}}
 </$navigator>

package/core/ui/KeyboardShortcuts/save-wiki.tid

@@ -2,6 +2,7 @@ title: $:/core/ui/KeyboardShortcuts/save-wiki
 tags: $:/tags/KeyboardShortcut
 key: ((save-wiki))
 
+\whitespace trim
 <$wikify name="site-title" text={{$:/config/SaveWikiButton/Filename}}>
 <$action-sendmessage $message="tm-save-wiki" $param={{$:/config/SaveWikiButton/Template}} filename=<<site-title>>/>
 </$wikify>

package/core/ui/KeyboardShortcuts/toggle-sidebar.tid

@@ -2,8 +2,9 @@ title: $:/core/ui/KeyboardShortcuts/toggle-sidebar
 tags: $:/tags/KeyboardShortcut
 key: ((toggle-sidebar))
 
-<$list filter="[[$:/state/sidebar]is[missing]] [{$:/state/sidebar}removeprefix[yes]]" emptyMessage="""
-<$action-setfield $tiddler="$:/state/sidebar" text="yes"/>
-""">
+\whitespace trim
+<$list
+	filter="[[$:/state/sidebar]is[missing]] [{$:/state/sidebar}removeprefix[yes]]"
+	emptyMessage="<$action-setfield $tiddler='$:/state/sidebar' text='yes'/>">
 <$action-setfield $tiddler="$:/state/sidebar" text="no"/>
 </$list>

package/core/ui/LayoutSwitcher.tid

@@ -2,14 +2,26 @@ title: $:/snippets/LayoutSwitcher
 tags: $:/tags/ControlPanel/Appearance
 caption: {{$:/language/ControlPanel/LayoutSwitcher/Caption}}
 
+\whitespace trim
 <$linkcatcher to="$:/layout">
 <div class="tc-chooser">
 <$list filter="[all[tiddlers+shadows]tag[$:/tags/Layout]] [[$:/core/ui/PageTemplate]] +[!is[draft]sort[name]]">
-<$list filter="[{$:/layout}!has[text]]" variable="ignore" emptyMessage="""
-<$set name="cls" filter="[all[current]field:title{$:/layout}]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item"><div class=<<cls>>><$link to={{!!title}}>''<$transclude field="name"/>'' - <$transclude field="description"/></$link></div>
-</$set>
+<$list
+	filter="[{$:/layout}!has[text]]"
+	variable="ignore"
+	emptyMessage="""\whitespace trim
+		<$set name="cls" filter="[all[current]field:title{$:/layout}]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item">
+		<div class=<<cls>>>
+		<$link to={{!!title}}>
+		''<$transclude field="name"/>''&#32;-&#32;<$transclude field="description"/>
+		</$link></div></$set>
 """>
-<$set name="cls" filter="[all[current]field:title[$:/core/ui/PageTemplate]]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item"><div class=<<cls>>><$link to={{!!title}}>''<$transclude field="name"/>'' - <$transclude field="description"/></$link></div>
+<$set name="cls" filter="[all[current]field:title[$:/core/ui/PageTemplate]]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item">
+<div class=<<cls>>>
+<$link to={{!!title}}>
+''<$transclude field="name"/>''&#32;-&#32;<$transclude field="description"/>
+</$link>
+</div>
 </$set>
 </$list>
 </$list>

package/core/ui/ListItemTemplate.tid

@@ -1,5 +1,3 @@
 title: $:/core/ui/ListItemTemplate
 
-<div class="tc-menu-list-item">
-<$link />
-</div>
+<div class="tc-menu-list-item"><$link /></div>

package/core/ui/ListTaggedCascade.tid

@@ -1,5 +1,6 @@
 title: $:/snippets/ListTaggedCascade
 
+\whitespace trim
 {{||$:/language/ControlPanel/Cascades/TagPrompt}}
 
 <ol>

package/core/ui/Manager/ItemMainFields.tid

@@ -2,6 +2,7 @@ title: $:/Manager/ItemMain/Fields
 tags: $:/tags/Manager/ItemMain
 caption: {{$:/language/Manager/Item/Fields}}
 
+\whitespace trim
 <table>
 <tbody>
 <$list filter="[all[current]fields[]sort[title]] -text" template="$:/core/ui/TiddlerFieldTemplate" variable="listItem"/>

package/core/ui/Manager/ItemSidebarColour.tid

@@ -7,9 +7,12 @@ height: 1em;
 background-color: $(colour)$
 \end
 
+\whitespace trim
 <$vars colour={{!!color}}>
 <p style=<<swatch-styles>>/>
 </$vars>
 <p>
-<$edit-text field="color" tag="input" type="color"/> / <$edit-text field="color" tag="input" type="text" size="9"/>
+<$edit-text field="color" tag="input" type="color"/>
+&#32;/&#32;
+<$edit-text field="color" tag="input" type="text" size="9"/>
 </p>

package/core/ui/Manager/ItemSidebarIcon.tid

@@ -2,6 +2,7 @@ title: $:/Manager/ItemSidebar/Icon
 tags: $:/tags/Manager/ItemSidebar
 caption: {{$:/language/Manager/Item/Icon}}
 
+\whitespace trim
 <p>
 <div class="tc-manager-icon-editor">
 <$button popup=<<qualify "$:/state/popup/image-picker">> class="tc-btn-invisible">
@@ -12,10 +13,9 @@ caption: {{$:/language/Manager/Item/Icon}}
 <div class="tc-block-dropdown-wrapper" style="position: static;">
 <$reveal state=<<qualify "$:/state/popup/image-picker">> type="nomatch" text="" default="" tag="div" class="tc-popup">
 <div class="tc-block-dropdown tc-popup-keep" style="width: 80%; left: 10%; right: 10%; padding: 0.5em;">
-<$macrocall $name="image-picker-include-tagged-images" actions="""
-<$action-setfield $field="icon" $value=<<imageTitle>>/>
-<$action-deletetiddler $tiddler=<<qualify "$:/state/popup/image-picker">>/>
-"""/>
+<$macrocall
+	$name="image-picker-include-tagged-images"
+	actions="<$action-setfield $field='icon' $value=<<imageTitle>>/><$action-deletetiddler $tiddler=<<qualify '$:/state/popup/image-picker'>>/>"/>
 </div>
 </$reveal>
 </div>

package/core/ui/Manager/ItemSidebarTools.tid

@@ -2,9 +2,14 @@ title: $:/Manager/ItemSidebar/Tools
 tags: $:/tags/Manager/ItemSidebar
 caption: {{$:/language/Manager/Item/Tools}}
 
+\whitespace trim
 <p>
-<$button to=<<currentTiddler>>>{{$:/core/images/link}} open</$button>
+<$button to=<<currentTiddler>>>
+{{$:/core/images/link}}&#32;open
+</$button>
 </p>
 <p>
-<$button message="tm-edit-tiddler" param=<<currentTiddler>>>{{$:/core/images/edit-button}} edit</$button>
+<$button message="tm-edit-tiddler" param=<<currentTiddler>>>
+{{$:/core/images/edit-button}}&#32;edit
+</$button>
 </p>

package/core/ui/Manager.tid

@@ -5,16 +5,17 @@ color: #bbb
 \define lingo-base() $:/language/Manager/
 
 \define list-item-content-item()
+\whitespace trim
 <div class="tc-manager-list-item-content-item">
 	<$vars state-title="""$:/state/popup/manager/item/$(listItem)$""">
 		<$reveal state=<<state-title>> type="match" text="show" default="show" tag="div">
 			<$button set=<<state-title>> setTo="hide" class="tc-btn-invisible tc-manager-list-item-content-item-heading">
-				{{$:/core/images/down-arrow}} <$transclude tiddler=<<listItem>> field="caption"/>
+				{{$:/core/images/down-arrow}}&#32;<$transclude tiddler=<<listItem>> field="caption"/>
 			</$button>
 		</$reveal>
 		<$reveal state=<<state-title>> type="nomatch" text="show" default="show" tag="div">
 			<$button set=<<state-title>> setTo="show" class="tc-btn-invisible tc-manager-list-item-content-item-heading">
-				{{$:/core/images/right-arrow}} <$transclude tiddler=<<listItem>> field="caption"/>
+				{{$:/core/images/right-arrow}}&#32;<$transclude tiddler=<<listItem>> field="caption"/>
 			</$button>
 		</$reveal>
 		<$reveal state=<<state-title>> type="match" text="show" default="show" tag="div" class="tc-manager-list-item-content-item-body">
@@ -24,19 +25,20 @@ color: #bbb
 </div>
 \end
 
+\whitespace trim
 <div class="tc-manager-wrapper">
 	<div class="tc-manager-controls">
 		<div class="tc-manager-control">
-			<<lingo Controls/Show/Prompt>> <$select tiddler="$:/config/Manager/Show" default="tiddlers">
+			<<lingo Controls/Show/Prompt>>&#32;<$select tiddler="$:/config/Manager/Show" default="tiddlers">
 				<option value="tiddlers"><<lingo Controls/Show/Option/Tiddlers>></option>
 				<option value="tags"><<lingo Controls/Show/Option/Tags>></option>
 			</$select>
 		</div>
 		<div class="tc-manager-control">
-			<<lingo Controls/Search/Prompt>> <$edit-text tiddler="$:/config/Manager/Filter" tag="input" default="" placeholder={{$:/language/Manager/Controls/Search/Placeholder}}/>
+			<<lingo Controls/Search/Prompt>>&#32;<$edit-text tiddler="$:/config/Manager/Filter" tag="input" default="" placeholder={{$:/language/Manager/Controls/Search/Placeholder}}/>
 		</div>
 		<div class="tc-manager-control">
-			<<lingo Controls/FilterByTag/Prompt>> <$select tiddler="$:/config/Manager/Tag" default="">
+			<<lingo Controls/FilterByTag/Prompt>>&#32;<$select tiddler="$:/config/Manager/Tag" default="">
 				<option value=""><<lingo Controls/FilterByTag/None>></option>
 				<$list filter="[!is{$:/config/Manager/System}tags[]!is[system]sort[title]]" variable="tag">
 					<option value=<<tag>>><$text text=<<tag>>/></option>
@@ -44,7 +46,7 @@ color: #bbb
 			</$select>
 		</div>
 		<div class="tc-manager-control">
-			<<lingo Controls/Sort/Prompt>> <$select tiddler="$:/config/Manager/Sort" default="title">
+			<<lingo Controls/Sort/Prompt>>&#32;<$select tiddler="$:/config/Manager/Sort" default="title">
 				<optgroup label="Common">
 					<$list filter="title modified modifier created creator created" variable="field">
 						<option value=<<field>>><$text text=<<field>>/></option>
@@ -56,12 +58,15 @@ color: #bbb
 					</$list>
 				</optgroup>
 			</$select>
+			&#32;
 			<$checkbox tiddler="$:/config/Manager/Order" field="text" checked="reverse" unchecked="forward" default="forward">
+				&#32;
 				<<lingo Controls/Order/Prompt>>
 			</$checkbox>
 		</div>
 		<div class="tc-manager-control">
 			<$checkbox tiddler="$:/config/Manager/System" field="text" checked="" unchecked="system" default="system">
+				&#32;
 				{{$:/language/SystemTiddlers/Include/Prompt}}
 			</$checkbox>
 		</div>

package/core/ui/MissingTemplate.tid

@@ -1,5 +1,6 @@
 title: $:/core/ui/MissingTemplate
 
+\whitespace trim
 <div class="tc-tiddler-missing">
 <$button popup=<<qualify "$:/state/popup/missing">> class="tc-btn-invisible tc-missing-tiddler-label">
 <$view field="title" format="text" />

package/core/ui/MoreSideBar/Types.tid

@@ -2,6 +2,7 @@ title: $:/core/ui/MoreSideBar/Types
 tags: $:/tags/MoreSideBar
 caption: {{$:/language/SideBar/Types/Caption}}
 
+\whitespace trim
 <$list filter={{$:/core/Filters/TypedTiddlers!!filter}}>
 <div class="tc-menu-list-item">
 <$view field="type"/>

package/core/ui/PageControls/controlpanel.tid

@@ -16,6 +16,6 @@ description: {{$:/language/Buttons/ControlPanel/Hint}}
 </$button>
 \end
 
-<$list filter="[list[$:/StoryList]] +[field:title[$:/ControlPanel]]" emptyMessage=<<control-panel-button>>>
+<$list filter="[list<tv-story-list>] +[field:title[$:/ControlPanel]]" emptyMessage=<<control-panel-button>>>
 <<control-panel-button "tc-selected">>
 </$list>

package/core/ui/PageControls/layout.tid

@@ -0,0 +1,15 @@
+title: $:/core/ui/Buttons/layout
+tags: $:/tags/PageControls
+caption: {{$:/core/images/layout-button}} {{$:/language/Buttons/LayoutSwitcher/Caption}}
+description: {{$:/language/LayoutSwitcher/Description}}
+
+\whitespace trim
+<$button tooltip={{$:/language/Buttons/LayoutSwitcher/Hint}} aria-label={{$:/language/Buttons/LayoutSwitcher/Caption}} class=<<tv-config-toolbar-class>>>
+<$action-sendmessage $message="tm-show-switcher" switch="layout"/>
+<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+{{$:/core/images/layout-button}}
+</$list>
+<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<span class="tc-btn-text"><$text text={{$:/language/Buttons/LayoutSwitcher/Caption}}/></span>
+</$list>
+</$button>

package/core/ui/PageStylesheet.tid

@@ -1,6 +1,7 @@
 title: $:/core/ui/PageStylesheet
 
 \import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
+\whitespace trim
 
 <$set name="currentTiddler" value={{$:/language}}>
 

package/core/ui/PageTemplate/story.tid

@@ -2,7 +2,7 @@ title: $:/core/ui/PageTemplate/story
 tags: $:/tags/PageTemplate
 
 \whitespace trim
-<section class="tc-story-river">
+<section class="tc-story-river" role="main">
 
 <section class="story-backdrop">