From 5794718047e48100fd4a409d470597323ec0a8e6 Mon Sep 17 00:00:00 2001 From: Mohammad Rahmani <830394+kookma@users.noreply.github.com> Date: Sun, 28 Jul 2024 19:04:31 +0330 Subject: [PATCH 01/18] Add Documentation for New Shortcutkey to Open Control Panel (#8440) --- editions/tw5.com/tiddlers/howtos/KeyboardShortcuts.tid | 1 + 1 file changed, 1 insertion(+) diff --git a/editions/tw5.com/tiddlers/howtos/KeyboardShortcuts.tid b/editions/tw5.com/tiddlers/howtos/KeyboardShortcuts.tid index 421f99dce..f22167fe3 100644 --- a/editions/tw5.com/tiddlers/howtos/KeyboardShortcuts.tid +++ b/editions/tw5.com/tiddlers/howtos/KeyboardShortcuts.tid @@ -27,6 +27,7 @@ Keyboard shortcuts are available for common editing operations within the Text E |Focusing sidebar search |<<.from-version 5.1.20>>ctrl-shift-F | |Toggling the sidebar |<<.from-version 5.1.20>>shift-alt-S | |Advanced search |<<.from-version 5.1.20>>ctrl-shift-A | +|Open [[Control Panel|$:/ControlPanel]] |<<.from-version 5.3.6>>ctrl-alt-C | The current shortcuts can be inspected and customised in the "Keyboard Shortcuts" tab of the [[Control Panel|$:/ControlPanel]] <<.icon $:/core/images/options-button>>. From e80c99791e7142d786830e65ace9c71e13b5921e Mon Sep 17 00:00:00 2001 From: Mario Pietsch Date: Sun, 28 Jul 2024 17:36:17 +0200 Subject: [PATCH 02/18] Add tag-tiddler to tag-pill drag & drop import, add hidden setting for TagPillDragFilter (#8182) * add tag-tiddler to tag-pill drag & drop import, add hidden setting for TagPillDragFilter * update docs to make Be Aware clearer * exclude the tag tiddler and update hidden docs accordingly --- core/ui/TagTemplate.tid | 2 +- core/wiki/config/TagPillDragFilter.tid | 2 ++ .../Hidden Setting_ Tag Pill Drag Filter.tid | 22 +++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 core/wiki/config/TagPillDragFilter.tid create mode 100644 editions/tw5.com/tiddlers/hiddensettings/Hidden Setting_ Tag Pill Drag Filter.tid diff --git a/core/ui/TagTemplate.tid b/core/ui/TagTemplate.tid index 49e836671..6b17fe971 100644 --- a/core/ui/TagTemplate.tid +++ b/core/ui/TagTemplate.tid @@ -9,7 +9,7 @@ title: $:/core/ui/TagTemplate colour={{{ [] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}} palette={{$:/palette}} element-tag="$button" - element-attributes="""popup=<> dragFilter="[all[current]tagging[]]" tag='span'""" + element-attributes="""popup=<> dragFilter="[subfilter{$:/core/config/TagPillDragFilter}]" tag='span'""" /> <$reveal state=<> type="popup" position="below" animate="yes" class="tc-drop-down"> <$set name="tv-show-missing-links" value="yes"> diff --git a/core/wiki/config/TagPillDragFilter.tid b/core/wiki/config/TagPillDragFilter.tid new file mode 100644 index 000000000..188c50b9e --- /dev/null +++ b/core/wiki/config/TagPillDragFilter.tid @@ -0,0 +1,2 @@ +title: $:/core/config/TagPillDragFilter +text: [all[current]tagging[]] +[!is[draft]] diff --git a/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting_ Tag Pill Drag Filter.tid b/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting_ Tag Pill Drag Filter.tid new file mode 100644 index 000000000..c8e2c9c77 --- /dev/null +++ b/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting_ Tag Pill Drag Filter.tid @@ -0,0 +1,22 @@ +created: 20240508093242925 +modified: 20240728134955433 +tags: [[Hidden Settings]] +title: Hidden Setting: Tag Pill Drag Filter +type: text/vnd.tiddlywiki + +The ''~$:/core/config/TagPillDragFilter'' defines the filter string, that is used to drag & drop a tap-pill eg: <> from 1 wiki to an other wiki. + +* By default the set contains all tiddlers that are ''tagged:'' HelloThere ''without'' the HelloThere tag-tiddler itself +** Core Default: <$transclude $tiddler="$:/core" $subtiddler="$:/core/config/TagPillDragFilter" output="text/plain" /> +* If you do want to include the tag-tiddler use the following filter: +** Tagged tiddlers only: `[all[current]tagging[]] [all[current]is[tiddler]] +[!is[draft]]` + +Your $:/core/config/TagPillDragFilter +<%if [[$:/core/config/TagPillDragFilter]is[tiddler]] %> +''has been overwritten'' and contains: +<%else%> +defaults to: +<%endif%> +{{$:/core/config/TagPillDragFilter}} + +<<.note title:"Be Aware" _:"The core default filter does //not// include shadow-tiddlers. It will //include overwritten// shadow tiddlers. See: [[is Operator]] for details about the `is[tiddler]` and other possibilities.">> From f2942707014a98f12f46005eb87cb7f26f6075e7 Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Sun, 28 Jul 2024 22:13:42 +0100 Subject: [PATCH 03/18] Add Discord link to HelloThere --- editions/tw5.com/tiddlers/hellothere/HelloThere.tid | 3 +++ 1 file changed, 3 insertions(+) diff --git a/editions/tw5.com/tiddlers/hellothere/HelloThere.tid b/editions/tw5.com/tiddlers/hellothere/HelloThere.tid index e2e1cfdeb..db719f1c0 100644 --- a/editions/tw5.com/tiddlers/hellothere/HelloThere.tid +++ b/editions/tw5.com/tiddlers/hellothere/HelloThere.tid @@ -41,6 +41,9 @@ TiddlyWiki lets you choose where to keep your data, guaranteeing that in the dec {{$:/core/images/video}} ~YouTube + +{{$:/core/images/globe}} Discord + {{$:/core/images/twitter}} Twitter From c412ea52da04ed67af5735291ea3d752a5349118 Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Sun, 28 Jul 2024 22:17:23 +0100 Subject: [PATCH 04/18] Add Discord icon --- core/images/discord.tid | 5 +++++ editions/tw5.com/tiddlers/hellothere/HelloThere.tid | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 core/images/discord.tid diff --git a/core/images/discord.tid b/core/images/discord.tid new file mode 100644 index 000000000..7510babb4 --- /dev/null +++ b/core/images/discord.tid @@ -0,0 +1,5 @@ +title: $:/core/images/discord +tags: $:/tags/Image + +\parameters (size:"22pt") +> height=<> class="tc-image-discord tc-image-button" viewBox="0 -28.5 256 256"> \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/hellothere/HelloThere.tid b/editions/tw5.com/tiddlers/hellothere/HelloThere.tid index db719f1c0..88125a043 100644 --- a/editions/tw5.com/tiddlers/hellothere/HelloThere.tid +++ b/editions/tw5.com/tiddlers/hellothere/HelloThere.tid @@ -42,7 +42,7 @@ TiddlyWiki lets you choose where to keep your data, guaranteeing that in the dec {{$:/core/images/video}} ~YouTube -{{$:/core/images/globe}} Discord +{{$:/core/images/discord}} Discord {{$:/core/images/twitter}} Twitter From ea8e805e1c9e4cf4ab16f1aaad4ed9f249d9f40b Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Sun, 28 Jul 2024 22:34:24 +0100 Subject: [PATCH 05/18] Improve prerelease presentation --- .../tiddlers/system/TiddlyWiki Pre-release.tid | 8 +++++++- editions/prerelease/tiddlers/system/styles.tid | 17 +++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 editions/prerelease/tiddlers/system/styles.tid diff --git a/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid b/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid index b337a3ad1..f35234cbf 100644 --- a/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid +++ b/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid @@ -1,12 +1,18 @@ title: TiddlyWiki Pre-release modified: 20230731122156493 -This is a pre-release build of TiddlyWiki provided for testing and review purposes. ''Please don't try to depend on the pre-release for anything important'' -- you should use the latest official release from https://tiddlywiki.com. +
+ +!!! This is a pre-release build of TiddlyWiki provided for testing and review purposes. + +''Please don't try to depend on the pre-release for anything important'' -- you should use the latest official release from https://tiddlywiki.com. All of the changes in this pre-release are provisional until it is released and they become frozen by our backwards compatibility policies. This is the perfect time to raise questions or make suggestions. Please [[open a ticket at GitHub|https://github.com/TiddlyWiki/TiddlyWiki5/issues/new/choose]] or make a post at https://talk.tiddlywiki.org/. The pre-release is also available as an [[empty wiki|https://tiddlywiki.com/prerelease/empty.html]] ready for reuse. +
+ <$list filter="[tag[ReleaseNotes]!has[released]!sort[created]]">

<$text text=<>/>

diff --git a/editions/prerelease/tiddlers/system/styles.tid b/editions/prerelease/tiddlers/system/styles.tid new file mode 100644 index 000000000..2f63c5a48 --- /dev/null +++ b/editions/prerelease/tiddlers/system/styles.tid @@ -0,0 +1,17 @@ +tags: $:/tags/Stylesheet +title: $:/_tw5.com/prerelease-styles +type: text/vnd.tiddlywiki + +\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline macrocallblock + +.tc-scary-warning { + font-weight: bold; + padding: 0 1em; + margin-left: -1em; + margin-right: -1em; + color: #f22; + border-radius: 4px; + border: 3px solid transparent; + background: #ffd; + background: linear-gradient(#ffd, #ffd) padding-box, repeating-linear-gradient(-45deg, red 0, red 25%, transparent 0, transparent 50%) 0 / .6em .6em; +} \ No newline at end of file From 165c7e9825243638ed7e5bb92bd2925a0f70dcbe Mon Sep 17 00:00:00 2001 From: Mario Pietsch Date: Mon, 29 Jul 2024 13:19:44 +0200 Subject: [PATCH 06/18] Data widget add compound filter parameter (#8447) * add $compound-filter parameter to data-widget * update TestCaseTemplate to use $compound-filter parameter * update data-widget, TestCaseTiddlers and CompoundTiddlers docs --- core/modules/widgets/data.js | 15 +++++++++++-- core/ui/TestCaseTemplate.tid | 3 ++- .../tiddlers/concepts/CompoundTiddlers.tid | 7 ++++-- .../tiddlers/concepts/TestCaseTiddlers.tid | 22 +++++++++++-------- .../tw5.com/tiddlers/widgets/DataWidget.tid | 3 ++- 5 files changed, 35 insertions(+), 15 deletions(-) diff --git a/core/modules/widgets/data.js b/core/modules/widgets/data.js index 63f12e1f9..c3da00919 100644 --- a/core/modules/widgets/data.js +++ b/core/modules/widgets/data.js @@ -75,7 +75,9 @@ DataWidget.prototype.computeDataTiddlerValues = function() { } }); // Deal with $tiddler, $filter or $compound-tiddler attributes - var tiddlers = [],title; + var tiddlers = [], + compoundTiddlers, + title; if(this.hasAttribute("$tiddler")) { title = this.getAttribute("$tiddler"); if(title) { @@ -103,8 +105,17 @@ DataWidget.prototype.computeDataTiddlerValues = function() { tiddlers.push.apply(tiddlers,this.extractCompoundTiddler(title)); } } + if(this.hasAttribute("$compound-filter")) { + filter = this.getAttribute("$compound-filter"); + if(filter) { + compoundTiddlers = this.wiki.filterTiddlers(filter); + $tw.utils.each(compoundTiddlers, function(title){ + tiddlers.push.apply(tiddlers,self.extractCompoundTiddler(title)); + }); + } + } // Return the literal item if none of the special attributes were used - if(!this.hasAttribute("$tiddler") && !this.hasAttribute("$filter") && !this.hasAttribute("$compound-tiddler")) { + if(!this.hasAttribute("$tiddler") && !this.hasAttribute("$filter") && !this.hasAttribute("$compound-tiddler") && !this.hasAttribute("$compound-filter")) { if(Object.keys(item).length > 0 && !!item.title) { return [new $tw.Tiddler(item)]; } else { diff --git a/core/ui/TestCaseTemplate.tid b/core/ui/TestCaseTemplate.tid index 9871a2904..8761abdd5 100644 --- a/core/ui/TestCaseTemplate.tid +++ b/core/ui/TestCaseTemplate.tid @@ -13,7 +13,8 @@ title: $:/core/ui/TestCaseTemplate testActions="Actions" testHideIfPass=<> > + <$data $compound-filter={{!!import-compound}}/> <$data $compound-tiddler=<>/> - <$data title="Description" text={{!!description}}/> + <%if [{!!description}!is[blank]] %><$data title="Description" text={{!!description}}/><%endif%> diff --git a/editions/tw5.com/tiddlers/concepts/CompoundTiddlers.tid b/editions/tw5.com/tiddlers/concepts/CompoundTiddlers.tid index c4a049a6a..b6817b3f7 100644 --- a/editions/tw5.com/tiddlers/concepts/CompoundTiddlers.tid +++ b/editions/tw5.com/tiddlers/concepts/CompoundTiddlers.tid @@ -1,7 +1,8 @@ -title: CompoundTiddlers -modified: 20240507221902644 created: 20240507221902644 +modified: 20240729082610287 tags: Concepts +title: CompoundTiddlers +type: text/vnd.tiddlywiki Compound tiddlers are a special type of tiddler that can store one or more payload tiddlers. The tiddlers within a compound tiddler are only accessible via special operations, typically with the TestCaseWidget. @@ -29,3 +30,5 @@ tags: five six This is the third tiddler ``` + +Also see: [[TestCaseTiddlers]] \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/concepts/TestCaseTiddlers.tid b/editions/tw5.com/tiddlers/concepts/TestCaseTiddlers.tid index cf42c67d7..fae4bab55 100644 --- a/editions/tw5.com/tiddlers/concepts/TestCaseTiddlers.tid +++ b/editions/tw5.com/tiddlers/concepts/TestCaseTiddlers.tid @@ -1,26 +1,30 @@ -title: TestCaseTiddlers -modified: 20240507221902644 created: 20240507221902644 +modified: 20240729083054531 tags: Concepts +title: TestCaseTiddlers +type: text/vnd.tiddlywiki -Test case tiddlers encapsulate one or more tiddlers that can be displayed as a [[test case|TestCaseWidget]]: an independent embedded wiki that can be used for testing or learning purposes. +Test case tiddlers encapsulate one or more tiddlers that can be displayed as a <<.wlink TestCaseWidget>>: an independent embedded wiki that can be used for testing or learning purposes. Test case tiddlers are formatted as CompoundTiddlers, allowing them to contain multiple tiddlers packed into one. -Test case tiddlers have the following fields: +Test case tiddlers have the following ''fields'': |!Field |!Description | -|<<.field type>> | Should be set to `text/vnd.tiddlywiki-multiple` | -|<<.field tags>> | Test cases are tagged [[$:/tags/wiki-test-spec]]. Test cases that intentionally fail are tagged [[$:/tags/wiki-test-spec-failing]] | +|<<.field type>> |Needs to be set to `text/vnd.tiddlywiki-multiple` | +|<<.field tags>> |Test cases are tagged [[$:/tags/wiki-test-spec]]. Test cases that intentionally fail are tagged [[$:/tags/wiki-test-spec-failing]] | |<<.field description>> |Descriptive heading for the test, intended to make it easy to identify the test | |<<.field display-format>> |Optional, defaults to `wikitext`. Set to `plaintext` to cause the output to be rended as plain text | +|<<.field import-compound>> |<<.from-version "5.3.6">> A filter string, that defines a list of compound tiddlers, that should be imported. See: <<.wlink DataWidget>> widget | -Test case tiddlers with the appropriate tag are shown in $:/ControlPanel +Test case tiddlers with the appropriate tag are shown in the $:/ControlPanel ''-> Advanced -> Test Cases '' -Some payload tiddlers are set aside for special purposes: +Some ''payload ''tiddlers are set aside for special purposes: |!Tiddler |!Description | |''Narrative'' |Narrative description of the test, intended to explain the purpose and operation of the test | |''Output'' |The tiddler that produces the test output | |''~ExpectedResult'' |HTML of expected result of rendering the ''Output'' tiddler | -|''Description'' |Set to the text of the <<.field description>> field | +|''Description'' |Set to the text of the <<.field description>> field, if the field exists | + +Also see: TestCaseWidget, DataWidget \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/widgets/DataWidget.tid b/editions/tw5.com/tiddlers/widgets/DataWidget.tid index 8aaf1efaf..dc2e7ab2a 100644 --- a/editions/tw5.com/tiddlers/widgets/DataWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/DataWidget.tid @@ -1,6 +1,6 @@ caption: data created: 20240507221902644 -modified: 20240507221902644 +modified: 20240729084028713 tags: Widgets title: DataWidget type: text/vnd.tiddlywiki @@ -17,6 +17,7 @@ The content of the data widget is ignored. It supports the following attributes: |<<.attr $tiddler>> |Optional title of a tiddler to be used as a payload tiddler (optional) | |<<.attr $filter>> |Optional filter string identifying tiddlers to be used as payload tiddlers (optional) | |<<.attr $compound-tiddler>> |Optional title of a tiddler containing payload tiddlers in `text/vnd.tiddlywiki-multiple` format (see below) | +|<<.attr $compound-filter>> |<<.from-version "5.3.6">> Optional filter, to create a list of tiddlers that contain compound tiddlers. <<.infoBox """Tiddlers will be imported in order. Existing testcase tiddlers will be overwritten, so the currentTiddler wins""">>| |//any attribute
not starting
with $// |Field values to be assigned to the payload tiddler(s) | The data widget is not rendered when used within the <<.wlink TestCaseWidget>> widget or the [[Innerwiki Plugin]] but for ease of testing, when used elsewhere it renders a JSON representation of the payload tiddlers. From d2302df197cc2ade1684055cd26c708c1cda496a Mon Sep 17 00:00:00 2001 From: Mario Pietsch Date: Mon, 29 Jul 2024 13:38:07 +0200 Subject: [PATCH 07/18] Add procedure and function snippet to "stamp button" (#8445) * Add procedure and function snippet to "stamp button" * remove draft tiddler --- core/language/en-GB/Snippets/FunctionDefinition.tid | 7 +++++++ core/language/en-GB/Snippets/ProcedureDefinition.tid | 7 +++++++ core/wiki/tags/TextEditorSnippet.tid | 2 ++ languages/de-DE/Snippets/FunctionDefinition.tid | 7 +++++++ languages/de-DE/Snippets/MacroDefinition.tid | 2 +- languages/de-DE/Snippets/ProcedureDefinition.tid | 8 ++++++++ 6 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 core/language/en-GB/Snippets/FunctionDefinition.tid create mode 100644 core/language/en-GB/Snippets/ProcedureDefinition.tid create mode 100644 core/wiki/tags/TextEditorSnippet.tid create mode 100644 languages/de-DE/Snippets/FunctionDefinition.tid create mode 100644 languages/de-DE/Snippets/ProcedureDefinition.tid diff --git a/core/language/en-GB/Snippets/FunctionDefinition.tid b/core/language/en-GB/Snippets/FunctionDefinition.tid new file mode 100644 index 000000000..e000e38b1 --- /dev/null +++ b/core/language/en-GB/Snippets/FunctionDefinition.tid @@ -0,0 +1,7 @@ +title: $:/language/Snippets/FunctionDefinition +tags: $:/tags/TextEditor/Snippet +caption: Function definition + +\function f.name(param1,param2:"default value") [!is[blank]else] + +<> diff --git a/core/language/en-GB/Snippets/ProcedureDefinition.tid b/core/language/en-GB/Snippets/ProcedureDefinition.tid new file mode 100644 index 000000000..632abcc01 --- /dev/null +++ b/core/language/en-GB/Snippets/ProcedureDefinition.tid @@ -0,0 +1,7 @@ +title: $:/language/Snippets/ProcedureDefinition +tags: $:/tags/TextEditor/Snippet +caption: Procedure definition + +\procedure procName(param1:"default value",param2) +Your text comes here. +\end diff --git a/core/wiki/tags/TextEditorSnippet.tid b/core/wiki/tags/TextEditorSnippet.tid new file mode 100644 index 000000000..4d54212be --- /dev/null +++ b/core/wiki/tags/TextEditorSnippet.tid @@ -0,0 +1,2 @@ +title: $:/tags/TextEditor/Snippet +list: $:/language/Snippets/ProcedureDefinition $:/language/Snippets/FunctionDefinition $:/language/Snippets/ListByTag $:/language/Snippets/Table4x3 $:/language/Snippets/TableOfContents $:/language/Snippets/MacroDefinition \ No newline at end of file diff --git a/languages/de-DE/Snippets/FunctionDefinition.tid b/languages/de-DE/Snippets/FunctionDefinition.tid new file mode 100644 index 000000000..a4c1a0152 --- /dev/null +++ b/languages/de-DE/Snippets/FunctionDefinition.tid @@ -0,0 +1,7 @@ +title: $:/language/Snippets/FunctionDefinition +tags: $:/tags/TextEditor/Snippet +caption: Function Definition + +\function f.name(param1,param2:"default value") [!is[blank]else] + +<> diff --git a/languages/de-DE/Snippets/MacroDefinition.tid b/languages/de-DE/Snippets/MacroDefinition.tid index a50cb0c9f..3d07c55c4 100644 --- a/languages/de-DE/Snippets/MacroDefinition.tid +++ b/languages/de-DE/Snippets/MacroDefinition.tid @@ -3,6 +3,6 @@ tags: $:/tags/TextEditor/Snippet caption: Makro Definition \define makroName(param1:"standard parameter", param2) -Text des Makros. Zugriff auf den <<__param1__>>. +Ihr Text kommt hier her. Zugriff auf <<__param1__>>. <<__param2__>> \end diff --git a/languages/de-DE/Snippets/ProcedureDefinition.tid b/languages/de-DE/Snippets/ProcedureDefinition.tid new file mode 100644 index 000000000..074eea13d --- /dev/null +++ b/languages/de-DE/Snippets/ProcedureDefinition.tid @@ -0,0 +1,8 @@ +title: $:/language/Snippets/ProcedureDefinition +tags: $:/tags/TextEditor/Snippet +caption: Procedure Definition + +\procedure procName(param1:"standard parameter", param2) +Ihr Text kommt hier her. Zugriff auf <<__param1__>>. +<<__param2__>> +\end From 27f3de2f8893e9c112cb22b0203d007a1cbd7d89 Mon Sep 17 00:00:00 2001 From: Mario Pietsch Date: Mon, 29 Jul 2024 14:08:45 +0200 Subject: [PATCH 08/18] Show wikitext formatting buttons for compound tiddlers (#8449) * allow wikitext formatting buttons for types [prefix[text/vnd.tiddlywiki]] which is very permissive * add 2 missing buttons --- core/ui/EditorToolbar/bold.tid | 2 +- core/ui/EditorToolbar/excise.tid | 2 +- core/ui/EditorToolbar/heading-1.tid | 2 +- core/ui/EditorToolbar/heading-2.tid | 2 +- core/ui/EditorToolbar/heading-3.tid | 2 +- core/ui/EditorToolbar/heading-4.tid | 2 +- core/ui/EditorToolbar/heading-5.tid | 2 +- core/ui/EditorToolbar/heading-6.tid | 2 +- core/ui/EditorToolbar/italic.tid | 2 +- core/ui/EditorToolbar/link.tid | 2 +- core/ui/EditorToolbar/linkify.tid | 2 +- core/ui/EditorToolbar/list-bullet.tid | 2 +- core/ui/EditorToolbar/list-number.tid | 2 +- core/ui/EditorToolbar/mono-block.tid | 2 +- core/ui/EditorToolbar/mono-line.tid | 2 +- core/ui/EditorToolbar/picture.tid | 2 +- core/ui/EditorToolbar/quote.tid | 2 +- core/ui/EditorToolbar/strikethrough.tid | 2 +- core/ui/EditorToolbar/subscript.tid | 2 +- core/ui/EditorToolbar/superscript.tid | 2 +- core/ui/EditorToolbar/transcludify.tid | 2 +- core/ui/EditorToolbar/underline.tid | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/core/ui/EditorToolbar/bold.tid b/core/ui/EditorToolbar/bold.tid index ffe84de61..1cde1be39 100644 --- a/core/ui/EditorToolbar/bold.tid +++ b/core/ui/EditorToolbar/bold.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/bold caption: {{$:/language/Buttons/Bold/Caption}} description: {{$:/language/Buttons/Bold/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((bold)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/excise.tid b/core/ui/EditorToolbar/excise.tid index f478abdc2..fe5c5288b 100644 --- a/core/ui/EditorToolbar/excise.tid +++ b/core/ui/EditorToolbar/excise.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/excise caption: {{$:/language/Buttons/Excise/Caption}} description: {{$:/language/Buttons/Excise/Hint}} -condition: [type[]] [type[text/vnd.tiddlywiki]] +[first[]] +condition: [type[]] [get[type]prefix[text/vnd.tiddlywiki]] +[first[]] shortcuts: ((excise)) dropdown: $:/core/ui/EditorToolbar/excise-dropdown diff --git a/core/ui/EditorToolbar/heading-1.tid b/core/ui/EditorToolbar/heading-1.tid index 2f0f41847..d7d2e5032 100644 --- a/core/ui/EditorToolbar/heading-1.tid +++ b/core/ui/EditorToolbar/heading-1.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/heading-1 caption: {{$:/language/Buttons/Heading1/Caption}} description: {{$:/language/Buttons/Heading1/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] button-classes: tc-text-editor-toolbar-item-start-group shortcuts: ((heading-1)) diff --git a/core/ui/EditorToolbar/heading-2.tid b/core/ui/EditorToolbar/heading-2.tid index 7139bf3d0..8f873ad19 100644 --- a/core/ui/EditorToolbar/heading-2.tid +++ b/core/ui/EditorToolbar/heading-2.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/heading-2 caption: {{$:/language/Buttons/Heading2/Caption}} description: {{$:/language/Buttons/Heading2/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((heading-2)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/heading-3.tid b/core/ui/EditorToolbar/heading-3.tid index e00dd832b..96d053cee 100644 --- a/core/ui/EditorToolbar/heading-3.tid +++ b/core/ui/EditorToolbar/heading-3.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/heading-3 caption: {{$:/language/Buttons/Heading3/Caption}} description: {{$:/language/Buttons/Heading3/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((heading-3)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/heading-4.tid b/core/ui/EditorToolbar/heading-4.tid index 4a4b7a90b..c3d373016 100644 --- a/core/ui/EditorToolbar/heading-4.tid +++ b/core/ui/EditorToolbar/heading-4.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/heading-4 caption: {{$:/language/Buttons/Heading4/Caption}} description: {{$:/language/Buttons/Heading4/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((heading-4)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/heading-5.tid b/core/ui/EditorToolbar/heading-5.tid index 09f0bcf4c..fd961df4b 100644 --- a/core/ui/EditorToolbar/heading-5.tid +++ b/core/ui/EditorToolbar/heading-5.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/heading-5 caption: {{$:/language/Buttons/Heading5/Caption}} description: {{$:/language/Buttons/Heading5/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((heading-5)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/heading-6.tid b/core/ui/EditorToolbar/heading-6.tid index d5d8dc045..d573cc89f 100644 --- a/core/ui/EditorToolbar/heading-6.tid +++ b/core/ui/EditorToolbar/heading-6.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/heading-6 caption: {{$:/language/Buttons/Heading6/Caption}} description: {{$:/language/Buttons/Heading6/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((heading-6)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/italic.tid b/core/ui/EditorToolbar/italic.tid index 518f3d0c2..7f3505ddb 100644 --- a/core/ui/EditorToolbar/italic.tid +++ b/core/ui/EditorToolbar/italic.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/italic caption: {{$:/language/Buttons/Italic/Caption}} description: {{$:/language/Buttons/Italic/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((italic)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/link.tid b/core/ui/EditorToolbar/link.tid index e0527cfab..719b05c50 100644 --- a/core/ui/EditorToolbar/link.tid +++ b/core/ui/EditorToolbar/link.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/link caption: {{$:/language/Buttons/Link/Caption}} description: {{$:/language/Buttons/Link/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] button-classes: tc-text-editor-toolbar-item-start-group shortcuts: ((link)) dropdown: $:/core/ui/EditorToolbar/link-dropdown diff --git a/core/ui/EditorToolbar/linkify.tid b/core/ui/EditorToolbar/linkify.tid index 68a45857e..e8b5fed62 100644 --- a/core/ui/EditorToolbar/linkify.tid +++ b/core/ui/EditorToolbar/linkify.tid @@ -1,5 +1,5 @@ caption: {{$:/language/Buttons/Linkify/Caption}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] description: {{$:/language/Buttons/Linkify/Hint}} icon: $:/core/images/linkify list-before: $:/core/ui/EditorToolbar/mono-block diff --git a/core/ui/EditorToolbar/list-bullet.tid b/core/ui/EditorToolbar/list-bullet.tid index dfa14cc18..5a18f77d9 100644 --- a/core/ui/EditorToolbar/list-bullet.tid +++ b/core/ui/EditorToolbar/list-bullet.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/list-bullet caption: {{$:/language/Buttons/ListBullet/Caption}} description: {{$:/language/Buttons/ListBullet/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((list-bullet)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/list-number.tid b/core/ui/EditorToolbar/list-number.tid index 81b9152d0..0bf2ba160 100644 --- a/core/ui/EditorToolbar/list-number.tid +++ b/core/ui/EditorToolbar/list-number.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/list-number caption: {{$:/language/Buttons/ListNumber/Caption}} description: {{$:/language/Buttons/ListNumber/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((list-number)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/mono-block.tid b/core/ui/EditorToolbar/mono-block.tid index 4ef741695..72ec82d90 100644 --- a/core/ui/EditorToolbar/mono-block.tid +++ b/core/ui/EditorToolbar/mono-block.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/mono-block caption: {{$:/language/Buttons/MonoBlock/Caption}} description: {{$:/language/Buttons/MonoBlock/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] button-classes: tc-text-editor-toolbar-item-start-group shortcuts: ((mono-block)) diff --git a/core/ui/EditorToolbar/mono-line.tid b/core/ui/EditorToolbar/mono-line.tid index 15ca77de1..2df863171 100644 --- a/core/ui/EditorToolbar/mono-line.tid +++ b/core/ui/EditorToolbar/mono-line.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/mono-line caption: {{$:/language/Buttons/MonoLine/Caption}} description: {{$:/language/Buttons/MonoLine/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((mono-line)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/picture.tid b/core/ui/EditorToolbar/picture.tid index cf10c0017..0a3fee736 100644 --- a/core/ui/EditorToolbar/picture.tid +++ b/core/ui/EditorToolbar/picture.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/picture caption: {{$:/language/Buttons/Picture/Caption}} description: {{$:/language/Buttons/Picture/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((picture)) dropdown: $:/core/ui/EditorToolbar/picture-dropdown diff --git a/core/ui/EditorToolbar/quote.tid b/core/ui/EditorToolbar/quote.tid index 1fe5fd9e1..d97974325 100644 --- a/core/ui/EditorToolbar/quote.tid +++ b/core/ui/EditorToolbar/quote.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/quote caption: {{$:/language/Buttons/Quote/Caption}} description: {{$:/language/Buttons/Quote/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((quote)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/strikethrough.tid b/core/ui/EditorToolbar/strikethrough.tid index 53808cac3..0b00df486 100644 --- a/core/ui/EditorToolbar/strikethrough.tid +++ b/core/ui/EditorToolbar/strikethrough.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/strikethrough caption: {{$:/language/Buttons/Strikethrough/Caption}} description: {{$:/language/Buttons/Strikethrough/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((strikethrough)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/subscript.tid b/core/ui/EditorToolbar/subscript.tid index e2c83abbd..1c980a896 100644 --- a/core/ui/EditorToolbar/subscript.tid +++ b/core/ui/EditorToolbar/subscript.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/subscript caption: {{$:/language/Buttons/Subscript/Caption}} description: {{$:/language/Buttons/Subscript/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((subscript)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/superscript.tid b/core/ui/EditorToolbar/superscript.tid index c1a40efea..ee4713409 100644 --- a/core/ui/EditorToolbar/superscript.tid +++ b/core/ui/EditorToolbar/superscript.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/superscript caption: {{$:/language/Buttons/Superscript/Caption}} description: {{$:/language/Buttons/Superscript/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((superscript)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/transcludify.tid b/core/ui/EditorToolbar/transcludify.tid index dbc008d56..d24b2041c 100644 --- a/core/ui/EditorToolbar/transcludify.tid +++ b/core/ui/EditorToolbar/transcludify.tid @@ -1,5 +1,5 @@ caption: {{$:/language/Buttons/Transcludify/Caption}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] description: {{$:/language/Buttons/Transcludify/Hint}} icon: $:/core/images/transcludify list-before: $:/core/ui/EditorToolbar/mono-block diff --git a/core/ui/EditorToolbar/underline.tid b/core/ui/EditorToolbar/underline.tid index ec6d63319..9f0fc9c30 100644 --- a/core/ui/EditorToolbar/underline.tid +++ b/core/ui/EditorToolbar/underline.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/underline caption: {{$:/language/Buttons/Underline/Caption}} description: {{$:/language/Buttons/Underline/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((underline)) <$action-sendmessage From 9d210712006cf82dc57c30196f85035006c469dd Mon Sep 17 00:00:00 2001 From: Bram Chen Date: Mon, 29 Jul 2024 20:18:34 +0800 Subject: [PATCH 09/18] Update chinese language files (#8444) * Update chinese language files * add chinese translations for OpenControlPanel/Hint in Buttons.multids * Update chinese language files * Add chinese translations for procedure and function snippet to "stamp button" --- languages/zh-Hans/Buttons.multids | 1 + languages/zh-Hans/Snippets/FunctionDefinition.tid | 7 +++++++ languages/zh-Hans/Snippets/ProcedureDefinition.tid | 7 +++++++ languages/zh-Hant/Buttons.multids | 1 + languages/zh-Hant/Snippets/FunctionDefinition.tid | 7 +++++++ languages/zh-Hant/Snippets/ProcedureDefinition.tid | 7 +++++++ 6 files changed, 30 insertions(+) create mode 100644 languages/zh-Hans/Snippets/FunctionDefinition.tid create mode 100644 languages/zh-Hans/Snippets/ProcedureDefinition.tid create mode 100644 languages/zh-Hant/Snippets/FunctionDefinition.tid create mode 100644 languages/zh-Hant/Snippets/ProcedureDefinition.tid diff --git a/languages/zh-Hans/Buttons.multids b/languages/zh-Hans/Buttons.multids index 3fa13f740..87be34a82 100644 --- a/languages/zh-Hans/Buttons.multids +++ b/languages/zh-Hans/Buttons.multids @@ -80,6 +80,7 @@ NewMarkdown/Caption: 添加 Markdown 条目 NewMarkdown/Hint: 创建一个新的 Markdown 条目 NewTiddler/Caption: 添加条目 NewTiddler/Hint: 创建一个新的条目 +OpenControlPanel/Hint: 开启控制台 OpenWindow/Caption: 开启于新窗口 OpenWindow/Hint: 在新窗口中开启条目 Palette/Caption: 调色板 diff --git a/languages/zh-Hans/Snippets/FunctionDefinition.tid b/languages/zh-Hans/Snippets/FunctionDefinition.tid new file mode 100644 index 000000000..fa7793d8a --- /dev/null +++ b/languages/zh-Hans/Snippets/FunctionDefinition.tid @@ -0,0 +1,7 @@ +title: $:/language/Snippets/FunctionDefinition +tags: $:/tags/TextEditor/Snippet +caption: 函数定义 + +\function f.name(param1,param2:"默认值") [!is[blank]else] + +<> diff --git a/languages/zh-Hans/Snippets/ProcedureDefinition.tid b/languages/zh-Hans/Snippets/ProcedureDefinition.tid new file mode 100644 index 000000000..d6445349b --- /dev/null +++ b/languages/zh-Hans/Snippets/ProcedureDefinition.tid @@ -0,0 +1,7 @@ +title: $:/language/Snippets/ProcedureDefinition +tags: $:/tags/TextEditor/Snippet +caption: 程序定义 + +\procedure procName(param1:"预设值",param2) +这里就是您的文字了。 +\end diff --git a/languages/zh-Hant/Buttons.multids b/languages/zh-Hant/Buttons.multids index b45b88f79..c17974998 100644 --- a/languages/zh-Hant/Buttons.multids +++ b/languages/zh-Hant/Buttons.multids @@ -80,6 +80,7 @@ NewMarkdown/Caption: 新增 Markdown 條目 NewMarkdown/Hint: 建立一個新的 Markdown 條目 NewTiddler/Caption: 新增條目 NewTiddler/Hint: 建立一個新的條目 +OpenControlPanel/Hint: 開啟控制台 OpenWindow/Caption: 開啟於新視窗 OpenWindow/Hint: 在新視窗中開啟條目 Palette/Caption: 調色盤 diff --git a/languages/zh-Hant/Snippets/FunctionDefinition.tid b/languages/zh-Hant/Snippets/FunctionDefinition.tid new file mode 100644 index 000000000..c42ed096a --- /dev/null +++ b/languages/zh-Hant/Snippets/FunctionDefinition.tid @@ -0,0 +1,7 @@ +title: $:/language/Snippets/FunctionDefinition +tags: $:/tags/TextEditor/Snippet +caption: 函數定義 + +\function f.name(param1,param2:"預設值") [!is[blank]else] + +<> diff --git a/languages/zh-Hant/Snippets/ProcedureDefinition.tid b/languages/zh-Hant/Snippets/ProcedureDefinition.tid new file mode 100644 index 000000000..8a92ae666 --- /dev/null +++ b/languages/zh-Hant/Snippets/ProcedureDefinition.tid @@ -0,0 +1,7 @@ +title: $:/language/Snippets/ProcedureDefinition +tags: $:/tags/TextEditor/Snippet +caption: 程序定義 + +\procedure procName(param1:"預設值",param2) +這裡就是您的文字了。 +\end From 8735d1ac93054c54459832fcc8252ac4d6fa03d2 Mon Sep 17 00:00:00 2001 From: Mario Pietsch Date: Mon, 29 Jul 2024 23:04:06 +0200 Subject: [PATCH 10/18] Add vnd.tiddlywiki-multiple to the editor type dropdown (#8450) * add text/vnd.tiddlywiki-multiple to editor type dropdown * de-DE add text/vnd.tiddlywiki-multiple to editor type dropdown * move text/x-tiddlywiki to classictools plugin * remove image/x-icon from all languages files * move type text/vnd.tiddlywiki-multiple to Developer --- core/language/en-GB/Types/image_x-icon.tid | 5 ----- .../language/en-GB/Types/text_vnd.tiddlywiki_multiple.tid | 5 +++++ languages/ca-ES/Types/image%2Fx-icon.tid | 4 ---- languages/cs-CZ/Types/image%2Fx-icon.tid | 4 ---- languages/da-DK/Types/image%2Fx-icon.tid | 4 ---- languages/de-DE/Types/application_javascript.tid | 1 + languages/de-DE/Types/application_json.tid | 1 + .../de-DE/Types/application_x_tiddler_dictionary.tid | 1 + languages/de-DE/Types/image_gif.tid | 3 ++- languages/de-DE/Types/image_jpeg.tid | 1 + languages/de-DE/Types/image_png.tid | 1 + languages/de-DE/Types/image_svg_xml.tid | 1 + languages/de-DE/Types/image_x-icon.tid | 4 ---- languages/de-DE/Types/text_css.tid | 1 + languages/de-DE/Types/text_html.tid | 1 + languages/de-DE/Types/text_plain.tid | 1 + languages/de-DE/Types/text_vnd.tiddlywiki.tid | 3 ++- languages/de-DE/Types/text_vnd.tiddlywiki_multiple.tid | 5 +++++ languages/el-GR/Types/image%2Fx-icon.tid | 4 ---- languages/es-ES/Types/image_x-icon.tid | 5 ----- languages/fr-FR/Types/image_x-icon.tid | 5 ----- languages/he-IL/Types/image%2Fx-icon.tid | 4 ---- languages/hi-IN/Types/image%2Fx-icon.tid | 5 ----- languages/ia-IA/Types/image%2Fx-icon.tid | 4 ---- languages/it-IT/Types/image_x-icon.tid | 5 ----- languages/ja-JP/Types/image%2Fx-icon.tid | 4 ---- languages/ko-KR/Types/image%2Fx-icon.tid | 4 ---- languages/mk-MK/Types/image%2Fx-icon.tid | 4 ---- languages/nl-NL/Types/image%2Fx-icon.tid | 4 ---- languages/pa-IN/Types/image%2Fx-icon.tid | 4 ---- languages/pl-PL/Types/image_x-icon.tid | 5 ----- languages/pt-BR/Types/image%2Fx-icon.tid | 4 ---- languages/pt-PT/Types/image%2Fx-icon.tid | 4 ---- languages/ru-RU/Types/image%2Fx-icon.tid | 4 ---- languages/sk-SK/Types/image%2Fx-icon.tid | 4 ---- languages/sl-SI/Types/image%2Fx-icon.tid | 4 ---- languages/sv-SE/Types/image_x-icon.tid | 4 ---- languages/zh-Hans/Types/image_x-icon.tid | 4 ---- languages/zh-Hant/Types/image_x-icon.tid | 4 ---- .../languages/ca-ES/types/text_Fx-tiddlywiki.tid | 0 .../languages/cs-CZ/types/text_Fx-tiddlywiki.tid | 0 .../languages/da-DK/types/text_Fx-tiddlywiki.tid | 0 .../languages/de-DE/types}/text_x-tiddlywiki.tid | 0 .../languages/el-Gr/types/text_Fx-tiddlywiki.tid | 0 .../languages/en-GB/types}/text_x-tiddlywiki.tid | 0 .../languages/es-ES/types}/text_x-tiddlywiki.tid | 0 .../languages/fr-FR/types}/text_x-tiddlywiki.tid | 0 .../languages/he-IL/types/text_Fx-tiddlywiki.tid | 0 .../languages/hi-IN/types/text_Fx-tiddlywiki.tid | 0 .../languages/ia-IA/types/text_Fx-tiddlywiki.tid | 4 ++++ .../languages/it-IT/types}/text_x-tiddlywiki.tid | 0 .../languages/ja-JP/types/text_Fx-tiddlywiki.tid | 0 .../languages/ko-KR/types/text_Fx-tiddlywiki.tid | 0 .../languages/mk-MK/types/text_Fx-tiddlywiki.tid | 0 .../languages/nl-NL/types/text_Fx-tiddlywiki.tid | 0 .../languages/pa-IN/types/text_Fx-tiddlywiki.tid | 0 .../languages/pl-PL/types}/text_x-tiddlywiki.tid | 0 .../languages/pt-BR/types/text_Fx-tiddlywiki.tid | 0 .../languages/pt-PT/types/text_Fx-tiddlywiki.tid | 0 .../languages/ru-RU/types/text_Fx-tiddlywiki.tid | 0 .../languages/sk-SK/types/text_Fx-tiddlywiki.tid | 0 .../languages/sl-SI/types/text_Fx-tiddlywiki.tid | 0 .../languages/sv-SE/types}/text_x-tiddlywiki.tid | 8 ++++---- .../languages/zh-Hans/types}/text_x-tiddlywiki.tid | 0 .../languages/zh-Hant/types}/text_x-tiddlywiki.tid | 0 65 files changed, 31 insertions(+), 116 deletions(-) delete mode 100644 core/language/en-GB/Types/image_x-icon.tid create mode 100644 core/language/en-GB/Types/text_vnd.tiddlywiki_multiple.tid delete mode 100644 languages/ca-ES/Types/image%2Fx-icon.tid delete mode 100644 languages/cs-CZ/Types/image%2Fx-icon.tid delete mode 100644 languages/da-DK/Types/image%2Fx-icon.tid delete mode 100644 languages/de-DE/Types/image_x-icon.tid create mode 100644 languages/de-DE/Types/text_vnd.tiddlywiki_multiple.tid delete mode 100644 languages/el-GR/Types/image%2Fx-icon.tid delete mode 100644 languages/es-ES/Types/image_x-icon.tid delete mode 100644 languages/fr-FR/Types/image_x-icon.tid delete mode 100644 languages/he-IL/Types/image%2Fx-icon.tid delete mode 100644 languages/hi-IN/Types/image%2Fx-icon.tid delete mode 100644 languages/ia-IA/Types/image%2Fx-icon.tid delete mode 100644 languages/it-IT/Types/image_x-icon.tid delete mode 100644 languages/ja-JP/Types/image%2Fx-icon.tid delete mode 100644 languages/ko-KR/Types/image%2Fx-icon.tid delete mode 100644 languages/mk-MK/Types/image%2Fx-icon.tid delete mode 100644 languages/nl-NL/Types/image%2Fx-icon.tid delete mode 100644 languages/pa-IN/Types/image%2Fx-icon.tid delete mode 100644 languages/pl-PL/Types/image_x-icon.tid delete mode 100644 languages/pt-BR/Types/image%2Fx-icon.tid delete mode 100644 languages/pt-PT/Types/image%2Fx-icon.tid delete mode 100644 languages/ru-RU/Types/image%2Fx-icon.tid delete mode 100644 languages/sk-SK/Types/image%2Fx-icon.tid delete mode 100644 languages/sl-SI/Types/image%2Fx-icon.tid delete mode 100755 languages/sv-SE/Types/image_x-icon.tid delete mode 100644 languages/zh-Hans/Types/image_x-icon.tid delete mode 100644 languages/zh-Hant/Types/image_x-icon.tid rename languages/ca-ES/Types/text%2Fx-tiddlywiki.tid => plugins/tiddlywiki/classictools/languages/ca-ES/types/text_Fx-tiddlywiki.tid (100%) rename languages/cs-CZ/Types/text%2Fx-tiddlywiki.tid => plugins/tiddlywiki/classictools/languages/cs-CZ/types/text_Fx-tiddlywiki.tid (100%) rename languages/da-DK/Types/text%2Fx-tiddlywiki.tid => plugins/tiddlywiki/classictools/languages/da-DK/types/text_Fx-tiddlywiki.tid (100%) rename {languages/de-DE/Types => plugins/tiddlywiki/classictools/languages/de-DE/types}/text_x-tiddlywiki.tid (100%) rename languages/el-GR/Types/text%2Fx-tiddlywiki.tid => plugins/tiddlywiki/classictools/languages/el-Gr/types/text_Fx-tiddlywiki.tid (100%) rename {core/language/en-GB/Types => plugins/tiddlywiki/classictools/languages/en-GB/types}/text_x-tiddlywiki.tid (100%) rename {languages/es-ES/Types => plugins/tiddlywiki/classictools/languages/es-ES/types}/text_x-tiddlywiki.tid (100%) rename {languages/fr-FR/Types => plugins/tiddlywiki/classictools/languages/fr-FR/types}/text_x-tiddlywiki.tid (100%) rename languages/he-IL/Types/text%2Fx-tiddlywiki.tid => plugins/tiddlywiki/classictools/languages/he-IL/types/text_Fx-tiddlywiki.tid (100%) rename languages/hi-IN/Types/text%2Fx-tiddlywiki.tid => plugins/tiddlywiki/classictools/languages/hi-IN/types/text_Fx-tiddlywiki.tid (100%) create mode 100644 plugins/tiddlywiki/classictools/languages/ia-IA/types/text_Fx-tiddlywiki.tid rename {languages/it-IT/Types => plugins/tiddlywiki/classictools/languages/it-IT/types}/text_x-tiddlywiki.tid (100%) rename languages/ja-JP/Types/text%2Fx-tiddlywiki.tid => plugins/tiddlywiki/classictools/languages/ja-JP/types/text_Fx-tiddlywiki.tid (100%) rename languages/ko-KR/Types/text%2Fx-tiddlywiki.tid => plugins/tiddlywiki/classictools/languages/ko-KR/types/text_Fx-tiddlywiki.tid (100%) rename languages/mk-MK/Types/text%2Fx-tiddlywiki.tid => plugins/tiddlywiki/classictools/languages/mk-MK/types/text_Fx-tiddlywiki.tid (100%) rename languages/nl-NL/Types/text%2Fx-tiddlywiki.tid => plugins/tiddlywiki/classictools/languages/nl-NL/types/text_Fx-tiddlywiki.tid (100%) rename languages/pa-IN/Types/text%2Fx-tiddlywiki.tid => plugins/tiddlywiki/classictools/languages/pa-IN/types/text_Fx-tiddlywiki.tid (100%) rename {languages/pl-PL/Types => plugins/tiddlywiki/classictools/languages/pl-PL/types}/text_x-tiddlywiki.tid (100%) rename languages/pt-BR/Types/text%2Fx-tiddlywiki.tid => plugins/tiddlywiki/classictools/languages/pt-BR/types/text_Fx-tiddlywiki.tid (100%) rename languages/pt-PT/Types/text%2Fx-tiddlywiki.tid => plugins/tiddlywiki/classictools/languages/pt-PT/types/text_Fx-tiddlywiki.tid (100%) rename languages/ru-RU/Types/text%2Fx-tiddlywiki.tid => plugins/tiddlywiki/classictools/languages/ru-RU/types/text_Fx-tiddlywiki.tid (100%) rename languages/sk-SK/Types/text%2Fx-tiddlywiki.tid => plugins/tiddlywiki/classictools/languages/sk-SK/types/text_Fx-tiddlywiki.tid (100%) rename languages/sl-SI/Types/text%2Fx-tiddlywiki.tid => plugins/tiddlywiki/classictools/languages/sl-SI/types/text_Fx-tiddlywiki.tid (100%) rename {languages/sv-SE/Types => plugins/tiddlywiki/classictools/languages/sv-SE/types}/text_x-tiddlywiki.tid (96%) mode change 100755 => 100644 rename {languages/zh-Hans/Types => plugins/tiddlywiki/classictools/languages/zh-Hans/types}/text_x-tiddlywiki.tid (100%) rename {languages/zh-Hant/Types => plugins/tiddlywiki/classictools/languages/zh-Hant/types}/text_x-tiddlywiki.tid (100%) diff --git a/core/language/en-GB/Types/image_x-icon.tid b/core/language/en-GB/Types/image_x-icon.tid deleted file mode 100644 index 55420387a..000000000 --- a/core/language/en-GB/Types/image_x-icon.tid +++ /dev/null @@ -1,5 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: ICO icon -name: image/x-icon -group: Image -group-sort: 1 diff --git a/core/language/en-GB/Types/text_vnd.tiddlywiki_multiple.tid b/core/language/en-GB/Types/text_vnd.tiddlywiki_multiple.tid new file mode 100644 index 000000000..4fb3f2ec1 --- /dev/null +++ b/core/language/en-GB/Types/text_vnd.tiddlywiki_multiple.tid @@ -0,0 +1,5 @@ +title: $:/language/Docs/Types/text/vnd.tiddlywiki-multiple +description: TiddlyWiki 5 compound tiddler +name: text/vnd.tiddlywiki-multiple +group: Developer +group-sort: 2 diff --git a/languages/ca-ES/Types/image%2Fx-icon.tid b/languages/ca-ES/Types/image%2Fx-icon.tid deleted file mode 100644 index ba79c8f76..000000000 --- a/languages/ca-ES/Types/image%2Fx-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: Format de fitxer d'icona ICO -name: image/x-icon -group: Imatge diff --git a/languages/cs-CZ/Types/image%2Fx-icon.tid b/languages/cs-CZ/Types/image%2Fx-icon.tid deleted file mode 100644 index ff8d12f81..000000000 --- a/languages/cs-CZ/Types/image%2Fx-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: ICO format icon file -name: image/x-icon -group: Image diff --git a/languages/da-DK/Types/image%2Fx-icon.tid b/languages/da-DK/Types/image%2Fx-icon.tid deleted file mode 100644 index 7dd30a011..000000000 --- a/languages/da-DK/Types/image%2Fx-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: ICO ikon fil -name: image/x-icon -group: Billede diff --git a/languages/de-DE/Types/application_javascript.tid b/languages/de-DE/Types/application_javascript.tid index 5d8355058..894a8f727 100644 --- a/languages/de-DE/Types/application_javascript.tid +++ b/languages/de-DE/Types/application_javascript.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/application/javascript description: JS - JavaScript Code name: application/javascript group: Entwickler +group-sort: 2 diff --git a/languages/de-DE/Types/application_json.tid b/languages/de-DE/Types/application_json.tid index 07599cf57..c1768b93f 100644 --- a/languages/de-DE/Types/application_json.tid +++ b/languages/de-DE/Types/application_json.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/application/json description: JSON - Daten name: application/json group: Entwickler +group-sort: 2 diff --git a/languages/de-DE/Types/application_x_tiddler_dictionary.tid b/languages/de-DE/Types/application_x_tiddler_dictionary.tid index 0eeb94feb..97ba09970 100644 --- a/languages/de-DE/Types/application_x_tiddler_dictionary.tid +++ b/languages/de-DE/Types/application_x_tiddler_dictionary.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/application/x-tiddler-dictionary description: TiddlyWiki Datenkatalog name: application/x-tiddler-dictionary group: Entwickler +group-sort: 2 diff --git a/languages/de-DE/Types/image_gif.tid b/languages/de-DE/Types/image_gif.tid index cadd49999..a214a46b6 100644 --- a/languages/de-DE/Types/image_gif.tid +++ b/languages/de-DE/Types/image_gif.tid @@ -1,4 +1,5 @@ title: $:/language/Docs/Types/image/gif description: GIF - Bild name: image/gif -group: Bilder \ No newline at end of file +group: Bilder +group-sort: 1 \ No newline at end of file diff --git a/languages/de-DE/Types/image_jpeg.tid b/languages/de-DE/Types/image_jpeg.tid index 2a0c59998..15b3ec725 100644 --- a/languages/de-DE/Types/image_jpeg.tid +++ b/languages/de-DE/Types/image_jpeg.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/image/jpeg description: JPEG - Bild name: image/jpeg group: Bilder +group-sort: 1 diff --git a/languages/de-DE/Types/image_png.tid b/languages/de-DE/Types/image_png.tid index 1f330eff1..140b669f3 100644 --- a/languages/de-DE/Types/image_png.tid +++ b/languages/de-DE/Types/image_png.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/image/png description: PNG - Portable Netzwerkgrafik name: image/png group: Bilder +group-sort: 1 diff --git a/languages/de-DE/Types/image_svg_xml.tid b/languages/de-DE/Types/image_svg_xml.tid index 6a008c87f..ab9ee72ec 100644 --- a/languages/de-DE/Types/image_svg_xml.tid +++ b/languages/de-DE/Types/image_svg_xml.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/image/svg+xml description: SVG - Strukturierte Vektor Graphik name: image/svg+xml group: Bilder +group-sort: 1 diff --git a/languages/de-DE/Types/image_x-icon.tid b/languages/de-DE/Types/image_x-icon.tid deleted file mode 100644 index 043071d97..000000000 --- a/languages/de-DE/Types/image_x-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: ICO - Piktogramm (Icon) -name: image/x-icon -group: Bilder diff --git a/languages/de-DE/Types/text_css.tid b/languages/de-DE/Types/text_css.tid index 0ac501127..95038c03c 100644 --- a/languages/de-DE/Types/text_css.tid +++ b/languages/de-DE/Types/text_css.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/text/css description: CSS - Cascading Style Sheets name: text/css group: Entwickler +group-sort: 2 diff --git a/languages/de-DE/Types/text_html.tid b/languages/de-DE/Types/text_html.tid index a94db47c4..974920715 100644 --- a/languages/de-DE/Types/text_html.tid +++ b/languages/de-DE/Types/text_html.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/text/html description: HTML - Auszeichnungssprache name: text/html group: Text +group-sort: 0 \ No newline at end of file diff --git a/languages/de-DE/Types/text_plain.tid b/languages/de-DE/Types/text_plain.tid index 8246411ba..d1e96034c 100644 --- a/languages/de-DE/Types/text_plain.tid +++ b/languages/de-DE/Types/text_plain.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/text/plain description: TXT - Unformatierter Text name: text/plain group: Text +group-sort: 0 \ No newline at end of file diff --git a/languages/de-DE/Types/text_vnd.tiddlywiki.tid b/languages/de-DE/Types/text_vnd.tiddlywiki.tid index fdcc917dd..ec8342a24 100644 --- a/languages/de-DE/Types/text_vnd.tiddlywiki.tid +++ b/languages/de-DE/Types/text_vnd.tiddlywiki.tid @@ -1,4 +1,5 @@ title: $:/language/Docs/Types/text/vnd.tiddlywiki -description: TW5 - TiddlyWiki Version 5 Wikitext +description: TW5 - TiddlyWiki Wikitext name: text/vnd.tiddlywiki group: Text +group-sort: 0 \ No newline at end of file diff --git a/languages/de-DE/Types/text_vnd.tiddlywiki_multiple.tid b/languages/de-DE/Types/text_vnd.tiddlywiki_multiple.tid new file mode 100644 index 000000000..2c192f96f --- /dev/null +++ b/languages/de-DE/Types/text_vnd.tiddlywiki_multiple.tid @@ -0,0 +1,5 @@ +title: $:/language/Docs/Types/text/vnd.tiddlywiki-multiple +description: TW5 - TiddlyWiki Wikitext Verbund Tiddler +name: text/vnd.tiddlywiki-multiple +group: Entwickler +group-sort: 2 diff --git a/languages/el-GR/Types/image%2Fx-icon.tid b/languages/el-GR/Types/image%2Fx-icon.tid deleted file mode 100644 index 43fc68aeb..000000000 --- a/languages/el-GR/Types/image%2Fx-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: Αρχείο Εικονιδίου μορφής ICO -name: image/x-icon -group: Εικόνας diff --git a/languages/es-ES/Types/image_x-icon.tid b/languages/es-ES/Types/image_x-icon.tid deleted file mode 100644 index 9a3574bca..000000000 --- a/languages/es-ES/Types/image_x-icon.tid +++ /dev/null @@ -1,5 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: Archivo de icono en formato .ICO -name: image/x-icon -group: Imagen -group-sort: 1 diff --git a/languages/fr-FR/Types/image_x-icon.tid b/languages/fr-FR/Types/image_x-icon.tid deleted file mode 100644 index 15f41cb65..000000000 --- a/languages/fr-FR/Types/image_x-icon.tid +++ /dev/null @@ -1,5 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: icône au format ICO -name: image/x-icon -group: Image -group-sort: 1 diff --git a/languages/he-IL/Types/image%2Fx-icon.tid b/languages/he-IL/Types/image%2Fx-icon.tid deleted file mode 100644 index 55a37c04a..000000000 --- a/languages/he-IL/Types/image%2Fx-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: ICO format קובץ סמליל -name: image/x-icon -group: תמונה diff --git a/languages/hi-IN/Types/image%2Fx-icon.tid b/languages/hi-IN/Types/image%2Fx-icon.tid deleted file mode 100644 index 2f2ec7b8e..000000000 --- a/languages/hi-IN/Types/image%2Fx-icon.tid +++ /dev/null @@ -1,5 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: ICO के प्रारूप आइकन फ़ाइल -name: image/x-icon -group: - छवि diff --git a/languages/ia-IA/Types/image%2Fx-icon.tid b/languages/ia-IA/Types/image%2Fx-icon.tid deleted file mode 100644 index d5057ea68..000000000 --- a/languages/ia-IA/Types/image%2Fx-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: File de formato de icones ICO -name: image/x-icon -group: Imagine diff --git a/languages/it-IT/Types/image_x-icon.tid b/languages/it-IT/Types/image_x-icon.tid deleted file mode 100644 index f0c922f95..000000000 --- a/languages/it-IT/Types/image_x-icon.tid +++ /dev/null @@ -1,5 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: File icona ICO -name: image/x-icon -group: Immagine -group-sort: 1 diff --git a/languages/ja-JP/Types/image%2Fx-icon.tid b/languages/ja-JP/Types/image%2Fx-icon.tid deleted file mode 100644 index 9baa98ea8..000000000 --- a/languages/ja-JP/Types/image%2Fx-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: アイコンファイル（ICO 形式） -name: image/x-icon -group: Image diff --git a/languages/ko-KR/Types/image%2Fx-icon.tid b/languages/ko-KR/Types/image%2Fx-icon.tid deleted file mode 100644 index c0708db36..000000000 --- a/languages/ko-KR/Types/image%2Fx-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: ICO 형식 아이콘 파일 -name: image/x-icon -group: 그림 diff --git a/languages/mk-MK/Types/image%2Fx-icon.tid b/languages/mk-MK/Types/image%2Fx-icon.tid deleted file mode 100644 index 0f28bb5b8..000000000 --- a/languages/mk-MK/Types/image%2Fx-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: ICO икона -name: image/x-icon -group: Фотографија diff --git a/languages/nl-NL/Types/image%2Fx-icon.tid b/languages/nl-NL/Types/image%2Fx-icon.tid deleted file mode 100644 index 5cfa06148..000000000 --- a/languages/nl-NL/Types/image%2Fx-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: ICO pictogram (icon) -name: image/x-icon -group: Afbeelding diff --git a/languages/pa-IN/Types/image%2Fx-icon.tid b/languages/pa-IN/Types/image%2Fx-icon.tid deleted file mode 100644 index dfee8dc3d..000000000 --- a/languages/pa-IN/Types/image%2Fx-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: ICO ਫਾਰਮੈਟ ਆਈਕਾਨ ਫਾਇਲ -name: image/x-icon -group: ਚਿੱਤਰ diff --git a/languages/pl-PL/Types/image_x-icon.tid b/languages/pl-PL/Types/image_x-icon.tid deleted file mode 100644 index 624000820..000000000 --- a/languages/pl-PL/Types/image_x-icon.tid +++ /dev/null @@ -1,5 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: Ikona w formacie ICO -name: image/x-icon -group: Image -group-sort: 1 diff --git a/languages/pt-BR/Types/image%2Fx-icon.tid b/languages/pt-BR/Types/image%2Fx-icon.tid deleted file mode 100644 index 2cbf89338..000000000 --- a/languages/pt-BR/Types/image%2Fx-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: Ícone em formato de arquivo ICO -name: image/x-icon -group: Imagem diff --git a/languages/pt-PT/Types/image%2Fx-icon.tid b/languages/pt-PT/Types/image%2Fx-icon.tid deleted file mode 100644 index 04f08c6e8..000000000 --- a/languages/pt-PT/Types/image%2Fx-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: Ícone em formato de ficheiro ICO -name: image/x-icon -group: Imagem diff --git a/languages/ru-RU/Types/image%2Fx-icon.tid b/languages/ru-RU/Types/image%2Fx-icon.tid deleted file mode 100644 index fc268f917..000000000 --- a/languages/ru-RU/Types/image%2Fx-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: ICO значок -name: image/x-icon -group: Изображение diff --git a/languages/sk-SK/Types/image%2Fx-icon.tid b/languages/sk-SK/Types/image%2Fx-icon.tid deleted file mode 100644 index 56695bf3b..000000000 --- a/languages/sk-SK/Types/image%2Fx-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: ICO formát pre súbor ikony -name: image/x-icon -group: Obrázok diff --git a/languages/sl-SI/Types/image%2Fx-icon.tid b/languages/sl-SI/Types/image%2Fx-icon.tid deleted file mode 100644 index 7007c1ac3..000000000 --- a/languages/sl-SI/Types/image%2Fx-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: Datoteka s ikono oblike ICO -name: image/x-icon -group: Slika diff --git a/languages/sv-SE/Types/image_x-icon.tid b/languages/sv-SE/Types/image_x-icon.tid deleted file mode 100755 index 78ba4e19b..000000000 --- a/languages/sv-SE/Types/image_x-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: ICO ikonfil -name: image/x-icon -group: Bild diff --git a/languages/zh-Hans/Types/image_x-icon.tid b/languages/zh-Hans/Types/image_x-icon.tid deleted file mode 100644 index a5b5159bc..000000000 --- a/languages/zh-Hans/Types/image_x-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: ICO 图标 -name: image/x-icon -group: 图像 diff --git a/languages/zh-Hant/Types/image_x-icon.tid b/languages/zh-Hant/Types/image_x-icon.tid deleted file mode 100644 index 5dd06b877..000000000 --- a/languages/zh-Hant/Types/image_x-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: ICO 圖示 -name: image/x-icon -group: 圖片 diff --git a/languages/ca-ES/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/ca-ES/types/text_Fx-tiddlywiki.tid similarity index 100% rename from languages/ca-ES/Types/text%2Fx-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/ca-ES/types/text_Fx-tiddlywiki.tid diff --git a/languages/cs-CZ/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/cs-CZ/types/text_Fx-tiddlywiki.tid similarity index 100% rename from languages/cs-CZ/Types/text%2Fx-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/cs-CZ/types/text_Fx-tiddlywiki.tid diff --git a/languages/da-DK/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/da-DK/types/text_Fx-tiddlywiki.tid similarity index 100% rename from languages/da-DK/Types/text%2Fx-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/da-DK/types/text_Fx-tiddlywiki.tid diff --git a/languages/de-DE/Types/text_x-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/de-DE/types/text_x-tiddlywiki.tid similarity index 100% rename from languages/de-DE/Types/text_x-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/de-DE/types/text_x-tiddlywiki.tid diff --git a/languages/el-GR/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/el-Gr/types/text_Fx-tiddlywiki.tid similarity index 100% rename from languages/el-GR/Types/text%2Fx-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/el-Gr/types/text_Fx-tiddlywiki.tid diff --git a/core/language/en-GB/Types/text_x-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/en-GB/types/text_x-tiddlywiki.tid similarity index 100% rename from core/language/en-GB/Types/text_x-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/en-GB/types/text_x-tiddlywiki.tid diff --git a/languages/es-ES/Types/text_x-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/es-ES/types/text_x-tiddlywiki.tid similarity index 100% rename from languages/es-ES/Types/text_x-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/es-ES/types/text_x-tiddlywiki.tid diff --git a/languages/fr-FR/Types/text_x-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/fr-FR/types/text_x-tiddlywiki.tid similarity index 100% rename from languages/fr-FR/Types/text_x-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/fr-FR/types/text_x-tiddlywiki.tid diff --git a/languages/he-IL/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/he-IL/types/text_Fx-tiddlywiki.tid similarity index 100% rename from languages/he-IL/Types/text%2Fx-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/he-IL/types/text_Fx-tiddlywiki.tid diff --git a/languages/hi-IN/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/hi-IN/types/text_Fx-tiddlywiki.tid similarity index 100% rename from languages/hi-IN/Types/text%2Fx-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/hi-IN/types/text_Fx-tiddlywiki.tid diff --git a/plugins/tiddlywiki/classictools/languages/ia-IA/types/text_Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/ia-IA/types/text_Fx-tiddlywiki.tid new file mode 100644 index 000000000..802e23ce2 --- /dev/null +++ b/plugins/tiddlywiki/classictools/languages/ia-IA/types/text_Fx-tiddlywiki.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/text/x-tiddlywiki +description: TiddlyWiki Classic +name: text/x-tiddlywiki +group: Texto diff --git a/languages/it-IT/Types/text_x-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/it-IT/types/text_x-tiddlywiki.tid similarity index 100% rename from languages/it-IT/Types/text_x-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/it-IT/types/text_x-tiddlywiki.tid diff --git a/languages/ja-JP/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/ja-JP/types/text_Fx-tiddlywiki.tid similarity index 100% rename from languages/ja-JP/Types/text%2Fx-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/ja-JP/types/text_Fx-tiddlywiki.tid diff --git a/languages/ko-KR/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/ko-KR/types/text_Fx-tiddlywiki.tid similarity index 100% rename from languages/ko-KR/Types/text%2Fx-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/ko-KR/types/text_Fx-tiddlywiki.tid diff --git a/languages/mk-MK/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/mk-MK/types/text_Fx-tiddlywiki.tid similarity index 100% rename from languages/mk-MK/Types/text%2Fx-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/mk-MK/types/text_Fx-tiddlywiki.tid diff --git a/languages/nl-NL/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/nl-NL/types/text_Fx-tiddlywiki.tid similarity index 100% rename from languages/nl-NL/Types/text%2Fx-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/nl-NL/types/text_Fx-tiddlywiki.tid diff --git a/languages/pa-IN/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/pa-IN/types/text_Fx-tiddlywiki.tid similarity index 100% rename from languages/pa-IN/Types/text%2Fx-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/pa-IN/types/text_Fx-tiddlywiki.tid diff --git a/languages/pl-PL/Types/text_x-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/pl-PL/types/text_x-tiddlywiki.tid similarity index 100% rename from languages/pl-PL/Types/text_x-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/pl-PL/types/text_x-tiddlywiki.tid diff --git a/languages/pt-BR/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/pt-BR/types/text_Fx-tiddlywiki.tid similarity index 100% rename from languages/pt-BR/Types/text%2Fx-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/pt-BR/types/text_Fx-tiddlywiki.tid diff --git a/languages/pt-PT/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/pt-PT/types/text_Fx-tiddlywiki.tid similarity index 100% rename from languages/pt-PT/Types/text%2Fx-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/pt-PT/types/text_Fx-tiddlywiki.tid diff --git a/languages/ru-RU/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/ru-RU/types/text_Fx-tiddlywiki.tid similarity index 100% rename from languages/ru-RU/Types/text%2Fx-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/ru-RU/types/text_Fx-tiddlywiki.tid diff --git a/languages/sk-SK/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/sk-SK/types/text_Fx-tiddlywiki.tid similarity index 100% rename from languages/sk-SK/Types/text%2Fx-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/sk-SK/types/text_Fx-tiddlywiki.tid diff --git a/languages/sl-SI/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/sl-SI/types/text_Fx-tiddlywiki.tid similarity index 100% rename from languages/sl-SI/Types/text%2Fx-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/sl-SI/types/text_Fx-tiddlywiki.tid diff --git a/languages/sv-SE/Types/text_x-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/sv-SE/types/text_x-tiddlywiki.tid old mode 100755 new mode 100644 similarity index 96% rename from languages/sv-SE/Types/text_x-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/sv-SE/types/text_x-tiddlywiki.tid index c62e54531..145da212d --- a/languages/sv-SE/Types/text_x-tiddlywiki.tid +++ b/plugins/tiddlywiki/classictools/languages/sv-SE/types/text_x-tiddlywiki.tid @@ -1,4 +1,4 @@ -title: $:/language/Docs/Types/text/x-tiddlywiki -description: TiddlyWiki klassisk -name: text/x-tiddlywiki -group: Text +title: $:/language/Docs/Types/text/x-tiddlywiki +description: TiddlyWiki klassisk +name: text/x-tiddlywiki +group: Text diff --git a/languages/zh-Hans/Types/text_x-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/zh-Hans/types/text_x-tiddlywiki.tid similarity index 100% rename from languages/zh-Hans/Types/text_x-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/zh-Hans/types/text_x-tiddlywiki.tid diff --git a/languages/zh-Hant/Types/text_x-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/zh-Hant/types/text_x-tiddlywiki.tid similarity index 100% rename from languages/zh-Hant/Types/text_x-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/zh-Hant/types/text_x-tiddlywiki.tid From ada5af5af4b8c5f1684b67394844504a52a52718 Mon Sep 17 00:00:00 2001 From: Bram Chen Date: Tue, 30 Jul 2024 18:45:06 +0800 Subject: [PATCH 11/18] Update chinese language files (#8453) * imrove simplied chinese translations for Snippets/ProcedureDefinition * add chinese translations for text/vnd.tiddlywiki-multiple --- languages/zh-Hans/Snippets/ProcedureDefinition.tid | 4 ++-- languages/zh-Hans/Types/text_vnd.tiddlywiki_multiple.tid | 5 +++++ languages/zh-Hant/Types/text_vnd.tiddlywiki_multiple.tid | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 languages/zh-Hans/Types/text_vnd.tiddlywiki_multiple.tid create mode 100644 languages/zh-Hant/Types/text_vnd.tiddlywiki_multiple.tid diff --git a/languages/zh-Hans/Snippets/ProcedureDefinition.tid b/languages/zh-Hans/Snippets/ProcedureDefinition.tid index d6445349b..3b4f60212 100644 --- a/languages/zh-Hans/Snippets/ProcedureDefinition.tid +++ b/languages/zh-Hans/Snippets/ProcedureDefinition.tid @@ -2,6 +2,6 @@ title: $:/language/Snippets/ProcedureDefinition tags: $:/tags/TextEditor/Snippet caption: 程序定义 -\procedure procName(param1:"预设值",param2) -这里就是您的文字了。 +\procedure procName(param1:"默认值",param2) +这里就是您的文本了。 \end diff --git a/languages/zh-Hans/Types/text_vnd.tiddlywiki_multiple.tid b/languages/zh-Hans/Types/text_vnd.tiddlywiki_multiple.tid new file mode 100644 index 000000000..dd8e72be9 --- /dev/null +++ b/languages/zh-Hans/Types/text_vnd.tiddlywiki_multiple.tid @@ -0,0 +1,5 @@ +title: $:/language/Docs/Types/text/vnd.tiddlywiki-multiple +description: TiddlyWiki 5 复合条目 +name: text/vnd.tiddlywiki-multiple +group: 开发者 +group-sort: 2 diff --git a/languages/zh-Hant/Types/text_vnd.tiddlywiki_multiple.tid b/languages/zh-Hant/Types/text_vnd.tiddlywiki_multiple.tid new file mode 100644 index 000000000..745734788 --- /dev/null +++ b/languages/zh-Hant/Types/text_vnd.tiddlywiki_multiple.tid @@ -0,0 +1,5 @@ +title: $:/language/Docs/Types/text/vnd.tiddlywiki-multiple +description: TiddlyWiki 5 複合條目 +name: text/vnd.tiddlywiki-multiple +group: 開發者 +group-sort: 2 From 22286aa569ae1c829285c84c158bf018808cfe72 Mon Sep 17 00:00:00 2001 From: Leilei332 Date: Wed, 31 Jul 2024 20:38:25 +0800 Subject: [PATCH 12/18] Add image toolbar dropdown to markdown plugin (#8459) * Add image toolbar dropdown to markdown plugin * Escape special characters --- .../EditorToolbar/picture-dropdown.tid | 24 +++++++++++++++++++ .../markdown/EditorToolbar/picture.tid | 10 ++++++++ 2 files changed, 34 insertions(+) create mode 100644 plugins/tiddlywiki/markdown/EditorToolbar/picture-dropdown.tid create mode 100644 plugins/tiddlywiki/markdown/EditorToolbar/picture.tid diff --git a/plugins/tiddlywiki/markdown/EditorToolbar/picture-dropdown.tid b/plugins/tiddlywiki/markdown/EditorToolbar/picture-dropdown.tid new file mode 100644 index 000000000..966c991fd --- /dev/null +++ b/plugins/tiddlywiki/markdown/EditorToolbar/picture-dropdown.tid @@ -0,0 +1,24 @@ +title: $:/plugins/tiddlywiki/markdown/EditorToolbar/picture-dropdown + +\define replacement-text() +![](<#$(escaped-text)$>) +\end + +\define escapetitle() [()<>\\] + +''{{$:/language/Buttons/Picture/Hint}}'' + +<$macrocall $name="image-picker" actions=""" + +<$let escaped-text={{{ [search-replace:g:regexp,[\$&]] }}}> +<$action-sendmessage + $message="tm-edit-text-operation" + $param="replace-selection" + text=<> +/> + +<$action-deletetiddler + $tiddler=<> +/> + +"""/> diff --git a/plugins/tiddlywiki/markdown/EditorToolbar/picture.tid b/plugins/tiddlywiki/markdown/EditorToolbar/picture.tid new file mode 100644 index 000000000..27e108c81 --- /dev/null +++ b/plugins/tiddlywiki/markdown/EditorToolbar/picture.tid @@ -0,0 +1,10 @@ +title: $:/plugins/tiddlywiki/markdown/EditorToolbar/picture +list-after: $:/core/ui/EditorToolbar/picture +tags: $:/tags/EditorToolbar +icon: $:/core/images/picture +caption: {{$:/language/Buttons/Picture/Caption}} (Markdown) +description: {{$:/language/Buttons/Picture/Hint}} +condition: [type[text/x-markdown]] [type[text/markdown]] +shortcuts: ((picture)) +dropdown: $:/plugins/tiddlywiki/markdown/EditorToolbar/picture-dropdown + From 39bd45002ea051a6dc98fe8a2b4ff91826119e9a Mon Sep 17 00:00:00 2001 From: poc2go Date: Thu, 1 Aug 2024 06:47:37 -0400 Subject: [PATCH 13/18] Test to verify that reserved wikitext constructs are not parsed (#8384) --- .../reserved-wikitext/ReservedWikiText.tid | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 editions/test/tiddlers/tests/data/reserved-wikitext/ReservedWikiText.tid diff --git a/editions/test/tiddlers/tests/data/reserved-wikitext/ReservedWikiText.tid b/editions/test/tiddlers/tests/data/reserved-wikitext/ReservedWikiText.tid new file mode 100644 index 000000000..b9b77f160 --- /dev/null +++ b/editions/test/tiddlers/tests/data/reserved-wikitext/ReservedWikiText.tid @@ -0,0 +1,54 @@ +title: ReservedWikiText +description: Verify that reserved wikitext constructions are not parsed +type: text/vnd.tiddlywiki-multiple +tags: [[$:/tags/wiki-test-spec]] + +title: Narrative + +Verifies that certain wikitext constructions that are reserved for use by other tools are not parsed by TiddlyWiki. ++ +title: TestTiddler + +{%%} +(==) +{% %} +(= =) +{% something %} +(= something =) +Inline {% something %} substitution +Inline (= something =) substitution +Prefix-{% +Prefix-(= +%}-Postfix +=)-Postfix + {% + (= + %} + =) ++ +title: Output + +<$wikify name="parsetree" text={{TestTiddler}} output="parsetree"> +<$text text={{{ [jsonget[0],[children],[0],[text]] }}}/> + ++ +title: ExpectedResult + +

+{%%} +(==) +{% %} +(= =) +{% something %} +(= something =) +Inline {% something %} substitution +Inline (= something =) substitution +Prefix-{% +Prefix-(= +%}-Postfix +=)-Postfix + {% + (= + %} + =) +

\ No newline at end of file From 5c43512a56b9e08e680ad555439d8932ea2b9164 Mon Sep 17 00:00:00 2001 From: Mohammad Rahmani <830394+kookma@users.noreply.github.com> Date: Thu, 1 Aug 2024 19:13:10 +0330 Subject: [PATCH 14/18] Shorter Title of Compound Tiddler in Type Field Dropdown Menu (#8469) * Update text_vnd.tiddlywiki_multiple.tid This PR addresses the idea in #8465 * Update text_vnd.tiddlywiki_multiple.tid This addresses the idea in #8465 for de-DE language --- core/language/en-GB/Types/text_vnd.tiddlywiki_multiple.tid | 2 +- languages/de-DE/Types/text_vnd.tiddlywiki_multiple.tid | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/language/en-GB/Types/text_vnd.tiddlywiki_multiple.tid b/core/language/en-GB/Types/text_vnd.tiddlywiki_multiple.tid index 4fb3f2ec1..af15d7ac3 100644 --- a/core/language/en-GB/Types/text_vnd.tiddlywiki_multiple.tid +++ b/core/language/en-GB/Types/text_vnd.tiddlywiki_multiple.tid @@ -1,5 +1,5 @@ title: $:/language/Docs/Types/text/vnd.tiddlywiki-multiple -description: TiddlyWiki 5 compound tiddler +description: Compound tiddler name: text/vnd.tiddlywiki-multiple group: Developer group-sort: 2 diff --git a/languages/de-DE/Types/text_vnd.tiddlywiki_multiple.tid b/languages/de-DE/Types/text_vnd.tiddlywiki_multiple.tid index 2c192f96f..ab32b262c 100644 --- a/languages/de-DE/Types/text_vnd.tiddlywiki_multiple.tid +++ b/languages/de-DE/Types/text_vnd.tiddlywiki_multiple.tid @@ -1,5 +1,5 @@ title: $:/language/Docs/Types/text/vnd.tiddlywiki-multiple -description: TW5 - TiddlyWiki Wikitext Verbund Tiddler +description: Verbund Tiddler name: text/vnd.tiddlywiki-multiple group: Entwickler group-sort: 2 From 57d3e8e765cda7dadce9f021a5caab2dcfb9b4a8 Mon Sep 17 00:00:00 2001 From: lin onetwo Date: Fri, 2 Aug 2024 01:01:22 +0800 Subject: [PATCH 15/18] Feat: allow tags have its ViewTemplate tag and cascade (#8462) * feat: allow tags have its ViewTemplate tag and cascade * feat: quick addition of subtitle cascade * docs: tag subtitle cascade control panel * Update ControlPanel.multids --- core/language/en-GB/ControlPanel.multids | 4 ++++ .../ui/ControlPanel/Cascades/ViewTemplateSubtitle.tid | 9 +++++++++ core/ui/ControlPanel/Cascades/ViewTemplateTags.tid | 9 +++++++++ core/ui/ViewTemplate/subtitle.tid | 8 +------- core/ui/ViewTemplate/subtitle/default.tid | 10 ++++++++++ core/ui/ViewTemplate/tags.tid | 4 +--- core/ui/ViewTemplate/tags/default.tid | 11 +++++++++++ languages/zh-Hans/ControlPanel.multids | 4 ++++ languages/zh-Hant/ControlPanel.multids | 6 +++++- 9 files changed, 54 insertions(+), 11 deletions(-) create mode 100644 core/ui/ControlPanel/Cascades/ViewTemplateSubtitle.tid create mode 100644 core/ui/ControlPanel/Cascades/ViewTemplateTags.tid create mode 100644 core/ui/ViewTemplate/subtitle/default.tid create mode 100644 core/ui/ViewTemplate/tags/default.tid diff --git a/core/language/en-GB/ControlPanel.multids b/core/language/en-GB/ControlPanel.multids index 93cfc3c10..772949c0d 100644 --- a/core/language/en-GB/ControlPanel.multids +++ b/core/language/en-GB/ControlPanel.multids @@ -235,3 +235,7 @@ ViewTemplateBody/Caption: View Template Body ViewTemplateBody/Hint: This rule cascade is used by the default view template to dynamically choose the template for displaying the body of a tiddler. ViewTemplateTitle/Caption: View Template Title ViewTemplateTitle/Hint: This rule cascade is used by the default view template to dynamically choose the template for displaying the title of a tiddler. +ViewTemplateSubtitle/Caption: View Template Subtitle +ViewTemplateSubtitle/Hint: This rule cascade is used by the default view template to dynamically choose the template for displaying the subtitle of a tiddler. +ViewTemplateTags/Caption: View Template Tags +ViewTemplateTags/Hint: This rule cascade is used by the default view template to dynamically choose the template for displaying the tags area of a tiddler. diff --git a/core/ui/ControlPanel/Cascades/ViewTemplateSubtitle.tid b/core/ui/ControlPanel/Cascades/ViewTemplateSubtitle.tid new file mode 100644 index 000000000..5ba1234ae --- /dev/null +++ b/core/ui/ControlPanel/Cascades/ViewTemplateSubtitle.tid @@ -0,0 +1,9 @@ +title: $:/core/ui/ControlPanel/ViewTemplateSubtitle +tags: $:/tags/ControlPanel/Cascades +caption: {{$:/language/ControlPanel/ViewTemplateSubtitle/Caption}} + +\define lingo-base() $:/language/ControlPanel/ViewTemplateSubtitle/ + +<> + +{{$:/tags/ViewTemplateSubtitleFilter||$:/snippets/ListTaggedCascade}} diff --git a/core/ui/ControlPanel/Cascades/ViewTemplateTags.tid b/core/ui/ControlPanel/Cascades/ViewTemplateTags.tid new file mode 100644 index 000000000..3cea12307 --- /dev/null +++ b/core/ui/ControlPanel/Cascades/ViewTemplateTags.tid @@ -0,0 +1,9 @@ +title: $:/core/ui/ControlPanel/ViewTemplateTags +tags: $:/tags/ControlPanel/Cascades +caption: {{$:/language/ControlPanel/ViewTemplateTags/Caption}} + +\define lingo-base() $:/language/ControlPanel/ViewTemplateTags/ + +<> + +{{$:/tags/ViewTemplateTagsFilter||$:/snippets/ListTaggedCascade}} diff --git a/core/ui/ViewTemplate/subtitle.tid b/core/ui/ViewTemplate/subtitle.tid index a7c010287..013f0266b 100644 --- a/core/ui/ViewTemplate/subtitle.tid +++ b/core/ui/ViewTemplate/subtitle.tid @@ -2,10 +2,4 @@ title: $:/core/ui/ViewTemplate/subtitle tags: $:/tags/ViewTemplate \whitespace trim -<$reveal type="nomatch" stateTitle=<> text="hide" tag="div" retain="yes" animate="yes"> -
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewTemplate/Subtitle]!has[draft.of]]" variable="subtitleTiddler"> -<$transclude tiddler=<> mode="inline"/><$list-join>  - -
- +<$transclude tiddler={{{ [] :cascade[all[shadows+tiddlers]tag[$:/tags/ViewTemplateSubtitleFilter]!is[draft]get[text]] :and[!is[blank]else[$:/core/ui/ViewTemplate/subtitle/default]] }}} /> \ No newline at end of file diff --git a/core/ui/ViewTemplate/subtitle/default.tid b/core/ui/ViewTemplate/subtitle/default.tid new file mode 100644 index 000000000..3885dc779 --- /dev/null +++ b/core/ui/ViewTemplate/subtitle/default.tid @@ -0,0 +1,10 @@ +title: $:/core/ui/ViewTemplate/subtitle/default + +\whitespace trim +<$reveal type="nomatch" stateTitle=<> text="hide" tag="div" retain="yes" animate="yes"> +
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewTemplate/Subtitle]!has[draft.of]]" variable="subtitleTiddler"> +<$transclude tiddler=<> mode="inline"/><$list-join>  + +
+ diff --git a/core/ui/ViewTemplate/tags.tid b/core/ui/ViewTemplate/tags.tid index d1f4e55c9..fc09c571a 100644 --- a/core/ui/ViewTemplate/tags.tid +++ b/core/ui/ViewTemplate/tags.tid @@ -2,6 +2,4 @@ title: $:/core/ui/ViewTemplate/tags tags: $:/tags/ViewTemplate \whitespace trim -<$reveal type="nomatch" stateTitle=<> text="hide" tag="div" retain="yes" animate="yes"> -
<$list filter="[all[current]tags[]sort[title]]" template="$:/core/ui/TagTemplate" storyview="pop"/>
- +<$transclude tiddler={{{ [] :cascade[all[shadows+tiddlers]tag[$:/tags/ViewTemplateTagsFilter]!is[draft]get[text]] :and[!is[blank]else[$:/core/ui/ViewTemplate/tags/default]] }}} /> \ No newline at end of file diff --git a/core/ui/ViewTemplate/tags/default.tid b/core/ui/ViewTemplate/tags/default.tid new file mode 100644 index 000000000..d524bfccd --- /dev/null +++ b/core/ui/ViewTemplate/tags/default.tid @@ -0,0 +1,11 @@ +title: $:/core/ui/ViewTemplate/tags/default + +\whitespace trim +<$reveal type="nomatch" stateTitle=<> text="hide" tag="div" retain="yes" animate="yes"> +
+ <$list filter="[all[current]tags[]sort[title]]" template="$:/core/ui/TagTemplate" storyview="pop"/> + <$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewTemplate/Tags]!has[draft.of]]"> + <$transclude mode="inline"/> + +
+ diff --git a/languages/zh-Hans/ControlPanel.multids b/languages/zh-Hans/ControlPanel.multids index 258c051ad..33bc5e9ce 100644 --- a/languages/zh-Hans/ControlPanel.multids +++ b/languages/zh-Hans/ControlPanel.multids @@ -236,3 +236,7 @@ ViewTemplateBody/Caption: 查看模板主体 ViewTemplateBody/Hint: 默认的查看模板使用此规则级联，动态选择模板以显示条目的主体。 ViewTemplateTitle/Caption: 查看模板标题 ViewTemplateTitle/Hint: 默认的查看模板使用此规则级联，动态选择模板以显示条目的标题。 +ViewTemplateSubtitle/Caption: 查看模板副标题 +ViewTemplateSubtitle/Hint: 默认的查看模板使用此规则级联，动态选择模板以显示条目的副标题。 +ViewTemplateTags/Caption: 查看模板标签区 +ViewTemplateTags/Hint: 默认的查看模板使用此规则级联，动态选择模板以显示条目的标签区域。 diff --git a/languages/zh-Hant/ControlPanel.multids b/languages/zh-Hant/ControlPanel.multids index 497b72e49..853ca98d5 100644 --- a/languages/zh-Hant/ControlPanel.multids +++ b/languages/zh-Hant/ControlPanel.multids @@ -235,4 +235,8 @@ Tools/Download/Full/Caption: 下載完整副本 ViewTemplateBody/Caption: 檢視範本主體 ViewTemplateBody/Hint: 預設的檢視範本使用此規則級聯，動態選擇範本以顯示條目的主體。 ViewTemplateTitle/Caption: 檢視範本標題 -ViewTemplateTitle/Hint: 預設的檢視範本使用此規則級聯，動態選擇範本以顯示條目的標題。 \ No newline at end of file +ViewTemplateTitle/Hint: 預設的檢視範本使用此規則級聯，動態選擇範本以顯示條目的標題。 +ViewTemplateSubtitle/Caption: 檢視範本副標題 +ViewTemplateSubtitle/Hint: 預設的檢視範本使用此規則級聯，動態選擇範本以顯示條目的副標題。 +ViewTemplateTags/Caption: 檢視範本標籤 +ViewTemplateTags/Hint: 預設的檢視範本使用此規則級聯，動態選擇範本以顯示條目的標籤。 \ No newline at end of file From 77335a42b534613e3300f56d9bc24b1a029cad74 Mon Sep 17 00:00:00 2001 From: lin onetwo Date: Fri, 2 Aug 2024 16:45:52 +0800 Subject: [PATCH 16/18] Fix: add cascade configs (#8470) --- core/wiki/config/ViewTemplateSubtitleFilters.multids | 4 ++++ core/wiki/config/ViewTemplateTagsFilters.multids | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 core/wiki/config/ViewTemplateSubtitleFilters.multids create mode 100644 core/wiki/config/ViewTemplateTagsFilters.multids diff --git a/core/wiki/config/ViewTemplateSubtitleFilters.multids b/core/wiki/config/ViewTemplateSubtitleFilters.multids new file mode 100644 index 000000000..dd673b673 --- /dev/null +++ b/core/wiki/config/ViewTemplateSubtitleFilters.multids @@ -0,0 +1,4 @@ +title: $:/config/ViewTemplateSubtitleFilters/ +tags: $:/tags/ViewTemplateSubtitleFilter + +default: [[$:/core/ui/ViewTemplate/subtitle/default]] diff --git a/core/wiki/config/ViewTemplateTagsFilters.multids b/core/wiki/config/ViewTemplateTagsFilters.multids new file mode 100644 index 000000000..2f6c13051 --- /dev/null +++ b/core/wiki/config/ViewTemplateTagsFilters.multids @@ -0,0 +1,4 @@ +title: $:/config/ViewTemplateTagsFilters/ +tags: $:/tags/ViewTemplateTagsFilter + +default: [[$:/core/ui/ViewTemplate/tags/default]] From 2bc7ec4b946f6a1cd3db5146f02ff7717eef6355 Mon Sep 17 00:00:00 2001 From: Leilei332 Date: Sat, 3 Aug 2024 20:16:05 +0800 Subject: [PATCH 17/18] Do not import "$:/build" (#8476) --- core/modules/upgraders/system.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/modules/upgraders/system.js b/core/modules/upgraders/system.js index a93a57712..a653a75b1 100644 --- a/core/modules/upgraders/system.js +++ b/core/modules/upgraders/system.js @@ -12,7 +12,7 @@ Upgrader module that suppresses certain system tiddlers that shouldn't be import /*global $tw: false */ "use strict"; -var DONT_IMPORT_LIST = ["$:/Import"], +var DONT_IMPORT_LIST = ["$:/Import", "$:/build"], UNSELECT_PREFIX_LIST = ["$:/temp/","$:/state/","$:/StoryList","$:/HistoryList"], WARN_IMPORT_PREFIX_LIST = ["$:/core/modules/"]; From c5c72795548343ae36729e7f016897c573daf23f Mon Sep 17 00:00:00 2001 From: Mario Pietsch Date: Sun, 4 Aug 2024 13:48:57 +0200 Subject: [PATCH 18/18] Eslint force double-quotes for strings -- avoidEscape:true (#8482) --- .eslintrc.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.eslintrc.yml b/.eslintrc.yml index 049af59e4..0316b8385 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -231,7 +231,10 @@ rules: prefer-spread: 'off' prefer-template: 'off' quote-props: 'off' - quotes: 'off' + quotes: + - error + - double + - avoidEscape: true radix: 'off' require-atomic-updates: error require-await: error