tiddlywiki 5.2.2 → 5.2.4

package/core/ui/PageTemplate.tid

@@ -3,9 +3,6 @@ name: {{$:/language/PageTemplate/Name}}
 description: {{$:/language/PageTemplate/Description}}
 
 \whitespace trim
-\define containerClasses()
-tc-page-container tc-page-view-$(storyviewTitle)$ tc-language-$(languageTitle)$
-\end
 \import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
 
 <$vars
@@ -17,7 +14,7 @@ tc-page-container tc-page-view-$(storyviewTitle)$ tc-language-$(languageTitle)$
 	storyviewTitle={{$:/view}}
 	languageTitle={{{ [{$:/language}get[name]] }}}>
 
-<div class=<<containerClasses>>>
+<div class={{{ [all[shadows+tiddlers]tag[$:/tags/ClassFilters/PageTemplate]!is[draft]] :map:flat[subfilter{!!text}] tc-page-container [[tc-page-view-]addsuffix<storyviewTitle>] [[tc-language-]addsuffix<languageTitle>] :and[unique[]join[ ]] }}} >
 
 <$navigator story="$:/StoryList" history="$:/HistoryList" openLinkFromInsideRiver={{$:/config/Navigation/openLinkFromInsideRiver}} openLinkFromOutsideRiver={{$:/config/Navigation/openLinkFromOutsideRiver}} relinkOnRename={{$:/config/RelinkOnRename}}>
 

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/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}}
 
-<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"/>
+\whitespace trim
+<div class={{{ [{$:/config/ui/SideBar/More/horizontal}match[yes]then[tc-sidebar-tabs]else[tc-more-sidebar]] }}}>
+<$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/MoreSideBar]!has[draft.of]]" default={{$:/config/DefaultMoreSidebarTab}} state="$:/state/tab/moresidebar" class={{{ [{$:/config/ui/SideBar/More/horizontal}match[yes]then[tc-sidebar-tabs-more]else[tc-vertical tc-sidebar-tabs-more]] }}} explicitState="$:/state/tab/moresidebar-1850697562"/>
 </div>

package/core/ui/SideBar/Open.tid

@@ -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/SwitcherModal.tid

@@ -1,6 +1,7 @@
 title: $:/core/ui/SwitcherModal
 subtitle: <$text text={{{[<switch>lookup[$:/language/Switcher/Subtitle/]]}}}/>
 class: tc-modal-centered
+mask-closable: yes
 
 <$tiddler tiddler={{{[<switch>lookup[$:/config/SwitcherTargets/]]}}}>
 

package/core/ui/TagManager.tid

@@ -3,89 +3,101 @@ icon: $:/core/images/tag-button
 color: #bbb
 
 \define lingo-base() $:/language/TagManager/
+
 \define iconEditorTab(type)
 \whitespace trim
 <$link to=""><<lingo Icons/None>></$link>
 <$list filter="[all[shadows+tiddlers]is[image]] [all[shadows+tiddlers]tag[$:/tags/Image]] -[type[application/pdf]] +[sort[title]] +[$type$is[system]]">
-<$link to={{!!title}}>
-<$transclude/> <$view field="title"/>
-</$link>
+	<$link to={{!!title}}>
+		<$transclude/> <$view field="title"/>
+	</$link>
 </$list>
 \end
+
 \define iconEditor(title)
 \whitespace trim
 <div class="tc-drop-down-wrapper">
-<$button popupTitle={{{ [[$:/state/popup/icon/]addsuffix<__title__>] }}} class="tc-btn-invisible tc-btn-dropdown">{{$:/core/images/down-arrow}}</$button>
-<$reveal stateTitle={{{ [[$:/state/popup/icon/]addsuffix<__title__>] }}} type="popup" position="belowleft" text="" default="">
-<div class="tc-drop-down">
-<$linkcatcher actions="""<$action-setfield $tiddler=<<__title__>> icon=<<navigateTo>>/>""">
-<<iconEditorTab type:"!">>
-<hr/>
-<<iconEditorTab type:"">>
-</$linkcatcher>
-</div>
-</$reveal>
+	<$button popupTitle={{{ [[$:/state/popup/icon/]addsuffix<__title__>] }}} class="tc-btn-invisible tc-btn-dropdown">
+		{{$:/core/images/down-arrow}}
+	</$button>
+	<$reveal stateTitle={{{ [[$:/state/popup/icon/]addsuffix<__title__>] }}} type="popup" position="belowleft" text="" default="">
+		<div class="tc-drop-down">
+			<$linkcatcher actions="""<$action-setfield $tiddler=<<__title__>> icon=<<navigateTo>>/>""">
+				<<iconEditorTab type:"!">>
+				<hr/>
+				<<iconEditorTab type:"">>
+			</$linkcatcher>
+		</div>
+	</$reveal>
 </div>
 \end
