tiddlywiki 5.2.0 → 5.2.3

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

@@ -8,11 +8,10 @@ second-search-filter: [tags[]is[system]search:title<userInput>sort[]]
 \define delete-tag-state-tiddlers() <$action-deletetiddler $filter="[<newTagNameTiddler>] [<storeTitle>] [<tagSelectionState>]"/>
 
 \define add-tag-actions(actions,tagField:"tags")
+\whitespace trim
 <$set name="tag" value={{{ [<__tiddler__>get[text]] }}}>
-<$list filter="[<saveTiddler>!contains:$tagField$<tag>!match[]]" variable="ignore" emptyMessage="""
-<$action-listops $tiddler=<<saveTiddler>> $field=<<__tagField__>> $subfilter="-[<tag>]"/>
-""">
-<$action-listops $tiddler=<<saveTiddler>> $field=<<__tagField__>> $subfilter="[<tag>]"/>
+<$list filter="[<saveTiddler>!contains:$tagField$<tag>!match[]]" variable="ignore" emptyMessage="<$action-listops $tiddler=<<saveTiddler>> $field=<<__tagField__>> $subfilter='-[<tag>]'/>">
+<$action-listops $tiddler=<<saveTiddler>> $field=<<__tagField__>> $subfilter="[<tag>trim[]]"/>
 $actions$
 </$list>
 </$set>
@@ -21,14 +20,16 @@ $actions$
 \end
 
 \define clear-tags-actions-inner()
-<$list filter="[<storeTitle>has[text]] [<newTagNameTiddler>has[text]]" variable="ignore" emptyMessage="""<<cancel-delete-tiddler-actions "cancel">>""">
+\whitespace trim
+<$list filter="[<storeTitle>has[text]] [<newTagNameTiddler>has[text]]" variable="ignore" emptyMessage="<<cancel-delete-tiddler-actions 'cancel'>>">
 <<delete-tag-state-tiddlers>>
 </$list>
 \end
 
 \define clear-tags-actions()
+\whitespace trim
 <$set name="userInput" value={{{ [<storeTitle>get[text]] }}}>
-<$list filter="[<newTagNameTiddler>get[text]!match<userInput>]" emptyMessage="""<<clear-tags-actions-inner>>""">
+<$list filter="[<newTagNameTiddler>get[text]!match<userInput>]" emptyMessage="<<clear-tags-actions-inner>>">
 <$action-setfield $tiddler=<<newTagNameTiddler>> text=<<userInput>>/><$action-setfield $tiddler=<<refreshTitle>> text="yes"/>
 </$list>
 </$set>
@@ -43,7 +44,7 @@ $actions$
 <div>
 <span class="tc-add-tag-name tc-small-gap-right">
 <$macrocall $name="keyboard-driven-input" tiddler=<<newTagNameTiddler>> storeTitle=<<storeTitle>> refreshTitle=<<refreshTitle>>
-		selectionStateTitle=<<tagSelectionState>> inputAcceptActions="""<$macrocall $name="add-tag-actions" actions=<<__actions__>> tagField=<<__tagField__>>/>"""
+		selectionStateTitle=<<tagSelectionState>> inputAcceptActions="<$macrocall $name='add-tag-actions' actions=<<__actions__>> tagField=<<__tagField__>>/>"
 		inputCancelActions=<<clear-tags-actions>> tag="input" placeholder={{$:/language/EditTemplate/Tags/Add/Placeholder}}
 		focusPopup=<<qualify "$:/state/popup/tags-auto-complete">> class="tc-edit-texteditor tc-popup-handle" tabindex=<<tabIndex>> 
 		focus={{{ [{$:/config/AutoFocus}match[tags]then[true]] ~[[false]] }}} filterMinLength={{$:/config/Tags/MinLength}} 
@@ -51,7 +52,7 @@ $actions$
 </span><$button popup=<<qualify "$:/state/popup/tags-auto-complete">> class="tc-btn-invisible tc-btn-dropdown" tooltip={{$:/language/EditTemplate/Tags/Dropdown/Hint}} aria-label={{$:/language/EditTemplate/Tags/Dropdown/Caption}}>{{$:/core/images/down-arrow}}</$button><$reveal state=<<storeTitle>> type="nomatch" text=""><$button 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}}<<delete-tag-state-tiddlers>></$button></$reveal><span class="tc-add-tag-button tc-small-gap-left">
 <$set name="tag" value={{{ [<newTagNameTiddler>get[text]] }}}>
 <$button set=<<newTagNameTiddler>> setTo="" class="">
