tiddlywiki 5.3.8 → 5.4.0

package/core/ui/SideBarSegments/search.tid

@@ -46,13 +46,21 @@ tags: $:/tags/SideBarSegment
 
 \procedure advanced-search-actions() <$action-setfield $tiddler="$:/temp/advancedsearch" text={{$:/temp/search/input}}/><$action-setfield $tiddler="$:/temp/advancedsearch/input" text={{$:/temp/search/input}}/><<delete-state-tiddlers>><$action-navigate $to="$:/AdvancedSearch"/><$action-setfield $tiddler="$:/temp/advancedsearch/refresh" text="yes"/><$action-sendmessage $message="tm-focus-selector" $param="""[data-tiddler-title="$:/AdvancedSearch"] .tc-search input""" preventScroll="true"/><$action-deletetiddler $filter="$:/temp/search $:/temp/search/input $:/temp/search/refresh [<searchListState>]"/>
 
+\procedure input-actions()
+<%if [<event-key-descriptor>match[((input-tab-right))]] %>
+<<set-next-input-tab>>
+<%elseif [<event-key-descriptor>match[((input-tab-left))]] %>
+<<set-previous-input-tab>>
+<%elseif [<event-key-descriptor>match[((advanced-search-sidebar))]] %>
+<<advanced-search-actions>>
+<%endif%>
+\end
+
 <div class="tc-sidebar-lists tc-sidebar-search">
 
 <$vars editTiddler="$:/temp/search" searchTiddler="$:/temp/search/input" searchListState=<<qualify "$:/state/search-list/selected-item">>>
 <div class="tc-search">
-<$keyboard key="((input-tab-right))" actions=<<set-next-input-tab>>>
-<$keyboard key="((input-tab-left))" actions=<<set-previous-input-tab>>>
-<$keyboard key="((advanced-search-sidebar))" actions=<<advanced-search-actions>>>
+<$keyboard key="((input-tab-right)) ((input-tab-left)) ((advanced-search-sidebar))" actions=<<input-actions>>>
 <form class="tc-form-inline">
 <$transclude $variable="keyboard-driven-input" tiddler=<<editTiddler>> storeTitle=<<searchTiddler>> 
 		selectionStateTitle=<<searchListState>> refreshTitle="$:/temp/search/refresh" type="search" 
@@ -62,8 +70,6 @@ tags: $:/tags/SideBarSegment
 		configTiddlerFilter="[[$:/state/search/currentTab]!is[missing]get[text]] :else[{$:/config/SearchResults/Default}]"/>
 </form>
 </$keyboard>
-</$keyboard>
-</$keyboard>
 <$reveal state=<<searchTiddler>> type="nomatch" text="">
 <$button tooltip={{$:/language/Buttons/AdvancedSearch/Hint}} aria-label={{$:/language/Buttons/AdvancedSearch/Caption}} class="tc-btn-invisible">
 <<advanced-search-actions>>

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

