Merge branch 'tiddlywiki-com'

bin/build-site.sh

@@ -105,6 +105,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 fi
 
 # /index.html			Main site
+# /external-(version).html External core version of main site
 # /favicon.ico			Favicon for main site
 # /static.html			Static rendering of default tiddlers
 # /alltiddlers.html		Static rendering of all tiddlers
@@ -117,7 +118,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 	--version \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
-	--build favicon static index \
+	--build favicon static index external-js \
 	|| exit 1
 
 # /empty.html					Empty
@@ -155,7 +156,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/tour \
 	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all tour.html text/plain \
+	--rendertiddler $:/core/save/all-external-js tour.html text/plain \
 	|| exit 1
 
 # /share.html				Custom edition for sharing via the URL
@@ -194,7 +195,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 	./editions/xlsx-utils \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/editions/xlsx-utils/ \
-	--build index \
+	--build external \
 	|| exit 1
 
 # /editions/resumebuilder/index.html	Resume builder edition
@@ -210,7 +211,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 	./editions/text-slicer \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/editions/text-slicer/ \
-	--build index \
+	--build external \
 	|| exit 1
 
 # /editions/translators/index.html	Translators edition
@@ -242,7 +243,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 	./editions/tw5.com-docs \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT/editions/tw5.com-docs/ \
-	--build index \
+	--build external \
 	|| exit 1
 
 # /editions/twitter-archivist/index.html	Twitter Archivist edition
@@ -265,7 +266,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 	./editions/innerwikidemo \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all plugins/tiddlywiki/innerwiki/index.html text/plain \
+	--rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/innerwiki/index.html text/plain \
 	|| exit 1
 
 # /plugins/tiddlywiki/dynaview/index.html	Demo wiki with DynaView plugin
@@ -275,7 +276,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 	./editions/dynaviewdemo \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all plugins/tiddlywiki/dynaview/index.html text/plain \
+	--rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/dynaview/index.html text/plain \
 	--rendertiddler $:/core/save/empty plugins/tiddlywiki/dynaview/empty.html text/plain \
 	|| exit 1
 
@@ -289,7 +290,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 	./editions/katexdemo \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all plugins/tiddlywiki/katex/index.html text/plain \
+	--rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/katex/index.html text/plain \
 	--rendertiddler $:/core/save/empty plugins/tiddlywiki/katex/empty.html text/plain \
 	|| exit 1
 
@@ -319,7 +320,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 	./editions/codemirrordemo \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all plugins/tiddlywiki/codemirror/index.html text/plain \
+	--rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/codemirror/index.html text/plain \
 	--rendertiddler $:/core/save/empty plugins/tiddlywiki/codemirror/empty.html text/plain \
 	|| exit 1
 
@@ -329,7 +330,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 	./editions/markdowndemo \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all plugins/tiddlywiki/markdown/index.html text/plain \
+	--rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/markdown/index.html text/plain \
 	--rendertiddler $:/core/save/empty plugins/tiddlywiki/markdown/empty.html text/plain \
 	|| exit 1
 
@@ -339,7 +340,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 	./editions/classicparserdemo \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all plugins/tiddlywiki/tw2parser/index.html text/plain \
+	--rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/tw2parser/index.html text/plain \
 	--rendertiddler $:/core/save/empty plugins/tiddlywiki/tw2parser/empty.html text/plain \
 	|| exit 1
 
@@ -349,7 +350,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 	./editions/highlightdemo \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all plugins/tiddlywiki/highlight/index.html text/plain \
+	--rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/highlight/index.html text/plain \
 	--rendertiddler $:/core/save/empty plugins/tiddlywiki/highlight/empty.html text/plain \
 	|| exit 1
 
@@ -359,7 +360,7 @@ node $TW5_BUILD_TIDDLYWIKI \
 	./editions/geospatialdemo \
 	--load $TW5_BUILD_OUTPUT/build.tid \
 	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all plugins/tiddlywiki/geospatial/index.html text/plain \
+	--rendertiddler $:/core/save/all-external-js plugins/tiddlywiki/geospatial/index.html text/plain \
 	--rendertiddler $:/core/save/empty plugins/tiddlywiki/geospatial/empty.html text/plain \
 	|| exit 1
 

editions/classicparserdemo/tiddlers/$__coreURL.tid

