tiddlywiki 5.3.5 → 5.3.7

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

package/core/wiki/macros/toc.tid

@@ -1,7 +1,6 @@
 title: $:/core/macros/toc
 tags: $:/tags/Macro
 
-
 \define toc-open-icon() $:/core/images/down-arrow
 \define toc-closed-icon() $:/core/images/right-arrow
 
@@ -37,7 +36,10 @@ tags: $:/tags/Macro
 \end
 
 \define toc(tag,sort:"",itemClassFilter:"", exclude)
-<$macrocall $name="toc-body"  tag=<<__tag__>> sort=<<__sort__>> itemClassFilter=<<__itemClassFilter__>> exclude=<<__exclude__>>/>
+\whitespace trim
+<$let __tag__={{{ [<__tag__>is[blank]then<currentTiddler>else<__tag__>] }}} >
+  <$macrocall $name="toc-body"  tag=<<__tag__>> sort=<<__sort__>> itemClassFilter=<<__itemClassFilter__>> exclude=<<__exclude__>>/>
+</$let>
 \end
 
 \define toc-linked-expandable-body(tag,sort:"",itemClassFilter,exclude,path)
@@ -99,7 +101,7 @@ tags: $:/tags/Macro
 
 \define toc-expandable(tag,sort:"",itemClassFilter:"",exclude,path)
 \whitespace trim
-<$let tag=<<__tag__>> sort=<<__sort__>> itemClassFilter=<<__itemClassFilter__>> path={{{ [<__path__>addsuffix[/]addsuffix<__tag__>] }}}>
+<$let __tag__={{{ [<__tag__>is[blank]then<currentTiddler>else<__tag__>] }}} tag=<<__tag__>> sort=<<__sort__>> itemClassFilter=<<__itemClassFilter__>> path={{{ [<__path__>addsuffix[/]addsuffix<__tag__>] }}}>
   <$set name="excluded" filter="[subfilter<__exclude__>] [<__tag__>]">
     <ol class="tc-toc toc-expandable">
       <$list filter="""[all[shadows+tiddlers]tag<__tag__>!has[draft.of]$sort$] -[<__tag__>] -[subfilter<__exclude__>]""">
@@ -118,7 +120,7 @@ tags: $:/tags/Macro
   <$set name="toc-item-class" filter=<<__itemClassFilter__>> emptyValue="toc-item-selected" value="toc-item" >
     <li class=<<toc-item-class>>>
       <$link to={{{ [<currentTiddler>get[target]else<currentTiddler>] }}}>
-          <$list filter="[all[current]tagging[]$sort$limit[1]]  -[subfilter<__exclude__>]" variable="ignore" emptyMessage="<$button class='tc-btn-invisible'>{{$:/core/images/blank}}</$button>">
+          <$list filter="[all[current]tagging[]$sort$]  -[subfilter<__exclude__>] +[limit[1]]" variable="ignore" emptyMessage="<$button class='tc-btn-invisible'>{{$:/core/images/blank}}</$button>">
           <$reveal type="nomatch" stateTitle=<<toc-state>> text="open">
             <$button setTitle=<<toc-state>> setTo="open" class="tc-btn-invisible tc-popup-keep">
             <$transclude tiddler=<<toc-closed-icon>> />
@@ -145,7 +147,7 @@ tags: $:/tags/Macro
 <$qualify name="toc-state" title={{{ [[$:/state/toc]addsuffix<__path__>addsuffix[-]addsuffix<currentTiddler>] }}}>
   <$set name="toc-item-class" filter=<<__itemClassFilter__>> emptyValue="toc-item-selected" value="toc-item">
     <li class=<<toc-item-class>>>
