tiddlywiki 5.3.5 → 5.3.7

package/core/palettes/Rocker.tid

@@ -11,7 +11,7 @@ alert-highlight: #881122
 alert-muted-foreground: #b99e2f
 background: #ffffff
 blockquote-bar: <<colour muted-foreground>>
-button-background:
+button-background: #adadad
 button-foreground:
 button-border:
 code-background: #f7f7f9
@@ -33,6 +33,7 @@ external-link-background: inherit
 external-link-foreground-hover: inherit
 external-link-foreground-visited: #0000aa
 external-link-foreground: #0000ee
+footnote-target-background: #ecf2ff
 foreground: #333333
 highlight-background: #ffff00
 highlight-foreground: #000000
@@ -46,36 +47,41 @@ modal-footer-background: #f5f5f5
 modal-footer-border: #dddddd
 modal-header-border: #eeeeee
 muted-foreground: #999999
+network-activity-foreground: <<colour primary>>
 notification-background: #ffffdd
 notification-border: #999999
 page-background: #000
 pre-background: #f5f5f5
 pre-border: #cccccc
 primary: #cc0000
-select-tag-background:
-select-tag-foreground:
+select-tag-background: <<colour foreground>>
+select-tag-foreground: <<colour foreground>>
 sidebar-button-foreground: <<colour foreground>>
-sidebar-controls-foreground-hover: #000000
-sidebar-controls-foreground: #ffffff
+sidebar-controls-foreground-hover: #797979
+sidebar-controls-foreground: #cacaca
 sidebar-foreground-shadow: rgba(255,255,255, 0.0)
 sidebar-foreground: #acacac
 sidebar-muted-foreground-hover: #444444
 sidebar-muted-foreground: #c0c0c0
-sidebar-tab-background-selected: #000
+sidebar-tab-background-selected: #000000
 sidebar-tab-background: <<colour tab-background>>
-sidebar-tab-border-selected: <<colour tab-border-selected>>
+sidebar-tab-border-selected: #7c7c7c
 sidebar-tab-border: <<colour tab-border>>
 sidebar-tab-divider: <<colour tab-divider>>
-sidebar-tab-foreground-selected: 
+sidebar-tab-foreground-selected: #ff0909
 sidebar-tab-foreground: <<colour tab-foreground>>
 sidebar-tiddler-link-foreground-hover: #ffbb99
 sidebar-tiddler-link-foreground: #cc0000
 site-title-foreground: <<colour tiddler-title-foreground>>
+stability-deprecated: #ff0000
+stability-experimental: #c07c00
+stability-legacy: #0000ff
+stability-stable: #008000
 static-alert-foreground: #aaaaaa
 tab-background-selected: #ffffff
 tab-background: #d8d8d8
 tab-border-selected: #d8d8d8
-tab-border: #cccccc
+tab-border: #bbbbbb
 tab-divider: #d8d8d8
 tab-foreground-selected: <<colour tab-foreground>>
 tab-foreground: #666666
@@ -84,6 +90,7 @@ table-footer-background: #a8a8a8
 table-header-background: #f0f0f0
 tag-background: #ffbb99
 tag-foreground: #000
+testcase-accent-level-1: #9e9eff
 tiddler-background: <<colour background>>
 tiddler-border: <<colour background>>
 tiddler-controls-foreground-hover: #888888
@@ -111,4 +118,4 @@ toolbar-delete-button:
 toolbar-cancel-button:
 toolbar-done-button:
 untagged-background: #999999
-very-muted-foreground: #888888
+very-muted-foreground: #888888

package/core/palettes/SolarFlare.tid

@@ -5,24 +5,24 @@ description: Warm, relaxing earth colours
 tags: $:/tags/Palette
 type: application/x-tiddler-dictionary
 
-: Background Tones
+# Background Tones
 
 base03: #002b36
 base02: #073642
 
-: Content Tones
+# Content Tones
 
 base01: #586e75
 base00: #657b83
 base0: #839496
 base1: #93a1a1
 
