From 45f5ba7d3867d90059738d79a346682659e72aca Mon Sep 17 00:00:00 2001 From: Maurycy Zarzycki Date: Sat, 11 Jun 2022 10:53:06 +0200 Subject: [PATCH 01/16] update Keyboard Shortcut documentation with information on how it interacts with navigate actions (#6703) --- .../tw5.com/tiddlers/concepts/KeyboardShortcutTiddler.tid | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/editions/tw5.com/tiddlers/concepts/KeyboardShortcutTiddler.tid b/editions/tw5.com/tiddlers/concepts/KeyboardShortcutTiddler.tid index aca6b30a0..7fa93e21a 100644 --- a/editions/tw5.com/tiddlers/concepts/KeyboardShortcutTiddler.tid +++ b/editions/tw5.com/tiddlers/concepts/KeyboardShortcutTiddler.tid @@ -10,3 +10,10 @@ A ''Keyboard Shortcut Tiddler'' is made of three parts: If the [[Keyboard Shortcut Descriptor]] has the form `((my-shortcut))` it's a ''reference'' to a ''configuration Tiddler'' that stores the corresponding [[Keyboard Shortcut|KeyboardShortcuts]] In order to make a ''shortcut'' editable through the <<.controlpanel-tab KeyboardShortcuts>> Tab in the $:/ControlPanel it's sufficient to create a tiddler `$:/config/ShortcutInfo/my-shortcut`, where the ''suffix'' is the ''reference'' used for the [[Keyboard Shortcut|KeyboardShortcuts]] + +!! Notes on wiki navigation + +If you want to create keyboard shortcuts for navigation, there are two things to keep in mind: + + * If your shortcut uses ''Ctrl'', you need to include `$scroll="yes"` in the [[ActionNavigateWidget's|ActionNavigateWidget]] attributes otherwise the action will be ignored. + * The actions need to be wrapped in [[NavigatorWidget]] like in this [[New Tiddler keyboard shortcut|$:/core/ui/KeyboardShortcuts/new-tiddler]]. From 27609d26190d1cbf6016c54822634dd056d4b4ed Mon Sep 17 00:00:00 2001 From: Marxsal Date: Fri, 17 Jun 2022 00:01:11 -0700 Subject: [PATCH 02/16] Add new instructions for saving with Koofr (#6726) --- editions/tw5.com/tiddlers/saving/Saving via WebDAV.tid | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/editions/tw5.com/tiddlers/saving/Saving via WebDAV.tid b/editions/tw5.com/tiddlers/saving/Saving via WebDAV.tid index 8e246e128..fe10ad98e 100644 --- a/editions/tw5.com/tiddlers/saving/Saving via WebDAV.tid +++ b/editions/tw5.com/tiddlers/saving/Saving via WebDAV.tid @@ -4,7 +4,7 @@ created: 20160216191710789 delivery: Protocol description: Standard web protocol available on products such as Sharepoint method: save -modified: 20220222190056634 +modified: 20220615155048712 tags: Android Chrome Firefox [[Internet Explorer]] Linux Mac Opera PHP Safari Saving Windows iOS Edge title: Saving via WebDAV type: text/vnd.tiddlywiki @@ -56,10 +56,12 @@ Several ~WebDAV hosting services tested (~~box.com~~, ~~swissdisk.com~~) don't s !!! Koofr -//''Koofr''// is a cloud service that emphasizes privacy. To use their webdav services, sign up for an account at `koofr.eu` . Then go to `preferences` on their web app. Then `password` from the menu on the left. Scroll down to `App Passwords`. Use some name like 'tiddlywiki' and generate a password. Despite what it says, save the password somewhere. Upload your file on some path, preferably without spaces to their site. Then in the browser link to the site with an address like: +//''Koofr''// is a cloud service that emphasizes privacy. To use their webdav services, sign up for an account at `koofr.eu` . Then go to `preferences` on their web app. Then `password` from the menu on the left. Scroll down to `App Passwords`. Use some name like 'tiddlywiki' and generate a password. Despite what it says, save the password somewhere. + +You will probably need to rename your file extension to `.aspx`. Then upload your file on some path, preferably without spaces to their site. Then in the browser link to the site with an address like: ``` -https://app.koofr.net/dav/Koofr/myfile.html +https://app.koofr.net/dav/Koofr/myfile.aspx ``` When you do, an authentication dialog will come up. Use your email address that you used to sign up and the password you just generated to login. From 10bc84ba6c8058d40b381dcdb3cdd603bb8761cf Mon Sep 17 00:00:00 2001 From: Mario Pietsch Date: Mon, 20 Jun 2022 14:51:44 +0200 Subject: [PATCH 03/16] Add Note formatting to an important paragraph in ScrollableWidget (#6729) --- editions/tw5.com/tiddlers/widgets/ScrollableWidget.tid | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/editions/tw5.com/tiddlers/widgets/ScrollableWidget.tid b/editions/tw5.com/tiddlers/widgets/ScrollableWidget.tid index da5b536c9..a0664a5da 100644 --- a/editions/tw5.com/tiddlers/widgets/ScrollableWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/ScrollableWidget.tid @@ -1,9 +1,9 @@ +caption: scrollable created: 20140324223413403 -modified: 20150427123524945 +modified: 20220620115347910 tags: Widgets title: ScrollableWidget type: text/vnd.tiddlywiki -caption: scrollable ! Introduction @@ -17,7 +17,7 @@ The content of the `<$scrollable>` widget is displayed within a pair of wrapper |class |The CSS class(es) to be applied to the outer DIV | |fallthrough |See below | -If a scrollable widget can't handle the `tm-scroll` message because the inner DIV fits within the outer DIV, then by default the message falls through to the parent widget. Setting the ''fallthrough'' attribute to `no` prevents this behaviour. +<$macrocall $name=".note" _="""If a scrollable widget can't handle the `tm-scroll` message because the inner DIV fits within the outer DIV, then by default the message falls through to the parent widget. Setting the ''fallthrough'' attribute to `no` prevents this behaviour."""/> ! Examples From 8af7054efa244a7fde991211448283c51a8a65f9 Mon Sep 17 00:00:00 2001 From: Mario Pietsch Date: Mon, 20 Jun 2022 14:55:12 +0200 Subject: [PATCH 04/16] Doc restructuring Plugin Install using core Libraries and with Node.js (#6722) * Doc restructuring Plugin Install using core Libraries and with Node.js * fixing typos and concerns raised by Jeremy --- .../tw5.com/tiddlers/concepts/TiddlyWiki5.tid | 6 +- .../tw5.com/tiddlers/definitions/Node.js.tid | 8 ++- .../tiddlers/mechanisms/PluginMechanism.tid | 2 +- .../Environment Variables on Node.js.tid | 10 ++-- .../Installing custom plugins on Node.js.tid | 30 ++++------ ...Installing official plugins on Node.js.tid | 40 +++++++++++++ .../tw5.com/tiddlers/nodejs/PluginsCS.tid | 9 +++ .../tiddlers/nodejs/TiddlyWiki on Node.js.tid | 9 ++- .../Uninstalling a plugin with Node.js.tid | 31 ++++++++++ .../nodejs/Using TiddlyWiki on Node.js.tid | 8 +-- ...lling a plugin from the plugin library.tid | 57 +++++++------------ .../plugins/Manually installing a plugin.tid | 23 ++++++-- .../tiddlers/plugins/OfficialPlugins.tid | 4 +- .../tiddlers/plugins/Plugin Ordering.tid | 47 +++++++++++++++ .../tiddlers/plugins/PluginFolders.tid | 28 ++++++++- editions/tw5.com/tiddlers/plugins/Plugins.tid | 26 ++++++--- .../plugins/Uninstalling a plugin.tid | 42 ++++++-------- .../tw5.com/tiddlers/system/doc-styles.tid | 3 +- .../tiddlers/system/wikitext-macros.tid | 41 ++++++++++++- 19 files changed, 310 insertions(+), 114 deletions(-) create mode 100644 editions/tw5.com/tiddlers/nodejs/Installing official plugins on Node.js.tid create mode 100644 editions/tw5.com/tiddlers/nodejs/PluginsCS.tid create mode 100644 editions/tw5.com/tiddlers/nodejs/Uninstalling a plugin with Node.js.tid create mode 100644 editions/tw5.com/tiddlers/plugins/Plugin Ordering.tid diff --git a/editions/tw5.com/tiddlers/concepts/TiddlyWiki5.tid b/editions/tw5.com/tiddlers/concepts/TiddlyWiki5.tid index 53b958d1a..53ebd1e81 100644 --- a/editions/tw5.com/tiddlers/concepts/TiddlyWiki5.tid +++ b/editions/tw5.com/tiddlers/concepts/TiddlyWiki5.tid @@ -1,7 +1,9 @@ -created: 201308252136 -modified: 201308252136 +created: 20130825213600000 +modified: 20220613145033713 tags: Concepts title: TiddlyWiki5 type: text/vnd.tiddlywiki ~TiddlyWiki5 is a reboot of TiddlyWiki for the next 25 years. It is a complete interactive wiki in JavaScript that can be run in the browser or on the server under [[Node.js]]. + +The ~TiddlyWiki repository can be found at GitHub. \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/definitions/Node.js.tid b/editions/tw5.com/tiddlers/definitions/Node.js.tid index f92743d30..b23fb2fc6 100644 --- a/editions/tw5.com/tiddlers/definitions/Node.js.tid +++ b/editions/tw5.com/tiddlers/definitions/Node.js.tid @@ -1,13 +1,15 @@ created: 20131129094739786 -modified: 20140211195455541 +modified: 20220612091858504 tags: Definitions title: Node.js type: text/vnd.tiddlywiki -''Node.js'' is a downloadable application for your PC, Mac or Linux computer that lets it run JavaScript applications. Unlike ~JavaScript applications running in a web browser, Node.js code has full access to the file system and other resources of the computer, enabling it to perform the roles that have traditionally been the preserve of languages like Java, PHP and Python. See http://nodejs.org for more details. +''Node.js'' is a downloadable application for your PC, Mac or Linux computer that lets it run JavaScript applications. Unlike ~JavaScript applications running in a web browser, Node.js code has full access to the file system and other resources of the computer, enabling it to perform the roles that have traditionally been the preserve of languages like Java, PHP and Python. For ~TiddlyWiki, Node.js means that we can have a single code base that can run in the browser or on the server, giving great flexibility in how it is used. For end users, Node.js is no more complicated to install than a web browser, but unlocks powerful capabilities such as the ability to run ~TiddlyWiki as a web server that you can connect to from other devices. -See [[TiddlyWiki on Node.js]] for more details. +''Node.js'' is a ''trademark'' of the ~OpenJS Foundation. See: https://nodejs.org fore more details. + +[[TiddlyWiki on Node.js]] will give an overview about the possibilities using a client-server configuration. diff --git a/editions/tw5.com/tiddlers/mechanisms/PluginMechanism.tid b/editions/tw5.com/tiddlers/mechanisms/PluginMechanism.tid index c51417887..ba5a72f15 100644 --- a/editions/tw5.com/tiddlers/mechanisms/PluginMechanism.tid +++ b/editions/tw5.com/tiddlers/mechanisms/PluginMechanism.tid @@ -1,5 +1,5 @@ created: 20130826122000000 -modified: 20190928082000464 +modified: 20220613124446953 tags: Mechanisms title: PluginMechanism type: text/vnd.tiddlywiki diff --git a/editions/tw5.com/tiddlers/nodejs/Environment Variables on Node.js.tid b/editions/tw5.com/tiddlers/nodejs/Environment Variables on Node.js.tid index 048007405..786075d4e 100644 --- a/editions/tw5.com/tiddlers/nodejs/Environment Variables on Node.js.tid +++ b/editions/tw5.com/tiddlers/nodejs/Environment Variables on Node.js.tid @@ -1,5 +1,5 @@ created: 20140617211749290 -modified: 20211104172343220 +modified: 20220613114121229 tags: [[TiddlyWiki on Node.js]] title: Environment Variables on Node.js type: text/vnd.tiddlywiki @@ -11,15 +11,15 @@ type: text/vnd.tiddlywiki * `TIDDLYWIKI_LANGUAGE_PATH` - Search path for languages * `TIDDLYWIKI_EDITION_PATH` - Search path for editions (used by the InitCommand) -''Note 1'': The delimiter may vary between operating systems. While on Windows a semicolon `;` is used, Linux implements a colon `:`. -''Note 2'': On Linux systems, it may be necessary to //''export''// the variable as well as to define it. +<$macrocall $name=".note" _="""''1.'' The delimiter may vary between operating systems. While on Windows a semicolon `;` is used, Linux implements a colon `:`.

''2.'' On Linux systems, it may be necessary to //''export''// the variable as well as to define it. +"""/> -The additional paths should each point to folders structured like the equivalent directories in the TiddlyWiki5 GitHub repository: the plugin, theme and language directories contain `publisher/pluginname/` while the edition directories contain `editionname/` +The additional paths should each point to folders structured like the equivalent directories in the ~TiddlyWiki5 GitHub repository: the plugin, theme and language directories contain `publisher/pluginname/` while the edition directories contain `editionname/` For example: ``` -TIDDLYWIKI_PLUGIN_PATH=~/MyPluginStore +export TIDDLYWIKI_PLUGIN_PATH=~/MyPluginStore tiddlywiki mywiki --build index ``` diff --git a/editions/tw5.com/tiddlers/nodejs/Installing custom plugins on Node.js.tid b/editions/tw5.com/tiddlers/nodejs/Installing custom plugins on Node.js.tid index 1f4a12177..462482e51 100644 --- a/editions/tw5.com/tiddlers/nodejs/Installing custom plugins on Node.js.tid +++ b/editions/tw5.com/tiddlers/nodejs/Installing custom plugins on Node.js.tid @@ -1,27 +1,19 @@ created: 20191022095653896 -modified: 20191102131824766 -tags: [[TiddlyWiki on Node.js]] +modified: 20220617130125173 +tags: [[TiddlyWiki on Node.js]] PluginsCS title: Installing custom plugins on Node.js type: text/vnd.tiddlywiki -There are several ways in which custom plugins that are not part of TiddlyWiki's plugin library can be installed when using TiddlyWiki under Node.js. (See [[Installing a plugin from the plugin library]] for instructions on installing plugins from the library). +\rules except wikilink -* Arrange the PluginFolders containing the plugins in a convenient shared location and then use [[environment variables|Environment Variables on Node.js]] to tell TiddlyWiki to search those folders. The plugins can be referenced in `tiddlywiki.info` by their name (e.g. `tiddlytools/magic`) -* Place the PluginFolders containing the plugins in a `plugins` folder within the [[wiki folder|TiddlyWikiFolders]]. TiddlyWiki will attempt to include every subfolder as a plugin. Do not add the plugin names to `tiddlywiki.info`. Do not add the PluginFolders under a specific namespace:
.
-├── plugins
-│   ├── relink
-│   │   ├── js
-│   │   ├── plugin.info
-│   │   └── tiddlers
-│   └── relink-markdown
-│       ├── js
-│       ├── plugin.info
-│       └── readme.tid
-├── tiddlers
-└── tiddlywiki.info
-
-* Depending on how TiddlyWiki itself has been installed, plugins can also be installed by copying the plugin folders into the `plugins` folder of the repository. This is only recommended if working with a forked copy of the repo. It is not recommended if TiddlyWiki has been installed with npm because npm is liable to overwrite the installation when performing an update +! Introduction -Note that including a plugin as an ordinary tiddler (e.g. by dragging and dropping a plugin into the browser) will result in the plugin only being active in the browser, and not available under Node.js. +There are several ways in which official plugins and custom plugins can be installed when using TiddlyWiki with a Node.js client-server configuration. +<$macrocall $name=".note" _="""For instructions on installing plugins from libraries to ''single-file'' wikis learn more at [[Plugins]]. +"""/> + +!! Plugin Load Order + +{{Plugin Ordering}} diff --git a/editions/tw5.com/tiddlers/nodejs/Installing official plugins on Node.js.tid b/editions/tw5.com/tiddlers/nodejs/Installing official plugins on Node.js.tid new file mode 100644 index 000000000..c985ea9a6 --- /dev/null +++ b/editions/tw5.com/tiddlers/nodejs/Installing official plugins on Node.js.tid @@ -0,0 +1,40 @@ +created: 20220611123344385 +modified: 20220617132351460 +tags: [[TiddlyWiki on Node.js]] PluginsCS +title: Installing official plugins on Node.js +type: text/vnd.tiddlywiki + +Follow these instructions when using TiddlyWiki with a client-server Node.js configuration: + +# Identify the plugins you want to install using the ''Plugins'' tab of <> (''don't'' install the plugins from here, though) +#* Plugins are identified by their type (ie language, theme or plugin) and their publisher and title. For example, the plugin `$:/plugins/tiddlywiki/internals` is referred to as ''tiddlywiki/internals'' + +# Quit the server if it is running + +# Edit the `tiddlywiki.info` file (it is in JSON format) and locate the `plugins`, `themes` or `languages` section (see below) + +# Add entries corresponding to the plugins you wish to add +#* Take care to retain ''commas ''to separate items +#* Do ''not'' terminate the last item in a list with a comma + +# Restart the server + +``` +{ + "plugins": [ + "tiddlywiki/codemirror" + ], + "themes": [ + "tiddlywiki/vanilla", + "tiddlywiki/snowwhite" + ], + "languages": [ + "es-ES", + "fr-FR", + "en-EN" + ] +} +``` + +<$macrocall $name=".note" _="An overview of working with plugins can be found at [[Plugins]].
Also see: [[Installing custom plugins on Node.js]]."/> + diff --git a/editions/tw5.com/tiddlers/nodejs/PluginsCS.tid b/editions/tw5.com/tiddlers/nodejs/PluginsCS.tid new file mode 100644 index 000000000..10f3f9ebc --- /dev/null +++ b/editions/tw5.com/tiddlers/nodejs/PluginsCS.tid @@ -0,0 +1,9 @@ +created: 20220612082924589 +list: [[Installing custom plugins on Node.js]] [[Installing official plugins on Node.js]] [[Uninstalling a plugin with Node.js]] +modified: 20220617124533352 +title: PluginsCS +type: text/vnd.tiddlywiki + +This tiddler is used as a tag in the [[Plugins]] tiddler to create a sorted list + +<> \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/nodejs/TiddlyWiki on Node.js.tid b/editions/tw5.com/tiddlers/nodejs/TiddlyWiki on Node.js.tid index 3175791e9..3aef005a6 100644 --- a/editions/tw5.com/tiddlers/nodejs/TiddlyWiki on Node.js.tid +++ b/editions/tw5.com/tiddlers/nodejs/TiddlyWiki on Node.js.tid @@ -1,15 +1,20 @@ created: 20131129094353704 -modified: 20200318115527226 +modified: 20220617114433107 tags: Platforms title: TiddlyWiki on Node.js type: text/vnd.tiddlywiki +\rules except wikilink + Running TiddlyWiki on [[Node.js]] brings several important benefits over and above the single file version: -* You can edit your content on any suitably compatible HTML5 browser, including smartphones and tablets * Individual tiddlers are stored in separate files, which you can organise as you wish + * The ability to build multiple wikis that blend different combinations of shared and unique content +* You can edit your content on any modern browser, including smartphones and tablets + + <<.warning """Note that TiddlyWiki on Node.js doesn't currently support directly modifying the tiddler files via the file system while it is running. The server must be restarted in order to for changes to take effect. The recommended way to interact with a running wiki is via the HTTP or JavaScript APIs.""">> For more information see: diff --git a/editions/tw5.com/tiddlers/nodejs/Uninstalling a plugin with Node.js.tid b/editions/tw5.com/tiddlers/nodejs/Uninstalling a plugin with Node.js.tid new file mode 100644 index 000000000..249e8f150 --- /dev/null +++ b/editions/tw5.com/tiddlers/nodejs/Uninstalling a plugin with Node.js.tid @@ -0,0 +1,31 @@ +created: 20220611125113040 +modified: 20220617133704286 +tags: [[TiddlyWiki on Node.js]] PluginsCS +title: Uninstalling a plugin with Node.js +type: text/vnd.tiddlywiki + +Follow these instructions when using TiddlyWiki with client-server Node.js configuration: + +# Quit the server if it is running + +# Edit the `tiddlywiki.info` file (it is in JSON format) and locate the `plugins` and `themes` section (see below) + +# Remove the entries corresponding to the plugins you wish to remove +#* Take care to retain ''commas'' to separate items +#* Do ''not'' terminate the last item in a list with a comma + +# Restart the server + +``` +{ + "plugins": [ + "tiddlywiki/codemirror" + ], + "themes": [ + "tiddlywiki/vanilla", + "tiddlywiki/snowwhite" + ] +} +``` + +<$macrocall $name=".note" _="An overview of working with plugins can be found at [[Plugins]]"/> diff --git a/editions/tw5.com/tiddlers/nodejs/Using TiddlyWiki on Node.js.tid b/editions/tw5.com/tiddlers/nodejs/Using TiddlyWiki on Node.js.tid index eff87add7..751b6389e 100644 --- a/editions/tw5.com/tiddlers/nodejs/Using TiddlyWiki on Node.js.tid +++ b/editions/tw5.com/tiddlers/nodejs/Using TiddlyWiki on Node.js.tid @@ -1,18 +1,18 @@ created: 20131219100520659 -modified: 20200523092939199 +modified: 20220613172345723 tags: [[TiddlyWiki on Node.js]] title: Using TiddlyWiki on Node.js type: text/vnd.tiddlywiki -TiddlyWiki5 includes a set of [[Commands]] for use on the command line to perform an extensive set of operations based on TiddlyWikiFolders, TiddlerFiles and TiddlyWikiFiles. +~TiddlyWiki5 includes a set of commands for use on the command line to perform an extensive set of operations based on TiddlyWikiFolders, TiddlerFiles. -For example, the following command loads the tiddlers from a TiddlyWiki HTML file and then saves one of them in static HTML: +For example, the following command loads the tiddlers from a ~TiddlyWiki HTML file and then saves one of them in static HTML: ``` tiddlywiki --verbose --load mywiki.html --rendertiddler ReadMe ./readme.html ``` -Running `tiddlywiki` from the command line boots the TiddlyWiki kernel, loads the core plugins and establishes an empty wiki store. It then sequentially processes the command line arguments from left to right. The arguments are separated with spaces. +Running `tiddlywiki` from the command line boots the ~TiddlyWiki kernel, loads the core plugins and establishes an empty wiki store. It then sequentially processes the command line arguments from left to right. The arguments are separated with spaces. <<.from-version "5.1.20">> First, there can be zero or more plugin references identified by the prefix `+` for plugin names or `++` for a path to a plugin folder. These plugins are loaded in addition to any specified in the [[TiddlyWikiFolder|TiddlyWikiFolders]]. diff --git a/editions/tw5.com/tiddlers/plugins/Installing a plugin from the plugin library.tid b/editions/tw5.com/tiddlers/plugins/Installing a plugin from the plugin library.tid index de4e89598..b7601adc3 100644 --- a/editions/tw5.com/tiddlers/plugins/Installing a plugin from the plugin library.tid +++ b/editions/tw5.com/tiddlers/plugins/Installing a plugin from the plugin library.tid @@ -1,51 +1,38 @@ created: 20160107222352710 -modified: 20191022095637710 -tags: [[TiddlyWiki on Node.js]] Plugins +modified: 20220617122143911 +tags: Plugins title: Installing a plugin from the plugin library type: text/vnd.tiddlywiki -! Standalone Configuration +\rules except wikilink -Follow these instructions when using TiddlyWiki as a standalone HTML file: +If you want to follow the steps //side by side// you can <>. + +Follow these instructions when using TiddlyWiki as a standalone, single file wiki. -# Create a backup of your current TiddlyWiki HTML file ([[just in case|The First Rule of Using TiddlyWiki]]) # Open your TiddlyWiki in a browser -# Open the [[control panel|$:/ControlPanel]] <<.icon $:/core/images/options-button>>, click on the ''Plugins'' tab and then the <<.icon $:/core/images/download-button>> ''Get more plugins'' button + +# Create a backup of your current wiki file ([[just in case|The First Rule of Using TiddlyWiki]]) + +# Open the <> + +#* Click on the ''Plugins'' tab and then the +#*<<.icon $:/core/images/download-button>> ''Get more plugins'' button + # Click <<.icon $:/core/images/chevron-right>> ''open plugin library'' to open the official plugin library + # When the library listing is loaded: ## Use the tab to select between ''plugins'', ''themes'' and ''languages'' ## Use the ''search'' box to search the plugin details + # Click the ''install'' button to install a plugin + # Save your TiddlyWiki <<.icon $:/core/images/save-button>> + # If a yellow warning bar appears at the top of the window, refresh the window so that TiddlyWiki completes installation of the plugin <<.icon $:/core/images/refresh-button>> -#* <<.from-version "5.1.22">> It is no longer necessary to refresh TiddlyWiki when deleting plugins that support dynamic loading. See PluginMechanism for more details + +#* <<.from-version "5.1.22">> It is no longer necessary to refresh TiddlyWiki when deleting plugins that support dynamic loading. See the [[PluginMechanism]] for more details + # The plugin should now be available for use -! Client-Server Configuration - -Follow these instructions when using TiddlyWiki under Node.js: - -# Identify the plugins you want to install using the ''Plugins'' tab of [[control panel|$:/ControlPanel]] (''don't'' install the plugins from here, though). Plugins are identified by their type (ie language, theme or plugin) and their publisher and title. For example, the plugin `$:/plugins/tiddlywiki/internals` is referred to as ''tiddlywiki/internals'' -# Quit the server if it is running -# Edit the `tiddlywiki.info` file (it is in JSON format) and locate the `plugins`, `themes` or `languages` section (see below) -# Add entries corresponding to the plugins you wish to add. Take care to retain commas to separate items, but do not terminate the last item in a list with a comma -# Restart the server - -``` -{ - "plugins": [ - "tiddlywiki/codemirror" - ], - "themes": [ - "tiddlywiki/vanilla", - "tiddlywiki/snowwhite" - ], - "languages": [ - "es-ES", - "fr-FR", - "en-EN" - ] -} -``` - -See also [[Installing custom plugins on Node.js]]. \ No newline at end of file +<$macrocall $name=".note" _="""If you use TiddlyWiki with ''Node.js'' have a closer look at [[Installing official plugins on Node.js]]
An overview can be found at [[Plugins]]"""/> diff --git a/editions/tw5.com/tiddlers/plugins/Manually installing a plugin.tid b/editions/tw5.com/tiddlers/plugins/Manually installing a plugin.tid index 5d58cad3a..54008a63c 100644 --- a/editions/tw5.com/tiddlers/plugins/Manually installing a plugin.tid +++ b/editions/tw5.com/tiddlers/plugins/Manually installing a plugin.tid @@ -1,14 +1,29 @@ created: 20160107222430613 -modified: 20190927205631648 +modified: 20220617115930635 tags: Plugins title: Manually installing a plugin type: text/vnd.tiddlywiki +\rules except wikilink + +If you want to follow the steps //side by side// you can <>. + # Create a backup of your current TiddlyWiki HTML file ([[just in case|The First Rule of Using TiddlyWiki]]) + # Open your TiddlyWiki in a browser -# In another browser window, find a link to the plugin, e.g. [[$:/plugins/tiddlywiki/example]]. You will typically find these links on the home page of the plugin (for example, https://tiddlywiki.com/plugins/tiddlywiki/katex/) -# Drag the link [[$:/plugins/tiddlywiki/example]] to the browser window containing your TiddlyWiki + +# In another browser window, find a link to the plugin, e.g. https://tiddlywiki.com/plugins/tiddlywiki/katex. You will typically find these links on the home page of the plugin + +# Drag the link similar to `$:/plugins/tiddlywiki/example` to the browser window containing your TiddlyWiki + +# Import the new plugin shown in the $:/Import tiddler + # Save your TiddlyWiki (<<.icon $:/core/images/save-button>>) + # If a yellow warning bar appears at the top of the window, refresh the window so that TiddlyWiki completes installation of the plugin <<.icon $:/core/images/refresh-button>> + #* <<.from-version "5.1.22">> It is no longer necessary to refresh TiddlyWiki when deleting plugins that support dynamic loading. See PluginMechanism for more details -# The plugin should now be available for use \ No newline at end of file + +# The plugin should now be available for use + +<$macrocall $name=".note" _="More information about installing a plugin form the official plugin library, can be found at [[Installing a plugin from the plugin library]]
An overview can be found at [[Plugins]]"/> diff --git a/editions/tw5.com/tiddlers/plugins/OfficialPlugins.tid b/editions/tw5.com/tiddlers/plugins/OfficialPlugins.tid index 7ba5a258e..84f7665c2 100644 --- a/editions/tw5.com/tiddlers/plugins/OfficialPlugins.tid +++ b/editions/tw5.com/tiddlers/plugins/OfficialPlugins.tid @@ -1,5 +1,5 @@ created: 20170210075109635 -modified: 20170210075709809 +modified: 20220612082350537 tags: Plugins title: OfficialPlugins type: text/vnd.tiddlywiki @@ -7,3 +7,5 @@ type: text/vnd.tiddlywiki The official TiddlyWiki plugin library contains the plugins that are part of the [[main TiddlyWiki 5 GitHub repository|Working with the TiddlyWiki5 repository]]. Install them from [[the plugin library|Installing a plugin from the plugin library]]. Plugins from the official plugin library are automatically updated as part of the [[upgrade process|UpgradeMechanism]]. <> + +<$macrocall $name=".note" _="An overview, how to handle plugins can be found at: [[Plugins]]"/> diff --git a/editions/tw5.com/tiddlers/plugins/Plugin Ordering.tid b/editions/tw5.com/tiddlers/plugins/Plugin Ordering.tid new file mode 100644 index 000000000..1cf635e9c --- /dev/null +++ b/editions/tw5.com/tiddlers/plugins/Plugin Ordering.tid @@ -0,0 +1,47 @@ +created: 20220613115453346 +modified: 20220617133125115 +tags: PluginMechanism +title: Plugin Ordering +type: text/vnd.tiddlywiki + +Using the Node.js client-server configuration plugins are activated in the following order: + +# Plugins found using the OS environment variables +#* See: [[PluginFolders]] +#* and: [[Environment Variables on Node.js]] + +# Plugins stored in the wiki `/plugin` path +#* See: [[PluginFolders]] + +# Plugins specified in the command line +#* See: [[Using TiddlyWiki on Node.js]] ... the notes about <<.from-version "5.1.20">> + +# Plugins imported by drag and drop as wiki content +#* See: [[Installing a plugin from the plugin library]] or [[Manually installing a plugin]] + +''Important:'' + +* ''Elements lower in the list take precedence'' + +*Including a plugin as an ordinary tiddler by drag and drop into the browser, will result in the plugin only being active in the browser +** It will not be available under Node.js + +Option 1: + +* Using a Node.js configuration option 1 is the most common one +* It lowers maintenence, because all plugins can be updated in one go + +Option 2: + +* Option 2 is preferred if you want to work with a fixed configuration +* Plugin updates only effect the corresponding wiki + +Option 3: + +* This option allows to ''add and start'' an edition without the need to overwrite an existing `tiddlywiki.info` file +* It allows you to start any edition as a client-server edition, even if the tiddlywiki.info file didn't specify it. + +Option 4: + +* Is the exact same mechanism used for a single-file wiki +* This mechanism should only be used in a Node.js configuration for ''testing and debugging'' purposes, since the plugins are stored in the `tiddlers/` directory diff --git a/editions/tw5.com/tiddlers/plugins/PluginFolders.tid b/editions/tw5.com/tiddlers/plugins/PluginFolders.tid index 393f1ef40..a3bc8d347 100644 --- a/editions/tw5.com/tiddlers/plugins/PluginFolders.tid +++ b/editions/tw5.com/tiddlers/plugins/PluginFolders.tid @@ -1,9 +1,35 @@ created: 20161015113519246 -modified: 20190927172743140 +modified: 20220613123551803 tags: PluginMechanism title: PluginFolders type: text/vnd.tiddlywiki +! Working with Plugin Folders + +* Arrange the [[PluginFolders]] containing the plugins in a convenient shared location + +* Use [[environment variables|Environment Variables on Node.js]] to tell TiddlyWiki to search those folders. + +*The plugins can be referenced in `tiddlywiki.info` by their name (e.g. `tiddlytools/magic`) + +* Place the PluginFolders containing the plugins in a `plugins` folder within the [[wiki folder|TiddlyWikiFolders]]. TiddlyWiki will attempt to include every subfolder as a plugin. Do not add the plugin names to `tiddlywiki.info`. Do not add the PluginFolders under a specific namespace: + +``` +├── plugins/ +│ ├── relink/ +│ │ ├── js/ +│ │ ├── tiddlers/ +│ │ └── plugin.info +│ └── relink-markdown/ +│ ├── js/ +│ ├── plugin.info +│ └── readme.tid +├── tiddlers/ +└── tiddlywiki.info +``` + +! Plugin.info File + On the server, plugins can be stored as ordinary JSON tiddlers but it is often more convenient to store them as separate tiddler files within folders. Plugin folders must contain a `plugin.info` file that contains the metadata for the plugin. It can also optionally identify files external to the plugin folder that should be loaded as tiddlers. The `plugin.info` file should contain the following JSON structure: diff --git a/editions/tw5.com/tiddlers/plugins/Plugins.tid b/editions/tw5.com/tiddlers/plugins/Plugins.tid index 2648de1fe..e51c3776f 100644 --- a/editions/tw5.com/tiddlers/plugins/Plugins.tid +++ b/editions/tw5.com/tiddlers/plugins/Plugins.tid @@ -1,18 +1,30 @@ created: 20140910215514237 -modified: 20190108000000000 +list: [[Installing a plugin from the plugin library]] [[Uninstalling a plugin]] [[Manually installing a plugin]] OfficialPlugins +modified: 20220617133819755 tags: Concepts TableOfContents title: Plugins type: text/vnd.tiddlywiki -Plugins in TiddlyWiki5 can be used to distribute optional components that customise and extend TiddlyWiki. You can install them from the [[official plugin library|Installing a plugin from the plugin library]] or from [[community sites|Resources]]. +! Introduction -{{$:/core/ui/ControlPanel/Plugins/AddPlugins}} +Plugins in TiddlyWiki5 can be used to distribute optional components that customise and extend wiki. You can install them from the official plugin library or from community sites. -Internally, plugins are a bundle of tiddlers packaged together as a single tiddler that can be installed, copied or deleted as a unit. The individual tiddlers within a plugin appear as ShadowTiddlers. See the PluginMechanism discussion for more details about how plugins are implemented internally. +Internally, plugins are a bundle of tiddlers packaged together as a single tiddler that can be installed, copied, disabled or deleted as a unit. The individual tiddlers within a plugin appear as shadow tiddlers. -Plugins can contain JavaScript modules, style sheets, and templates. Plugins can also be used to distribute ordinary text, images or any other content. +Plugins can contain ~JavaScript modules, style sheets, and templates. Plugins can also be used to distribute ordinary text, images or any other content. +! Handling Plugins with a Single File Wiki -<> +<> -<$macrocall $name=".note" _="There is a plugin called $:/core that contains the main core code of ~TiddlyWiki. It is always present, and it is the source of default [[Shadow tiddlers|ShadowTiddlers]]. You can see the details of this in the <<.button control-panel>> on the <<.controlpanel-tab Plugins>> sub-tab."> +! Handling Plugins with a Client - Server Configuration (Node.js) + +<> + +! Plugin Mechanism + +The PluginMechanism tiddler contains more details about how plugins are implemented internally. + +You can open the plugin details in the <> on the <<.controlpanel-tab Plugins>> sub-tab. + +There is a plugin called $:/core that contains the main core code of TiddlyWiki. It is always present, and it is the source of default ShadowTiddlers. \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/plugins/Uninstalling a plugin.tid b/editions/tw5.com/tiddlers/plugins/Uninstalling a plugin.tid index 81bf95739..7debc2834 100644 --- a/editions/tw5.com/tiddlers/plugins/Uninstalling a plugin.tid +++ b/editions/tw5.com/tiddlers/plugins/Uninstalling a plugin.tid @@ -1,40 +1,30 @@ created: 20160107222504269 -modified: 20190927205509760 +modified: 20220617132957241 tags: Plugins title: Uninstalling a plugin type: text/vnd.tiddlywiki -! Standalone Configuration +\rules except wikilink -Follow these instructions when using TiddlyWiki as a standalone HTML file: +If you want to follow the steps //side by side// you can <>. + + +Follow these instructions when using TiddlyWiki as a standalone, single file wiki. # Create a backup of your current TiddlyWiki HTML file ([[just in case|The First Rule of Using TiddlyWiki]]) -# Open the [[control panel|$:/ControlPanel]] and go to the ''Plugins'' tab + +# Open the <> and go to the ''Plugins'' tab + # Click on the plugin you want to delete to open it as a standalone tiddler + # Click the <<.icon $:/core/images/down-arrow>> ''more'' button and <<.icon $:/core/images/delete-button>> ''delete'' the tiddler + # Save your TiddlyWiki <<.icon $:/core/images/save-button>> + # If a yellow warning bar appears at the top of the window, refresh the window so that TiddlyWiki completely removes the plugin <<.icon $:/core/images/refresh-button>> -#* <<.from-version "5.1.22">> It is no longer necessary to refresh TiddlyWiki when deleting plugins that support dynamic loading. See PluginMechanism for more details + +#* <<.from-version "5.1.22">> It is no longer necessary to refresh TiddlyWiki when deleting plugins that support dynamic loading. See [[PluginMechanism]] for more details + # The plugin should no longer be active or available - -! Client-Server Configuration - -Follow these instructions when using TiddlyWiki under Node.js: - -# Quit the server if it is running -# Edit the `tiddlywiki.info` file (it is in JSON format) and locate the `plugins` and `themes` section (see below) -# Remove the entries corresponding to the plugins you wish to remove. Take care to retain commas to separate items, but do not terminate the last item in a list with a comma -# Restart the server - -``` -{ - "plugins": [ - "tiddlywiki/codemirror" - ], - "themes": [ - "tiddlywiki/vanilla", - "tiddlywiki/snowwhite" - ] -} -``` \ No newline at end of file +<$macrocall $name=".note" _="""If you use TiddlyWiki with node.js have a closer look at [[Uninstalling a plugin with Node.js]]
An overview of working with plugins can be found at [[Plugins]]"""/> diff --git a/editions/tw5.com/tiddlers/system/doc-styles.tid b/editions/tw5.com/tiddlers/system/doc-styles.tid index f7cd9594e..e0f2af8a4 100644 --- a/editions/tw5.com/tiddlers/system/doc-styles.tid +++ b/editions/tw5.com/tiddlers/system/doc-styles.tid @@ -1,5 +1,6 @@ +code-body: yes created: 20150117152612000 -modified: 20211230150725145 +modified: 20220617125128201 tags: $:/tags/Stylesheet title: $:/editions/tw5.com/doc-styles type: text/vnd.tiddlywiki diff --git a/editions/tw5.com/tiddlers/system/wikitext-macros.tid b/editions/tw5.com/tiddlers/system/wikitext-macros.tid index cb5f81bf1..2c10a678b 100644 --- a/editions/tw5.com/tiddlers/system/wikitext-macros.tid +++ b/editions/tw5.com/tiddlers/system/wikitext-macros.tid @@ -1,9 +1,46 @@ +code-body: yes created: 20150117184156000 -modified: 20220227210152153 +modified: 20220617122915793 tags: $:/tags/Macro title: $:/editions/tw5.com/wikitext-macros type: text/vnd.tiddlywiki +\define activatePluginTab() +<$action-setfield $tiddler="$:/state/tab-1749438307" text="$:/core/ui/ControlPanel/Plugins"/> +<$action-navigate $to="$:/ControlPanel"/> +\end + +\define activateTiddlerWindow() +<$action-sendmessage $message="tm-open-window" + $param=<> windowTitle="Side by Side View" + width="800" height="600" /> +\end + +\define controlPanel-plugin-link() +<$button actions=<> class="tc-btn-invisible tc-tiddlylink"> +{{$:/core/images/options-button}} ~ControlPanel + +\end + +\define open-tiddler-in-window() +<$button actions=<> class="tc-btn-invisible tc-tiddlylink"> +open ''this'' tiddler in a new window + +\end + +\define activateEditionWindow(url) +<$action-sendmessage $message="tm-open-external-window" + $param="""$url$""" windowName="_edition" + windowFeatures="width=800 height=600" /> +\end + +\define open-external-window(url) +<$button actions=<> class="tc-btn-invisible tc-tiddlylink"> +open the ''example edition'' in a new window + +\end + + \define wikitext-example(src)
@@ -64,5 +101,3 @@ $$$ <> \end - -
<$view field="text"/>
\ No newline at end of file From bce3ec6e6f9f5ea619dd869068dd73d700882122 Mon Sep 17 00:00:00 2001 From: Rizwan Date: Thu, 23 Jun 2022 13:18:15 +0530 Subject: [PATCH 05/16] Update Installing TiddlyWiki on Node.js.tid (#6734) --- .../nodejs/Installing TiddlyWiki on Node.js.tid | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/editions/tw5.com/tiddlers/nodejs/Installing TiddlyWiki on Node.js.tid b/editions/tw5.com/tiddlers/nodejs/Installing TiddlyWiki on Node.js.tid index fe8a58513..fcbbe7c51 100644 --- a/editions/tw5.com/tiddlers/nodejs/Installing TiddlyWiki on Node.js.tid +++ b/editions/tw5.com/tiddlers/nodejs/Installing TiddlyWiki on Node.js.tid @@ -23,9 +23,9 @@ type: text/vnd.tiddlywiki #> `npm install -g tiddlywiki` #> If it fails with an error you may need to re-run the command as an administrator: #> `sudo npm install -g tiddlywiki` (Mac/Linux) -# Check TiddlyWiki is installed by typing: +# Ensure ~TiddlyWiki is installed by typing: #> `tiddlywiki --version` -# In response, you should see TiddlyWiki report its current version (eg "<>"; you may also see other debugging information reported) +#* In response, you should see TiddlyWiki report its current version (eg "<>". You may also see other debugging information reported.) # Try it out: ## `tiddlywiki mynewwiki --init server` to create a folder for a new wiki that includes server-related components ## `tiddlywiki mynewwiki --listen` to start TiddlyWiki @@ -37,11 +37,6 @@ type: text/vnd.tiddlywiki The `-g` flag causes TiddlyWiki to be installed globally. Without it, TiddlyWiki will only be available in the directory where you installed it. -If you are using Debian or Debian-based Linux and you are receiving a `node: command not found` error though node.js package is installed, you may need to create a symbolic link between `nodejs` and `node`. Consult your distro's manual and `whereis` to correctly create a link. See github [[issue 1434|http://github.com/Jermolene/TiddlyWiki5/issues/1434]] - -Example Debian v8.0: `sudo ln -s /usr/bin/nodejs /usr/bin/node` - -You can also install prior versions like this: - -> npm install -g tiddlywiki@5.1.13 - +<<.warning "If you are using Debian or Debian-based Linux and you are receiving a `node: command not found` error though node.js package is installed, you may need to create a symbolic link between `nodejs` and `node`. Consult your distro's manual and `whereis` to correctly create a link. See github [[issue 1434|http://github.com/Jermolene/TiddlyWiki5/issues/1434]].

Example Debian v8.0: `sudo ln -s /usr/bin/nodejs /usr/bin/node`">> +
+<<.tip "You can also install prior versions like this:
npm install -g tiddlywiki@5.1.13">> From 2b45bbc4c43a4e5b5b97ce729e762fd6eaa3db8a Mon Sep 17 00:00:00 2001 From: Nolan Darilek Date: Mon, 27 Jun 2022 14:48:54 -0500 Subject: [PATCH 06/16] Sign the CLA. (#6741) --- licenses/cla-individual.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index 75cf9ecff..ba5c1a7a9 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -489,3 +489,5 @@ Guang Li, @oflg, 2022/03/12 Dam S., @damscal, 2022/03/24 Max Schillinger, @MaxGyver83, 2022/05/11 + +Nolan Darilek, @NDarilek, 2022/06/21 From f02bd2392fb40a54fe21bf64dd56aa3d53ce54d4 Mon Sep 17 00:00:00 2001 From: Nolan Darilek Date: Tue, 28 Jun 2022 08:05:52 -0500 Subject: [PATCH 07/16] Various accessibility improvements (#6742) * Add `main` and `article` roles to stories and story. * Support `role` and \aria-checked` in buttons, and integrate with sidebar tabs. * Add `region` role to sidebar, and set caption as `aria-label`. * Add accessibility roles and labels to static templates. * Update test fixtures with new ARIA tab attributes. --- core/language/en-GB/SideBar.multids | 1 + core/modules/widgets/button.js | 7 ++++++- core/templates/server/static.sidebar.wikitext.tid | 2 +- core/templates/server/static.tiddler.html.tid | 4 ++-- core/ui/PageTemplate/story.tid | 2 +- core/ui/SideBarSegments/tabs.tid | 2 +- core/ui/ViewTemplate.tid | 2 +- core/wiki/macros/tabs.tid | 2 +- .../data/tabs-macro/expected-html-tabs-horizontal-all.tid | 2 +- .../data/tabs-macro/expected-html-tabs-horizontal.tid | 2 +- .../tests/data/tabs-macro/expected-html-tabs-vertical.tid | 2 +- 11 files changed, 17 insertions(+), 11 deletions(-) diff --git a/core/language/en-GB/SideBar.multids b/core/language/en-GB/SideBar.multids index b109f3a9b..c4fda9c81 100644 --- a/core/language/en-GB/SideBar.multids +++ b/core/language/en-GB/SideBar.multids @@ -1,5 +1,6 @@ title: $:/language/SideBar/ +Caption: Sidebar All/Caption: All Contents/Caption: Contents Drafts/Caption: Drafts diff --git a/core/modules/widgets/button.js b/core/modules/widgets/button.js index 107977ac0..a32820e8b 100644 --- a/core/modules/widgets/button.js +++ b/core/modules/widgets/button.js @@ -46,7 +46,8 @@ ButtonWidget.prototype.render = function(parent,nextSibling) { isPoppedUp = (this.popup || this.popupTitle) && this.isPoppedUp(); if(this.selectedClass) { if((this.set || this.setTitle) && this.setTo && this.isSelected()) { - $tw.utils.pushTop(classes,this.selectedClass.split(" ")); + $tw.utils.pushTop(classes, this.selectedClass.split(" ")); + domNode.setAttribute("aria-checked", "true"); } if(isPoppedUp) { $tw.utils.pushTop(classes,this.selectedClass.split(" ")); @@ -66,6 +67,9 @@ ButtonWidget.prototype.render = function(parent,nextSibling) { if(this["aria-label"]) { domNode.setAttribute("aria-label",this["aria-label"]); } + if (this.role) { + domNode.setAttribute("role", this.role); + } if(this.popup || this.popupTitle) { domNode.setAttribute("aria-expanded",isPoppedUp ? "true" : "false"); } @@ -206,6 +210,7 @@ ButtonWidget.prototype.execute = function() { this.popup = this.getAttribute("popup"); this.hover = this.getAttribute("hover"); this["aria-label"] = this.getAttribute("aria-label"); + this.role = this.getAttribute("role"); this.tooltip = this.getAttribute("tooltip"); this.style = this.getAttribute("style"); this["class"] = this.getAttribute("class",""); diff --git a/core/templates/server/static.sidebar.wikitext.tid b/core/templates/server/static.sidebar.wikitext.tid index 5ac53703e..b0cf553f6 100644 --- a/core/templates/server/static.sidebar.wikitext.tid +++ b/core/templates/server/static.sidebar.wikitext.tid @@ -1,7 +1,7 @@ title: $:/core/templates/server/static.sidebar.wikitext \whitespace trim -
+

<$transclude tiddler="$:/SiteTitle"/> diff --git a/core/templates/server/static.tiddler.html.tid b/core/templates/server/static.tiddler.html.tid index 827383ba7..1a803bd86 100644 --- a/core/templates/server/static.tiddler.html.tid +++ b/core/templates/server/static.tiddler.html.tid @@ -19,8 +19,8 @@ title: $:/core/templates/server/static.tiddler.html <$transclude tiddler="$:/core/templates/server/static.sidebar.wikitext" mode="inline"/> -
-
+
+
<$transclude tiddler="$:/core/templates/server/static.tiddler.wikitext" mode="inline"/>
diff --git a/core/ui/PageTemplate/story.tid b/core/ui/PageTemplate/story.tid index 66b90778a..38e723835 100644 --- a/core/ui/PageTemplate/story.tid +++ b/core/ui/PageTemplate/story.tid @@ -2,7 +2,7 @@ title: $:/core/ui/PageTemplate/story tags: $:/tags/PageTemplate \whitespace trim -
+
diff --git a/core/ui/SideBarSegments/tabs.tid b/core/ui/SideBarSegments/tabs.tid index 3fdda7d57..af17b0166 100644 --- a/core/ui/SideBarSegments/tabs.tid +++ b/core/ui/SideBarSegments/tabs.tid @@ -1,7 +1,7 @@ title: $:/core/ui/SideBarSegments/tabs tags: $:/tags/SideBarSegment -
+
<$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/SideBar]!has[draft.of]]" default={{$:/config/DefaultSidebarTab}} state="$:/state/tab/sidebar" class="tc-sidebar-tabs-main" explicitState="$:/state/tab/sidebar--595412856"/> diff --git a/core/ui/ViewTemplate.tid b/core/ui/ViewTemplate.tid index 074c89af1..7cb8bec3c 100644 --- a/core/ui/ViewTemplate.tid +++ b/core/ui/ViewTemplate.tid @@ -7,7 +7,7 @@ $:/state/folded/$(currentTiddler)$ \define cancel-delete-tiddler-actions(message) <$action-sendmessage $message="tm-$message$-tiddler"/> \import [all[shadows+tiddlers]tag[$:/tags/Macro/View]!has[draft.of]] <$vars storyTiddler=<> tiddlerInfoState=<>> -
> data-tags={{!!tags}} class={{{ tc-tiddler-frame tc-tiddler-view-frame [is[tiddler]then[tc-tiddler-exists]] [is[missing]!is[shadow]then[tc-tiddler-missing]] [is[shadow]then[tc-tiddler-exists tc-tiddler-shadow]] [is[shadow]is[tiddler]then[tc-tiddler-overridden-shadow]] [is[system]then[tc-tiddler-system]] [{!!class}] [tags[]encodeuricomponent[]addprefix[tc-tagged-]] +[join[ ]] }}}> +
> data-tags={{!!tags}} class={{{ tc-tiddler-frame tc-tiddler-view-frame [is[tiddler]then[tc-tiddler-exists]] [is[missing]!is[shadow]then[tc-tiddler-missing]] [is[shadow]then[tc-tiddler-exists tc-tiddler-shadow]] [is[shadow]is[tiddler]then[tc-tiddler-overridden-shadow]] [is[system]then[tc-tiddler-system]] [{!!class}] [tags[]encodeuricomponent[]addprefix[tc-tagged-]] +[join[ ]] }}} role="article"> <$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewTemplate]!has[draft.of]]" variable="listItem"> <$transclude tiddler=<>/> diff --git a/core/wiki/macros/tabs.tid b/core/wiki/macros/tabs.tid index 84a24dab6..2e0c854d4 100644 --- a/core/wiki/macros/tabs.tid +++ b/core/wiki/macros/tabs.tid @@ -4,7 +4,7 @@ code-body: yes \define tabs-button() \whitespace trim -<$button set=<> setTo=<> default=<<__default__>> selectedClass="tc-tab-selected" tooltip={{!!tooltip}}> +<$button set=<> setTo=<> default=<<__default__>> selectedClass="tc-tab-selected" tooltip={{!!tooltip}} role="switch"> <$tiddler tiddler=<>> <$set name="tv-wikilinks" value="no"> <$transclude tiddler=<<__buttonTemplate__>> mode="inline"> diff --git a/editions/test/tiddlers/tests/data/tabs-macro/expected-html-tabs-horizontal-all.tid b/editions/test/tiddlers/tests/data/tabs-macro/expected-html-tabs-horizontal-all.tid index 152e2136e..61f8d4971 100644 --- a/editions/test/tiddlers/tests/data/tabs-macro/expected-html-tabs-horizontal-all.tid +++ b/editions/test/tiddlers/tests/data/tabs-macro/expected-html-tabs-horizontal-all.tid @@ -2,4 +2,4 @@ title: expected-html-tabs-horizontal-all type: text/html description: Horizontal tabs with all parameters active. This is the expected HTML output from a test in test-wikitext-tabs-macro.js -

TabTwo

Text tab 2

\ No newline at end of file +

TabTwo

Text tab 2

\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/tabs-macro/expected-html-tabs-horizontal.tid b/editions/test/tiddlers/tests/data/tabs-macro/expected-html-tabs-horizontal.tid index e7bdee0dd..0d1f2a416 100644 --- a/editions/test/tiddlers/tests/data/tabs-macro/expected-html-tabs-horizontal.tid +++ b/editions/test/tiddlers/tests/data/tabs-macro/expected-html-tabs-horizontal.tid @@ -2,4 +2,4 @@ title: expected-html-tabs-horizontal type: text/html description: Horizontal tabs test - This is the expected HTML output from a test in test-wikitext-tabs-macro.js -

Text tab 2

\ No newline at end of file +

Text tab 2

\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/tabs-macro/expected-html-tabs-vertical.tid b/editions/test/tiddlers/tests/data/tabs-macro/expected-html-tabs-vertical.tid index 940082a51..c45891073 100644 --- a/editions/test/tiddlers/tests/data/tabs-macro/expected-html-tabs-vertical.tid +++ b/editions/test/tiddlers/tests/data/tabs-macro/expected-html-tabs-vertical.tid @@ -2,4 +2,4 @@ title: expected-html-tabs-vertical type: text/html description: Vertical tabs test -- This is the expected HTML output from the test in test-wikitext-tabs-macro.js -

Text tab 2

\ No newline at end of file +

Text tab 2

\ No newline at end of file From 7ac7d26f864b4c72f7bc24c0ee2e84d12ef9c32a Mon Sep 17 00:00:00 2001 From: Nolan Darilek Date: Tue, 28 Jun 2022 11:48:03 -0500 Subject: [PATCH 08/16] Add `alert` role to notifications so they're automatically spoken by screen readers. (#6743) --- core/modules/utils/dom/notifier.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/modules/utils/dom/notifier.js b/core/modules/utils/dom/notifier.js index 3897b0e52..bf93d451c 100644 --- a/core/modules/utils/dom/notifier.js +++ b/core/modules/utils/dom/notifier.js @@ -36,8 +36,9 @@ Notifier.prototype.display = function(title,options) { if(!tiddler) { return; } - // Add classes + // Add classes and roles $tw.utils.addClass(notification,"tc-notification"); + notification.setAttribute("role","alert"); // Create the variables var variables = $tw.utils.extend({currentTiddler: title},options.variables); // Render the body of the notification From 926b7808b3870ab80603da919815d7d6dff33d17 Mon Sep 17 00:00:00 2001 From: Mario Pietsch Date: Tue, 28 Jun 2022 18:59:33 +0200 Subject: [PATCH 09/16] Fix a typo in the Plugin Ordering tiddler (#6744) --- editions/tw5.com/tiddlers/plugins/Plugin Ordering.tid | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/editions/tw5.com/tiddlers/plugins/Plugin Ordering.tid b/editions/tw5.com/tiddlers/plugins/Plugin Ordering.tid index 1cf635e9c..f3fe4da3d 100644 --- a/editions/tw5.com/tiddlers/plugins/Plugin Ordering.tid +++ b/editions/tw5.com/tiddlers/plugins/Plugin Ordering.tid @@ -1,5 +1,5 @@ created: 20220613115453346 -modified: 20220617133125115 +modified: 20220628160136158 tags: PluginMechanism title: Plugin Ordering type: text/vnd.tiddlywiki @@ -10,7 +10,7 @@ Using the Node.js client-server configuration plugins are activated in the follo #* See: [[PluginFolders]] #* and: [[Environment Variables on Node.js]] -# Plugins stored in the wiki `/plugin` path +# Plugins stored in the wiki `/plugins` path #* See: [[PluginFolders]] # Plugins specified in the command line From dfebd69d8fd2006f828e7619a7545cdcdb00e178 Mon Sep 17 00:00:00 2001 From: Bram Chen Date: Wed, 29 Jun 2022 15:20:29 +0800 Subject: [PATCH 10/16] Update chinese language files (#6745) * Add `Caption/Sidebar` in SideBar.multids * Update Help/default.tid --- languages/zh-Hans/Help/default.tid | 5 ++++- languages/zh-Hans/SideBar.multids | 1 + languages/zh-Hant/Help/default.tid | 5 ++++- languages/zh-Hant/SideBar.multids | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/languages/zh-Hans/Help/default.tid b/languages/zh-Hans/Help/default.tid index c2036cc95..7c3c794b2 100644 --- a/languages/zh-Hans/Help/default.tid +++ b/languages/zh-Hans/Help/default.tid @@ -3,6 +3,7 @@ title: $:/language/Help/default \define commandTitle() $:/language/Help/$(command)$ \end +\whitespace trim ``` 用法: tiddlywiki [] [-- [...]...] ``` @@ -11,7 +12,9 @@ $:/language/Help/$(command)$
    <$list filter="[commands[]sort[title]]" variable="command"> -
  • <$link to=<>><$macrocall $name="command" $type="text/plain" $output="text/plain"/>: <$transclude tiddler=<> field="description"/>
    • +
  • <$link to=<>><$macrocall $name="command" $type="text/plain" $output="text/plain"/>: + +<$transclude tiddler=<> field="description"/>
diff --git a/languages/zh-Hans/SideBar.multids b/languages/zh-Hans/SideBar.multids index 83c1ccb73..416e5b07c 100644 --- a/languages/zh-Hans/SideBar.multids +++ b/languages/zh-Hans/SideBar.multids @@ -1,6 +1,7 @@ title: $:/language/SideBar/ All/Caption: 全部 +Caption: 侧边栏 Contents/Caption: 目录 Drafts/Caption: 草稿 Explorer/Caption: 探索 diff --git a/languages/zh-Hant/Help/default.tid b/languages/zh-Hant/Help/default.tid index 80228ada5..8e7a3b647 100644 --- a/languages/zh-Hant/Help/default.tid +++ b/languages/zh-Hant/Help/default.tid @@ -3,6 +3,7 @@ title: $:/language/Help/default \define commandTitle() $:/language/Help/$(command)$ \end +\whitespace trim ``` 用法: tiddlywiki [] [-- [...]...] ``` @@ -11,7 +12,9 @@ $:/language/Help/$(command)$
    <$list filter="[commands[]sort[title]]" variable="command"> -
  • <$link to=<>><$macrocall $name="command" $type="text/plain" $output="text/plain"/>: <$transclude tiddler=<> field="description"/>
    • +
  • <$link to=<>><$macrocall $name="command" $type="text/plain" $output="text/plain"/>: + +<$transclude tiddler=<> field="description"/>
diff --git a/languages/zh-Hant/SideBar.multids b/languages/zh-Hant/SideBar.multids index ae916b877..bd208af11 100644 --- a/languages/zh-Hant/SideBar.multids +++ b/languages/zh-Hant/SideBar.multids @@ -1,6 +1,7 @@ title: $:/language/SideBar/ All/Caption: 全部 +Caption: 側邊欄 Contents/Caption: 目錄 Drafts/Caption: 草稿 Explorer/Caption: 探索 From 2c607ee8e6dfe027e5053bdd5f3b7d0d00fb97a7 Mon Sep 17 00:00:00 2001 From: FSpark Date: Wed, 29 Jun 2022 15:58:40 +0800 Subject: [PATCH 11/16] Add storyTiddler to render command (#6746) --- core/modules/commands/render.js | 2 +- core/modules/commands/rendertiddler.js | 1 + core/modules/commands/rendertiddlers.js | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/modules/commands/render.js b/core/modules/commands/render.js index 09e366011..b396deef9 100644 --- a/core/modules/commands/render.js +++ b/core/modules/commands/render.js @@ -50,7 +50,7 @@ Render individual tiddlers and save the results to the specified files console.log("Rendering \"" + title + "\" to \"" + filepath + "\""); } var parser = wiki.parseTiddler(template || title), - widgetNode = wiki.makeWidget(parser,{variables: $tw.utils.extend({},variables,{currentTiddler: title})}), + widgetNode = wiki.makeWidget(parser,{variables: $tw.utils.extend({},variables,{currentTiddler: title,storyTiddler: title})}), container = $tw.fakeDocument.createElement("div"); widgetNode.render(container,null); var text = type === "text/html" ? container.innerHTML : container.textContent; diff --git a/core/modules/commands/rendertiddler.js b/core/modules/commands/rendertiddler.js index 1860beb7e..41812aea1 100755 --- a/core/modules/commands/rendertiddler.js +++ b/core/modules/commands/rendertiddler.js @@ -40,6 +40,7 @@ Command.prototype.execute = function() { $tw.utils.createFileDirectories(filename); if(template) { variables.currentTiddler = title; + variables.storyTiddler = title; title = template; } if(name && value) { diff --git a/core/modules/commands/rendertiddlers.js b/core/modules/commands/rendertiddlers.js index 01af09649..91030b0f3 100644 --- a/core/modules/commands/rendertiddlers.js +++ b/core/modules/commands/rendertiddlers.js @@ -46,7 +46,7 @@ Command.prototype.execute = function() { } $tw.utils.each(tiddlers,function(title) { var parser = wiki.parseTiddler(template), - widgetNode = wiki.makeWidget(parser,{variables: {currentTiddler: title}}), + widgetNode = wiki.makeWidget(parser,{variables: {currentTiddler: title, storyTiddler: title}}), container = $tw.fakeDocument.createElement("div"); widgetNode.render(container,null); var text = type === "text/html" ? container.innerHTML : container.textContent, From 1110fd50cfc4b61e61524323b4e309d72f1298dd Mon Sep 17 00:00:00 2001 From: Maurycy Zarzycki Date: Wed, 29 Jun 2022 15:03:16 +0200 Subject: [PATCH 12/16] add Polish translation for the newly introduced English i18n string (#6747) Co-authored-by: Maurycy Zarzycki --- languages/pl-PL/SideBar.multids | 1 + 1 file changed, 1 insertion(+) diff --git a/languages/pl-PL/SideBar.multids b/languages/pl-PL/SideBar.multids index a79c52c51..f1a736bc6 100644 --- a/languages/pl-PL/SideBar.multids +++ b/languages/pl-PL/SideBar.multids @@ -1,5 +1,6 @@ title: $:/language/SideBar/ +Caption: Menu Boczne All/Caption: Wszystkie Contents/Caption: Treści Drafts/Caption: Szkice From 92c4c820058fdf48fd6788ebb08128b05b9f94c7 Mon Sep 17 00:00:00 2001 From: Nolan Darilek Date: Fri, 1 Jul 2022 09:39:52 -0500 Subject: [PATCH 13/16] Add ARIA region for editor. (#6749) --- core/language/en-GB/EditTemplate.multids | 1 + core/ui/EditTemplate.tid | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/core/language/en-GB/EditTemplate.multids b/core/language/en-GB/EditTemplate.multids index fc436059e..c4bfa5e56 100644 --- a/core/language/en-GB/EditTemplate.multids +++ b/core/language/en-GB/EditTemplate.multids @@ -1,5 +1,6 @@ title: $:/language/EditTemplate/ +Caption: Editor Body/External/Hint: This tiddler shows content stored outside of the main TiddlyWiki file. You can edit the tags and fields but cannot directly edit the content itself Body/Placeholder: Type the text for this tiddler Body/Preview/Type/Output: output diff --git a/core/ui/EditTemplate.tid b/core/ui/EditTemplate.tid index 1c356998c..57151fe38 100644 --- a/core/ui/EditTemplate.tid +++ b/core/ui/EditTemplate.tid @@ -23,7 +23,9 @@ title: $:/core/ui/EditTemplate
> data-tags={{!!tags}} - class={{{ tc-tiddler-frame tc-tiddler-edit-frame [is[tiddler]then[tc-tiddler-exists]] [is[missing]!is[shadow]then[tc-tiddler-missing]] [is[shadow]then[tc-tiddler-exists tc-tiddler-shadow]] [is[system]then[tc-tiddler-system]] [{!!class}] [tags[]encodeuricomponent[]addprefix[tc-tagged-]] +[join[ ]] }}}> + class={{{ tc-tiddler-frame tc-tiddler-edit-frame [is[tiddler]then[tc-tiddler-exists]] [is[missing]!is[shadow]then[tc-tiddler-missing]] [is[shadow]then[tc-tiddler-exists tc-tiddler-shadow]] [is[system]then[tc-tiddler-system]] [{!!class}] [tags[]encodeuricomponent[]addprefix[tc-tagged-]] +[join[ ]] }}} + role="region" + aria-label={{$:/language/EditTemplate/Caption}}> <$fieldmangler> <$vars storyTiddler=<> From bf6d5fa76700b366f26dd0d63433a1d96417367c Mon Sep 17 00:00:00 2001 From: Bram Chen Date: Mon, 4 Jul 2022 22:19:03 +0800 Subject: [PATCH 14/16] Update chinese language files (#6752) * Add `Caption` to EditTemplate.multids --- languages/zh-Hans/EditTemplate.multids | 1 + languages/zh-Hant/EditTemplate.multids | 1 + 2 files changed, 2 insertions(+) diff --git a/languages/zh-Hans/EditTemplate.multids b/languages/zh-Hans/EditTemplate.multids index d6d0aca4a..2420eb647 100644 --- a/languages/zh-Hans/EditTemplate.multids +++ b/languages/zh-Hans/EditTemplate.multids @@ -1,5 +1,6 @@ title: $:/language/EditTemplate/ +Caption: 编辑器 Body/External/Hint: 此条目显示保存于主要的 TiddlyWiki 文件之外的内容。你可以编辑其标签和字段，但不能直接编辑内容本身 Body/Placeholder: 输入此条目的内容 Body/Preview/Type/Output: 输出 diff --git a/languages/zh-Hant/EditTemplate.multids b/languages/zh-Hant/EditTemplate.multids index d8c57347d..e7e57759d 100644 --- a/languages/zh-Hant/EditTemplate.multids +++ b/languages/zh-Hant/EditTemplate.multids @@ -1,5 +1,6 @@ title: $:/language/EditTemplate/ +Caption: 編輯器 Body/External/Hint: 此條目顯示儲存於主要的 TiddlyWiki 檔之外的內容。你可以編輯其標籤和欄位，但不能直接編輯內容本身 Body/Placeholder: 輸入此條目的內容 Body/Preview/Type/Output: 輸出 From 4185d9a26c4785bef82b99e6951db8f0f2fdce73 Mon Sep 17 00:00:00 2001 From: "jeremy@jermolene.com" Date: Mon, 4 Jul 2022 17:35:03 +0100 Subject: [PATCH 15/16] Docs: Make .from-version macro be a link to the release note Fixes #6750 --- editions/tw5.com/tiddlers/system/doc-styles.tid | 6 +++--- editions/tw5.com/tiddlers/system/version-macros.tid | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/editions/tw5.com/tiddlers/system/doc-styles.tid b/editions/tw5.com/tiddlers/system/doc-styles.tid index e0f2af8a4..5b268a429 100644 --- a/editions/tw5.com/tiddlers/system/doc-styles.tid +++ b/editions/tw5.com/tiddlers/system/doc-styles.tid @@ -178,10 +178,10 @@ tr.doc-table-subheading { fill: <>; } -.doc-from-version { +a.doc-from-version.tc-tiddlylink { display: inline-block; border-radius: 1em; - background: <>; + background: <>; color: <>; fill: <>; padding: 0 0.4em; @@ -192,7 +192,7 @@ tr.doc-table-subheading { vertical-align: text-bottom; } -.doc-deprecated-version { +a.doc-deprecated-version.tc-tiddlylink { display: inline-block; border-radius: 1em; background: red; diff --git a/editions/tw5.com/tiddlers/system/version-macros.tid b/editions/tw5.com/tiddlers/system/version-macros.tid index b3893d358..f48d054e9 100644 --- a/editions/tw5.com/tiddlers/system/version-macros.tid +++ b/editions/tw5.com/tiddlers/system/version-macros.tid @@ -5,11 +5,11 @@ title: $:/editions/tw5.com/version-macros type: text/vnd.tiddlywiki \define .from-version(version) -{{$:/core/images/warning}} New in: $version$ +<$link to={{{ [<__version__>addprefix[Release ]] }}} class="doc-from-version">{{$:/core/images/warning}} New in: <$text text=<<__version__>>/> \end \define .deprecated-since(version, superseded:"TODO-Link") -<$button to="Deprecated - What does it mean" class="doc-deprecated-version tc-btn-invisible">{{$:/core/images/warning}} Deprecated since: $version$ . Use [[$superseded$]] instead +<$link to="Deprecated - What does it mean" class="doc-deprecated-version tc-btn-invisible">{{$:/core/images/warning}} Deprecated since: <$text text=<<__version__>>/>. Use <$link to=<<__superseded__>>><$text text=<<__version__>>/> instead \end 
<$view field="text"/>
\ No newline at end of file From 20df381cf30d666d1edc890f4da0a0834ba2d2e6 Mon Sep 17 00:00:00 2001 From: "jeremy@jermolene.com" Date: Mon, 4 Jul 2022 17:42:58 +0100 Subject: [PATCH 16/16] Docs: Improve deprecation documentation --- .../tiddlers/howtos/How to apply custom styles by tag.tid | 4 ++-- editions/tw5.com/tiddlers/system/Deprecated.tid | 8 ++++---- .../tiddlers/system/Deprecated_-_What_does_it_mean.tid | 8 ++------ editions/tw5.com/tiddlers/system/version-macros.tid | 4 ++-- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/editions/tw5.com/tiddlers/howtos/How to apply custom styles by tag.tid b/editions/tw5.com/tiddlers/howtos/How to apply custom styles by tag.tid index bc6c2ccf2..573acd232 100644 --- a/editions/tw5.com/tiddlers/howtos/How to apply custom styles by tag.tid +++ b/editions/tw5.com/tiddlers/howtos/How to apply custom styles by tag.tid @@ -1,11 +1,11 @@ caption: {{!!title}} - ^^deprecated^^ created: 20141001132300000 -modified: 201804111739 +modified: 20220704174221300 tags: [[How to apply custom styles]] $:/deprecated title: How to apply custom styles by tag type: text/vnd.tiddlywiki -<<.deprecated-since "5.1.16 <- click" "Custom styles by data-tags">>. Also see: [[How to apply custom styles]] +<<.deprecated-since "5.1.16" "Custom styles by data-tags">>. Also see: [[How to apply custom styles]] ---- diff --git a/editions/tw5.com/tiddlers/system/Deprecated.tid b/editions/tw5.com/tiddlers/system/Deprecated.tid index c8370cb8e..9d85bd185 100644 --- a/editions/tw5.com/tiddlers/system/Deprecated.tid +++ b/editions/tw5.com/tiddlers/system/Deprecated.tid @@ -1,8 +1,8 @@ created: 20170126143833588 -modified: 201804111739 +modified: 20220704174221300 title: $:/deprecated type: text/vnd.tiddlywiki -<<< -In several fields, deprecation is the discouragement of use of some feature, design or practice; typically because it has been superseded or is no longer considered safe – but without completely removing it or prohibiting its use. -<<< [[wikipedia|https://en.wikipedia.org/wiki/Deprecation]] +Deprecated features of TiddlyWiki are those that have been superseded by newer, improved ways of doing the same thing. + +Deprecated features will still work, but are not recommended for new content. diff --git a/editions/tw5.com/tiddlers/system/Deprecated_-_What_does_it_mean.tid b/editions/tw5.com/tiddlers/system/Deprecated_-_What_does_it_mean.tid index 5fdbca026..98fbf6bb0 100644 --- a/editions/tw5.com/tiddlers/system/Deprecated_-_What_does_it_mean.tid +++ b/editions/tw5.com/tiddlers/system/Deprecated_-_What_does_it_mean.tid @@ -1,15 +1,11 @@ created: 20170126142116898 -modified: 201804111739 +modified: 20220704174221300 title: Deprecated - What does it mean type: text/vnd.tiddlywiki -First of all: ''Keep calm!'' - {{$:/deprecated}} -For ~TiddlyWiki it means that you should not use this mechanism for new content anymore, ''AND you should update your existing content''! - -Deprecated features have a marker. See: [[How to apply custom styles by tag]] +Deprecated features are marked with a special warning button. See: [[How to apply custom styles by tag]] for an example. ''Tiddlers tagged `$:/deprecated`'' diff --git a/editions/tw5.com/tiddlers/system/version-macros.tid b/editions/tw5.com/tiddlers/system/version-macros.tid index f48d054e9..3daf6e848 100644 --- a/editions/tw5.com/tiddlers/system/version-macros.tid +++ b/editions/tw5.com/tiddlers/system/version-macros.tid @@ -1,5 +1,5 @@ created: 20161008085627406 -modified: 201804111739 +modified: 20220704174221300 tags: $:/tags/Macro title: $:/editions/tw5.com/version-macros type: text/vnd.tiddlywiki @@ -9,7 +9,7 @@ type: text/vnd.tiddlywiki \end \define .deprecated-since(version, superseded:"TODO-Link") -<$link to="Deprecated - What does it mean" class="doc-deprecated-version tc-btn-invisible">{{$:/core/images/warning}} Deprecated since: <$text text=<<__version__>>/>. Use <$link to=<<__superseded__>>><$text text=<<__version__>>/> instead +<$link to="Deprecated - What does it mean" class="doc-deprecated-version tc-btn-invisible">{{$:/core/images/warning}} Deprecated since: <$text text=<<__version__>>/>. Use <$link to=<<__superseded__>>><$text text=<<__superseded__>>/> instead \end 
<$view field="text"/>
\ No newline at end of file