tiddlywiki 5.3.5 → 5.3.6

package/core/wiki/macros/CSS.tid

@@ -1,5 +1,5 @@
 title: $:/core/macros/CSS
-tags: $:/tags/Macro $:/tags/Global
+tags: $:/tags/Macro
 
 <!-- Needs to stay that way for backwards compatibility. See GH issue: #8326 -->
 \define colour(name)
@@ -13,42 +13,54 @@ tags: $:/tags/Macro $:/tags/Global
 
 \define color(name) <<colour $name$>>
 
-\function box-shadow(shadow)
-[[ -webkit-box-shadow: $(shadow)$;
-	-moz-box-shadow: $(shadow)$;
-	box-shadow: $(shadow)$;]substitute[]]
+\define box-shadow(shadow)
+``
+-webkit-box-shadow: $shadow$;
+	-moz-box-shadow: $shadow$;
+		box-shadow: $shadow$;
+``
 \end
 
-\function filter(filter)
-[[ -webkit-filter: $(filter)$;
-	-moz-filter: $(filter)$;
-	filter: $(filter)$;]substitute[]]
+\define filter(filter)
+``
+-webkit-filter: $filter$;
+	-moz-filter: $filter$;
+		filter: $filter$;
+``
 \end
 
-\function transition(transition)
-[[ -webkit-transition: $(transition)$;
-	-moz-transition: $(transition)$;
-	transition: $(transition)$;]substitute[]]
+\define transition(transition)
+``
+-webkit-transition: $transition$;
+	-moz-transition: $transition$;
+		transition: $transition$;
+``
 \end
 
-\function transform-origin(origin)
-[[ -webkit-transform-origin: $(origin)$;
-	-moz-transform-origin: $(origin)$;
-	transform-origin: $(origin)$;]substitute[]]
+\define transform-origin(origin)
+``
+-webkit-transform-origin: $origin$;
+	-moz-transform-origin: $origin$;
+		transform-origin: $origin$;
+``
 \end
 
-\function 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)$);]substitute[]]
+\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
 
-\function column-count(columns)
-[[-moz-column-count: $(columns)$;
-	-webkit-column-count: $(columns)$;
-	column-count: $(columns)$;]substitute[]]
+\define column-count(columns)
+``
+-moz-column-count: $columns$;
+-webkit-column-count: $columns$;
+column-count: $columns$;
+``
 \end
 
 \procedure datauri(title)

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

@@ -10,9 +10,7 @@ tags: $:/tags/Macro
 
 \define colour-picker-inner(actions)
 <$button tag="a" tooltip="""$(colour-picker-value)$""">
-
 $(colour-picker-update-recent)$
-
 <$transclude $variable="__actions__"/>
 
 <span style="display:inline-block; background-color: $(colour-picker-value)$; width: 100%; height: 100%; border-radius: 50%;"/>

package/core/wiki/macros/copy-to-clipboard.tid

@@ -1,5 +1,5 @@
 title: $:/core/macros/copy-to-clipboard
-tags: $:/tags/Macro $:/tags/Global
+tags: $:/tags/Macro
 
 \whitespace trim
 

package/core/wiki/macros/diff.tid

@@ -1,5 +1,5 @@
 title: $:/core/macros/diff
-tags: $:/tags/Macro $:/tags/Global
+tags: $:/tags/Macro
 
 \whitespace trim
 

package/core/wiki/macros/export.tid

@@ -1,33 +1,51 @@
 title: $:/core/macros/export
 tags: $:/tags/Macro
 
-\define exportButtonFilename(baseFilename)
-$baseFilename$$(extension)$
+\function exportButtonFilename(baseFilename)
+[<baseFilename>] [<extension>] +[join[]]
 \end
 
-\define exportButton(exportFilter:"[!is[system]sort[title]]",lingoBase,baseFilename:"tiddlers")
+\procedure exportButton(exportFilter:"[!is[system]sort[title]]",lingoBase,baseFilename:"tiddlers")
 \whitespace trim
