tiddlywiki 5.3.4 → 5.3.6

package/plugins/tiddlywiki/markdown/plugin.info

@@ -2,6 +2,6 @@
 	"title": "$:/plugins/tiddlywiki/markdown",
 	"name": "Markdown",
 	"description": "Markdown parser based on markdown-it",
-	"list": "readme config syntax license",
+	"list": "readme settings syntax license",
 	"stability": "STABILITY_2_STABLE"
 }

package/plugins/tiddlywiki/markdown/readme.tid

@@ -29,4 +29,73 @@ var md = $tw.Wiki.parsers["text/markdown"].prototype.md;
 
 md.use(plugin1)
   .use(plugin2, opts, ...);
+```
+
+! Plugin Configuration
+
+<h2 style="margin-top:1.5em">~WikiText Pragma</h2>
+
+The value of [[renderWikiTextPragma|$:/config/markdown/renderWikiTextPragma]] has been carefully tuned to properly integrate markdown with ~TiddlyWiki. Changing this setting may produce unexpected results, but the inclusion of the following parser rules should be fine:
+
+; image
+: embed images using ~TiddlyWiki's image syntax:
+
+<p style="margin-left:1em">
+
+```
+[img[An explanatory tooltip|TiddlerTitle]]
+
+[img width=23 class="tc-image" [https://tiddlywiki.com/fractalveg.jpg]]
+```
+</p>
+
+; prettylink
+: create links the ~TiddlyWiki way:
+
+<p style="margin-left:1em">
+
+```
+[[TiddlerTitle]]
+
+[[Displayed Link Title|Tiddler Title]]
+
+[[TW5|https://tiddlywiki.com/]]
+```
+</p>
+
+; prettyextlink
+: create external links using the following syntax:
+
+<p style="margin-left:1em">
+
+```
+[ext[Open file|index.html]]
+
+[ext[Open file|../README.md]]
+```
+</p>
+
+; wikilink
+: auto-link ~CamelCase titles
+
+; syslink
+: auto-link system tiddlers
+
+<h2 style="margin-top:1.5em">Typographical Replacements</h2>
+
+When [[typographer|$:/config/markdown/typographer]] is enabled, markdown-it will provide these typographical replacements:
+
+```
+(c) (C)   → ©
+(tm) (TM) → ™
+(r) (R)   → ®
++-        → ±
+...       → …
+?....     → ?..
+!....     → !..
+?????     → ???
+!!!!!     → !!!
+,,        → ,
+--        → &ndash;
+---       → &mdash;
 ```

package/plugins/tiddlywiki/markdown/settings/breaks.tid

@@ -0,0 +1,9 @@
+title: $:/plugins/tiddlywiki/markdown/settings/breaks
+tags: $:/tags/ControlPanel/Settings/Markdown
+caption: Breaks
+
+markdown-it library config: Convert `\n` in paragraphs into `<br>`
+
+<$checkbox tiddler="$:/config/markdown/breaks" field="text" checked="true" unchecked="false">
+    [[Breaks|$:/config/markdown/breaks]]
+</$checkbox>

package/plugins/tiddlywiki/markdown/settings/linkify.tid

@@ -0,0 +1,9 @@
+title: $:/plugins/tiddlywiki/markdown/settings/linkify
+tags: $:/tags/ControlPanel/Settings/Markdown
+caption: Linkify
+
+markdown-it library config: Autoconvert URL-like text to links
+
+<$checkbox tiddler="$:/config/markdown/linkify" field="text" checked="true" unchecked="false">
+    [[Linkify|$:/config/markdown/linkify]]
+</$checkbox>

package/plugins/tiddlywiki/markdown/settings/quotes.tid

@@ -0,0 +1,8 @@
+title: $:/plugins/tiddlywiki/markdown/settings/quotes
+tags: $:/tags/ControlPanel/Settings/Markdown
+caption: Quotes replacement
+list-after: $:/plugins/tiddlywiki/markdown/settings/typographer
+
+markdown-it library config: Double + single quotes replacement pairs, when [[typographer|$:/config/markdown/typographer]] is enabled.
+
+|[[Quotes replacement|$:/config/markdown/quotes]]|<$edit-text tiddler="$:/config/markdown/quotes" tag="input"/> |

package/plugins/tiddlywiki/markdown/settings/renderWikiText.tid

@@ -0,0 +1,9 @@
+title: $:/plugins/tiddlywiki/markdown/settings/renderWikiText
+tags: $:/tags/ControlPanel/Settings/Markdown
+caption: Enable WikiText
+
+After Markdown is parsed, should any text elements be handed off to the ~WikiText parser for further processing?
+
+<$checkbox tiddler="$:/config/markdown/renderWikiText" field="text" checked="true" unchecked="false">
+    [[Enable WikiText|$:/config/markdown/renderWikiText]]
+</$checkbox>

package/plugins/tiddlywiki/markdown/settings/renderWikiTextPragma.tid

@@ -0,0 +1,7 @@
+title: $:/plugins/tiddlywiki/markdown/settings/renderWikiTextPragma
+tags: $:/tags/ControlPanel/Settings/Markdown
+caption: Enabled WikiText parser rules
+
+When handing off to the ~WikiText parser, what parser rules should it follow?
+
+|[[Enabled WikiText parser rules|$:/config/markdown/renderWikiTextPragma]]|<$edit tiddler="$:/config/markdown/renderWikiTextPragma" class="tc-edit-texteditor" autoHeight="yes"/> |

package/plugins/tiddlywiki/markdown/settings/typographer.tid

@@ -0,0 +1,9 @@
+title: $:/plugins/tiddlywiki/markdown/settings/typographer
+tags: $:/tags/ControlPanel/Settings/Markdown
+caption: Typographer
+
+markdown-it library config: Enable some language-neutral replacement + quotes beautification
+
+<$checkbox tiddler="$:/config/markdown/typographer" field="text" checked="true" unchecked="false">
+    [[Typographer|$:/config/markdown/typographer]]
+</$checkbox>

package/plugins/tiddlywiki/markdown/settings.tid

@@ -0,0 +1,19 @@
+title: $:/plugins/tiddlywiki/markdown/settings
+tags: $:/tags/ControlPanel/SettingsTab
+caption: Markdown
+
+These settings let you customise the behaviour of Markdown. See [[plugin|$:/plugins/tiddlywiki/markdown]] readme tab for more information.
+
+''IMPORTANT:'' You must reload your wiki for changes to take effect.
+
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Settings/Markdown]]">
+
+<div class="tc-control-panel-setting" data-setting-title=<<currentTiddler>> >
+
+!!.tc-control-panel-accent <$link><$transclude field="caption"/></$link>
+
+<$transclude/>
+
+</div>
+
+</$list>

package/plugins/tiddlywiki/markdown/styles.tid

@@ -36,7 +36,7 @@ code-body: yes
 	margin-left: 0.25em;
 }
 .markdown a.footnote-ref:target, .markdown .footnote-item:target {
-	background-color: <<colour message-background>>;
+	background-color: <<colour footnote-target-background>>;
 	scroll-margin-top: {{{ [{$:/themes/tiddlywiki/vanilla/options/stickytitles}match[yes]then[120px]else[60px]] }}};
 }
 .markdown li > p:first-child {

package/plugins/tiddlywiki/markdown/wrapper.js

@@ -234,12 +234,12 @@ function MarkdownParser(type,text,options) {
 			rules: { pragma: {}, block: this.blockRuleClasses, inline: this.inlineRuleClasses }
 		});
 	}
-	catch (err) {
+	catch(err) {
 		wikiParser = $tw.wiki.parseText("text/vnd.tiddlywiki",
 			"<strong>Error encountered while parsing the tiddler:</strong><p>" + err.message + "</p>",
 			{parseAsInline: false, wiki: options.wiki});
 	}
-	finally {
+	finally{
 		$tw.utils.parseStringLiteral = origParseStringLiteral;
 	}
 	if(wikiParser.tree.length > 0) {

package/plugins/tiddlywiki/markdown-legacy/new-markdown.tid

@@ -7,10 +7,10 @@ list-after: $:/core/ui/Buttons/new-tiddler
 \whitespace trim
 <$button tooltip={{$:/language/Buttons/NewMarkdown/Hint}} aria-label={{$:/language/Buttons/NewMarkdown/Caption}} class=<<tv-config-toolbar-class>>>
 <$action-sendmessage $message="tm-new-tiddler" type="text/markdown"/>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/plugins/tiddlywiki/markdown-legacy/images/new-markdown-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/NewMarkdown/Caption}}/></span>
-</$list>
+<%endif%>
 </$button>

package/plugins/tiddlywiki/markdown-legacy/readme.tid

@@ -4,4 +4,4 @@ This is a TiddlyWiki plugin for parsing Markdown text, using the [[Remarkable|ht
 
 It is completely self-contained, and doesn't need an Internet connection in order to work. It works both in the browser and under Node.js.
 
-[[Source code|https://github.com/Jermolene/TiddlyWiki5/blob/master/plugins/tiddlywiki/markdown-legacy]]
+[[Source code|https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/plugins/tiddlywiki/markdown-legacy]]

package/plugins/tiddlywiki/menubar/keyboardshortcuts-menubar-search.tid

@@ -0,0 +1,5 @@
+key: ((menubar-search))
+tags: $:/tags/KeyboardShortcut
+title: $:/core/ui/KeyboardShortcuts/menubar-search
+
+<$action-sendmessage $message="tm-focus-selector" $param=".tc-menubar input"/>

package/plugins/tiddlywiki/menubar/shortcutinfo-menubar-search.tid

@@ -0,0 +1,4 @@
+tags: 
+title: $:/config/ShortcutInfo/menubar-search
+
+Select the menubar search field

package/plugins/tiddlywiki/nodewebkitsaver/readme.tid

@@ -2,4 +2,4 @@ title: $:/plugins/tiddlywiki/nodewebkitsaver/readme
 
 This plugin provides a ''saver'' module for saving changes when using TiddlyWiki directly under NW.js (previously known as node-webkit).
 
-[[Source code|https://github.com/Jermolene/TiddlyWiki5/blob/master/plugins/tiddlywiki/nodewebkitsaver]]
+[[Source code|https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/plugins/tiddlywiki/nodewebkitsaver]]

package/plugins/tiddlywiki/pluginlibrary/readme.tid

@@ -2,4 +2,4 @@ title: $:/plugins/tiddlywiki/pluginlibrary/readme
 
 This plugin is used behind the scenes by TiddlyWiki to build the plugin library.
 
-[[Source code|https://github.com/Jermolene/TiddlyWiki5/blob/master/plugins/tiddlywiki/pluginlibrary]]
+[[Source code|https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/plugins/tiddlywiki/pluginlibrary]]

package/plugins/tiddlywiki/qrcode/ViewToolbarButton/Button.tid

@@ -8,50 +8,28 @@ description: Generate QR code for this tiddler
 \whitespace trim
 <span class="tc-popup-keep">
 <$button popup=<<qualify "$:/state/popup/qrcode">> tooltip={{$:/plugins/tiddlywiki/qrcode/ViewToolbarButton!!description}} aria-label={{$:/plugins/tiddlywiki/qrcode/ViewToolbarButton!!short-caption}} class=<<tv-config-toolbar-class>> class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/plugins/tiddlywiki/qrcode/icon}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text">
 <$text text={{$:/plugins/tiddlywiki/qrcode/ViewToolbarButton!!short-caption}}/>
 </span>
-</$list>
+<%endif%>
 </$button>
 </span>
 <$reveal state=<<qualify "$:/state/popup/qrcode">> type="popup" position="below" animate="yes">
-
-<div class="tc-drop-down">
-
-{{$:/plugins/tiddlywiki/qrcode/ViewToolbarButton||description}}
-
-<$set name="tv-config-toolbar-icons" value="yes">
-
-<$set name="tv-config-toolbar-text" value="yes">
-
-<$set name="tv-config-toolbar-class" value="tc-btn-invisible">
-
-<$set name="targetTiddler" value=<<currentTiddler>>>
-
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbarButton/QRcode]!has[draft.of]]">
-
-<$button popup=<<qualify "$:/state/popup/qrcode/type">> class="tc-btn-invisible" selectedClass="tc-selected">
-
-<$action-sendmessage $message="tm-modal" $param=<<currentTiddler>> currentTiddler=<<targetTiddler>>/>
-
-<$transclude field="caption" mode="inline"/>
-
-</$button>
-
-</$list>
-
-</$set>
-
-</$set>
-
-</$set>
-
-</$set>
-
-</div>
-
+    <div class="tc-drop-down">
+
+    {{$:/plugins/tiddlywiki/qrcode/ViewToolbarButton||description}}
+
+        <$let tv-config-toolbar-icons="yes" tv-config-toolbar-text="yes" tv-config-toolbar-class="tc-btn-invisible" targetTiddler=<<currentTiddler>>>
+            <$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbarButton/QRcode]!has[draft.of]]">
+                <$button popup=<<qualify "$:/state/popup/qrcode/type">> class="tc-btn-invisible" selectedClass="tc-selected">
+                    <$action-sendmessage $message="tm-modal" $param=<<currentTiddler>> currentTiddler=<<targetTiddler>>/>
+                    <$transclude field="caption" mode="inline"/>
+                </$button>
+            </$list>
+        </$let>
+    </div>
 </$reveal>

package/plugins/tiddlywiki/qrcode/docs/makeqr.tid

@@ -11,7 +11,7 @@ The ''makeqr'' [[macro|Macros]] converts text data into an image of the correspo
 ;size
 : The size of the image in pixels (defaults to 500)
 ;errorCorrectLevel
-: Determines the amount of error correction applied to the image; see below (defaults to "M").
+: Determines the amount of error correction applied to the image (see below, defaults to "M")
 ;fallback
 : The fallback image to be returned in case of an error (see below)
 
@@ -19,26 +19,30 @@ The conversion will fail if the text is too long and/or complex and the macro wi
 
 The error correction level is a [[QR code feature|http://www.qrcode.com/en/about/error_correction.html]]:
 
-<<<
-QR Code has error correction capability to restore data if the code is dirty or damaged. ... Level Q or H may be selected for factory environment where QR Code get dirty, whereas Level L may be selected for clean environment with the large amount of data. Typically, Level M (15%) is most frequently selected.
-<<<
+|errorCorrectLevel |Redundancy |Use cases |h
+|L | 7%|Clean environment, large amount of data |
+|M | 15%|Default value, most common choice |
+|Q | 25%|Dirty environment, small amount of data |
+|H | 30%|~|
 
 !! Examples
 
-Making a QR code for a simple string of text:
+Making a QR code data URI for a simple string of text:
 
 ```
 <<makeqr "Hello there!">>
 ```
 
-Making a QR code for the URL field of the current tiddler:
+Displaying a QR code for a simple string of text:
 
 ```
-<$macrocall $name="makeqr" text={{!!url}}/>
+<img src=<<makeqr "Hello there!">> />
 ```
 
-Making a QR code for the URL of the current wiki:
+Displaying a QR code for a transcluded value (URL of the current wiki):
 
 ```
-<$macrocall $name="makeqr" text={{$:/info/url/full}}/>
+\define qr(content) <img src=<<makeqr text:"""$content$""">> />
+
+<$transclude $variable="qr" content={{$:/info/url/full}} />
 ```

package/plugins/tiddlywiki/qrcode/makeqr.js

@@ -37,7 +37,7 @@ exports.run = function(text,size,errorCorrectLevel,fallback) {
 	var result;
 	try {
 		result = generateQrCode(text,{size: size, errorCorrectLevel: errorCorrectLevel});
-	} catch (ex) {
+	} catch(ex) {
 		console.log("makeqr error: " + ex);
 		result = fallback || ("data:image/svg+xml," + encodeURI(QRCODE_GENERATION_ERROR_PREFIX + ex + QRCODE_GENERATION_ERROR_SUFFIX));
 	}
@@ -54,7 +54,7 @@ function generateQrCode(text,options) {
 		qr = qrcode(typeNumber,errorCorrectLevel);
 		qr.addData(text);
 		qr.make();
-	} catch (e) {
+	} catch(e) {
 		if(typeNumber >= 40) {
 			throw new Error("Text too long to encode");
 		} else {

package/plugins/tiddlywiki/railroad/parser.js

@@ -377,7 +377,7 @@ Parser.prototype.tokenise = function(source) {
 		// Skip whitespace
 		pos = $tw.utils.skipWhiteSpace(source,pos);
 		// Avoid falling off the end of the string
-		if (pos >= source.length) {
+		if(pos >= source.length) {
 			break;
 		}
 		// Examine the next character

package/plugins/tiddlywiki/savetrail/settings.tid

@@ -1,5 +1,6 @@
 title: $:/plugins/tiddlywiki/savetrail/settings
-
+caption: Save Trail
+tags: $:/tags/ControlPanel/SettingsTab
 
 <$checkbox tiddler="$:/config/SaveTrailPlugin/enable" field="text" checked="yes" unchecked="no"> Enable automatic saving of modified tiddlers</$checkbox>
 

package/plugins/tiddlywiki/share/settings.tid

@@ -1,4 +1,6 @@
 title: $:/plugins/tiddlywiki/share/settings
+caption: Share
+tags: $:/tags/ControlPanel/SettingsTab
 
 !! Base sharing URL
 

package/plugins/tiddlywiki/stacked-view/readme.tid

@@ -2,4 +2,4 @@ title: $:/plugins/tiddlywiki/stacked-view/readme
 
 This plugin provides a new story visualisation that displays individual tiddlers as a stack of cards. It is currently experimental and incomplete.
 
-[[Source code|https://github.com/Jermolene/TiddlyWiki5/blob/master/plugins/tiddlywiki/stacked-view]]
+[[Source code|https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/plugins/tiddlywiki/stacked-view]]

package/plugins/tiddlywiki/tahoelafs/readme.tid

@@ -4,4 +4,4 @@ This plugin provides a ''saver'' module for saving changes under the [[Tahoe Lea
 
 At this point it is largely for experimentation by @zooko.
 
-[[Source code|https://github.com/Jermolene/TiddlyWiki5/blob/master/plugins/tiddlywiki/tahoelafs]]
+[[Source code|https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/plugins/tiddlywiki/tahoelafs]]

package/plugins/tiddlywiki/text-slicer/modules/slicer.js

@@ -365,7 +365,7 @@ Slicer.prototype.onCloseTag = function(name) {
 	// Render the tag
 	if(actions.isAnchor) {
 		this.onCloseAnchor(e);
-	} else if (!actions.dontRenderTag && !selfClosing) {
+	} else if(!actions.dontRenderTag && !selfClosing) {
 		var markupInfo = actions.markup && actions.markup[this.outputMode];
 		if(markupInfo) {
 			this.addTextToCurrentChunk(markupInfo.suffix);

package/plugins/tiddlywiki/text-slicer/ui/slice-toolbar-button.tid

@@ -6,18 +6,18 @@ description: Slice this text tiddler by headings and lists
 
 \whitespace trim
 
-\define hint()
+\procedure hint()
 Slice this text tiddler into chunks
 \end
 
 <$list filter="[<currentTiddler>!is[image]!is[binary]]" variable="ignore">
 <$button tooltip=<<hint>> aria-label=<<hint>> class=<<tv-config-toolbar-class>>>
 <$action-sendmessage $message="tm-modal" $param="$:/plugins/tiddlywiki/text-slicer/ui/slice-modal" currentTiddler=<<currentTiddler>>/>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/plugins/tiddlywiki/text-slicer/images/text-slicer-icon}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text">Slice tiddler</span>
-</$list>
+<%endif%>
 </$button>
 </$list>

package/plugins/tiddlywiki/tiddlyweb/configOfficialPluginLibrary.tid

@@ -4,4 +4,4 @@ url: https://tiddlywiki.com/library/v5.1.23/index.html
 caption: {{$:/language/OfficialPluginLibrary}}
 enabled: no
 
-The official plugin library is disabled when using the client-server configuration. Instead, plugins should be installed via the `tiddlywiki.info` file, as described [[here|https://tiddlywiki.com/#Installing%20a%20plugin%20from%20the%20plugin%20library]].
+The official plugin library is disabled when using the client-server configuration. Instead, plugins should be installed via the `tiddlywiki.info` file, as described [[here|https://tiddlywiki.com/#Installing%20official%20plugins%20on%20Node.js]].

package/plugins/tiddlywiki/tiddlyweb/readme.tid

@@ -4,4 +4,4 @@ This plugin runs in the browser to synchronise tiddler changes to and from a Tid
 
 Changes made while offline are saved in memory and automatically synchonised with the server when the connection is re-established. However, if the browser tab is closed or another URL is loaded, the in-memory changes will be lost. The [[https://tiddlywiki.com/#BrowserStorage Plugin]] may be added to provide temporary filesystem storage of tiddler changes made while offline and enable them to be synchronised with the server the next time the wiki is loaded in the same browser.  
 
-[[Source code|https://github.com/Jermolene/TiddlyWiki5/blob/master/plugins/tiddlywiki/tiddlyweb]]
+[[Source code|https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/plugins/tiddlywiki/tiddlyweb]]

package/plugins/tiddlywiki/tiddlyweb/save-wiki-button.tid

@@ -9,12 +9,12 @@ $:/config/PageControlButtons/Visibility/$(listItem)$
 \end
 <$button popup=<<qualify "$:/state/popup/save-wiki">> tooltip="Status of synchronisation with server" aria-label="Server status" class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
 <span class="tc-dirty-indicator">
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/plugins/tiddlywiki/tiddlyweb/icon/cloud}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text"><$text text="Server status"/></span>
-</$list>
+<%endif%>
 </span>
 </$button>
 <$reveal state=<<qualify "$:/state/popup/save-wiki">> type="popup" position="belowleft" animate="yes">

package/plugins/tiddlywiki/tiddlyweb/tiddlywebadaptor.js

@@ -84,7 +84,7 @@ TiddlyWebAdaptor.prototype.getStatus = function(callback) {
 			var json = null;
 			try {
 				json = JSON.parse(data);
-			} catch (e) {
+			} catch(e) {
 			}
 			if(json) {
 				self.logger.log("Status:",data);
@@ -164,7 +164,7 @@ TiddlyWebAdaptor.prototype.getCsrfToken = function() {
 	var regex = /^(?:.*; )?csrf_token=([^(;|$)]*)(?:;|$)/,
 		match = regex.exec(document.cookie),
 		csrf = null;
-	if (match && (match.length === 2)) {
+	if(match && (match.length === 2)) {
 		csrf = match[1];
 	}
 	return csrf;