-: Background Tones
+# Background Tones
 
 base2: #eee8d5
 base3: #fdf6e3
 
-: Accent Colors
+# Accent Colors
 
 yellow: #b58900
 orange: #cb4b16
@@ -33,7 +33,7 @@ blue: #268bd2
 cyan: #2aa198
 green: #859900
 
-: Additional Tones (RA)
+# Additional Tones (RA)
 
 base10: #c0c4bb
 violet-muted: #7c81b0
@@ -45,9 +45,9 @@ red-hot: #ff2222
 blue-hot: #2298ee
 green-hot: #98ee22
 
-: Palette
+# Palette
 
-: Do not use colour macro for background and foreground
+# Do not use colour macro for background and foreground
 background: #fdf6e3
     download-foreground: <<colour background>>
     dragger-foreground: <<colour background>>
@@ -68,24 +68,28 @@ foreground: #657b83
     sidebar-button-foreground: <<colour foreground>>
     sidebar-controls-foreground: <<colour foreground>>
     sidebar-foreground: <<colour foreground>>
-: base03
-: base02
-: base01
+# base03
+# base02
+# base01
     alert-muted-foreground: <<colour base01>>
-: base00
+# base00
     code-foreground: <<colour base00>>
     message-foreground: <<colour base00>>
     tag-foreground: <<colour base00>>
-: base0
+# base0
     sidebar-tiddler-link-foreground: <<colour base0>>
-: base1
+# base1
     muted-foreground: <<colour base1>>
         blockquote-bar: <<colour muted-foreground>>
         dropdown-border: <<colour muted-foreground>>
         sidebar-muted-foreground: <<colour muted-foreground>>
         tiddler-title-foreground: <<colour muted-foreground>>
             site-title-foreground: <<colour tiddler-title-foreground>>
-: base2
+# base2
+    stability-deprecated: <<colour red>>
+    stability-experimental: <<colour yellow>>
+    stability-legacy: <<colour blue-hot>>
+    stability-stable: <<colour green>>
     modal-footer-background: <<colour base2>>
     page-background: <<colour base2>>
         modal-backdrop: <<colour page-background>>
@@ -99,45 +103,54 @@ foreground: #657b83
     tag-background: <<colour base2>>
     tiddler-editor-background: <<colour base2>>
     tiddler-info-background: <<colour base2>>
-    tiddler-info-tab-background: <<colour base2>>
+    tiddler-info-tab-background: <<colour tiddler-info-border>>
     tab-background: <<colour base2>>
-        dropdown-tab-background: <<colour tab-background>>
-: base3
+dropdown-tab-background: <<colour tab-background>>
+# base3
     alert-background: <<colour base3>>
     message-background: <<colour base3>>
-: yellow
-: orange
-: red
-: magenta
+# yellow
+# orange
+# red
+# magenta
     alert-highlight: <<colour magenta>>
-: violet
+# violet
     external-link-foreground: <<colour violet>>
-: blue
-: cyan
-: green
-: base10
+
+# blue
+# cyan
+# green
+# base10
     tiddler-controls-foreground: <<colour base10>>
-: violet-muted
+# violet-muted
     external-link-foreground-visited: <<colour violet-muted>>
-: blue-muted
+# blue-muted
     primary: <<colour blue-muted>>
-        download-background: <<colour primary>>
+        download-background: #5bb83d
         tiddler-link-foreground: <<colour primary>>
-
 alert-border: #b99e2f
+diff-delete-background: <<colour red>>
+diff-delete-foreground: <<colour background>>
+diff-equal-background: inherit
+diff-equal-foreground: inherit
+diff-insert-background: <<colour green>>
+diff-insert-foreground: <<colour background>>
+diff-invisible-background: <<colour yellow>>
+diff-invisible-foreground: <<colour background>>
 dirty-indicator: #ff0000
-dropzone-background: rgba(0,200,0,0.7)
+dropzone-background: #008800
 external-link-background-hover: inherit
 external-link-background-visited: inherit
 external-link-background: inherit
 external-link-foreground-hover: inherit
