Merge branch 'st3-develop' into st4-develop

Author: deathaxe

Default (OSX).sublime-keymap

@@ -678,15 +678,15 @@
 			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - markup.raw", "match_all": true }
 		]
 	},
-	{ "keys": ["super+shift+["], "command": "mde_fold_section", "context":
+	{ "keys": ["super+alt+["], "command": "mde_fold_section", "context":
 		[
 			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - markup.raw - markup.list", "match_all": true },
 			{ "key": "setting.mde.keymap_disable.fold_section", "operator": "not_equal", "operand": true },
 			{ "key": "has_prev_field", "operator": "equal", "operand": false },
 			{ "key": "overlay_visible", "operator": "equal", "operand": false }
 		]
 	},
-	{ "keys": ["super+shift+]"], "command": "mde_unfold_section", "context":
+	{ "keys": ["super+alt+]"], "command": "mde_unfold_section", "context":
 		[
 			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - markup.raw - markup.list", "match_all": true },
 			{ "key": "setting.mde.keymap_disable.fold_section", "operator": "not_equal", "operand": true },

docs/usage.md

@@ -107,10 +107,10 @@ or use one of the following bindings:
 
 | Linux/Windows | MacOS | Description
 |---------------|-------|-------------
-| <kbd>Alt</kbd> + <kbd>k</kbd>, <kbd>Alt</kbd> + <kbd>0</kbd> | <kbd>^</kbd> + <kbd>k</kbd>, <kbd>^</kbd> + <kbd>0</kbd> | convert headings into normal text
-| <kbd>Alt</kbd> + <kbd>k</kbd>, <kbd>Alt</kbd> + <kbd>1..6</kbd> | <kbd>^</kbd> + <kbd>k</kbd>, <kbd>^</kbd> + <kbd>1..6</kbd> | set headings level to 1..6
-| <kbd>Shift</kbd> + <kbd>Alt</kbd> + <kbd>,</kbd> | <kbd>⇧</kbd> + <kbd>^</kbd> + <kbd>,</kbd> | reduce headings level by one
-| <kbd>Shift</kbd> + <kbd>Alt</kbd> + <kbd>.</kbd> | <kbd>⇧</kbd> + <kbd>^</kbd> + <kbd>.</kbd> | increase headings level by one
+| <kbd>Alt</kbd> + <kbd>k</kbd>, <kbd>Alt</kbd> + <kbd>0</kbd> | <kbd>⌃</kbd> + <kbd>k</kbd>, <kbd>⌃</kbd> + <kbd>0</kbd> | convert headings into normal text
+| <kbd>Alt</kbd> + <kbd>k</kbd>, <kbd>Alt</kbd> + <kbd>1..6</kbd> | <kbd>⌃</kbd> + <kbd>k</kbd>, <kbd>⌃</kbd> + <kbd>1..6</kbd> | set headings level to 1..6
+| <kbd>Shift</kbd> + <kbd>Alt</kbd> + <kbd>,</kbd> | <kbd>⇧</kbd> + <kbd>⌃</kbd> + <kbd>,</kbd> | reduce headings level by one
+| <kbd>Shift</kbd> + <kbd>Alt</kbd> + <kbd>.</kbd> | <kbd>⇧</kbd> + <kbd>⌃</kbd> + <kbd>.</kbd> | increase headings level by one
 
 Key bindings can be disabled via `"mde.keymap_disable.set_heading_level": true`.
 
@@ -162,12 +162,12 @@ Folding is bound to following keys by default:
 
 | Linux/Windows | MacOS | Description
 |---------------|-------|-------------
-| <kbd>Ctrl</kbd> + <kbd>k</kbd>, <kbd>Ctrl</kbd> + <kbd>0</kbd> | <kbd>⌥</kbd> + <kbd>k</kbd>, <kbd>⌥</kbd> + <kbd>0</kbd> | Unfold all sections
-| <kbd>Ctrl</kbd> + <kbd>k</kbd>, <kbd>Ctrl</kbd> + <kbd>1..6</kbd> | <kbd>⌥</kbd> + <kbd>k</kbd>, <kbd>⌥</kbd> + <kbd>1..6</kbd> | Fold sections by level 1..6
-| <kbd>Ctrl</kbd> + <kbd>k</kbd>, <kbd>Ctrl</kbd> + <kbd>9</kbd> | <kbd>⌥</kbd> + <kbd>k</kbd>, <kbd>⌥</kbd> + <kbd>9</kbd> | Fold all sections, but keep headings of any level visible
-| <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>[</kbd> | <kbd>^</kbd> + <kbd>⇧</kbd> + <kbd>Tab</kbd> | Fold current section.
-| <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>]</kbd> | <kbd>^</kbd> + <kbd>⇧</kbd> + <kbd>Tab</kbd> | Unfold current section.
-| <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Tab</kbd> | <kbd>^</kbd> + <kbd>⇧</kbd> + <kbd>Tab</kbd> | Fold all sections under headings of a certain level.
+| <kbd>Ctrl</kbd> + <kbd>k</kbd>, <kbd>Ctrl</kbd> + <kbd>0</kbd> | <kbd>⌘</kbd> + <kbd>k</kbd>, <kbd>⌘</kbd> + <kbd>0</kbd> | Unfold all sections
+| <kbd>Ctrl</kbd> + <kbd>k</kbd>, <kbd>Ctrl</kbd> + <kbd>1..6</kbd> | <kbd>⌘</kbd> + <kbd>k</kbd>, <kbd>⌘</kbd> + <kbd>1..6</kbd> | Fold sections by level 1..6
+| <kbd>Ctrl</kbd> + <kbd>k</kbd>, <kbd>Ctrl</kbd> + <kbd>9</kbd> | <kbd>⌘</kbd> + <kbd>k</kbd>, <kbd>⌘</kbd> + <kbd>9</kbd> | Fold all sections, but keep headings of any level visible
+| <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>[</kbd> | <kbd>⌘</kbd> + <kbd>⌥</kbd> + <kbd>Tab</kbd> | Fold current section.
+| <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>]</kbd> | <kbd>⌘</kbd> + <kbd>⌥</kbd> + <kbd>Tab</kbd> | Unfold current section.
+| <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Tab</kbd> | <kbd>⌃</kbd> + <kbd>⇧</kbd> + <kbd>Tab</kbd> | Fold all sections under headings of a certain level.
 
 ## Automatic Link Url Folding
 

messages.json

@@ -43,5 +43,6 @@
 	"3.1.6": "messages/3.1.6.md",
 	"3.1.7": "messages/3.1.7.md",
 	"3.1.8": "messages/3.1.8.md",
-	"3.1.9": "messages/3.1.9.md"
+	"3.1.9": "messages/3.1.9.md",
+	"3.1.10": "messages/3.1.10.md"
 }

messages/3.1.10.md

@@ -0,0 +1,18 @@
+# MarkdownEditing 3.1.10 Changelog
+
+Your _MarkdownEditing_ plugin is updated. Enjoy new version. For any type of
+feedback you can use [GitHub issues][issues].
+
+## Bug Fixes
+
+* Fix MacOs fold/unfold section key bindings (#724)
+
+## New Features
+
+* Add snippets for GitHub admonitions
+  - ghnote - Note
+  - ghwarn - Warning
+
+## Changes
+
+[issues]: https://github.com/SublimeText-Markdown/MarkdownEditing/issues

snippets/Github Note.sublime-snippet

@@ -0,0 +1,9 @@
+<snippet>
+	<content><![CDATA[> **Note**
+>
+> ${0:enter text}
+]]></content>
+	<tabTrigger>ghnote</tabTrigger>
+	<scope>text.html.markdown - meta.frontmatter - meta.disable-markdown - meta.code-fence - markup.raw</scope>
+	<description>Markdown Admonition</description>
+</snippet>

snippets/Github Warning.sublime-snippet

@@ -0,0 +1,9 @@
+<snippet>
+	<content><![CDATA[> **Warning**
+>
+> ${0:enter text}
+]]></content>
+	<tabTrigger>ghwarn</tabTrigger>
+	<scope>text.html.markdown - meta.frontmatter - meta.disable-markdown - meta.code-fence - markup.raw</scope>
+	<description>Markdown Admonition</description>
+</snippet>