+
 \define toggleButton(state)
 \whitespace trim
 <$reveal stateTitle=<<__state__>> type="match" text="closed" default="closed">
-<$button setTitle=<<__state__>> setTo="open" class="tc-btn-invisible tc-btn-dropdown" selectedClass="tc-selected">
-{{$:/core/images/info-button}}
-</$button>
+	<$button setTitle=<<__state__>> setTo="open" class="tc-btn-invisible tc-btn-dropdown" selectedClass="tc-selected">
+		{{$:/core/images/info-button}}
+	</$button>
 </$reveal>
 <$reveal stateTitle=<<__state__>> type="match" text="open" default="closed">
-<$button setTitle=<<__state__>> setTo="closed" class="tc-btn-invisible tc-btn-dropdown" selectedClass="tc-selected">
-{{$:/core/images/info-button}}
-</$button>
+	<$button setTitle=<<__state__>> setTo="closed" class="tc-btn-invisible tc-btn-dropdown" selectedClass="tc-selected">
+		{{$:/core/images/info-button}}
+	</$button>
 </$reveal>
 \end
+
 \whitespace trim
 <table class="tc-tag-manager-table">
 <tbody>
-<tr>
-<th><<lingo Colour/Heading>></th>
-<th class="tc-tag-manager-tag"><<lingo Tag/Heading>></th>
-<th><<lingo Count/Heading>></th>
-<th><<lingo Icon/Heading>></th>
-<th><<lingo Info/Heading>></th>
-</tr>
-<$list filter="[tags[]!is[system]sort[title]]">
-<tr>
-<td><$edit-text field="color" tag="input" type="color"/></td>
-<td>{{||$:/core/ui/TagTemplate}}</td>
-<td><$count filter="[all[current]tagging[]]"/></td>
-<td>
-<$macrocall $name="iconEditor" title={{!!title}}/>
-</td>
-<td>
-<$macrocall $name="toggleButton" state={{{ [[$:/state/tag-manager/]addsuffix<currentTiddler>] }}} /> 
-</td>
-</tr>
-<tr>
-<td></td>
-<td colspan="4">
-<$reveal stateTitle={{{ [[$:/state/tag-manager/]addsuffix<currentTiddler>] }}} type="match" text="open" default="">
-<table>
-<tbody>
-<tr><td><<lingo Colour/Heading>></td><td><$edit-text field="color" tag="input" type="text" size="9"/></td></tr>
-<tr><td><<lingo Icon/Heading>></td><td><$edit-text field="icon" tag="input" size="45"/></td></tr>
-</tbody>
-</table>
-</$reveal>
-</td>
-</tr>
-</$list>
-<tr>
-<td></td>
-<td style="position:relative;">
-{{$:/core/ui/UntaggedTemplate}}
-</td>
-<td>
-<small class="tc-menu-list-count"><$count filter="[untagged[]!is[system]] -[tags[]]"/></small>
-</td>
-<td></td>
-<td></td>
-</tr>
+	<tr>
+		<th><<lingo Colour/Heading>></th>
+		<th class="tc-tag-manager-tag"><<lingo Tag/Heading>></th>
+		<th><<lingo Count/Heading>></th>
+		<th><<lingo Icon/Heading>></th>
+		<th><<lingo Info/Heading>></th>
+	</tr>
+	<$list filter="[tags[]!is[system]sort[title]]">
+		<tr>
+			<td><$edit-text field="color" tag="input" type="color"/></td>
+			<td>{{||$:/core/ui/TagTemplate}}</td>
+			<td><$count filter="[all[current]tagging[]]"/></td>
+			<td>
+				<$macrocall $name="iconEditor" title={{!!title}}/>
+			</td>
+			<td>
+				<$macrocall $name="toggleButton" state={{{ [[$:/state/tag-manager/]addsuffix<currentTiddler>] }}} />
+			</td>
+		</tr>
+		<tr>
+			<td></td>
+			<td colspan="4">
+				<$reveal stateTitle={{{ [[$:/state/tag-manager/]addsuffix<currentTiddler>] }}} type="match" text="open" default="">
+					<table>
+						<tbody>
+							<tr>
+								<td><<lingo Colour/Heading>></td>
+								<td><$edit-text field="color" tag="input" type="text" size="9"/></td>
+							</tr>
+							<tr>
+								<td><<lingo Icon/Heading>></td>
+								<td><$edit-text field="icon" tag="input" size="45"/></td>
+							</tr>
+						</tbody>
+					</table>
+				</$reveal>
+			</td>
+		</tr>
+	</$list>
+	<tr>
+		<td></td>
+		<td style="position:relative;">
+			{{$:/core/ui/UntaggedTemplate}}
+		</td>
+		<td>
+			<small class="tc-menu-list-count"><$count filter="[untagged[]!is[system]] -[tags[]]"/></small>
+		</td>
+		<td></td>
+		<td></td>
+	</tr>
 </tbody>
 </table>

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/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/import.tid

