tiddlywiki 5.2.0 → 5.2.3

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/MoreSideBar/plugins/Languages.tid

@@ -2,4 +2,4 @@ title: $:/core/ui/MoreSideBar/Plugins/Languages
 tags: $:/tags/MoreSideBar/Plugins
 caption: {{$:/language/ControlPanel/Plugins/Languages/Caption}}
 
-<$list filter="[!has[draft.of]plugin-type[language]sort[description]]" template="$:/core/ui/PluginListItemTemplate" emptyMessage={{$:/language/ControlPanel/Plugins/Empty/Hint}}/>
+<$list filter="[!has[draft.of]plugin-type[language]sort[name]]" template="$:/core/ui/PluginListItemTemplate" emptyMessage={{$:/language/ControlPanel/Plugins/Empty/Hint}}/>

package/core/ui/MoreSideBar/plugins/Plugins.tid

@@ -2,4 +2,4 @@ title: $:/core/ui/MoreSideBar/Plugins/Plugins
 tags: $:/tags/MoreSideBar/Plugins
 caption: {{$:/language/ControlPanel/Plugins/Plugins/Caption}}
 
-<$list filter="[!has[draft.of]plugin-type[plugin]sort[description]]" template="$:/core/ui/PluginListItemTemplate" emptyMessage={{$:/language/ControlPanel/Plugins/Empty/Hint}}>>/>
+<$list filter="[!has[draft.of]plugin-type[plugin]sort[name]]" template="$:/core/ui/PluginListItemTemplate" emptyMessage={{$:/language/ControlPanel/Plugins/Empty/Hint}}>>/>

package/core/ui/MoreSideBar/plugins/Theme.tid

@@ -2,4 +2,4 @@ title: $:/core/ui/MoreSideBar/Plugins/Theme
 tags: $:/tags/MoreSideBar/Plugins
 caption: {{$:/language/ControlPanel/Plugins/Themes/Caption}}
 
-<$list filter="[!has[draft.of]plugin-type[theme]sort[description]]" template="$:/core/ui/PluginListItemTemplate" emptyMessage={{$:/language/ControlPanel/Plugins/Empty/Hint}}/>
+<$list filter="[!has[draft.of]plugin-type[theme]sort[name]]" template="$:/core/ui/PluginListItemTemplate" emptyMessage={{$:/language/ControlPanel/Plugins/Empty/Hint}}/>

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/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">
 
@@ -14,7 +14,7 @@ tags: $:/tags/PageTemplate
 
 </section>
 
-<$list filter="[list[$:/StoryList]]" history="$:/HistoryList" template={{$:/config/ui/ViewTemplate}} editTemplate={{$:/config/ui/EditTemplate}} storyview={{$:/view}} emptyMessage={{$:/config/EmptyStoryMessage}}/>
+<$list filter="[list[$:/StoryList]]" history="$:/HistoryList" template="$:/core/ui/StoryTiddlerTemplate" storyview={{$:/view}} emptyMessage={{$:/config/EmptyStoryMessage}}/>
 
 <section class="story-frontdrop">
 

package/core/ui/PaletteManager.tid

@@ -8,6 +8,7 @@ title: $:/PaletteManager
  edit $(colourName)$
 \end
 \define colour-tooltip(showhide) $showhide$ editor for $(newColourName)$ 
+
 \define resolve-colour(macrocall)
 \import $:/core/macros/utils
 \whitespace trim
@@ -15,6 +16,7 @@ title: $:/PaletteManager
 <<name>>
 </$wikify>
 \end
+
 \define delete-colour-index-actions() <$action-setfield $index=<<colourName>>/>
 \define palette-manager-colour-row-segment()
 \whitespace trim
@@ -41,6 +43,7 @@ title: $:/PaletteManager
 </$set>
 </$list>
 \end
+
 \define palette-manager-colour-row()
 \whitespace trim
 <tr>
