Skip to content

Commit

Permalink
Merge pull request #310 from SublimeText-Markdown/v2.1.5
Browse files Browse the repository at this point in the history 
Version 2.1.5
  • Loading branch information
@felixhao28
felixhao28 committed Mar 4, 2016
2 parents e55f752 + aeb0075 commit 1d70bc8
Show file tree
Hide file tree
Showing 30 changed files with 948 additions and 571 deletions.
131 changes: 131 additions & 0 deletions CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,134 @@ Each milestone will have a pull request that will be kept open until the milesto
When the milestone is completed, push-access users can publish the new version to the Package Control. Creating the new version __tag__ on the GitHub repository is enough for this. For example, if the name of the milestone is `v2.0.4`, the tag should be `2.0.4`.

The update process may take __up to an hour__ depending on the crawl frequency by the Package Control.

## Contributing to themes

Here are the used scopes under 3 different markdown flavors. If you are not sure about how the scopes are used, checkout .tmlanguage files or ask in issues. __Unique__ scopes are marked as bold.

### ScopeName: text.html.markdown

* constant.character.escape.markdown
* constant.other.reference.link.markdown
* invalid.illegal.whitespace.markdown
* markup.bold.markdown
* markup.bold_italic.markdown
* markup.heading.1.markdown
* markup.heading.2.markdown
* markup.heading.markdown
* markup.italic.markdown
* markup.list.numbered.markdown
* markup.list.unnumbered.markdown
* markup.quote.markdown
* markup.raw.block.markdown
* markup.raw.inline.content.markdown
* markup.raw.inline.markdown
* markup.underline.link.image.markdown
* markup.underline.link.markdown
* meta.block-level.markdown
* meta.disable-markdown
* meta.dummy.line-break
* meta.image.inline.markdown
* meta.image.reference.markdown
* meta.link.email.lt-gt.markdown
* meta.link.inet.markdown
* meta.link.inline.markdown
* meta.link.reference.def.markdown
* meta.link.reference.literal.markdown
* meta.link.reference.markdown
* meta.other.valid-ampersand.markdown
* meta.other.valid-bracket.markdown
* meta.paragraph.list.markdown
* meta.paragraph.markdown
* meta.separator.markdown
* punctuation.definition.blockquote.markdown
* punctuation.definition.bold.markdown
* punctuation.definition.constant.begin.markdown
* punctuation.definition.constant.end.markdown
* punctuation.definition.constant.markdown
* punctuation.definition.heading.markdown
* punctuation.definition.italic.markdown
* punctuation.definition.link.markdown
* punctuation.definition.list_item.markdown
* __punctuation.definition.list_item.number.markdown__
* punctuation.definition.metadata.markdown
* punctuation.definition.raw.markdown
* punctuation.definition.string.begin.markdown
* punctuation.definition.string.end.markdown
* punctuation.definition.string.markdown
* punctuation.separator.key-value.markdown
* string.other.link.description.markdown
* string.other.link.description.title.markdown
* string.other.link.title.markdown

### ScopeName: text.html.markdown.gfm

* constant.character.escape.markdown
* constant.other.reference.link.markdown
* __entity.name.tag.other.html__
* invalid.illegal.whitespace.markdown
* markup.bold.markdown
* markup.bold_italic.markdown
* markup.heading.1.markdown
* markup.heading.2.markdown
* markup.heading.markdown
* markup.italic.markdown
* __markup.kbd.content.markdown__
* __markup.kbd.markdown__
* markup.list.numbered.markdown
* markup.list.unnumbered.markdown
* markup.quote.markdown
* __markup.raw.block.fenced.markdown__
* markup.raw.block.markdown
* markup.raw.inline.content.markdown
* markup.raw.inline.markdown
* __markup.strikethrough.markdown__
* markup.underline.link.image.markdown
* markup.underline.link.markdown
* meta.block-level.markdown
* meta.disable-markdown
* meta.dummy.line-break
* meta.image.inline.markdown
* meta.image.reference.markdown
* meta.link.email.lt-gt.markdown
* meta.link.inet.markdown
* meta.link.inline.markdown
* meta.link.reference.def.markdown
* meta.link.reference.literal.markdown
* meta.link.reference.markdown
* meta.other.valid-ampersand.markdown
* meta.other.valid-bracket.markdown
* meta.paragraph.list.markdown
* meta.paragraph.markdown
* meta.separator.markdown
* __meta.tag.other.html__
* punctuation.definition.blockquote.markdown
* punctuation.definition.bold.markdown
* punctuation.definition.constant.begin.markdown
* punctuation.definition.constant.end.markdown
* punctuation.definition.constant.markdown
* punctuation.definition.heading.markdown
* punctuation.definition.italic.markdown
* punctuation.definition.link.markdown
* punctuation.definition.list_item.markdown
* punctuation.definition.metadata.markdown
* punctuation.definition.raw.markdown
* __punctuation.definition.strikethrough.markdown__
* punctuation.definition.string.begin.markdown
* punctuation.definition.string.end.markdown
* punctuation.definition.string.markdown
* __punctuation.definition.tag.begin.html__
* __punctuation.definition.tag.end.html__
* punctuation.separator.key-value.markdown
* string.other.link.description.markdown
* string.other.link.description.title.markdown
* string.other.link.title.markdown