@@ -0,0 +1,4 @@
+title: $:/coreURL
+tags: $:/tags/Global
+
+\function coreURL() [[../../../tiddlywikicore-$(version)$.js]substitute[]]

editions/classicparserdemo/tiddlywiki.info

@@ -11,6 +11,9 @@
 	],
 	"build": {
 		"index": [
-			"--rendertiddler","$:/core/save/all","classicparserdemo.html","text/plain"]
+			"--rendertiddler","$:/core/save/all","classicparserdemo.html","text/plain"],
+		"external": [
+			"--render","$:/core/save/all-external-js","classicparserdemo.html","text/plain"
+		]
 	}
 }

editions/codemirrordemo/tiddlers/$__coreURL.tid

@@ -0,0 +1,4 @@
+title: $:/coreURL
+tags: $:/tags/Global
+
+\function coreURL() [[../../../tiddlywikicore-$(version)$.js]substitute[]]

editions/codemirrordemo/tiddlywiki.info

@@ -22,6 +22,9 @@
 	],
 	"build": {
 		"index": [
-			"--rendertiddler","$:/core/save/all","codemirrordemo.html","text/plain"]
+			"--rendertiddler","$:/core/save/all","codemirrordemo.html","text/plain"],
+		"external": [
+			"--render","$:/core/save/all-external-js","codemirrordemo.html","text/plain"
+		]
 	}
 }

editions/dynaviewdemo/tiddlers/$__coreURL.tid

@@ -0,0 +1,4 @@
+title: $:/coreURL
+tags: $:/tags/Global
+
+\function coreURL() [[../../../tiddlywikicore-$(version)$.js]substitute[]]

editions/dynaviewdemo/tiddlywiki.info

@@ -9,6 +9,9 @@
 	],
 	"build": {
 		"index": [
-			"--rendertiddler","$:/core/save/all","index.html","text/plain"]
+			"--rendertiddler","$:/core/save/all","index.html","text/plain"],
+		"external": [
+			"--render","$:/core/save/all-external-js","index.html","text/plain"
+		]
 	}
 }

editions/geospatialdemo/tiddlers/$__coreURL.tid

@@ -0,0 +1,4 @@
+title: $:/coreURL
+tags: $:/tags/Global
+
+\function coreURL() [[../../../tiddlywikicore-$(version)$.js]substitute[]]

editions/geospatialdemo/tiddlywiki.info

@@ -15,6 +15,9 @@
 	"build": {
 		"index": [
 			"--render","$:/core/save/all","index.html","text/plain"],
+		"external": [
+			"--render","$:/core/save/all-external-js","index.html","text/plain"
+		],
 		"favicon": [],
 		"static": [],
 		"empty": [],

editions/highlightdemo/tiddlers/$__coreURL.tid

@@ -0,0 +1,4 @@
+title: $:/coreURL
+tags: $:/tags/Global
+
+\function coreURL() [[../../../tiddlywikicore-$(version)$.js]substitute[]]

editions/highlightdemo/tiddlywiki.info

@@ -16,6 +16,9 @@
 			"--render","$:/core/templates/static.template.html","static.html","text/plain",
 			"--render","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
 			"--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain","$:/core/templates/static.tiddler.html",
-			"--render","$:/core/templates/static.template.css","static/static.css","text/plain"]
+			"--render","$:/core/templates/static.template.css","static/static.css","text/plain"],
+		"external": [
+			"--render","$:/core/save/all-external-js","highlightdemo.html","text/plain"
+		]
 	}
 }

editions/innerwikidemo/tiddlers/system/$__coreURL.tid

@@ -0,0 +1,4 @@
+title: $:/coreURL
+tags: $:/tags/Global
+
+\function coreURL() [[../../../tiddlywikicore-$(version)$.js]substitute[]]

editions/innerwikidemo/tiddlywiki.info

@@ -19,6 +19,9 @@
 			"--screenshot",
 			"[[$:/plugins/tiddlywiki/innerwiki/examples]]",
 			"4"
+		],
+		"external": [
+			"--render","$:/core/save/all-external-js","index.html","text/plain"
 		]
 	}
 }

editions/katexdemo/tiddlers/$__coreURL.tid