@@ -57,28 +60,26 @@ title: $:/PaletteManager
 </td>
 </tr>
 \end
+
 \define palette-manager-table()
 \whitespace trim
 <table>
 <tbody>
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/Palette]indexes[]]" variable="colourName">
-<$list filter="[<currentTiddler>indexes[]removeprefix<colourName>suffix[]]" variable="ignore" emptyMessage="""
-<$list filter="[{$:/state/palettemanager/showexternal}removeprefix[yes]suffix[]]" variable="ignore">
-<<palette-manager-colour-row>>
-</$list>
-""">
-<<palette-manager-colour-row>>
-</$list>
-</$list>
+<$set name="colorList" filter="[{$:/state/palettemanager/showexternal}match[yes]]"
+   value="[all[shadows+tiddlers]tag[$:/tags/Palette]indexes[]]" emptyValue="[<currentTiddler>indexes[]]">
+<$list filter=<<colorList>> variable="colourName"> <<palette-manager-colour-row>> </$list>
+</$set>
 </tbody>
 </table>
 \end
+\whitespace trim
 <$set name="currentTiddler" value={{$:/palette}}>
 
-<<lingo Prompt>> <$link to={{$:/palette}}><$macrocall $name="currentTiddler" $output="text/plain"/></$link>
+<<lingo Prompt>>&#32;<$link to={{$:/palette}}><$macrocall $name="currentTiddler" $output="text/plain"/></$link>
 
 <$list filter="[all[current]is[shadow]is[tiddler]]" variable="listItem">
 <<lingo Prompt/Modified>>
+&#32;
 <$button message="tm-delete-tiddler" param={{$:/palette}}><<lingo Reset/Caption>></$button>
 </$list>
 

package/core/ui/PluginInfo.tid

@@ -9,6 +9,7 @@ $(currentTiddler)$/$(currentTab)$
 \define default-tiddler-title()
 $:/core/ui/PluginInfo/Default/$(currentTab)$
 \end
+\whitespace trim
 <$transclude tiddler=<<localised-info-tiddler-title>> mode="block">
 <$transclude tiddler=<<currentTiddler>> subtiddler=<<localised-info-tiddler-title>> mode="block">
 <$transclude tiddler=<<currentTiddler>> subtiddler=<<info-tiddler-title>> mode="block">

package/core/ui/PluginInfoDefaultContents.tid

@@ -1,6 +1,7 @@
 title: $:/core/ui/PluginInfo/Default/contents
 
 \define lingo-base() $:/language/TiddlerInfo/Advanced/PluginInfo/
+\whitespace trim
 <<lingo Hint>>
 <ul>
 <$list filter="[all[current]plugintiddlers[]sort[title]]" emptyMessage=<<lingo Empty/Hint>>>

package/core/ui/PluginListItemTemplate.tid

@@ -1,5 +1,15 @@
 title: $:/core/ui/PluginListItemTemplate
 
-<div class="tc-menu-list-item">
-<$link to={{!!title}}><$view field="description"><$view field="title"/></$view></$link>
-</div>
+\whitespace trim
+<$link to={{!!title}} class="tc-plugin-info">
+	<div class="tc-plugin-info-chunk tc-plugin-info-icon">
+		<$transclude tiddler=<<currentTiddler>> subtiddler={{{ [<currentTiddler>addsuffix[/icon]] }}}>
+			<$transclude tiddler={{{ [<currentTiddler>get[plugin-type]addprefix[$:/core/images/plugin-generic-]] }}}/>
+		</$transclude>
+	</div>
+	<div class="tc-plugin-info-chunk tc-plugin-info-description">
+		<h1>
+			''<$text text={{{ [<currentTiddler>get[name]] ~[<currentTiddler>split[/]last[1]] }}}/>'':&nbsp;<$view field="description"><$view field="title"/></$view>
+		</h1>
+	</div>
+</$link>