-<$action-listops $tiddler=<<saveTiddler>> $field=<<__tagField__>> $subfilter="[<tag>]"/>
+<$action-listops $tiddler=<<saveTiddler>> $field=<<__tagField__>> $subfilter="[<tag>trim[]]"/>
 $actions$
 <$set name="currentTiddlerCSSEscaped" value={{{ [<saveTiddler>escapecss[]] }}}>
 <<delete-tag-state-tiddlers>><$action-sendmessage $message="tm-focus-selector" $param=<<get-tagpicker-focus-selector>>/>
@@ -65,16 +66,16 @@ $actions$
 <$reveal state=<<qualify "$:/state/popup/tags-auto-complete">> type="nomatch" text="" default="">
 <div class="tc-block-dropdown tc-block-tags-dropdown">
 <$set name="userInput" value={{{ [<storeTitle>get[text]] }}}>
-<$list filter="[<userInput>minlength{$:/config/Tags/MinLength}limit[1]]" emptyMessage="""<div class="tc-search-results">{{$:/language/Search/Search/TooShort}}</div>""" variable="listItem">
+<$list filter="[<userInput>minlength{$:/config/Tags/MinLength}limit[1]]" emptyMessage="<div class='tc-search-results'>{{$:/language/Search/Search/TooShort}}</div>" variable="listItem">
 <$list filter=<<nonSystemTagsFilter>> variable="tag">
-<$list filter="[<tag>addsuffix[-primaryList]] -[<tagSelectionState>get[text]]" emptyMessage="""<$vars button-classes="tc-btn-invisible tc-tag-button-selected" actions=<<__actions__>> tagField=<<__tagField__>> currentTiddler=<<tag>>>{{||$:/core/ui/TagPickerTagTemplate}}</$vars>""">
+<$list filter="[<tag>addsuffix[-primaryList]] -[<tagSelectionState>get[text]]" emptyMessage="<$vars button-classes='tc-btn-invisible tc-tag-button-selected' actions=<<__actions__>> tagField=<<__tagField__>> currentTiddler=<<tag>>>{{||$:/core/ui/TagPickerTagTemplate}}</$vars>">
 <$vars button-classes="tc-btn-invisible" actions=<<__actions__>> tagField=<<__tagField__>> currentTiddler=<<tag>>>{{||$:/core/ui/TagPickerTagTemplate}}</$vars>
 </$list>
 </$list></$list>
 <hr>
-<$list filter="[<userInput>minlength{$:/config/Tags/MinLength}limit[1]]" emptyMessage="""<div class="tc-search-results">{{$:/language/Search/Search/TooShort}}</div>""" variable="listItem">
+<$list filter="[<userInput>minlength{$:/config/Tags/MinLength}limit[1]]" emptyMessage="<div class='tc-search-results'>{{$:/language/Search/Search/TooShort}}</div>" variable="listItem">
 <$list filter=<<systemTagsFilter>> variable="tag">
-<$list filter="[<tag>addsuffix[-secondaryList]] -[<tagSelectionState>get[text]]" emptyMessage="""<$vars button-classes="tc-btn-invisible tc-tag-button-selected" actions=<<__actions__>> tagField=<<__tagField__>> currentTiddler=<<tag>>>{{||$:/core/ui/TagPickerTagTemplate}}</$vars>""">
+<$list filter="[<tag>addsuffix[-secondaryList]] -[<tagSelectionState>get[text]]" emptyMessage="<$vars button-classes='tc-btn-invisible tc-tag-button-selected' actions=<<__actions__>> tagField=<<__tagField__>> currentTiddler=<<tag>>>{{||$:/core/ui/TagPickerTagTemplate}}</$vars>">
 <$vars button-classes="tc-btn-invisible" actions=<<__actions__>> tagField=<<__tagField__>> currentTiddler=<<tag>>>{{||$:/core/ui/TagPickerTagTemplate}}</$vars>
 </$list>
 </$list></$list>
@@ -90,7 +91,7 @@ $actions$
 \define tag-picker(actions,tagField:"tags")
 \whitespace trim
 <$vars saveTiddler=<<currentTiddler>> palette={{$:/palette}}>