@@ -0,0 +1,43 @@
+title: $:/core/ui/TiddlerInfo/Advanced/CascadeInfo
+tags: $:/tags/TiddlerInfo/Advanced
+
+\define lingo-base() $:/language/TiddlerInfo/Advanced/CascadeInfo/
+
+<$let infoTiddler=<<currentTiddler>>>
+
+''<<lingo Heading>>''
+
+<<lingo Hint>>
+
+<table class="tc-max-width">
+	<thead>
+		<$list filter="[[View]] [[ActiveCascadeFilter]] [[Template]]" variable="th">
+			<th><$transclude $variable="lingo" title=`Detail/$(th)$`/></th>
+		</$list>
+	</thead>
+	<$list filter="[[$:/tags/ViewTemplate]tagging[]]" variable="ViewTemplate">
+		<tr>
+			<$let
+				view={{{ [<ViewTemplate>]+[split[/]last[]] }}}
+				tagFilter=`$:/tags/ViewTemplate${ [<view>titlecase[]] }$Filter`
+				activeCascadeFilterTiddler={{{ [all[shadows+tiddlers]tag<tagFilter>!is[draft]]:filter[<storyTiddler>subfilter{!!text}]+[first[]] }}}
+				activeCascadeFilter={{{ [<activeCascadeFilterTiddler>get[text]] }}}
+				activeTemplateTiddler={{{ [<currentTiddler>]:cascade[all[shadows+tiddlers]tag<tagFilter>!is[draft]get[text]] }}}
+			>
+			<%if [<activeCascadeFilterTiddler>!is[blank]]%>
+				<td>
+					<$link to=<<ViewTemplate>> ><<view>></$link>
+				</td>
+				<td>
+					<$link to=<<activeCascadeFilterTiddler>> />
+				</td>
+				<td style="text-align:center;">
+					<$link class="tc-btn-invisible" to=<<activeTemplateTiddler>>>
+						<$button class="tc-btn-invisible">{{$:/core/images/file}}</$button>
+					</$link>
+				</td>
+			<%endif%>
+			</$let>
+		</tr>
+	</$list>
+</table>

package/core/ui/TiddlerInfo.tid

@@ -2,7 +2,7 @@ title: $:/core/ui/TiddlerInfo
 
 \whitespace trim
 <div style="position:relative;">
-<div class="tc-tiddler-controls" style="position:absolute;right:0;">
+<div class="tc-tiddler-controls tc-tiddler-info-controls">
 <$reveal state="$:/config/TiddlerInfo/Mode" type="match" text="sticky">
 <$button set=<<tiddlerInfoState>> setTo="" tooltip={{$:/language/Buttons/Info/Hint}} aria-label={{$:/language/Buttons/Info/Caption}} class="tc-btn-invisible">
 {{$:/core/images/close-button}}

package/core/ui/ViewTemplate/title.tid

@@ -11,9 +11,13 @@ tags: $:/tags/ViewTemplate
 				storyview="pop"
 				variable="listItem"
 			>
-				<$set name="tv-config-toolbar-class" filter="[<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]]">
-					<$transclude tiddler=<<listItem>>/>
-				</$set>
+				<$let condition={{{ [<listItem>get[condition]] }}}>
+					<%if [<condition>!is[blank]] :and[<currentTiddler>subfilter<condition>limit[1]] :else[<condition>is[blank]then[true]] %>
+						<$set name="tv-config-toolbar-class" filter="[<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]]">
+							<$transclude tiddler=<<listItem>>/>
+						</$set>
+					<%endif%>
+				</$let>
 			</$list>
 		</span>
 		<$set name="tv-wikilinks" value={{$:/config/Tiddlers/TitleLinks}}>

package/core/ui/WikiInformation.tid

@@ -41,6 +41,8 @@ Drag this link to copy this tool to another wiki
 </$wikify>
 \end capture-item-wikified
 
+\function get.shadow.source() [shadowsource[]]
+
 \procedure capture-wiki-info(tempWikiInfo)
 <$transclude $variable="capture-item-wikified" label="TiddlyWiki Version" value="<<version>>"/>
 <$transclude $variable="capture-item" label="Current palette" value={{$:/palette}}/>
@@ -64,6 +66,7 @@ Drag this link to copy this tool to another wiki
 <$transclude $variable="capture-item" label="Keyboard shortcuts that have been customised" value={{{ [all[tiddlers]prefix[$:/config/shortcuts]] +[join[,]] }}}/>
 <$transclude $variable="capture-item" label="Disabled plugins" value={{{ [all[tiddlers]prefix[$:/config/Plugins/Disabled/]] :filter[{!!text}match[yes]] :map[<currentTiddler>removeprefix[$:/config/Plugins/Disabled/]] +[join[,]] }}}/>
 <$transclude $variable="capture-item" label="Plugins" value={{{ [has[plugin-type]sort[]] :filter[<currentTiddler>addprefix[$:/config/Plugins/Disabled/]get[text]else[no]!match[yes]] :map[{!!version}addprefix[ - ]addprefix<currentTiddler>] +[addprefix[  ]addprefix<crlf>join[]] }}}/>