package/core/ui/SearchResults.tid

@@ -2,13 +2,15 @@ title: $:/core/ui/SearchResults
 
 <div class="tc-search-results">
 
-<$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 mode="block"/>
-</$list>
-""">
+<$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 mode='block'/></$list>">
 
-<$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]]" default={{$:/config/SearchResults/Default}} actions="""<$action-setfield $tiddler="$:/state/search/currentTab" text=<<currentTab>>/>""" explicitState="$:/state/tab/search-results/sidebar"/>
+<$macrocall $name="tabs"
+	tabsList="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]]"
+	default={{$:/config/SearchResults/Default}}
+	actions="<$action-setfield $tiddler='$:/state/search/currentTab' text=<<currentTab>>/>"
+	explicitState="$:/state/tab/search-results/sidebar"/>
 
 </$list>
 

package/core/ui/SideBar/More.tid

@@ -2,6 +2,7 @@ title: $:/core/ui/SideBar/More
 tags: $:/tags/SideBar
 caption: {{$:/language/SideBar/More/Caption}}
 
+\whitespace trim
 <div class="tc-more-sidebar">
 <$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/MoreSideBar]!has[draft.of]]" default={{$:/config/DefaultMoreSidebarTab}} state="$:/state/tab/moresidebar" class="tc-vertical tc-sidebar-tabs-more" explicitState="$:/state/tab/moresidebar-1850697562"/>
 </div>

package/core/ui/SideBar/Open.tid

@@ -6,7 +6,7 @@ caption: {{$:/language/SideBar/Open/Caption}}
 \define lingo-base() $:/language/CloseAll/
 
 \define drop-actions()
-<$action-listops $tiddler=<<tv-story-list>> $subfilter="+[insertbefore:currentTiddler<actionTiddler>]"/>
+<$action-listops $tiddler=<<tv-story-list>> $subfilter="+[insertbefore<actionTiddler>,<currentTiddler>]"/>
 \end
 
 \define placeholder()
@@ -15,7 +15,7 @@ caption: {{$:/language/SideBar/Open/Caption}}
 
 \define droppable-item(button)
 \whitespace trim
-<$droppable actions=<<drop-actions>> enable=<<tv-allow-drag-and-drop>>>
+<$droppable actions=<<drop-actions>> enable=<<tv-allow-drag-and-drop>> tag="div">
 <<placeholder>>
 <div>
 $button$
@@ -26,12 +26,12 @@ $button$
 <div class="tc-sidebar-tab-open">
 <$list filter="[list<tv-story-list>]" history=<<tv-history-list>> storyview="pop">
 <div class="tc-sidebar-tab-open-item">
-<$macrocall $name="droppable-item" button="""<$button message="tm-close-tiddler" tooltip={{$:/language/Buttons/Close/Hint}} aria-label={{$:/language/Buttons/Close/Caption}} class="tc-btn-invisible tc-btn-mini tc-small-gap-right">{{$:/core/images/close-button}}</$button><$link to={{!!title}}><$view field="title"/></$link>"""/>
+<$macrocall $name="droppable-item" button="<$button message='tm-close-tiddler' tooltip={{$:/language/Buttons/Close/Hint}} aria-label={{$:/language/Buttons/Close/Caption}} class='tc-btn-invisible tc-btn-mini tc-small-gap-right'>{{$:/core/images/close-button}}</$button><$link to={{!!title}}><$view field='title'/></$link>"/>
 </div>
 </$list>
 <$tiddler tiddler="">
 <div>
-<$macrocall $name="droppable-item" button="""<$button message="tm-close-all-tiddlers" class="tc-btn-invisible tc-btn-mini"><<lingo Button>></$button>"""/>
+<$macrocall $name="droppable-item" button="<$button message='tm-close-all-tiddlers' class='tc-btn-invisible tc-btn-mini'><<lingo Button>></$button>"/>
 </div>
 </$tiddler>
 </div>

package/core/ui/SideBarSegments/search.tid

@@ -51,12 +51,14 @@ tags: $:/tags/SideBarSegment
 <$keyboard key="((input-tab-right))" actions=<<set-next-input-tab>>>
 <$keyboard key="((input-tab-left))" actions=<<set-next-input-tab "before">>>
 <$keyboard key="((advanced-search-sidebar))" actions=<<advanced-search-actions>>>
+<form class="tc-form-inline">
 <$macrocall $name="keyboard-driven-input" tiddler=<<editTiddler>> storeTitle=<<searchTiddler>> 
 		selectionStateTitle=<<searchListState>> refreshTitle="$:/temp/search/refresh" type="search" 
 		tag="input" focus={{$:/config/Search/AutoFocus}} focusPopup=<<qualify "$:/state/popup/search-dropdown">> 
 		class="tc-popup-handle" filterMinLength={{$:/config/Search/MinLength}} inputCancelActions=<<cancel-search-actions>> 
 		inputAcceptActions=<<input-accept-actions>> inputAcceptVariantActions=<<input-accept-variant-actions>> cancelPopups="yes" 
 		configTiddlerFilter="[[$:/state/search/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}]"/>
+</form>
 </$keyboard>
 </$keyboard>
 </$keyboard>

package/core/ui/SideBarSegments/tabs.tid

@@ -1,7 +1,7 @@
 title: $:/core/ui/SideBarSegments/tabs
 tags: $:/tags/SideBarSegment
 
-<div class="tc-sidebar-lists tc-sidebar-tabs">
+<div class="tc-sidebar-lists tc-sidebar-tabs" role="region" aria-label={{$:/language/SideBar/Caption}}>
 
 <$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/SideBar]!has[draft.of]]" default={{$:/config/DefaultSidebarTab}} state="$:/state/tab/sidebar" class="tc-sidebar-tabs-main" explicitState="$:/state/tab/sidebar--595412856"/>
 

package/core/ui/StoryTiddlerTemplate.tid

@@ -0,0 +1,3 @@
+title: $:/core/ui/StoryTiddlerTemplate
+
+<$transclude tiddler={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/StoryTiddlerTemplateFilter]!is[draft]get[text]] :and[!is[blank]else{$:/config/ui/ViewTemplate}] }}} />

package/core/ui/TagPickerTagTemplate.tid

@@ -13,10 +13,10 @@ title: $:/core/ui/TagPickerTagTemplate
 <$action-setfield $tiddler=<<refreshTitle>> text="yes"/>
 </$list>
 <<actions>>
-<$set name="backgroundColor" value={{!!color}}>
-<$wikify name="foregroundColor" text="""<$macrocall $name="contrastcolour" target={{!!color}} fallbackTarget=<<fallbackTarget>> colourA=<<colourA>> colourB=<<colourB>>/>""">
+<$set name="backgroundColor" value={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}}>
+<$wikify name="foregroundColor" text="""<$macrocall $name="contrastcolour" target=<<backgroundColor>> fallbackTarget=<<fallbackTarget>> colourA=<<colourA>> colourB=<<colourB>>/>""">
 <span class="tc-tag-label tc-btn-invisible" style=<<tag-pill-styles>>>
-<$transclude tiddler={{!!icon}}/><$view field="title" format="text"/>
+{{||$:/core/ui/TiddlerIcon}}<$view field="title" format="text"/>
 </span>
 </$wikify>
 </$set>

package/core/ui/TagTemplate.tid

@@ -3,7 +3,7 @@ title: $:/core/ui/TagTemplate
 \whitespace trim
 <span class="tc-tag-list-item" data-tag-title=<<currentTiddler>>>
 <$set name="transclusion" value=<<currentTiddler>>>
-<$macrocall $name="tag-pill-body" tag=<<currentTiddler>> icon={{!!icon}} colour={{!!color}} palette={{$:/palette}} element-tag="""$button""" element-attributes="""popup=<<qualify "$:/state/popup/tag">> dragFilter='[all[current]tagging[]]' tag='span'"""/>
+<$macrocall $name="tag-pill-body" tag=<<currentTiddler>> icon={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerIconFilter]!is[draft]get[text]] }}} colour={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}} palette={{$:/palette}} element-tag="""$button""" element-attributes="""popup=<<qualify "$:/state/popup/tag">> dragFilter='[all[current]tagging[]]' tag='span'"""/>
 <$reveal state=<<qualify "$:/state/popup/tag">> type="popup" position="below" animate="yes" class="tc-drop-down">
 <$set name="tv-show-missing-links" value="yes">
 <$transclude tiddler="$:/core/ui/ListItemTemplate"/>

package/core/ui/TiddlerFieldTemplate.tid

@@ -1,5 +1,6 @@
 title: $:/core/ui/TiddlerFieldTemplate
 
+\whitespace trim
 <tr class="tc-view-field">
 <td class="tc-view-field-name">
 <$text text=<<listItem>>/>

package/core/ui/TiddlerFields.tid

@@ -1,5 +1,6 @@
 title: $:/core/ui/TiddlerFields
 
+\whitespace trim
 <table class="tc-view-field-table">
 <tbody>
 <$list filter="[all[current]fields[]sort[title]] -text" template="$:/core/ui/TiddlerFieldTemplate" variable="listItem"/>

package/core/ui/TiddlerIcon.tid

@@ -0,0 +1,8 @@
+title: $:/core/ui/TiddlerIcon
+
+\whitespace trim
+<$let tiddlerIcon={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerIconFilter]!is[draft]get[text]] }}}>
+<$list filter="[<tiddlerIcon>!is[blank]]" variable="ignore">
+<$transclude tiddler=<<tiddlerIcon>>/>
+</$list>
+</$let>

package/core/ui/TiddlerInfo/Advanced/PluginInfo.tid

@@ -2,6 +2,7 @@ title: $:/core/ui/TiddlerInfo/Advanced/PluginInfo
 tags: $:/tags/TiddlerInfo/Advanced
 
 \define lingo-base() $:/language/TiddlerInfo/Advanced/PluginInfo/
+\whitespace trim
 <$list filter="[all[current]has[plugin-type]]">
 
 ! <<lingo Heading>>

package/core/ui/TiddlerInfo/Advanced/ShadowInfo.tid

@@ -19,6 +19,7 @@ tags: $:/tags/TiddlerInfo/Advanced
 <$list filter="[all[current]shadowsource[]]">
 
 <$set name="pluginTiddler" value=<<currentTiddler>>>
+
 <<lingo Shadow/Source>>
 </$set>
 

package/core/ui/TiddlerInfo/Advanced.tid

@@ -5,4 +5,5 @@ caption: {{$:/language/TiddlerInfo/Advanced/Caption}}
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/TiddlerInfo/Advanced]!has[draft.of]]" variable="listItem">
 
 <$transclude tiddler=<<listItem>> mode="block"/>
+
 </$list>

package/core/ui/TiddlerInfo.tid

@@ -1,5 +1,6 @@
 title: $:/core/ui/TiddlerInfo
 
+\whitespace trim
 <div style="position:relative;">
 <div class="tc-tiddler-controls" style="position:absolute;right:0;">
 <$reveal state="$:/config/TiddlerInfo/Mode" type="match" text="sticky">

package/core/ui/TopRightBar/menu.tid

@@ -1,6 +1,7 @@
 title: $:/core/ui/TopBar/menu
 tags: $:/tags/TopRightBar
 
+\whitespace trim
 <$list filter="[[$:/state/sidebar]get[text]] +[else[yes]!match[no]]" variable="ignore">
 <$button set="$:/state/sidebar" setTo="no" tooltip={{$:/language/Buttons/HideSideBar/Hint}} aria-label={{$:/language/Buttons/HideSideBar/Caption}} class="tc-btn-invisible tc-hide-sidebar-btn">{{$:/core/images/chevron-right}}</$button>
 </$list>

package/core/ui/UntaggedTemplate.tid

@@ -1,6 +1,7 @@
 title: $:/core/ui/UntaggedTemplate
 
 \define lingo-base() $:/language/SideBar/
+\whitespace trim
 <$button popup=<<qualify "$:/state/popup/tag">> class="tc-btn-invisible tc-untagged-label tc-tag-label">
 <<lingo Tags/Untagged/Caption>>
 </$button>

package/core/ui/ViewTemplate/body/blank.tid

@@ -0,0 +1,3 @@
+title: $:/core/ui/ViewTemplate/body/blank
+
+<!-- Intentionally blank -->

package/core/ui/ViewTemplate/body/code.tid

@@ -0,0 +1,3 @@
+title: $:/core/ui/ViewTemplate/body/code
+
+<$codeblock code={{{ [<currentTiddler>get[text]] }}} language={{{ [<currentTiddler>get[type]else[text/vnd.tiddlywiki]] }}}/>

package/core/ui/ViewTemplate/body/default.tid

@@ -0,0 +1,7 @@
+title: $:/core/ui/ViewTemplate/body/default
+
+<$transclude>
+
+<$transclude tiddler="$:/language/MissingTiddler/Hint"/>
+
+</$transclude>

package/core/ui/ViewTemplate/{import.tid → body/import.tid}

@@ -1,9 +1,9 @@
-title: $:/core/ui/ViewTemplate/import
-tags: $:/tags/ViewTemplate
+title: $:/core/ui/ViewTemplate/body/import
 
 \define lingo-base() $:/language/Import/
 
 \define confirmCancel()
+\whitespace trim
 <$action-confirm $message={{$:/language/Import/Listing/Cancel/Warning}} >
 <$action-deletetiddler $tiddler=<<currentTiddler>>/>
 <$action-sendmessage $message="tm-close-tiddler" title=<<currentTiddler>>/>
@@ -11,14 +11,18 @@ tags: $:/tags/ViewTemplate
 \end
 
 \define buttons()
+\whitespace trim
 <$button actions=<<confirmCancel>> ><<lingo Listing/Cancel/Caption>></$button>
+&#32;
 <$button message="tm-perform-import" param=<<currentTiddler>>><<lingo Listing/Import/Caption>></$button>
-<<lingo Listing/Preview>> <$select tiddler="$:/state/importpreviewtype" default="$:/core/ui/ImportPreviews/Text">
+&#32;
+<<lingo Listing/Preview>>&#32;<$select tiddler="$:/state/importpreviewtype" default="$:/core/ui/ImportPreviews/Text">
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/ImportPreview]!has[draft.of]]">
 <option value=<<currentTiddler>>>{{!!caption}}</option>
 </$list>
 </$select>
 \end
+\whitespace trim
 
 <$list filter="[all[current]field:plugin-type[import]]">
 

package/core/ui/ViewTemplate/body/plugin.tid

@@ -0,0 +1,11 @@
+title: $:/core/ui/ViewTemplate/body/plugin
+
+\whitespace trim
+<div class="tc-tiddler-plugin-info">
+<$let plugin-type={{!!plugin-type}}
+	default-popup-state="yes"
+	qualified-state=<<qualify "$:/state/plugin-info">>
+>
+{{||$:/core/ui/Components/plugin-info}}
+</$let>
+</div>

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

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

package/core/ui/ViewTemplate/body.tid

@@ -1,16 +1,10 @@
 title: $:/core/ui/ViewTemplate/body
 tags: $:/tags/ViewTemplate
 
-<$reveal tag="div" class="tc-tiddler-body" type="nomatch" stateTitle=<<folded-state>> text="hide" retain="yes" animate="yes">
-
-<$list filter="[all[current]!has[plugin-type]!field:hide-body[yes]]">
-
-<$transclude>
+\import [all[shadows+tiddlers]tag[$:/tags/Macro/View/Body]!has[draft.of]]
 
-<$transclude tiddler="$:/language/MissingTiddler/Hint"/>
-
-</$transclude>
+<$reveal tag="div" class="tc-tiddler-body" type="nomatch" stateTitle=<<folded-state>> text="hide" retain="yes" animate="yes">
 
-</$list>
+<$transclude tiddler={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/ViewTemplateBodyFilter]!is[draft]get[text]] :and[!is[blank]else[$:/core/ui/ViewTemplate/body/default]] }}} />
 
 </$reveal>

package/core/ui/ViewTemplate/classic.tid

@@ -2,6 +2,7 @@ title: $:/core/ui/ViewTemplate/classic
 tags: $:/tags/ViewTemplate $:/tags/EditTemplate
 
 \define lingo-base() $:/language/ClassicWarning/
+\whitespace trim
 <$list filter="[all[current]type[text/x-tiddlywiki]]">
 <div class="tc-message-box">
 

package/core/ui/ViewTemplate/subtitle/modified.tid

@@ -0,0 +1,4 @@
+title: $:/core/ui/ViewTemplate/subtitle/modified
+tags: $:/tags/ViewTemplate/Subtitle
+
+<$view field="modified" format="date" template={{$:/language/Tiddler/DateFormat}}/>

package/core/ui/ViewTemplate/subtitle/modifier.tid

@@ -0,0 +1,4 @@
+title: $:/core/ui/ViewTemplate/subtitle/modifier
+tags: $:/tags/ViewTemplate/Subtitle
+
+<$link to={{!!modifier}}/>

package/core/ui/ViewTemplate/subtitle.tid

@@ -4,7 +4,11 @@ tags: $:/tags/ViewTemplate
 \whitespace trim
 <$reveal type="nomatch" stateTitle=<<folded-state>> text="hide" tag="div" retain="yes" animate="yes">
 <div class="tc-subtitle">
-<$link to={{!!modifier}} />
-<$view field="modified" format="date" template={{$:/language/Tiddler/DateFormat}}/>
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewTemplate/Subtitle]!has[draft.of]]" variable="subtitleTiddler" counter="indexSubtitleTiddler">
+<$list filter="[<indexSubtitleTiddler-first>match[no]]" variable="ignore">
+&nbsp;
+</$list>
+<$transclude tiddler=<<subtitleTiddler>> mode="inline"/>
+</$list>
 </div>
 </$reveal>

package/core/ui/ViewTemplate/tags.tid

@@ -1,6 +1,7 @@
 title: $:/core/ui/ViewTemplate/tags
 tags: $:/tags/ViewTemplate
 
+\whitespace trim
 <$reveal type="nomatch" stateTitle=<<folded-state>> text="hide" tag="div" retain="yes" animate="yes">
 <div class="tc-tags-wrapper"><$list filter="[all[current]tags[]sort[title]]" template="$:/core/ui/TagTemplate" storyview="pop"/></div>
 </$reveal>

package/core/ui/ViewTemplate/title/default.tid

@@ -0,0 +1,6 @@
+title: $:/core/ui/ViewTemplate/title/default
+
+\whitespace trim
+<h2 class="tc-title">
+<$view field="title"/>
+</h2>

package/core/ui/ViewTemplate/title/system.tid

@@ -0,0 +1,6 @@
+title: $:/core/ui/ViewTemplate/title/system
+
+\whitespace trim
+<h2 class="tc-title" title={{$:/language/SystemTiddler/Tooltip}}>
+<span class="tc-system-title-prefix">$:/</span><$text text={{{ [<currentTiddler>removeprefix[$:/]] }}}/>
+</h2>