-      <$list filter="[all[current]tagging[]$sort$limit[1]] -[subfilter<__exclude__>]" variable="ignore" emptyMessage="""<$button class="tc-btn-invisible">{{$:/core/images/blank}}</$button><span class="toc-item-muted"><<toc-caption>></span>""">
+      <$list filter="[all[current]tagging[]$sort$] -[subfilter<__exclude__>] +[limit[1]]" variable="ignore" emptyMessage="""<$button class="tc-btn-invisible">{{$:/core/images/blank}}</$button><span class="toc-item-muted"><<toc-caption>></span>""">
         <$reveal type="nomatch" stateTitle=<<toc-state>> text="open">
           <$button setTitle=<<toc-state>> setTo="open" class="tc-btn-invisible tc-popup-keep">
             <$transclude tiddler=<<toc-closed-icon>> />
@@ -173,7 +175,7 @@ tags: $:/tags/Macro
 
 \define toc-selective-expandable(tag,sort:"",itemClassFilter,exclude,path)
 \whitespace trim
-<$let tag=<<__tag__>> sort=<<__sort__>> itemClassFilter=<<__itemClassFilter__>> path={{{ [<__path__>addsuffix[/]addsuffix<__tag__>] }}}>
+<$let __tag__={{{ [<__tag__>is[blank]then<currentTiddler>else<__tag__>] }}} tag=<<__tag__>> sort=<<__sort__>> itemClassFilter=<<__itemClassFilter__>> path={{{ [<__path__>addsuffix[/]addsuffix<__tag__>] }}}>
   <$set name="excluded" filter="[subfilter<__exclude__>] [<__tag__>]">
     <ol class="tc-toc toc-selective-expandable">
       <$list filter="""[all[shadows+tiddlers]tag<__tag__>!has[draft.of]$sort$] -[<__tag__>] -[subfilter<__exclude__>]""">
@@ -188,31 +190,35 @@ tags: $:/tags/Macro
 
 \define toc-tabbed-external-nav(tag,sort:"",selectedTiddler:"$:/temp/toc/selectedTiddler",unselectedText,missingText,template:"",exclude)
 \whitespace trim
-<$tiddler tiddler={{{ [<__selectedTiddler__>get[text]] }}}>
-  <div class="tc-tabbed-table-of-contents">
-    <$linkcatcher to=<<__selectedTiddler__>>>
-      <div class="tc-table-of-contents">
-        <$macrocall $name="toc-selective-expandable" tag=<<__tag__>> sort=<<__sort__>> itemClassFilter="[all[current]] -[<__selectedTiddler__>get[text]]" exclude=<<__exclude__>>/>
+<$let __tag__={{{ [<__tag__>is[blank]then<currentTiddler>else<__tag__>] }}}>
+  <$tiddler tiddler={{{ [<__selectedTiddler__>get[text]] }}}>
+    <div class="tc-tabbed-table-of-contents">
+      <$linkcatcher to=<<__selectedTiddler__>>>
+        <div class="tc-table-of-contents">
+          <$macrocall $name="toc-selective-expandable" tag=<<__tag__>> sort=<<__sort__>> itemClassFilter="[all[current]] -[<__selectedTiddler__>get[text]]" exclude=<<__exclude__>>/>
+        </div>
+      </$linkcatcher>
+      <div class="tc-tabbed-table-of-contents-content">
+        <$reveal stateTitle=<<__selectedTiddler__>> type="nomatch" text="">
+          <$transclude mode="block" tiddler=<<__template__>>>
+            <h1><<toc-caption>></h1>
+            <$transclude mode="block">$missingText$</$transclude>
+          </$transclude>
+        </$reveal>
+        <$reveal stateTitle=<<__selectedTiddler__>> type="match" text="">
+          $unselectedText$
+        </$reveal>
       </div>
-    </$linkcatcher>
-    <div class="tc-tabbed-table-of-contents-content">
-      <$reveal stateTitle=<<__selectedTiddler__>> type="nomatch" text="">
-        <$transclude mode="block" tiddler=<<__template__>>>
-          <h1><<toc-caption>></h1>
-          <$transclude mode="block">$missingText$</$transclude>
-        </$transclude>
-      </$reveal>
-      <$reveal stateTitle=<<__selectedTiddler__>> type="match" text="">
-        $unselectedText$
-      </$reveal>
     </div>