+footnote-target-background: #ded8c5
 highlight-background: #ffff00
 highlight-foreground: #000000
 message-border: #cfd6e6
 modal-border: #999999
 select-tag-background:
 select-tag-foreground:
-sidebar-controls-foreground-hover:
+sidebar-controls-foreground-hover: #000000
 sidebar-muted-foreground-hover:
 sidebar-tab-background: #ded8c5
 sidebar-tiddler-link-foreground-hover:
@@ -153,6 +166,7 @@ tab-divider: #d8d8d8
     sidebar-tab-divider: <<colour tab-divider>>
 table-border: #dddddd
 table-footer-background: #a8a8a8
+testcase-accent-level-1: #bec8cc
 tiddler-controls-foreground-hover: #888888
 tiddler-controls-foreground-selected: #444444
 tiddler-editor-border-image: #ffffff
@@ -172,3 +186,4 @@ toolbar-cancel-button:
 toolbar-done-button:
 untagged-background: #999999
 very-muted-foreground: #888888
+network-activity-foreground: <<colour primary>>

package/core/palettes/SolarizedDark.tid

@@ -18,6 +18,14 @@ button-foreground: #93a1a1
 code-background: #073642
 code-border: #586e75
 code-foreground: #93a1a1
+diff-delete-background: #dc322f
+diff-delete-foreground: #eee8d5
+diff-equal-background: inherit
+diff-equal-foreground: inherit
+diff-insert-background: #859900
+diff-insert-foreground: #073642
+diff-invisible-background: #b58900
+diff-invisible-foreground: #eee8d5
 dirty-indicator: #dc322f
 download-background: #859900
 download-foreground: #073642
@@ -32,8 +40,9 @@ external-link-background: inherit
 external-link-background-hover: inherit
 external-link-background-visited: inherit
 external-link-foreground: #268bd2
-external-link-foreground-hover:
+external-link-foreground-hover: #1d669c
 external-link-foreground-visited: #268bd2
+footnote-target-background: #073642
 foreground: #839496
 highlight-background: #ffff78
 highlight-foreground: #000000
@@ -47,6 +56,7 @@ modal-footer-background: #073642
 modal-footer-border: #586e75
 modal-header-border: #586e75
 muted-foreground: #93a1a1
+network-activity-foreground: <<colour primary>>
 notification-background: #002b36
 notification-border: #586e75
 page-background: #073642
@@ -72,10 +82,10 @@ sidebar-tab-foreground-selected: #93a1a1
 sidebar-tiddler-link-foreground: #2aa198
 sidebar-tiddler-link-foreground-hover: #eee8d5
 site-title-foreground: #d33682
-stability-deprecated: #dc322f
-stability-experimental: #b58900
-stability-legacy: #268bd2
-stability-stable: #859900
+stability-deprecated: #aa1a9f
+stability-experimental: #806000
+stability-legacy: #1d669c
+stability-stable: #00df11
 static-alert-foreground: #93a1a1
 tab-background: #073642
 tab-background-selected: #002b36
@@ -89,6 +99,7 @@ table-footer-background: #073642
 table-header-background: #073642
 tag-background: #b58900
 tag-foreground: #002b36
+testcase-accent-level-1: #073642
 tiddler-background: #002b36
 tiddler-border: #586e75
 tiddler-controls-foreground: inherit
@@ -116,4 +127,4 @@ toolbar-new-button: #839496
 toolbar-options-button: #839496
 toolbar-save-button: inherit
 untagged-background: #586e75
-very-muted-foreground: #586e75
+very-muted-foreground: #586e75

package/core/palettes/SolarizedLight.tid

@@ -18,8 +18,16 @@ button-foreground: #586e75
 code-background: #eee8d5
 code-border: #93a1a1
 code-foreground: #586e75