-<$list filter="[<newTagNameTiddler>match[]]" emptyMessage="""<$macrocall $name="tag-picker-inner" actions=<<__actions__>> tagField=<<__tagField__>>/>""">
+<$list filter="[<newTagNameTiddler>match[]]" emptyMessage="<$macrocall $name='tag-picker-inner' actions=<<__actions__>> tagField=<<__tagField__>>/>">
 <$set name="newTagNameTiddler" value=<<qualify "$:/temp/NewTagName">>>
 <$macrocall $name="tag-picker-inner" actions=<<__actions__>> tagField=<<__tagField__>>/>
 </$set>

package/core/wiki/macros/tag.tid

@@ -7,12 +7,16 @@ fill:$(foregroundColor)$;
 color:$(foregroundColor)$;
 \end
 
+<!-- This has no whitespace trim to avoid modifying $actions$. Closing tags omitted for brevity. -->
 \define tag-pill-inner(tag,icon,colour,fallbackTarget,colourA,colourB,element-tag,element-attributes,actions)
-<$vars foregroundColor=<<contrastcolour target:"""$colour$""" fallbackTarget:"""$fallbackTarget$""" colourA:"""$colourA$""" colourB:"""$colourB$""">> backgroundColor="""$colour$""">
-<$element-tag$ $element-attributes$ class="tc-tag-label tc-btn-invisible" style=<<tag-pill-styles>>>
-$actions$<$transclude tiddler="""$icon$"""/><$view tiddler=<<__tag__>> field="title" format="text" />
-</$element-tag$>
-</$vars>
+<$vars
+	foregroundColor=<<contrastcolour target:"""$colour$""" fallbackTarget:"""$fallbackTarget$""" colourA:"""$colourA$""" colourB:"""$colourB$""">>
+	backgroundColor="""$colour$"""
+><$element-tag$
+	$element-attributes$
+	class="tc-tag-label tc-btn-invisible"
+	style=<<tag-pill-styles>>
+>$actions$<$transclude tiddler="""$icon$"""/><$view tiddler=<<__tag__>> field="title" format="text" /></$element-tag$>
 \end
 
 \define tag-pill-body(tag,icon,colour,palette,element-tag,element-attributes,actions)
@@ -20,8 +24,11 @@ $actions$<$transclude tiddler="""$icon$"""/><$view tiddler=<<__tag__>> field="ti
 \end
 
 \define tag-pill(tag,element-tag:"span",element-attributes:"",actions:"")
+\whitespace trim
 <span class="tc-tag-list-item" data-tag-title=<<__tag__>>>
-<$macrocall $name="tag-pill-body" tag=<<__tag__>> icon={{{ [<__tag__>get[icon]] }}} colour={{{ [<__tag__>get[color]] }}} palette={{$:/palette}} element-tag="""$element-tag$""" element-attributes="""$element-attributes$""" actions="""$actions$"""/>
+<$let currentTiddler=<<__tag__>>>
+<$macrocall $name="tag-pill-body" tag=<<__tag__>> icon={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerIconFilter]!is[draft]get[text]] }}} colour={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}} palette={{$:/palette}} element-tag="""$element-tag$""" element-attributes="""$element-attributes$""" actions="""$actions$"""/>
+</$let>
 </span>
 \end
 

package/core/wiki/macros/thumbnails.tid

@@ -1,16 +1,28 @@
 title: $:/core/macros/thumbnails
 tags: $:/tags/Macro
 
+<!-- This macro does not use \whitespace trim because it could affect the caption -->
 \define thumbnail(link,icon,color,background-color,image,caption,width:"280",height:"157")
