diff --git a/bin/build-site.sh b/bin/build-site.sh index 9f6cbea0c..aa8a29f63 100755 --- a/bin/build-site.sh +++ b/bin/build-site.sh @@ -104,13 +104,15 @@ node $TW5_BUILD_TIDDLYWIKI \ --build favicon static index \ || exit 1 -# /empty.html Empty -# /empty.hta For Internet Explorer +# /empty.html Empty +# /empty.hta For Internet Explorer +# /empty-external-core.html External core empty +# /tiddlywikicore-.js Core plugin javascript node $TW5_BUILD_TIDDLYWIKI \ ./editions/empty \ --verbose \ --output $TW5_BUILD_OUTPUT \ - --build empty \ + --build empty emptyexternalcore \ || exit 1 diff --git a/boot/boot.js b/boot/boot.js index 06d4628c0..1468e00b6 100644 --- a/boot/boot.js +++ b/boot/boot.js @@ -2674,6 +2674,18 @@ $tw.hooks.addHook = function(hookName,definition) { } }; +/* +Delete hooks from the hashmap +*/ +$tw.hooks.removeHook = function(hookName,definition) { + if($tw.utils.hop($tw.hooks.names,hookName)) { + var p = $tw.hooks.names[hookName].indexOf(definition); + if(p !== -1) { + $tw.hooks.names[hookName].splice(p, 1); + } + } +}; + /* Invoke the hook by key */ diff --git a/core/language/en-GB/Exporters.multids b/core/language/en-GB/Exporters.multids index e455b8bf1..6ac52efe7 100644 --- a/core/language/en-GB/Exporters.multids +++ b/core/language/en-GB/Exporters.multids @@ -3,4 +3,4 @@ title: $:/language/Exporters/ StaticRiver: Static HTML JsonFile: JSON file CsvFile: CSV file -TidFile: ".tid" file +TidFile: TID text file diff --git a/core/language/en-GB/Help/savewikifolder.tid b/core/language/en-GB/Help/savewikifolder.tid index 5c6405ad2..82565f7bc 100644 --- a/core/language/en-GB/Help/savewikifolder.tid +++ b/core/language/en-GB/Help/savewikifolder.tid @@ -19,7 +19,7 @@ The following options are supported: ** ''yes'' will "explode" plugins into separate tiddler files and save them to the plugin directory within the wiki folder ** ''no'' will suppress exploding plugins into their constituent tiddler files. It will save the plugin as a single JSON tiddler in the tiddlers folder -Note that both ''explodePlugins'' options will produce wiki folders that build the same exact same original wiki. The difference lies in how plugins are represented in the wiki folder. +Note that both ''explodePlugins'' options will produce wiki folders that build the exact same original wiki. The difference lies in how plugins are represented in the wiki folder. A common usage is to convert a TiddlyWiki HTML file into a wiki folder: @@ -31,4 +31,4 @@ Save the plugin to the tiddlers directory of the target wiki folder: ``` tiddlywiki --load ./mywiki.html --savewikifolder ./mywikifolder explodePlugins=no -``` \ No newline at end of file +``` diff --git a/core/language/en-GB/Types/image_svg_xml.tid b/core/language/en-GB/Types/image_svg_xml.tid index 9f7c23ba3..94c3ea949 100644 --- a/core/language/en-GB/Types/image_svg_xml.tid +++ b/core/language/en-GB/Types/image_svg_xml.tid @@ -1,5 +1,5 @@ title: $:/language/Docs/Types/image/svg+xml -description: Structured Vector Graphics image +description: SVG image name: image/svg+xml group: Image group-sort: 1 diff --git a/core/language/en-GB/Types/image_x-icon.tid b/core/language/en-GB/Types/image_x-icon.tid index 6ae32331c..55420387a 100644 --- a/core/language/en-GB/Types/image_x-icon.tid +++ b/core/language/en-GB/Types/image_x-icon.tid @@ -1,5 +1,5 @@ title: $:/language/Docs/Types/image/x-icon -description: ICO format icon file +description: ICO icon name: image/x-icon group: Image group-sort: 1 diff --git a/core/modules/editor/engines/framed.js b/core/modules/editor/engines/framed.js index a4cf983b0..34d11dec7 100644 --- a/core/modules/editor/engines/framed.js +++ b/core/modules/editor/engines/framed.js @@ -60,7 +60,7 @@ function FramedEngine(options) { this.domNode.value = this.value; } // Set the attributes - if(this.widget.editType) { + if(this.widget.editType && this.widget.editTag !== "textarea") { this.domNode.setAttribute("type",this.widget.editType); } if(this.widget.editPlaceholder) { diff --git a/core/modules/editor/engines/simple.js b/core/modules/editor/engines/simple.js index 9840cb623..809dc58ea 100644 --- a/core/modules/editor/engines/simple.js +++ b/core/modules/editor/engines/simple.js @@ -34,7 +34,7 @@ function SimpleEngine(options) { this.domNode.value = this.value; } // Set the attributes - if(this.widget.editType) { + if(this.widget.editType && this.widget.editTag !== "textarea") { this.domNode.setAttribute("type",this.widget.editType); } if(this.widget.editPlaceholder) { diff --git a/core/modules/filters/all.js b/core/modules/filters/all.js index a36749e92..3554a74b3 100644 --- a/core/modules/filters/all.js +++ b/core/modules/filters/all.js @@ -28,12 +28,8 @@ function getAllFilterOperators() { Export our filter function */ exports.all = function(source,operator,options) { - // Get our suboperators - var allFilterOperators = getAllFilterOperators(); - // Cycle through the suboperators accumulating their results - var results = new $tw.utils.LinkedList(), - subops = operator.operand.split("+"); // Check for common optimisations + var subops = operator.operand.split("+"); if(subops.length === 1 && subops[0] === "") { return source; } else if(subops.length === 1 && subops[0] === "tiddlers") { @@ -46,6 +42,10 @@ exports.all = function(source,operator,options) { return options.wiki.eachShadowPlusTiddlers; } // Do it the hard way + // Get our suboperators + var allFilterOperators = getAllFilterOperators(); + // Cycle through the suboperators accumulating their results + var results = new $tw.utils.LinkedList(); for(var t=0; t 0) { + var oldLastIdx = oldLength-1; + this.removeListItem(oldLastIdx); + this.insertListItem(oldLastIdx,this.list[oldLastIdx]); + } // If there are items to remove and we have not refreshed then recreate the item that will now be at the last position if(!hasRefreshed && this.children.length > this.list.length) { this.removeListItem(this.list.length-1); diff --git a/core/ui/EditTemplate/body/default.tid b/core/ui/EditTemplate/body/default.tid index a2128efb0..68133d48e 100644 --- a/core/ui/EditTemplate/body/default.tid +++ b/core/ui/EditTemplate/body/default.tid @@ -1,5 +1,9 @@ title: $:/core/ui/EditTemplate/body/default +\function edit-preview-state() +[{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[] +[get[text]] :else[[no]] +\end + \define config-visibility-title() $:/config/EditorToolbarButtons/Visibility/$(currentTiddler)$ \end @@ -10,15 +14,16 @@ $:/config/EditorToolbarButtons/Visibility/$(currentTiddler)$ \whitespace trim <$let - edit-preview-state={{{ [{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[] }}} importTitle=<> importState=<> > <$dropzone importTitle=<> autoOpenOnImport="no" contentTypesFilter={{$:/config/Editor/ImportContentTypesFilter}} class="tc-dropzone-editor" enable={{{ [{$:/config/DragAndDrop/Enable}match[no]] :else[subfilter{$:/config/Editor/EnableImportFilter}then[yes]else[no]] }}} filesOnly="yes" actions=<> > -<$reveal stateTitle=<> type="match" text="yes" tag="div"> -
+
+
<$transclude tiddler="$:/core/ui/EditTemplate/body/editor" mode="inline"/> +<$list filter="[function[edit-preview-state]match[yes]]" variable="ignore"> +
<$transclude tiddler={{$:/state/editpreviewtype}} mode="inline"> @@ -29,13 +34,12 @@ $:/config/EditorToolbarButtons/Visibility/$(currentTiddler)$
+ +
- -<$reveal stateTitle=<> type="nomatch" text="yes" tag="div"> +
-<$transclude tiddler="$:/core/ui/EditTemplate/body/editor" mode="inline"/> - - + diff --git a/core/ui/EditTemplate/type.tid b/core/ui/EditTemplate/type.tid index faa89639f..c1c38b72a 100644 --- a/core/ui/EditTemplate/type.tid +++ b/core/ui/EditTemplate/type.tid @@ -10,7 +10,7 @@ first-search-filter: [all[shadows+tiddlers]prefix[$:/language/Docs/Types/]sort[d <>
<$fieldmangler> -<$macrocall $name="keyboard-driven-input" tiddler=<> storeTitle=<> refreshTitle=<> selectionStateTitle=<> field="type" tag="input" default="" placeholder={{$:/language/EditTemplate/Type/Placeholder}} focusPopup=<> class="tc-edit-typeeditor tc-edit-texteditor tc-popup-handle" tabindex={{$:/config/EditTabIndex}} focus={{{ [{$:/config/AutoFocus}match[type]then[true]] ~[[false]] }}} cancelPopups="yes" configTiddlerFilter="[[$:/core/ui/EditTemplate/type]]" inputCancelActions=<>/><$button popup=<> class="tc-btn-invisible tc-btn-dropdown tc-small-gap" tooltip={{$:/language/EditTemplate/Type/Dropdown/Hint}} aria-label={{$:/language/EditTemplate/Type/Dropdown/Caption}}>{{$:/core/images/down-arrow}}<$button message="tm-remove-field" param="type" class="tc-btn-invisible tc-btn-icon" tooltip={{$:/language/EditTemplate/Type/Delete/Hint}} aria-label={{$:/language/EditTemplate/Type/Delete/Caption}}>{{$:/core/images/delete-button}}<$action-deletetiddler $filter="[] [] []"/> +<$macrocall $name="keyboard-driven-input" tiddler=<> storeTitle=<> refreshTitle=<> selectionStateTitle=<> field="type" tag="input" default="" placeholder={{$:/language/EditTemplate/Type/Placeholder}} focusPopup=<> class="tc-edit-typeeditor tc-edit-texteditor tc-popup-handle" tabindex={{$:/config/EditTabIndex}} focus={{{ [{$:/config/AutoFocus}match[type]then[true]] ~[[false]] }}} cancelPopups="yes" configTiddlerFilter="[[$:/core/ui/EditTemplate/type]]" inputCancelActions=<>/><$button popup=<> class="tc-btn-invisible tc-btn-dropdown tc-small-gap" tooltip={{$:/language/EditTemplate/Type/Dropdown/Hint}} aria-label={{$:/language/EditTemplate/Type/Dropdown/Caption}}>{{$:/core/images/down-arrow}}<$button message="tm-remove-field" param="type" class="tc-btn-invisible tc-btn-icon" tooltip={{$:/language/EditTemplate/Type/Delete/Hint}} aria-label={{$:/language/EditTemplate/Type/Delete/Caption}}>{{$:/core/images/delete-button}}<$action-deletetiddler $filter="[] [] [] []"/>
diff --git a/core/ui/EditorToolbar/preview.tid b/core/ui/EditorToolbar/preview.tid index 106b28d3c..3c8cef505 100644 --- a/core/ui/EditorToolbar/preview.tid +++ b/core/ui/EditorToolbar/preview.tid @@ -9,11 +9,17 @@ button-classes: tc-text-editor-toolbar-item-start-group shortcuts: ((preview)) \whitespace trim +<$let + edit-preview-state={{{ [{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[] }}} +> <$reveal state=<> type="match" text="yes" tag="span"> {{$:/core/images/preview-open}} <$action-setfield $tiddler=<> $value="no"/> +<$action-sendmessage $message="tm-edit-text-operation" $param="focus-editor"/> <$reveal state=<> type="nomatch" text="yes" tag="span"> {{$:/core/images/preview-closed}} <$action-setfield $tiddler=<> $value="yes"/> +<$action-sendmessage $message="tm-edit-text-operation" $param="focus-editor"/> + diff --git a/core/ui/PageTemplate.tid b/core/ui/PageTemplate.tid index 38b4c915b..20891e35d 100644 --- a/core/ui/PageTemplate.tid +++ b/core/ui/PageTemplate.tid @@ -20,7 +20,7 @@ code-body: yes <$navigator story="$:/StoryList" history="$:/HistoryList" openLinkFromInsideRiver={{$:/config/Navigation/openLinkFromInsideRiver}} openLinkFromOutsideRiver={{$:/config/Navigation/openLinkFromOutsideRiver}} relinkOnRename={{$:/config/RelinkOnRename}}> -<$dropzone enable=<>> +<$dropzone enable=<> class="tc-dropzone tc-page-container-inner"> <$list filter="[all[shadows+tiddlers]tag[$:/tags/PageTemplate]!has[draft.of]]" variable="listItem"> diff --git a/editions/de-AT-server/tiddlers/system/favicon.ico b/editions/de-AT-server/tiddlers/system/favicon.ico deleted file mode 100644 index 3765a9a88..000000000 Binary files a/editions/de-AT-server/tiddlers/system/favicon.ico and /dev/null differ diff --git a/editions/de-AT-server/tiddlers/system/favicon.png b/editions/de-AT-server/tiddlers/system/favicon.png new file mode 100644 index 000000000..75be8e27d Binary files /dev/null and b/editions/de-AT-server/tiddlers/system/favicon.png differ diff --git a/editions/es-ES-server/tiddlers/system/favicon.ico.meta b/editions/de-AT-server/tiddlers/system/favicon.png.meta similarity index 53% rename from editions/es-ES-server/tiddlers/system/favicon.ico.meta rename to editions/de-AT-server/tiddlers/system/favicon.png.meta index 2f3e81713..76d0be1a8 100644 --- a/editions/es-ES-server/tiddlers/system/favicon.ico.meta +++ b/editions/de-AT-server/tiddlers/system/favicon.png.meta @@ -1,2 +1,2 @@ title: $:/favicon.ico -type: image/x-icon +type: image/png diff --git a/editions/dev/tiddlers/images/favicon.ico b/editions/dev/tiddlers/images/favicon.ico deleted file mode 100644 index b73f67d49..000000000 Binary files a/editions/dev/tiddlers/images/favicon.ico and /dev/null differ diff --git a/editions/dev/tiddlers/images/favicon.png b/editions/dev/tiddlers/images/favicon.png new file mode 100644 index 000000000..dd2cb686c Binary files /dev/null and b/editions/dev/tiddlers/images/favicon.png differ diff --git a/editions/de-AT-server/tiddlers/system/favicon.ico.meta b/editions/dev/tiddlers/images/favicon.png.meta similarity index 53% rename from editions/de-AT-server/tiddlers/system/favicon.ico.meta rename to editions/dev/tiddlers/images/favicon.png.meta index 2f3e81713..76d0be1a8 100644 --- a/editions/de-AT-server/tiddlers/system/favicon.ico.meta +++ b/editions/dev/tiddlers/images/favicon.png.meta @@ -1,2 +1,2 @@ title: $:/favicon.ico -type: image/x-icon +type: image/png diff --git a/editions/dev/tiddlers/new/HookMechanism.tid b/editions/dev/tiddlers/new/HookMechanism.tid index 0034c9fab..4e4659bca 100644 --- a/editions/dev/tiddlers/new/HookMechanism.tid +++ b/editions/dev/tiddlers/new/HookMechanism.tid @@ -1,9 +1,14 @@ created: 20141122200310516 -modified: 20201213161842776 +modified: 20230923031318421 +tags: Mechanisms title: HookMechanism type: text/vnd.tiddlywiki -The hook mechanism provides a way for plugins to intercept and modify default functionality. Hooks are added as follows: +The hook mechanism provides a way for plugins to intercept and modify default functionality. + +!! Add a hook + +Hooks are added as follows: ```js /* @@ -13,6 +18,8 @@ handler: function to be called when hook is invoked $tw.hooks.addHook(name,handler); ``` +!!! Params and return + The handler function will be called with parameters that depend on the specific hook in question, but they always follow the pattern `handler(value,params...)` * ''value'': an optional value that is to be transformed by the hook function @@ -20,11 +27,29 @@ The handler function will be called with parameters that depend on the specific If required by the hook in question, the handler function must return the modified ''value''. +!!! Multiple handlers + Multiple handlers can be assigned to the same name using repeated calls. When a hook is invoked by name all registered functions will be called sequentially in their order of addition. Note that the ''value'' passed to the subsequent hook function will be the return value of the previous hook function. -Though not essential care should be taken to ensure that hooks are added before they are invoked. For example: [[Hook: th-opening-default-tiddlers-list]] should ideally be added before the story startup module is invoked otherwise any hook specified additions to the default tiddlers will not be seen on the initial loading of the page, though will be visible if the user clicks the home button. +Be careful not to `addHook` in widget's `render` method, which will be call several times. You could `addHook` in methods that only called once, e.g. the constructor of widget class. Otherwise you should `removeHook` then add it again. + +!!! Timing of registration + +Though not essential care should be taken to ensure that hooks are added before they are invoked. + +For example: [[Hook: th-opening-default-tiddlers-list]] should ideally be added before the story startup module is invoked. Otherwise any hook specified additions to the default tiddlers will not be seen on the initial loading of the page, though will be visible if the user clicks the home button. + +!! Remove a hook + +You should clean up the callback when your widget is going to unmount. + +```js +$tw.hooks.removeHook(handler) +``` + +The `handler` should be the same function instance you used in `addHook` (check by `===`). You can save it to `this.xxxHookHandler` on your widget, and call `removeHook` in [[destroy method|Widget `destroy` method examples]]. !! Example diff --git a/editions/empty/tiddlywiki.info b/editions/empty/tiddlywiki.info index a911c7aed..c754aad8a 100644 --- a/editions/empty/tiddlywiki.info +++ b/editions/empty/tiddlywiki.info @@ -12,6 +12,9 @@ "empty": [ "--render","$:/core/save/all","empty.html","text/plain", "--render","$:/core/save/all","empty.hta","text/plain"], + "emptyexternalcore": [ + "--render","$:/core/save/offline-external-js","empty-external-core.html","text/plain", + "--render","$:/core/templates/tiddlywiki5.js","[[tiddlywikicore-]addsuffixaddsuffix[.js]]","text/plain"], "externalimages": [ "--savetiddlers","[is[image]]","images", "--setfield","[is[image]]","_canonical_uri","$:/core/templates/canonical-uri-external-image","text/plain", @@ -20,7 +23,7 @@ "static": [ "--render","$:/core/templates/static.template.html","static.html","text/plain", "--render","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain", - "--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain", + "--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain","$:/core/templates/static.tiddler.html", "--render","$:/core/templates/static.template.css","static/static.css","text/plain"] } -} \ No newline at end of file +} diff --git a/editions/es-ES-server/tiddlers/system/favicon.ico b/editions/es-ES-server/tiddlers/system/favicon.ico deleted file mode 100644 index 3765a9a88..000000000 Binary files a/editions/es-ES-server/tiddlers/system/favicon.ico and /dev/null differ diff --git a/editions/es-ES-server/tiddlers/system/favicon.png b/editions/es-ES-server/tiddlers/system/favicon.png new file mode 100644 index 000000000..75be8e27d Binary files /dev/null and b/editions/es-ES-server/tiddlers/system/favicon.png differ diff --git a/editions/es-ES/tiddlers/images/favicon.ico.meta b/editions/es-ES-server/tiddlers/system/favicon.png.meta similarity index 53% rename from editions/es-ES/tiddlers/images/favicon.ico.meta rename to editions/es-ES-server/tiddlers/system/favicon.png.meta index 2f3e81713..76d0be1a8 100644 --- a/editions/es-ES/tiddlers/images/favicon.ico.meta +++ b/editions/es-ES-server/tiddlers/system/favicon.png.meta @@ -1,2 +1,2 @@ title: $:/favicon.ico -type: image/x-icon +type: image/png diff --git a/editions/es-ES/tiddlers/images/favicon.ico b/editions/es-ES/tiddlers/images/favicon.ico deleted file mode 100644 index d4fae0448..000000000 Binary files a/editions/es-ES/tiddlers/images/favicon.ico and /dev/null differ diff --git a/editions/es-ES/tiddlers/images/favicon.png b/editions/es-ES/tiddlers/images/favicon.png new file mode 100644 index 000000000..d797bbe8d Binary files /dev/null and b/editions/es-ES/tiddlers/images/favicon.png differ diff --git a/editions/dev/tiddlers/images/favicon.ico.meta b/editions/es-ES/tiddlers/images/favicon.png.meta similarity index 53% rename from editions/dev/tiddlers/images/favicon.ico.meta rename to editions/es-ES/tiddlers/images/favicon.png.meta index 2f3e81713..76d0be1a8 100644 --- a/editions/dev/tiddlers/images/favicon.ico.meta +++ b/editions/es-ES/tiddlers/images/favicon.png.meta @@ -1,2 +1,2 @@ title: $:/favicon.ico -type: image/x-icon +type: image/png diff --git a/editions/es-ES/tiddlers/images/green_favicon.ico b/editions/es-ES/tiddlers/images/green_favicon.ico deleted file mode 100644 index 06e5f8e80..000000000 Binary files a/editions/es-ES/tiddlers/images/green_favicon.ico and /dev/null differ diff --git a/editions/es-ES/tiddlers/images/green_favicon.png b/editions/es-ES/tiddlers/images/green_favicon.png new file mode 100644 index 000000000..ac96b571f Binary files /dev/null and b/editions/es-ES/tiddlers/images/green_favicon.png differ diff --git a/editions/es-ES/tiddlers/images/green_favicon.ico.meta b/editions/es-ES/tiddlers/images/green_favicon.png.meta similarity index 59% rename from editions/es-ES/tiddlers/images/green_favicon.ico.meta rename to editions/es-ES/tiddlers/images/green_favicon.png.meta index f2e1cfa3c..1f2a3ecc0 100644 --- a/editions/es-ES/tiddlers/images/green_favicon.ico.meta +++ b/editions/es-ES/tiddlers/images/green_favicon.png.meta @@ -1,2 +1,2 @@ title: $:/green_favicon.ico -type: image/x-icon +type: image/png diff --git a/editions/fr-FR-server/tiddlers/system/favicon.ico b/editions/fr-FR-server/tiddlers/system/favicon.ico deleted file mode 100644 index 3765a9a88..000000000 Binary files a/editions/fr-FR-server/tiddlers/system/favicon.ico and /dev/null differ diff --git a/editions/fr-FR-server/tiddlers/system/favicon.ico.meta b/editions/fr-FR-server/tiddlers/system/favicon.ico.meta deleted file mode 100644 index 2f3e81713..000000000 --- a/editions/fr-FR-server/tiddlers/system/favicon.ico.meta +++ /dev/null @@ -1,2 +0,0 @@ -title: $:/favicon.ico -type: image/x-icon diff --git a/editions/fr-FR-server/tiddlers/system/favicon.png b/editions/fr-FR-server/tiddlers/system/favicon.png new file mode 100644 index 000000000..75be8e27d Binary files /dev/null and b/editions/fr-FR-server/tiddlers/system/favicon.png differ diff --git a/editions/fr-FR-server/tiddlers/system/favicon.png.meta b/editions/fr-FR-server/tiddlers/system/favicon.png.meta new file mode 100644 index 000000000..76d0be1a8 --- /dev/null +++ b/editions/fr-FR-server/tiddlers/system/favicon.png.meta @@ -0,0 +1,2 @@ +title: $:/favicon.ico +type: image/png diff --git a/editions/fr-FR/tiddlers/images/favicon.ico b/editions/fr-FR/tiddlers/images/favicon.ico deleted file mode 100644 index d4fae0448..000000000 Binary files a/editions/fr-FR/tiddlers/images/favicon.ico and /dev/null differ diff --git a/editions/fr-FR/tiddlers/images/favicon.ico.meta b/editions/fr-FR/tiddlers/images/favicon.ico.meta deleted file mode 100644 index 2f3e81713..000000000 --- a/editions/fr-FR/tiddlers/images/favicon.ico.meta +++ /dev/null @@ -1,2 +0,0 @@ -title: $:/favicon.ico -type: image/x-icon diff --git a/editions/fr-FR/tiddlers/images/favicon.png b/editions/fr-FR/tiddlers/images/favicon.png new file mode 100644 index 000000000..d797bbe8d Binary files /dev/null and b/editions/fr-FR/tiddlers/images/favicon.png differ diff --git a/editions/fr-FR/tiddlers/images/favicon.png.meta b/editions/fr-FR/tiddlers/images/favicon.png.meta new file mode 100644 index 000000000..76d0be1a8 --- /dev/null +++ b/editions/fr-FR/tiddlers/images/favicon.png.meta @@ -0,0 +1,2 @@ +title: $:/favicon.ico +type: image/png diff --git a/editions/fr-FR/tiddlers/images/green_favicon.ico b/editions/fr-FR/tiddlers/images/green_favicon.ico deleted file mode 100644 index 06e5f8e80..000000000 Binary files a/editions/fr-FR/tiddlers/images/green_favicon.ico and /dev/null differ diff --git a/editions/fr-FR/tiddlers/images/green_favicon.png b/editions/fr-FR/tiddlers/images/green_favicon.png new file mode 100644 index 000000000..ac96b571f Binary files /dev/null and b/editions/fr-FR/tiddlers/images/green_favicon.png differ diff --git a/editions/fr-FR/tiddlers/images/green_favicon.ico.meta b/editions/fr-FR/tiddlers/images/green_favicon.png.meta similarity index 59% rename from editions/fr-FR/tiddlers/images/green_favicon.ico.meta rename to editions/fr-FR/tiddlers/images/green_favicon.png.meta index f2e1cfa3c..1f2a3ecc0 100644 --- a/editions/fr-FR/tiddlers/images/green_favicon.ico.meta +++ b/editions/fr-FR/tiddlers/images/green_favicon.png.meta @@ -1,2 +1,2 @@ title: $:/green_favicon.ico -type: image/x-icon +type: image/png diff --git a/editions/highlightdemo/tiddlywiki.info b/editions/highlightdemo/tiddlywiki.info index 69dc1336b..075859c8c 100644 --- a/editions/highlightdemo/tiddlywiki.info +++ b/editions/highlightdemo/tiddlywiki.info @@ -15,7 +15,7 @@ "static": [ "--render","$:/core/templates/static.template.html","static.html","text/plain", "--render","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain", - "--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain", + "--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain","$:/core/templates/static.tiddler.html", "--render","$:/core/templates/static.template.css","static/static.css","text/plain"] } } diff --git a/editions/ja-JP/tiddlers/images/favicon.ico b/editions/ja-JP/tiddlers/images/favicon.ico deleted file mode 100644 index d4fae0448..000000000 Binary files a/editions/ja-JP/tiddlers/images/favicon.ico and /dev/null differ diff --git a/editions/ja-JP/tiddlers/images/favicon.ico.meta b/editions/ja-JP/tiddlers/images/favicon.ico.meta deleted file mode 100644 index 2f3e81713..000000000 --- a/editions/ja-JP/tiddlers/images/favicon.ico.meta +++ /dev/null @@ -1,2 +0,0 @@ -title: $:/favicon.ico -type: image/x-icon diff --git a/editions/ja-JP/tiddlers/images/favicon.png b/editions/ja-JP/tiddlers/images/favicon.png new file mode 100644 index 000000000..d797bbe8d Binary files /dev/null and b/editions/ja-JP/tiddlers/images/favicon.png differ diff --git a/editions/ja-JP/tiddlers/images/favicon.png.meta b/editions/ja-JP/tiddlers/images/favicon.png.meta new file mode 100644 index 000000000..76d0be1a8 --- /dev/null +++ b/editions/ja-JP/tiddlers/images/favicon.png.meta @@ -0,0 +1,2 @@ +title: $:/favicon.ico +type: image/png diff --git a/editions/ja-JP/tiddlers/images/green_favicon.ico b/editions/ja-JP/tiddlers/images/green_favicon.ico deleted file mode 100644 index 06e5f8e80..000000000 Binary files a/editions/ja-JP/tiddlers/images/green_favicon.ico and /dev/null differ diff --git a/editions/ja-JP/tiddlers/images/green_favicon.png b/editions/ja-JP/tiddlers/images/green_favicon.png new file mode 100644 index 000000000..ac96b571f Binary files /dev/null and b/editions/ja-JP/tiddlers/images/green_favicon.png differ diff --git a/editions/ja-JP/tiddlers/images/green_favicon.ico.meta b/editions/ja-JP/tiddlers/images/green_favicon.png.meta similarity index 59% rename from editions/ja-JP/tiddlers/images/green_favicon.ico.meta rename to editions/ja-JP/tiddlers/images/green_favicon.png.meta index f2e1cfa3c..1f2a3ecc0 100644 --- a/editions/ja-JP/tiddlers/images/green_favicon.ico.meta +++ b/editions/ja-JP/tiddlers/images/green_favicon.png.meta @@ -1,2 +1,2 @@ title: $:/green_favicon.ico -type: image/x-icon +type: image/png diff --git a/editions/katexdemo/tiddlywiki.info b/editions/katexdemo/tiddlywiki.info index 4d1ad4c32..bd07b3e28 100644 --- a/editions/katexdemo/tiddlywiki.info +++ b/editions/katexdemo/tiddlywiki.info @@ -15,7 +15,7 @@ "static": [ "--render","$:/core/templates/static.template.html","static.html","text/plain", "--render","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain", - "--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain", + "--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain","$:/core/templates/static.tiddler.html", "--render","$:/core/templates/static.template.css","static/static.css","text/plain"] } } diff --git a/editions/ko-KR-server/tiddlers/system/favicon.ico b/editions/ko-KR-server/tiddlers/system/favicon.ico deleted file mode 100644 index 3765a9a88..000000000 Binary files a/editions/ko-KR-server/tiddlers/system/favicon.ico and /dev/null differ diff --git a/editions/ko-KR-server/tiddlers/system/favicon.ico.meta b/editions/ko-KR-server/tiddlers/system/favicon.ico.meta deleted file mode 100644 index 2f3e81713..000000000 --- a/editions/ko-KR-server/tiddlers/system/favicon.ico.meta +++ /dev/null @@ -1,2 +0,0 @@ -title: $:/favicon.ico -type: image/x-icon diff --git a/editions/ko-KR-server/tiddlers/system/favicon.png b/editions/ko-KR-server/tiddlers/system/favicon.png new file mode 100644 index 000000000..75be8e27d Binary files /dev/null and b/editions/ko-KR-server/tiddlers/system/favicon.png differ diff --git a/editions/ko-KR-server/tiddlers/system/favicon.png.meta b/editions/ko-KR-server/tiddlers/system/favicon.png.meta new file mode 100644 index 000000000..76d0be1a8 --- /dev/null +++ b/editions/ko-KR-server/tiddlers/system/favicon.png.meta @@ -0,0 +1,2 @@ +title: $:/favicon.ico +type: image/png diff --git a/editions/ko-KR/tiddlers/images/favicon.ico b/editions/ko-KR/tiddlers/images/favicon.ico deleted file mode 100644 index d4fae0448..000000000 Binary files a/editions/ko-KR/tiddlers/images/favicon.ico and /dev/null differ diff --git a/editions/ko-KR/tiddlers/images/favicon.ico.meta b/editions/ko-KR/tiddlers/images/favicon.ico.meta deleted file mode 100644 index 2f3e81713..000000000 --- a/editions/ko-KR/tiddlers/images/favicon.ico.meta +++ /dev/null @@ -1,2 +0,0 @@ -title: $:/favicon.ico -type: image/x-icon diff --git a/editions/ko-KR/tiddlers/images/favicon.png b/editions/ko-KR/tiddlers/images/favicon.png new file mode 100644 index 000000000..d797bbe8d Binary files /dev/null and b/editions/ko-KR/tiddlers/images/favicon.png differ diff --git a/editions/ko-KR/tiddlers/images/favicon.png.meta b/editions/ko-KR/tiddlers/images/favicon.png.meta new file mode 100644 index 000000000..76d0be1a8 --- /dev/null +++ b/editions/ko-KR/tiddlers/images/favicon.png.meta @@ -0,0 +1,2 @@ +title: $:/favicon.ico +type: image/png diff --git a/editions/ko-KR/tiddlers/images/green_favicon.ico b/editions/ko-KR/tiddlers/images/green_favicon.ico deleted file mode 100644 index 06e5f8e80..000000000 Binary files a/editions/ko-KR/tiddlers/images/green_favicon.ico and /dev/null differ diff --git a/editions/ko-KR/tiddlers/images/green_favicon.png b/editions/ko-KR/tiddlers/images/green_favicon.png new file mode 100644 index 000000000..ac96b571f Binary files /dev/null and b/editions/ko-KR/tiddlers/images/green_favicon.png differ diff --git a/editions/ko-KR/tiddlers/images/green_favicon.ico.meta b/editions/ko-KR/tiddlers/images/green_favicon.png.meta similarity index 59% rename from editions/ko-KR/tiddlers/images/green_favicon.ico.meta rename to editions/ko-KR/tiddlers/images/green_favicon.png.meta index f2e1cfa3c..1f2a3ecc0 100644 --- a/editions/ko-KR/tiddlers/images/green_favicon.ico.meta +++ b/editions/ko-KR/tiddlers/images/green_favicon.png.meta @@ -1,2 +1,2 @@ title: $:/green_favicon.ico -type: image/x-icon +type: image/png diff --git a/editions/pluginlibrary/tiddlywiki.info b/editions/pluginlibrary/tiddlywiki.info index 4f1ab1409..ba18ff0a2 100644 --- a/editions/pluginlibrary/tiddlywiki.info +++ b/editions/pluginlibrary/tiddlywiki.info @@ -17,8 +17,8 @@ ], "library": [ "--makelibrary","$:/UpgradeLibrary", - "--savelibrarytiddlers","$:/UpgradeLibrary","[prefix[$:/]] -[[$:/plugins/tiddlywiki/upgrade]] -[[$:/plugins/tiddlywiki/translators]] -[[$:/plugins/tiddlywiki/pluginlibrary]] -[[$:/plugins/tiddlywiki/jasmine]]","recipes/library/tiddlers/","$:/UpgradeLibrary/List", - "--savetiddler","$:/UpgradeLibrary/List","recipes/library/tiddlers.json", + "--savelibrarytiddlers","$:/UpgradeLibrary","[prefix[$:/]] -[[$:/plugins/tiddlywiki/upgrade]] -[[$:/plugins/tiddlywiki/translators]] -[[$:/plugins/tiddlywiki/pluginlibrary]] -[[$:/plugins/tiddlywiki/jasmine]]","recipes/library/tiddlers/","$:/UpgradeLibrary/List", + "--savetiddler","$:/UpgradeLibrary/List","recipes/library/tiddlers.json", "--rendertiddler","$:/plugins/tiddlywiki/pluginlibrary/library.template.html","index.html","text/plain"] } } diff --git a/editions/prerelease/tiddlers/Release 5.3.2.tid b/editions/prerelease/tiddlers/Release 5.3.2.tid index ce4f218c5..9dddb2916 100644 --- a/editions/prerelease/tiddlers/Release 5.3.2.tid +++ b/editions/prerelease/tiddlers/Release 5.3.2.tid @@ -4,6 +4,7 @@ modified: 20230820114855583 tags: ReleaseNotes title: Release 5.3.2 type: text/vnd.tiddlywiki +description: Under development //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.3.1...master]]// @@ -11,27 +12,50 @@ type: text/vnd.tiddlywiki Improvements to the following translations: -* +* Chinese +* Polish +* Spanish + +! Plugin Improvements + +* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/1be8f0a9336952d4745d2bd4f2327e353580a272">> comments plugin to use predefined palette colours ! Widget Improvements * +! Usability Improvements + +* <<.link-badge-updated "https://github.com/Jermolene/TiddlyWiki5/pull/7747">> editor preview button to automatically focus the editor +* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7764">> file type names in the export menu + ! Hackability Improvements -* +* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7737">> an automatic build of the external core TiddlyWiki at https://tiddlywiki.com/empty-external-core.html +* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7690">> the default page layout to better support CSS grid and flexbox layouts ! Bug Fixes -* +* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/7665">> `{{}}` generating a recursion error +* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7758">> ordering of Vanilla stylesheets +* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/fa9bfa07a095548eb2f8339b0b1b816d2e6794ef">> missing closing tag in tag-pill-inner macro +* <<.link-badge-removed "https://github.com/Jermolene/TiddlyWiki5/issues/7732">> invalid "type" attribute from textarea elements generated by the EditTextWidget +* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7749">> editor "type" dropdown state tiddlers +* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7712">> handling of "counter-last" variable when appending items with the ListWidget +* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/6088">> upgrade download link in Firefox ! Node.js Improvements * +! Performance Improvements + +* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7702">> performance of predefined patterns with [[all Operator]] +* <<.link-badge-updated "https://github.com/Jermolene/TiddlyWiki5/issues/7671">> favicon format to PNG + ! Developer Improvements -* +* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7751">> global hook handling to support removing hooks ! Acknowledgements @@ -39,22 +63,16 @@ Improvements to the following translations: <<.contributors """ AnthonyMuscio -btheado -catter-fly -cmo-pomerium -CrossEye -flibbles -hffqyd -lilscribby +BramChen +BuckarooBanzay +BurningTreeC +EvidentlyCube +joebordes +kookma linonetwo -Marxsal mateuszwilczek -pille1842 pmario rmunn -saqimtiaz -stevesunypoly -TiddlyTweeter -twMat -yaisog +simonbaird +T1mL3arn """>> diff --git a/editions/prerelease/tiddlers/system/favicon.ico b/editions/prerelease/tiddlers/system/favicon.ico deleted file mode 100644 index 707c67577..000000000 Binary files a/editions/prerelease/tiddlers/system/favicon.ico and /dev/null differ diff --git a/editions/prerelease/tiddlers/system/favicon.ico.meta b/editions/prerelease/tiddlers/system/favicon.ico.meta deleted file mode 100644 index 2f3e81713..000000000 --- a/editions/prerelease/tiddlers/system/favicon.ico.meta +++ /dev/null @@ -1,2 +0,0 @@ -title: $:/favicon.ico -type: image/x-icon diff --git a/editions/prerelease/tiddlers/system/favicon.png b/editions/prerelease/tiddlers/system/favicon.png new file mode 100644 index 000000000..bbf053e28 Binary files /dev/null and b/editions/prerelease/tiddlers/system/favicon.png differ diff --git a/editions/prerelease/tiddlers/system/favicon.png.meta b/editions/prerelease/tiddlers/system/favicon.png.meta new file mode 100644 index 000000000..76d0be1a8 --- /dev/null +++ b/editions/prerelease/tiddlers/system/favicon.png.meta @@ -0,0 +1,2 @@ +title: $:/favicon.ico +type: image/png diff --git a/editions/resumebuilder/tiddlywiki.info b/editions/resumebuilder/tiddlywiki.info index 28f4ac3f3..c199c8cd7 100644 --- a/editions/resumebuilder/tiddlywiki.info +++ b/editions/resumebuilder/tiddlywiki.info @@ -20,4 +20,4 @@ "favicon": [ "--savetiddler","$:/favicon.ico","favicon.ico"] } -} \ No newline at end of file +} diff --git a/editions/server-external-js/tiddlywiki.info b/editions/server-external-js/tiddlywiki.info index cb02accd5..b0c245b49 100644 --- a/editions/server-external-js/tiddlywiki.info +++ b/editions/server-external-js/tiddlywiki.info @@ -17,7 +17,7 @@ "static": [ "--render","$:/core/templates/static.template.html","static.html","text/plain", "--render","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain", - "--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain", + "--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain","$:/core/templates/static.tiddler.html", "--render","$:/core/templates/static.template.css","static/static.css","text/plain"], "tiddlywikicore": [ "--render","$:/core/templates/tiddlywiki5.js","[[tiddlywikicore-]addsuffixaddsuffix[.js]]","text/plain"] diff --git a/editions/server/tiddlywiki.info b/editions/server/tiddlywiki.info index 9067d778e..e35ff95f8 100644 --- a/editions/server/tiddlywiki.info +++ b/editions/server/tiddlywiki.info @@ -15,7 +15,7 @@ "static": [ "--render","$:/core/templates/static.template.html","static.html","text/plain", "--render","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain", - "--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain", + "--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain","$:/core/templates/static.tiddler.html", "--render","$:/core/templates/static.template.css","static/static.css","text/plain"] } } \ No newline at end of file diff --git a/editions/test/tiddlers/tests/test-widget.js b/editions/test/tiddlers/tests/test-widget.js index 544ed928f..4da9e20b0 100755 --- a/editions/test/tiddlers/tests/test-widget.js +++ b/editions/test/tiddlers/tests/test-widget.js @@ -527,6 +527,29 @@ describe("Widget module", function() { expect(wrapper.children[0].children[15].sequenceNumber).toBe(53); }); + var testCounterLast = function(oldList, newList) { + return function() { + var wiki = new $tw.Wiki(); + // Add some tiddlers + wiki.addTiddler({title: "Numbers", text: "", list: oldList}); + var text = "<$list filter='[list[Numbers]]' variable='item' counter='c'><><$text text={{{ [match[no]then[, ]] }}} />"; + var widgetNode = createWidgetNode(parseText(text,wiki),wiki); + // Render the widget node to the DOM + var wrapper = renderWidgetNode(widgetNode); + // Test the rendering + expect(wrapper.innerHTML).toBe("

" + oldList.split(' ').join(', ') + "

"); + // Append a number + wiki.addTiddler({title: "Numbers", text: "", list: newList}); + refreshWidgetNode(widgetNode,wrapper,["Numbers"]); + expect(wrapper.innerHTML).toBe("

" + newList.split(' ').join(', ') + "

"); + } + } + + it("the list widget with counter-last should update correctly when list is appended", testCounterLast("1 2 3 4", "1 2 3 4 5")); + it("the list widget with counter-last should update correctly when last item is removed", testCounterLast("1 2 3 4", "1 2 3")); + it("the list widget with counter-last should update correctly when first item is inserted", testCounterLast("1 2 3 4", "0 1 2 3 4")); + it("the list widget with counter-last should update correctly when first item is removed", testCounterLast("1 2 3 4", "2 3 4")); + it("should deal with the list widget followed by other widgets", function() { var wiki = new $tw.Wiki(); // Add some tiddlers diff --git a/editions/tw.org/tiddlers/$__favicon.ico.png b/editions/tw.org/tiddlers/$__favicon.ico.png index c6b279307..b147a217b 100644 Binary files a/editions/tw.org/tiddlers/$__favicon.ico.png and b/editions/tw.org/tiddlers/$__favicon.ico.png differ diff --git a/editions/tw.org/tiddlywiki.info b/editions/tw.org/tiddlywiki.info index aa19a02ec..5e4202ccc 100644 --- a/editions/tw.org/tiddlywiki.info +++ b/editions/tw.org/tiddlywiki.info @@ -21,7 +21,7 @@ "static": [ "--render","$:/core/templates/static.template.html","static.html","text/plain", "--render","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain", - "--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain","$:/core/templates/static.tiddler.html", + "--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain","$:/core/templates/static.tiddler.html", "--render","$:/core/templates/static.template.css","static/static.css","text/plain"] }, "config": { diff --git a/editions/tw5.com-server/tiddlers/system/favicon.ico b/editions/tw5.com-server/tiddlers/system/favicon.ico deleted file mode 100644 index 3765a9a88..000000000 Binary files a/editions/tw5.com-server/tiddlers/system/favicon.ico and /dev/null differ diff --git a/editions/tw5.com-server/tiddlers/system/favicon.ico.meta b/editions/tw5.com-server/tiddlers/system/favicon.ico.meta deleted file mode 100644 index 2f3e81713..000000000 --- a/editions/tw5.com-server/tiddlers/system/favicon.ico.meta +++ /dev/null @@ -1,2 +0,0 @@ -title: $:/favicon.ico -type: image/x-icon diff --git a/editions/tw5.com-server/tiddlers/system/tiddlywiki.com.server.png b/editions/tw5.com-server/tiddlers/system/tiddlywiki.com.server.png new file mode 100644 index 000000000..75be8e27d Binary files /dev/null and b/editions/tw5.com-server/tiddlers/system/tiddlywiki.com.server.png differ diff --git a/editions/tw5.com-server/tiddlers/system/tiddlywiki.com.server.png.meta b/editions/tw5.com-server/tiddlers/system/tiddlywiki.com.server.png.meta new file mode 100644 index 000000000..76d0be1a8 --- /dev/null +++ b/editions/tw5.com-server/tiddlers/system/tiddlywiki.com.server.png.meta @@ -0,0 +1,2 @@ +title: $:/favicon.ico +type: image/png diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/classic.tiddlywiki.com.ico b/editions/tw5.com/tiddlers/_tw_shared/favicons/classic.tiddlywiki.com.ico deleted file mode 100644 index 03a9b6ee9..000000000 Binary files a/editions/tw5.com/tiddlers/_tw_shared/favicons/classic.tiddlywiki.com.ico and /dev/null differ diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/classic.tiddlywiki.com.png b/editions/tw5.com/tiddlers/_tw_shared/favicons/classic.tiddlywiki.com.png new file mode 100644 index 000000000..c0ae6e696 Binary files /dev/null and b/editions/tw5.com/tiddlers/_tw_shared/favicons/classic.tiddlywiki.com.png differ diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/classic.tiddlywiki.com.ico.meta b/editions/tw5.com/tiddlers/_tw_shared/favicons/classic.tiddlywiki.com.png.meta similarity index 80% rename from editions/tw5.com/tiddlers/_tw_shared/favicons/classic.tiddlywiki.com.ico.meta rename to editions/tw5.com/tiddlers/_tw_shared/favicons/classic.tiddlywiki.com.png.meta index 53a3ac055..c83def11f 100644 --- a/editions/tw5.com/tiddlers/_tw_shared/favicons/classic.tiddlywiki.com.ico.meta +++ b/editions/tw5.com/tiddlers/_tw_shared/favicons/classic.tiddlywiki.com.png.meta @@ -1,3 +1,3 @@ title: $:/_tw_shared/favicons/classic.tiddlywiki.com -type: image/x-icon +type: image/png tags: TiddlyWikiSitesMenu \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/links.tiddlywiki.org.ico b/editions/tw5.com/tiddlers/_tw_shared/favicons/links.tiddlywiki.org.ico deleted file mode 100644 index 7ad263dad..000000000 Binary files a/editions/tw5.com/tiddlers/_tw_shared/favicons/links.tiddlywiki.org.ico and /dev/null differ diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/links.tiddlywiki.org.png b/editions/tw5.com/tiddlers/_tw_shared/favicons/links.tiddlywiki.org.png new file mode 100644 index 000000000..8e4602dda Binary files /dev/null and b/editions/tw5.com/tiddlers/_tw_shared/favicons/links.tiddlywiki.org.png differ diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/links.tiddlywiki.org.ico.meta b/editions/tw5.com/tiddlers/_tw_shared/favicons/links.tiddlywiki.org.png.meta similarity index 80% rename from editions/tw5.com/tiddlers/_tw_shared/favicons/links.tiddlywiki.org.ico.meta rename to editions/tw5.com/tiddlers/_tw_shared/favicons/links.tiddlywiki.org.png.meta index a21a05c4a..d53b194b7 100644 --- a/editions/tw5.com/tiddlers/_tw_shared/favicons/links.tiddlywiki.org.ico.meta +++ b/editions/tw5.com/tiddlers/_tw_shared/favicons/links.tiddlywiki.org.png.meta @@ -1,3 +1,3 @@ title: $:/_tw_shared/favicons/links.tiddlywiki.org -type: image/x-icon +type: image/png tags: TiddlyWikiSitesMenu diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.dev.ico b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.dev.ico deleted file mode 100644 index b73f67d49..000000000 Binary files a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.dev.ico and /dev/null differ diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.dev.png b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.dev.png new file mode 100644 index 000000000..dd2cb686c Binary files /dev/null and b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.dev.png differ diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.dev.ico.meta b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.dev.png.meta similarity index 79% rename from editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.dev.ico.meta rename to editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.dev.png.meta index 4f14e4af1..0913aa504 100644 --- a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.dev.ico.meta +++ b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.dev.png.meta @@ -1,3 +1,3 @@ title: $:/_tw_shared/favicons/tiddlywiki.com.dev -type: image/x-icon +type: image/png tags: TiddlyWikiSitesMenu diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.ico b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.ico deleted file mode 100644 index abf226e9b..000000000 Binary files a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.ico and /dev/null differ diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.png b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.png new file mode 100644 index 000000000..d797bbe8d Binary files /dev/null and b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.png differ diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.ico.meta b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.png.meta similarity index 78% rename from editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.ico.meta rename to editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.png.meta index ad4a92d3b..b884444c3 100644 --- a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.ico.meta +++ b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.png.meta @@ -1,3 +1,3 @@ title: $:/_tw_shared/favicons/tiddlywiki.com -type: image/x-icon +type: image/png tags: TiddlyWikiSitesMenu diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.prerelease.ico b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.prerelease.ico deleted file mode 100644 index 707c67577..000000000 Binary files a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.prerelease.ico and /dev/null differ diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.prerelease.png b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.prerelease.png new file mode 100644 index 000000000..bbf053e28 Binary files /dev/null and b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.prerelease.png differ diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.prerelease.ico.meta b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.prerelease.png.meta similarity index 81% rename from editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.prerelease.ico.meta rename to editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.prerelease.png.meta index a5d98ea5e..4757a18bc 100644 --- a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.prerelease.ico.meta +++ b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.prerelease.png.meta @@ -1,3 +1,3 @@ title: $:/_tw_shared/favicons/tiddlywiki.com.prerelease -type: image/x-icon +type: image/png tags: TiddlyWikiSitesMenu diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.upgrade.ico b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.upgrade.ico deleted file mode 100644 index 6d8d018e9..000000000 Binary files a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.upgrade.ico and /dev/null differ diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.upgrade.png b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.upgrade.png new file mode 100644 index 000000000..38f661431 Binary files /dev/null and b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.upgrade.png differ diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.upgrade.ico.meta b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.upgrade.png.meta similarity index 80% rename from editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.upgrade.ico.meta rename to editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.upgrade.png.meta index ef6c637c9..9479c07b2 100644 --- a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.upgrade.ico.meta +++ b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.upgrade.png.meta @@ -1,3 +1,3 @@ title: $:/_tw_shared/favicons/tiddlywiki.com.upgrade -type: image/x-icon +type: image/png tags: TiddlyWikiSitesMenu diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.org.ico b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.org.ico deleted file mode 100644 index c6b279307..000000000 Binary files a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.org.ico and /dev/null differ diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.org.png b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.org.png new file mode 100644 index 000000000..b147a217b Binary files /dev/null and b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.org.png differ diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.org.ico.meta b/editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.org.png.meta similarity index 100% rename from editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.org.ico.meta rename to editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.org.png.meta diff --git a/editions/tw5.com/tiddlers/about/Archive.tid b/editions/tw5.com/tiddlers/about/Archive.tid new file mode 100644 index 000000000..988f65e7b --- /dev/null +++ b/editions/tw5.com/tiddlers/about/Archive.tid @@ -0,0 +1,82 @@ +title: TiddlyWiki Archive +created: 20231005205623086 +modified: 20231005210538879 +tags: About + +\procedure versions() +5.1.0 5.1.1 5.1.2 5.1.3 5.1.4 5.1.5 5.1.6 5.1.7 5.1.8 5.1.9 +5.1.10 5.1.11 5.1.12 5.1.13 5.1.14 5.1.15 5.1.16 5.1.17 5.1.18 5.1.19 +5.1.20 5.1.21 5.1.22 5.1.23 +5.2.0 5.2.1 5.2.2 5.2.3 5.2.4 5.2.5 5.2.6 5.2.7 +5.3.0 5.3.1 +\end + +Older versions of TiddlyWiki are available in the [[archive|https://github.com/Jermolene/jermolene.github.io/tree/master/archive]]: + + + + + + + + + + + <$list filter="[enlistreverse[]]" variable="version"> + <$let + filename=`TiddlyWiki-$(version)$` + emptyFilename=`Empty-$(filename)$` + releaseTiddler={{{ [addprefix[Release ]] }}} + releaseDate={{{ [get[released]format:date[TIMESTAMP]] }}} + nextVersion={{{ [enlistafter] }}} + nextReleaseTiddler={{{ [addprefix[Release ]] }}} + nextReleaseDate={{{ [get[released]format:date[TIMESTAMP]] }}} + lifetime={{{ [subtractdivide[86400000]add[0.5]fixed[0]] }}} + > + + + + + + + + + + +
+ Version + + Released + + Lifetime + + Summary + + Download +
+ <$link to=<>> + <$text text=`v$(version)$`/> + + + <$view tiddler=<> field="released" format="date" template="DDth mmm YYYY"/> + + <$list filter="[compare:number:lt[0]]" variable="ignore"> + Current + + <$list filter="[compare:number:gteq[0]]" variable="ignore"> + <$text text=<>/> + day<$list filter="[!compare:number:eq[1]]" variable="ignore">s + + + <$transclude $tiddler=<> $field="description" $format="inline"> + (none) + + + addprefix[https://tiddlywiki.com/archive/full/]]}}} rel="noopener noreferrer" target="_blank"> + Complete + + | + addprefix[https://tiddlywiki.com/archive/empty/]]}}} rel="noopener noreferrer" target="_blank"> + Empty + +
diff --git a/editions/tw5.com/tiddlers/filters/examples/jsonstringify Operator (Examples).tid b/editions/tw5.com/tiddlers/filters/examples/jsonstringify Operator (Examples).tid deleted file mode 100644 index ead9ffb38..000000000 --- a/editions/tw5.com/tiddlers/filters/examples/jsonstringify Operator (Examples).tid +++ /dev/null @@ -1,9 +0,0 @@ -created: 20171029155046637 -modified: 20171029155227382 -tags: [[Operator Examples]] [[stringify Operator]] -title: jsonstringify Operator (Examples) -type: text/vnd.tiddlywiki - -<<.operator-example 1 """[[Title with "double quotes" and single ' and \backslash]] +[jsonstringify[]]""">> -<<.operator-example 2 """[[Accents and emojis -> äñøßπ ⌛🎄🍪🍓 without suffix]] +[jsonstringify[]]""">> -<<.operator-example 3 """[[Accents and emojis -> äñøßπ ⌛🎄🍪🍓 with rawunicode suffix]] +[jsonstringify:rawunicode[]]""">> diff --git a/editions/tw5.com/tiddlers/filters/examples/stringify_Operator_(Examples).tid b/editions/tw5.com/tiddlers/filters/examples/stringify_Operator_(Examples).tid index a664cf7d2..cc5a51429 100644 --- a/editions/tw5.com/tiddlers/filters/examples/stringify_Operator_(Examples).tid +++ b/editions/tw5.com/tiddlers/filters/examples/stringify_Operator_(Examples).tid @@ -1,9 +1,9 @@ created: 20161017154944352 -modified: 20171029155233487 +modified: 20230919124059118 tags: [[Operator Examples]] [[stringify Operator]] title: stringify Operator (Examples) type: text/vnd.tiddlywiki <<.operator-example 1 """[[Title with "double quotes" and single ' and \backslash]] +[stringify[]]""">> <<.operator-example 2 """[[Accents and emojis -> äñøßπ ⌛🎄🍪🍓 without suffix]] +[stringify[]]""">> -<<.operator-example 3 """[[Accents and emojis -> äñøßπ ⌛🎄🍪🍓 with rawunicode suffix]] +[stringify:rawunicode[]]""">> +<<.operator-example 3 """[[Accents and emojis -> äñøßπ ⌛🎄🍪🍓 with rawunicode suffix]] +[stringify:rawunicode[]]""">> \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/filters/jsonstringify Operator.tid b/editions/tw5.com/tiddlers/filters/jsonstringify Operator.tid index a7e4d565c..748a851bb 100644 --- a/editions/tw5.com/tiddlers/filters/jsonstringify Operator.tid +++ b/editions/tw5.com/tiddlers/filters/jsonstringify Operator.tid @@ -1,36 +1,12 @@ caption: jsonstringify created: 20171029155051467 from-version: 5.1.14 -modified: 20171029155143797 -op-input: a [[selection of titles|Title Selection]] -op-output: the input with JSON string encodings applied +modified: 20230919124826880 op-parameter: op-parameter-name: -op-purpose: apply JSON string encoding to a string -op-suffix: <<.from-version "5.1.23">> optionally, the keyword `rawunicode` +op-purpose: deprecated, use <<.olink stringify>> instead op-suffix-name: R tags: [[Filter Operators]] [[String Operators]] title: jsonstringify Operator type: text/vnd.tiddlywiki -The following substitutions are made: - -|!Character |!Replacement |!Condition | -|`\` |`\\` |Always | -|`"` |`\"` |Always | -|Carriage return (0x0d) |`\\r` |Always | -|Line feed (0x0a) |`\\n` |Always | -|Backspace (0x08) |`\\b` |Always | -|Form field (0x0c) |`\\f` |Always | -|Tab (0x09) |`\\t` |Always | -|Characters from 0x00 to 0x1f |`\\u####` where #### is four hex digits |Always | -|Characters from 0x80 to 0xffff|`\\u####` where #### is four hex digits |If `rawunicode` suffix is not present (default) | -|Characters from 0x80 to 0xffff|Unchanged |If `rawunicode` suffix is present <<.from-version "5.1.23">> | - -<<.from-version "5.1.23">> If the suffix `rawunicode` is present, Unicode characters above 0x80 (such as ß, ä, ñ or 🎄) will be passed through unchanged. Without the suffix, they will be substituted with `\\u` codes, which was the default behavior before 5.1.23. - -<<.note """Technical note: Characters outside the Basic Multilingual Plane, such as 🎄 and other emojis, will be encoded as a UTF-16 surrogate pair, i.e. with two `\u` sequences.""">> - -Also see the [[stringify Operator]]. - -<<.operator-examples "jsonstringify">> diff --git a/editions/tw5.com/tiddlers/filters/stringify_Operator.tid b/editions/tw5.com/tiddlers/filters/stringify_Operator.tid index e06be4387..73dabb1c2 100644 --- a/editions/tw5.com/tiddlers/filters/stringify_Operator.tid +++ b/editions/tw5.com/tiddlers/filters/stringify_Operator.tid @@ -1,6 +1,7 @@ caption: stringify created: 20161017153038029 -modified: 20171029155143797 +from-version: 5.1.14 +modified: 20230919130847809 op-input: a [[selection of titles|Title Selection]] op-output: the input with ~JavaScript string encodings applied op-parameter: @@ -11,26 +12,25 @@ op-suffix-name: R tags: [[Filter Operators]] [[String Operators]] title: stringify Operator type: text/vnd.tiddlywiki -from-version: 5.1.14 The following substitutions are made: |!Character |!Replacement |!Condition | |`\` |`\\` |Always | |`"` |`\"` |Always | -|Carriage return (0x0d) |`\\r` |Always | -|Line feed (0x0a) |`\\n` |Always | -|Backspace (0x08) |`\\b` |Always | -|Form field (0x0c) |`\\f` |Always | -|Tab (0x09) |`\\t` |Always | -|Characters from 0x00 to 0x1f |`\\x##` where ## is two hex digits |Always | -|Characters from 0x80 to 0xffff|`\\u####` where #### is four hex digits |If `rawunicode` suffix is not present (default) | +|Carriage return (0x0d) |`\r` |Always | +|Line feed (0x0a) |`\n` |Always | +|Backspace (0x08) |`\b` |Always | +|Form field (0x0c) |`\f` |Always | +|Tab (0x09) |`\t` |Always | +|Characters from 0x00 to 0x1f |`\x##` where ## is two hex digits |Always | +|Characters from 0x80 to 0xffff|`\u####` where #### is four hex digits |If `rawunicode` suffix is not present (default) | |Characters from 0x80 to 0xffff|<<.from-version "5.1.23">> Unchanged |If `rawunicode` suffix is present | -<<.from-version "5.1.23">> If the suffix `rawunicode` is present, Unicode characters above 0x80 (such as ß, ä, ñ or 🎄) will be passed through unchanged. Without the suffix, they will be substituted with `\\u` codes, which was the default behavior before 5.1.23. +<<.from-version "5.1.23">> If the suffix `rawunicode` is present, Unicode characters above 0x80 (such as ß, ä, ñ or 🎄) will be passed through unchanged. Without the suffix, they will be substituted with `\u` codes, which was the default behavior before 5.1.23. -<<.note """Technical note: Characters outside the Basic Multilingual Plane, such as 🎄 and other emojis, will be encoded as a UTF-16 surrogate pair, i.e. with two `\u` sequences.""">> +<<.note """Characters outside the Basic Multilingual Plane, such as 🎄 and other emojis, will be encoded as a UTF-16 surrogate pair, i.e. with two `\u` sequences.""">> -Also see the [[jsonstringify Operator]]. +<<.olink jsonstringify>> is considered deprecated, as it duplicates the functionality of <<.op stringify>>. -<<.operator-examples "stringify">> +<<.operator-examples "stringify">> \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/filters/syntax/Filter Expression.tid b/editions/tw5.com/tiddlers/filters/syntax/Filter Expression.tid index f923a03a6..8521859ac 100644 --- a/editions/tw5.com/tiddlers/filters/syntax/Filter Expression.tid +++ b/editions/tw5.com/tiddlers/filters/syntax/Filter Expression.tid @@ -50,7 +50,7 @@ In technical / logical terms: |`~run` |`:else[run]` |else |... ELSE run | ||`:intersection`|intersection of sets|| -For the difference between `+` and `:intersection`, see [[Filter Run Prefix (Examples)]]. +For the difference between `+` and `:intersection`, see [[Intersection Filter Run Prefix (Examples)]]. The input of a run is normally a list of all the non-[[shadow|ShadowTiddlers]] tiddler titles in the wiki (in no particular order). But the `+` prefix can change this: diff --git a/editions/tw5.com/tiddlers/howtos/Constructing JSON tiddlers.tid b/editions/tw5.com/tiddlers/howtos/Constructing JSON tiddlers.tid index 58b36244c..ff4c7927c 100644 --- a/editions/tw5.com/tiddlers/howtos/Constructing JSON tiddlers.tid +++ b/editions/tw5.com/tiddlers/howtos/Constructing JSON tiddlers.tid @@ -1,7 +1,7 @@ -title: Constructing JSON tiddlers -tags: [[JSON in TiddlyWiki]] [[Learning]] created: 20220427174702859 -modified: 20220427174702859 +modified: 20230809113620964 +tags: [[JSON in TiddlyWiki]] Learning +title: Constructing JSON tiddlers See [[JSON in TiddlyWiki]] for an overview of using JSON in TiddlyWiki. @@ -13,4 +13,4 @@ At a high level, we have several ways to generate JSON data in TiddlyWiki's own * [[jsontiddler Macro]] * [[jsontiddlers Macro]] -When constructing JSON data manually, the [[jsonstringify Operator]] is needed to ensure that any special characters are properly escaped. +When constructing JSON data manually, the [[stringify Operator]] is needed to ensure that any special characters are properly escaped. diff --git a/editions/tw5.com/tiddlers/images/Favicon template.svg b/editions/tw5.com/tiddlers/images/Favicon template.svg new file mode 100644 index 000000000..fe8f53afd --- /dev/null +++ b/editions/tw5.com/tiddlers/images/Favicon template.svg @@ -0,0 +1,296 @@ + + + + diff --git a/editions/tw5.com/tiddlers/images/Favicon template.svg.meta b/editions/tw5.com/tiddlers/images/Favicon template.svg.meta new file mode 100644 index 000000000..8d6a1a197 --- /dev/null +++ b/editions/tw5.com/tiddlers/images/Favicon template.svg.meta @@ -0,0 +1,3 @@ +title: Favicon template.svg +tags: picture +type: image/svg+xml \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/images/favicon.ico b/editions/tw5.com/tiddlers/images/favicon.ico deleted file mode 100644 index abf226e9b..000000000 Binary files a/editions/tw5.com/tiddlers/images/favicon.ico and /dev/null differ diff --git a/editions/tw5.com/tiddlers/images/favicon.ico.meta b/editions/tw5.com/tiddlers/images/favicon.ico.meta deleted file mode 100644 index 2f3e81713..000000000 --- a/editions/tw5.com/tiddlers/images/favicon.ico.meta +++ /dev/null @@ -1,2 +0,0 @@ -title: $:/favicon.ico -type: image/x-icon diff --git a/editions/tw5.com/tiddlers/images/favicon.png b/editions/tw5.com/tiddlers/images/favicon.png new file mode 100644 index 000000000..d797bbe8d Binary files /dev/null and b/editions/tw5.com/tiddlers/images/favicon.png differ diff --git a/editions/tw5.com/tiddlers/images/favicon.png.meta b/editions/tw5.com/tiddlers/images/favicon.png.meta new file mode 100644 index 000000000..76d0be1a8 --- /dev/null +++ b/editions/tw5.com/tiddlers/images/favicon.png.meta @@ -0,0 +1,2 @@ +title: $:/favicon.ico +type: image/png diff --git a/editions/tw5.com/tiddlers/images/green_favicon.ico b/editions/tw5.com/tiddlers/images/green_favicon.ico deleted file mode 100644 index 06e5f8e80..000000000 Binary files a/editions/tw5.com/tiddlers/images/green_favicon.ico and /dev/null differ diff --git a/editions/tw5.com/tiddlers/images/green_favicon.ico.meta b/editions/tw5.com/tiddlers/images/green_favicon.ico.meta deleted file mode 100644 index f2e1cfa3c..000000000 --- a/editions/tw5.com/tiddlers/images/green_favicon.ico.meta +++ /dev/null @@ -1,2 +0,0 @@ -title: $:/green_favicon.ico -type: image/x-icon diff --git a/editions/tw5.com/tiddlers/images/green_favicon.png b/editions/tw5.com/tiddlers/images/green_favicon.png new file mode 100644 index 000000000..ac96b571f Binary files /dev/null and b/editions/tw5.com/tiddlers/images/green_favicon.png differ diff --git a/editions/tw5.com/tiddlers/images/green_favicon.png.meta b/editions/tw5.com/tiddlers/images/green_favicon.png.meta new file mode 100644 index 000000000..1f2a3ecc0 --- /dev/null +++ b/editions/tw5.com/tiddlers/images/green_favicon.png.meta @@ -0,0 +1,2 @@ +title: $:/green_favicon.ico +type: image/png diff --git a/editions/tw5.com/tiddlers/pragmas/Pragma_ _whitespace.tid b/editions/tw5.com/tiddlers/pragmas/Pragma_ _whitespace.tid index 273a35bea..6e9f78287 100644 --- a/editions/tw5.com/tiddlers/pragmas/Pragma_ _whitespace.tid +++ b/editions/tw5.com/tiddlers/pragmas/Pragma_ _whitespace.tid @@ -1,13 +1,17 @@ created: 20220917113002350 -modified: 20230419103154329 +modified: 20230921180332436 tags: Pragmas title: Pragma: \whitespace type: text/vnd.tiddlywiki -<<.from-version "5.1.15">> The ''\whitespace'' [[pragma|Pragmas]] determines how spaces and newlines are treated within wikitext. Note that this only applies to the printable text, and not to other text, such as the values of attributes. +<<.from-version "5.1.15">> The ''\whitespace'' [[pragma|Pragmas]] determines how spaces and newlines are treated within wikitext. * ''notrim'' -- whitespace text is not subject to special processing (the default) -* ''trim'' -- whitespace text is removed +* ''trim'' -- whitespace text is ignored + +Note that the processing only applies to the printable text, and not to other text, such as the values of attributes. + +The whitespace setting only applies to the parsed content in which it appears. The setting is inherited by embedded [[Procedure Definitions]] and [[Custom Widgets]] definitions, but is not inherited by [[Macro definitions]]. ``` \whitespace trim|notrim diff --git a/editions/tw5.com/tiddlers/procedures/Procedure Definitions.tid b/editions/tw5.com/tiddlers/procedures/Procedure Definitions.tid index aa6d37a72..7d2ef564c 100644 --- a/editions/tw5.com/tiddlers/procedures/Procedure Definitions.tid +++ b/editions/tw5.com/tiddlers/procedures/Procedure Definitions.tid @@ -1,5 +1,5 @@ created: 20221007125701001 -modified: 20230419103154329 +modified: 20230921180332436 tags: WikiText Procedures title: Procedure Definitions type: text/vnd.tiddlywiki @@ -18,6 +18,8 @@ This is the procedure text (param=<>) \end ``` +Note that the [[Pragma: \whitespace]] setting is inherited from the parsing context in which the procedure definition occurs. That means that a tiddler containing multiple procedure definitions only needs a single whitespace pragma at the top of the tiddler, and the setting will be automatically inherited by the procedure definitions without needing the pragma to be repeated. + !! Procedure Definition with Set Widget Procedures are implemented as a special kind of [[variable|Variables]] and so internally are actually defined with a <<.wlink SetWidget>> widget. diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.0.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.0.tid index 29403c9a7..b10ed54d5 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.0.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.0.tid @@ -5,6 +5,7 @@ tags: ReleaseNotes title: Release 5.1.0 type: text/vnd.tiddlywiki released: 201409201500 +description: First non-beta release //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.0.18-beta...v5.1.0]]// diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.1.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.1.tid index db16984c0..6ee16c1d8 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.1.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.1.tid @@ -5,6 +5,7 @@ tags: ReleaseNotes title: Release 5.1.1 type: text/vnd.tiddlywiki released: 201409221100 +description: [[KaTeX Plugin]] //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.0...v5.1.1]]// diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.10.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.10.tid index 3b72acd96..aab812aeb 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.10.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.10.tid @@ -5,6 +5,7 @@ tags: ReleaseNotes title: Release 5.1.10 type: text/vnd.tiddlywiki released: 20160107231609312 +description: Text slicer, fold/unfold, performance optimisations, translations, external text tiddlers //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.9...v5.1.10]]// diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.11.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.11.tid index 18eff4b38..4bf6744bc 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.11.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.11.tid @@ -5,6 +5,7 @@ tags: ReleaseNotes title: Release 5.1.11 type: text/vnd.tiddlywiki released: 20160130124109312 +description: Bug fix release for v5.1.10 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.10...v5.1.11]]// diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.12.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.12.tid index ee26fb2a4..50e4a0c1a 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.12.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.12.tid @@ -5,6 +5,7 @@ tags: ReleaseNotes title: Release 5.1.12 type: text/vnd.tiddlywiki released: 20160713104714652 +description: Editor toolbars, improved bitmap editor, Internals plugin, WikifyWidget //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.11...v5.1.12]]// diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.13.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.13.tid index 593e1c85c..a9fd5a94f 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.13.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.13.tid @@ -5,6 +5,7 @@ released: 20160725084810809 tags: ReleaseNotes title: Release 5.1.13 type: text/vnd.tiddlywiki +description: Bug fix release for v5.1.12 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.12...v5.1.13]]// diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.14.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.14.tid index 57a2cc6f7..ea2898821 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.14.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.14.tid @@ -5,6 +5,7 @@ released: 20170426160031661 tags: ReleaseNotes title: Release 5.1.14 type: text/vnd.tiddlywiki +description: Drag and drop improvements, initial RTL support, plugins for XLSX import, QR Codes, ~BibTeX, Google Analytics, Twitter //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.13...v5.1.14]]// diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.15.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.15.tid index a3db96697..68dd3389b 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.15.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.15.tid @@ -5,6 +5,7 @@ released: 20171113161124237 tags: ReleaseNotes title: Release 5.1.15 type: text/vnd.tiddlywiki +description: Explorer tab, whitespace pragma, save and render commands //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.14...v5.1.15]]// diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.16.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.16.tid index 90c62c110..6a97267e1 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.16.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.16.tid @@ -5,6 +5,7 @@ released: 20180425155658451 tags: ReleaseNotes title: Release 5.1.16 type: text/vnd.tiddlywiki +description: [[Dynaview Plugin]], import previews, DiffTextWidget, rotate left in bitmap editor, StartupActions //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.15...v5.1.16]]// diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.17.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.17.tid index 99cc96e52..a80e2d5a1 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.17.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.17.tid @@ -5,6 +5,7 @@ released: 20180512104329616 tags: ReleaseNotes title: Release 5.1.17 type: text/vnd.tiddlywiki +description: Minor bug fix release //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.16...v5.1.17]]// diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.18.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.18.tid index 9338869c2..4b2501ea3 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.18.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.18.tid @@ -5,6 +5,7 @@ released: 20181206090053690 tags: ReleaseNotes title: Release 5.1.18 type: text/vnd.tiddlywiki +description: Global keyboard shortcuts, HTTP server improvements, support for splash screens, `~` filter run prefix, external JS support //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.17...v5.1.18]]// diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.19.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.19.tid index 942dea49c..2e6f12baa 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.19.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.19.tid @@ -5,6 +5,7 @@ released: 20181220163418974 tags: ReleaseNotes title: Release 5.1.19 type: text/vnd.tiddlywiki +description: Bug fix release for v5.1.18 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.18...v5.1.19]]// diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.2.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.2.tid index 18c5c8f7a..71bc7c332 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.2.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.2.tid @@ -5,6 +5,7 @@ tags: ReleaseNotes title: Release 5.1.2 type: text/vnd.tiddlywiki released: 20140927162659979 +description: Minor fixes //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.1...v5.1.2]]// diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.20.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.20.tid index a56247222..513f4f946 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.20.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.20.tid @@ -5,6 +5,7 @@ released: 20190809141328809 tags: ReleaseNotes title: Release 5.1.20 type: text/vnd.tiddlywiki +description: New conditional, mathematics and string operators, GitHub Saver, save wiki folder command, [[Innerwiki Plugin]] //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.19...v5.1.20]]// diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.21.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.21.tid index 1511c6dd5..c099b5411 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.21.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.21.tid @@ -5,6 +5,7 @@ released: 20190910152313608 tags: ReleaseNotes title: Release 5.1.21 type: text/vnd.tiddlywiki +description: Bug fix release for v5.1.20 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.20...v5.1.21]]// diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.22.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.22.tid index 9805c3f38..813aed85b 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.22.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.22.tid @@ -5,6 +5,7 @@ released: 20200415160825341 tags: ReleaseNotes title: Release 5.1.22 type: text/vnd.tiddlywiki +description: Dynamic plugin loading, compare operator, new plugins: Menubar, Freelinks, Dynannotate, Share //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.21...v5.1.22]]// diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.23.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.23.tid index 8427d97ab..c12a3b4db 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.23.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.23.tid @@ -5,6 +5,7 @@ released: 20201224132933812 tags: ReleaseNotes title: Release 5.1.23 type: text/vnd.tiddlywiki +description: Switchable page templates, EventCatcherWidget, Rename during import, many plugin and filter improvements //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.22...v5.1.23]]// diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.3.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.3.tid index 8958a21ab..d7196c284 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.3.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.3.tid @@ -5,6 +5,7 @@ tags: ReleaseNotes title: Release 5.1.3 type: text/vnd.tiddlywiki released: 20141020171015200 +description: Journals, ActionWidgets, <<.olink addprefix>> and <<.olink addsuffix>> operators, "includeWikis" //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.2...v5.1.3]]// diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.4.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.4.tid index 68b241721..09d8572a5 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.4.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.4.tid @@ -5,6 +5,7 @@ tags: ReleaseNotes title: Release 5.1.4 type: text/vnd.tiddlywiki released: 20141022155524581 +description: Dragging links into text boxes, coloured errors and warnings under Node.js //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.3...v5.1.4]]// diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.5.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.5.tid index 4d19b0be1..5177bfa1c 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.5.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.5.tid @@ -5,6 +5,7 @@ tags: ReleaseNotes title: Release 5.1.5 type: text/vnd.tiddlywiki released: 20141126153016142 +description: Export button, more ActionWidgets, Danish and Greek translations //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.4...v5.1.5]]// diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.6.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.6.tid index ba4e04d5b..7bf74d8b3 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.6.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.6.tid @@ -5,6 +5,7 @@ tags: ReleaseNotes title: Release 5.1.6 type: text/vnd.tiddlywiki released: 20141219155007260 +description: Minor bug fix release for v5.1.5 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.5...v5.1.6]]// diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.7.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.7.tid index b19a60521..1525a0171 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.7.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.7.tid @@ -5,6 +5,7 @@ tags: ReleaseNotes title: Release 5.1.7 type: text/vnd.tiddlywiki released: 20141219215007260 +description: Hot fix release for v5.1.7 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.6...v5.1.7]]// diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.8.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.8.tid index ec43827aa..bf2ad97d5 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.8.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.8.tid @@ -5,6 +5,7 @@ tags: ReleaseNotes title: Release 5.1.8 type: text/vnd.tiddlywiki released: 2015041716307227 +description: Plugin library, Railroad Plugin, sticky titles, 7 new translations //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.7...v5.1.8]]// diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.9.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.9.tid index 8ab977572..6c98838dd 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.9.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.9.tid @@ -5,6 +5,7 @@ tags: ReleaseNotes title: Release 5.1.9 type: text/vnd.tiddlywiki released: 20150703153725652 +description: Fluid-fixed layout, vars widget, open in new window \define custom-colour-picker(tiddler,colour) <$edit-text tiddler="""$tiddler$""" index="""$colour$""" type="color" tag="input"/> diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.2.0.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.2.0.tid index 369a31f59..2d3909022 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.2.0.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.2.0.tid @@ -5,6 +5,7 @@ released: 20211003151502543 tags: ReleaseNotes title: Release 5.2.0 type: text/vnd.tiddlywiki +description: JSON store area, nestable macros, counter attribute for ListWidget, MessageCatcherWidget //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.23...v5.2.0]]// diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.2.1.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.2.1.tid index b0894362c..40d33f59d 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.2.1.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.2.1.tid @@ -5,6 +5,7 @@ released: 20211208115833846 tags: ReleaseNotes title: Release 5.2.1 type: text/vnd.tiddlywiki +description: Filter cascades, LetWidget, trigonometric operators //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.2.0...v5.2.1]]// diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.2.2.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.2.2.tid index 914a629ce..d89193044 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.2.2.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.2.2.tid @@ -5,6 +5,7 @@ released: 20220325130817150 tags: ReleaseNotes title: Release 5.2.2 type: text/vnd.tiddlywiki +description: Minor bug fix release //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.2.1...v5.2.2]]// diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.2.3.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.2.3.tid index 7aeb4fcbd..a810603be 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.2.3.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.2.3.tid @@ -5,6 +5,7 @@ released: 20220802122551819 tags: ReleaseNotes title: Release 5.2.3 type: text/vnd.tiddlywiki +description: Minor fixes and improvements //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.2.2...v5.2.3]]// diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.2.4.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.2.4.tid index 46a2ea4df..461a528c8 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.2.4.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.2.4.tid @@ -5,6 +5,7 @@ released: 20221213163110439 tags: ReleaseNotes title: Release 5.2.4 type: text/vnd.tiddlywiki +description: Hot fixes for v5.2.3, Twitter archivist plugin, GenesisWidget, JSON read operators, nested macro definitions //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.2.3...v5.2.4]]// diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.2.5.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.2.5.tid index 4ada9efa4..72ee38c34 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.2.5.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.2.5.tid @@ -5,6 +5,7 @@ released: 20221219184500440 tags: ReleaseNotes title: Release 5.2.5 type: text/vnd.tiddlywiki +description: Hot fix release for v5.2.4 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.2.4...v5.2.5]]// diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.2.6.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.2.6.tid index 575d9d47b..008b96225 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.2.6.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.2.6.tid @@ -5,6 +5,7 @@ released: 20230320184352916 tags: ReleaseNotes title: Release 5.2.6 type: text/vnd.tiddlywiki +description: Markdown improvements, indentable pragmas, accessible save wiki button //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.2.5...v5.2.6]]// diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.2.7.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.2.7.tid index 62a6b5264..af175912f 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.2.7.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.2.7.tid @@ -5,6 +5,7 @@ released: 20230326083239710 tags: ReleaseNotes title: Release 5.2.7 type: text/vnd.tiddlywiki +description: Bug fix release for v5.2.6 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.2.6...v5.2.7]]// diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.3.0.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.3.0.tid index 48e4d7490..68e3263ba 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.3.0.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.3.0.tid @@ -5,6 +5,7 @@ released: 20230701123439630 tags: ReleaseNotes title: Release 5.3.0 type: text/vnd.tiddlywiki +description: Parameterised transclusions, procedures, functions, custom widgets //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.2.7...v5.3.0]]// diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.3.1.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.3.1.tid index b4c326125..522bc08be 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.3.1.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.3.1.tid @@ -5,6 +5,7 @@ released: 20230820112855583 tags: ReleaseNotes title: Release 5.3.1 type: text/vnd.tiddlywiki +description: Bug fix release for v5.3.0 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.3.0...v5.3.1]]// diff --git a/editions/tw5.com/tiddlers/releasenotes/Releases.tid b/editions/tw5.com/tiddlers/releasenotes/Releases.tid index e738520a7..57e5d3fd4 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Releases.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Releases.tid @@ -1,9 +1,11 @@ created: 20150419144523070 -modified: 20220802100223019 +modified: 20231005205612322 tags: About title: Releases type: text/vnd.tiddlywiki New releases of TiddlyWiki and TiddlyDesktop are announced via the [[official discussion groups|Forums]] and [[Twitter|https://twitter.com/TiddlyWiki]] +See the [[TiddlyWiki Archive]] to download older versions. + <> diff --git a/editions/tw5.com/tiddlers/widgets/Custom Widgets.tid b/editions/tw5.com/tiddlers/widgets/Custom Widgets.tid index 3d762bed2..b8c48b2c3 100644 --- a/editions/tw5.com/tiddlers/widgets/Custom Widgets.tid +++ b/editions/tw5.com/tiddlers/widgets/Custom Widgets.tid @@ -1,5 +1,5 @@ created: 20221007144237585 -modified: 20230419103154328 +modified: 20230921180332436 tags: Concepts Reference title: Custom Widgets type: text/vnd.tiddlywiki @@ -22,6 +22,8 @@ This is the widget, and the attribute is <>. The name of the widget must start with a dollar sign. If it is a user defined widget that does not override an existing widget then it must include at least one period (dot) within the name (for example `$my.widget` or `$acme.logger`). +Note that the [[Pragma: \whitespace]] setting is inherited from the parsing context in which the procedure definition occurs. That means that a tiddler containing multiple procedure definitions only needs a single whitespace pragma at the top of the tiddler, and the setting will be automatically inherited by the procedure definitions without needing the pragma to be repeated. + !! Using Custom Widgets Custom widgets are called in the same way as ordinary built-in widgets: diff --git a/editions/tw5.com/tiddlywiki.info b/editions/tw5.com/tiddlywiki.info index 7379908ee..30787a42f 100644 --- a/editions/tw5.com/tiddlywiki.info +++ b/editions/tw5.com/tiddlywiki.info @@ -49,7 +49,7 @@ "static": [ "--render","$:/core/templates/static.template.html","static.html","text/plain", "--render","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain", - "--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain","$:/core/templates/static.tiddler.html", + "--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain","$:/core/templates/static.tiddler.html", "--render","$:/core/templates/static.template.css","static/static.css","text/plain"], "external-js": [ "--render","$:/core/save/offline-external-js","[[external-]addsuffixaddsuffix[.html]]","text/plain", diff --git a/editions/zh-Hans/tiddlers/images/favicon.ico b/editions/zh-Hans/tiddlers/images/favicon.ico deleted file mode 100644 index d4fae0448..000000000 Binary files a/editions/zh-Hans/tiddlers/images/favicon.ico and /dev/null differ diff --git a/editions/zh-Hans/tiddlers/images/favicon.ico.meta b/editions/zh-Hans/tiddlers/images/favicon.ico.meta deleted file mode 100644 index 2f3e81713..000000000 --- a/editions/zh-Hans/tiddlers/images/favicon.ico.meta +++ /dev/null @@ -1,2 +0,0 @@ -title: $:/favicon.ico -type: image/x-icon diff --git a/editions/zh-Hans/tiddlers/images/favicon.png b/editions/zh-Hans/tiddlers/images/favicon.png new file mode 100644 index 000000000..d797bbe8d Binary files /dev/null and b/editions/zh-Hans/tiddlers/images/favicon.png differ diff --git a/editions/zh-Hans/tiddlers/images/favicon.png.meta b/editions/zh-Hans/tiddlers/images/favicon.png.meta new file mode 100644 index 000000000..76d0be1a8 --- /dev/null +++ b/editions/zh-Hans/tiddlers/images/favicon.png.meta @@ -0,0 +1,2 @@ +title: $:/favicon.ico +type: image/png diff --git a/editions/zh-Hans/tiddlers/images/green_favicon.ico b/editions/zh-Hans/tiddlers/images/green_favicon.ico deleted file mode 100644 index 06e5f8e80..000000000 Binary files a/editions/zh-Hans/tiddlers/images/green_favicon.ico and /dev/null differ diff --git a/editions/zh-Hans/tiddlers/images/green_favicon.ico.meta b/editions/zh-Hans/tiddlers/images/green_favicon.ico.meta deleted file mode 100644 index f2e1cfa3c..000000000 --- a/editions/zh-Hans/tiddlers/images/green_favicon.ico.meta +++ /dev/null @@ -1,2 +0,0 @@ -title: $:/green_favicon.ico -type: image/x-icon diff --git a/editions/zh-Hans/tiddlers/images/green_favicon.png b/editions/zh-Hans/tiddlers/images/green_favicon.png new file mode 100644 index 000000000..ac96b571f Binary files /dev/null and b/editions/zh-Hans/tiddlers/images/green_favicon.png differ diff --git a/editions/zh-Hans/tiddlers/images/green_favicon.png.meta b/editions/zh-Hans/tiddlers/images/green_favicon.png.meta new file mode 100644 index 000000000..1f2a3ecc0 --- /dev/null +++ b/editions/zh-Hans/tiddlers/images/green_favicon.png.meta @@ -0,0 +1,2 @@ +title: $:/green_favicon.ico +type: image/png diff --git a/editions/zh-Hant/tiddlers/images/favicon.ico b/editions/zh-Hant/tiddlers/images/favicon.ico deleted file mode 100644 index d4fae0448..000000000 Binary files a/editions/zh-Hant/tiddlers/images/favicon.ico and /dev/null differ diff --git a/editions/zh-Hant/tiddlers/images/favicon.ico.meta b/editions/zh-Hant/tiddlers/images/favicon.ico.meta deleted file mode 100644 index 2f3e81713..000000000 --- a/editions/zh-Hant/tiddlers/images/favicon.ico.meta +++ /dev/null @@ -1,2 +0,0 @@ -title: $:/favicon.ico -type: image/x-icon diff --git a/editions/zh-Hant/tiddlers/images/favicon.png b/editions/zh-Hant/tiddlers/images/favicon.png new file mode 100644 index 000000000..d797bbe8d Binary files /dev/null and b/editions/zh-Hant/tiddlers/images/favicon.png differ diff --git a/editions/zh-Hant/tiddlers/images/favicon.png.meta b/editions/zh-Hant/tiddlers/images/favicon.png.meta new file mode 100644 index 000000000..76d0be1a8 --- /dev/null +++ b/editions/zh-Hant/tiddlers/images/favicon.png.meta @@ -0,0 +1,2 @@ +title: $:/favicon.ico +type: image/png diff --git a/editions/zh-Hant/tiddlers/images/green_favicon.ico b/editions/zh-Hant/tiddlers/images/green_favicon.ico deleted file mode 100644 index 06e5f8e80..000000000 Binary files a/editions/zh-Hant/tiddlers/images/green_favicon.ico and /dev/null differ diff --git a/editions/zh-Hant/tiddlers/images/green_favicon.ico.meta b/editions/zh-Hant/tiddlers/images/green_favicon.ico.meta deleted file mode 100644 index f2e1cfa3c..000000000 --- a/editions/zh-Hant/tiddlers/images/green_favicon.ico.meta +++ /dev/null @@ -1,2 +0,0 @@ -title: $:/green_favicon.ico -type: image/x-icon diff --git a/editions/zh-Hant/tiddlers/images/green_favicon.png b/editions/zh-Hant/tiddlers/images/green_favicon.png new file mode 100644 index 000000000..ac96b571f Binary files /dev/null and b/editions/zh-Hant/tiddlers/images/green_favicon.png differ diff --git a/editions/zh-Hant/tiddlers/images/green_favicon.png.meta b/editions/zh-Hant/tiddlers/images/green_favicon.png.meta new file mode 100644 index 000000000..1f2a3ecc0 --- /dev/null +++ b/editions/zh-Hant/tiddlers/images/green_favicon.png.meta @@ -0,0 +1,2 @@ +title: $:/green_favicon.ico +type: image/png diff --git a/languages/es-ES/Buttons.multids b/languages/es-ES/Buttons.multids index 1e36bc00e..5ee88ead4 100644 --- a/languages/es-ES/Buttons.multids +++ b/languages/es-ES/Buttons.multids @@ -67,6 +67,8 @@ More/Caption: Más More/Hint: Otras acciones NewHere/Caption: Nuevo aquí NewHere/Hint: Crea un nuevo tiddler etiquetado con el título de este tiddler +NetworkActivity/Caption: actividad de red +NetworkActivity/Hint: Cancelar la actividad de red NewJournal/Caption: Nueva entrada NewJournal/Hint: Crea una nueva entrada de diario NewJournalHere/Caption: Entrada nueva aquí diff --git a/languages/es-ES/Fields.multids b/languages/es-ES/Fields.multids index fe0b54dd9..4ea73213e 100644 --- a/languages/es-ES/Fields.multids +++ b/languages/es-ES/Fields.multids @@ -1,11 +1,13 @@ title: $:/language/Docs/Fields/ _canonical_uri: Dirección (URI) completa -absoluta o relativa- de un tiddler externo de imagen +author: Nombre del autor de un plugin bag: Nombre de la bolsa de la que procede un tiddler caption: Texto que se muestra en una pestaña o botón, con independencia del título del tiddler que lo define code-body: La plantilla de vista mostrará el tiddler como código si se establece en ''yes'' color: Valor CSS del color de fondo asociado a un tiddler component: Nombre del componente responsable de un [[tiddler de alerta|AlertMechanism]] +core-version: Para un plugin, indica con qué versión de TiddlyWiki es compatible current-tiddler: Usado para incluir el tiddler superior en una [[historia|HistoryMechanism]] created: Fecha de creación del tiddler creator: Nombre del autor del tiddler @@ -22,7 +24,9 @@ list-before: Título del tiddler antes del que el presente será añadido a una list-after: Título del tiddler tras el que el presente será añadido a una lista de tiddlers. modified: Fecha y hora de última modificación modifier: Nombre del tiddler asociado con quien modificó por última vez el presente tiddler +module-type: Para los tiddlers javascript, especifica de qué tipo de módulo se trata name: Nombre asociado con un complemento o extensión +parent-plugin: Para un plugin, especifica de qué plugin es un subplugin plugin-priority: Valor numérico que indica la prioridad de un complemento o extensión plugin-type: Tipo de complemento o extensión revision: Revisión del tiddler existente en el servidor diff --git a/languages/es-ES/Help/listen.tid b/languages/es-ES/Help/listen.tid index 9cfae2bb1..c3b77dc66 100644 --- a/languages/es-ES/Help/listen.tid +++ b/languages/es-ES/Help/listen.tid @@ -18,7 +18,7 @@ Todos los parámetros son opcionales con valores predeterminados seguros y se pu * ''anon-username'' - el nombre de usuario para firmar ediciones de usuarios anónimos * ''username'' - nombre de usuario opcional para autenticación básica * ''password'' - contraseña opcional para autenticación básica -* ''authenticated-user-header'' - nombre opcional del encabezado que se utilizará para la autenticación de confianza +* ''authenticated-user-header'' - nombre opcional del encabezado de solicitud que se utilizará para la autenticación de confianza. * ''readers'' - lista separada por comas de los usuarios autorizados a leer de este wiki * ''writers'' - lista separada por comas de los usuarios autorizados a escribir en este wiki * ''csrf-disable'' - establecer a "yes" para deshabilitar las comprobaciones CSRF (el valor predeterminado es "no") diff --git a/languages/es-ES/Help/savewikifolder.tid b/languages/es-ES/Help/savewikifolder.tid index 6522b7155..268180aae 100644 --- a/languages/es-ES/Help/savewikifolder.tid +++ b/languages/es-ES/Help/savewikifolder.tid @@ -4,7 +4,7 @@ description: Guarda un wiki en una nueva carpeta de wiki <<.from-version "5.1.20">> Guarda el wiki actual como una carpeta de wiki, incluidos tiddlers, complementos y configuración: ``` ---savewikifolder [] +--savewikifolder [] [ [=] ]* ``` * La carpeta wiki de destino debe estar vacía o no existir @@ -12,8 +12,23 @@ description: Guarda un wiki en una nueva carpeta de wiki * Los complementos de la biblioteca oficial de complementos se reemplazan con referencias a esos complementos en el archivo `tiddlywiki.info` * Los complementos personalizados se descomprimen en su propia carpeta +Se admiten las siguientes opciones: + +* ''filter'': una expresión de filtro que define los tiddlers que se incluirán en la salida. +* ''explodePlugins'': por defecto "yes". +** ''yes'' desplegará los plugins en archivos tiddler separados y los guardará en el directorio de plugins dentro de la carpeta wiki +** ''no'' no realizará el despliegue del plugin en sus archivos tiddler constituyentes si no que guardará el plugin como un único tiddler JSON en la carpeta tiddlers. + +Ten en cuenta que ambas opciones ''explodePlugins'' producirán carpetas wiki que construirán exactamente el mismo wiki original. La diferencia radica en cómo se representan los plugins en la carpeta wiki. + Un uso común es convertir un archivo HTML de TiddlyWiki en una carpeta wiki: ``` tiddlywiki --load ./mywiki.html --savewikifolder ./mywikifolder ``` + +Guarda el plugin en el directorio tiddlers de la carpeta wiki de destino: + +``` +tiddlywiki --load ./mywiki.html --savewikifolder ./mywikifolder explodePlugins=no +``` diff --git a/languages/es-ES/Help/server.tid b/languages/es-ES/Help/server.tid index b16769dfe..a05099240 100644 --- a/languages/es-ES/Help/server.tid +++ b/languages/es-ES/Help/server.tid @@ -1,5 +1,5 @@ title: $:/language/Help/server -description: Proporciona interfaz de servidor HTTP a TiddlyWiki (en desuso a favor del nuevo comando listen) +description: (en desuso: utiliza el comando 'listen') Proporciona interfaz de servidor HTTP a TiddlyWiki Comando obsoleto para servir una wiki a través de HTTP. diff --git a/languages/es-ES/Misc.multids b/languages/es-ES/Misc.multids index 457ad56e2..6c0839027 100644 --- a/languages/es-ES/Misc.multids +++ b/languages/es-ES/Misc.multids @@ -25,6 +25,8 @@ Encryption/RepeatPassword: Repite la contraseña Encryption/PasswordNoMatch: Las contraseñas no coinciden Encryption/SetPassword: Establecer contraseña Error/Caption: Error +Error/DeserializeOperator/MissingOperand: Error de filtro: Falta el operando 'deserialize +Error/DeserializeOperator/UnknownDeserializer: Error de filtro: Deserializador desconocido proporcionado como operando para el operador 'deserialize'. Error/Filter: Error de filtro Error/FilterSyntax: Error de sintaxis en la expresión de filtro Error/FilterRunPrefix: Error en Filtro: Prefijo desconocido para la ejecución del filtro @@ -40,6 +42,7 @@ Error/RetrievingSkinny: Error al recuperar la lista resumida de tiddlers Error/SavingToTWEdit: Error al guardar en TWEdit Error/WhileSaving: Error al guardar Error/XMLHttpRequest: Código de error XMLHttpRequest +Error/ZoominTextNode: Error de vista de historia: Parece que has intentado interactuar con un tiddler que se muestra en un contenedor personalizado. La causa más probable es el uso de `$:/tags/StoryTiddlerTemplateFilter` con una plantilla que contiene texto o espacios en blanco al principio. Utiliza el pragma `\whitespace trim` y asegúrate de que todo el contenido del tiddler está envuelto en un único elemento HTML. El texto que causó este problema: InternalJavaScriptError/Hint: Hay un problema. Se recomienda que reinicies TiddlyWiki InternalJavaScriptError/Title: Error interno de JavaScript LayoutSwitcher/Description: Abre el selector de diseño diff --git a/languages/es-ES/SiteTitle.tid b/languages/es-ES/SiteTitle.tid index f1899630c..875fe88b1 100644 --- a/languages/es-ES/SiteTitle.tid +++ b/languages/es-ES/SiteTitle.tid @@ -1,3 +1,3 @@ title: $:/SiteTitle -Mi ~TiddlyWiki \ No newline at end of file +Mi TiddlyWiki diff --git a/languages/pl-PL/Exporters.multids b/languages/pl-PL/Exporters.multids index 5a7d965c1..38f4e0427 100644 --- a/languages/pl-PL/Exporters.multids +++ b/languages/pl-PL/Exporters.multids @@ -3,5 +3,5 @@ title: $:/language/Exporters/ StaticRiver: Statyczny HTML JsonFile: Plik JSON CsvFile: Plik CSV -TidFile: Plik ".tid" +TidFile: Plik tekstowy TID diff --git a/languages/pl-PL/Help/savewikifolder.tid b/languages/pl-PL/Help/savewikifolder.tid index c5edba093..52e7db6ac 100644 --- a/languages/pl-PL/Help/savewikifolder.tid +++ b/languages/pl-PL/Help/savewikifolder.tid @@ -19,6 +19,8 @@ Wspierane argumenty: ** `yes` rozdzieli wtyczki na osobne pliki tiddlerów i zapisze je do podfolderu z wtyczkami ** `no` każda wtyczka będzie zapisana jako jeden zbiorczy plik w formacie JSON w folderze z tiddlerami +Obie wartości dla `explodePlugins` stworzą taką samą wiki. Różnica będzie jedynie w sposobie rozlokowania wtyczek. + Typowe zastosowanie to konwersja pliku TiddlyWiki w formie pliku HTML do formatu folderu: ``` @@ -29,4 +31,4 @@ Zapisanie wtyczek jako zwykłych tiddlerów: ``` tiddlywiki --load ./mojawiki.html --savewikifolder ./folderwiki explodePlugins=no -``` \ No newline at end of file +``` diff --git a/languages/pl-PL/Help/server.tid b/languages/pl-PL/Help/server.tid index 85213cd9b..afd74aca8 100644 --- a/languages/pl-PL/Help/server.tid +++ b/languages/pl-PL/Help/server.tid @@ -1,5 +1,5 @@ title: $:/language/Help/server -description: Tworzy serwer HTTP wystawiający TiddlyWiki (zalecamy użycie komendy "--listen" zamiast tej) +description: (nieaktualne: patrz komenda 'listen') Tworzy serwer HTTP wystawiający TiddlyWiki (zalecamy użycie komendy "--listen" zamiast tej) Dawna komenda do stawiania serwera wystawiającego wiki. diff --git a/languages/zh-Hans/Exporters.multids b/languages/zh-Hans/Exporters.multids index 9786906da..d63644c0a 100644 --- a/languages/zh-Hans/Exporters.multids +++ b/languages/zh-Hans/Exporters.multids @@ -3,4 +3,4 @@ title: $:/language/Exporters/ StaticRiver: 静态 HTML JsonFile: JSON 文件 CsvFile: CSV 文件 -TidFile: ".tid" 文件 +TidFile: TID 文本文件 diff --git a/languages/zh-Hans/Types/image_svg_xml.tid b/languages/zh-Hans/Types/image_svg_xml.tid index 471564b30..3dcc47c57 100644 --- a/languages/zh-Hans/Types/image_svg_xml.tid +++ b/languages/zh-Hans/Types/image_svg_xml.tid @@ -1,4 +1,4 @@ title: $:/language/Docs/Types/image/svg+xml -description: 结构式矢量图 +description: SVG 图像 name: image/svg+xml group: 图像 diff --git a/languages/zh-Hans/Types/image_x-icon.tid b/languages/zh-Hans/Types/image_x-icon.tid index 5e126f903..a5b5159bc 100644 --- a/languages/zh-Hans/Types/image_x-icon.tid +++ b/languages/zh-Hans/Types/image_x-icon.tid @@ -1,4 +1,4 @@ title: $:/language/Docs/Types/image/x-icon -description: 图标 +description: ICO 图标 name: image/x-icon group: 图像 diff --git a/languages/zh-Hant/Exporters.multids b/languages/zh-Hant/Exporters.multids index 933feeb3a..7829a0f72 100644 --- a/languages/zh-Hant/Exporters.multids +++ b/languages/zh-Hant/Exporters.multids @@ -3,4 +3,4 @@ title: $:/language/Exporters/ StaticRiver: 靜態 HTML JsonFile: JSON 檔案 CsvFile: CSV 檔案 -TidFile: ".tid" 檔案 +TidFile: TID 文字檔案 diff --git a/languages/zh-Hant/Types/image_svg_xml.tid b/languages/zh-Hant/Types/image_svg_xml.tid index bcf53f66a..a069952c7 100644 --- a/languages/zh-Hant/Types/image_svg_xml.tid +++ b/languages/zh-Hant/Types/image_svg_xml.tid @@ -1,4 +1,4 @@ title: $:/language/Docs/Types/image/svg+xml -description: 結構式向量圖 +description: SVG 圖片 name: image/svg+xml group: 圖片 diff --git a/languages/zh-Hant/Types/image_x-icon.tid b/languages/zh-Hant/Types/image_x-icon.tid index 90a255ffb..5dd06b877 100644 --- a/languages/zh-Hant/Types/image_x-icon.tid +++ b/languages/zh-Hant/Types/image_x-icon.tid @@ -1,4 +1,4 @@ title: $:/language/Docs/Types/image/x-icon -description: 圖示 +description: ICO 圖示 name: image/x-icon group: 圖片 diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index 9c4173e01..b5926fc44 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -549,3 +549,5 @@ Eric Haberstroh, @pille1842, 2023/07/23 @cmo-pomerium, 2023/08/03 BuckarooBanzay, @BuckarooBanzay, 2023/09/01 + +Timur, @T1mL3arn, 2023/10/04 diff --git a/plugins/tiddlywiki/comments/styles.tid b/plugins/tiddlywiki/comments/styles.tid index 613c4fdec..ed3cf1ddf 100644 --- a/plugins/tiddlywiki/comments/styles.tid +++ b/plugins/tiddlywiki/comments/styles.tid @@ -5,13 +5,13 @@ tags: [[$:/tags/Stylesheet]] .tc-is-comment-header { padding: 0.25em; - border: 2px solid #c1e1ea; + border: 2px solid <>; border-radius: 4px; - background: #f1fcff; + background: <>; } .tc-comments-segment { - border-top: 2px solid #d7eef4; + border-top: 2px solid <>; } .tc-comment-button button { @@ -25,7 +25,7 @@ tags: [[$:/tags/Stylesheet]] } .tc-comment-button button svg { - fill: #26cb56; + fill: <>; height: 2em; width: 2em; } @@ -44,18 +44,18 @@ tags: [[$:/tags/Stylesheet]] .tc-comment-entry { position: relative; - border: 2px solid #c1e1ea; + border: 2px solid <>; border-radius: 4px; margin: 0.5em 0 0 0; - background: #f1fcff; + background: <>; } .tc-comment-entry-heading { font-size: 0.7em; font-weight: bold; text-transform: uppercase; - background: #d7eef4; - color: #5B6D80; + background: <>; + color: <>; padding: 0 0.5em; } diff --git a/plugins/tiddlywiki/upgrade/UpgradeWizard.tid b/plugins/tiddlywiki/upgrade/UpgradeWizard.tid index c45e57c60..922441bd6 100644 --- a/plugins/tiddlywiki/upgrade/UpgradeWizard.tid +++ b/plugins/tiddlywiki/upgrade/UpgradeWizard.tid @@ -50,7 +50,7 @@ For help and support, visit [[the TiddlyWiki discussion forum|http://groups.goog
-//Your data will not leave your browser. Download this upgrader to use it offline// +//Your data will not leave your browser. Download this upgrader to use it offline// //If clicking the link doesn't work, right-click the link and save it that way.// diff --git a/plugins/tiddlywiki/upgrade/favicon.ico b/plugins/tiddlywiki/upgrade/favicon.ico deleted file mode 100644 index 6d8d018e9..000000000 Binary files a/plugins/tiddlywiki/upgrade/favicon.ico and /dev/null differ diff --git a/plugins/tiddlywiki/upgrade/favicon.ico.meta b/plugins/tiddlywiki/upgrade/favicon.ico.meta deleted file mode 100644 index 2f3e81713..000000000 --- a/plugins/tiddlywiki/upgrade/favicon.ico.meta +++ /dev/null @@ -1,2 +0,0 @@ -title: $:/favicon.ico -type: image/x-icon diff --git a/plugins/tiddlywiki/upgrade/favicon.png b/plugins/tiddlywiki/upgrade/favicon.png new file mode 100644 index 000000000..38f661431 Binary files /dev/null and b/plugins/tiddlywiki/upgrade/favicon.png differ diff --git a/plugins/tiddlywiki/upgrade/favicon.png.meta b/plugins/tiddlywiki/upgrade/favicon.png.meta new file mode 100644 index 000000000..76d0be1a8 --- /dev/null +++ b/plugins/tiddlywiki/upgrade/favicon.png.meta @@ -0,0 +1,2 @@ +title: $:/favicon.ico +type: image/png diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid index 4603589ae..031b849bf 100644 --- a/themes/tiddlywiki/vanilla/base.tid +++ b/themes/tiddlywiki/vanilla/base.tid @@ -1,5 +1,6 @@ title: $:/themes/tiddlywiki/vanilla/base tags: [[$:/tags/Stylesheet]] +list-before: code-body: yes \define custom-background-datauri() diff --git a/themes/tiddlywiki/vanilla/settings.multids b/themes/tiddlywiki/vanilla/settings.multids index 26c9bb9de..e63a4db2d 100644 --- a/themes/tiddlywiki/vanilla/settings.multids +++ b/themes/tiddlywiki/vanilla/settings.multids @@ -1,6 +1,6 @@ title: $:/themes/tiddlywiki/vanilla/settings/ -fontfamily: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji; +fontfamily: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji codefontfamily: "SFMono-Regular",Consolas,"Liberation Mono",Menlo,Courier,monospace backgroundimageattachment: fixed backgroundimagesize: auto