+diff-delete-background: #dc322f
+diff-delete-foreground: #eee8d5
+diff-equal-background: inherit
+diff-equal-foreground: inherit
+diff-insert-background: #859900
+diff-insert-foreground: #eee8d5
+diff-invisible-background: #b58900
+diff-invisible-foreground: #eee8d5
 dirty-indicator: #dc322f
-download-background: #859900
+download-background: #00910b
 download-foreground: #eee8d5
 dragger-background: #eee8d5
 dragger-foreground: #657b83
@@ -34,6 +42,7 @@ external-link-background-visited: inherit
 external-link-foreground: #268bd2
 external-link-foreground-hover: inherit
 external-link-foreground-visited: #268bd2
+footnote-target-background: #eee8d5
 foreground: #657b83
 highlight-background: #ffff00
 highlight-foreground: #000000
@@ -47,6 +56,7 @@ modal-footer-background: #eee8d5
 modal-footer-border: #93a1a1
 modal-header-border: #93a1a1
 muted-foreground: #586e75
+network-activity-foreground: <<colour primary>>
 notification-background: #fdf6e3
 notification-border: #93a1a1
 page-background: #eee8d5
@@ -72,10 +82,10 @@ sidebar-tab-foreground-selected: #586e75
 sidebar-tiddler-link-foreground: #2aa198
 sidebar-tiddler-link-foreground-hover: #002b36
 site-title-foreground: #d33682
-stability-deprecated: #dc322f
-stability-experimental: #b58900
-stability-legacy: #268bd2
-stability-stable: #859900
+stability-deprecated: #d21a1a
+stability-experimental: #771e00
+stability-legacy: #227abb
+stability-stable: #576400
 static-alert-foreground: #586e75
 tab-background: #eee8d5
 tab-background-selected: #fdf6e3
@@ -89,6 +99,7 @@ table-footer-background: #eee8d5
 table-header-background: #eee8d5
 tag-background: #b58900
 tag-foreground: #fdf6e3
+testcase-accent-level-1: #afc2db
 tiddler-background: #fdf6e3
 tiddler-border: #93a1a1
 tiddler-controls-foreground: inherit

package/core/palettes/SpartanDay.tid

@@ -33,6 +33,7 @@ external-link-background: transparent
 external-link-foreground-hover: 
 external-link-foreground-visited: 
 external-link-foreground: 
+footnote-target-background: #ececec
 foreground: rgba(0, 0, 0, 0.87)
 highlight-background: #ffff00
 highlight-foreground: #000000

package/core/palettes/SpartanNight.tid

@@ -33,6 +33,7 @@ external-link-background: transparent
 external-link-foreground-hover: 
 external-link-foreground-visited: #7c318c
 external-link-foreground: #9e3eb3
+footnote-target-background: #494949
 foreground: rgba(255, 255, 255, 0.7)
 highlight-background: #ffff78
 highlight-foreground: #000000

package/core/palettes/Twilight.tid

@@ -19,13 +19,13 @@ code-background: rgba(0,0,0,0.03)
 code-border: rgba(0,0,0,0.08)
 code-foreground: rgb(255, 94, 94)
 diff-delete-background: #ffc9c9
-diff-delete-foreground: <<colour foreground>>
+diff-delete-foreground: <<colour background>>
 diff-equal-background: 
 diff-equal-foreground: <<colour foreground>>
 diff-insert-background: #aaefad
-diff-insert-foreground: <<colour foreground>>
-diff-invisible-background: 
-diff-invisible-foreground: <<colour muted-foreground>>
+diff-insert-foreground: <<colour background>>
+diff-invisible-background: #fdfcbd
+diff-invisible-foreground: <<colour background>>
 dirty-indicator: rgb(255, 94, 94)
 download-background: #19a974
 download-foreground: rgb(38, 38, 38)
@@ -42,6 +42,7 @@ external-link-background-visited: inherit
 external-link-foreground: rgb(179, 179, 255)
 external-link-foreground-hover: inherit
 external-link-foreground-visited: rgb(153, 153, 255)