-<$link to="""$link$"""><div class="tc-thumbnail-wrapper">
-<div class="tc-thumbnail-image" style="width:$width$px;height:$height$px;"><$reveal type="nomatch" text="" default="""$image$""" tag="div" style="width:$width$px;height:$height$px;">
-[img[$image$]]
-</$reveal><$reveal type="match" text="" default="""$image$""" tag="div" class="tc-thumbnail-background" style="width:$width$px;height:$height$px;background-color:$background-color$;"></$reveal></div><div class="tc-thumbnail-icon" style="fill:$color$;color:$color$;">
-$icon$
-</div><div class="tc-thumbnail-caption">
-$caption$
-</div>
-</div></$link>
+<$link to="""$link$"""><div class="tc-thumbnail-wrapper"
+><div
+	class="tc-thumbnail-image"
+	style="width:$width$px;height:$height$px;"><$reveal
+	type="nomatch"
+	text=""
+	default="""$image$"""
+	tag="div"
+	style="width:$width$px;height:$height$px;"
+>[img[$image$]]</$reveal><$reveal
+	type="match"
+	text=""
+	default="""$image$"""
+	tag="div"
+	class="tc-thumbnail-background"
+	style="width:$width$px;height:$height$px;background-color:$background-color$;"
+></$reveal></div><div
+	class="tc-thumbnail-icon"
+	style="fill:$color$;color:$color$;"
+>$icon$</div><div class="tc-thumbnail-caption">$caption$</div></div></$link>
 \end
 
 \define thumbnail-right(link,icon,color,background-color,image,caption,width:"280",height:"157")

package/core/wiki/macros/timeline.tid

@@ -12,6 +12,7 @@ title: $:/core/macros/timeline
 <$view field="title"/>
 \end
 \define 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$]]">
 <div class="tc-menu-list-item">

package/core/wiki/macros/toc.tid

@@ -2,17 +2,21 @@ title: $:/core/macros/toc
 tags: $:/tags/Macro
 
 \define toc-caption()
+\whitespace trim
+<span class="tc-toc-caption tc-tiny-gap-left">
 <$set name="tv-wikilinks" value="no">
   <$transclude field="caption">
     <$view field="title"/>
   </$transclude>
 </$set>
+</span>
 \end
 
 \define toc-body(tag,sort:"",itemClassFilter,exclude,path)
+\whitespace trim
 <ol class="tc-toc">
   <$list filter="""[all[shadows+tiddlers]tag<__tag__>!has[draft.of]$sort$] -[<__tag__>] -[enlist<__exclude__>]""">
-    <$vars item=<<currentTiddler>> path={{{ [<__path__>addsuffix[/]addsuffix<__tag__>] }}}>
+    <$let item=<<currentTiddler>> path={{{ [<__path__>addsuffix[/]addsuffix<__tag__>] }}}>
       <$set name="excluded" filter="""[enlist<__exclude__>] [<__tag__>]""">
         <$set name="toc-item-class" filter=<<__itemClassFilter__>> emptyValue="toc-item-selected" value="toc-item">
           <li class=<<toc-item-class>>>
@@ -23,7 +27,7 @@ tags: $:/tags/Macro
           </li>
         </$set>
       </$set>
-    </$vars>
+    </$let>
   </$list>
 </ol>
 \end
@@ -33,6 +37,7 @@ tags: $:/tags/Macro
 \end
 
 \define toc-linked-expandable-body(tag,sort:"",itemClassFilter,exclude,path)
+\whitespace trim
 <!-- helper function -->
 <$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">
@@ -59,6 +64,7 @@ tags: $:/tags/Macro
 \end
 
 \define toc-unlinked-expandable-body(tag,sort:"",itemClassFilter,exclude,path)
+\whitespace trim
 <!-- helper function -->
 <$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">
@@ -88,7 +94,8 @@ tags: $:/tags/Macro
 \end
 
 \define toc-expandable(tag,sort:"",itemClassFilter:"",exclude,path)
-<$vars tag=<<__tag__>> sort=<<__sort__>> itemClassFilter=<<__itemClassFilter__>> path={{{ [<__path__>addsuffix[/]addsuffix<__tag__>] }}}>
+\whitespace trim
+<$let tag=<<__tag__>> sort=<<__sort__>> itemClassFilter=<<__itemClassFilter__>> path={{{ [<__path__>addsuffix[/]addsuffix<__tag__>] }}}>
   <$set name="excluded" filter="""[enlist<__exclude__>] [<__tag__>]""">
     <ol class="tc-toc toc-expandable">
       <$list filter="""[all[shadows+tiddlers]tag<__tag__>!has[draft.of]$sort$] -[<__tag__>] -[enlist<__exclude__>]""">
@@ -98,10 +105,11 @@ tags: $:/tags/Macro
       </$list>
     </ol>
   </$set>
