tiddlywiki 5.2.2 → 5.2.4

package/core/ui/ControlPanel/Modals/AddPlugins.tid

@@ -2,6 +2,7 @@ title: $:/core/ui/ControlPanel/Modals/AddPlugins
 subtitle: {{$:/core/images/download-button}} {{$:/language/ControlPanel/Plugins/Add/Caption}}
 
 \define install-plugin-actions()
+\whitespace trim
 <$action-sendmessage $message="tm-load-plugin-from-library" url={{!!url}} title={{$(assetInfo)$!!original-title}}/>
 <$set name="url" value={{!!url}}>
 <$set name="currentTiddler" value=<<assetInfo>>>
@@ -13,18 +14,21 @@ subtitle: {{$:/core/images/download-button}} {{$:/language/ControlPanel/Plugins/
 \end
 
 \define install-plugin-button()
+\whitespace trim
 <div>
 <$set name="libraryVersion" value={{{ [<assetInfo>get[version]] }}}>
 <$set name="installedVersion" value={{{ [<assetInfo>get[original-title]get[version]] }}}>
 <$set name="reinstall-type" value={{{ [<libraryVersion>compare:version:eq<installedVersion>then[tc-reinstall]] [<libraryVersion>compare:version:gt<installedVersion>then[tc-reinstall-upgrade]] [<libraryVersion>compare:version:lt<installedVersion>then[tc-reinstall-downgrade]] }}}>
 <$button actions=<<install-plugin-actions>> class={{{ [<assetInfo>get[original-title]has[version]then<reinstall-type>] tc-btn-invisible tc-install-plugin +[join[ ]] }}}>
 {{$:/core/images/download-button}}
+&#32;
 <$list filter="[<assetInfo>get[original-title]get[version]]" variable="ignore" emptyMessage="{{$:/language/ControlPanel/Plugins/Install/Caption}}">
-<$list filter="[<libraryVersion>compare:version:gt<installedVersion>]" variable="ignore" emptyMessage="""
-<$list filter="[<libraryVersion>compare:version:lt<installedVersion>]" variable="ignore" emptyMessage="{{$:/language/ControlPanel/Plugins/Reinstall/Caption}}">
+<$list filter="[<libraryVersion>compare:version:gt<installedVersion>]" variable="ignore" emptyMessage="
+\whitespace trim
+<$list filter='[<libraryVersion>compare:version:lt<installedVersion>]' variable='ignore' emptyMessage='{{$:/language/ControlPanel/Plugins/Reinstall/Caption}}'>
 {{$:/language/ControlPanel/Plugins/Downgrade/Caption}}
 </$list>
-""">
+">
 {{$:/language/ControlPanel/Plugins/Update/Caption}}
 </$list>
 </$list>
@@ -43,6 +47,7 @@ $:/state/add-plugin-info/$(connectionTiddler)$/$(assetInfo)$
 \end
 
 \define display-plugin-info(type)
+\whitespace trim
 <$set name="popup-state" value=<<popup-state-macro>>>
 <div class="tc-plugin-info">
 <div class="tc-plugin-info-chunk tc-plugin-info-toggle">
@@ -63,7 +68,9 @@ $:/state/add-plugin-info/$(connectionTiddler)$/$(assetInfo)$
 </$list>
 </div>
 <div class="tc-plugin-info-chunk tc-plugin-info-description">
-<h1><strong><$text text={{{ [<assetInfo>get[name]] ~[<assetInfo>get[original-title]split[/]last[1]] }}}/></strong>: <$view tiddler=<<assetInfo>> field="description"/></h1>
+<h1><strong><$text text={{{ [<assetInfo>get[name]] ~[<assetInfo>get[original-title]split[/]last[1]] }}}/></strong>:
+&#32;
+<$view tiddler=<<assetInfo>> field="description"/></h1>
 <h2><$view tiddler=<<assetInfo>> field="original-title"/></h2>
 <div><em><$view tiddler=<<assetInfo>> field="version"/></em></div>
 <$list filter="[<assetInfo>get[original-title]get[version]]" variable="installedVersion"><div><em>{{$:/language/ControlPanel/Plugins/AlreadyInstalled/Hint}}</em></div></$list>
@@ -83,9 +90,9 @@ $:/state/add-plugin-info/$(connectionTiddler)$/$(assetInfo)$
 <$set name="currentTiddler" value=<<assetInfo>>>
 <$list filter="[enlist{!!dependents}] [<currentTiddler>get[parent-plugin]] +[limit[1]]" variable="ignore">
 <div>
-{{$:/language/ControlPanel/Plugins/AlsoRequires}}
+{{$:/language/ControlPanel/Plugins/AlsoRequires}}&#32;
 <$list filter="[enlist{!!dependents}] [{!!parent-plugin}] +[sort[name]]" variable="dependency">
-<$text text=<<dependency>>/>
+<$text text=<<dependency>>/>&#32;
 </$list>
 </div>
 </$list>
@@ -118,16 +125,21 @@ $:/state/add-plugin-info/$(connectionTiddler)$/$(assetInfo)$
 \end
 
 \define load-plugin-library-button()
+\whitespace trim
 <$list filter="[<currentTiddler>get[enabled]else[yes]match[yes]]" variable="ignore">
 <$button class="tc-btn-big-green">
 <$action-sendmessage $message="tm-load-plugin-library" url={{!!url}} infoTitlePrefix="$:/temp/RemoteAssetInfo/"/>
-{{$:/core/images/chevron-right}} {{$:/language/ControlPanel/Plugins/OpenPluginLibrary}}
+{{$:/core/images/chevron-right}}&#32;{{$:/language/ControlPanel/Plugins/OpenPluginLibrary}}
 </$button>
 </$list>
 \end
 
 \define display-server-assets(type)
-{{$:/language/Search/Search}}: <$edit-text tiddler="""$:/temp/RemoteAssetSearch/$(currentTiddler)$""" default="" type="search" tag="input"/>
+\whitespace trim
+{{$:/language/Search/Search}}:
+&#32;
+<$edit-text tiddler="""$:/temp/RemoteAssetSearch/$(currentTiddler)$""" default="" type="search" tag="input"/>
+&#32;
 <$reveal state="""$:/temp/RemoteAssetSearch/$(currentTiddler)$""" type="nomatch" text="">
 <$button class="tc-btn-invisible">
 <$action-setfield $tiddler="""$:/temp/RemoteAssetSearch/$(currentTiddler)$""" $field="text" $value=""/>
@@ -144,6 +156,7 @@ $:/state/add-plugin-info/$(connectionTiddler)$/$(assetInfo)$
 \end
 
 \define display-server-connection()
+\whitespace trim
 <$list filter="[all[tiddlers+shadows]tag[$:/tags/ServerConnection]suffix{!!url}]" variable="connectionTiddler" emptyMessage=<<load-plugin-library-button>>>
 
 <$set name="transclusion" value=<<connectionTiddler>>>
@@ -156,16 +169,18 @@ $:/state/add-plugin-info/$(connectionTiddler)$/$(assetInfo)$
 \end
 
 \define close-library-button()
+\whitespace trim
 <$reveal type='nomatch' state='$:/temp/ServerConnection/$(PluginLibraryURL)$' text=''>
 <$button class='tc-btn-big-green'>
 <$action-sendmessage $message="tm-unload-plugin-library" url={{!!url}}/>
-{{$:/core/images/chevron-left}} {{$:/language/ControlPanel/Plugins/ClosePluginLibrary}}
+{{$:/core/images/chevron-left}}&#32;{{$:/language/ControlPanel/Plugins/ClosePluginLibrary}}
 <$action-deletetiddler $filter="[prefix[$:/temp/ServerConnection/$(PluginLibraryURL)$]][prefix[$:/temp/RemoteAssetInfo/$(PluginLibraryURL)$]]"/>
 </$button>
 </$reveal>
 \end
 
 \define plugin-library-listing()
+\whitespace trim
 <div class="tc-tab-set">
 <$set name="defaultTab" value={{{ [all[tiddlers+shadows]tag[$:/tags/PluginLibrary]] }}}>
 <div class="tc-tab-buttons">
@@ -187,6 +202,7 @@ $:/state/add-plugin-info/$(connectionTiddler)$/$(assetInfo)$
 <$set name=PluginLibraryURL value={{!!url}}>
 <<close-library-button>>
 </$set>
+&#32;
 <<display-server-connection>>
 </$reveal>
 </$list>
@@ -196,6 +212,7 @@ $:/state/add-plugin-info/$(connectionTiddler)$/$(assetInfo)$
 \end
 
 \import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
+\whitespace trim
 
 <div>
 <<plugin-library-listing>>

package/core/ui/ControlPanel/Parsing.tid

@@ -5,6 +5,7 @@ caption: {{$:/language/ControlPanel/Parsing/Caption}}
 \define lingo-base() $:/language/ControlPanel/Parsing/
 
 \define toggle(Type)
+\whitespace trim
 <$checkbox
 tiddler="""$:/config/WikiParserRules/$Type$/$(rule)$"""
 field="text"
@@ -16,10 +17,12 @@ default="enable">
 \end
 
 \define rules(type,Type)
+\whitespace trim
 <$list filter="[wikiparserrules[$type$]]" variable="rule">
 <dd><<toggle $Type$>></dd>
 </$list>
 \end
+\whitespace trim
 
 <<lingo Hint>>
 

package/core/ui/ControlPanel/Plugins/Add/Updates.tid

@@ -2,6 +2,7 @@ title: $:/core/ui/ControlPanel/Plugins/Add/Updates
 caption: <$importvariables filter="$:/core/ui/ControlPanel/Plugins/Add/Updates">{{$:/language/ControlPanel/Plugins/Updates/Caption}} (<<update-count>>)</$importvariables>
 
 \define each-updateable-plugin(body)
+\whitespace trim
 <$list filter="[all[tiddlers+shadows]tag[$:/tags/RemoteAssetInfo]server-url{!!url}sort[title]]" variable="assetInfo">
 <$set name="libraryVersion" value={{{ [<assetInfo>get[version]] }}}>
 <$list filter="[<assetInfo>get[original-title]has[version]!version<libraryVersion>]" variable="ignore">
@@ -25,8 +26,11 @@ $body$
 <$wikify name="count-filter" text=<<each-updateable-plugin "&#91;&#91;<$text text=<<assetInfo>>/>]]">>><$count filter=<<count-filter>>/></$wikify>
 \end
 
+\whitespace trim
 <$button actions=<<update-all-actions>> class="tc-btn-invisible tc-install-plugin tc-reinstall-upgrade">
-{{$:/core/images/download-button}} {{||$:/language/ControlPanel/Plugins/Updates/UpdateAll/Caption}}
+{{$:/core/images/download-button}}
+&#32;
+{{||$:/language/ControlPanel/Plugins/Updates/UpdateAll/Caption}}
 </$button>
 
 <div class="tc-plugin-library-listing">

package/core/ui/ControlPanel/Plugins/AddPlugins.tid

@@ -1,7 +1,10 @@
 title: $:/core/ui/ControlPanel/Plugins/AddPlugins
 
 \define lingo-base() $:/language/ControlPanel/Plugins/
+\whitespace trim
 
 <$button message="tm-modal" param="$:/core/ui/ControlPanel/Modals/AddPlugins" tooltip={{$:/language/ControlPanel/Plugins/Add/Hint}} class="tc-btn-big-green tc-primary-btn">
-{{$:/core/images/download-button}} <<lingo Add/Caption>>
+{{$:/core/images/download-button}}
+&#32;
+<<lingo Add/Caption>>
 </$button>

package/core/ui/ControlPanel/Plugins.tid

@@ -5,6 +5,7 @@ caption: {{$:/language/ControlPanel/Plugins/Caption}}
 \define lingo-base() $:/language/ControlPanel/Plugins/
 
 \define plugin-table(type)
+\whitespace trim
 <$set name="plugin-type" value="""$type$""">
 <$set name="qualified-state" value=<<qualify "$:/state/plugin-info">>>
 <$list filter="[!has[draft.of]plugin-type[$type$]sort[name]]" emptyMessage=<<lingo "Empty/Hint">> template="$:/core/ui/Components/plugin-info"/>

package/core/ui/ControlPanel/Saving/TiddlySpot.tid

@@ -8,13 +8,14 @@ caption: {{$:/language/ControlPanel/Saving/TiddlySpot/Caption}}
 http://$(userName)$.tiddlyspot.com/$path$/
 \end
 \define siteLink(path)
+\whitespace trim
 <$reveal type="nomatch" state="$:/UploadName" text="">
 <$set name="userName" value={{$:/UploadName}}>
 <$reveal type="match" state="$:/UploadURL" text="">
 <<siteURL $path$>>
 </$reveal>
 <$reveal type="nomatch" state="$:/UploadURL" text="">
-<$macrocall $name=resolvePath source={{$:/UploadBackupDir}} root={{$:/UploadURL}}>>
+<$macrocall $name=resolvePath source={{$:/UploadBackupDir}} root={{$:/UploadURL}}/>
 </$reveal>
 </$set>
 </$reveal>

package/core/ui/ControlPanel/Saving.tid

@@ -2,6 +2,7 @@ title: $:/core/ui/ControlPanel/Saving
 tags: $:/tags/ControlPanel
 caption: {{$:/language/ControlPanel/Saving/Caption}}
 
+\whitespace trim
 {{$:/language/ControlPanel/Saving/Hint}}
 
 <div class="tc-control-panel">

package/core/ui/ControlPanel/Settings/DefaultMoreSidebarTab.tid

@@ -3,6 +3,7 @@ tags: $:/tags/ControlPanel/Settings
 title: $:/core/ui/ControlPanel/Settings/DefaultMoreSidebarTab
 
 \define lingo-base() $:/language/ControlPanel/Settings/DefaultMoreSidebarTab/
+\whitespace trim
 
 <$link to="$:/config/DefaultMoreSidebarTab"><<lingo Hint>></$link>
 

package/core/ui/ControlPanel/Settings/DefaultSidebarTab.tid

@@ -3,6 +3,7 @@ tags: $:/tags/ControlPanel/Settings
 title: $:/core/ui/ControlPanel/Settings/DefaultSidebarTab
 
 \define lingo-base() $:/language/ControlPanel/Settings/DefaultSidebarTab/
+\whitespace trim
 
 <$link to="$:/config/DefaultSidebarTab"><<lingo Hint>></$link>
 

package/core/ui/ControlPanel/Settings/LinkToBehaviour.tid

@@ -3,6 +3,7 @@ tags: $:/tags/ControlPanel/Settings
 caption: {{$:/language/ControlPanel/Settings/LinkToBehaviour/Caption}}
 
 \define lingo-base() $:/language/ControlPanel/Settings/LinkToBehaviour/
+\whitespace trim
 
 <$link to="$:/config/Navigation/openLinkFromInsideRiver"><<lingo "InsideRiver/Hint">></$link>
 

package/core/ui/ControlPanel/Settings/ToolbarButtonStyle.tid

@@ -3,6 +3,7 @@ tags: $:/tags/ControlPanel/Settings
 caption: {{$:/language/ControlPanel/Settings/ToolbarButtonStyle/Caption}}
 
 \define lingo-base() $:/language/ControlPanel/Settings/ToolbarButtonStyle/
+\whitespace trim
 <$link to="$:/config/Toolbar/ButtonClass"><<lingo "Hint">></$link>
 
 <$select tiddler="$:/config/Toolbar/ButtonClass">

package/core/ui/ControlPanel/Toolbars/EditorItemTemplate.tid

@@ -3,7 +3,14 @@ title: $:/core/ui/ControlPanel/Toolbars/EditorItemTemplate
 \define config-title()
 $(config-base)$$(currentTiddler)$
 \end
+\whitespace trim
 
 <$draggable tiddler=<<currentTiddler>>>
-<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"/> <span class="tc-icon-wrapper"><$transclude tiddler={{!!icon}}/></span> <$transclude field="caption"/> -- <i class="tc-muted"><$transclude field="description"/></i>
+<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"/>
+&#32;
+<span class="tc-icon-wrapper"><$transclude tiddler={{!!icon}}/></span>
+&#32;
+<$transclude field="caption"/>
+&#32;--&#32;
+<i class="tc-muted"><$transclude field="description"/></i>
 </$draggable>

package/core/ui/ControlPanel/Toolbars/ItemTemplate.tid

@@ -3,7 +3,17 @@ title: $:/core/ui/ControlPanel/Toolbars/ItemTemplate
 \define config-title()
 $(config-base)$$(currentTiddler)$
 \end
+\whitespace trim
 
 <$draggable tiddler=<<currentTiddler>>>
-<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"/> <span class="tc-icon-wrapper"> <$transclude field="caption"/> <i class="tc-muted">-- <$transclude field="description"/></i></span>
+<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"/>
+&#32;
+<span class="tc-icon-wrapper">
+&#32;
+<$transclude field="caption"/>
+&#32;
+<i class="tc-muted">
+--&#32;
+<$transclude field="description"/>
+</i></span>
 </$draggable>

package/core/ui/ControlPanel/Toolbars.tid

@@ -2,6 +2,7 @@ title: $:/core/ui/ControlPanel/Toolbars
 tags: $:/tags/ControlPanel/Appearance
 caption: {{$:/language/ControlPanel/Toolbars/Caption}}
 
+\whitespace trim
 {{$:/language/ControlPanel/Toolbars/Hint}}
 
 <div class="tc-control-panel">

package/core/ui/ControlPanel.tid

@@ -2,6 +2,7 @@ title: $:/ControlPanel
 icon: $:/core/images/options-button
 color: #bbb
 
+\whitespace trim
 <div class="tc-control-panel">
 <$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/ControlPanel]!has[draft.of]]" default="$:/core/ui/ControlPanel/Info" explicitState="$:/state/tab-1749438307"/>
 </div>