+footnote-target-background: <<colour tag-foreground>>
 foreground: rgb(179, 179, 179)
 highlight-background: #ffff78
 highlight-foreground: #000000
@@ -93,6 +94,7 @@ table-footer-background: rgba(0,0,0,.4)
 table-header-background: rgba(0,0,0,.1)
 tag-background: rgb(255, 201, 102)
 tag-foreground: rgb(25, 25, 25)
+testcase-accent-level-1: rgb(13, 52, 99)
 tiddler-background: rgb(38, 38, 38)
 tiddler-border: rgba(240, 196, 117, 0.7)
 tiddler-controls-foreground: rgb(128, 128, 128)

package/core/palettes/Vanilla.tid

@@ -32,7 +32,7 @@ dragger-background: <<colour foreground>>
 dragger-foreground: <<colour background>>
 dropdown-background: <<colour background>>
 dropdown-border: <<colour muted-foreground>>
-dropdown-tab-background-selected: #fff
+dropdown-tab-background-selected: #ffffff
 dropdown-tab-background: #ececec
 dropzone-background: rgba(0,200,0,0.7)
 external-link-background-hover: inherit
@@ -41,6 +41,7 @@ external-link-background: inherit
 external-link-foreground-hover: inherit
 external-link-foreground-visited: #0000aa
 external-link-foreground: #0000ee
+footnote-target-background: #ecf2ff
 foreground: #333333
 highlight-background: #ffff00
 highlight-foreground: #000000
@@ -53,7 +54,7 @@ modal-border: #999999
 modal-footer-background: #f5f5f5
 modal-footer-border: #dddddd
 modal-header-border: #eeeeee
-muted-foreground: #bbb
+muted-foreground: #bbbbbb
 network-activity-foreground: #448844
 notification-background: #ffffdd
 notification-border: #999999
@@ -68,7 +69,7 @@ select-tag-foreground:
 sidebar-button-foreground: <<colour foreground>>
 sidebar-controls-foreground-hover: #000000
 sidebar-controls-foreground: #aaaaaa
-sidebar-foreground-shadow: rgba(255,255,255, 0.8)
+sidebar-foreground-shadow: #ffffff
 sidebar-foreground: #acacac
 sidebar-muted-foreground-hover: #444444
 sidebar-muted-foreground: #c0c0c0
@@ -82,7 +83,7 @@ sidebar-tab-foreground: <<colour tab-foreground>>
 sidebar-tiddler-link-foreground-hover: #444444
 sidebar-tiddler-link-foreground: #999999
 site-title-foreground: <<colour tiddler-title-foreground>>
-stability-stable: #008000
+stability-stable: #00b700
 stability-experimental: #c07c00
 stability-deprecated: #ff0000
 stability-legacy: #0000ff
@@ -97,7 +98,7 @@ tab-foreground: #666666
 table-border: #dddddd
 table-footer-background: #a8a8a8
 table-header-background: #f0f0f0
-tag-background: #ec6
+tag-background: #eecc66
 tag-foreground: #ffffff
 testcase-accent-level-1: #c1eaff
 testcase-accent-level-2: #E3B740
@@ -131,19 +132,19 @@ toolbar-done-button:
 untagged-background: #999999
 very-muted-foreground: #888888
 wikilist-background: #e5e5e5
-wikilist-item: #fff
-wikilist-info: #000
-wikilist-title: #666
+wikilist-item: #ffffff
+wikilist-info: #000000
+wikilist-title: #666666
 wikilist-title-svg: <<colour wikilist-title>>
-wikilist-url: #aaa
+wikilist-url: #aaaaaa
 wikilist-button-open: #4fb82b
-wikilist-button-open-hover: green
+wikilist-button-open-hover: #009300
 wikilist-button-reveal: #5778d8
-wikilist-button-reveal-hover: blue
+wikilist-button-reveal-hover: #0000ff
 wikilist-button-remove: #d85778
-wikilist-button-remove-hover: red
+wikilist-button-remove-hover: #ff0000
 wikilist-toolbar-background: #d3d3d3