-</$vars>
+</$let>
 \end
 
 \define toc-linked-selective-expandable-body(tag,sort:"",itemClassFilter,exclude,path)
+\whitespace trim
 <$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>>>
@@ -129,6 +137,7 @@ tags: $:/tags/Macro
 \end
 
 \define toc-unlinked-selective-expandable-body(tag,sort:"",itemClassFilter,exclude,path)
+\whitespace trim
 <$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>>>
@@ -159,8 +168,9 @@ tags: $:/tags/Macro
 \end
 
 \define toc-selective-expandable(tag,sort:"",itemClassFilter,exclude,path)
-<$vars tag=<<__tag__>> sort=<<__sort__>> itemClassFilter=<<__itemClassFilter__>> path={{{ [<__path__>addsuffix[/]addsuffix<__tag__>] }}}>
-  <$set name="excluded" filter="""[enlist<__exclude__>] [<__tag__>]""">
+\whitespace trim
+<$let tag=<<__tag__>> sort=<<__sort__>> itemClassFilter=<<__itemClassFilter__>> path={{{ [<__path__>addsuffix[/]addsuffix<__tag__>] }}}>
+  <$set name="excluded" filter="[enlist<__exclude__>] [<__tag__>]">
     <ol class="tc-toc toc-selective-expandable">
       <$list filter="""[all[shadows+tiddlers]tag<__tag__>!has[draft.of]$sort$] -[<__tag__>] -[enlist<__exclude__>]""">
         <$list filter="[all[current]toc-link[no]]" variable="ignore" emptyMessage=<<toc-selective-expandable-empty-message>> >
@@ -169,10 +179,11 @@ tags: $:/tags/Macro
       </$list>
     </ol>
   </$set>
-</$vars>
+</$let>
 \end
 
 \define toc-tabbed-external-nav(tag,sort:"",selectedTiddler:"$:/temp/toc/selectedTiddler",unselectedText,missingText,template:"")
+\whitespace trim
 <$tiddler tiddler={{{ [<__selectedTiddler__>get[text]] }}}>
   <div class="tc-tabbed-table-of-contents">
     <$linkcatcher to=<<__selectedTiddler__>>>
@@ -196,8 +207,8 @@ tags: $:/tags/Macro
 \end
 
 \define toc-tabbed-internal-nav(tag,sort:"",selectedTiddler:"$:/temp/toc/selectedTiddler",unselectedText,missingText,template:"")
+\whitespace trim
 <$linkcatcher to=<<__selectedTiddler__>>>
   <$macrocall $name="toc-tabbed-external-nav" tag=<<__tag__>> sort=<<__sort__>> selectedTiddler=<<__selectedTiddler__>> unselectedText=<<__unselectedText__>> missingText=<<__missingText__>> template=<<__template__>>/>
 </$linkcatcher>
 \end
-

package/core/wiki/macros/translink.tid

@@ -2,6 +2,7 @@ title: $:/core/macros/translink
 tags: $:/tags/Macro
 
 \define translink(title,mode:"block")
+\whitespace trim
 <div style="border:1px solid #ccc; padding: 0.5em; background: black; foreground; white;">
 <$link to="""$title$""">
 <$text text="""$title$"""/>

package/core/wiki/macros/tree.tid

@@ -6,28 +6,31 @@ tags: $:/tags/Macro
 \end
 
 \define leaf-node(prefix,chunk)
+\whitespace trim
 <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> <$macrocall $name="leaf-link" full-title=<<full-title>> chunk=<<chunk>>/>
+<span>{{$:/core/images/file}}</span>&#32;<$macrocall $name="leaf-link" full-title=<<full-title>> chunk=<<chunk>>/>
 </$list>
 </$list>
 </li>
 \end
 
 \define branch-node(prefix,chunk,separator: "/")
+\whitespace trim
 <li>
 <$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}} <$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}} <$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>
 <$reveal type="match" stateTitle=<<reveal-state>> text="show">
 <$macrocall $name="tree-node" prefix={{{ [<__prefix__>addsuffix<__chunk__>] }}} separator=<<__separator__>>/>
@@ -37,6 +40,7 @@ tags: $:/tags/Macro
 \end
 
 \define tree-node(prefix,separator: "/")
+\whitespace trim
 <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__>>/>
@@ -48,6 +52,7 @@ tags: $:/tags/Macro
 \end
 
 \define tree(prefix: "$:/",separator: "/")