+<$transclude $variable="capture-item" label="Stylesheets" value={{{ [all[shadows+tiddlers]tag[$:/tags/Stylesheet]!is[draft]] :map[is[shadow]addsuffix[ ∈ ]addsuffix<get.shadow.source>else<currentTiddler>] +[addprefix[  ]addprefix<crlf>join[]] }}}/>
 \end capture-wiki-info
 
 \procedure template-header()

package/core/wiki/config/MediaQueryTrackers/DarkLightPreferred.tid

@@ -0,0 +1,5 @@
+title: $:/core/wiki/config/MediaQueryTrackers/DarkLightPreferred
+tags: $:/tags/MediaQueryTracker
+media-query: (prefers-color-scheme: dark)
+info-tiddler: $:/info/browser/darkmode
+info-tiddler-alt: $:/info/darkmode

package/core/wiki/config/OfficialPluginLibrary.tid

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

package/core/wiki/config/TiddlerInfoMode.tid

@@ -1,2 +1,2 @@
 title: $:/config/TiddlerInfo/Mode
-text: popup
+text: sticky

package/core/wiki/languageswitcher.tid

@@ -1,20 +1,20 @@
 title: $:/snippets/languageswitcher
 
 \whitespace trim
+\function language.filter() [all[current]field:title{$:/language}]
+
 <$linkcatcher to="$:/language">
-<div class="tc-chooser tc-language-chooser">
+<div class="tc-chooser tc-language-chooser" role="listbox">
 <$list filter="[[$:/languages/en-GB]] [plugin-type[language]sort[description]]">
-<$set name="cls" filter="[all[current]field:title{$:/language}]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item">
-<div class=<<cls>> lang={{!!name}}>
-<$link>
-<$view field="description">
-<$view field="name">
-<$view field="title"/>
-</$view>
-</$view>
-</$link>
-</div>
-</$set>
+	<div class={{{ [language.filter[]then[tc-chooser-item tc-chosen]else[tc-chooser-item]] }}} lang={{!!name}}>
+		<$link role="option" aria-selected={{{ [language.filter[]then[true]else[false]] }}}>
+			<$view field="description">
+				<$view field="name">
+				<$view field="title"/>
+				</$view>
+			</$view>
+		</$link>
+	</div>
 </$list>
 </div>
 </$linkcatcher>

package/core/wiki/macros/CSS-property.tid

@@ -0,0 +1,39 @@
+title: $:/core/macros/CSS/property
+
+<!-- CSS property macros -->
+
+<!-- TODO: Deprecate the following CSS macros once 2020 baseline is supported -->
+
+\procedure margin-start(size)
+	-webkit-margin-start: <<size>>;
+	margin-inline-start: <<size>>;
+\end
+
+\procedure margin-end(size)
+	-webkit-margin-end: <<size>>;
+	margin-inline-end: <<size>>;
+\end
+
+\procedure padding-start(size)
+	-webkit-padding-start: <<size>>;
+	padding-inline-start: <<size>>;
+\end
+
+\procedure padding-end(size)
+	-webkit-padding-end: <<size>>;
+	padding-inline-end: <<size>>;
+\end
+
+\procedure margin-inline(start,end)
+	-webkit-margin-start: <<start>>;
+	margin-inline-start: <<start>>;
+	-webkit-margin-end: <<end>>;
+	margin-inline-end: <<end>>;
+\end
+
+\procedure padding-inline(start,end)
+	-webkit-padding-start: <<start>>;
+	padding-inline-start: <<start>>;
+	-webkit-padding-end: <<end>>;
+	padding-inline-end: <<end>>;
+\end

package/core/wiki/macros/CSS.tid