-  </div>
-</$tiddler>
+  </$tiddler>
+</$let>
 \end
 
 \define toc-tabbed-internal-nav(tag,sort:"",selectedTiddler:"$:/temp/toc/selectedTiddler",unselectedText,missingText,template:"",exclude)
 \whitespace trim
-<$linkcatcher to=<<__selectedTiddler__>>>
-  <$macrocall $name="toc-tabbed-external-nav" tag=<<__tag__>> sort=<<__sort__>> selectedTiddler=<<__selectedTiddler__>> unselectedText=<<__unselectedText__>> missingText=<<__missingText__>> template=<<__template__>> exclude=<<__exclude__>> />
-</$linkcatcher>
+<$let __tag__={{{ [<__tag__>is[blank]then<currentTiddler>else<__tag__>] }}}>
+  <$linkcatcher to=<<__selectedTiddler__>>>
+    <$macrocall $name="toc-tabbed-external-nav" tag=<<__tag__>> sort=<<__sort__>> selectedTiddler=<<__selectedTiddler__>> unselectedText=<<__unselectedText__>> missingText=<<__missingText__>> template=<<__template__>> exclude=<<__exclude__>> />
+  </$linkcatcher>
+</$let>
 \end

package/core/wiki/macros/translink.tid

@@ -1,28 +1,28 @@
 title: $:/core/macros/translink
 tags: $:/tags/Macro
 
-\define translink(title,mode:"block")
+\procedure translink(title,mode:"block")
 \whitespace trim
-<$list filter="[<__mode__>match[block]]">
+<%if [<mode>match[block]] %>
 <div class="tc-translink">
 <div>
-<$link to="""$title$""">
-<h1><$text text="""$title$"""/></h1>
+<$link to=<<title>>>
+<h1><$text text=<<title>>/></h1>
 </$link>
-<$transclude tiddler="""$title$""" mode="block">
-<$set name="currentTiddler" value="""$title$"""><$transclude tiddler="$:/language/MissingTiddler/Hint"/></$set>
+<$transclude tiddler=<<title>> mode="block">
+<$set name="currentTiddler" value=<<title>>><$transclude tiddler="$:/language/MissingTiddler/Hint"/></$set>
 </$transclude>
 </div>
 </div>
-</$list>
-<$list filter="[<__mode__>match[inline]]">
+<%endif%>
+<%if [<mode>match[inline]] %>
 <span class="tc-translink">
-<$link to="""$title$""">
-<$text text="""$title$"""/>
+<$link to=<<title>> class="tc-tiny-gap-right">
+<$text text=<<title>>/>
 </$link>
-&#32;(<$transclude tiddler="""$title$""" mode="inline">
-<$set name="currentTiddler" value="""$title$"""><$transclude tiddler="$:/language/MissingTiddler/Hint"/></$set>
+(<$transclude tiddler=<<title>> mode="inline">
+<$set name="currentTiddler" value=<<title>>><$transclude tiddler="$:/language/MissingTiddler/Hint"/></$set>
 </$transclude>)
 </span>
-</$list>
+<%endif%>
 \end

package/core/wiki/macros/tree.tid

@@ -1,62 +1,58 @@
 title: $:/core/macros/tree
 tags: $:/tags/Macro
 
-\define leaf-link(full-title,chunk,separator: "/")
-<$link to=<<__full-title__>>><$text text=<<__chunk__>>/></$link>
+\procedure leaf-link(full-title,chunk,separator: "/")
+<$link to=<<full-title>>><$text text=<<chunk>>/></$link>
 \end
 
-\define leaf-node(prefix,chunk)
 \whitespace trim
+\procedure leaf-node(prefix,chunk)
 <li>