-wikilist-toolbar-foreground: #888
-wikilist-droplink-dragover: rgba(255,192,192,0.5)
+wikilist-toolbar-foreground: #888888
+wikilist-droplink-dragover: #ffc0c0
 wikilist-button-background: #acacac
-wikilist-button-foreground: #000
+wikilist-button-foreground: #000000

package/core/templates/exporters/CsvFile.tid

@@ -2,5 +2,6 @@ title: $:/core/templates/exporters/CsvFile
 tags: $:/tags/Exporter
 description: {{$:/language/Exporters/CsvFile}}
 extension: .csv
+file-type: text/csv
 
 <$macrocall $name="csvtiddlers" filter=<<exportFilter>> format="quoted-comma-sep" $output="text/raw"/>

package/core/templates/exporters/JsonFile.tid

@@ -2,5 +2,6 @@ title: $:/core/templates/exporters/JsonFile
 tags: $:/tags/Exporter
 description: {{$:/language/Exporters/JsonFile}}
 extension: .json
+file-type: application/json
 
 <$macrocall $name="jsontiddlers" filter=<<exportFilter>> $output="text/raw"/>

package/core/templates/exporters/TidFile.tid

@@ -2,6 +2,7 @@ title: $:/core/templates/exporters/TidFile
 tags: $:/tags/Exporter
 description: {{$:/language/Exporters/TidFile}}
 extension: .tid
+file-type: text/vnd.tiddlywiki
 condition: [<count>compare:lte[1]]
 
 \define renderContent()

package/core/templates/server/static.tiddler.wikitext.tid

@@ -1,23 +1,23 @@
 title: $:/core/templates/server/static.tiddler.wikitext
 
 \whitespace trim
-<div class="tc-tiddler-title">
+<div class="tc-tiddler-title tc-clearfix">
 <div class="tc-titlebar">
 <h2><$text text=<<currentTiddler>>/></h2>
 </div>
 </div>
-<div class="tc-subtitle">
+<div class="tc-subtitle tc-clearfix">
 <$link to={{!!modifier}}>
 <$view field="modifier"/>
 </$link> <$view field="modified" format="date" template={{$:/language/Tiddler/DateFormat}}/>
 </div>
-<div class="tc-tags-wrapper">
+<div class="tc-tags-wrapper" tc-clearfix>
 <$list filter="[all[current]tags[]sort[title]]">
 <a href={{{ [<currentTiddler>encodeuricomponent[]] }}}>
 <$macrocall $name="tag-pill" tag=<<currentTiddler>>/>
 </a>
 </$list>
 </div>
-<div class="tc-tiddler-body">
+<div class="tc-tiddler-body tc-clearfix">
 <$transclude mode="block"/>
 </div>

package/core/templates/social-metadata.tid

@@ -0,0 +1,38 @@
+title: $:/core/templates/social-metadata
+tags: $:/tags/RawMarkupWikified
+
+\procedure meta-plain(name,source,name-attribute:"name")
+\whitespace trim
+<%if [<source>has[text]] %>
+	&lt;meta&#32;<$text text=<<name-attribute>>/>="<$text text=<<name>>/>" content="<$text text={{{ [<source>get[text]encodehtml[]] }}}/>"&gt;
+	<$text text={{{ [charcode[10]] }}}/>
+<%endif%>
+\end meta-plain
+
+\procedure meta-wikified(name,source,name-attribute:"name")
+\whitespace trim
+<%if [<source>has[text]] %>
+	<$wikify name="html" text={{{ [<source>get[text]] }}} output="text">
+		&lt;meta&#32;<$text text=<<name-attribute>>/>="<$text text=<<name>>/>" content="<$text text={{{ [<html>encodehtml[]] }}}/>"&gt;
+		<$text text={{{ [charcode[10]] }}}/>
+	</$wikify>
+<%endif%>
+\end meta-wikified
+
+\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline macrocallblock conditional commentinline commentblock
+<<meta-wikified "description" "$:/SiteSubtitle">>
+
+<!-- Facebook Meta Tags -->
+<<meta-plain "og:url" "$:/SiteUrl" "property">>
+<<meta-plain "og:type" "website" "property">>
+<<meta-wikified "og:title" "$:/SiteTitle" "property">>
+<<meta-wikified "og:description" "$:/SiteSubtitle" "property">>
+<<meta-plain "og:image" "$:/SitePreviewUrl" "property">>
+
+<!-- Twitter Meta Tags -->
+<<meta-plain "twitter:card" "summary_large_image">>
+<<meta-plain "twitter:domain" "$:/SiteDomain" "property">>
+<<meta-plain "twitter:url" "$:/SiteUrl" "property">>
+<<meta-wikified "twitter:title" "$:/SiteTitle">>
+<<meta-wikified "twitter:description" "$:/SiteSubtitle">>
+<<meta-plain "twitter:image" "$:/SitePreviewUrl">>