@@ -13,56 +13,6 @@ tags: $:/tags/Macro
 
 \define color(name) <<colour $name$>>
 
-\define box-shadow(shadow)
-``
--webkit-box-shadow: $shadow$;
-	-moz-box-shadow: $shadow$;
-		box-shadow: $shadow$;
-``
-\end
-
-\define filter(filter)
-``
--webkit-filter: $filter$;
-	-moz-filter: $filter$;
-		filter: $filter$;
-``
-\end
-
-\define transition(transition)
-``
--webkit-transition: $transition$;
-	-moz-transition: $transition$;
-		transition: $transition$;
-``
-\end
-
-\define transform-origin(origin)
-``
--webkit-transform-origin: $origin$;
-	-moz-transform-origin: $origin$;
-		transform-origin: $origin$;
-``
-\end
-
-\define background-linear-gradient(gradient)
-``
-background-image: linear-gradient($gradient$);
-background-image: -o-linear-gradient($gradient$);
-background-image: -moz-linear-gradient($gradient$);
-background-image: -webkit-linear-gradient($gradient$);
-background-image: -ms-linear-gradient($gradient$);
-``
-\end
-
-\define column-count(columns)
-``
--moz-column-count: $columns$;
--webkit-column-count: $columns$;
-column-count: $columns$;
-``
-\end
-
 \procedure datauri(title)
 <$macrocall $name="makedatauri" type={{{ [<title>get[type]] }}} text={{{ [<title>get[text]] }}} _canonical_uri={{{ [<title>get[_canonical_uri]] }}}/>
 \end

package/core/wiki/macros/deprecated.tid

@@ -0,0 +1,43 @@
+title: $:/core/macros/deprecated
+tags: $:/tags/Macro
+
+<!-- Deprecated Macros -->
+<!-- DO NOT USE THESE MACROS. THEY MAY BE REMOVED AT ANY MOMENT -->
+
+\define box-shadow(shadow)
+``
+		box-shadow: $shadow$;
+``
+\end
+
+\define filter(filter)
+``
+		filter: $filter$;
+``
+\end
+
+\define transition(transition)
+``
+		transition: $transition$;
+``
+\end
+
+\define transform-origin(origin)
+``
+		transform-origin: $origin$;
+``
+\end
+
+\define background-linear-gradient(gradient)
+``
+background-image: linear-gradient($gradient$);
+background-image: -moz-linear-gradient($gradient$);
+background-image: -webkit-linear-gradient($gradient$);
+``
+\end
+
+\define column-count(columns)
+``
+column-count: $columns$;
+``
+\end

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

@@ -120,11 +120,21 @@ tags: $:/tags/Macro
 
 \procedure keyboard-driven-input(tiddler,storeTitle,field:"text",index:"",tag:"input",type,focus:"",inputAcceptActions,inputAcceptVariantActions,inputCancelActions,placeholder:"",default:"",class,focusPopup,rows,minHeight,tabindex,size,autoHeight,filterMinLength:"0",refreshTitle,selectionStateTitle,cancelPopups:"",configTiddlerFilter,firstSearchFilterField:"first-search-filter",secondSearchFilterField:"second-search-filter")
 \whitespace trim