package/core/ui/DefaultSearchResultList.tid

@@ -5,6 +5,7 @@ first-search-filter: [!is[system]search:title<userInput>sort[title]limit[250]]
 second-search-filter: [!is[system]search<userInput>sort[title]limit[250]]
 
 \define searchResultList()
+\whitespace trim
 //<small>{{$:/language/Search/Matches/Title}}</small>//
 
 <$list filter="[<userInput>minlength[1]]" variable="ignore">

package/core/ui/EditTemplate/Preview/output.tid

@@ -2,9 +2,9 @@ title: $:/core/ui/EditTemplate/body/preview/output
 tags: $:/tags/EditPreview
 caption: {{$:/language/EditTemplate/Body/Preview/Type/Output}}
 
-\import [all[shadows+tiddlers]tag[$:/tags/Macro/View]!has[draft.of]]
+\import [all[shadows+tiddlers]tag[$:/tags/Macro/View]!has[draft.of]] [all[shadows+tiddlers]tag[$:/tags/Macro/View/Body]!has[draft.of]]
 <$set name="tv-tiddler-preview" value="yes">
 
-<$transclude />
+<$transclude tiddler={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/ViewTemplateBodyFilter]!is[draft]get[text]] :and[!is[blank]else[$:/core/ui/ViewTemplate/body/default]] }}} />
 
 </$set>