+\whitespace trim
 <div class="tc-tree">
 <span><$text text=<<__prefix__>>/></span>
 <div>

package/core/wiki/minifocusswitcher.tid

@@ -1,5 +1,6 @@
 title: $:/snippets/minifocusswitcher
 
+\whitespace trim
 <$select tiddler="$:/config/AutoFocus">
 <$list filter="title tags text type fields">
 <option value=<<currentTiddler>>><<currentTiddler>></option>

package/core/wiki/minilanguageswitcher.tid

@@ -1,5 +1,6 @@
 title: $:/snippets/minilanguageswitcher
 
+\whitespace trim
 <$select tiddler="$:/language">
 <$list filter="[[$:/languages/en-GB]] [plugin-type[language]sort[title]]">
 <option value=<<currentTiddler>>><$view field="description"><$view field="name"><$view field="title"/></$view></$view></option>

package/core/wiki/minithemeswitcher.tid

@@ -1,7 +1,8 @@
 title: $:/snippets/minithemeswitcher
 
 \define lingo-base() $:/language/ControlPanel/Theme/
-<<lingo Prompt>> <$select tiddler="$:/theme">
+\whitespace trim
+<<lingo Prompt>>&#32;<$select tiddler="$:/theme">
 <$list filter="[plugin-type[theme]sort[title]]">
 <option value=<<currentTiddler>>><$view field="name"><$view field="title"/></$view></option>
 </$list>

package/core/wiki/modules.tid

@@ -3,6 +3,7 @@ title: $:/snippets/modules
 \define describeModuleType(type)
 {{$:/language/Docs/ModuleTypes/$type$}}
 \end
+\whitespace trim
 <$list filter="[moduletypes[]]">
 
 !! <$macrocall $name="currentTiddler" $type="text/plain" $output="text/plain"/>

package/core/wiki/palettepreview.tid

@@ -1,5 +1,6 @@
 title: $:/snippets/palettepreview
 
+\whitespace trim
 <$set name="currentTiddler" value={{$:/palette}}>
 {{||$:/snippets/currpalettepreview}}
 </$set>

package/core/wiki/paletteswitcher.tid

@@ -1,8 +1,19 @@
 title: $:/snippets/paletteswitcher
 
+\whitespace trim
 <$linkcatcher to="$:/palette">
-<div class="tc-chooser"><$list filter="[all[shadows+tiddlers]tag[$:/tags/Palette]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}}>''<$view field="name" format="text"/>'' - <$view field="description" format="text"/>{{||$:/snippets/currpalettepreview}}</$link>
-</div></$set>
+<div class="tc-chooser">
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/Palette]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}}>
+''<$view field="name" format="text"/>''
+&#32;-&#32;
+<$view field="description" format="text"/>
+{{||$:/snippets/currpalettepreview}}
+</$link>
+</div>
+</$set>
 </$list>
 </div>
 </$linkcatcher>

package/core/wiki/peek-stylesheets.tid

@@ -1,6 +1,7 @@
 title: $:/snippets/peek-stylesheets
 
 \define expandable-stylesheets-list()
+\whitespace trim
 <ol>
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/Stylesheet]!has[draft.of]]">
 <$vars state=<<qualify "$:/state/peek-stylesheets/open/">>>
@@ -22,11 +23,7 @@ title: $:/snippets/peek-stylesheets
 <$reveal type="match" state=<<state>> text="yes" tag="div">
 <$set name="source" tiddler=<<currentTiddler>>>
 <$wikify name="styles" text=<<source>>>
-<pre>
-<code>
-<$text text=<<styles>>/>
-</code>
-</pre>
+<$codeblock code=<<styles>> language="css"/>
 </$wikify>
 </$set>
 </$reveal>
@@ -38,6 +35,7 @@ title: $:/snippets/peek-stylesheets
 \end
 
 \define stylesheets-list()
+\whitespace trim
 <ol>
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/Stylesheet]!has[draft.of]]">
 <li>
@@ -57,6 +55,7 @@ title: $:/snippets/peek-stylesheets
 </$list>
 </ol>
 \end
+\whitespace trim
 
 <$vars modeState=<<qualify "$:/state/peek-stylesheets/mode/">>>
 

package/core/wiki/tags/EditTemplateBodyFilter.tid