-<$vars hint={{{ [<__lingoBase__>addsuffix[Hint]get[text]] }}} caption={{{  [<__lingoBase__>addsuffix[Caption]get[text]] }}}>
-<span class="tc-popup-keep"><$button popup=<<qualify "$:/state/popup/export">> tooltip=<<hint>> aria-label=<<caption>> class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
-{{$:/core/images/export-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
-<span class="tc-btn-text"><$text text=<<caption>>/></span>
-</$list>
-</$button></span></$vars><$reveal state=<<qualify "$:/state/popup/export">> type="popup" position="below" animate="yes">
-<div class="tc-drop-down">
-<$set name="count" value={{{ [subfilter<__exportFilter__>count[]] }}}>
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/Exporter]]">
-<$list filter="[<currentTiddler>has[condition]subfilter{!!condition}limit[1]] ~[<currentTiddler>!has[condition]then[true]]" variable="ignore">
-<$button class="tc-btn-invisible">
-<$action-sendmessage $message="tm-download-file" $param=<<currentTiddler>> exportFilter=<<__exportFilter__>> filename={{{ [<__baseFilename__>addsuffix{!!extension}] }}}/>
-<$action-deletetiddler $tiddler=<<qualify "$:/state/popup/export">>/>
-<$transclude field="description"/>
-</$button>
-</$list>
-</$list>
-</$set>
-</div>
+<$let hint={{{ [<lingoBase>addsuffix[Hint]get[text]] }}}
+	caption={{{  [<lingoBase>addsuffix[Caption]get[text]] }}}
+>
+	<span class="tc-popup-keep">
+		<$button popup=<<qualify "$:/state/popup/export">>
+			tooltip=<<hint>>
+			aria-label=<<caption>>
+			class=<<tv-config-toolbar-class>>
+			selectedClass="tc-selected"
+			dragFilter=<<exportFilter>>
+		>
+			<%if [<tv-config-toolbar-icons>match[yes]] %>
+				{{$:/core/images/export-button}}
+			<%endif%>
+			<%if [<tv-config-toolbar-text>match[yes]] %>
+				<span class="tc-btn-text"><$text text=<<caption>>/></span>
+			<%endif%>
+		</$button>
+	</span>
+</$let>
+<$reveal state=<<qualify "$:/state/popup/export">> type="popup" position="below" animate="yes">
+	<div class="tc-drop-down">
+		<$set name="count" value={{{ [subfilter<exportFilter>count[]] }}}>
+			<$list filter="[all[shadows+tiddlers]tag[$:/tags/Exporter]]">
+				<$list filter="[<currentTiddler>has[condition]subfilter{!!condition}limit[1]] ~[<currentTiddler>!has[condition]then[true]]"
+					variable="ignore"
+				>
+					<$button class="tc-btn-invisible">
+						<$action-sendmessage $message="tm-download-file"
+							$param=<<currentTiddler>>
+							exportFilter=<<exportFilter>>
+							filename={{{ [<baseFilename>addsuffix{!!extension}] }}}
+						/>
+						<$action-deletetiddler $tiddler=<<qualify "$:/state/popup/export">>/>
+						<$transclude field="description"/>
+					</$button>
+				</$list>
+			</$list>
+		</$set>
+	</div>
 </$reveal>
 \end

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

@@ -1,105 +1,137 @@
 title: $:/core/macros/keyboard-driven-input
 tags: $:/tags/Macro
 
-\define change-input-tab(stateTitle,tag,beforeafter,defaultState,actions)
+\procedure prefix.bracket() [
+\procedure suffix.bracket() ]
+
+\function tf.change-input-tab.next-tab() [[all]addprefix<prefix.bracket>addsuffix<prefix.bracket>addsuffix[shadows+tiddlers]addsuffix<suffix.bracket>addsuffix[tag<tag>!has]addsuffix<prefix.bracket>addsuffix[draft.of]addsuffix<suffix.bracket>addsuffix<beforeafter>addsuffix[<currentState>]addsuffix<suffix.bracket>addsuffix[ :else]addsuffix<prefix.bracket>addsuffix<prefix.bracket>addsuffix<beforeafter>addsuffix<suffix.bracket>addsuffix[match]addsuffix<prefix.bracket>addsuffix[after]addsuffix<suffix.bracket>addsuffix[then<firstTab>]addsuffix<suffix.bracket>addsuffix[ :else]addsuffix<prefix.bracket>addsuffix<prefix.bracket>addsuffix<beforeafter>addsuffix<suffix.bracket>addsuffix[match]addsuffix<prefix.bracket>addsuffix[before]addsuffix<suffix.bracket>addsuffix[then<lastTab>]addsuffix<suffix.bracket>]
+
+\procedure change-input-tab(stateTitle,tag,beforeafter,defaultState,actions)
 \whitespace trim