package/core/templates/tiddlywiki5.html.tid

@@ -57,3 +57,4 @@ title: $:/core/templates/tiddlywiki5.html
 `{{{ [enlist<saveTiddlerAndShadowsFilter>tag[$:/tags/RawMarkupWikified/BottomBody]] ||$:/core/templates/raw-static-tiddler}}}`
 </body>
 </html>`
+</$set>

package/core/ui/Actions/new-journal.tid

@@ -2,10 +2,10 @@ title: $:/core/ui/Actions/new-journal
 tags: $:/tags/Actions
 description: create a new journal tiddler
 
-\define get-tags() $(textFieldTags)$ $(tagsFieldTags)$
 \whitespace trim
-<$vars journalTitleTemplate={{$:/config/NewJournal/Title}} textFieldTags={{$:/config/NewJournal/Tags}} tagsFieldTags={{$:/config/NewJournal/Tags!!tags}} journalText={{$:/config/NewJournal/Text}}>
-<$wikify name="journalTitle" text="<$macrocall $name='now' format=<<journalTitleTemplate>>/>">
+\function get-tags() [<textFieldTags>] [<tagsFieldTags>] +[join[ ]]
+<$let journalTitleTemplate={{$:/config/NewJournal/Title}} textFieldTags={{$:/config/NewJournal/Tags}} tagsFieldTags={{$:/config/NewJournal/Tags!!tags}} journalText={{$:/config/NewJournal/Text}}>
+<$wikify name="journalTitle" text="<$transclude $variable='now' format=<<journalTitleTemplate>>/>">
 <$reveal type="nomatch" state=<<journalTitle>> text="">
 <$action-sendmessage $message="tm-new-tiddler" title=<<journalTitle>> tags=<<get-tags>> text={{{ [<journalTitle>get[]] }}}/>
 </$reveal>
@@ -13,4 +13,4 @@ description: create a new journal tiddler
 <$action-sendmessage $message="tm-new-tiddler" title=<<journalTitle>> tags=<<get-tags>> text=<<journalText>>/>
 </$reveal>
 </$wikify>
-</$vars>
+</$let>

package/core/ui/Actions/new-tiddler.tid

@@ -2,8 +2,8 @@ title: $:/core/ui/Actions/new-tiddler
 tags: $:/tags/Actions
 description: create a new empty tiddler
 
-\define get-tags() $(textFieldTags)$ $(tagsFieldTags)$
 \whitespace trim
-<$vars textFieldTags={{$:/config/NewTiddler/Tags}} tagsFieldTags={{$:/config/NewTiddler/Tags!!tags}}>
+\function get-tags() [<textFieldTags>] [<tagsFieldTags>] +[join[ ]]
+<$let textFieldTags={{$:/config/NewTiddler/Tags}} tagsFieldTags={{$:/config/NewTiddler/Tags!!tags}}>
 <$action-sendmessage $message="tm-new-tiddler" tags=<<get-tags>>/>
-</$vars>
+</$let>