-<$keyboard key="((input-accept))" actions=<<inputAcceptActions>>>
-<$keyboard key="((input-accept-variant))" actions=<<inputAcceptVariantActions>>>
-<$keyboard key="((input-up))" actions=<<input-next-actions-before>>>
-<$keyboard key="((input-down))" actions=<<input-next-actions-after>>>
-<$keyboard key="((input-cancel))" actions=<<inputCancelActions>>>
+\procedure keyboard-driven-input-actions()
+<%if [<event-key-descriptor>match[((input-accept))]] %>
+<$transclude $variable=inputAcceptActions $fillignore=yes />
+<%elseif [<event-key-descriptor>match[((input-accept-variant))]] %>
+<$transclude $variable=inputAcceptVariantActions $fillignore=yes />
+<%elseif [<event-key-descriptor>match[((input-up))]] %>
+<$transclude $variable=input-next-actions-before $fillignore=yes />
+<%elseif [<event-key-descriptor>match[((input-down))]] %>
+<$transclude $variable=input-next-actions-after $fillignore=yes />
+<%elseif [<event-key-descriptor>match[((input-cancel))]] %>
+<$transclude $variable=inputCancelActions $fillignore=yes />
+<%endif%>
+\end keyboard-driven-input-actions
+
+<$keyboard key="((input-accept)) ((input-accept-variant)) ((input-up)) ((input-down)) ((input-cancel))" actions=<<keyboard-driven-input-actions>>>
 	<$edit-text
 		tiddler=<<tiddler>> field=<<field>> index=<<index>>
 		inputActions=<<keyboard-input-actions>> tag=<<tag>> class=<<class>>
@@ -134,8 +144,4 @@ tags: $:/tags/Macro
 		refreshTitle=<<refreshTitle>> cancelPopups=<<cancelPopups>>
 	/>
 </$keyboard>
-</$keyboard>
-</$keyboard>
-</$keyboard>
-</$keyboard>
-\end
+\end keyboard-driven-input

package/core/wiki/macros/list.tid

@@ -22,46 +22,54 @@ tags: $:/tags/Macro
 <$action-listops $tiddler=<<targetTiddler>> $field=<<targetField>> $subfilter="+[insertbefore<actionTiddler>,<currentTiddler>]"/>
 \end
 
-\define list-links-draggable(tiddler,field:"list",emptyMessage,type:"ul",subtype:"li",class:"",itemTemplate)
+\define list-links-draggable(tiddler,field:"list",emptyMessage,type:"ul",subtype:"li",class:"",itemTemplate,displayField:"caption",startactions,endactions)
 \whitespace trim
-<span class="tc-links-draggable-list">
-	<$vars targetTiddler="""$tiddler$""" targetField="""$field$""">
-		<$genesis $type=<<__type__>> class="$class$">
-			<$list filter="[list[$tiddler$!!$field$]]" emptyMessage=<<__emptyMessage__>>>
-				<$droppable
-					actions=<<list-links-draggable-drop-actions>>
-					tag="""$subtype$"""
-					enable=<<tv-enable-drag-and-drop>>
-				>
-					<div class="tc-droppable-placeholder"/>
-					<div>
-						<$transclude tiddler="""$itemTemplate$""">
-							<$link to={{!!title}}>
-								<$let tv-wikilinks="no">
-									<$transclude field="caption">
-										<$view field="title"/>
-									</$transclude>
-								</$let>
-							</$link>
-						</$transclude>
-					</div>
-				</$droppable>
-			</$list>
-			<$tiddler tiddler="">
-				<$droppable
-					actions=<<list-links-draggable-drop-actions>> 
-					tag="div"
-					enable=<<tv-enable-drag-and-drop>>
-				>
-					<div class="tc-droppable-placeholder">
-						{{$:/core/images/blank}}
-					</div>
-					<div style="height:0.5em;"/>
-				</$droppable>
-			</$tiddler>
-		</$genesis>
-	</$vars>
-</span>
+<$set name="_tiddler" value="""$tiddler$""" emptyValue=<<currentTiddler>> >
+	<$let field-reference={{{ [<_tiddler>] "!!" [[$field$]] +[join[]] }}}
+		targetTiddler=<<_tiddler>>
+		targetField="""$field$"""
+	>
+		<span class="tc-links-draggable-list">
+			<$genesis $type=<<__type__>> class="$class$">
+				<$list filter="[list<field-reference>]" emptyMessage=<<__emptyMessage__>>>
+					<$droppable
+						actions=<<list-links-draggable-drop-actions>>
+						tag="""$subtype$"""
+						enable=<<tv-enable-drag-and-drop>>
+					>
+						<div class="tc-droppable-placeholder"/>
+						<div>
+							<$transclude tiddler=<<__itemTemplate__>>>
+								<$link to={{!!title}}
+									startactions=<<__startactions__>>
+									endactions=<<__endactions__>>
+								>
+									<$let tv-wikilinks="no">
+										<$transclude field=<<__displayField__>>>
+											<$view field="title"/>
+										</$transclude>
+									</$let>
+								</$link>
+							</$transclude>
+						</div>
+					</$droppable>
+				</$list>
+				<$tiddler tiddler="">
+					<$droppable
+						actions=<<list-links-draggable-drop-actions>> 
+						tag="div"
+						enable=<<tv-enable-drag-and-drop>>
+					>
+						<div class="tc-droppable-placeholder">
+							{{$:/core/images/blank}}
+						</div>
+						<div style="height:0.5em;"/>
+					</$droppable>
+				</$tiddler>
+			</$genesis>
+		</span>
+	</$let>
+</$set>
 \end
 
 \define list-tagged-draggable-drop-actions(tag)