@@ -3,6 +3,7 @@ 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>>/>
@@ -10,14 +11,18 @@ title: $:/core/ui/ViewTemplate/body/import
 \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

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

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,6 +1,8 @@
 title: $:/core/ui/ViewTemplate/body
 tags: $:/tags/ViewTemplate
 
+\import [all[shadows+tiddlers]tag[$:/tags/Macro/View/Body]!has[draft.of]]
+
 <$reveal tag="div" class="tc-tiddler-body" type="nomatch" stateTitle=<<folded-state>> text="hide" retain="yes" animate="yes">
 
 <$transclude tiddler={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/ViewTemplateBodyFilter]!is[draft]get[text]] :and[!is[blank]else[$:/core/ui/ViewTemplate/body/default]] }}} />

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.tid

@@ -12,11 +12,13 @@ fill:$(foregroundColor)$;
 </span>
 <$set name="tv-wikilinks" value={{$:/config/Tiddlers/TitleLinks}}>
 <$link>
+<$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>>>
 {{||$:/core/ui/TiddlerIcon}}
 </span>
 </$let>
+</$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>

package/core/ui/ViewTemplate/unfold.tid

@@ -1,17 +1,22 @@
 title: $:/core/ui/ViewTemplate/unfold
 tags: $:/tags/ViewTemplate
 
-<$reveal tag="div" type="nomatch" state="$:/config/ViewToolbarButtons/Visibility/$:/core/ui/Buttons/fold-bar" text="hide">
+\whitespace trim
+<div class="tc-reveal">
+<$list filter="[{$:/config/ViewToolbarButtons/Visibility/$:/core/ui/Buttons/fold-bar}match[show]]" variable="ignore">
 <$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">
 <$action-sendmessage $message="tm-fold-tiddler" $param=<<currentTiddler>> foldedState=<<folded-state>>/>
 {{$:/core/images/chevron-up}}
 </$button>
 </$reveal>
+</$list>
+<$list filter="[{$:/config/ViewToolbarButtons/Visibility/$:/core/ui/Buttons/fold-bar}match[show]] :else[<folded-state>get[text]match[hide]]" variable="ignore">
 <$reveal tag="div" type="nomatch" stateTitle=<<folded-state>> text="show" default="show" retain="yes" animate="yes">
 <$button tooltip={{$:/language/Buttons/Unfold/Hint}} aria-label={{$:/language/Buttons/Unfold/Caption}} class="tc-unfold-banner">
 <$action-sendmessage $message="tm-fold-tiddler" $param=<<currentTiddler>> foldedState=<<folded-state>>/>
 {{$:/core/images/chevron-down}}
 </$button>
 </$reveal>
-</$reveal>
+</$list>
+</div>

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={{{ [all[shadows+tiddlers]tag[$:/tags/ClassFilters/TiddlerTemplate]!is[draft]] :map:flat[subfilter{!!text}] 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

@@ -3,5 +3,11 @@ title: $:/snippets/allfields
 \define renderfield(title)
 <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/DefaultTiddlersRetainStory.tid

@@ -0,0 +1,3 @@
+title: $:/config/ControlPanel/Basics/DefaultTiddlers/RetainStory
+
+[list[$:/StoryList]]

package/core/wiki/config/OfficialPluginLibrary.tid

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