@@ -0,0 +1,2 @@
+title: $:/tags/EditTemplateBodyFilter
+list: $:/config/EditTemplateBodyFilters/canonical-uri $:/config/EditTemplateBodyFilters/default

package/core/wiki/tags/StoryTiddlerTemplateFilter.tid

@@ -0,0 +1,2 @@
+title: $:/tags/StoryTiddlerTemplateFilter
+list: $:/config/StoryTiddlerTemplateFilters/draft $:/config/StoryTiddlerTemplateFilters/default

package/core/wiki/tags/TiddlerColourFilter.tid

@@ -0,0 +1,3 @@
+title: $:/tags/TiddlerColourFilter
+list: $:/config/TiddlerColourFilters/color-field $:/config/TiddlerColourFilters/default
+

package/core/wiki/tags/TiddlerIconFilter.tid

@@ -0,0 +1,3 @@
+title: $:/tags/TiddlerIconFilter
+list: $:/config/TiddlerIconFilters/icon-field $:/config/TiddlerIconFilters/default
+

package/core/wiki/tags/ViewTemplateBodyFilter.tid

@@ -0,0 +1,3 @@
+title: $:/tags/ViewTemplateBodyFilter
+list: $:/config/ViewTemplateBodyFilters/hide-body $:/config/ViewTemplateBodyFilters/code-body $:/config/ViewTemplateBodyFilters/stylesheet $:/config/ViewTemplateBodyFilters/system $:/config/ViewTemplateBodyFilters/import $:/config/ViewTemplateBodyFilters/plugin $:/config/ViewTemplateBodyFilters/default
+

package/core/wiki/tags/ViewTemplateSubtitle.tid

@@ -0,0 +1,2 @@
+title: $:/tags/ViewTemplate/Subtitle
+list: $:/core/ui/ViewTemplate/subtitle/modifier $:/core/ui/ViewTemplate/subtitle/modified

package/core/wiki/tags/ViewTemplateTitleFilter.tid

@@ -0,0 +1,3 @@
+title: $:/tags/ViewTemplateTitleFilter
+list: $:/config/ViewTemplateTitleFilters/system $:/config/ViewTemplateTitleFilters/default
+

package/core/wiki/themeswitcher.tid

@@ -1,7 +1,16 @@
 title: $:/snippets/themeswitcher
 
+\whitespace trim
 <$linkcatcher to="$:/theme">
-<div class="tc-chooser"><$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"/>'' <$view field="description" format="text"/></$link></div>
+<div class="tc-chooser">
+<$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>
 </$list>
 </div>

package/core/wiki/title.tid

@@ -1,6 +1,7 @@
 title: $:/core/wiki/title
 
+\whitespace trim
 {{$:/SiteTitle}}
 <$list filter="[{$:/SiteSubtitle}trim[]minlength[1]]" variable="ignore">
---- {{$:/SiteSubtitle}}
+&#32;---&#32;{{$:/SiteSubtitle}}
 </$list>

package/core/wiki/viewswitcher.tid

@@ -3,6 +3,7 @@ title: $:/snippets/viewswitcher
 \define icon()
 $:/core/images/storyview-$(storyview)$
 \end
+\whitespace trim
 <$linkcatcher to="$:/view">
 <div class="tc-chooser tc-viewswitcher">
 <$list filter="[storyviews[]]" variable="storyview">

package/editions/de-AT/tiddlers/howto/TiddlyWiki und TiddlyDesktop.tid

@@ -8,7 +8,7 @@ type: text/vnd.tiddlywiki
 
 TiddlyDesktop ist ein Programm für Windows, Mac OS X und Linux, mit dem Sie TiddlyWiki Dateien bearbeiten können.
 
-# Installieren Sie die aktuelle ~TiddlyDesktop Version von: https://github.com/Jermolene/TiddlyDesktop/releases
+# Installieren Sie die aktuelle ~TiddlyDesktop Version von: https://github.com/TiddlyWiki/TiddlyDesktop/releases
 # Starten Sie TiddlyDesktop
 # Verwenden Sie den "browse button" um TiddlyWiki Dateien zu öffnen.
 # Speichern der Änderungen funktioniert wie gewohnt. 

package/editions/dev/tiddlers/_tw_shared/tiddlywiki.files

