Merge branch 'master' into multi-wiki-support

core/modules/widgets/data.js

@@ -91,7 +91,9 @@ DataWidget.prototype.computeDataTiddlerValues = function() {
 			var titles = this.wiki.filterTiddlers(filter);
 			$tw.utils.each(titles,function(title) {
 				var tiddler = self.wiki.getTiddler(title);
+				if(tiddler) {
 					tiddlers.push(tiddler);
+				}
 			});
 		}
 	}

core/palettes/GruvBoxDark.tid

@@ -82,6 +82,10 @@ sidebar-tab-foreground: <<colour tab-foreground>>
 sidebar-tiddler-link-foreground-hover: #458588
 sidebar-tiddler-link-foreground: #98971a
 site-title-foreground: <<colour tiddler-title-foreground>>
+stability-deprecated: #cc241d
+stability-experimental: #d79921
+stability-legacy: #458588
+stability-stable: #98971a
 static-alert-foreground: #B48EAD
 tab-background-selected: #ebdbb2
 tab-background: #665c54

core/palettes/Nord.tid

@@ -82,6 +82,10 @@ sidebar-tab-foreground: <<colour tab-foreground>>
 sidebar-tiddler-link-foreground-hover: #A3BE8C
 sidebar-tiddler-link-foreground: #81A1C1
 site-title-foreground: <<colour tiddler-title-foreground>>
+stability-deprecated: #bf616a
+stability-experimental: #d08770
+stability-legacy: #88c0d0
+stability-stable: #a3be8c
 static-alert-foreground: #B48EAD
 tab-background-selected: #ECEFF4
 tab-background: #4C566A

core/palettes/SolarizedDark.tid

@@ -18,7 +18,7 @@ button-foreground: #93a1a1
 code-background: #073642
 code-border: #586e75
 code-foreground: #93a1a1
-dirty-indicator: inherit
+dirty-indicator: #dc322f
 download-background: #859900
 download-foreground: #073642
 dragger-background: #073642
@@ -72,6 +72,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
 static-alert-foreground: #93a1a1
 tab-background: #073642
 tab-background-selected: #002b36

core/palettes/SolarizedLight.tid

@@ -18,7 +18,7 @@ button-foreground: #586e75
 code-background: #eee8d5
 code-border: #93a1a1
 code-foreground: #586e75
-dirty-indicator: inherit
+dirty-indicator: #dc322f
 download-background: #859900
 download-foreground: #eee8d5
 dragger-background: #eee8d5
@@ -72,6 +72,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
 static-alert-foreground: #586e75
 tab-background: #eee8d5
 tab-background-selected: #fdf6e3

core/wiki/macros/CSS.tid

@@ -1,18 +1,17 @@
 title: $:/core/macros/CSS
 tags: $:/tags/Macro $:/tags/Global
 
-\procedure colour(name)
+<!-- Needs to stay that way for backwards compatibility. See GH issue: #8326 -->
+\define colour(name)
 \whitespace trim
-<$transclude $tiddler={{$:/palette}} $index=`$(name)$`>
+<$transclude tiddler={{$:/palette}} index="$name$">
-	<$transclude $tiddler="$:/palettes/Vanilla" $index=`$(name)$`>
+	<$transclude tiddler="$:/palettes/Vanilla" index="$name$">
-		<$transclude $tiddler=`$:/config/DefaultColourMappings/$(name)$`/>
+		<$transclude tiddler="$:/config/DefaultColourMappings/$name$"/>
 	</$transclude>
 </$transclude>
 \end
 
-\procedure color(name)
+\define color(name) <<colour $name$>>
-<$macrocall $name=colour name=`$(name)$`/>
-\end
 
 \function box-shadow(shadow)
 [[ -webkit-box-shadow: $(shadow)$;

core/wiki/macros/tag-picker.tid

@@ -1,5 +1,5 @@
 title: $:/core/macros/tag-picker
-tags: tags: $:/tags/Macro $:/tags/Global
+tags: $:/tags/Macro $:/tags/Global
 first-search-filter: [subfilter<tagListFilter>!is[system]search:title<userInput>sort[]]
 second-search-filter: [subfilter<tagListFilter>is[system]search:title<userInput>sort[]]
 
@@ -154,8 +154,10 @@ 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[]]
 
-<!-- keep those variables because they may "blead" into macros using old syntax -->
+<!-- keep those variables because they may "bleed" into macros using old syntax -->
 <$let
 	palette={{$:/palette}}
 	colourA={{{ [<palette>getindex[foreground]] }}}
@@ -164,7 +166,7 @@ The second ESC tries to close the "draft tiddler"
 
 	saveTiddler={{{ [<tiddler>is[blank]then<currentTiddler>else<tiddler>] }}}
 
-	newTagNameTiddler={{{ [[$:/temp/NewTagName]] [<tagField>!match[tags]] +[join[/]] [<qualify>] +[join[]] }}}
+	newTagNameTiddler={{{ [[newTagNameTiddler]is[variable]then<newTagNameTiddler>] :else[<_tf.makeTagNameTiddler>] }}}
 	storeTitle={{{ [[$:/temp/NewTagName/input]] [<tagField>!match[tags]] +[join[/]] [<qualify>] +[join[]] }}}
 
 	newTagNameSelectionTiddlerQualified=<<qualify "$:/temp/NewTagName/selected-item">>

editions/prerelease/tiddlers/Release 5.3.5.tid

@@ -8,57 +8,37 @@ description: Under development
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.3.4...master]]//
 