-<$list filter="[<__prefix__>addsuffix<__chunk__>is[shadow]] [<__prefix__>addsuffix<__chunk__>is[tiddler]]" variable="full-title">
-<$list filter="[<full-title>removeprefix<__prefix__>]" variable="chunk">
-<span>{{$:/core/images/file}}</span>&#32;<$macrocall $name="leaf-link" full-title=<<full-title>> chunk=<<chunk>>/>
+<$list filter="[<prefix>addsuffix<chunk>is[shadow]] [<prefix>addsuffix<chunk>is[tiddler]]" variable="full-title">
+<$list filter="[<full-title>removeprefix<prefix>]" variable="chunk">
+<span class="tc-tiny-gap-right">{{$:/core/images/file}}</span><$transclude $variable="leaf-link" full-title=<<full-title>> chunk=<<chunk>>/>
 </$list>
 </$list>
 </li>
 \end
 
-\define branch-node(prefix,chunk,separator: "/")
-\whitespace trim
+\procedure branch-node(prefix,chunk,separator: "/")
 <li>
-<$set name="reveal-state" value={{{ [[$:/state/tree/]addsuffix<__prefix__>addsuffix<__chunk__>] }}}>
+<$set name="reveal-state" value={{{ [[$:/state/tree/]addsuffix<prefix>addsuffix<chunk>] }}}>
 <$reveal type="nomatch" stateTitle=<<reveal-state>> text="show">
 <$button setTitle=<<reveal-state>> setTo="show" class="tc-btn-invisible">
-{{$:/core/images/folder}}&#32;<$text text=<<__chunk__>>/>
+{{$:/core/images/folder}}&#32;<$text text=<<chunk>>/>
 </$button>
 </$reveal>
 <$reveal type="match" stateTitle=<<reveal-state>> text="show">
 <$button setTitle=<<reveal-state>> setTo="hide" class="tc-btn-invisible">
-{{$:/core/images/folder}}&#32;<$text text=<<__chunk__>>/>
+{{$:/core/images/folder}}&#32;<$text text=<<chunk>>/>
 </$button>
 </$reveal>
-&#32;
-<span>(<$count filter="[all[shadows+tiddlers]removeprefix<__prefix__>removeprefix<__chunk__>] -[<__prefix__>addsuffix<__chunk__>]"/>)</span>
+<span class="tc-tiny-gap-left">(<$count filter="[all[shadows+tiddlers]removeprefix<prefix>removeprefix<chunk>] -[<prefix>addsuffix<chunk>]"/>)</span>
 <$reveal type="match" stateTitle=<<reveal-state>> text="show">
-<$macrocall $name="tree-node" prefix={{{ [<__prefix__>addsuffix<__chunk__>] }}} separator=<<__separator__>>/>
+<$transclude $variable="tree-node" prefix={{{ [<prefix>addsuffix<chunk>] }}} separator=<<separator>>/>
 </$reveal>
 </$set>
 </li>
 \end
 
-\define tree-node(prefix,separator: "/")
-\whitespace trim
+\procedure tree-node(prefix,separator: "/")
 <ol>
-<$list filter="[all[shadows+tiddlers]removeprefix<__prefix__>splitbefore<__separator__>sort[]!suffix<__separator__>]" variable="chunk">
-<$macrocall $name="leaf-node" prefix=<<__prefix__>> chunk=<<chunk>> separator=<<__separator__>>/>
+<$list filter="[all[shadows+tiddlers]removeprefix<prefix>splitbefore<separator>sort[]!suffix<separator>]" variable="chunk">
+<$transclude $variable="leaf-node" prefix=<<prefix>> chunk=<<chunk>> separator=<<separator>>/>
 </$list>
-<$list filter="[all[shadows+tiddlers]removeprefix<__prefix__>splitbefore<__separator__>sort[]suffix<__separator__>]" variable="chunk">
-<$macrocall $name="branch-node" prefix=<<__prefix__>> chunk=<<chunk>> separator=<<__separator__>>/>
+<$list filter="[all[shadows+tiddlers]removeprefix<prefix>splitbefore<separator>sort[]suffix<separator>]" variable="chunk">
+<$transclude $variable="branch-node" prefix=<<prefix>> chunk=<<chunk>> separator=<<separator>>/>
 </$list>
 </ol>
 \end
 