@@ -0,0 +1,5 @@
+{
+	"directories": [
+		"../../../tw5.com/tiddlers/_tw_shared"
+	]
+}

package/editions/dev/tiddlers/from Heigele and Jurke/Syncadaptor.tid

@@ -1,10 +1,10 @@
 chapter.of: Extended Persistence
 created: 20140708084850294
-modified: 20140717181245449
+modified: 20210720193245000
 sub.num: 3
 tags: doc
 title: Syncadaptor
 
 A module with ``module-type: syncadaptor`` provides functionality to get a list of tiddlers (this list is provided as ~SkinnyTiddlers, which are normal tiddlers without the text field) and to load, save and delete single tiddlers. A syncadaptor can also provide functions to login and logout so that syncadaptor modules can be used to synchronize tiddlers with a remote server.
 
-The syncer module only uses one syncadaptor and honours a special [[system tiddler|System Tiddlers]] [[$:/config/SyncFilter]] containing a [[filter string|Tags and Filter Mechanism]]. Tiddlers matching this filter string are not saved to the server with a syncadapter. It uses the [[WebServer API|https://tiddlywiki.com/#WebServer%20API%3A%20Get%20All%20Tiddlers]] to load modified tiddlers from the server, which returns only non-system tiddlers.
+The syncer module only uses one syncadaptor and honours a special [[system tiddler|System Tiddlers]] [[$:/config/SyncFilter]] containing a [[filter string|Tags and Filter Mechanism]]. Tiddlers matching this filter string are saved to the server with a syncadapter. It uses the [[WebServer API|https://tiddlywiki.com/#WebServer%20API%3A%20Get%20All%20Tiddlers]] to load modified tiddlers from the server, which returns only non-system tiddlers.

package/editions/dev/tiddlers/system/github-fork-ribbon.tid

@@ -1,5 +1,5 @@
 title: $:/editions/dev/github-fork-ribbon
-tags: $:/tags/PageControls
+tags: $:/tags/PageTemplate
 caption: ~GitHub ribbon
 description: ~GitHub ribbon for tw5.com/dev
 

package/editions/dev/tiddlywiki.info

@@ -4,6 +4,7 @@
 		"tiddlywiki/highlight",
 		"tiddlywiki/nodewebkitsaver",
 		"tiddlywiki/github-fork-ribbon",
+		"tiddlywiki/menubar",
 		"tiddlywiki/internals"
 	],
 	"themes": [
@@ -22,7 +23,6 @@
 		"de-AT",
 		"de-DE",
 		"el-GR",
-		"en-GB",
 		"en-US",
 		"es-ES",
 		"fa-IR",

package/editions/dynaviewdemo/tiddlers/SideBar-Open.tid

@@ -5,7 +5,7 @@ caption: {{$:/language/SideBar/Open/Caption}}
 \define lingo-base() $:/language/CloseAll/
 
 \define drop-actions()
-<$action-listops $tiddler="$:/StoryList" $subfilter="+[insertbefore:currentTiddler<actionTiddler>]"/>
+<$action-listops $tiddler="$:/StoryList" $subfilter="+[insertbefore<actionTiddler>,<currentTiddler>]"/>
 \end
 
 <$list filter="[list[$:/StoryList]]" history="$:/HistoryList" storyview="pop">

package/editions/es-ES/tiddlers/TiddlyDesktop.tid

@@ -12,7 +12,7 @@ Aquí hay un video de [[introducción a TiddlyDesktop|Introducing TiddlyDesktop
 
 ! Instrucciones
 
-# Descarga la última versión de TiddlyDesktop de https://github.com/Jermolene/TiddlyDesktop/releases
+# Descarga la última versión de TiddlyDesktop de https://github.com/TiddlyWiki/TiddlyDesktop/releases
 
 # Ejecuta TiddlyDesktop
 
@@ -24,6 +24,6 @@ Aquí hay un video de [[introducción a TiddlyDesktop|Introducing TiddlyDesktop
 
 ~TiddlyDesktop se basa en [[NW.js]], proyecto [[de código abierto|OpenSource]] y la fuente se encuentra en GitHub:
 
-https://github.com/Jermolene/TiddlyDesktop/
+https://github.com/TiddlyWiki/TiddlyDesktop/
 
 Consulta las [[versiones de TiddlyDesktop|TiddlyDesktop Releases]]