-! Major Improvements
+<<.banner-credits
+	credit:"""Congratulations to [[duarte.framos|https://talk.tiddlywiki.org/u/duarte.framos]] for their winning design for the banner for this release (here is the [[competition thread|https://talk.tiddlywiki.org/t/banner-image-competition-for-v5-3-4/9940]]).
+"""
+	url:"https://raw.githubusercontent.com/Jermolene/TiddlyWiki5/a9b6de8c35f0789a27a36218e8422bb11066f115/editions/tw5.com/tiddlers/images/New%20Release%20Banner.png"
+>>
 
-! Translation improvements
+This is a bug fix release to address a number of bugs that were introduced with [[Release 5.3.4]].
 
-This release also includes improvements to the following translations:
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/8327">> backwards compatibility issues with [[colour Macro]] as a procedure
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/8322">> typo extra "tags: "
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/8332">> adding fields without clicking the "add" button
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/8317">> stability badges colors in the Gruvbox, Nord and Solarized palettes
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/8333">> crash with DataWidget if `$filter` attribute specifies a missing tiddler
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/6554b5c9f4f6888f0c25c833b775c3a74ea15531">> reapplies [[#8246 Link to correct plugin instructions for Node.js|https://github.com/Jermolene/TiddlyWiki5/pull/8246]] which had accidentally been reverted
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/d2c2ada33ccd3d73d39d8c0461f327e4dee68234">> tour display in "zoomin" storyview
 