-\define tree(prefix: "$:/",separator: "/")
-\whitespace trim
+\procedure tree(prefix: "$:/",separator: "/")
 <div class="tc-tree">
-<span><$text text=<<__prefix__>>/></span>
+<span><$text text=<<prefix>>/></span>
 <div>
-<$macrocall $name="tree-node" prefix=<<__prefix__>> separator=<<__separator__>>/>
+<$transclude $variable="tree-node" prefix=<<prefix>> separator=<<separator>>/>
 </div>
 </div>
 \end

package/core/wiki/paletteswitcher.tid

@@ -3,7 +3,7 @@ title: $:/snippets/paletteswitcher
 \whitespace trim
 <$linkcatcher to="$:/palette">
 <div class="tc-chooser">
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/Palette]sort[name]]">
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/Palette]!is[draft]sort[name]]">
 <$set name="cls" filter="[all[current]prefix{$:/palette}]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item">
 <div class=<<cls>>>
 <$link to={{!!title}}>

package/core/wiki/tags/TextEditorSnippet.tid

@@ -0,0 +1,2 @@
+title: $:/tags/TextEditor/Snippet
+list: $:/language/Snippets/ProcedureDefinition $:/language/Snippets/FunctionDefinition $:/language/Snippets/ListByTag $:/language/Snippets/Table4x3 $:/language/Snippets/TableOfContents $:/language/Snippets/MacroDefinition

package/core/wiki/tags/ViewTemplate.tid

@@ -1,2 +1,2 @@
 title: $:/tags/ViewTemplate
-list: [[$:/core/ui/ViewTemplate/title]] [[$:/core/ui/ViewTemplate/unfold]] [[$:/core/ui/ViewTemplate/subtitle]] [[$:/core/ui/ViewTemplate/tags]] [[$:/core/ui/ViewTemplate/classic]] [[$:/core/ui/ViewTemplate/body]]
+list: [[$:/core/ui/ViewTemplate/title]] [[$:/core/ui/ViewTemplate/unfold]] [[$:/core/ui/ViewTemplate/subtitle]] [[$:/core/ui/ViewTemplate/tags]] [[$:/core/ui/ViewTemplate/classic]] [[$:/core/ui/ViewTemplate/body]] [[$:/core/ui/ViewTemplate/lazy-loading]]

package/core/wiki/tags/ViewTemplateBodyFilter.tid

@@ -1,2 +1,2 @@
 title: $:/tags/ViewTemplateBodyFilter
-list: $:/config/ViewTemplateBodyFilters/testcase $:/config/ViewTemplateBodyFilters/hide-body $:/config/ViewTemplateBodyFilters/code-body $:/config/ViewTemplateBodyFilters/stylesheet $:/config/ViewTemplateBodyFilters/core-ui-advanced-search $:/config/ViewTemplateBodyFilters/core-ui-tags $:/config/ViewTemplateBodyFilters/system $:/config/ViewTemplateBodyFilters/import $:/config/ViewTemplateBodyFilters/plugin $:/config/ViewTemplateBodyFilters/default
+list: $:/config/ViewTemplateBodyFilters/testcase $:/config/ViewTemplateBodyFilters/hide-body $:/config/ViewTemplateBodyFilters/code-body $:/config/ViewTemplateBodyFilters/stylesheet $:/config/ViewTemplateBodyFilters/core-ui-advanced-search $:/config/ViewTemplateBodyFilters/core-ui-tags $:/config/ViewTemplateBodyFilters/import $:/config/ViewTemplateBodyFilters/plugin $:/config/ViewTemplateBodyFilters/html $:/config/ViewTemplateBodyFilters/system $:/config/ViewTemplateBodyFilters/default

package/editions/classicparserdemo/tiddlers/$__coreURL.tid