@@ -87,7 +95,7 @@ tags: $:/tags/Macro
 </$set>
 \end
 
-\define list-tagged-draggable(tag,subFilter,emptyMessage,itemTemplate,elementTag:"div",storyview:"")
+\define list-tagged-draggable(tag,subFilter,emptyMessage,itemTemplate,elementTag:"div",storyview:"",displayField:"title",startactions,endactions)
 \whitespace trim
 <span class="tc-tagged-draggable-list">
 	<$set name="tag" value=<<__tag__>>>
@@ -103,9 +111,16 @@ tags: $:/tags/Macro
 				>
 					<$genesis $type=<<__elementTag__>> class="tc-droppable-placeholder"/>
 					<$genesis $type=<<__elementTag__>>>
-						<$transclude tiddler="""$itemTemplate$""">
-							<$link to={{!!title}}>
-								<$view field="title"/>
+						<$transclude tiddler=<<__itemTemplate__>>>
+							<$link to={{!!title}}
+								startactions=<<__startactions__>>
+								endactions=<<__endactions__>>
+							>
+								<$let tv-wikilinks="no">
+									<$transclude field=<<__displayField__>>>
+										<$view field="title"/>
+									</$transclude>
+								</$let>
 							</$link>
 						</$transclude>
 					</$genesis>

package/core/wiki/macros/tabs.tid

@@ -9,8 +9,9 @@ code-body: yes
 	setTo=<<currentTab>>
 	default=<<__default__>>
 	selectedClass="tc-tab-selected"
+	selectedAria="aria-selected"
 	tooltip={{!!tooltip}}
-	role="switch"
+	role="tab"
 	data-tab-title=<<currentTab>>
 >
 	<$tiddler tiddler=<<save-currentTiddler>>>
@@ -57,12 +58,12 @@ code-body: yes
 \whitespace trim
 <$qualify title=<<__state__>> name="qualifiedState">
 	<$let tabsState={{{ [<__explicitState__>minlength[1]] ~[<qualifiedState>] }}}>
-		<div class={{{ [[tc-tab-set]addsuffix[ ]addsuffix<__class__>] }}}>
+		<div class={{{ [[tc-tab-set]addsuffix[ ]addsuffix<__class__>] }}} role="tablist">
 			<div class={{{ [[tc-tab-buttons]addsuffix[ ]addsuffix<__class__>] }}}>
 				<<tabs-tab-list>>
 			</div>
 			<div class={{{ [[tc-tab-divider]addsuffix[ ]addsuffix<__class__>] }}}/>
-			<div class={{{ [[tc-tab-content]addsuffix[ ]addsuffix<__class__>] }}}>
+			<div class={{{ [[tc-tab-content]addsuffix[ ]addsuffix<__class__>] }}} role="tabpanel">
 				<<tabs-tab-body>>
 			</div>
 		</div>

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