package/core/ui/EditTemplate/body/default.tid

@@ -8,14 +8,18 @@ $:/config/EditorToolbarButtons/Visibility/$(currentTiddler)$
 <$action-popup $state=<<importState>> $coords="(0,0,0,0)" $floating="yes"/>
 \end
 
-<$set name="edit-preview-state" value={{{ [{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[<qualify "$:/state/showeditpreview">] }}}>
-<$vars importTitle=<<qualify $:/ImportImage>> importState=<<qualify $:/state/ImportImage>> >
-<$dropzone importTitle=<<importTitle>> autoOpenOnImport="no" contentTypesFilter={{$:/config/Editor/ImportContentTypesFilter}} class="tc-dropzone-editor" enable={{{ [{$:/config/DragAndDrop/Enable}match[no]] :else[subfilter{$:/config/Editor/EnableImportFilter}then[yes]else[no]] }}} filesOnly="yes" actions=<<importFileActions>> ><$reveal stateTitle=<<edit-preview-state>> type="match" text="yes" tag="div">
+\whitespace trim
+<$let
+	edit-preview-state={{{ [{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[<qualify "$:/state/showeditpreview">] }}}
+	importTitle=<<qualify $:/ImportImage>>
+	importState=<<qualify $:/state/ImportImage>> >
+<$dropzone importTitle=<<importTitle>> autoOpenOnImport="no" contentTypesFilter={{$:/config/Editor/ImportContentTypesFilter}} class="tc-dropzone-editor" enable={{{ [{$:/config/DragAndDrop/Enable}match[no]] :else[subfilter{$:/config/Editor/EnableImportFilter}then[yes]else[no]] }}} filesOnly="yes" actions=<<importFileActions>> >
+<$reveal stateTitle=<<edit-preview-state>> type="match" text="yes" tag="div">
 <div class="tc-tiddler-preview">
 
 <$transclude tiddler="$:/core/ui/EditTemplate/body/editor" mode="inline"/>
 
-<div class="tc-tiddler-preview-preview">
+<div class="tc-tiddler-preview-preview" data-tiddler-title={{!!draft.title}} data-tags={{!!tags}}>
 
 <$transclude tiddler={{$:/state/editpreviewtype}} mode="inline">
 
@@ -34,5 +38,4 @@ $:/config/EditorToolbarButtons/Visibility/$(currentTiddler)$
 
 </$reveal>
 </$dropzone>
-</$vars>
-</$set>
+</$let>

package/core/ui/EditTemplate/body-editor.tid

@@ -1,5 +1,7 @@
 title: $:/core/ui/EditTemplate/body/editor
 
+\whitespace trim
+
 <$edit
 
   field="text"

package/core/ui/EditTemplate/controls.tid

@@ -4,6 +4,7 @@ tags: $:/tags/EditTemplate
 \define config-title()
 $:/config/EditToolbarButtons/Visibility/$(listItem)$
 \end
+\whitespace trim
 <div class="tc-tiddler-title tc-tiddler-edit-title">
 <$view field="title"/>
 <span class="tc-tiddler-controls tc-titlebar"><$list filter="[all[shadows+tiddlers]tag[$:/tags/EditToolbar]!has[draft.of]]" variable="listItem"><$reveal type="nomatch" state=<<config-title>> text="hide"><$transclude tiddler=<<listItem>>/></$reveal></$list></span>

package/core/ui/EditTemplate/fieldEditor-default.tid

@@ -1,3 +1,3 @@
 title: $:/core/ui/EditTemplate/fieldEditor/default
 
-<$edit-text tiddler=<<currentTiddler>> field=<<currentField>> default="" class="tc-edit-texteditor" placeholder={{$:/language/EditTemplate/Fields/Add/Value/Placeholder}} tabindex={{$:/config/EditTabIndex}} cancelPopups="yes"/>
+<$edit-text tiddler=<<currentTiddler>> field=<<currentField>> tag="input" default="" class="tc-edit-texteditor tc-edit-fieldeditor" placeholder={{$:/language/EditTemplate/Fields/Add/Value/Placeholder}} tabindex={{$:/config/EditTabIndex}} cancelPopups="yes"/>

package/core/ui/EditTemplate/fields.tid

@@ -10,40 +10,57 @@ $:/config/EditTemplateFields/Visibility/$(currentField)$
 [[hide]] -[title{$(config-title)$}]
 \end
 
+<!-- Beware this is duplicated from EditTemplate.tid. For details see bug #7054 -->
+\define get-field-value-tiddler-filter() [subfilter<get-field-editor-filter>sha256[16]addprefix[/]addprefix<newFieldValueTiddlerPrefix>]
+\define get-field-editor-filter() [<newFieldNameTiddler>get[text]else[]] :cascade[all[shadows+tiddlers]tag[$:/tags/FieldEditorFilter]!is[draft]get[text]] :and[!is[blank]else{$:/core/ui/EditTemplate/fieldEditor/default}]
+
 \define current-tiddler-new-field-selector()
 [data-tiddler-title="$(currentTiddlerCSSescaped)$"] .tc-edit-field-add-name-wrapper input
 \end
 
 \define new-field-actions()
-<$action-sendmessage $message="tm-add-field" $name={{{ [<newFieldNameTiddler>get[text]] }}} $value={{{ [<newFieldNameTiddler>get[text]] :map[<newFieldValueTiddler>get<currentTiddler>] }}}/>
-<$action-deletetiddler $filter="[<newFieldNameTiddler>] [<newFieldValueTiddler>] [<storeTitle>] [<searchListState>]"/>
+\whitespace trim
+<$action-sendmessage $message="tm-add-field" $name={{{ [<newFieldNameTiddler>get[text]] }}} $value={{{ [<newFieldNameTiddler>get[text]] :map[subfilter<get-field-value-tiddler-filter>get[text]] }}}/>
+<$set name="safeNewFieldValueTiddlerPrefix" value=<<newFieldValueTiddlerPrefix>> emptyValue=<<qualify "$:/temp/NewFieldValue">> >
+	<$action-deletetiddler $filter="[<newFieldNameTiddler>] [prefix[$:/temp/NewFieldValue]prefix<safeNewFieldValueTiddlerPrefix>] [<storeTitle>] [<searchListState>]"/>
+</$set>
 <$action-sendmessage $message="tm-focus-selector" $param=<<current-tiddler-new-field-selector>>/>
 \end
 
 \define delete-state-tiddlers() <$action-deletetiddler $filter="[<newFieldNameTiddler>] [<storeTitle>] [<searchListState>]"/>
 
 \define cancel-search-actions-inner()
-<$list filter="[<storeTitle>has[text]] [<newFieldNameTiddler>has[text]]" variable="ignore" emptyMessage="""<<cancel-delete-tiddler-actions "cancel">>""">
+\whitespace trim
+<$list
+	filter="[<storeTitle>has[text]] [<newFieldNameTiddler>has[text]]"
+	variable="ignore"
+	emptyMessage="<<cancel-delete-tiddler-actions 'cancel'>>">
 <<delete-state-tiddlers>>
 </$list>
 \end
 
 \define cancel-search-actions()
+\whitespace trim
 <$set name="userInput" value={{{ [<storeTitle>get[text]] }}}>
-<$list filter="[<newFieldNameTiddler>get[text]!match<userInput>]" emptyMessage="""<<cancel-search-actions-inner>>""">
+<$list
+	filter="[<newFieldNameTiddler>get[text]!match<userInput>]"
+	emptyMessage="<<cancel-search-actions-inner>>">
 <$action-setfield $tiddler=<<newFieldNameTiddler>> text=<<userInput>>/><$action-setfield $tiddler=<<refreshTitle>> text="yes"/>
 </$list>
 </$set>
 \end
 
 \define new-field()
+\whitespace trim
 <$vars name={{{ [<newFieldNameTiddler>get[text]] }}}>
 <$reveal type="nomatch" text="" default=<<name>>>
 <$button tooltip=<<lingo Fields/Add/Button/Hint>>>
 <$action-sendmessage $message="tm-add-field"
 $name=<<name>>
-$value={{{ [<newFieldValueTiddler>get<name>] }}}/>
-<$action-deletetiddler $filter="[<newFieldNameTiddler>] [<newFieldValueTiddler>] [<storeTitle>] [<searchListState>]"/>
+$value={{{ [subfilter<get-field-value-tiddler-filter>get[text]] }}}/>
+<$set name="safeNewFieldValueTiddlerPrefix" value=<<newFieldValueTiddlerPrefix>> emptyValue=<<qualify "$:/temp/NewFieldValue">> >
+	<$action-deletetiddler $filter="[<newFieldNameTiddler>] [prefix[$:/temp/NewFieldValue]prefix<safeNewFieldValueTiddlerPrefix>] [<storeTitle>] [<searchListState>]"/>
+</$set>
 <<lingo Fields/Add/Button>>
 </$button>
 </$reveal>
@@ -56,6 +73,7 @@ $value={{{ [<newFieldValueTiddler>get<name>] }}}/>
 \end
 \whitespace trim
 
+<$set name="newFieldValueTiddlerPrefix" value=<<newFieldValueTiddlerPrefix>> emptyValue=<<qualify "$:/temp/NewFieldValue">> >
 <div class="tc-edit-fields">
 <table class={{{ [all[current]fields[]] :filter[lookup[$:/config/EditTemplateFields/Visibility/]!match[hide]] +[count[]!match[0]] +[then[tc-edit-fields]] ~[[tc-edit-fields tc-edit-fields-small]] }}}>
 <tbody>
@@ -126,13 +144,11 @@ $value={{{ [<newFieldValueTiddler>get<name>] }}}/>
 </div>
 </$reveal>
 </div>
-<$let currentTiddler=<<newFieldValueTiddler>> currentField={{{ [<newFieldNameTiddler>get[text]] }}}>
+<$let currentTiddlerCSSescaped={{{ [<currentTiddler>escapecss[]] }}} currentTiddler={{{ [subfilter<get-field-value-tiddler-filter>] }}} currentField="text" currentFieldName={{{ [<newFieldNameTiddler>get[text]] }}}>
 <span class="tc-edit-field-add-value tc-small-gap-right">
-<$set name="currentTiddlerCSSescaped" value={{{ [<currentTiddler>escapecss[]] }}}>
 <$keyboard key="((add-field))" actions=<<new-field-actions>>>
-<$transclude tiddler={{{ [<currentField>] :cascade[all[shadows+tiddlers]tag[$:/tags/FieldEditorFilter]!is[draft]get[text]] :and[!is[blank]else{$:/core/ui/EditTemplate/fieldEditor/default}] }}} />
+<$transclude tiddler={{{ [subfilter<get-field-editor-filter>] }}} />
 </$keyboard>
-</$set>
 </span>
 <span class="tc-edit-field-add-button">
 <$macrocall $name="new-field"/>
@@ -141,3 +157,4 @@ $value={{{ [<newFieldValueTiddler>get<name>] }}}/>
 </$vars>
 </div>
 </$fieldmangler>
+</$set>

package/core/ui/EditTemplate/shadow.tid

@@ -3,10 +3,12 @@ tags: $:/tags/EditTemplate
 
 \define lingo-base() $:/language/EditTemplate/Shadow/
 \define pluginLinkBody()
+\whitespace trim
 <$link to="""$(pluginTitle)$""">
 <$text text="""$(pluginTitle)$"""/>
 </$link>
 \end
+\whitespace trim
 <$list filter="[all[current]get[draft.of]is[shadow]!is[tiddler]]">
 
 <$list filter="[all[current]shadowsource[]]" variable="pluginTitle">

package/core/ui/EditTemplate/title.tid

@@ -1,6 +1,7 @@
 title: $:/core/ui/EditTemplate/title
 tags: $:/tags/EditTemplate
 
+\whitespace trim
 <$edit-text field="draft.title" class="tc-titlebar tc-edit-texteditor" focus={{{ [{$:/config/AutoFocus}match[title]then[true]] ~[[false]] }}} tabindex={{$:/config/EditTabIndex}} cancelPopups="yes"/>
 
 <$vars pattern="""[\|\[\]{}]""" bad-chars="""`| [ ] { }`""">
@@ -9,7 +10,7 @@ tags: $:/tags/EditTemplate
 
 <div class="tc-message-box">
 
-{{$:/core/images/warning}} {{$:/language/EditTemplate/Title/BadCharacterWarning}}
+{{$:/core/images/warning}}&#32;{{$:/language/EditTemplate/Title/BadCharacterWarning}}
 
 </div>
 
@@ -23,7 +24,7 @@ tags: $:/tags/EditTemplate
 
 <div class="tc-message-box">
 
-{{$:/core/images/warning}} {{$:/language/EditTemplate/Title/Exists/Prompt}}: <$link to={{!!draft.title}} />
+{{$:/core/images/warning}}&#32;{{$:/language/EditTemplate/Title/Exists/Prompt}}:&#32;<$link to={{!!draft.title}} />
 
 </div>
 
@@ -33,18 +34,22 @@ tags: $:/tags/EditTemplate
 
 <$vars fromTitle={{!!draft.of}} toTitle={{!!draft.title}}>
 
-<$checkbox tiddler="$:/config/RelinkOnRename" field="text" checked="yes" unchecked="no" default="no"> {{$:/language/EditTemplate/Title/Relink/Prompt}}</$checkbox>
+<$checkbox tiddler="$:/config/RelinkOnRename" field="text" checked="yes" unchecked="no" default="no">&#32;{{$:/language/EditTemplate/Title/Relink/Prompt}}</$checkbox>
 
 <$list filter="[title<fromTitle>backlinks[]limit[1]]" variable="listItem">
 
 <$vars stateTiddler=<<qualify "$:/state/edit/references">> >
 
 <$reveal type="nomatch" state=<<stateTiddler>> text="show">
-<$button set=<<stateTiddler>> setTo="show" class="tc-btn-invisible">{{$:/core/images/right-arrow}} 
+<$button set=<<stateTiddler>> setTo="show" class="tc-btn-invisible">
+{{$:/core/images/right-arrow}}
+&#32;
 <<lingo EditTemplate/Title/References/Prompt>></$button>
 </$reveal>
 <$reveal type="match" state=<<stateTiddler>> text="show">
-<$button set=<<stateTiddler>> setTo="hide" class="tc-btn-invisible">{{$:/core/images/down-arrow}} 
+<$button set=<<stateTiddler>> setTo="hide" class="tc-btn-invisible">
+{{$:/core/images/down-arrow}}
+&#32;
 <<lingo EditTemplate/Title/References/Prompt>></$button>
 </$reveal>
 

package/core/ui/EditTemplate.tid

@@ -1,19 +1,48 @@
 title: $:/core/ui/EditTemplate
 
-\define delete-edittemplate-state-tiddlers() <$action-deletetiddler $filter="[<newFieldNameTiddler>] [<newFieldValueTiddler>] [<newFieldNameInputTiddler>] [<newFieldNameSelectionTiddler>] [<newTagNameTiddler>] [<newTagNameInputTiddler>] [<newTagNameSelectionTiddler>] [<typeInputTiddler>] [<typeSelectionTiddler>]"/>
+\define delete-edittemplate-state-tiddlers()
+<$set name="safeNewFieldValueTiddlerPrefix" value=<<newFieldValueTiddlerPrefix>> emptyValue=<<qualify "$:/temp/NewFieldValue">> >
+	<$action-deletetiddler $filter="[<newFieldNameTiddler>] [prefix[$:/temp/NewFieldValue]prefix<safeNewFieldValueTiddlerPrefix>] [<newFieldNameInputTiddler>] [<newFieldNameSelectionTiddler>] [<newTagNameTiddler>] [<newTagNameInputTiddler>] [<newTagNameSelectionTiddler>] [<typeInputTiddler>] [<typeSelectionTiddler>]"/>
+</$set>
+\end
+
+<!-- Beware this is duplicated from fields.tid. For details see bug #7054 -->
+\define get-field-value-tiddler-filter() [subfilter<get-field-editor-filter>sha256[16]addprefix[/]addprefix<newFieldValueTiddlerPrefix>]
+\define get-field-editor-filter() [<newFieldNameTiddler>get[text]else[]] :cascade[all[shadows+tiddlers]tag[$:/tags/FieldEditorFilter]!is[draft]get[text]] :and[!is[blank]else{$:/core/ui/EditTemplate/fieldEditor/default}]
+
 \define save-tiddler-actions()
+\whitespace trim
 <$action-sendmessage $message="tm-add-tag" $param={{{ [<newTagNameTiddler>get[text]] }}}/>
-<$action-sendmessage $message="tm-add-field" $name={{{ [<newFieldNameTiddler>get[text]] }}} $value={{{ [<newFieldValueTiddler>get[text]] }}}/>
+<$action-sendmessage $message="tm-add-field" $name={{{ [<newFieldNameTiddler>get[text]] }}} $value={{{ [<newFieldNameTiddler>get[text]] :map[subfilter<get-field-value-tiddler-filter>get[text]] }}}/>
 <<delete-edittemplate-state-tiddlers>>
 <$action-sendmessage $message="tm-save-tiddler"/>
 \end
+
 \define cancel-delete-tiddler-actions(message)
+\whitespace trim
 <<delete-edittemplate-state-tiddlers>>
 <$action-sendmessage $message="tm-$message$-tiddler"/>
 \end
-<div data-tiddler-title=<<currentTiddler>> data-tags={{!!tags}} class={{{ tc-tiddler-frame tc-tiddler-edit-frame [<currentTiddler>is[tiddler]then[tc-tiddler-exists]] [<currentTiddler>is[missing]!is[shadow]then[tc-tiddler-missing]] [<currentTiddler>is[shadow]then[tc-tiddler-exists tc-tiddler-shadow]] [<currentTiddler>is[system]then[tc-tiddler-system]] [{!!class}] [<currentTiddler>tags[]encodeuricomponent[]addprefix[tc-tagged-]] +[join[ ]] }}}>
+
+\whitespace trim
+<div
+	data-tiddler-title=<<currentTiddler>>
+	data-tags={{!!tags}}
+	class={{{ [all[shadows+tiddlers]tag[$:/tags/ClassFilters/TiddlerTemplate]!is[draft]] :map:flat[subfilter{!!text}] tc-tiddler-frame tc-tiddler-edit-frame [<currentTiddler>is[tiddler]then[tc-tiddler-exists]] [<currentTiddler>is[missing]!is[shadow]then[tc-tiddler-missing]] [<currentTiddler>is[shadow]then[tc-tiddler-exists tc-tiddler-shadow]] [<currentTiddler>is[system]then[tc-tiddler-system]] [{!!class}] [<currentTiddler>tags[]encodeuricomponent[]addprefix[tc-tagged-]] +[join[ ]] }}}
+	role="region"
+	aria-label={{$:/language/EditTemplate/Caption}}>
 <$fieldmangler>
-<$vars storyTiddler=<<currentTiddler>> newTagNameTiddler=<<qualify "$:/temp/NewTagName">> newFieldNameTiddler=<<qualify "$:/temp/NewFieldName">> newFieldValueTiddler=<<qualify "$:/temp/NewFieldValue">> newFieldNameInputTiddler=<<qualify "$:/temp/NewFieldName/input">> newFieldNameSelectionTiddler=<<qualify "$:/temp/NewFieldName/selected-item">> newTagNameInputTiddler=<<qualify "$:/temp/NewTagName/input">> newTagNameSelectionTiddler=<<qualify "$:/temp/NewTagName/selected-item">> typeInputTiddler=<<qualify "$:/temp/Type/input">> typeSelectionTiddler=<<qualify "$:/temp/Type/selected-item">>>
+<$vars
+	storyTiddler=<<currentTiddler>>
+	newTagNameTiddler=<<qualify "$:/temp/NewTagName">>
+	newFieldNameTiddler=<<qualify "$:/temp/NewFieldName">>
+	newFieldValueTiddlerPrefix=<<qualify "$:/temp/NewFieldValue">>
+	newFieldNameInputTiddler=<<qualify "$:/temp/NewFieldName/input">>
+	newFieldNameSelectionTiddler=<<qualify "$:/temp/NewFieldName/selected-item">>
+	newTagNameInputTiddler=<<qualify "$:/temp/NewTagName/input">>
+	newTagNameSelectionTiddler=<<qualify "$:/temp/NewTagName/selected-item">>
+	typeInputTiddler=<<qualify "$:/temp/Type/input">>
+	typeSelectionTiddler=<<qualify "$:/temp/Type/selected-item">>>
 <$keyboard key="((cancel-edit-tiddler))" actions=<<cancel-delete-tiddler-actions "cancel">> tag="div">
 <$keyboard key="((save-tiddler))" actions=<<save-tiddler-actions>> tag="div">
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/EditTemplate]!has[draft.of]]" variable="listItem">

package/core/ui/EditorToolbar/editor-height.tid

@@ -7,6 +7,7 @@ description: {{$:/language/Buttons/EditorHeight/Hint}}
 condition: [<targetTiddler>type[]] [<targetTiddler>get[type]prefix[text/]] [<targetTiddler>get[type]match[application/javascript]] [<targetTiddler>get[type]match[application/json]] [<targetTiddler>get[type]match[application/x-tiddler-dictionary]] [<targetTiddler>get[type]match[image/svg+xml]] +[first[]]
 dropdown: $:/core/ui/EditorToolbar/editor-height-dropdown
 
+\whitespace trim
 <$reveal tag="span" state="$:/config/TextEditor/EditorHeight/Mode" type="match" text="fixed">
 {{$:/core/images/fixed-height}}
 </$reveal>