-<$set name="tabsList" filter="[all[shadows+tiddlers]tag<__tag__>!has[draft.of]]">
+<$set name="tabsList" filter="[<explicitTabList>!is[blank]enlist-input[]] :else[all[shadows+tiddlers]tag<tag>!has[draft.of]]">
 	<$let
-		currentState={{{ [<__stateTitle__>!is[missing]get[text]] ~[<__defaultState__>] }}}
+		currentState={{{ [<stateTitle>!is[missing]get[text]] :else[<defaultState>] }}}
 		firstTab={{{ [enlist<tabsList>nth[1]] }}}
 		lastTab={{{ [enlist<tabsList>last[]] }}}
-		nextTab={{{ [all[shadows+tiddlers]tag<__tag__>!has[draft.of]$beforeafter$<currentState>] ~[[$beforeafter$]removeprefix[after]suffix[]addprefix<firstTab>] ~[[$beforeafter$]removeprefix[before]suffix[]addprefix<lastTab>] }}}
+		nextTabSubFilter=<<tf.change-input-tab.next-tab>>
+		nextTab={{{ [subfilter<nextTabSubFilter>] }}}
 	>
-		<$action-setfield $tiddler=<<__stateTitle__>> text=<<nextTab>>/>
-		$actions$
+		<$action-setfield $tiddler=<<stateTitle>> text=<<nextTab>>/>
+		<<actions>>
 	</$let>
 </$set>
 \end
 
-\define keyboard-input-actions()
+\procedure keyboard-input-actions()
 \whitespace trim
-<$list filter="[<__index__>match[]]">
-	<$action-setfield $tiddler=<<__storeTitle__>> text={{{ [<__tiddler__>get<__field__>] }}}/>
-</$list>
-<$list filter="[<__index__>!match[]]">
-	<$action-setfield $tiddler=<<__storeTitle__>> text={{{ [<__tiddler__>getindex<__index__>] }}}/>
-</$list>
+<%if [<index>match[]] %>
+	<$action-setfield $tiddler=<<storeTitle>> text={{{ [<tiddler>get<field>] }}}/>
+<% endif %>
+<%if [<index>!match[]] %>
+	<$action-setfield $tiddler=<<storeTitle>> text={{{ [<tiddler>getindex<index>] }}}/>
+<% endif %>
 \end
 
-\define input-next-actions-inner()
+\procedure input-next-actions-inner()
 \whitespace trim
-<$list filter="[<nextItem>minlength[1]]" variable="ignore">
-	<$action-setfield $tiddler=<<__selectionStateTitle__>> text=<<nextItem>>/>
-	<$list filter="[<__index__>match[]]">
-		<$action-setfield $tiddler=<<__tiddler__>> $field=<<__field__>> $value={{{ [<nextItem>] +[splitregexp[(?:.(?!-))+$]] }}}/>
-	</$list>
-	<$list filter="[<__index__>!match[]]">
-		<$action-setfield $tiddler=<<__tiddler__>> $index=<<__index__>> $value={{{ [<nextItem>] +[splitregexp[(?:.(?!-))+$]] }}}/>
-	</$list>
-	<$action-setfield $tiddler=<<__refreshTitle__>> text="yes"/>
-</$list>
+<%if [<nextItem>minlength[1]] %>
+	<$action-setfield $tiddler=<<selectionStateTitle>> text=<<nextItem>>/>
+	<%if [<index>match[]] %>
+		<$action-setfield $tiddler=<<tiddler>> $field=<<field>> $value={{{ [<nextItem>] :and[splitregexp[(?:.(?!-))+$]] }}}/>
+	<% endif %>
+	<%if [<index>!match[]] %>
+		<$action-setfield $tiddler=<<tiddler>> $index=<<index>> $value={{{ [<nextItem>] :and[splitregexp[(?:.(?!-))+$]] }}}/>
+	<% endif %>
+	<$action-setfield $tiddler=<<refreshTitle>> text="yes"/>
+<% endif %>
 \end
 
-\define input-next-actions(afterOrBefore:"after",reverse:"")
+\procedure input-next-actions-after()
 \whitespace trim
