From 3b2c64a85b1bb01d0782e29321e01067c9f55ff4 Mon Sep 17 00:00:00 2001 From: "jeremy@jermolene.com" Date: Fri, 2 Sep 2022 21:28:32 +0100 Subject: [PATCH 1/2] Update release note --- .../prerelease/tiddlers/Release 5.2.4.tid | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/editions/prerelease/tiddlers/Release 5.2.4.tid b/editions/prerelease/tiddlers/Release 5.2.4.tid index 97b5daf3b..45de29903 100644 --- a/editions/prerelease/tiddlers/Release 5.2.4.tid +++ b/editions/prerelease/tiddlers/Release 5.2.4.tid @@ -1,6 +1,6 @@ caption: 5.2.4 created: 20220802100223020 -modified: 20220802100223020 +modified: 20220902201505817 tags: ReleaseNotes title: Release 5.2.4 type: text/vnd.tiddlywiki @@ -11,9 +11,17 @@ type: text/vnd.tiddlywiki * -! Translation improvements +! Translation improvement -* +Improvements to the following translations: + +* Chinese +* Japanese + +Improvements to the translation features of TiddlyWiki: + +* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/6882">> the [[Translators Edition|Translate TiddlyWiki into your language]] to add an option to display the original English text underneath the text area +* <<.link-badge-updated "https://github.com/Jermolene/TiddlyWiki5/pull/6933">> "delete" button text in $:/AdvancedSearch so that it is translatable ! Accessibility Improvements @@ -21,11 +29,12 @@ type: text/vnd.tiddlywiki ! Usability Improvements -* +* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/d62a16ee464fb9984b766b48504829a1a3eb143b">> problem with long presses on tiddler links triggering a preview on iOS/iPadOS +* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/6910">> consistency of button and input elements across browsers ! Widget Improvements -* +* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/127f660c91020dcbb43897d954066b31af729e74">> EditTextWidget to remove the default text "Type the text for the tiddler 'foo'" ! Filter improvements @@ -33,7 +42,7 @@ type: text/vnd.tiddlywiki ! Hackability Improvements -* +* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/6936">> new operators for reading and formatting JSON data: [[jsonget Operator]], [[jsonindexes Operator]], [[jsontype Operator]] and [[format Operator]] ! Bug Fixes @@ -56,4 +65,10 @@ type: text/vnd.tiddlywiki [[@Jermolene|https://github.com/Jermolene]] would like to thank the contributors to this release who have generously given their time to help improve TiddlyWiki: <<.contributors """ +BramChen +fu-sen +oflg +pmario +twMat +xcazin """>> From 9b7edfc1a78422676c20b770e370c5de2eec0e01 Mon Sep 17 00:00:00 2001 From: "jeremy@jermolene.com" Date: Sat, 3 Sep 2022 10:55:15 +0100 Subject: [PATCH 2/2] Revert changes to parse tree preview This implementation requires #6666 --- .../internals/editpreviews/parse-tree.tid | 122 +----------------- 1 file changed, 7 insertions(+), 115 deletions(-) diff --git a/plugins/tiddlywiki/internals/editpreviews/parse-tree.tid b/plugins/tiddlywiki/internals/editpreviews/parse-tree.tid index 205ef7cae..aafa30ecf 100644 --- a/plugins/tiddlywiki/internals/editpreviews/parse-tree.tid +++ b/plugins/tiddlywiki/internals/editpreviews/parse-tree.tid @@ -3,121 +3,13 @@ tags: $:/tags/EditPreview list-after: $:/core/ui/EditTemplate/body/preview/output caption: parse tree -\whitespace trim - -\procedure preview-node-properties(node) -<$let excludeProperties="text type tag children attributes orderedAttributes"> -<$list filter="[jsonindexes[]] -[subfilter] +[limit[1]]" variable="ignore"> - - -<$list filter="[jsonindexes[]] -[subfilter] +[sort[]]" variable="index"> - - - - - - -
-<$text text=<>/> - -<$text text={{{ [jsonget] }}}/> -
- - -\end - -\procedure preview-node-attribute-string(attribute) -<$text text={{{ [jsonget[value]] }}}/> -\end - -\procedure preview-node-attribute-indirect(attribute) -{{<$text text={{{ [jsonget[textReference]] }}}/>}} -\end - -\procedure preview-node-attribute-macro(attribute) -<< -<$text text={{{ [jsonget[value],[name]] }}}/> -<$list filter="[jsonindexes[value],[params]]" variable="index"> -  -<$list filter="[jsonget[value],[params],,[name]]" variable="ignore"> -<$text text={{{ [jsonget[value],[params],,[name]] }}}/> -: - -<$text text={{{ [jsonget[value],[params],,[value]] }}}/> - ->> -\end - -\procedure preview-node-attributes(node) -<$list filter="[jsonindexes[attributes]limit[1]]" variable="ignore"> - - -<$list filter="[jsonindexes[attributes]sort[]]" variable="index"> - - - - - - -
-<$text text=<>/> - -<$let type={{{ [jsonget[attributes],,[type]] }}}> -<$transclude $variable={{{ [match[string]then[preview-node-attribute-string]] :else[match[indirect]then[preview-node-attribute-indirect]] :else[match[macro]then[preview-node-attribute-macro]] }}} attribute={{{ [jsonget[attributes],] }}}/> - -
- -\end - -\procedure preview-node-children(node) -
-<$transclude $variable="preview-node-properties" node=<>/> -<$transclude $variable="preview-node-attributes" node=<>/> -<$transclude $variable="preview-node-list" nodeList={{{ [jsonget[children]] }}}/> -
-\end - -\procedure preview-node-title-widget(node) -
-
-<$<$text text={{{ [jsonget[type]] }}}/>> -
-<$transclude $variable="preview-node-children" node=<>/> -
-\end - -\procedure preview-node-title-element(node) -
-
-<<$text text={{{ [jsonget[tag]] }}}/>> -
-<$transclude $variable="preview-node-children" node=<>/> -
-\end - -\procedure preview-node-title-text(node) -
-
-"<$text text={{{ [jsonget[text]] }}}/>" -
-
-\end - -\procedure preview-node(node) -<$let type={{{ [jsonget[type]] }}}> -<$transclude $variable={{{ [match[element]then[preview-node-title-element]] :else[match[text]then[preview-node-title-text]] :else[[preview-node-title-widget]] }}} node=<>/> - -\end - -\procedure preview-node-list(nodeList) -<$list filter="[jsonindexes[]]" variable="index"> -<$transclude $variable="preview-node" node={{{ [jsonget] }}}/> - -\end - -\procedure preview(mode) -<$wikify name="preview-json" text={{!!text}} type={{!!type}} mode=<> output="parsetree"> -<$transclude $variable="preview-node-list" nodeList=<>/> +\define preview(mode) +<$wikify name="preview-text" text={{!!text}} type={{!!type}} mode="$mode$" output="parsetree"> +
+
+<$text text=<>/>
+
+
\end