diff --git a/CliClient/package-lock.json b/CliClient/package-lock.json
index 1e59fe9f4e..b85cd9c2a2 100644
--- a/CliClient/package-lock.json
+++ b/CliClient/package-lock.json
@@ -2159,7 +2159,8 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"aproba": {
"version": "1.2.0",
@@ -2180,12 +2181,14 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -2200,17 +2203,20 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"core-util-is": {
"version": "1.0.2",
@@ -2327,7 +2333,8 @@
"inherits": {
"version": "2.0.4",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"ini": {
"version": "1.3.5",
@@ -2339,6 +2346,7 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -2353,6 +2361,7 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@@ -2360,12 +2369,14 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"minipass": {
"version": "2.9.0",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@@ -2384,6 +2395,7 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"minimist": "0.0.8"
}
@@ -2473,7 +2485,8 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"object-assign": {
"version": "4.1.1",
@@ -2485,6 +2498,7 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"wrappy": "1"
}
@@ -2570,7 +2584,8 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"safer-buffer": {
"version": "2.1.2",
@@ -2606,6 +2621,7 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -2625,6 +2641,7 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@@ -2668,12 +2685,14 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"yallist": {
"version": "3.1.1",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
}
}
},
@@ -6676,7 +6695,7 @@
"requires": {
"chalk": "^2.1.0",
"emphasize": "^1.5.0",
- "node-emoji": "git+https://github.com/laurent22/node-emoji.git#9fa01eac463e94dde1316ef8c53089eeef4973b5",
+ "node-emoji": "git+https://github.com/laurent22/node-emoji.git",
"slice-ansi": "^1.0.0",
"string-width": "^2.1.1",
"terminal-kit": "^1.13.11",
diff --git a/ElectronClient/package-lock.json b/ElectronClient/package-lock.json
index bcbe23ec50..d57bfc750a 100644
--- a/ElectronClient/package-lock.json
+++ b/ElectronClient/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "Joplin",
- "version": "1.0.229",
+ "version": "1.0.231",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/ElectronClient/package.json b/ElectronClient/package.json
index 585c498a81..c5097cc9a6 100644
--- a/ElectronClient/package.json
+++ b/ElectronClient/package.json
@@ -1,6 +1,6 @@
{
"name": "Joplin",
- "version": "1.0.229",
+ "version": "1.0.231",
"description": "Joplin for Desktop",
"main": "main.js",
"scripts": {
diff --git a/docs/images/md_plugins/abbr_plugin.jpg b/docs/images/md_plugins/abbr_plugin.jpg
new file mode 100644
index 0000000000..1cdee3eb91
Binary files /dev/null and b/docs/images/md_plugins/abbr_plugin.jpg differ
diff --git a/docs/images/md_plugins/deflist_plugin.jpg b/docs/images/md_plugins/deflist_plugin.jpg
new file mode 100644
index 0000000000..08ef0aae0d
Binary files /dev/null and b/docs/images/md_plugins/deflist_plugin.jpg differ
diff --git a/docs/images/md_plugins/emoji_plugin.jpg b/docs/images/md_plugins/emoji_plugin.jpg
new file mode 100644
index 0000000000..c1949c97f1
Binary files /dev/null and b/docs/images/md_plugins/emoji_plugin.jpg differ
diff --git a/docs/images/md_plugins/footnote_plugin.jpg b/docs/images/md_plugins/footnote_plugin.jpg
new file mode 100644
index 0000000000..dcc3ed5e43
Binary files /dev/null and b/docs/images/md_plugins/footnote_plugin.jpg differ
diff --git a/docs/images/md_plugins/fountain_plugin.jpg b/docs/images/md_plugins/fountain_plugin.jpg
new file mode 100644
index 0000000000..04f70f41fc
Binary files /dev/null and b/docs/images/md_plugins/fountain_plugin.jpg differ
diff --git a/docs/images/md_plugins/insert_plugin.jpg b/docs/images/md_plugins/insert_plugin.jpg
new file mode 100644
index 0000000000..971129631b
Binary files /dev/null and b/docs/images/md_plugins/insert_plugin.jpg differ
diff --git a/docs/images/md_plugins/katex_plugin.jpg b/docs/images/md_plugins/katex_plugin.jpg
new file mode 100644
index 0000000000..73ae8c32c3
Binary files /dev/null and b/docs/images/md_plugins/katex_plugin.jpg differ
diff --git a/docs/images/md_plugins/mark_plugin.jpg b/docs/images/md_plugins/mark_plugin.jpg
new file mode 100644
index 0000000000..dc4f175ec6
Binary files /dev/null and b/docs/images/md_plugins/mark_plugin.jpg differ
diff --git a/docs/images/md_plugins/mermaid.jpg b/docs/images/md_plugins/mermaid.jpg
new file mode 100644
index 0000000000..2d7bb179fc
Binary files /dev/null and b/docs/images/md_plugins/mermaid.jpg differ
diff --git a/docs/images/md_plugins/multitable_plugin.jpg b/docs/images/md_plugins/multitable_plugin.jpg
new file mode 100644
index 0000000000..c3cb177974
Binary files /dev/null and b/docs/images/md_plugins/multitable_plugin.jpg differ
diff --git a/docs/images/md_plugins/softbreaks_plugin.jpg b/docs/images/md_plugins/softbreaks_plugin.jpg
new file mode 100644
index 0000000000..39758320fb
Binary files /dev/null and b/docs/images/md_plugins/softbreaks_plugin.jpg differ
diff --git a/docs/images/md_plugins/sub_plugin.jpg b/docs/images/md_plugins/sub_plugin.jpg
new file mode 100644
index 0000000000..75b389397f
Binary files /dev/null and b/docs/images/md_plugins/sub_plugin.jpg differ
diff --git a/docs/images/md_plugins/sup_plugin.jpg b/docs/images/md_plugins/sup_plugin.jpg
new file mode 100644
index 0000000000..a6f66501bd
Binary files /dev/null and b/docs/images/md_plugins/sup_plugin.jpg differ
diff --git a/docs/images/md_plugins/toc_plugin.jpg b/docs/images/md_plugins/toc_plugin.jpg
new file mode 100644
index 0000000000..a5c2ff7c04
Binary files /dev/null and b/docs/images/md_plugins/toc_plugin.jpg differ
diff --git a/docs/images/md_plugins/typographer_plugin.jpg b/docs/images/md_plugins/typographer_plugin.jpg
new file mode 100644
index 0000000000..b69a22bad3
Binary files /dev/null and b/docs/images/md_plugins/typographer_plugin.jpg differ
diff --git a/readme/markdown.md b/readme/markdown.md
index 0b6648ab74..7e52ae66aa 100644
--- a/readme/markdown.md
+++ b/readme/markdown.md
@@ -26,7 +26,7 @@ This is a quick summary of the Markdown syntax.
| **Link** | This is detected as a link:
`https://joplinapp.org`
And this is a link anchoring text content:
`[Joplin](https://joplinapp.org)`
And this is a link, with a title,
anchoring text content:
`[Joplin](https://joplinapp.org "Joplin project page")`
| This is detected as a link:
https://joplinapp.org
And this is a link anchoring text content:
[Joplin](https://joplinapp.org)
And this is a link, with a title,
anchoring text content:
[Joplin](https://joplinapp.org "Joplin project page") (_hint: hover over the link_)
| **Images** | ``
| 
| **Horizontal Rule** | One rule:
\*\*\*
Another rule:
\-\-\-
| One rule:
Another rule:
-| **Tables** | [See below](#tables) |
+| **Tables** | [See below](#tables) |
### Tables
@@ -138,19 +138,20 @@ Joplin supports a number of plugins that can be toggled on/off to enable/disable
Note that the functionality added by these plugins is not part of the CommonMark spec so, while they will all work within Joplin, it is not guaranteed that they will work in other Markdown readers. Often this is not an issue but keep it in mind if you require compatibility with other Markdown applications.
-| Plugin | Syntax | Description | Enabled |
-|--------|--------|-------------|---------|
-| Soft breaks | See [breaks](https://markdown-it.github.io/#md3=%7B%22source%22%3A%22This%20is%20line1%5CnThis%20is%20line2%5Cn%5CnThis%20is%20a%20line%20with%202%20trailing%20spaces%20%20%5CnNext%20line%5Cn%5CnClick%20the%20%60breaks%60%20checkbox%20above%20to%20see%20the%20difference.%5CnJoplin%27s%20default%20is%20hard%20breaks%20%28checked%20%60breaks%60%20checkbox%29.%22%2C%22defaults%22%3A%7B%22html%22%3Afalse%2C%22xhtmlOut%22%3Afalse%2C%22breaks%22%3Afalse%2C%22langPrefix%22%3A%22language-%22%2C%22linkify%22%3Afalse%2C%22typographer%22%3Afalse%2C%22_highlight%22%3Afalse%2C%22_strict%22%3Afalse%2C%22_view%22%3A%22html%22%7D%7D) markdown-it demo| Joplin uses hard breaks by default, which means that a line break is rendered as `
`. Enable soft breaks for traditional markdown line-break behaviour. | no |
-| Typographer | See [typographer](https://markdown-it.github.io/#md3=%7B%22source%22%3A%22%23%20Typographic%20replacements%5Cn%5Cn%28c%29%20%28C%29%20%28r%29%20%28R%29%20%28tm%29%20%28TM%29%20%28p%29%20%28P%29%20%2B-%5Cn%5Cntest..%20test...%20test.....%20test%3F.....%20test!....%5Cn%5Cn!!!!!!%20%3F%3F%3F%3F%20%2C%2C%20%20--%20---%5Cn%5Cn%5C%22Smartypants%2C%20double%20quotes%5C%22%20and%20%27single%20quotes%27%5Cn%22%2C%22defaults%22%3A%7B%22html%22%3Afalse%2C%22xhtmlOut%22%3Afalse%2C%22breaks%22%3Afalse%2C%22langPrefix%22%3A%22language-%22%2C%22linkify%22%3Atrue%2C%22typographer%22%3Atrue%2C%22_highlight%22%3Atrue%2C%22_strict%22%3Afalse%2C%22_view%22%3A%22html%22%7D%7D) markdown-it demo | Does typographic replacements, (c) -> © and so on | no |
-| [Katex](https://katex.org) | `$$math expr$$` or `$math$` | [See above](#math-notation) | yes |
-| [Mark](https://github.com/markdown-it/markdown-it-mark) | `==marked==` | Transforms into `marked` (highlighted) | yes |
-| [Footnote](https://github.com/markdown-it/markdown-it-footnote) | `Simples inline footnote ^[I'm inline!]` | See [plugin page](https://github.com/markdown-it/markdown-it-footnote) for full description | yes |
-| [TOC](https://github.com/nagaozen/markdown-it-toc-done-right) | Any of `${toc}, [[toc]], [toc], [[_toc_]]` | Adds a table of contents to the location of the toc page. Based on headings and sub-headings | no |
-| [Sub](https://github.com/markdown-it/markdown-it-sub) | `X~1~` | Transforms into X1 | no |
-| [Sup](https://github.com/markdown-it/markdown-it-sup) | `X^2^` | Transforms into X2 | no |
-| [Deflist](https://github.com/markdown-it/markdown-it-deflist) | See [pandoc](http://johnmacfarlane.net/pandoc/README.html#definition-lists) page for syntax | Adds the html `` tag accessible through markdown | no |
-| [Abbr](https://github.com/markdown-it/markdown-it-abbr) | *[HTML]: Hyper Text Markup Language
The HTML specification | Allows definition of abbreviations that can be hovered over later for a full expansion | no |
-| [Emoji](https://github.com/markdown-it/markdown-it-emoji) | `:smile:` | Transforms into 😄. See [this list](https://gist.github.com/rxaviers/7360908) for more emojis | no |
-| [Insert](https://github.com/markdown-it/markdown-it-ins) | `++inserted++` | Transforms into `inserted` (inserted) | no |
-| [Multitable](https://github.com/RedBug312/markdown-it-multimd-table) | See [MultiMarkdown](https://fletcher.github.io/MultiMarkdown-6/syntax/tables.html) page | Adds more power and customization to markdown tables | no |
-| [Fountain](https://fountain.io) | \`\`\`fountain
Your screenplay...
\`\`\` | Adds support for the Fountain markup language, a plain text markup language for screenwriting | no |
+| Plugin | Syntax | Description | Enabled | Screenshot |
+|--------|--------|-------------|---------|------------|
+| Soft breaks | See [breaks](https://markdown-it.github.io/#md3=%7B%22source%22%3A%22This%20is%20line1%5CnThis%20is%20line2%5Cn%5CnThis%20is%20a%20line%20with%202%20trailing%20spaces%20%20%5CnNext%20line%5Cn%5CnClick%20the%20%60breaks%60%20checkbox%20above%20to%20see%20the%20difference.%5CnJoplin%27s%20default%20is%20hard%20breaks%20%28checked%20%60breaks%60%20checkbox%29.%22%2C%22defaults%22%3A%7B%22html%22%3Afalse%2C%22xhtmlOut%22%3Afalse%2C%22breaks%22%3Afalse%2C%22langPrefix%22%3A%22language-%22%2C%22linkify%22%3Afalse%2C%22typographer%22%3Afalse%2C%22_highlight%22%3Afalse%2C%22_strict%22%3Afalse%2C%22_view%22%3A%22html%22%7D%7D) markdown-it demo| Joplin uses hard breaks by default, which means that a line break is rendered as `
`. Enable soft breaks for traditional markdown line-break behaviour. | no | [View](https://joplinapp.org/images/md_plugins/softbreaks_plugin.jpg)
+| Typographer | See [typographer](https://markdown-it.github.io/#md3=%7B%22source%22%3A%22%23%20Typographic%20replacements%5Cn%5Cn%28c%29%20%28C%29%20%28r%29%20%28R%29%20%28tm%29%20%28TM%29%20%28p%29%20%28P%29%20%2B-%5Cn%5Cntest..%20test...%20test.....%20test%3F.....%20test!....%5Cn%5Cn!!!!!!%20%3F%3F%3F%3F%20%2C%2C%20%20--%20---%5Cn%5Cn%5C%22Smartypants%2C%20double%20quotes%5C%22%20and%20%27single%20quotes%27%5Cn%22%2C%22defaults%22%3A%7B%22html%22%3Afalse%2C%22xhtmlOut%22%3Afalse%2C%22breaks%22%3Afalse%2C%22langPrefix%22%3A%22language-%22%2C%22linkify%22%3Atrue%2C%22typographer%22%3Atrue%2C%22_highlight%22%3Atrue%2C%22_strict%22%3Afalse%2C%22_view%22%3A%22html%22%7D%7D) markdown-it demo | Does typographic replacements, (c) -> © and so on | no | [View](https://joplinapp.org/images/md_plugins/typographer_plugin.jpg) |
+| [Katex](https://katex.org) | `$$math expr$$` or `$math$` | [See above](#math-notation) | yes | [View](https://joplinapp.org/images/md_plugins/katex_plugin.jpg) |
+| [Mark](https://github.com/markdown-it/markdown-it-mark) | `==marked==` | Transforms into `marked` (highlighted) | yes | [View](https://joplinapp.org/images/md_plugins/mark_plugin.jpg) |
+| [Footnote](https://github.com/markdown-it/markdown-it-footnote) | `Simples inline footnote ^[I'm inline!]` | See [plugin page](https://github.com/markdown-it/markdown-it-footnote) for full description | yes | [View](https://joplinapp.org/images/md_plugins/footnote_plugin.jpg) |
+| [TOC](https://github.com/nagaozen/markdown-it-toc-done-right) | Any of `${toc}, [[toc]], [toc], [[_toc_]]` | Adds a table of contents to the location of the toc page. Based on headings and sub-headings | no | [View](https://joplinapp.org/images/md_plugins/toc_plugin.jpg) |
+| [Sub](https://github.com/markdown-it/markdown-it-sub) | `X~1~` | Transforms into X1 | no | [View](https://joplinapp.org/images/md_plugins/sub_plugin.jpg) |
+| [Sup](https://github.com/markdown-it/markdown-it-sup) | `X^2^` | Transforms into X2 | no | [View](https://joplinapp.org/images/md_plugins/sup_plugin.jpg) |
+| [Deflist](https://github.com/markdown-it/markdown-it-deflist) | See [pandoc](http://johnmacfarlane.net/pandoc/README.html#definition-lists) page for syntax | Adds the html `` tag accessible through markdown | no | [View](https://joplinapp.org/images/md_plugins/deflist_plugin.jpg) |
+| [Abbr](https://github.com/markdown-it/markdown-it-abbr) | *[HTML]: Hyper Text Markup Language
The HTML specification | Allows definition of abbreviations that can be hovered over later for a full expansion | no | [View](https://joplinapp.org/images/md_plugins/abbr_plugin.jpg) |
+| [Emoji](https://github.com/markdown-it/markdown-it-emoji) | `:smile:` | Transforms into 😄. See [this list](https://gist.github.com/rxaviers/7360908) for more emojis | no |!View[]https://joplinapp.org/images/md_plugins/emoji_plugin.jpg) |
+| [Insert](https://github.com/markdown-it/markdown-it-ins) | `++inserted++` | Transforms into `inserted` (inserted) | no | [View](https://joplinapp.org/images/md_plugins/insert_plugin.jpg) |
+| [Multitable](https://github.com/RedBug312/markdown-it-multimd-table) | See [MultiMarkdown](https://fletcher.github.io/MultiMarkdown-6/syntax/tables.html) page | Adds more power and customization to markdown tables | no | [View](https://joplinapp.org/images/md_plugins/multitable_plugin.jpg) |
+| [Fountain](https://fountain.io) | \`\`\`fountain
Your screenplay...
\`\`\` | Adds support for the Fountain markup language, a plain text markup language for screenwriting | no | [View](https://joplinapp.org/images/md_plugins/fountain_plugin.jpg) |
+| [Mermaid](https://mermaid-js.github.io/mermaid/) | \`\`\`mermaid
mermaid syntax...
\`\`\` | See [plugin page](https://mermaid-js.github.io/mermaid/#/examples) for full description | no | [View](https://joplinapp.org/images/md_plugins/mermaid.jpg) |