-<$list
-	filter="[<__storeTitle__>get[text]minlength<__filterMinLength__>] [<__filterMinLength__>match[0]] +[limit[1]]"
-	variable="ignore"
->
+<%if [<storeTitle>get[text]minlength<filterMinLength>] [<filterMinLength>match[0]] %>
 	<$let
-		userInput={{{ [<__storeTitle__>get[text]] }}}
-		selectedItem={{{ [<__selectionStateTitle__>get[text]] }}}
-		configTiddler={{{ [subfilter<__configTiddlerFilter__>] }}}
-		primaryListFilter={{{ [<configTiddler>get<__firstSearchFilterField__>] }}}
-		secondaryListFilter={{{ [<configTiddler>get<__secondSearchFilterField__>] }}}
+		userInput={{{ [<storeTitle>get[text]] }}}
+		selectedItem={{{ [<selectionStateTitle>get[text]] }}}
+		configTiddler={{{ [subfilter<configTiddlerFilter>] }}}
+		primaryListFilter={{{ [<configTiddler>get<firstSearchFilterField>] }}}
+		secondaryListFilter={{{ [<configTiddler>get<secondSearchFilterField>] }}}
 	>
 		<$set
 			name="filteredList"
-			filter="[subfilter<primaryListFilter>addsuffix[-primaryList]] =[subfilter<secondaryListFilter>addsuffix[-secondaryList]]"
+			filter="[subfilter<primaryListFilter>addsuffix[-primaryList]] :all[subfilter<secondaryListFilter>addsuffix[-secondaryList]]"
 		>
 			<$let
-				nextItem={{{ [enlist<filteredList>$afterOrBefore$<selectedItem>] ~[enlist<filteredList>$reverse$nth[1]] }}}
+				nextItem={{{ [enlist<filteredList>after<selectedItem>] :else[enlist<filteredList>nth[1]] }}}
 				firstItem={{{ [enlist<filteredList>nth[1]] }}}
 				lastItem={{{ [enlist<filteredList>last[]] }}}
 			>
-				<$list filter="[<selectedItem>match<firstItem>!match<lastItem>]" variable="ignore">
-					<$set name="nextItem" value={{{ [[$afterOrBefore$]match[before]then<userInput>addsuffix[-userInput]] ~[<nextItem>] }}}>
+				<%if [<selectedItem>match<firstItem>!match<lastItem>] [<selectedItem>!match<firstItem>!match<lastItem>] %>
+					<<input-next-actions-inner>>
+				<%elseif [<selectedItem>match<lastItem>!match<firstItem>] %>
+					<$set name="nextItem" value={{{ [<userInput>addsuffix[-userInput]] }}}>
 						<<input-next-actions-inner>>
 					</$set>
-				</$list>
-				<$list filter="[<selectedItem>match<lastItem>!match<firstItem>]" variable="ignore">
-					<$set name="nextItem" value={{{ [[$afterOrBefore$]match[after]then<userInput>addsuffix[-userInput]] ~[<nextItem>] }}}>
+				<%elseif [<selectedItem>match<firstItem>match<lastItem>] %>
+					<$set name="nextItem" value={{{ [<userInput>addsuffix[-userInput]] }}}>
 						<<input-next-actions-inner>>
 					</$set>
-				</$list>
-				<$list filter="[<selectedItem>match<firstItem>match<lastItem>]" variable="ignore">
+				<% endif %>
+			</$let>
+		</$set>
+	</$let>
+<% endif %>
+\end
+
+\procedure input-next-actions-before()
+\whitespace trim
+<%if [<storeTitle>get[text]minlength<filterMinLength>] [<filterMinLength>match[0]] %>
+	<$let
+		userInput={{{ [<storeTitle>get[text]] }}}
+		selectedItem={{{ [<selectionStateTitle>get[text]] }}}
+		configTiddler={{{ [subfilter<configTiddlerFilter>] }}}
+		primaryListFilter={{{ [<configTiddler>get<firstSearchFilterField>] }}}
+		secondaryListFilter={{{ [<configTiddler>get<secondSearchFilterField>] }}}
+	>
+		<$set
+			name="filteredList"
+			filter="[subfilter<primaryListFilter>addsuffix[-primaryList]] :all[subfilter<secondaryListFilter>addsuffix[-secondaryList]]"
+		>
+			<$let
+				nextItem={{{ [enlist<filteredList>before<selectedItem>] :else[enlist<filteredList>reverse[]nth[1]] }}}
+				firstItem={{{ [enlist<filteredList>nth[1]] }}}
+				lastItem={{{ [enlist<filteredList>last[]] }}}
+			>
+				<%if [<selectedItem>match<firstItem>!match<lastItem>] %>
 					<$set name="nextItem" value={{{ [<userInput>addsuffix[-userInput]] }}}>
 						<<input-next-actions-inner>>
 					</$set>
