Bugfixes, added alt modifier to almost everything to avoid conflicts …

…with default keybindings
jngeist · Jul 28, 2012 · d5bd8fb · d5bd8fb
1 parent aac8757
commit d5bd8fb
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 44 deletions.
diff --git a/Default (OSX).sublime-keymap b/Default (OSX).sublime-keymap
@@ -92,7 +92,7 @@
         ]
     },
     // Bold on ⌘B
-    { "keys": ["super+b"], "command": "insert_snippet", "args": {"contents": "**$0**"}, "context":
+    { "keys": ["super+alt+b"], "command": "insert_snippet", "args": {"contents": "**$0**"}, "context":
      [
          { "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
          { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
@@ -102,15 +102,15 @@
          { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
      ]
     },
-    { "keys": ["super+b"], "command": "insert_snippet", "args": {"contents": "${0:**$SELECTION**}"}, "context":
+    { "keys": ["super+alt+b"], "command": "insert_snippet", "args": {"contents": "${0:**$SELECTION**}"}, "context":
         [
             { "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
             { "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
     // italics on ⌘I
-    { "keys": ["super+i"], "command": "insert_snippet", "args": {"contents": "*$0*"}, "context":
+    { "keys": ["super+alt+i"], "command": "insert_snippet", "args": {"contents": "*$0*"}, "context":
      [
          { "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
          { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
@@ -120,15 +120,15 @@
          { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
      ]
     },
-    { "keys": ["super+i"], "command": "insert_snippet", "args": {"contents": "${0:*$SELECTION*}"}, "context":
+    { "keys": ["super+alt+i"], "command": "insert_snippet", "args": {"contents": "${0:*$SELECTION*}"}, "context":
         [
             { "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
             { "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
     // inline link insertion
-    { "keys": ["super+k"], "command": "insert_snippet", "args": {"contents": "[$1]($0)"}, "context":
+    { "keys": ["super+alt+k"], "command": "insert_snippet", "args": {"contents": "[$1]($0)"}, "context":
      [
          { "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
          { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
@@ -138,7 +138,7 @@
          { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
      ]
     },
-    { "keys": ["super+k"], "command": "insert_snippet", "args": {"contents": "[$SELECTION]($0)"}, "context":
+    { "keys": ["super+alt+k"], "command": "insert_snippet", "args": {"contents": "[$SELECTION]($0)"}, "context":
         [
             { "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
             { "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true },
@@ -192,7 +192,7 @@
        ]
     },
     // selection pairing with SPACE by Gabe Weatherhead
-    { "keys": ["super+shift+space"], "command": "insert_snippet", "args": {"contents": " ${0:$SELECTION} "}, "context":
+    { "keys": ["ctrl+alt+space"], "command": "insert_snippet", "args": {"contents": " ${0:$SELECTION} "}, "context":
        [
            { "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
            { "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true },

diff --git a/MarkdownEditor-Focus.tmTheme b/MarkdownEditor-Focus.tmTheme
@@ -784,6 +784,30 @@
                 <string>#AAAAAA</string>
             </dict>
         </dict>
+        <dict>
+            <key>name</key>
+            <string>Block Cursor</string>
+            <key>scope</key>
+            <string>block_cursor</string>
+            <key>settings</key>
+            <dict>
+                <key>foreground</key>
+                <string>#212121</string>
+                <key>background</key>
+                <string>#00bdff77</string>
+            </dict>
+        </dict>
+        <dict>
+            <key>name</key>
+            <string>Brackets</string>
+            <key>scope</key>
+            <string>entity.name.class</string>
+            <key>settings</key>
+            <dict>
+                <key>background</key>
+                <string>#d5f6ff88</string>
+            </dict>
+        </dict>
     </array>
     <key>uuid</key>
     <string>BF4E1964-0DB9-4E88-8142-E8F52D7EDEEC</string>

diff --git a/MarkdownEditor.tmTheme b/MarkdownEditor.tmTheme
@@ -390,7 +390,7 @@
             <key>settings</key>
             <dict>
                 <key>foreground</key>
-                <string>#AAAAAA</string>
+                <string>#777777</string>
             </dict>
         </dict>
         <dict>
@@ -807,6 +807,17 @@
                 <string>#00bdff77</string>
             </dict>
         </dict>
+        <dict>
+            <key>name</key>
+            <string>Brackets</string>
+            <key>scope</key>
+            <string>entity.name.class</string>
+            <key>settings</key>
+            <dict>
+                <key>background</key>
+                <string>#d5f6ff88</string>
+            </dict>
+        </dict>
     </array>
     <key>uuid</key>
     <string>BF4E1964-0DB9-4E88-8142-E8F52D7EDEEC</string>

diff --git a/MultiMarkdown.sublime-settings.orig b/MultiMarkdown.sublime-settings.orig
diff --git a/README.md b/README.md
@@ -12,14 +12,9 @@ This package will make MarkdownEditor your default theme for Markdown/MultiMarkd
 * Left bracket pairing is modified to eliminate the selection and leave the cursor at a point where you can insert a `[]` or `()` pair for a link
 * ⌘⌥V will paste the contents of the clipboard as an inline link on selected text
 * ⌘⌥R will paste the contents of the clipboard as a reference link
-* ⌘K inserts a standard inline link, ⌘⇧K inserts an inline image
-* ⌘B and ⌘I are bound to bold and italics (Markdown). *If you don't like losing your default shortcut for "Build", modify the sublime-keymap file.*
-* Typing "#" when there's a selection will surroung it with "#" to make it a headline. Multiple presses add additional hashes, increasing the level of the header. Finish with Cmd-Shift-Space to add padding around the selection. (Contributed by [Gabe](http://www.macdrifter.com))
+* ⌘⌥K inserts a standard inline link, ⌘⇧K inserts an inline image
+* ⌘⌥B and ⌘⌥I are bound to bold and italics (Markdown).
+* Typing "#" when there's a selection will surroung it with "#" to make it a headline. Multiple presses add additional hashes, increasing the level of the header. Finish with Ctrl-Opt-Space to add padding around the selection. (Contributed by [Gabe](http://www.macdrifter.com))
 
 There's a long way to go and I have a lot of Python to learn.
 
-| Table Header 1 | Table Header 2 | Table Header 3 |
-| -------------- | -------------- | -------------- |
-| Division 1 | Division 2 | Division 3 |
-| Division 1 | Division 2 | Division 3 |
-| Division 1 | Division 2 | Division 3 |
diff --git a/packages.json b/packages.json
@@ -6,7 +6,7 @@
             "description": "The beginnings of a Markdown editing bundle for Sublime Text 2",
             "author": "Brett Terpstra (@ttscoff)",
             "homepage": "https://github.com/ttscoff/MarkdownEditing",
-            "last_modified": "2012-07-18 05:31:00",
+            "last_modified": "2012-07-28 12:04:00",
             "platforms": {
                 "osx": [
                     {