tiddlywiki 5.2.2 → 5.2.4

package/languages/zh-Hans/Help/setfield.tid

@@ -3,7 +3,7 @@ description: 准备用于外部条目
 
 //请注意此命令是试验性的，且可能会更改或在最终定稿前被替换//
 
-设置一群条目的指定栏位到 wikifying 范本条目的结果，其中的  `currentTiddler` 变数设置为各该条目。
+设置一群条目的指定字段到 wikifying 范本条目的结果，其中的  `currentTiddler` 变数设置为各该条目。
 
 ```
 --setfield <filter> <fieldname> <templatetitle> <rendertype>
@@ -12,6 +12,6 @@ description: 准备用于外部条目
 参数说明：
 
 * ''filter'' - 受影响的辨识条目的筛选条件
-* ''fieldname'' - 要修改的栏位（默认为 "text"）
-* ''templatetitle'' - 该条目 wikify 到指定栏位。若为空白或丢失，则删除指定的栏位
+* ''fieldname'' - 要修改的字段（默认为 "text"）
+* ''templatetitle'' - 该条目 wikify 到指定字段。若为空白或丢失，则删除指定的字段
 * ''rendertype'' - 要呈现的文本类型（默认为 "text/plain"; "text/html" 可以用于包含 HTML 标记)）

package/languages/zh-Hans/Import.multids

@@ -28,7 +28,7 @@ Upgrader/System/Disabled: 已禁用系統条目。
 Upgrader/System/Suppressed: 封锁的系统条目。
 Upgrader/System/Warning: 核心模块条目。
 Upgrader/System/Alert: 您即将导入一个条目会覆盖一个核心模块条目。不建议这样做，因为可能会使系统不稳定。
-Upgrader/ThemeTweaks/Created: 从 <$text text=<<from>>/> 迁移布景主题。
+Upgrader/ThemeTweaks/Created: 从 <$text text=<<from>>/> 迁移布局主题。
 Upgrader/Tiddler/Disabled: 已禁用系統条目。
 Upgrader/Tiddler/Selected: 选定的条目。
 Upgrader/Tiddler/Unselected: 未选定的条目。

package/languages/zh-Hans/Misc.multids

@@ -1,15 +1,16 @@
 title: $:/language/
 
-AboveStory/ClassicPlugin/Warning: 您貌似要加载为 ~TiddlyWiki 经典版设计的插件。请注意，[[这些插件无法运行于 TiddlyWiki 5.x.x 版|https://tiddlywiki.com/#TiddlyWikiClassic]]。检测到 ~TiddlyWiki 经典版插件：
+AboveStory/ClassicPlugin/Warning: 您似乎要加载为 ~TiddlyWiki 经典版设计的插件。请注意，[[这些插件无法运行于 TiddlyWiki 5.x.x 版|https://tiddlywiki.com/#TiddlyWikiClassic]]。检测到 ~TiddlyWiki 经典版插件：
 BinaryWarning/Prompt: 此条目包含二进制数据
 ClassicWarning/Hint: 此条目以经典版 TiddlyWiki 标记格式撰写，不完全兼容新版 TiddlyWiki 的格式，详细信息请参阅：https://tiddlywiki.com/static/Upgrading。
 ClassicWarning/Upgrade/Caption: 升级
 CloseAll/Button: 全部关闭
 ColourPicker/Recent: 最近︰
-ConfirmCancelTiddler: 您确定要放弃对条目 "<$text text=<<title>>/>" 的更改？
+ConfirmCancelTiddler: 您确定要取消对条目 "<$text text=<<title>>/>" 的更改？
 ConfirmDeleteTiddler: 您确定要删除条目 "<$text text=<<title>>/>"？
-ConfirmOverwriteTiddler: 您确定要复写条目 "<$text text=<<title>>/>"？
-ConfirmEditShadowTiddler: 您即将要编辑默认条目，任何更改将会复盖默认的系统，使未来的升级不寻常。您确定要编辑 "<$text text=<<title>>/>"?
+ConfirmDeleteTiddlers: 您确定要删除 <<resultCount>> 个条目？
+ConfirmOverwriteTiddler: 您确定要覆盖条目 "<$text text=<<title>>/>"？
+ConfirmEditShadowTiddler: 您即将要编辑默认条目，任何更改将会覆盖默认的系统，使未来的升级不寻常。您确定要编辑 "<$text text=<<title>>/>"?
 ConfirmAction: 是否要继续？
 Count: 计数
 DefaultNewTiddlerTitle: 新条目
@@ -34,8 +35,8 @@ Error/NetworkErrorAlert: `<h2>''网络错误''</h2>与服务器的连缐似乎
 Error/PutEditConflict: 服务器上的文件已更改
 Error/PutForbidden: 没有权限
 Error/PutUnauthorized: 需要身分验证