-				</$list>
-				<$list filter="[<selectedItem>!match<firstItem>!match<lastItem>]" variable="ignore">
+				<%elseif [<selectedItem>match<lastItem>!match<firstItem>] [<selectedItem>!match<firstItem>!match<lastItem>] %>
 					<<input-next-actions-inner>>
-				</$list>
+				<%elseif [<selectedItem>match<firstItem>match<lastItem>] %>
+					<$set name="nextItem" value={{{ [<userInput>addsuffix[-userInput]] }}}>
+						<<input-next-actions-inner>>
+					</$set>
+				<% endif %>
 			</$let>
 		</$set>
 	</$let>
-</$list>
+<% endif %>
 \end
 
-\define 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")
+\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" "reverse[]">>>
-<$keyboard key="((input-down))" actions=<<input-next-actions>>>
-<$keyboard key="((input-cancel))" actions=<<__inputCancelActions__>>>
+<$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>>>
 	<$edit-text
-		tiddler=<<__tiddler__>> field=<<__field__>> index=<<__index__>>
-		inputActions=<<keyboard-input-actions>> tag=<<__tag__>> class=<<__class__>>
-		placeholder=<<__placeholder__>> default=<<__default__>> focusPopup=<<__focusPopup__>>
-		focus=<<__focus__>> type=<<__type__>> rows=<<__rows__>> minHeight=<<__minHeight__>>
-		tabindex=<<__tabindex__>> size=<<__size__>> autoHeight=<<__autoHeight__>>
-		refreshTitle=<<__refreshTitle__>> cancelPopups=<<__cancelPopups__>>
+		tiddler=<<tiddler>> field=<<field>> index=<<index>>
+		inputActions=<<keyboard-input-actions>> tag=<<tag>> class=<<class>>
+		placeholder=<<placeholder>> default=<<default>> focusPopup=<<focusPopup>>
+		focus=<<focus>> type=<<type>> rows=<<rows>> minHeight=<<minHeight>>
+		tabindex=<<tabindex>> size=<<size>> autoHeight=<<autoHeight>>
+		refreshTitle=<<refreshTitle>> cancelPopups=<<cancelPopups>>
 	/>
 </$keyboard>
 </$keyboard>

package/core/wiki/macros/show-filter-count.tid

@@ -0,0 +1,17 @@
+title: $:/core/macros/show-filter-count
+tags: $:/tags/Macro
+
+\whitespace trim
+
+\procedure show-filter-count(filter)
+<$button class="tc-btn-invisible">
+	<$action-setfield $tiddler="$:/temp/advancedsearch" $value=<<filter>>/>
+	<$action-setfield $tiddler="$:/temp/advancedsearch/input" $value=<<filter>>/>
+	<$action-setfield $tiddler="$:/temp/advancedsearch/refresh" text="yes"/>
+	<$action-setfield $tiddler="$:/state/tab--1498284803" $value="$:/core/ui/AdvancedSearch/Filter"/>
+	<$action-navigate $to="$:/AdvancedSearch"/>
+	<$action-sendmessage $message="tm-focus-selector" $param=".tc-advanced-search input"/>
+	<span class="tc-small-gap-right">''<$count filter=<<filter>>/>''</span>
+	{{$:/core/images/advanced-search-button}}
+</$button>
+\end

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

@@ -1,5 +1,5 @@
 title: $:/core/macros/tag-picker
-tags: $:/tags/Macro $:/tags/Global
+tags: $:/tags/Macro
 first-search-filter: [subfilter<tagListFilter>!is[system]search:title<userInput>]
 second-search-filter: [subfilter<tagListFilter>is[system]search:title<userInput>]
 