-* 
+! Acknowledgements for v5.3.5
-
-! Plugin Improvements
-
-* 
-
-! Widget Improvements
-
-* 
-
-! Filter Improvements
-
-* 
-
-! Usability Improvements
-
-* 
-
-! Hackability Improvements
-
-* 
-
-! Bug Fixes
-
-* 
-
-! Node.js Improvements
-
-*
-
-! Performance Improvements
-
-* 
-
-! Developer Improvements
-
-* 
-
-! Infrastructure Improvements
-
-* 
-
-! Acknowledgements
 
 [[@Jermolene|https://github.com/Jermolene]] would like to thank the contributors to this release who have generously given their time to help improve TiddlyWiki:
 
 <<.contributors """
+Leilei332
+oeyoews
+pmario
+springerspandrel
 """>>
+
+---
+
+! Release Note for v5.3.4
+
+Since v5.3.5 replaces v5.3.4 after only a couple of weeks, here is the release note for v5.3.4.
+
+{{Release 5.3.4}}

editions/tw5.com/tiddlers/about/Archive.tid

@@ -1,14 +1,14 @@
-title: TiddlyWiki Archive
 created: 20231005205623086
-modified: 20231005210538879
+modified: 20240628132622052
 tags: About
+title: TiddlyWiki Archive
 
 \procedure versions()
 5.1.0 5.1.1 5.1.2 5.1.3 5.1.4 5.1.5 5.1.6 5.1.7 5.1.8 5.1.9
 5.1.10 5.1.11 5.1.12 5.1.13 5.1.14 5.1.15 5.1.16 5.1.17 5.1.18 5.1.19
 5.1.20 5.1.21 5.1.22 5.1.23
 5.2.0 5.2.1 5.2.2 5.2.3 5.2.4 5.2.5 5.2.6 5.2.7
-5.3.0 5.3.1 5.3.2 5.3.3
+5.3.0 5.3.1 5.3.2 5.3.3 5.3.4
 \end
 
 Older versions of TiddlyWiki are available in the [[archive|https://github.com/Jermolene/jermolene.github.io/tree/master/archive]]:

editions/tw5.com/tiddlers/currentTab Variable.tid

@@ -0,0 +1,12 @@
+caption: currentTab
+created: 20240627195924480
+modified: 20240627201655746
+tags: Variables [[Core Variables]]
+title: currentTab Variable
+type: text/vnd.tiddlywiki
+
+The <<.def currentTab>> [[variable|Variables]] contains the title of the current tab within an enclosing set of tabs generated by the [[tabs Macro]].
+
+When a tiddler is [[transcluded|Transclusion]] within a tab, any use of the [[currentTiddler Variable]] will point to the tiddler containing the [[tabs Macro]] call. This may lead to surprises if the transcluded tiddler was originally written to display by itself in the [[Story River]] in ways that rely on self-reference. The currentTab macro enables a similar effect to currentTiddler for the special case of a tiddler rendered as a tab.
+
+Compare <<.vlink currentTiddler>>.

editions/tw5.com/tiddlers/features/AutoSave.tid

@@ -4,7 +4,7 @@ tags: Features
 title: AutoSave
 type: text/vnd.tiddlywiki
 
-If there is a SaverModule available that supports it, TiddlyWiki will automatically trigger a save of the current document on clicking <<.icon $:/core/images/done-button>> ''ok'' or <<.icon $:/core/images/delete-button>> ''delete'' when editing a tiddler.
+If there is a SavingMechanism available that supports it, TiddlyWiki will automatically trigger a save of the current document on clicking <<.icon $:/core/images/done-button>> ''ok'' or <<.icon $:/core/images/delete-button>> ''delete'' when editing a tiddler.
 
 You should see a yellow notification at the top right of the window to confirm that an automatic save has taken place.
 

editions/tw5.com/tiddlers/fields/_canonical_uriField.tid

@@ -0,0 +1,5 @@
+created: 20240627223618060
+modified: 20240627223637576
+title: $:/language/Docs/Fields/_canonical_uri
+
+The full URI of an external image, audio, or html file

editions/tw5.com/tiddlers/filters/syntax/Named Filter Run Prefix.tid

@@ -4,7 +4,7 @@ tags: [[Filter Run Prefix]]
 title: Named Filter Run Prefix
 type: text/vnd.tiddlywiki
 
-In <<.from-version "5.1.23">> the named filter run prefixes where implemented. `:cascade`, `:map` and `:sort` have been added later as shown in the diagrams.
+In <<.from-version "5.1.23">> the named filter run prefixes were implemented. `:cascade`, `:map` and `:sort` have been added later as shown in the diagrams.
 
 A named filter run prefix can precede any [[run|Filter Run]] of a [[filter expression|Filter Expression]] in place of a [[shortcut run prefix|Shortcut Filter Run Prefix]].
 

editions/tw5.com/tiddlers/macros/TabsMacro.tid

@@ -1,6 +1,6 @@
 caption: tabs
 created: 20131228162203521
-modified: 20210721122823354
+modified: 20240627201724476
 tags: Macros [[Core Macros]]
 title: tabs Macro
 type: text/vnd.tiddlywiki
@@ -34,7 +34,7 @@ By default the tabs are arranged horizontally above the content. To get vertical
 
 Within the template, the title of the selected tab is available in the <<.var currentTab>> variable.
 
-The <<.vlink currentTiddler>> variable is not affected by the <<.var tabs>> macro. This can put you in trouble if the list of tabs includes tiddlers that depend on the value of the <<.vlink currentTiddler>>, for example tiddlers listing children based on its own name. To overcome this problem you can use a [[TemplateTiddler|TemplateTiddlers]] like the following:
+The <<.vlink currentTiddler>> variable is not affected by the <<.var tabs>> macro. This can put you in trouble if the list of tabs includes tiddlers that depend on the value of the <<.vlink currentTiddler>>, for example tiddlers listing children based on its own name. To overcome this problem you can make use of the <<.vlink currentTab>> variable, which can be used in a [[TemplateTiddler|TemplateTiddlers]] such as the following:
 
 ```
 <$tiddler tiddler=<<currentTab>>>

editions/tw5.com/tiddlers/releasenotes/Release 5.3.4.tid

@@ -1,11 +1,11 @@
 caption: 5.3.4
 created: 20240627165458407
-modified: 20240627165458407
+description: Testcase Widget, Tour Plugin, Geospatial Plugin, transcludes- backtranscludes operators, ... 
+modified: 20240628132840367
 released: 20240627165458407
 tags: ReleaseNotes
 title: Release 5.3.4
 type: text/vnd.tiddlywiki
-description: Under development
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.3.3...v5.3.4]]//
 

editions/tw5.com/tiddlers/widgets/EditTextWidget.tid

@@ -1,7 +1,9 @@
 caption: edit-text
 created: 20131024141900000
-modified: 20230122210049893
+heading: 
+modified: 20240627184331133
 tags: Widgets
+temp: 
 title: EditTextWidget
 type: text/vnd.tiddlywiki
 
@@ -66,3 +68,18 @@ Provide a dated heading for this example where only the placeholder (but not the
 <$macrocall $name=".example" n="3"
 eg="""<$edit-text tiddler=<<currentTiddler>> field="heading" size="25" focus="yes" focusSelectFromEnd="13" default={{{ [[Heading Text (]] [<now YYYY-0MM-0DD>] [[)]] +[join[]] }}} />
 """/>
+
+!!! Input Actions, with class attribute
+
+<$macrocall $name=".example" n="4"
+eg="""\procedure onInput()
+  <%if [get[temp]match[$:/]] %>
+		<$action-confirm $message="Yes, this is how system tiddler names begin!"/>
+  <% endif %>
+\end
+
+Type a new tiddler name, starting with the system prefix `$:/`: <$edit-text inputActions=<<onInput>> field="temp" class="tc-edit-texteditor"/>
+
+"""/>
+
+

editions/tw5.com/tiddlers/widgets/EditWidget.tid

@@ -1,6 +1,6 @@
 caption: edit
 created: 20131024141900000
-modified: 20211009121634055
+modified: 20240627220419761
 tags: Widgets TriggeringWidgets
 title: EditWidget
 type: text/vnd.tiddlywiki
@@ -24,3 +24,16 @@ The content of the `<$edit>` widget is ignored.
 |inputActions |<<.from-version 5.1.23>> Optional actions that are triggered every time an input event occurs within the input field or textarea |
 |refreshTitle |<<.from-version 5.1.23>> An optional tiddler title that makes the input field update whenever the specified tiddler changes |
 
+! Examples
+
+!! Edit the contents (text field) of a tiddler titled <%if [<now YYYY-0MM-0DD>is[tiddler]] %> <$tiddler tiddler=<<now YYYY-0MM-0DD>> > <$link/></$tiddler> <%else %> with today’s date <% endif %>
+
+<$macrocall $name=".example" n="1"
+eg="""<$edit tiddler=<<now YYYY-0MM-0DD>> class="tc-edit-texteditor"/>
+"""/>
+
+!! Edit $:/status/UserName with single-line input box, have browser offer autocomplete for email
+
+<$macrocall $name=".example" n="2"
+eg="""<$edit-text tiddler="$:/status/UserName" tag="input" size=40 autocomplete="email"/>
+"""/>

editions/tw5.com/tiddlers/wikitext/Lists in WikiText.tid

@@ -48,7 +48,7 @@ Here's an example the other way around, with numbers as the first level:
 You can also assign a CSS class to an individual member of a list with this notation:
 
 <<wikitext-example src:"* List One
-*.MyClass List Two
+*.tc-muted List Two
 * List Three
 ">>
 

licenses/cla-individual.md

@@ -573,3 +573,7 @@ Anders Jarmund, @andjar, 2024/04/05
 Fokzo Kat, @CyberFoxar, 2024/05/20
 
 Andrei Rybak, @rybak, 2024/06/09
+
+@Leilei332, 2024/06/28
+
+@springerspandrel, 2024/06/27

plugins/tiddlywiki/tiddlyweb/configOfficialPluginLibrary.tid

@@ -4,4 +4,4 @@ url: https://tiddlywiki.com/library/v5.1.23/index.html
 caption: {{$:/language/OfficialPluginLibrary}}
 enabled: no
 
-The official plugin library is disabled when using the client-server configuration. Instead, plugins should be installed via the `tiddlywiki.info` file, as described [[here|https://tiddlywiki.com/#Installing%20a%20plugin%20from%20the%20plugin%20library]].
+The official plugin library is disabled when using the client-server configuration. Instead, plugins should be installed via the `tiddlywiki.info` file, as described [[here|https://tiddlywiki.com/#Installing%20official%20plugins%20on%20Node.js]].

plugins/tiddlywiki/tour/styles.tid

@@ -149,6 +149,7 @@ tags: $:/tags/Stylesheet
 }
 
 .tc-tour-panel .tc-tour-panel-inner .tc-tiddler-frame {
+	position: static;
 	width: auto;
 	padding: 1.5em 2.5em;
 }