@@ -0,0 +1,4 @@
+title: $:/coreURL
+tags: $:/tags/Global
+
+\function coreURL() [[../../../tiddlywikicore-$(version)$.js]substitute[]]

package/editions/classicparserdemo/tiddlywiki.info

@@ -11,6 +11,9 @@
 	],
 	"build": {
 		"index": [
-			"--rendertiddler","$:/core/save/all","classicparserdemo.html","text/plain"]
+			"--rendertiddler","$:/core/save/all","classicparserdemo.html","text/plain"],
+		"external": [
+			"--render","$:/core/save/all-external-js","classicparserdemo.html","text/plain"
+		]
 	}
 }

package/editions/codemirrordemo/tiddlers/$__coreURL.tid

@@ -0,0 +1,4 @@
+title: $:/coreURL
+tags: $:/tags/Global
+
+\function coreURL() [[../../../tiddlywikicore-$(version)$.js]substitute[]]

package/editions/codemirrordemo/tiddlers/HelloThere.tid

@@ -11,6 +11,7 @@ The ~CodeMirror plugin can be extended with ~AddOns for more functionality:
 * Keymaps in the style of Emacs, Sublime Text or Vim
 * Closing Brackets
 * Closing Tags
+* Display trailing whitespace
 
 NOTE: This demo has the ''Sublime Text'' keymap installed.
 

package/editions/codemirrordemo/tiddlywiki.info

@@ -8,11 +8,16 @@
 		"tiddlywiki/codemirror-search-replace",
 		"tiddlywiki/codemirror-fullscreen-editing",
 		"tiddlywiki/codemirror-mode-xml",
+		"tiddlywiki/codemirror-mode-htmlembedded",
+		"tiddlywiki/codemirror-mode-htmlmixed",
 		"tiddlywiki/codemirror-mode-javascript",
 		"tiddlywiki/codemirror-mode-css",
 		"tiddlywiki/codemirror-mode-x-tiddlywiki",
 		"tiddlywiki/codemirror-mode-markdown",
-		"tiddlywiki/codemirror-keymap-sublime-text"
+		"tiddlywiki/codemirror-trailingspace",
+		"tiddlywiki/codemirror-keymap-emacs",
+		"tiddlywiki/codemirror-keymap-sublime-text",
+		"tiddlywiki/codemirror-keymap-vim"
 	],
 	"themes": [
 		"tiddlywiki/vanilla",
@@ -22,6 +27,9 @@
 	],
 	"build": {
 		"index": [
-			"--rendertiddler","$:/core/save/all","codemirrordemo.html","text/plain"]
+			"--rendertiddler","$:/core/save/all","codemirrordemo.html","text/plain"],
+		"external": [
+			"--render","$:/core/save/all-external-js","codemirrordemo.html","text/plain"
+		]
 	}
 }

package/editions/de-AT/tiddlers/HelloThere.tid

@@ -27,7 +27,7 @@ Anders, als bei herkömmlichen Online-Diensten, lässt Ihnen ~TiddlyWiki die Fre
 <a href="https://twitter.com/TiddlyWiki" class="tc-btn-big-green" style="background-color:#5E9FCA;" target="_blank">
 {{$:/core/images/twitter}} @~TiddlyWiki on Twitter
 </a>
-<a href="https://github.com/Jermolene/TiddlyWiki5" class="tc-btn-big-green" style="background-color:#444;" target="_blank">
+<a href="https://github.com/TiddlyWiki/TiddlyWiki5" class="tc-btn-big-green" style="background-color:#444;" target="_blank">
 {{$:/core/images/github}} ~TiddlyWiki on ~GitHub
 </a>
 <a href="https://tiddlywiki.com" class="tc-btn-big-green" style="background-color:#green;" target="_blank">

package/editions/de-AT/tiddlers/community/Fur_Entwickler.tid

