Merge branch 'master' into colour-improvements

core/language/en-GB/Misc.multids

@@ -1,5 +1,6 @@
 title: $:/language/
 
+Alerts: Alerts
 AboveStory/ClassicPlugin/Warning: It looks like you are trying to load a plugin designed for ~TiddlyWiki Classic. Please note that [[these plugins do not work with TiddlyWiki version 5.x.x|https://tiddlywiki.com/#TiddlyWikiClassic]]. ~TiddlyWiki Classic plugins detected:
 BinaryWarning/Prompt: This tiddler contains binary data
 ClassicWarning/Hint: This tiddler is written in TiddlyWiki Classic wiki text format, which is not fully compatible with TiddlyWiki version 5. See https://tiddlywiki.com/static/Upgrading.html for more details.

core/modules/parsers/imageparser.js

@@ -11,17 +11,16 @@ The image parser parses an image into an embeddable HTML element
 
 var ImageParser = function(type,text,options) {
 	var element = {
-			type: "element",
-			tag: "img",
-			attributes: {}
-		};
+		type: "image",
+		attributes: {}
+	};
 	if(options._canonical_uri) {
-		element.attributes.src = {type: "string", value: options._canonical_uri};
+		element.attributes.source = {type: "string", value: options._canonical_uri};
 	} else if(text) {
 		if(type === "image/svg+xml" || type === ".svg") {
-			element.attributes.src = {type: "string", value: "data:image/svg+xml," + encodeURIComponent(text)};
+			element.attributes.source = {type: "string", value: "data:image/svg+xml," + encodeURIComponent(text)};
 		} else {
-			element.attributes.src = {type: "string", value: "data:" + type + ";base64," + text};
+			element.attributes.source = {type: "string", value: "data:" + type + ";base64," + text};
 		}
 	}
 	this.tree = [element];

core/ui/PageTemplate/alerts.tid

@@ -1,7 +1,7 @@
 title: $:/core/ui/PageTemplate/alerts
 tags: $:/tags/PageTemplate
 
-<div class="tc-alerts" role="region" aria-label="Alerts">
+<div class="tc-alerts" role="region" aria-label={{$:/language/Alerts}}>
 
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/Alert]!is[draft]]" template="$:/core/ui/AlertTemplate" storyview="pop"/>
 

core/ui/ViewTemplate/title.tid

@@ -11,9 +11,13 @@ tags: $:/tags/ViewTemplate
 				storyview="pop"
 				variable="listItem"
 			>
-				<$set name="tv-config-toolbar-class" filter="[<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]]">
-					<$transclude tiddler=<<listItem>>/>
-				</$set>
+				<$let condition={{{ [<listItem>get[condition]] }}}>
+					<%if [<condition>!is[blank]] :and[<currentTiddler>subfilter<condition>limit[1]] :else[<condition>is[blank]then[true]] %>
+						<$set name="tv-config-toolbar-class" filter="[<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]]">
+							<$transclude tiddler=<<listItem>>/>
+						</$set>
+					<%endif%>
+				</$let>
 			</$list>
 		</span>
 		<$set name="tv-wikilinks" value={{$:/config/Tiddlers/TitleLinks}}>

core/wiki/macros/list.tid

@@ -92,7 +92,7 @@ tags: $:/tags/Macro
 </$set>
 \end
 
-\define list-tagged-draggable(tag,subFilter,emptyMessage,itemTemplate,elementTag:"div",storyview:"",displayField:"")
+\define list-tagged-draggable(tag,subFilter,emptyMessage,itemTemplate,elementTag:"div",storyview:"",displayField:"caption")
 \whitespace trim
 <span class="tc-tagged-draggable-list">
 	<$set name="tag" value=<<__tag__>>>

editions/tw5.com/tiddlers/macros/tag-pill_Macro.tid

@@ -1,6 +1,6 @@
 caption: tag-pill
 created: 20161128190930538
-modified: 20161128191220364
+modified: 20260114112210310
 tags: Macros [[Core Macros]]
 title: tag-pill Macro
 type: text/vnd.tiddlywiki