@@ -0,0 +1,4 @@
+title: $:/coreURL
+tags: $:/tags/Global
+
+\function coreURL() [[../../../tiddlywikicore-$(version)$.js]substitute[]]

editions/katexdemo/tiddlywiki.info

@@ -16,6 +16,9 @@
 			"--render","$:/core/templates/static.template.html","static.html","text/plain",
 			"--render","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
 			"--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain","$:/core/templates/static.tiddler.html",
-			"--render","$:/core/templates/static.template.css","static/static.css","text/plain"]
+			"--render","$:/core/templates/static.template.css","static/static.css","text/plain"],
+		"external": [
+			"--render","$:/core/save/all-external-js","katexdemo.html","text/plain"
+		]
 	}
 }

editions/markdowndemo/tiddlers/$__coreURL.tid

@@ -0,0 +1,4 @@
+title: $:/coreURL
+tags: $:/tags/Global
+
+\function coreURL() [[../../../tiddlywikicore-$(version)$.js]substitute[]]

editions/markdowndemo/tiddlywiki.info

@@ -13,6 +13,9 @@
 	],
 	"build": {
 		"index": [
-			"--rendertiddler","$:/core/save/all","markdowndemo.html","text/plain"]
+			"--rendertiddler","$:/core/save/all","markdowndemo.html","text/plain"],
+		"external": [
+			"--render","$:/core/save/all-external-js","markdowndemo.html","text/plain"
+		]
 	}
 }

editions/text-slicer/tiddlers/system/$__coreURL.tid

@@ -0,0 +1,4 @@
+title: $:/coreURL
+tags: $:/tags/Global
+
+\function coreURL() [[../../tiddlywikicore-$(version)$.js]substitute[]]

editions/text-slicer/tiddlywiki.info

@@ -13,6 +13,9 @@
 	"build": {
 		"index": [
 			"--rendertiddler","$:/core/save/all","index.html","text/plain"
+		],
+		"external": [
+			"--render","$:/core/save/all-external-js","index.html","text/plain"
 		]
 	}
 }

editions/tour/tiddlers/System/$__coreURL.tid

@@ -0,0 +1,4 @@
+title: $:/coreURL
+tags: $:/tags/Global
+
+\function coreURL() [[tiddlywikicore-$(version)$.js]substitute[]]

editions/tw5.com-docs/tiddlers/$__coreURL.tid

@@ -0,0 +1,4 @@
+title: $:/coreURL
+tags: $:/tags/Global
+
+\function coreURL() [[../../tiddlywikicore-$(version)$.js]substitute[]]

editions/tw5.com-docs/tiddlywiki.info

@@ -10,6 +10,9 @@
 	],
 	"build": {
 		"index": [
-			"--render","$:/core/save/all","index.html","text/plain"]
+			"--render","$:/core/save/all","index.html","text/plain"],
+		"external": [
+			"--render","$:/core/save/all-external-js","index.html","text/plain"
+		]
 	}
 }

editions/tw5.com/tiddlers/HTML Tags.tid

@@ -0,0 +1,11 @@
+created: 20250211092107689
+modified: 20250211092307574
+tags: Definitions
+title: HTML Tags
+type: text/vnd.tiddlywiki
+
+<<<
+In HTML, a tag is used for creating an element.
+
+The name of an HTML element is the name that appears at the beginning of the element's start tag and at the end of the element's end tag (if the element has an end tag). For example, the p in the `<p>` start tag and `</p>` end tag is the name of the HTML paragraph element. Note that an element name in an end tag is preceded by a slash character: `</p>`, and that for void elements, the end tag is neither required nor allowed.
+<<< https://developer.mozilla.org/en-US/docs/Glossary/Tag

editions/tw5.com/tiddlers/filters/Filter Operators.tid

@@ -1,6 +1,6 @@
 breadcrumbs: [[Filter Step]]
 created: 20140410103123179
-modified: 20230410114132501
+modified: 20250302200615061
 tags: Filters
 title: Filter Operators
 type: text/vnd.tiddlywiki
@@ -21,7 +21,7 @@ type: text/vnd.tiddlywiki
 
 A <<.def "filter operator">> is a predefined keyword attached to an individual step of a [[filter|Filters]]. It defines the particular action of that step.
 