@@ -8,4 +8,4 @@ Es gibt mehrere Ressourcen für Entwickler, um mehr über das TiddlyWiki Projekt
 
 * [[tiddlywiki.com/dev|https://tiddlywiki.com/dev]] Offizielle Entwickler Doku.
 * [[TiddlyWikiDev group|https://talk.tiddlywiki.org/c/devs/]] Diskussionsforum für Entwickler.
-* https://github.com/Jermolene/TiddlyWiki5 .. Github Repository. 
+* https://github.com/TiddlyWiki/TiddlyWiki5 .. Github Repository. 

package/editions/de-AT/tiddlers/community/Wie_kann_ich_helfen_.tid

@@ -13,7 +13,7 @@ OpenSource-Projekte, wie ~TiddlyWiki wachsen und gedeihen ''nur'' durch das Enga
 ~TiddlyWiki wird umso besser, je mehr Menschen es benutzen. ''Die beste Möglichkeit um die Zukunft zu sichern, ist ~TiddlyWiki 100 mal populärer zu machen, als es heute ist!''
 
 * Zwitschern sie über ~TiddlyWiki :) [[I love TiddlyWiki because...|https://twitter.com/intent/tweet?text=I+love+TiddlyWiki+because...&source=tiddlywiki5]]
-* Klicken sie den [[TiddlyWiki5 Star Button auf  GitHub|https://github.com/Jermolene/TiddlyWiki5]]
+* Klicken sie den [[TiddlyWiki5 Star Button auf  GitHub|https://github.com/TiddlyWiki/TiddlyWiki5]]
 * [[Veröffentlichen Sie das TiddlyWiki Poster|https://tiddlywiki.com/poster]]
 
 [img width=232 [Tiddler Poster.png]]
@@ -28,7 +28,7 @@ Es gibt unzählige Möglichkeiten dem Projekt zu helfen:
 
 * Und vor allem: ''Lassen Sie uns das auch wissen :)''
 ** [[Google Diskussions Forum|https://groups.google.com/forum/#!forum/tiddlywiki]] oder
-** [[GitHub Ticket|https://github.com/Jermolene/TiddlyWiki5/issues]]
+** [[GitHub Ticket|https://github.com/TiddlyWiki/TiddlyWiki5/issues]]
 
 Die ~TiddlyWiki Dokumentation und die Programme werden auf GitHub verwaltet. "Pull-Requests" werden gerne entgegen genommen.
 

package/editions/de-AT/tiddlers/lexikon/GitHub.tid

@@ -7,5 +7,5 @@ type: text/vnd.tiddlywiki
 
 ~GitHub ist eine, für OpenSource Projekte kostenlose, Plattform, die es erlaubt gemeinsam an einem Projekt zu arbeiten und zu kommunizieren. 
 
-* ~TiddlyWiki: https://github.com/Jermolene/TiddlyWiki5
+* ~TiddlyWiki: https://github.com/TiddlyWiki/TiddlyWiki5
 * ~GitHub: http://github.com

package/editions/de-AT/tiddlers/maintainer/Wer pflegt diese Edition_.tid

@@ -24,7 +24,7 @@ type: text/vnd.tiddlywiki
 
 !! GitHub
 
-siehe: https://github.com/Jermolene/TiddlyWiki5/tree/master/languages
+siehe: https://github.com/TiddlyWiki/TiddlyWiki5/tree/master/languages
 
 !! Feedback
 

package/editions/de-AT/tiddlers/referenz/Lizenzen.tid

@@ -7,7 +7,7 @@ title: Lizenzen
 type: text/vnd.tiddlywiki
 
 * ~TiddlyWiki Kern
-** https://github.com/Jermolene/TiddlyWiki5/blob/master/licenses/copyright.md
+** https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/licenses/copyright.md
 * ~TiddlyWiki Editionen 
-** https://github.com/Jermolene/TiddlyWiki5/blob/master/licenses/cla-individual.md
-** https://github.com/Jermolene/TiddlyWiki5/blob/master/licenses/cla-entity.md
+** https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/licenses/cla-individual.md
+** https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/licenses/cla-entity.md