@@ -9,13 +9,18 @@ The <<.def tag-pill>> [[macro|Macros]] generates a static tag pill showing a spe
 
 !! Parameters
 
-;tag
+; tag
 : The title of the tag
-;element-tag
-: The element name to be used for the pill (defaults to "span")
-;element-attributes
-: Additional attributes for the pill element
-;actions
-: Action widgets to be triggered when the pill is clicked. Within the text, the macro parameter ''tag'' contains the title of the selected tag.
+
+; element-tag
+: The element name to be used for the pill (defaults to HTML element SPAN).
+:  If an ''actions'' parameter is used the element-tag needs to be set to `$button`
+
+; element-attributes
+: Additional attributes for the element specified in ''element-tag'' 
+
+; actions
+:  If an actions parameter should be activated, the ''element-tag'' parameter needs to be set to `$button`.
+: Action widgets to be triggered when the pill is clicked. Within the text, the macro parameter ''tag'' contains the title of the selected tag
 
 <<.macro-examples "tag-pill">>

editions/tw5.com/tiddlers/releasenotes/5.4.0/#9466.tid

@@ -0,0 +1,15 @@
+title: $:/changenotes/5.4.0/#9466
+description: ViewToolbar buttons now support condition field
+tags: $:/tags/ChangeNote
+release: 5.4.0
+change-type: feature
+change-category: hackability
+github-links: https://github.com/TiddlyWiki/TiddlyWiki5/pull/9466
+github-contributors: linonetwo
+
+ViewToolbar buttons can now be conditionally displayed based on the currentTiddler using a `condition` field. Similar to how `$:/tags/Exporter` and `$:/tags/EditorTools` already have. An example would be:
+
+```tid
+tags: $:/tags/ViewToolbar
+condition: [<currentTiddler>type[text/x-markdown]] [<currentTiddler>type[text/markdown]]
+```

editions/tw5.com/tiddlers/releasenotes/5.4.0/#9570.tid

@@ -0,0 +1,10 @@
+title: $:/changenotes/5.4.0/#9570
+description: Fix images loaded from _canonical_uri tiddlers not having progress classes assigned
+release: 5.4.0
+tags: $:/tags/ChangeNote
+change-type: bugfix
+change-category: internal
+github-links: https://github.com/TiddlyWiki/TiddlyWiki5/pull/9570
+github-contributors: jermolene
+
+Fixes issue whereby transcluding a _canonical_uri tiddler with a missing image did not assign the progress classes `tc-image-loading`, `tc-image-loaded` and `tc-image-error`.

editions/tw5.com/tiddlers/releasenotes/5.4.0/improve-alert-a11y.tid

@@ -0,0 +1,10 @@
+title: $:/changenotes/5.4.0/#9248
+description: Improve alert accessibility
+release: 5.4.0
+tags: $:/tags/ChangeNote
+change-type: enhancement
+change-category: usability
+github-links: https://github.com/TiddlyWiki/TiddlyWiki5/pull/9248 https://github.com/TiddlyWiki/TiddlyWiki5/pull/9575
+github-contributors: Leilei332
+
+

editions/tw5.com/tiddlers/tag-pill Macro (Examples).tid

@@ -1,5 +1,5 @@
 created: 20230803034230294
-modified: 20230803043848449
+modified: 20260114112240512
 tags: [[Macro Examples]] [[tag-pill Macro]]
 title: tag-pill Macro (Examples)
 
@@ -12,3 +12,9 @@ This example displays the [[Definitions]] tag as an unclickable, but still-style
 <$transclude $variable=".example" n="2" eg="""<<tag-pill Definitions element-tag:"big" element-attributes:"inert">>"""/>
 
 
+<$transclude $variable=".example" n="3" eg="""\procedure tag-actions()
+<$action-confirm $message="test"/>
+\end
+
+<$transclude $variable="tag-pill" tag="asdf" element-tag="$button" actions=<<tag-actions>>/>
+""">>