### ScopeName: text.html.markdown.multimarkdown

* <All scopes under text.html.markdown.gfm>
* __keyword.other.multimarkdown__
* __punctuation.separator.key-value.multimarkdown__
* __meta.header.multimarkdown__
* __string.unquoted.multimarkdown__
* __meta.content.multimarkdown__
88 changes: 16 additions & 72 deletions Default (Linux).sublime-keymap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -344,11 +344,20 @@
{ "key": "selector", "operator": "not_equal", "operand": "markup.raw", "match_all": true }
]
},
// Extend Numbered Reference
{ "keys": ["enter"], "command": "number_list_reference", "context":
[
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
{ "key": "preceding_text", "operator": "regex_contains", "operand": "^(\\s*\\[(\\d+)\\]:\\s*)\\S.*", "match_all": true },
{ "key": "auto_complete_visible", "operator": "equal", "operand": false },
{ "key": "selector", "operator": "not_equal", "operand": "markup.raw", "match_all": true }
]
},
// Remove empty list item
{ "keys": ["enter"], "command": "run_macro_file", "args": {"file": "Packages/MarkdownEditing/macros/Remove Empty List Item.sublime-macro"}, "context":
[
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
{ "key": "preceding_text", "operator": "regex_contains", "operand": "^(\\s*([*\\-+]|\\d+\\.)\\s+)$", "match_all": true },
{ "key": "preceding_text", "operator": "regex_contains", "operand": "^(\\s*(\\[\\d+\\]:|[*\\-+]|\\d+\\.)\\s+)$", "match_all": true },
{ "key": "following_text", "operator": "regex_contains", "operand": "^\\s*$", "match_all": true },
{ "key": "auto_complete_visible", "operator": "equal", "operand": false },
{ "key": "selector", "operator": "not_equal", "operand": "markup.raw", "match_all": true }
Expand All @@ -370,16 +379,6 @@
{ "key": "selector", "operator": "not_equal", "operand": "markup.raw", "match_all": true }
]
},
{ "keys": ["alt+shift+g"], "command": "gather_missing_link_markers", "context":
[
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
]
},
{ "keys": ["alt+shift+f"], "command": "gather_missing_footnotes", "context":
[
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
]
},
{ "keys": ["tab"], "command": "complete_underlined_header", "context":
[
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
Expand All @@ -390,42 +389,12 @@
]
},

// inline link insertion
{ "keys": ["ctrl+super+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 },
{ "key": "following_text", "operator": "regex_contains", "operand": "^(?:\t| |\\)|]|\\}|$)", "match_all": true },
{ "key": "preceding_text", "operator": "not_regex_contains", "operand": "['a-zA-Z0-9_]$", "match_all": true },
{ "key": "eol_selector", "operator": "not_equal", "operand": "string.quoted.single", "match_all": true },
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
]
},
{ "keys": ["ctrl+super+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 },
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
]
},
// inline image insertion
{ "keys": ["super+shift+k"], "command": "insert_snippet", "args": {"contents": "![$1]($0)"}, "context":
{ "keys": ["super+shift+k"], "command": "reference_new_inline_image", "context":
[
{ "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
{ "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
{ "key": "following_text", "operator": "regex_contains", "operand": "^(?:\t| |\\)|]|\\}|$)", "match_all": true },
{ "key": "preceding_text", "operator": "not_regex_contains", "operand": "['a-zA-Z0-9_]$", "match_all": true },
{ "key": "eol_selector", "operator": "not_equal", "operand": "string.quoted.single", "match_all": true },
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
]
},
{ "keys": ["super+shift+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 },
{ "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":
[
Expand All @@ -435,32 +404,17 @@
]
},
// run paste as link command on selected text
{ "keys": ["ctrl+super+v"], "command": "paste_as_link", "context":
[
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
]
},
{ "keys": ["ctrl+super+r"], "command": "paste_as_reference", "context":
[
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
]
},
{ "keys": ["alt+ctrl+r"], "command": "insert_named_reference", "context":
[
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
]
},
{ "keys": ["super+ctrl+shift+r"], "command": "insert_numbered_reference", "context":
{ "keys": ["ctrl+super+v"], "command": "reference_new_inline_link", "context":
[
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
]
},
{ "keys": ["ctrl+alt+l"], "command": "list_markdown_references", "context":
{ "keys": ["ctrl+super+r"], "command": "reference_new_reference", "context":
[
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
]
},
{ "keys": ["ctrl+alt+g"], "command": "goto_reference", "context":
{ "keys": ["ctrl+alt+g"], "command": "reference_jump", "context":
[
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
]
Expand Down Expand Up @@ -622,17 +576,12 @@
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
]
},
{ "keys": ["ctrl+shift+6"], "command": "magic_footnotes", "context":
{ "keys": ["alt+shift+6"], "command": "reference_new_footnote", "context":
[
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
]
},
{ "keys": ["alt+shift+6"], "command": "insert_footnote", "context":
[
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
]
},
{ "keys": ["ctrl+alt+s"], "command": "sort_footnotes", "context":
{ "keys": ["ctrl+alt+s"], "command": "reference_organize", "context":
[
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
]
Expand All @@ -647,10 +596,5 @@
{ "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 }
]
}
]
Loading

0 comments on commit 1d70bc8

Please sign in to comment.