Skip to content

Commit 9e96fa6

Browse files
author
DeathAxe
committed
Merge branch 'st4-3.1.1'
2 parents ec66bbe + 1ebabea commit 9e96fa6

29 files changed

+8788
-3285
lines changed

‎CONTRIBUTING.md

-6
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,6 @@ Here are the used scopes under 3 different markdown flavors. If you are not sure
105105
* punctuation.definition.string.end.markdown
106106
* punctuation.definition.string.markdown
107107
* punctuation.separator.key-value.markdown
108-
* string.other.link.description.markdown
109-
* string.other.link.description.title.markdown
110-
* string.other.link.title.markdown
111108

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

@@ -168,9 +165,6 @@ Here are the used scopes under 3 different markdown flavors. If you are not sure
168165
* __punctuation.definition.tag.begin.html__
169166
* __punctuation.definition.tag.end.html__
170167
* punctuation.separator.key-value.markdown
171-
* string.other.link.description.markdown
172-
* string.other.link.description.title.markdown
173-
* string.other.link.title.markdown
174168

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

‎Default (Linux).sublime-keymap

+1-1
Original file line numberDiff line numberDiff line change
@@ -1188,7 +1188,7 @@
11881188
// jump to reference
11891189
{ "keys": ["f12"], "command": "mde_reference_jump", "context":
11901190
[
1191-
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown meta.link.reference string.other.link", "match_all": true }
1191+
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown meta.link.reference", "match_all": true }
11921192
]
11931193
},
11941194
{ "keys": ["shift+f12"], "command": "mde_reference_jump", "context":

‎Default (OSX).sublime-keymap

+6-6
Original file line numberDiff line numberDiff line change
@@ -1188,7 +1188,7 @@
11881188
// jump to reference
11891189
{ "keys": ["f12"], "command": "mde_reference_jump", "context":
11901190
[
1191-
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown meta.link.reference string.other.link", "match_all": true }
1191+
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown meta.link.reference", "match_all": true }
11921192
]
11931193
},
11941194
{ "keys": ["shift+f12"], "command": "mde_reference_jump", "context":
@@ -1379,31 +1379,31 @@
13791379
// Wiki
13801380
//
13811381

1382-
{ "keys": ["super+shift+h"], "command": "mde_open_home_page", "context":
1382+
{ "keys": ["super+alt+h"], "command": "mde_open_home_page", "context":
13831383
[
13841384
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
13851385
{ "key": "setting.mde.keymap_disable.open_home_page", "operator": "not_equal", "operand": true }
13861386
]
13871387
},
1388-
{ "keys": ["super+shift+d"], "command": "mde_open_page", "context":
1388+
{ "keys": ["super+alt+d"], "command": "mde_open_page", "context":
13891389
[
13901390
{ "key": "selector", "operator": "equal", "operand": "meta.link.reference.wiki.description.markdown", "match_all": true },
13911391
{ "key": "setting.mde.keymap_disable.open_page", "operator": "not_equal", "operand": true }
13921392
]
13931393
},
1394-
{ "keys": ["super+shift+d"], "command": "mde_make_page_reference", "context":
1394+
{ "keys": ["super+alt+d"], "command": "mde_make_page_reference", "context":
13951395
[
13961396
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - (meta.link | markup.underline.link)", "match_all": true },
13971397
{ "key": "setting.mde.keymap_disable.make_page_reference", "operator": "not_equal", "operand": true }
13981398
]
13991399
},
1400-
{ "keys": ["super+shift+x"], "command": "mde_list_back_links", "context":
1400+
{ "keys": ["super+alt+x"], "command": "mde_list_back_links", "context":
14011401
[
14021402
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
14031403
{ "key": "setting.mde.keymap_disable.list_back_links", "operator": "not_equal", "operand": true }
14041404
]
14051405
},
1406-
{ "keys": ["super+shift+j"], "command": "mde_open_journal", "context":
1406+
{ "keys": ["super+alt+j"], "command": "mde_open_journal", "context":
14071407
[
14081408
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
14091409
{ "key": "setting.mde.keymap_disable.open_journal", "operator": "not_equal", "operand": true }

‎Default (Windows).sublime-keymap

+1-1
Original file line numberDiff line numberDiff line change
@@ -1188,7 +1188,7 @@
11881188
// jump to reference
11891189
{ "keys": ["f12"], "command": "mde_reference_jump", "context":
11901190
[
1191-
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown meta.link.reference string.other.link", "match_all": true }
1191+
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown meta.link.reference", "match_all": true }
11921192
]
11931193
},
11941194
{ "keys": ["shift+f12"], "command": "mde_reference_jump", "context":

‎Preferences.sublime-settings

+10
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,16 @@
4040
// Adds <Tab> after list items instead of a single <space>.
4141
"mde.list_align_text": false,
4242

43+
// MarkdownEditing (References):
44+
// The sorting method used by the Organize References command.
45+
// Should be one of
46+
//
47+
// "reference_order": List in order of appearance in document
48+
// "alphabetical": Alphabetical based on reference name, sorting numerals lexagraphically
49+
// "numeric": Alphabetical based on reference name, sorting numeral chunks numerically
50+
"mde.ref_organize_sort": "reference_order",
51+
"mde.ref_organize_sort_reverse": false,
52+
4353
// MarkdownEditing:
4454
// Automatically switches list bullet when indenting blank list item with <Tab>.
4555
"mde.list_indent_auto_switch_bullet": true,

‎docs/troubleshooting.md

+8-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ To clean up or restore syntax specific settings...
2727
a) To clean up, remove no longer needed overrides.
2828
b) To restore, paste desired settings from following code block.
2929

30-
```json
30+
```jsonc
3131
{
3232
"color_scheme": "MarkdownEditor.sublime-color-scheme",
3333
"tab_size": 4,
@@ -126,10 +126,16 @@ When you notice any undesired behaviour introduced by the latest update, your fe
126126

127127
## Known Bugs
128128

129-
* Setext-style headers (`===` and `---`) do not show up in the symbol list. This is due to a Sublime Text limitation (see [#158][]). However, we are able to put a placeholder to indicate the existence of the header. We encourage you to use Atx-style headers (`#`).
129+
* Setext-style headers (`===` and `---`) show up in the symbol list of Sublime Text 4 only.
130+
They are not supported by Sublime Text 3 (see [#158][]).
131+
132+
* Indended code block highlighting in list blocks is not supported (see [#663][]).
133+
ST's syntax engine can't count indentation, so reliably highlighting indended code blocks in
134+
maybe nested list items is impossible. Use fenced code blocks instead.
130135

131136
* Installing for the first time while having markdown files opened may cause MarkdownEditing to behave unexpectedly on those files. Close and reopen those files to fix it.
132137

133138
[#158]: https://github.com/SublimeText-Markdown/MarkdownEditing/issues/158
139+
[#663]: https://github.com/SublimeText-Markdown/MarkdownEditing/issues/663
134140
[mdereleases]: https://github.com/SublimeText-Markdown/MarkdownEditing/releases
135141
[mdeissues]: https://github.com/SublimeText-Markdown/MarkdownEditing/issues

‎docs/usage.md

+6-4
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,9 @@ Lastly the command to open the *home* page is provided, where the home page is j
344344

345345
| Linux/Windows | MacOS | Description
346346
|---------------|-------|-------------
347-
| <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>H</kbd> | <kbd>⌘</kbd> + <kbd>⌥</kbd> + <kbd>H</kbd> | Open home page
348-
| <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>D</kbd> | <kbd>⌘</kbd> + <kbd>⌥</kbd> + <kbd>D</kbd> | Open wiki page under the cursor
349-
| <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>J</kbd> | <kbd>⌘</kbd> + <kbd>⌥</kbd> + <kbd>J</kbd> | Open journal page for today
350-
| <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>B</kbd> | <kbd>⌘</kbd> + <kbd>⌥</kbd> + <kbd>B</kbd> | List back links
347+
| <kbd>Ctrl</kbd> + <kbd>Alt</kbd> + <kbd>H</kbd> | <kbd>⌘</kbd> + <kbd>⌥</kbd> + <kbd>H</kbd> | Open home page
348+
| <kbd>Ctrl</kbd> + <kbd>Alt</kbd> + <kbd>D</kbd> | <kbd>⌘</kbd> + <kbd>⌥</kbd> + <kbd>D</kbd> | Open wiki page under the cursor
349+
| <kbd>Ctrl</kbd> + <kbd>Alt</kbd> + <kbd>J</kbd> | <kbd>⌘</kbd> + <kbd>⌥</kbd> + <kbd>J</kbd> | Open journal page for today
350+
| <kbd>Ctrl</kbd> + <kbd>Alt</kbd> + <kbd>X</kbd> | <kbd>⌘</kbd> + <kbd>⌥</kbd> + <kbd>B</kbd> | List back links
351+
352+
_Note: The key bindings are disabled via Preferences by default to prevent conflicts with certain keyboard layouts._

‎make.cmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ goto :usage
4141

4242
:LINT
4343
call :venv
44-
black --check .
44+
black .
4545
flake8
4646
goto :eof
4747

‎messages.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,7 @@
3333
"3.0.4": "messages/3.0.4.md",
3434
"3.0.5": "messages/3.0.5.md",
3535
"3.0.6": "messages/3.0.6.md",
36-
"3.0.7": "messages/3.0.7.md"
36+
"3.0.7": "messages/3.0.7.md",
37+
"3.1.0": "messages/3.1.0.md",
38+
"3.1.1": "messages/3.1.1.md"
3739
}

‎messages/3.1.1.md

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# MarkdownEditing 3.1.1 Changelog
2+
3+
Your _MarkdownEditing_ plugin is updated. Enjoy new version. For any type of
4+
feedback you can use [GitHub issues][issues].
5+
6+
## Bug Fixes
7+
8+
* fix regression with latex block highlighting in list items
9+
* fix CommonMark compatibility of backslash escapes
10+
* fix CommonMark compatibility of block quotes
11+
* fix CommonMark compatibility of html entities
12+
* fix CommonMark compatibility of fenced code blocks
13+
* fix CommonMark compatibility of indented code blocks (mixed tabs/spaces)
14+
* fix CommonMark compatibility of reference definitions
15+
* fix CommonMark compatibility of thematic breaks
16+
* fix `mde_convert_inline_link_to_reference` producing duplicate definitions (fixes #559)
17+
* update strikethough markup to use 2 tildes (fixes #637)
18+
* restore link/image/reference description colors for Mariana/Monokai (fixes #670)
19+
* fix strikethrough colors in Monokai/Mariana (fixes #678)
20+
* fix wiki link bindings and their docs (see #679)
21+
22+
## New Features
23+
24+
* `Organize References` learned to sort reference definitions using `"mde.ref_organize_sort"` setting
25+
26+
## Changes
27+
28+
* Fully support xonsh fenced code instead of using Python syntax
29+
(if supported syntax is installed)
30+
* Removes indended code block highlighting from list blocks (fixes #663)
31+
ST's syntax engine can't count indentation, so reliably highlighting
32+
indended code blocks in maybe nested list items is impossible.
33+
Use fenced code blocks instead.
34+
35+
[issues]: https://github.com/SublimeText-Markdown/MarkdownEditing/issues

0 commit comments

Comments
 (0)