-Error/RecursiveTransclusion: 于 transclude 小部件中的递回嵌入错误
-Error/RetrievingSkinny: 简要条目清单撷取错误
+Error/RecursiveTransclusion: 于 transclude 小部件中的递归嵌入错误
+Error/RetrievingSkinny: 简要条目清单提取错误
 Error/SavingToTWEdit: 保存到 TWEdit 时，发生错误
 Error/WhileSaving: 保存时，发生错误
 Error/XMLHttpRequest: XMLHttpRequest 错误代码
@@ -45,10 +46,10 @@ LayoutSwitcher/Description: 打开布局切换器
 LazyLoadingWarning: <p>正在从 ''<$text text={{!!_canonical_uri}}/>'' 加载外部内容 ...</p><p>如果此信息未消失，可能是条目内容类型与外部内容的类型不匹配，或是您可能正在使用的浏览器，不支援单文件式维基的外部内容。请参阅 https://tiddlywiki.com/#ExternalText</p>
 LoginToTiddlySpace: 登录 TiddlySpace
 Manager/Controls/FilterByTag/None: (无)
-Manager/Controls/FilterByTag/Prompt: 依标签筛选︰
+Manager/Controls/FilterByTag/Prompt: 按标签筛选︰
 Manager/Controls/Order/Prompt: 反向顺序
-Manager/Controls/Search/Placeholder: 搜寻
-Manager/Controls/Search/Prompt: 搜寻︰
+Manager/Controls/Search/Placeholder: 搜索
+Manager/Controls/Search/Prompt: 搜索︰
 Manager/Controls/Show/Option/Tags: 标签
 Manager/Controls/Show/Option/Tiddlers: 条目
 Manager/Controls/Show/Prompt: 显示︰
@@ -71,14 +72,14 @@ PluginReloadWarning: 请保存 {{$:/core/ui/Buttons/save-wiki}} 并刷新页面
 RecentChanges/DateFormat: YYYY年0MM月0DD日
 Shortcuts/Input/Accept/Hint: 接受选取的项目
 Shortcuts/Input/AcceptVariant/Hint: 接受选取项目 (变种)
-Shortcuts/Input/AdvancedSearch/Hint: 从侧边栏搜寻字段内打开[[进阶搜寻|$:/AdvancedSearch]]面板
+Shortcuts/Input/AdvancedSearch/Hint: 从侧边栏搜索字段内打开[[进阶搜索|$:/AdvancedSearch]]面板
 Shortcuts/Input/Cancel/Hint: 清除输入字段
 Shortcuts/Input/Down/Hint: 选择下一个项目
 Shortcuts/Input/Tab-Left/Hint: 选择上一个页签
 Shortcuts/Input/Tab-Right/Hint: 选择下一个页签
 Shortcuts/Input/Up/Hint: 选择前一个项目
 Shortcuts/SidebarLayout/Hint: 更改侧边栏布局
-Switcher/Subtitle/theme: 切换布景主题
+Switcher/Subtitle/theme: 切换布局主题
 Switcher/Subtitle/layout: 切换布局
 Switcher/Subtitle/language: 切换语言
 Switcher/Subtitle/palette: 切换调色板

package/languages/zh-Hans/Search.multids

@@ -2,19 +2,19 @@ title: $:/language/Search/
 
 DefaultResults/Caption: 列表
 Filter/Caption: 筛选