@@ -13,11 +13,11 @@ second-search-filter: [subfilter<tagListFilter>is[system]search:title<userInput>
 <!-- tf.tagpicker-dropdown-id is needed if several tap-pickers are shown in one tiddler -->
 \function tf.tagpicker-dropdown-id()
 	[<qualify $:/state/popup/tags-auto-complete>]
-	[[$(saveTiddler)$-[$(tagField)$-$(tagListFilter)$]substitute[]sha256[]] +[join[/]]
+	[[$(saveTiddler)$-[$(tagField)$-$(tagListFilter)$]substitute[]sha256[]] :and[join[/]]
 \end
 
 \function tf.tagpicker-dropdown-class() [<tf.tagpicker-dropdown-id>sha256[]addprefix[tc-]]
-\function tf.get-tagpicker-focus-selector() [<tf.tagpicker-dropdown-class>addprefix[.]] .tc-popup-handle +[join[ ]]
+\function tf.get-tagpicker-focus-selector() [<tf.tagpicker-dropdown-class>addprefix[.]] .tc-popup-handle :and[join[ ]]
 
 <!-- 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
@@ -30,12 +30,12 @@ second-search-filter: [subfilter<tagListFilter>is[system]search:title<userInput>
 <!-- trigger __toggle tag__ by keyboard -->
 \procedure add-tag-actions()
 <$let tag=<<_tf.getTag>> >
-	<$action-listops $tiddler=<<saveTiddler>> $field=<<tagField>> $subfilter='+[toggle<tag>trim[]]'/>
-	<% if [<tag>] :intersection[<saveTiddler>get<tagField>enlist-input[]] %>
+	<$action-listops $tiddler=<<saveTiddler>> $field=<<tagField>> $subfilter=':and[toggle<tag>trim[]]'/>
+	<%if [<tag>] :intersection[<saveTiddler>get<tagField>enlist-input[]] %>
 		<!-- tag has been removed - do nothing -->
-	<% else %>
+	<%else%>
 		<<actions>>
-	<% endif %>
+	<%endif%>
 	<<delete-tag-state-tiddlers>>
 	<$action-setfield $tiddler=<<refreshTitle>> text="yes"/>
 </$let>
@@ -46,11 +46,11 @@ second-search-filter: [subfilter<tagListFilter>is[system]search:title<userInput>
 The second ESC tries to close the "draft tiddler"
 -->
 \procedure clear-tags-actions-inner()
-<% if [<storeTitle>has[text]] ~[<newTagNameTiddler>has[text]] %>
+<%if [<storeTitle>has[text]] :else[<newTagNameTiddler>has[text]] %>
 	<<delete-tag-state-tiddlers>>
-<% else %>
+<%else%>
 		<<cancel-delete-tiddler-actions "cancel">>
-<% endif %>
+<%endif%>
 \end
 
 <!-- triggered by keyboard only -->
@@ -77,17 +77,20 @@ The second ESC tries to close the "draft tiddler"
 <!-- <$action-log /> -->
 
 <!-- create dropdown list -->
-\procedure tag-picker-listTags(filter, suffix)
+\procedure tag-picker-listTags(filter, suffix, empty)
 <$let userInput=<<_tf.getUserInput>> >
 	<$list filter="[<userInput>minlength{$:/config/Tags/MinLength}limit[1]]"
 		emptyMessage="<div class='tc-search-results'>{{$:/language/Search/Search/TooShort}}</div>" variable="listItem"
 	>
 		<$list filter=<<filter>> variable="tag">
+			<$list-empty>
+				<span class="tc-small-gap-left"><<empty>></span>
+			</$list-empty>
 			<!-- The buttonClasses filter is used to define tc-tag-button-selected state -->
 			<!-- tf.get-tagpicker-focus-selector has to be resolved for $:/core/ui/TagPickerTagTemplate,
 				othwerwise qualify in tf.tagpicker-dropdown-id causes problems -->
 			<$let currentTiddler=<<tag>>
-				button-classes=`tc-btn-invisible ${[<tag>addsuffix<suffix>] -[<tagSelectionState>get[text]] :then[[]] ~tc-tag-button-selected }$`
+				button-classes=`tc-btn-invisible ${[<tag>addsuffix<suffix>] :except[<tagSelectionState>get[text]] :then[[]] ~tc-tag-button-selected }$`
 				get-tagpicker-focus-selector=`${[<tf.get-tagpicker-focus-selector>]}$`
 			>
 				{{||$:/core/ui/TagPickerTagTemplate}}
@@ -99,10 +102,10 @@ The second ESC tries to close the "draft tiddler"
 
 <!-- tag-picker-inner is the main function -->
 \procedure tag-picker-inner()
-<div class={{{ [[tc-edit-add-tag]] [<tf.tagpicker-dropdown-class>] +[join[ ]] }}}>
+<div class={{{ [[tc-edit-add-tag]] [<tf.tagpicker-dropdown-class>] :and[join[ ]] }}}>
 	<div class="tc-edit-add-tag-ui">
 		<span class="tc-add-tag-name tc-small-gap-right">
-			<$macrocall	$name="keyboard-driven-input"
+			<$transclude $variable="keyboard-driven-input"
 				tiddler=<<newTagNameTiddler>>
 				storeTitle=<<storeTitle>>
 				refreshTitle=<<refreshTitle>>
@@ -114,7 +117,7 @@ The second ESC tries to close the "draft tiddler"
 				focusPopup=<<tf.tagpicker-dropdown-id>>
 				class="tc-edit-texteditor tc-popup-handle"
 				tabindex=<<tabIndex>>
-				focus={{{ [{$:/config/AutoFocus}match[tags]then[true]] ~[[false]] }}}
+				focus={{{ [{$:/config/AutoFocus}match[tags]then[true]] :else[[false]] }}}
 				filterMinLength={{$:/config/Tags/MinLength}}
 				cancelPopups=<<cancelPopups>>
 				configTiddlerFilter="[[$:/core/macros/tag-picker]]"
@@ -125,13 +128,13 @@ The second ESC tries to close the "draft tiddler"
 		>
 			{{$:/core/images/down-arrow}}
 		</$button>
-		<% if [<storeTitle>has[text]] %>
+		<%if [<storeTitle>has[text]] %>
 			<$button actions=<<delete-tag-state-tiddlers>> class="tc-btn-invisible tc-small-gap tc-btn-dropdown"
 				tooltip={{$:/language/EditTemplate/Tags/ClearInput/Hint}} aria-label={{$:/language/EditTemplate/Tags/ClearInput/Caption}}
 			>
 				{{$:/core/images/close-button}}
 			</$button>
-		<% endif %>
+		<%endif%>
 		<span class="tc-add-tag-button tc-small-gap-left">
 			<$let tag=<<_tf.getTag>>>
 				<$button set=<<newTagNameTiddler>> actions=<<add-button-actions>> >
@@ -141,13 +144,13 @@ The second ESC tries to close the "draft tiddler"
 		</span>
 	</div>
 	<div class="tc-block-dropdown-wrapper">
-		<% if [<tf.tagpicker-dropdown-id>has[text]] %>
+		<%if [<tf.tagpicker-dropdown-id>has[text]] %>
 			<div class="tc-block-dropdown tc-block-tags-dropdown">
-				<$macrocall $name="tag-picker-listTags" filter=<<nonSystemTagsFilter>> suffix="-primaryList" />
+				<$transclude $variable="tag-picker-listTags" filter=<<nonSystemTagsFilter>> suffix="-primaryList" empty={{$:/language/EditTemplate/Tags/EmptyMessage}}/>
 				<hr>
-				<$macrocall $name="tag-picker-listTags" filter=<<systemTagsFilter>> suffix="-secondaryList" />
+				<$transclude $variable="tag-picker-listTags" filter=<<systemTagsFilter>> suffix="-secondaryList" empty={{$:/language/EditTemplate/Tags/EmptyMessage/System}}/>
 			</div>
-		<% endif %>
+		<%endif%>
 	</div>
 </div>
 \end
@@ -158,7 +161,7 @@ The second ESC tries to close the "draft tiddler"
 \function _tf.getUserInput() [<storeTitle>get[text]]
 \function _tf.getTag() [<newTagNameTiddler>get[text]]
 <!-- Use this function if tag-picker is a stand alone macro. Otherwise use "newTagNameTiddler" defined for fieldmangler in EditTemplate -->
-\function _tf.makeTagNameTiddler() [[$:/temp/NewTagName]] [<tagField>!match[tags]] +[join[/]] [<qualify>] +[join[]]
+\function _tf.makeTagNameTiddler() [[$:/temp/NewTagName]] [<tagField>!match[tags]] :and[join[/]] [<qualify>] :and[join[]]
 
 <!-- keep those variables because they may "bleed" into macros using old syntax -->
 <!-- "nonSystemTagsFilter", "systemTagsFilter" __need to be the same__ as fields: "first-search-filter", "second-search-filter" -->
@@ -171,10 +174,10 @@ The second ESC tries to close the "draft tiddler"
 	saveTiddler={{{ [<tiddler>is[blank]then<currentTiddler>else<tiddler>] }}}
 
 	newTagNameTiddler={{{ [[newTagNameTiddler]is[variable]then<newTagNameTiddler>] :else[<_tf.makeTagNameTiddler>] }}}
-	storeTitle={{{ [[$:/temp/NewTagName/input]] [<tagField>!match[tags]] +[join[/]] [<qualify>] +[join[]] }}}
+	storeTitle={{{ [[$:/temp/NewTagName/input]] [<tagField>!match[tags]] :and[join[/]] [<qualify>] :and[join[]] }}}
 
 	newTagNameSelectionTiddlerQualified=<<qualify "$:/temp/NewTagName/selected-item">>
-	tagSelectionState={{{ [<newTagNameSelectionTiddler>!match[]] ~[<newTagNameSelectionTiddlerQualified>] }}}
+	tagSelectionState={{{ [<newTagNameSelectionTiddler>!match[]] :else[<newTagNameSelectionTiddlerQualified>] }}}
 
 	refreshTitle=<<qualify "$:/temp/NewTagName/refresh">>
 
@@ -183,6 +186,6 @@ The second ESC tries to close the "draft tiddler"
 
 	cancelPopups="yes"
 >
-	<$macrocall $name="tag-picker-inner"/>
+	<$transclude $variable="tag-picker-inner"/>
 </$let>
 \end

package/core/wiki/macros/tag.tid

@@ -7,7 +7,7 @@ fill:$(foregroundColor)$;
 color:$(foregroundColor)$;
 \end
 
-<!-- This has no whitespace trim to avoid modifying $actions$. Closing tags omitted for brevity. -->
+<!-- This has no whitespace trim to avoid modifying $actions$ -->
 \define tag-pill-inner(tag,icon,colour,fallbackTarget,colourA,colourB,element-tag,element-attributes,actions)
 \whitespace trim
 <$let

package/core/wiki/macros/testcase.tid

@@ -1,5 +1,5 @@
 title: $:/core/macros/testcase
-tags: $:/tags/Macro $:/tags/Global
+tags: $:/tags/Macro
 
 \whitespace trim
 

package/core/wiki/macros/timeline.tid

@@ -1,25 +1,25 @@
-created: 20141212105914482
-modified: 20141212110330815
 tags: $:/tags/Macro
 title: $:/core/macros/timeline
 
 <!-- Override one or both of the following two macros with a global or local macro of the same name 
 if you need to change how titles are displayed on a timeline -->
 
-\define timeline-title() <$view field="title"/>
-\define timeline-link() <$link to={{!!title}}><<timeline-title>></$link>
-\define timeline(limit:"100",format:"DDth MMM YYYY",subfilter:"",dateField:"modified")
+\procedure timeline-title() <$view field="title"/>
+\procedure timeline-link() <$link to={{!!title}}><<timeline-title>></$link>
+\procedure timeline(limit:"100",format:"DDth MMM YYYY",subfilter:"",dateField:"modified")
 \whitespace trim
 <div class="tc-timeline">
-<$list filter="[!is[system]$subfilter$has[$dateField$]!sort[$dateField$]limit[$limit$]eachday[$dateField$]]">
+<$set name="tv-tids" filter=`[!is[system]$(subfilter)$has<dateField>!sort<dateField>limit<limit>]`>
+<$list filter="[enlist<tv-tids>eachday<dateField>]">
 <div class="tc-menu-list-item">
-<$view field="$dateField$" format="date" template="$format$"/>
-<$list filter="[sameday:$dateField${!!$dateField$}!is[system]$subfilter$!sort[$dateField$]]">
+<$view field=<<dateField>> format="date" template=<<format>>/>
+<$list filter=`[enlist<tv-tids>sameday:$(dateField)${!!$(dateField)$}]`>
 <div class="tc-menu-list-subitem">
 <<timeline-link>>
 </div>
 </$list>
 </div>
 </$list>
+</$set>
 </div>
 \end