Merge pull request #433 from SublimeText-Markdown/v2.2.3

init v2.2.3
SublimeText-Markdown · Jul 11, 2017 · 0d38b40 · 0d38b40
2 parents 4782f75 + 267a4b6
commit 0d38b40
Show file tree

Hide file tree

Showing 18 changed files with 595 additions and 132 deletions.
diff --git a/Context.sublime-menu b/Context.sublime-menu
@@ -0,0 +1,14 @@
+[
+{
+    "caption": "MDE: Fold Section",
+    "command": "fold_section_context"
+},
+{
+    "caption": "MDE: Unfold Section",
+    "command": "unfold_section_context"
+},
+{
+    "caption": "MDE: Jump Reference",
+    "command": "reference_jump_context"
+}
+]
diff --git a/Default (Linux).sublime-keymap b/Default (Linux).sublime-keymap
@@ -393,9 +393,10 @@
 
     // inline image insertion
     { "keys": ["super+shift+k"], "command": "reference_new_inline_image", "context":
-     [
-         { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
-     ]
+        [
+            { "key": "setting.mde.keymap_disable.reference_new_inline_image", "operator": "not_equal", "operand": true },
+            { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
+        ]
     },
     // modify [] pairing so that selection is removed after pairing, ready for [] or ()
     { "keys": ["["], "command": "insert_snippet", "args": {"contents": "[$SELECTION]$0"}, "context":
@@ -408,16 +409,19 @@
     // run paste as link command on selected text
     { "keys": ["ctrl+super+v"], "command": "reference_new_inline_link", "context":
         [
+            { "key": "setting.mde.keymap_disable.reference_new_inline_link", "operator": "not_equal", "operand": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
     { "keys": ["ctrl+super+r"], "command": "reference_new_reference", "context":
         [
+            { "key": "setting.mde.keymap_disable.reference_new_reference", "operator": "not_equal", "operand": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
     { "keys": ["ctrl+alt+g"], "command": "reference_jump", "context":
         [
+            { "key": "setting.mde.keymap_disable.reference_jump", "operator": "not_equal", "operand": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
@@ -580,6 +584,7 @@
     },
     { "keys": ["alt+shift+6"], "command": "reference_new_footnote", "context":
         [
+            { "key": "setting.mde.keymap_disable.reference_new_footnote", "operator": "not_equal", "operand": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
@@ -596,6 +601,7 @@
     },
     { "keys": ["shift+tab"], "command": "fold_section", "context":
         [
+            { "key": "setting.mde.keymap_disable.fold_section", "operator": "not_equal", "operand": true },
             { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
             { "key": "preceding_text", "operator": "not_regex_match", "operand": "^\\s+", "match_all": true },
             { "key": "following_text", "operator": "not_regex_match", "operand": "^$", "match_all": true },
@@ -604,6 +610,7 @@
     },
     { "keys": ["shift+tab"], "command": "fold_section", "context":
         [
+            { "key": "setting.mde.keymap_disable.fold_section", "operator": "not_equal", "operand": true },
             { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
             { "key": "preceding_text", "operator": "not_regex_match", "operand": "^\\s+", "match_all": true },
             { "key": "selector", "operator": "not_equal", "operand": "markup.list", "match_all": true },
@@ -612,33 +619,39 @@
     },
     { "keys": ["shift+tab"], "command": "fold_section", "context":
         [
+            { "key": "setting.mde.keymap_disable.fold_section", "operator": "not_equal", "operand": true },
             { "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true },
             { "key": "text", "operator": "regex_contains", "operand": "^(#{1,6}(?!#))|^(-{3,}|={3,})$"},
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
     { "keys": ["ctrl+shift+tab"], "command": "show_fold_all_sections", "context":
         [
+            { "key": "setting.mde.keymap_disable.show_fold_all_sections", "operator": "not_equal", "operand": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
     { "keys": ["ctrl+shift+alt+pageup"], "command": "goto_previous_heading", "args": {"same_level": true}, "context":
         [
+            { "key": "setting.mde.keymap_disable.goto_previous_heading", "operator": "not_equal", "operand": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
     { "keys": ["ctrl+shift+alt+pagedown"], "command": "goto_next_heading", "args": {"same_level": true}, "context":
         [
+            { "key": "setting.mde.keymap_disable.goto_next_heading", "operator": "not_equal", "operand": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
     { "keys": ["ctrl+shift+pageup"], "command": "goto_previous_heading", "args": {"same_level": false}, "context":
         [
+            { "key": "setting.mde.keymap_disable.goto_previous_heading", "operator": "not_equal", "operand": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
     { "keys": ["ctrl+shift+pagedown"], "command": "goto_next_heading", "args": {"same_level": false}, "context":
         [
+            { "key": "setting.mde.keymap_disable.goto_next_heading", "operator": "not_equal", "operand": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     }

diff --git a/Default (OSX).sublime-keymap b/Default (OSX).sublime-keymap
@@ -394,6 +394,7 @@
     // inline image insertion
     { "keys": ["super+shift+k"], "command": "reference_new_inline_image", "context":
         [
+            { "key": "setting.mde.keymap_disable.reference_new_inline_image", "operator": "not_equal", "operand": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
@@ -408,16 +409,19 @@
     // run paste as link command on selected text
     { "keys": ["super+alt+v"], "command": "reference_new_inline_link", "context":
         [
+            { "key": "setting.mde.keymap_disable.reference_new_inline_link", "operator": "not_equal", "operand": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
     { "keys": ["super+alt+r"], "command": "reference_new_reference", "context":
         [
+            { "key": "setting.mde.keymap_disable.reference_new_reference", "operator": "not_equal", "operand": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
     { "keys": ["super+ctrl+shift+l"], "command": "reference_jump", "context":
         [
+            { "key": "setting.mde.keymap_disable.reference_jump", "operator": "not_equal", "operand": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
@@ -580,6 +584,7 @@
     },
     { "keys": ["alt+shift+6"], "command": "reference_new_footnote", "context":
         [
+            { "key": "setting.mde.keymap_disable.reference_new_footnote", "operator": "not_equal", "operand": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
@@ -601,6 +606,7 @@
     },
     { "keys": ["shift+tab"], "command": "fold_section", "context":
         [
+            { "key": "setting.mde.keymap_disable.fold_section", "operator": "not_equal", "operand": true },
             { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
             { "key": "preceding_text", "operator": "not_regex_match", "operand": "^\\s+", "match_all": true },
             { "key": "following_text", "operator": "not_regex_match", "operand": "^$", "match_all": true },
@@ -609,6 +615,7 @@
     },
     { "keys": ["shift+tab"], "command": "fold_section", "context":
         [
+            { "key": "setting.mde.keymap_disable.fold_section", "operator": "not_equal", "operand": true },
             { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
             { "key": "preceding_text", "operator": "not_regex_match", "operand": "^\\s+", "match_all": true },
             { "key": "selector", "operator": "not_equal", "operand": "markup.list", "match_all": true },
@@ -617,33 +624,39 @@
     },
     { "keys": ["shift+tab"], "command": "fold_section", "context":
         [
+            { "key": "setting.mde.keymap_disable.fold_section", "operator": "not_equal", "operand": true },
             { "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true },
             { "key": "text", "operator": "regex_contains", "operand": "^(#{1,6}(?!#))|^(-{3,}|={3,})$"},
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
     { "keys": ["ctrl+shift+tab"], "command": "show_fold_all_sections", "context":
         [
+            { "key": "setting.mde.keymap_disable.show_fold_all_sections", "operator": "not_equal", "operand": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
     { "keys": ["super+ctrl+pageup"], "command": "goto_previous_heading", "args": {"same_level": true}, "context":
         [
+            { "key": "setting.mde.keymap_disable.goto_previous_heading", "operator": "not_equal", "operand": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
     { "keys": ["super+ctrl+pagedown"], "command": "goto_next_heading", "args": {"same_level": true}, "context":
         [
+            { "key": "setting.mde.keymap_disable.goto_next_heading", "operator": "not_equal", "operand": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
     { "keys": ["super+shift+pageup"], "command": "goto_previous_heading", "args": {"same_level": false}, "context":
         [
+            { "key": "setting.mde.keymap_disable.goto_previous_heading", "operator": "not_equal", "operand": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
     { "keys": ["super+shift+pagedown"], "command": "goto_next_heading", "args": {"same_level": false}, "context":
         [
+            { "key": "setting.mde.keymap_disable.goto_next_heading", "operator": "not_equal", "operand": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     }

diff --git a/Default (Windows).sublime-keymap b/Default (Windows).sublime-keymap
@@ -394,6 +394,7 @@
     // inline image insertion
     { "keys": ["super+shift+k"], "command": "reference_new_inline_image", "context":
         [
+            { "key": "setting.mde.keymap_disable.reference_new_inline_image", "operator": "not_equal", "operand": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
@@ -408,16 +409,19 @@
     // run paste as link command on selected text
     { "keys": ["ctrl+super+v"], "command": "reference_new_inline_link", "context":
         [
+            { "key": "setting.mde.keymap_disable.reference_new_inline_link", "operator": "not_equal", "operand": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
     { "keys": ["ctrl+super+r"], "command": "reference_new_reference", "context":
         [
+            { "key": "setting.mde.keymap_disable.reference_new_reference", "operator": "not_equal", "operand": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
     { "keys": ["ctrl+alt+g"], "command": "reference_jump", "context":
         [
+            { "key": "setting.mde.keymap_disable.reference_jump", "operator": "not_equal", "operand": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
@@ -580,6 +584,7 @@
     },
     { "keys": ["alt+shift+6"], "command": "reference_new_footnote", "context":
         [
+            { "key": "setting.mde.keymap_disable.reference_new_footnote", "operator": "not_equal", "operand": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
@@ -596,6 +601,7 @@
     },
     { "keys": ["shift+tab"], "command": "fold_section", "context":
         [
+            { "key": "setting.mde.keymap_disable.fold_section", "operator": "not_equal", "operand": true },
             { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
             { "key": "preceding_text", "operator": "not_regex_match", "operand": "^\\s+", "match_all": true },
             { "key": "following_text", "operator": "not_regex_match", "operand": "^$", "match_all": true },
@@ -604,6 +610,7 @@
     },
     { "keys": ["shift+tab"], "command": "fold_section", "context":
         [
+            { "key": "setting.mde.keymap_disable.fold_section", "operator": "not_equal", "operand": true },
             { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
             { "key": "preceding_text", "operator": "not_regex_match", "operand": "^\\s+", "match_all": true },
             { "key": "selector", "operator": "not_equal", "operand": "markup.list", "match_all": true },
@@ -612,33 +619,39 @@
     },
     { "keys": ["shift+tab"], "command": "fold_section", "context":
         [
+            { "key": "setting.mde.keymap_disable.fold_section", "operator": "not_equal", "operand": true },
             { "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true },
             { "key": "text", "operator": "regex_contains", "operand": "^(#{1,6}(?!#))|^(-{3,}|={3,})$"},
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
     { "keys": ["ctrl+shift+tab"], "command": "show_fold_all_sections", "context":
         [
+            { "key": "setting.mde.keymap_disable.show_fold_all_sections", "operator": "not_equal", "operand": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
     { "keys": ["ctrl+shift+alt+pageup"], "command": "goto_previous_heading", "args": {"same_level": true}, "context":
         [
+            { "key": "setting.mde.keymap_disable.goto_previous_heading", "operator": "not_equal", "operand": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
     { "keys": ["ctrl+shift+alt+pagedown"], "command": "goto_next_heading", "args": {"same_level": true}, "context":
         [
+            { "key": "setting.mde.keymap_disable.goto_next_heading", "operator": "not_equal", "operand": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
     { "keys": ["ctrl+shift+pageup"], "command": "goto_previous_heading", "args": {"same_level": false}, "context":
         [
+            { "key": "setting.mde.keymap_disable.goto_previous_heading", "operator": "not_equal", "operand": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
     { "keys": ["ctrl+shift+pagedown"], "command": "goto_next_heading", "args": {"same_level": false}, "context":
         [
+            { "key": "setting.mde.keymap_disable.goto_next_heading", "operator": "not_equal", "operand": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     }

diff --git a/Default.sublime-commands b/Default.sublime-commands
@@ -140,5 +140,9 @@
         {
             "same_level" : false
         }
+    },
+    {
+        "caption": "MarkdownEditing: Change color scheme...",
+        "command": "mde_color_activate"
     }
 ]
diff --git a/Main.sublime-menu b/Main.sublime-menu
@@ -15,6 +15,10 @@
                                 "caption": "README",
                                 "command": "open_file"
                             },
+                            {
+                                "caption": "Change color scheme...",
+                                "command": "mde_color_activate"
+                            },
                             {
                                 "caption": "-"
                             },

diff --git a/Markdown (Standard).sublime-settings b/Markdown (Standard).sublime-settings
@@ -90,5 +90,35 @@
 			// optionaly, 2
 			"ol_multi": 1
 		}
-	}
+	},
+
+	// You can opt out some keybinds by setting the corresponding value from 'false' to 'true' (without single-quotes).
+	// Super key references to a key next to left Alt key. It usually has a Windows logo or "win" or "Command" on it.
+	// Jump between link/image/footnote reference and definition
+	// Default keys: (OSX)super+ctrl+shift+l	(Linux/Win)ctrl+alt+g
+	"mde.keymap_disable_reference_jump": false,
+	// Add a new link
+	// Default keys: (OSX)super+alt+r	(Linux/Win)ctrl+super+r
+	"mde.keymap_disable_reference_new_reference": false,
+	// Add a new inline link
+	// Default keys: (OSX)super+alt+v	(Linux/Win)ctrl+super+v
+	"mde.keymap_disable_reference_new_inline_link": false,
+	// Add a new inline image
+	// Default keys: (OSX/Linux/Win)super+shift+k
+	"mde.keymap_disable_reference_new_inline_image": false,
+	// Add a new footnote
+	// Default keys: (OSX/Linux/Win)alt+shift+6
+	"mde.keymap_disable_reference_new_footnote": false,
+	// Fold current section
+	// Default keys: (OSX/Linux/Win)shift+tab
+	"mde.keymap_disable_fold_section": false,
+	// Open a panel showing all functions related to folding
+	// Default keys: (OSX/Linux/Win)ctrl+shift+tab
+	"mde.keymap_disable_show_fold_all_sections": false,
+	// Jump to the next heading (any level/same or higher level)
+	// Default keys: (OSX)super+ctrl/shift+pagedown	(Linux/Win)ctrl+shift(+alt)+pagedown
+	"mde.keymap_disable_goto_next_heading": false,
+	// Jump to the previous heading (any level/same or higher level)
+	// Default keys: (OSX)super+ctrl/shift+pageup	(Linux/Win)ctrl+shift(+alt)+pageup
+	"mde.keymap_disable_goto_previous_heading": false
 }