-''Important:'' In general, each first [[filter step|Filter Step]] of a [[filter run|Filter Run]] not given any input titles receives the output of <$link to="all Operator">[all[tiddlers]]</$link> as its input.
+<<.tip """In general, each first [[filter step|Filter Step]] of a [[filter run|Filter Run]] not given any input titles receives the output of <$link to="all Operator">''[all[tiddlers]]''</$link> as its input.""" title:"Important">>
 
 
 ''Table legend:''

editions/tw5.com/tiddlers/plugins/Dynaview Plugin.tid

@@ -1,6 +1,6 @@
 created: 20180111122953142
 modified: 20181113084151268
-tags: OfficialPlugins
+tags: OfficialPlugins [[Plugin Editions]]
 title: Dynaview Plugin
 type: text/vnd.tiddlywiki
 

editions/tw5.com/tiddlers/plugins/Geospatial Plugin.tid

@@ -0,0 +1,17 @@
+created: 20250302053159467
+modified: 20250302053316068
+tags: OfficialPlugins [[Plugin Editions]]
+title: Geospatial Plugin
+type: text/vnd.tiddlywiki
+
+The Geospatial Plugin adds new primitives to the TiddlyWiki platform to enable non-developers to build sophisticated interactive geospatial applications.
+
+It incorporates a number of third party libraries and online services:
+
+* [[Leaflet.js|https://leafletjs.com/]], an open source library to display interactive maps
+* [[Turf.js|https://turfjs.org/]], an open source library to perform geospatial calculations with [[GeoJSON|https://en.wikipedia.org/wiki/GeoJSON]] objects
+* [[TravelTime|https://traveltime.com/]], a commercial API for [[geocoding|https://traveltime.com/features/geocoding]], [[routing|https://traveltime.com/features/multi-modal-routing]] and [[isochrones|https://traveltime.com/features/isochrones]]
+* [[Flickr|https://www.flickr.com/services/api/]], a free API for retrieving geotagged photographs
+* [[OpenLocationCode|https://github.com/google/open-location-code]], Google's open source library for converting to and from Open Location Codes (also known as [[PlusCodes|https://maps.google.com/pluscodes/]])
+
+Try it out at https://tiddlywiki.com/plugins/tiddlywiki/geospatial/

editions/tw5.com/tiddlers/plugins/Innerwiki Plugin.tid

@@ -1,6 +1,6 @@
 created: 20190127104143725
 modified: 20190127104143725
-tags: OfficialPlugins
+tags: OfficialPlugins [[Plugin Editions]]
 title: Innerwiki Plugin
 type: text/vnd.tiddlywiki
 

editions/tw5.com/tiddlers/plugins/Share Plugin.tid

@@ -1,6 +1,6 @@
 created: 20201228143125000
-modified: 20201228143125000
+modified: 20250302051857380
-tags: OfficialPlugins
+tags: OfficialPlugins [[Plugin Editions]]
 title: Share Plugin
 type: text/vnd.tiddlywiki
 
@@ -10,3 +10,5 @@ This experimental plugin provides tools to share tiddlers via URLs, comprising:
 
 * The ability to load a group of tiddlers from the browser location hash at startup
 * Wizard and templates to create URLs from group of tiddlers
+
+See the demo at [ext[https://tiddlywiki.com/share|share]]

editions/tw5.com/tiddlers/plugins/Tour Plugin.tid

@@ -0,0 +1,9 @@
+created: 20250302052635425
+modified: 20250302052905312
+tags: OfficialPlugins [[Plugin Editions]]
+title: Tour Plugin
+type: text/vnd.tiddlywiki
+
+The tour plugin allows interactive learning tours to be created and presented in TiddlyWiki.
+
+The demo TiddlyWiki interactive tour can be seen at https://tiddlywiki.com/tour

editions/tw5.com/tiddlers/pragmas/Pragma_ _define.tid

@@ -48,6 +48,6 @@ $caption$
 <<special-button>>
 """>>
 
-<<.warning """If macros are nested, textual substitution will only occur for the outermost macro. Thi is because by the time the inner macros are processed all the substitutions will have already occurred""">>
+<<.warning """If macros are nested, textual substitution will only occur for the outermost macro. This is because by the time the inner macros are processed all the substitutions will have already occurred""">>
 
 A more formal [[presentation|Macro Definition Syntax]] of this syntax is also available.

editions/tw5.com/tiddlers/roadmap/multiwikiserver/MultiWikiServer.tid

@@ -14,13 +14,8 @@ Planned features include:
 * Instantaneous synchronisation of changes between the server and all connected clients
 * Workflow processing on the server, for example to automatically compress images, or to archive webpages
 
-MWS does require basic knowledge of the command line and Node.js but is designed to be as simple as possible to setup and use. Once downloaded, just two commands are needed to complete the installation and start the server:
+MWS does require basic knowledge of the command line and Node.js but is designed to be as simple as possible to setup and use. A few simple commands are all that is needed to complete the installation and start the server.
 
-```
+MWS is currently under development at ~GitHub but it is already functional and usable:
-npm install
-npm start
-```
 
-MWS is currently [[under development at GitHub|https://github.com/TiddlyWiki/TiddlyWiki5/pull/7915]] but it is already functional and usable. Visit the MWS website for more information:
+https://github.com/TiddlyWiki/MultiWikiServer/
-
-! https://mws.tiddlywiki.com/

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

@@ -1,6 +1,6 @@
 caption: action-setfield
 created: 20141025120850184
-modified: 20150806171403798
+modified: 20250322010115457
 tags: Widgets ActionWidgets
 title: ActionSetFieldWidget
 type: text/vnd.tiddlywiki
@@ -66,3 +66,10 @@ src='<$button>
 <$action-navigate $to="$:/ControlPanel"/>
 Go to Control Panel "Appearance" tab
 </$button>'/>
+
+Here is an example of a button that will update the value of an existing field in a tiddler
+<$macrocall $name='wikitext-example-without-html'
+src='<$button>
+<$action-setfield $tiddler="Test" existing_field_name="new field value"/>
+Update Field existing_field_name in tiddler Test
+</$button>'/>

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

@@ -1,7 +1,7 @@
 caption: reveal
 created: 20131024141900000
 jeremy: tiddlywiki
-modified: 20240721175716320
+modified: 20250211091937860
 tags: Widgets
 title: RevealWidget
 type: text/vnd.tiddlywiki
@@ -28,7 +28,7 @@ The content of the `<$reveal>` widget is displayed according to the rules given
 |stateTitle |A title containing the state, ''without'' TextReference. Gets preferred over the <<.attr state>> attribute |
 |stateField |A ''field name'' which is used to look for the state, if the attribute <<.attr stateTitle>> is present |
 |stateIndex |An ''index'' which is used to look for the state, if the attribute <<.attr stateTitle>> is present |
-|tag |Overrides the default HTML element tag (`<div>` in block mode or `<span>` in inline mode) |
+|tag |Overrides the default [[HTML Tags]] (`<div>` in block mode or `<span>` in inline mode) |
 |type |The type of matching performed: ''match'', ''nomatch'', ''popup'', ''lt'', ''gt'', ''lteq'' or ''gteq'' |
 |text |The text to match when the type is ''match'', ''nomatch'', ''lt'', ''gt'', ''lteq'' or ''gteq'' |
 |class |An optional CSS class name to be assigned to the HTML element<br/>&raquo; Set to `tc-popup-keep` to make a popup "sticky", so it won't close when you click inside of it|

editions/xlsx-utils/tiddlers/$__coreURL.tid

@@ -0,0 +1,4 @@
+title: $:/coreURL
+tags: $:/tags/Global
+
+\function coreURL() [[../../tiddlywikicore-$(version)$.js]substitute[]]

editions/xlsx-utils/tiddlywiki.info

@@ -12,6 +12,9 @@
 	],
 	"build": {
 		"index": [
-			"--rendertiddler","$:/core/save/all","index.html","text/plain"]
+			"--rendertiddler","$:/core/save/all","index.html","text/plain"],
+		"external": [
+			"--render","$:/core/save/all-external-js","index.html","text/plain"
+		]
 	}
 }

licenses/cla-individual.md

@@ -609,3 +609,6 @@ J. Ryan Stinnett, @jryans, 2025/01/04
 Galen Huntington, @galenhuntington, 2025/01/19
 
 @Rhys-T, 2025/01/23
+
+@Rumman157, 2025/03/17
+@bob.jansen@cultconv.com, 2025/03/22