-Filter/Hint: 以[[筛选表达式|https://tiddlywiki.com/static/Filters.html]]查找
+Filter/Hint: 以[[筛选表达式|https://tiddlywiki.com/static/Filters.html]]搜索
 Filter/Matches: //<small><<resultCount>> 个条目符合条件</small>//
 Matches: //<small><<resultCount>> 个条目符合条件</small>//
 Matches/All: 所有匹配：
 Matches/Title: 条目名称匹配：
-Search: 查找
-Search/TooShort: 查找文本太短
+Search: 搜索
+Search/TooShort: 搜索文本太短
 Shadows/Caption: 默认
-Shadows/Hint: 查找默认条目
+Shadows/Hint: 搜索默认条目
 Shadows/Matches: //<small><<resultCount>> 个条目符合条件</small>//
 Standard/Caption: 标准
-Standard/Hint: 查找一般条目
+Standard/Hint: 搜索一般条目
 Standard/Matches: //<small><<resultCount>> 个条目符合条件</small>//
 System/Caption: 系统
-System/Hint: 查找系统条目
+System/Hint: 搜索系统条目
 System/Matches: //<small><<resultCount>> 个条目符合条件</small>//

package/languages/zh-Hans/SideBar.multids

@@ -1,6 +1,7 @@
 title: $:/language/SideBar/
 
 All/Caption: 全部
+Caption: 侧边栏
 Contents/Caption: 目录
 Drafts/Caption: 草稿
 Explorer/Caption: 探索

package/languages/zh-Hans/SiteSubtitle.tid

@@ -1,3 +1,3 @@
 title: $:/SiteSubtitle
 
-一个非线性的网页式笔记
+卡片式个人网页笔记

package/languages/zh-Hans/Snippets/ListByTag.tid

@@ -1,5 +1,5 @@
 title: $:/language/Snippets/ListByTag
 tags: $:/tags/TextEditor/Snippet
-caption: 依标签筛选的条目列表
+caption: 按标签筛选的条目列表
 
 <<list-links "[tag[task]sort[title]]">>

package/languages/zh-Hans/ThemeTweaks.multids

@@ -1,21 +1,21 @@
 title: $:/language/ThemeTweaks/
 
 ThemeTweaks: 主题调整
-ThemeTweaks/Hint: 您可以调整 ''Vanilla'' 布景主题的某些样貌。
+ThemeTweaks/Hint: 您可以调整 ''Vanilla'' 布局主题的某些样貌。
 Options: 选项
 Options/SidebarLayout: 侧边栏布局
 Options/SidebarLayout/Fixed-Fluid: 固定故事，浮动侧边栏
 Options/SidebarLayout/Fluid-Fixed: 浮动故事，固定侧边栏
 Options/StickyTitles: 置顶标题
-Options/StickyTitles/Hint: 使条目名称"黏着"于浏览器窗口的顶端
-Options/CodeWrapping: 在代码区块中折行
+Options/StickyTitles/Hint: 使条目名称吸顶
+Options/CodeWrapping: 在代码区块中换行
 Settings: 设置
 Settings/FontFamily: 字型
 Settings/CodeFontFamily: 代码字型
 Settings/EditorFontFamily: 编辑器字型
 Settings/BackgroundImage: 页面背景图像
 Settings/BackgroundImageAttachment: 页面背景图像附属
-Settings/BackgroundImageAttachment/Scroll: 随条目卷动
+Settings/BackgroundImageAttachment/Scroll: 随条目滚动
 Settings/BackgroundImageAttachment/Fixed: 固定于窗口
 Settings/BackgroundImageSize: 页面背景图像大小
 Settings/BackgroundImageSize/Auto: 自动
@@ -28,8 +28,8 @@ Metrics/BodyFontSize: 条目本文的字体大小
 Metrics/BodyLineHeight: 条目本文的行高
 Metrics/StoryLeft: 故事左侧位置
 Metrics/StoryLeft/Hint: 故事河（条目区）的左边缘与页面左端的间距
-Metrics/StoryTop: 故事顶端位置
-Metrics/StoryTop/Hint: 故事河（条目区）的上边缘与页面顶端的间距
+Metrics/StoryTop: 故事顶部位置
+Metrics/StoryTop/Hint: 故事河（条目区）的上边缘与页面顶部的间距
 Metrics/StoryRight: 故事右侧位置
 Metrics/StoryRight/Hint: 侧边栏的左边缘与页面左端的间距
 Metrics/StoryWidth: 故事的宽度
@@ -39,4 +39,4 @@ Metrics/TiddlerWidth/Hint: 在故事河内
 Metrics/SidebarBreakpoint: 侧边栏中断点
 Metrics/SidebarBreakpoint/Hint: 故事河和侧边栏会并排显示的最小页面宽度
 Metrics/SidebarWidth: 侧边栏宽度
-Metrics/SidebarWidth/Hint: 在浮动-固定布局中，侧边栏的宽度
+Metrics/SidebarWidth/Hint: 在 浮动故事，固定侧边栏 布局中，侧边栏的宽度

package/languages/zh-Hans/TiddlerInfo.multids

@@ -8,8 +8,8 @@ Advanced/ShadowInfo/Heading: 默认条目状态
 Advanced/ShadowInfo/NotShadow/Hint: <$link to=<<infoTiddler>>><$text text=<<infoTiddler>>/></$link> 不是一个默认条目
 Advanced/ShadowInfo/Shadow/Hint: <$link to=<<infoTiddler>>><$text text=<<infoTiddler>>/></$link> 是一个默认条目
 Advanced/ShadowInfo/Shadow/Source: 此条目定义于插件 <$link to=<<pluginTiddler>>><$text text=<<pluginTiddler>>/></$link>
-Advanced/ShadowInfo/OverriddenShadow/Hint: 已被一般条目覆写
-Fields/Caption: 栏位
+Advanced/ShadowInfo/OverriddenShadow/Hint: 已被一般条目覆盖
+Fields/Caption: 字段
 List/Caption: 列表
 List/Empty: 此条目无指定列表
 Listed/Caption: 被列于

package/languages/zh-Hant/Buttons.multids

@@ -18,6 +18,8 @@ CopyToClipboard/Caption: 複製到剪貼簿
 CopyToClipboard/Hint: 將此文字複製到剪貼簿
 Delete/Caption: 刪除
 Delete/Hint: 刪除此條目
+DeleteTiddlers/Caption: 刪除條目
+DeleteTiddlers/Hint: 刪除條目
 Edit/Caption: 編輯
 Edit/Hint: 編輯此條目
 Encryption/Caption: 加密
@@ -57,6 +59,8 @@ Info/Caption: 資訊
 Info/Hint: 顯示此條目的資訊
 Language/Caption: 語言
 Language/Hint: 選擇使用者介面語言
+LayoutSwitcher/Hint: 開啟版面切換器
+LayoutSwitcher/Caption: 版面
 Manager/Caption: 條目管理器
 Manager/Hint: 開啟條目管理器
 More/Caption: 更多

package/languages/zh-Hant/ControlPanel.multids

@@ -7,7 +7,7 @@ Appearance/Hint: 自訂您的 TiddlyWiki 外觀。
 Basics/AnimDuration/Prompt: 動畫持續時間
 Basics/AutoFocus/Prompt: 編輯條目時的預設自動停留欄位
 Basics/Caption: 基本
-Basics/DefaultTiddlers/BottomHint: 標題含空白時請使用 &#91;&#91;雙中括弧&#93;&#93;，或者您可用 <$button set="$:/DefaultTiddlers" setTo="[list[$:/StoryList]]">保留開啟中的條目順序</$button>
+Basics/DefaultTiddlers/BottomHint: 標題含空白時請使用 &#91;&#91;雙中括弧&#93;&#93;，或者您可用 {{保留開啟中的條目順序||$:/snippets/retain-story-ordering-button}}
 Basics/DefaultTiddlers/Prompt: 首頁
 Basics/DefaultTiddlers/TopHint: 預設開啟的條目
 Basics/Language/Prompt: 您好！當前的語言：
@@ -24,7 +24,7 @@ Basics/Subtitle/Prompt: 副標題
 Basics/SystemTiddlers/Prompt: 系統條目數量
 Basics/Tags/Prompt: 標籤數量
 Basics/Tiddlers/Prompt: 一般條目數量
-Basics/Title/Prompt: 標題
+Basics/Title/Prompt: 此 ~TiddlyWiki 的標題
 Basics/Username/Prompt: 編輯者署名
 Basics/Version/Prompt: ~TiddlyWiki 版本
 Cascades/Caption: 級聯

package/languages/zh-Hant/EditTemplate.multids

@@ -1,5 +1,6 @@
 title: $:/language/EditTemplate/
 
+Caption: 編輯器
 Body/External/Hint: 此條目顯示儲存於主要的 TiddlyWiki 檔之外的內容。你可以編輯其標籤和欄位，但不能直接編輯內容本身
 Body/Placeholder: 輸入此條目的內容
 Body/Preview/Type/Output: 輸出

package/languages/zh-Hant/Fields.multids

@@ -13,7 +13,7 @@ dependents: 插件的相依插件列表
 description: 插件的說明、描述
 draft.of: 草稿條目，包含條目的標題、標籤、欄位 ...
 draft.title: 草稿條目的標題
-footer: wizard 的註腳
+footer: 互動視窗的註腳
 hide-body: 若設定為 ''yes''，檢視範本將隱藏條目的主體
 icon: 條目的標題含有與條目關聯的圖示
 library: 若設定為 ''yes''，表示條目應該被儲存為一個 JavaScript 程式庫
@@ -28,7 +28,7 @@ plugin-type: 套件條目的類型
 released: TiddlyWiki 的釋出日期
 revision: 條目存放於伺服器中的修訂版本
 source: 條目的網址
-subtitle: 一個 wizard 的副標題
+subtitle: 互動視窗的副標題
 tags: 條目的標籤清單
 text: 條目的內文
 throttle.refresh: 如果存在，則限制此條目的刷新

package/languages/zh-Hant/GettingStarted.tid

@@ -9,9 +9,10 @@ title: GettingStarted
 
 <div class="tc-control-panel">
 
-|<$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
-|<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
-|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
+|tc-table-no-border tc-first-col-min-width tc-first-link-nowrap|k
+| <$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link>|<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
+| <$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link>|<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
+|^ <$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link><br><<lingo DefaultTiddlers/TopHint>>|<$edit tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
 </div>
 
 請參閱[[控制台|$:/ControlPanel]]查看更多選項。

package/languages/zh-Hant/Help/commands.tid

@@ -0,0 +1,18 @@
+title: $:/language/Help/commands
+description: 執行從篩選器傳回的命令
+
+按順序執行從篩選器傳回的命令符記
+
+```
+--commands <filter>
+```
+
+範例
+
+```
+--commands "[enlist{$:/build-commands-as-text}]"
+```
+
+```
+--commands "[{$:/build-commands-as-json}jsonindexes[]] :map[{$:/build-commands-as-json}jsonget<currentTiddler>]"
+```

package/languages/zh-Hant/Help/default.tid

@@ -3,6 +3,7 @@ title: $:/language/Help/default
 \define commandTitle()
 $:/language/Help/$(command)$
 \end
+\whitespace trim
 ```
 用法: tiddlywiki [<wikifolder>] [--<command> [<args>...]...]
 ```
@@ -11,7 +12,9 @@ $:/language/Help/$(command)$
 
 <ul>
 <$list filter="[commands[]sort[title]]" variable="command">
-<li><$link to=<<commandTitle>>><$macrocall $name="command" $type="text/plain" $output="text/plain"/></$link>: <$transclude tiddler=<<commandTitle>> field="description"/></li>
+<li><$link to=<<commandTitle>>><$macrocall $name="command" $type="text/plain" $output="text/plain"/></$link>:
+&#32;
+<$transclude tiddler=<<commandTitle>> field="description"/></li>
 </$list>
 </ul>
 

package/languages/zh-Hant/Help/render.tid

@@ -31,3 +31,4 @@ description: 呈現個別條目到檔案
 範例：
 
 * `--render "[!is[system]]" "[encodeuricomponent[]addprefix[tiddlers/]addsuffix[.html]]"` -- 呈現所有非系統條目為 "tiddlers" 子資料夾中的檔案，檔名為 URL 編碼的條目名稱和副檔名 HTML
+* `--render '.' 'tiddlers.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' '[tag[HelloThere]]'` -- 將標籤為 "HelloThere" 的條目渲染到名為 "tiddlers.json" 的 JSON 檔案

package/languages/zh-Hant/Misc.multids

@@ -8,6 +8,7 @@ CloseAll/Button: 全部關閉
 ColourPicker/Recent: 最近︰
 ConfirmCancelTiddler: 您確定要放棄對條目 "<$text text=<<title>>/>" 的更改？
 ConfirmDeleteTiddler: 您確定要刪除條目 "<$text text=<<title>>/>"？
+ConfirmDeleteTiddlers: 您確定要刪除 <<resultCount>> 個條目？
 ConfirmOverwriteTiddler: 您確定要覆寫條目 "<$text text=<<title>>/>"？
 ConfirmEditShadowTiddler: 您即將要編輯預設條目，任何更改將會覆蓋預設的系統，使未來的升級不尋常。您確定要編輯 "<$text text=<<title>>/>"?
 ConfirmAction: 是否要繼續？

package/languages/zh-Hant/SideBar.multids

@@ -1,6 +1,7 @@
 title: $:/language/SideBar/
 
 All/Caption: 全部
+Caption: 側邊欄
 Contents/Caption: 目錄
 Drafts/Caption: 草稿
 Explorer/Caption: 探索

package/licenses/cla-individual.md

@@ -482,8 +482,22 @@ Joseph Cosentino, @jc-ose, 2021-12-14
 
 @pmario, @TiddlyVee, 2022/02/26
 
+Eskha, @es-kha, 2022/03/04
+
 @FSpark, 2022/03/08
 
 Guang Li, @oflg, 2022/03/12
 
 Dam S., @damscal, 2022/03/24
+
+Max Schillinger, @MaxGyver83, 2022/05/11
+
+Nolan Darilek, @NDarilek,  2022/06/21
+
+Keiichi Shiga (🎈 BALLOON | FU-SEN), @fu-sen. 2022/07/07
+
+Nathaniel Knight, @nathanielknight, 2022/07/26
+
+HuanCheng Bai, @bestony, 2022/09/17
+
+Carlo Colombo, @carlo-colombo, 2022/11/30

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tiddlywiki",
   "preferGlobal": "true",
-  "version": "5.2.2",
+  "version": "5.2.4",
   "author": "Jeremy Ruston <jeremy@jermolene.com>",
   "description": "a non-linear personal web notebook",
   "contributors": [

package/plugins/tiddlywiki/browser-sniff/browser.js

@@ -42,8 +42,12 @@ exports.getInfoTiddlerFields = function() {
 				["is/sailfish","sailfish"],
 				["is/android","android"],
 				["is/windowsphone","windowsphone"],
-				["is/firefoxos","firefoxos"]
+				["is/firefoxos","firefoxos"],
+				["is/mobile","mobile"]
 			];
+		$tw.browser = $tw.utils.extend($tw.browser, {
+			is: bowser.browser,
+		});
 		$tw.utils.each(mappings,function(mapping) {
 			var value = bowser.browser[mapping[1]];
 			if(value === undefined) {

package/plugins/tiddlywiki/browser-sniff/usage.tid

@@ -5,6 +5,7 @@ title: $:/plugins/tiddlywiki/browser-sniff/usage
 The following informational tiddlers are created at startup:
 
 |!Title |!Description |
+|[[$:/info/browser/is/mobile]] |Running on mobile device? ("yes" or "no")  |
 |[[$:/info/browser/is/android]] |Running on Android? ("yes" or "no")  |
 |[[$:/info/browser/is/bada]] |Running on Bada? ("yes" or "no")  |
 |[[$:/info/browser/is/blackberry]] |Running on ~BlackBerry? ("yes" or "no")  |

package/plugins/tiddlywiki/browser-storage/rawmarkup.js

@@ -26,6 +26,7 @@ if(Object.prototype.hasOwnProperty.call($tw.hooks.names,hookName)) {
 // Load tiddlers from browser storage
 function hookBootTiddlersLoaded() {
 	var url = window.location.pathname,
+		keysToDelete = [],
 		log = [];
 	// Check that browser storage is available
 	try {
@@ -55,16 +56,32 @@ function hookBootTiddlersLoaded() {
 							existingTiddler = $tw.wiki.getTiddler(title);
 						if(existingTiddler && existingTiddler.isEqual(incomingTiddler)) {
 							// If the incoming tiddler is the same as the existing then we can delete the local storage version
-							window.localStorage.removeItem(key);
+							// Defer deletion until after this loop, since deleting will shift the index and cause the
+							// index+1 item to be skipped.
+							keysToDelete.push(key);
 						} else {
 							$tw.wiki.addTiddler(incomingTiddler);
 							log.push(title);
 						}
 					}
 				}
+			} else {
+				// Empty value means the tiddler is marked as deleted
+				var title = parts.slice(2).join("#"),
+					existingTiddler = $tw.wiki.getTiddler(title);
+				if(existingTiddler) {
+					// The tiddler still exists in the wiki. Delete it so it won't be visible.
+					$tw.wiki.deleteTiddler(title);
+				} else {
+					// The tiddler is already missing from the wiki, so delete the blank local storage entry
+					keysToDelete.push(key);
+				}
 			}
 		}
 	}
+	$tw.utils.each(keysToDelete,function(key) {
+		window.localStorage.removeItem(key);
+	});
 	// Make sure that all the tiddlers we've loaded are marked as dirty at startup
 	Array.prototype.push.apply($tw.boot.preloadDirty,log);
 	// Save the log

package/plugins/tiddlywiki/browser-storage/readme.tid

@@ -15,5 +15,4 @@ Please use this plugin with caution. There are a number of unresolved issues and
 
 * Innerwikis read the local storage of their parent wikis
 * This plugin does not interfere with the existing saver mechanism, so you'll still get warnings when refreshing the page, even if your changes are safely committed to local storage
-* Deleted tiddlers will be restored when the wiki is refreshed
 * There is a possibility that tiddlers might be transferred between different wikis if they are accessed via the same URL. This is particularly likely when running in local client server configuration under Node.js

package/plugins/tiddlywiki/browser-storage/settings.tid

@@ -14,7 +14,11 @@ Click this button to clear browser storage and disable its use:
 
 ! Save Filter
 
-This filter determines which tiddlers will be saved to local storage. By default, it contains `[prefix[$:/state/]] -[prefix[$:/state/popup/]]` to just save state tiddlers except popup state tiddlers, thus preserving selected tabs, and the open/closed status of table of contents entries. Other useful values include `[all[]]` meaning that it will attempt to save all tiddlers.
+This filter determines which tiddlers will be saved to local storage.
+
+* `[prefix[$:/state/]] -[prefix[$:/state/popup/]]` - the default value. Save state tiddlers except popup state tiddlers, thus preserving selected tabs and the open/closed status of table of contents entries. Any other tiddlers created or changed will be lost after reloading the page.
+* `[all[]]` - attempt to save all changed tiddlers. This means even popup state tiddlers and temporary tiddlers will be saved. In addition, when a plugin is installed, all the shadow tiddlers are individually "exploded" into local storage. Deleting the plugin requires deleting all the tiddlers individually. Not recommended unless these issues are unimportant.
+* `[all[]] -[is[shadow]!is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]]` - save all tiddlers except unmodified shadow tiddlers, popup state tiddlers, temp tiddlers and the history list. Solves the aforementioned issues with `[all[]]`. Recommended.
 
 <$link to="$:/config/BrowserStorage/SaveFilter">Browser Storage Save Filter</$link>: <$edit-text tiddler="$:/config/BrowserStorage/SaveFilter" default="" tag="input" size="50"/>
 

package/plugins/tiddlywiki/browser-storage/startup.js

@@ -100,9 +100,12 @@ function saveTiddlerToLocalStorage(title,options) {
 			}
 		}
 	} else {
-		console.log("browser-storage: Deleting",title);
+		// In local storage, use the special value of empty string to mark the tiddler as deleted
+		// On future page loads, if the tiddler is already gone from startup then the blank entry
+		// will be removed from localstorage. Otherwise, the tiddler will be deleted.
+		console.log("browser-storage: Blanking",title);
 		try {
-			window.localStorage.removeItem(options.prefix + title);
+			window.localStorage.setItem(options.prefix + title, "");
 		} catch(e) {
 			console.log("Browser-storage error:",e);
 		}
@@ -112,13 +115,15 @@ function saveTiddlerToLocalStorage(title,options) {
 function clearLocalStorage() {
 	var url = window.location.pathname,
 		log = [];
-	// Step through each browsder storage item
-	for(var index=window.localStorage.length - 1; index>=0; index--) {
-		var key = window.localStorage.key(index),
-			parts = key.split("#");
-		// Delete it if it's ours
-		if(parts[0] === "tw5" && parts[1] === url) {
-			window.localStorage.removeItem(key);
+	// Step through each browser storage item
+	if(window.localStorage) {
+		for(var index=window.localStorage.length - 1; index>=0; index--) {
+			var key = window.localStorage.key(index),
+				parts = key.split("#");
+			// Delete it if it is ours
+			if(parts[0] === "tw5" && parts[1] === url) {
+				window.localStorage.removeItem(key);
+			}
 		}
 	}
 }

package/plugins/tiddlywiki/codemirror/engine.js

@@ -186,6 +186,10 @@ function CodeMirrorEngine(options) {
 		return false;
 	});
 	this.cm.on("keydown",function(cm,event) {
+		if ($tw.keyboardManager.handleKeydownEvent(event, {onlyPriority: true})) {
+			return true;
+		}
+	
 		return self.widget.handleKeydownEvent.call(self.widget,event);
 	});
 	this.cm.on("focus",function(cm,event) {

package/plugins/tiddlywiki/dynannotate/docs/readme.tid

@@ -1,12 +1,10 @@
 title: $:/plugins/tiddlywiki/dynannotate/readme
 
-The ''Dynannotate'' plugin allows annotations on textual content to be created and displayed. It has three components:
+The ''Dynannotate'' plugin allows annotations on textual content to be created and displayed. It has several components:
 
-* The dynannotate widget overlays clickable textual annotations, search highlights and search snippets on the content that it contains
-* The selection tracker displays a popup that tracks the selection, and keeps track of the selected text. It also tracks a prefix and suffix that can be used to disambiguate the selected text within the container
-* The `<$action-popup>` widget is used for some specialised popup switching in the demo
-
-''Note that the TiddlyWiki core plugin __Dynaview__ is required for correct operation of __Dynannotate__''
+* The dynannotate widget draws clickable textual annotations, search highlights and search snippets as overlays over the top of the content that it contains
+* The selection tracker keeps track of changes to the selected text in the main browser window. It triggers an action string when the selection changes, passing it the details of the selection. It can be used to display a popup menu
+** The original legacy selection tracker is also provided for backwards compatibility. It is much more limited, and not recommended for new projects
 
 !! Dynannotate Widget
 
@@ -32,6 +30,10 @@ The `<$dynannotate>` widget uses the selection tracker to support a popup that d
 |searchCaseSensitive |"no" (default) for a case insensitive search, or "yes" for a case sensitive search |
 |searchClass |Optional CSS class to be added to search overlays |
 |snippetContextLength |Optional length of search result contextual prefix/suffix |
+
+The following attributes are only used with the legacy selection tracker:
+
+|!Attribute |!Description |
 |selection |Tiddler to which the currently selected text should be dynamically saved |
 |selectionPrefix |Tiddler to which up to 50 characters preceding the currently selected text should be dynamically saved |
 |selectionSuffix |Tiddler to which up to 50 characters succeeding the currently selected text should be dynamically saved |
@@ -91,9 +93,71 @@ An annotation tiddler is a tiddler describing an annotation to be overlaid over
 
 Note that using the `annotate-tiddler` field to associate an annotation with the annotated tiddler is a lightweight convention employed by the examples; it isn't actually required by any of the JavaScript code. Thus authors can experiment with other techniques for recording the association.
 
-!! Selection Tracker
+!! Selection Trackers
+
+The following configuration tiddlers can be used to control whether the selection trackers are enabled when the following configuration tiddlers are set to ''yes'' (the default).
+
+* $:/config/Dynannotate/SelectionTracker/Enable for the main selection tracker
+* $:/config/Dynannotate/LegacySelectionTracker/Enable for the legacy selection tracker
+
+Both selection trackers are enabled by default.
+
+!!! Main Selection Tracker
+
+The selection tracker triggers an action string whenever the browser text selection changes. The actions are delayed until the selection has not changed for 500ms (this means that the selection tracker is only triggered when the user pauses after completing a selection, and is not continuously invoked as the user drags the selection).
+
+The selection tracker works within DOM subtrees that have the following structure:
+
+* The outer wrapper element has the attribute `data-selection-actions-title` containing the title of the tiddler containing the action string to be invoked when the selection changes
+* Each child element of the outer element must have a unique `id` attribute to identify it
+
+```
+<div data-selection-actions-title="{tiddler title}">
+	<div id="{title}">
+		Content text
+	</div>
+	...
+</div>
+```
+
+The action string is invoked with the following variables:
+
+|!Variable |!Description |
+|`selection` |A JSON object representing the selection (see below) |
+|`dom-*` |All DOM attributes of the outer wrapper node are made available as variables, with the prefix `dom-` |
+|`tv-selection-posx` |X position of the selection in pixels |
+|`tv-selection-posy` |Y position of the selection in pixels |
+|`tv-selection-width` |Width of the selection in pixels |
+|`tv-selection-height` |Height of the selection in pixels |
+|`tv-selection-coords` |A co-ordinate string that can be used with the ActionPopupWidget to trigger a popup at the selection |
+
+The JSON representation of the selection is as follows:
+
+```
+{
+	"chunks": [
+		{
+			"id": "id-of-first-chunk-of-selection",
+			"text": "text-of-first-chunk-of-selection",
+			"prefix": "optional-prefix-before-first-chunk-of-selection",
+			"suffix": "optional-suffix-after-last-chunk-of-selection"
+		}
+		...
+	],
+	"variables": {
+		<variables listed above>
+	}
+}
+```
+
+Notes:
+
+* Only the first chunk of the selection may have a "prefix" field which will contain any text at the start of the chunk preceding the selection
+* Only the last chunk of the selection may have a "suffix" field which will contain any text at the end of the chunk following the selection
+
+!!! Legacy Selection Tracker
 
-The selection tracker is incorporated within the `<$dynannotate>` widget, but it can be used independently for specialised applications.
+The selection tracker is incorporated within the `<$dynannotate>` widget via the ''selection'', ''selectionPrefix'' ''selectionSuffix'' and ''selectionPopup'' attributes. It can be used independently for specialised applications.
 
 Each selection container is marked with the class `tc-dynannotate-selection-container`, and should contain the following attributes: