Skip to content

Commit

Permalink
Merge pull request #2 from SublimeText-Markdown/master
Browse files Browse the repository at this point in the history 
merge update v2.1.0
  • Loading branch information
@felixhao28
felixhao28 committed Feb 25, 2015
2 parents 6dab64e + cb87a0b commit ce46c03
Show file tree
Hide file tree
Showing 23 changed files with 1,967 additions and 98 deletions.
21 changes: 21 additions & 0 deletions Default (Linux).sublime-keymap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,14 @@
{ "key": "selector", "operator": "not_equal", "operand": "markup.raw", "match_all": true }
]
},
{ "keys": ["tab"], "command": "indent_list_multiitem", "context":
[
{ "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true },
{ "key": "preceding_text", "operator": "regex_contains", "operand": "^\\s*(>\\s*)?[*+\\-]\\s+(.*)$", "match_all": true },
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
{ "key": "selector", "operator": "not_equal", "operand": "markup.raw", "match_all": true }
]
},
{ "keys": ["shift+tab"], "command": "indent_list_item", "args": {"reverse": true}, "context":
[
{ "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
Expand All @@ -75,6 +83,14 @@
{ "key": "selector", "operator": "not_equal", "operand": "markup.raw", "match_all": true }
]
},
{ "keys": ["shift+tab"], "command": "indent_list_multiitem", "args": {"reverse": true}, "context":
[
{ "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true },
{ "key": "preceding_text", "operator": "regex_contains", "operand": "^\\s*(>\\s*)?[*+\\-]\\s+(.*)$", "match_all": true },
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
{ "key": "selector", "operator": "not_equal", "operand": "markup.raw", "match_all": true }
]
},
{ "keys": ["_"], "command": "insert_snippet", "args": {"contents": "_$0_"}, "context":
[
{ "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
Expand Down Expand Up @@ -636,5 +652,10 @@
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
{ "key": "preceding_text", "operator": "regex_contains", "operand": "(> )+", "match_all": true }
]
},
{ "keys": ["ctrl+shift+m"], "command": "lint", "context":
[
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
]
}
]
21 changes: 21 additions & 0 deletions Default (OSX).sublime-keymap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,14 @@
{ "key": "selector", "operator": "not_equal", "operand": "markup.raw", "match_all": true }
]
},
{ "keys": ["tab"], "command": "indent_list_multiitem", "context":
[
{ "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true },
{ "key": "preceding_text", "operator": "regex_contains", "operand": "^\\s*(>\\s*)?[*+\\-]\\s+(.*)$", "match_all": true },
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
{ "key": "selector", "operator": "not_equal", "operand": "markup.raw", "match_all": true }
]
},
{ "keys": ["shift+tab"], "command": "indent_list_item", "args": {"reverse": true}, "context":
[
{ "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
Expand All @@ -75,6 +83,14 @@
{ "key": "selector", "operator": "not_equal", "operand": "markup.raw", "match_all": true }
]
},
{ "keys": ["shift+tab"], "command": "indent_list_multiitem", "args": {"reverse": true}, "context":
[
{ "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true },
{ "key": "preceding_text", "operator": "regex_contains", "operand": "^\\s*(>\\s*)?[*+\\-]\\s+(.*)$", "match_all": true },
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
{ "key": "selector", "operator": "not_equal", "operand": "markup.raw", "match_all": true }
]
},
{ "keys": ["_"], "command": "insert_snippet", "args": {"contents": "_$0_"}, "context":
[
{ "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
Expand Down Expand Up @@ -636,5 +652,10 @@
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
{ "key": "preceding_text", "operator": "regex_contains", "operand": "(> )+", "match_all": true }
]
},
{ "keys": ["super+shift+m"], "command": "lint", "context":
[
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
]
}
]
21 changes: 21 additions & 0 deletions Default (Windows).sublime-keymap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,14 @@
{ "key": "selector", "operator": "not_equal", "operand": "markup.raw", "match_all": true }
]
},
{ "keys": ["tab"], "command": "indent_list_multiitem", "context":
[
{ "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true },
{ "key": "preceding_text", "operator": "regex_contains", "operand": "^\\s*(>\\s*)?[*+\\-]\\s+(.*)$", "match_all": true },
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
{ "key": "selector", "operator": "not_equal", "operand": "markup.raw", "match_all": true }
]
},
{ "keys": ["shift+tab"], "command": "indent_list_item", "args": {"reverse": true}, "context":
[
{ "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
Expand All @@ -75,6 +83,14 @@
{ "key": "selector", "operator": "not_equal", "operand": "markup.raw", "match_all": true }
]
},
{ "keys": ["shift+tab"], "command": "indent_list_multiitem", "args": {"reverse": true}, "context":
[
{ "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true },
{ "key": "preceding_text", "operator": "regex_contains", "operand": "^\\s*(>\\s*)?[*+\\-]\\s+(.*)$", "match_all": true },
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
{ "key": "selector", "operator": "not_equal", "operand": "markup.raw", "match_all": true }
]
},
{ "keys": ["_"], "command": "insert_snippet", "args": {"contents": "_$0_"}, "context":
[
{ "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
Expand Down Expand Up @@ -636,5 +652,10 @@
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
{ "key": "preceding_text", "operator": "regex_contains", "operand": "(> )+", "match_all": true }
]
},
{ "keys": ["ctrl+shift+m"], "command": "lint", "context":
[
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
]
}
]
4 changes: 4 additions & 0 deletions Default.sublime-commands
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,9 @@
{
"file": "${packages}/User/Markdown.sublime-settings"
}
},
{
"caption": "MarkdownEditing: Markdown Lint",
"command": "lint"
}
]
166 changes: 121 additions & 45 deletions Main.sublime-menu
View file
Original file line number Diff line number Diff line change
@@ -1,74 +1,150 @@
[
{
"caption": "Preferences",
"mnemonic": "n",
"id": "preferences",
"children":
[
"children": [
{
"caption": "Package Settings",
"mnemonic": "P",
"id": "package-settings",
"children":
[
"children": [
{
"caption": "Markdown Editing",
"children":
[
"children": [
{
"args": {
"file": "${packages}/MarkdownEditing/README.md"
},
"caption": "README",
"command": "open_file"
},
{
"caption": "-"
},
{
"args": {
"file": "${packages}/MarkdownEditing/Bold and Italic Markers.tmPreferences"
},
"caption": "Bold and Italic Settings \u2013 Default",
"command": "open_file"
},
{
"args": {
"file": "${packages}/User/Bold and Italic Markers.tmPreferences"
},
"caption": "Bold and Italic Settings \u2013 User",
"command": "open_file"
},
{
"caption": "-"
},
{
"args": {
"file": "${packages}/MarkdownEditing/Markdown.sublime-settings"
},
"caption": "Markdown GFM Settings \u2013 Default",
"command": "open_file"
},
{
"command": "open_file",
"args": {"file": "${packages}/MarkdownEditing/README.md"},
"caption": "README"
"args": {
"file": "${packages}/User/Markdown.sublime-settings"
},
"caption": "Markdown GFM Settings \u2013 User",
"command": "open_file"
},
{ "caption": "-" },
{
"command": "open_file",
"args": {"file": "${packages}/MarkdownEditing/Bold and Italic Markers.tmPreferences"},
"caption": "Bold and Italic Settings – Default"
"caption": "-"
},
{
"command": "open_file",
"args": {"file": "${packages}/User/Bold and Italic Markers.tmPreferences"},
"caption": "Bold and Italic Settings – User"
"args": {
"file": "${packages}/MarkdownEditing/Markdown (Standard).sublime-settings"
},
"caption": "Markdown (Standard) Settings \u2013 Default",
"command": "open_file"
},
{ "caption": "-" },
{
"command": "open_file",
"args": {"file": "${packages}/MarkdownEditing/Markdown.sublime-settings"},
"caption": "Markdown GFM Settings – Default"
"args": {
"file": "${packages}/User/Markdown (Standard).sublime-settings"
},
"caption": "Markdown (Standard) Settings \u2013 User",
"command": "open_file"
},
{
"command": "open_file",
"args": {"file": "${packages}/User/Markdown.sublime-settings"},
"caption": "Markdown GFM Settings – User"
"caption": "-"
},
{ "caption": "-" },
{
"command": "open_file",
"args": {"file": "${packages}/MarkdownEditing/Markdown (Standard).sublime-settings"},
"caption": "Markdown (Standard) Settings – Default"
"args": {
"file": "${packages}/MarkdownEditing/MultiMarkdown.sublime-settings"
},
"caption": "MultiMarkdown Settings \u2013 Default",
"command": "open_file"
},
{
"command": "open_file",
"args": {"file": "${packages}/User/Markdown (Standard).sublime-settings"},
"caption": "Markdown (Standard) Settings – User"
"args": {
"file": "${packages}/User/MultiMarkdown.sublime-settings"
},
"caption": "MultiMarkdown Settings \u2013 User",
"command": "open_file"
},
{ "caption": "-" },
{
"command": "open_file",
"args": {"file": "${packages}/MarkdownEditing/MultiMarkdown.sublime-settings"},
"caption": "MultiMarkdown Settings – Default"
"caption": "-"
},
{
"command": "open_file",
"args": {"file": "${packages}/User/MultiMarkdown.sublime-settings"},
"caption": "MultiMarkdown Settings – User"
"args": {
"file": "${packages}/MarkdownEditing/Default (Windows).sublime-keymap",
"platform": "Windows"
},
"caption": "Key Bindings \u2013 Default",
"command": "open_file"
},
{ "caption": "-" }
{
"args": {
"file": "${packages}/MarkdownEditing/Default (OSX).sublime-keymap",
"platform": "OSX"
},
"caption": "Key Bindings \u2013 Default",
"command": "open_file"
},
{
"args": {
"file": "${packages}/MarkdownEditing/Default (Linux).sublime-keymap",
"platform": "Linux"
},
"caption": "Key Bindings \u2013 Default",
"command": "open_file"
},
{
"args": {
"file": "${packages}/User/Default (Windows).sublime-keymap",
"platform": "Windows"
},
"caption": "Key Bindings \u2013 User",
"command": "open_file"
},
{
"args": {
"file": "${packages}/User/Default (OSX).sublime-keymap",
"platform": "OSX"
},
"caption": "Key Bindings \u2013 User",
"command": "open_file"
},
{
"args": {
"file": "${packages}/User/Default (Linux).sublime-keymap",
"platform": "Linux"
},
"caption": "Key Bindings \u2013 User",
"command": "open_file"
},
{
"caption": "-"
}
]
}
]
],
"id": "package-settings",
"mnemonic": "P"
}
]
],
"id": "preferences",
"mnemonic": "n"
}
]
]
36 changes: 34 additions & 2 deletions Markdown (Standard).sublime-settings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,44 @@
// List bullets to be used for automatically switching. In their order.
"mde.list_indent_bullets": ["*", "-", "+"],

// Allways keep current line vertically centered.
// Always keep current line vertically centered.
"mde.keep_centered": false,

// Distraction free mode improvements. In order these to work, you have to install
// Distraction free mode improvements. In order for these to work, you have to install
// FullScreenStatus plugin: https://github.com/maliayas/SublimeText_FullScreenStatus
"mde.distraction_free_mode": {
"mde.keep_centered": true
},

"lint":{
// disabled rules, e.g. "md001".
"disable": ["md013"],
// Options:
// atx, ## title only
// atx_closed, ## title ## only
// setext, title only
// =====
// any, consistent within the document
"md003": "any",
// Options:
// asterisk, * only
// plus, + only
// dash, - only
// cyclic, different symbols on different levels
// and same symbol on same level
// single, same symbol on different levels
// any, same symbol on same level
"md004": "cyclic",
// Number of spaces per list indent. Set to 0 to use Sublime tab_size instead
"md007": 0,
// Maximum line length, Set to 0 to use Sublime wrap_width instead
"md013": 0,
// Disallowed trailing punctuation in headers
"md026": ".,;:!",
// Options:
// one, '1.' only
// ordered, ascending number
// any, consistent within one list
"md029": "any"
}
}
Loading

0 comments on commit ce46c03

Please sign in to comment.