@@ -21,7 +21,7 @@ second-search-filter: [subfilter<tagListFilter>is[system]search:title<userInput>
 
 <!-- clean up temporary tiddlers, so the next "pick" starts with a clean input -->
 <!-- This could probably be optimized / removed if we would use different temp-tiddlers
-	(future improvement because keeping track is comlex for humans)
+	(future improvement because keeping track is complex for humans)
 -->
 \procedure delete-tag-state-tiddlers()
 <$action-deletetiddler $filter="[<newTagNameTiddler>] [<storeTitle>] [<tagSelectionState>]"/>
@@ -111,13 +111,14 @@ The second ESC tries to close the "draft tiddler"
 				refreshTitle=<<refreshTitle>>
 				selectionStateTitle=<<tagSelectionState>>
 				inputAcceptActions=<<add-tag-actions>>
+				inputAcceptVariantActions=<<save-tiddler-actions>>
 				inputCancelActions=<<clear-tags-actions>>
 				tag="input"
 				placeholder={{$:/language/EditTemplate/Tags/Add/Placeholder}}
 				focusPopup=<<tf.tagpicker-dropdown-id>>
 				class="tc-edit-texteditor tc-popup-handle"
 				tabindex=<<tabIndex>>
-				focus={{{ [{$:/config/AutoFocus}match[tags]then[true]] :else[[false]] }}}
+				focus={{{ [{!!draft.of}is[tiddler]then{$:/config/AutoFocusEdit}match[tags]then[true]] :else[{$:/config/AutoFocus}match[tags]then[true]] :else[[false]] }}}
 				filterMinLength={{$:/config/Tags/MinLength}}
 				cancelPopups=<<cancelPopups>>
 				configTiddlerFilter="[[$:/core/macros/tag-picker]]"

package/core/wiki/macros/toc.tid

@@ -15,7 +15,18 @@ tags: $:/tags/Macro
 </span>
 \end
 
-\define toc-body(tag,sort:"",itemClassFilter,exclude,path)
+\define toc-level-indicator()
+\whitespace trim
+<%if [<__level__>compare:number:gt[0]]%>
+  <%if [<currentTiddler>tagging[]] %>
+    <span class="tc-tiny-gap-left">{{$:/core/images/new-button}}</span>
+  <%else%>
+    <span class="tc-tiny-gap-left">{{$:/core/images/blank}}</span>
+  <%endif%>
+<% endif %>
+\end
+
+\define toc-body(tag,sort:"",itemClassFilter,exclude,path,level)
 \whitespace trim
 <ol class="tc-toc">
   <$list filter="""[all[shadows+tiddlers]tag<__tag__>!has[draft.of]$sort$] -[<__tag__>] -[subfilter<__exclude__>]""">
@@ -23,10 +34,26 @@ tags: $:/tags/Macro
       <$set name="excluded" filter="[subfilter<__exclude__>] [<__tag__>]">
         <$set name="toc-item-class" filter=<<__itemClassFilter__>> emptyValue="toc-item-selected" value="toc-item">
           <li class=<<toc-item-class>>>
-            <$list filter="[all[current]toc-link[no]]" emptyMessage="<$link to={{{ [<currentTiddler>get[target]else<currentTiddler>] }}}><<toc-caption>></$link>">
+            <$list filter="[all[current]toc-link[no]]" >
+              <$list-empty>
+                <!-- link to target-field or currentTiddler -->
+                <$link to={{{ [<currentTiddler>get[target]else<currentTiddler>] }}}>
+                  <<toc-level-indicator>>
+                  <<toc-caption>>
+                </$link>
+              </$list-empty>
+              <!-- toc-link = no -->
+              <<toc-level-indicator>>
               <<toc-caption>>
             </$list>
-            <$macrocall $name="toc-body" tag=<<item>> sort=<<__sort__>> itemClassFilter=<<__itemClassFilter__>> exclude=<<excluded>> path=<<path>>/>
+            <$let _level={{{ [<__level__>subtract[1]] }}}>
+              <%if [<_level>compare:number:gt[0]]%>
+                <$macrocall $name="toc-body" tag=<<item>> sort=<<__sort__>> itemClassFilter=<<__itemClassFilter__>> exclude=<<excluded>> path=<<path>> level=<<_level>>/>
+              <%elseif [<_level>match[-1]]%>
+                <!-- show full toc, no level defined -->
+                <$macrocall $name="toc-body" tag=<<item>> sort=<<__sort__>> itemClassFilter=<<__itemClassFilter__>> exclude=<<excluded>> path=<<path>>/>
+              <%endif%>
+            </$let>
           </li>
         </$set>
       </$set>
@@ -35,10 +62,10 @@ tags: $:/tags/Macro
 </ol>
 \end
 
-\define toc(tag,sort:"",itemClassFilter:"", exclude)
+\define toc(tag,sort:"",itemClassFilter:"",exclude,level)
 \whitespace trim
 <$let __tag__={{{ [<__tag__>is[blank]then<currentTiddler>else<__tag__>] }}} >
-  <$macrocall $name="toc-body"  tag=<<__tag__>> sort=<<__sort__>> itemClassFilter=<<__itemClassFilter__>> exclude=<<__exclude__>>/>
+  <$macrocall $name="toc-body"  tag=<<__tag__>> sort=<<__sort__>> itemClassFilter=<<__itemClassFilter__>> exclude=<<__exclude__>> level=<<__level__>>/>
 </$let>
 \end
 

package/core/wiki/minifocuseditswitcher.tid

@@ -0,0 +1,8 @@
+title: $:/snippets/minifocuseditswitcher
+
+\whitespace trim
+<$select tiddler="$:/config/AutoFocusEdit" default={{$:/config/AutoFocus}}>
+<$list filter="title tags text">
+<option><<currentTiddler>></option>
+</$list>
+</$select>

package/core/wiki/tags/TiddlerInfoAdvanced.tid

@@ -1,2 +1,2 @@
 title: $:/tags/TiddlerInfo/Advanced
-list: [[$:/core/ui/TiddlerInfo/Advanced/ShadowInfo]] [[$:/core/ui/TiddlerInfo/Advanced/PluginInfo]] 
+list: [[$:/core/ui/TiddlerInfo/Advanced/ShadowInfo]] [[$:/core/ui/TiddlerInfo/Advanced/PluginInfo]] [[$:/core/ui/TiddlerInfo/Advanced/CascadeInfo]]

package/core/wiki/themeswitcher.tid

@@ -1,17 +1,18 @@
 title: $:/snippets/themeswitcher
 
 \whitespace trim
+\function theme.filter() [all[current]field:title{$:/theme}] [[$:/theme]!has[text]addsuffix[s/tiddlywiki/vanilla]field:title<currentTiddler>] +[limit[1]]
+
 <$linkcatcher to="$:/theme">
-<div class="tc-chooser">
+<div class="tc-chooser" role="listbox">
 <$list filter="[plugin-type[theme]sort[title]]">
-<$set name="cls" filter="[all[current]field:title{$:/theme}] [[$:/theme]!has[text]addsuffix[s/tiddlywiki/vanilla]field:title<currentTiddler>] +[limit[1]]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item">
-<div class=<<cls>>><$link to={{!!title}}>
-''<$view field="name" format="text"/>''
-&#32;
-<$view field="description" format="text"/>
-</$link>
-</div>
-</$set>
+	<div class={{{ [theme.filter[]then[tc-chooser-item tc-chosen]else[tc-chooser-item]] }}}>
+		<$link to={{!!title}} role="option" aria-selected={{{ [theme.filter[]then[true]else[false]] }}}>
+			''<$view field="name" format="text"/>''
+			&#32;
+			<$view field="description" format="text"/>
+		</$link>
+	</div>
 </$list>
 </div>
 </$linkcatcher>