Skip to content

Commit 72a23cd

Browse files
deathaxedeathaxe
committed
Merge branch 'st4-develop'
2 parents d6b74ed + f2059eb commit 72a23cd

23 files changed

Lines changed: 678 additions & 326 deletions

‎.github/workflows/ci-syntax-tests.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,15 @@ on:
2323
jobs:
2424
syntax_tests:
2525
name: Sublime Text ${{ matrix.build }}
26+
runs-on: ubuntu-18.04
27+
timeout-minutes: 15 # default is 6 hours!
2628
strategy:
2729
matrix:
2830
include:
2931
- build: 4107
3032
default_packages: v4107
3133
- build: latest
3234
default_packages: master
33-
runs-on: ubuntu-latest
3435
steps:
3536
- uses: actions/checkout@v2
3637
- uses: SublimeText/syntax-test-action@v2

‎.github/workflows/ci-unit-tests.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ on:
2121
jobs:
2222
test:
2323
name: Sublime Text ${{ matrix.st_version }}
24-
runs-on: ubuntu-latest
24+
runs-on: ubuntu-18.04
25+
timeout-minutes: 15 # default is 6 hours!
2526
strategy:
2627
fail-fast: false
2728
matrix:
@@ -35,6 +36,7 @@ jobs:
3536
- uses: actions/checkout@v1
3637
- run: sh -e /etc/init.d/xvfb start
3738
- run: curl -OL https://raw.githubusercontent.com/SublimeText/UnitTesting/master/sbin/github.sh
39+
- run: apt-get update
3840
- run: |
3941
PATH="$HOME/.local/bin:$PATH"
4042
sh github.sh bootstrap

‎Default (Linux).sublime-keymap‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1385,28 +1385,28 @@
13851385
{ "key": "setting.mde.keymap_disable.open_home_page", "operator": "not_equal", "operand": true }
13861386
]
13871387
},
1388-
{ "keys": ["ctrl+alt+d"], "command": "mde_open_page", "context":
1388+
{ "keys": ["ctrl+alt+j"], "command": "mde_open_journal", "context":
13891389
[
1390-
{ "key": "selector", "operator": "equal", "operand": "meta.link.reference.wiki.description.markdown", "match_all": true },
1391-
{ "key": "setting.mde.keymap_disable.open_page", "operator": "not_equal", "operand": true }
1390+
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
1391+
{ "key": "setting.mde.keymap_disable.open_journal", "operator": "not_equal", "operand": true }
13921392
]
13931393
},
1394-
{ "keys": ["ctrl+alt+d"], "command": "mde_make_page_reference", "context":
1394+
{ "keys": ["f12"], "command": "mde_open_page", "context":
13951395
[
1396-
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - (meta.link | markup.underline.link)", "match_all": true },
1397-
{ "key": "setting.mde.keymap_disable.make_page_reference", "operator": "not_equal", "operand": true }
1396+
{ "key": "selector", "operator": "equal", "operand": "meta.link.reference.wiki.description.markdown", "match_all": true },
1397+
{ "key": "setting.mde.keymap_disable.open_page", "operator": "not_equal", "operand": true }
13981398
]
13991399
},
1400-
{ "keys": ["ctrl+alt+x"], "command": "mde_list_back_links", "context":
1400+
{ "keys": ["shift+f12"], "command": "mde_list_back_links", "context":
14011401
[
1402-
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
1402+
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - (meta.link | markup.underline.link | variable)", "match_all": true },
14031403
{ "key": "setting.mde.keymap_disable.list_back_links", "operator": "not_equal", "operand": true }
14041404
]
14051405
},
1406-
{ "keys": ["ctrl+alt+j"], "command": "mde_open_journal", "context":
1406+
{ "keys": ["ctrl+alt+d"], "command": "mde_make_page_reference", "context":
14071407
[
1408-
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
1409-
{ "key": "setting.mde.keymap_disable.open_journal", "operator": "not_equal", "operand": true }
1408+
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - (meta.link | markup.underline.link)", "match_all": true },
1409+
{ "key": "setting.mde.keymap_disable.make_page_reference", "operator": "not_equal", "operand": true }
14101410
]
14111411
}
14121412
]

‎Default (OSX).sublime-keymap‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1385,28 +1385,28 @@
13851385
{ "key": "setting.mde.keymap_disable.open_home_page", "operator": "not_equal", "operand": true }
13861386
]
13871387
},
1388-
{ "keys": ["super+alt+d"], "command": "mde_open_page", "context":
1388+
{ "keys": ["super+alt+j"], "command": "mde_open_journal", "context":
13891389
[
1390-
{ "key": "selector", "operator": "equal", "operand": "meta.link.reference.wiki.description.markdown", "match_all": true },
1391-
{ "key": "setting.mde.keymap_disable.open_page", "operator": "not_equal", "operand": true }
1390+
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
1391+
{ "key": "setting.mde.keymap_disable.open_journal", "operator": "not_equal", "operand": true }
13921392
]
13931393
},
1394-
{ "keys": ["super+alt+d"], "command": "mde_make_page_reference", "context":
1394+
{ "keys": ["f12"], "command": "mde_open_page", "context":
13951395
[
1396-
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - (meta.link | markup.underline.link)", "match_all": true },
1397-
{ "key": "setting.mde.keymap_disable.make_page_reference", "operator": "not_equal", "operand": true }
1396+
{ "key": "selector", "operator": "equal", "operand": "meta.link.reference.wiki.description.markdown", "match_all": true },
1397+
{ "key": "setting.mde.keymap_disable.open_page", "operator": "not_equal", "operand": true }
13981398
]
13991399
},
1400-
{ "keys": ["super+alt+x"], "command": "mde_list_back_links", "context":
1400+
{ "keys": ["shift+f12"], "command": "mde_list_back_links", "context":
14011401
[
1402-
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
1402+
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - (meta.link | markup.underline.link | variable)", "match_all": true },
14031403
{ "key": "setting.mde.keymap_disable.list_back_links", "operator": "not_equal", "operand": true }
14041404
]
14051405
},
1406-
{ "keys": ["super+alt+j"], "command": "mde_open_journal", "context":
1406+
{ "keys": ["super+alt+d"], "command": "mde_make_page_reference", "context":
14071407
[
1408-
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
1409-
{ "key": "setting.mde.keymap_disable.open_journal", "operator": "not_equal", "operand": true }
1408+
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - (meta.link | markup.underline.link)", "match_all": true },
1409+
{ "key": "setting.mde.keymap_disable.make_page_reference", "operator": "not_equal", "operand": true }
14101410
]
14111411
}
14121412
]

‎Default (Windows).sublime-keymap‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1385,28 +1385,28 @@
13851385
{ "key": "setting.mde.keymap_disable.open_home_page", "operator": "not_equal", "operand": true }
13861386
]
13871387
},
1388-
{ "keys": ["ctrl+alt+d"], "command": "mde_open_page", "context":
1388+
{ "keys": ["ctrl+alt+j"], "command": "mde_open_journal", "context":
13891389
[
1390-
{ "key": "selector", "operator": "equal", "operand": "meta.link.reference.wiki.description.markdown", "match_all": true },
1391-
{ "key": "setting.mde.keymap_disable.open_page", "operator": "not_equal", "operand": true }
1390+
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
1391+
{ "key": "setting.mde.keymap_disable.open_journal", "operator": "not_equal", "operand": true }
13921392
]
13931393
},
1394-
{ "keys": ["ctrl+alt+d"], "command": "mde_make_page_reference", "context":
1394+
{ "keys": ["f12"], "command": "mde_open_page", "context":
13951395
[
1396-
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - (meta.link | markup.underline.link)", "match_all": true },
1397-
{ "key": "setting.mde.keymap_disable.make_page_reference", "operator": "not_equal", "operand": true }
1396+
{ "key": "selector", "operator": "equal", "operand": "meta.link.reference.wiki.description.markdown", "match_all": true },
1397+
{ "key": "setting.mde.keymap_disable.open_page", "operator": "not_equal", "operand": true }
13981398
]
13991399
},
1400-
{ "keys": ["ctrl+alt+x"], "command": "mde_list_back_links", "context":
1400+
{ "keys": ["shift+f12"], "command": "mde_list_back_links", "context":
14011401
[
1402-
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
1402+
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - (meta.link | markup.underline.link | variable)", "match_all": true },
14031403
{ "key": "setting.mde.keymap_disable.list_back_links", "operator": "not_equal", "operand": true }
14041404
]
14051405
},
1406-
{ "keys": ["ctrl+alt+j"], "command": "mde_open_journal", "context":
1406+
{ "keys": ["ctrl+alt+d"], "command": "mde_make_page_reference", "context":
14071407
[
1408-
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
1409-
{ "key": "setting.mde.keymap_disable.open_journal", "operator": "not_equal", "operand": true }
1408+
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - (meta.link | markup.underline.link)", "match_all": true },
1409+
{ "key": "setting.mde.keymap_disable.make_page_reference", "operator": "not_equal", "operand": true }
14101410
]
14111411
}
14121412
]

‎Preferences.sublime-settings‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,13 +170,13 @@
170170
// Default keys: (OSX)super+ctrl/shift+pageup (Linux/Win)ctrl+shift(+alt)+pageup
171171
"mde.keymap_disable.goto_previous_heading": false,
172172
// List pages the link to the current page
173-
"mde.keymap_disable.list_back_links": true,
173+
"mde.keymap_disable.list_back_links": false,
174174
// Open the home page
175175
"mde.keymap_disable.open_home_page": true,
176176
// Open the journal
177177
"mde.keymap_disable.open_journal": true,
178178
// Open the page referenced
179-
"mde.keymap_disable.open_page": true,
179+
"mde.keymap_disable.open_page": false,
180180
// Make page reference
181181
"mde.keymap_disable.make_page_reference": true
182182
}

‎docs/usage.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,8 +345,8 @@ Lastly the command to open the *home* page is provided, where the home page is j
345345
| Linux/Windows | MacOS | Description
346346
|---------------|-------|-------------
347347
| <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
349348
| <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
349+
| <kbd>f12</kbd> | <kbd>f12</kbd> | Open wiki page under cursor
350+
| <kbd>Shift</kbd> + <kbd>f12</kbd> | <kbd>⇧</kbd> + <kbd>f12</kbd> | List back links
351351

352352
_Note: The key bindings are disabled via Preferences by default to prevent conflicts with certain keyboard layouts._

‎messages.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,6 @@
3636
"3.0.7": "messages/3.0.7.md",
3737
"3.1.0": "messages/3.1.0.md",
3838
"3.1.1": "messages/3.1.1.md",
39-
"3.1.2": "messages/3.1.2.md"
39+
"3.1.2": "messages/3.1.2.md",
40+
"3.1.3": "messages/3.1.3.md"
4041
}

‎messages/3.1.3.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# MarkdownEditing 3.1.3 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+
* Bind F12 (instead of `ctrl+alt+D`) to follow wiki links (#679)
9+
* Bind Sift+F12 (instead of `ctrl+alt+X`) to list back links links
10+
* Add `yml` syntax tag to enable YAML highlighting in fenced code-blocks (#688)
11+
* Add `yml` syntax tag as optional frontmatter language specifier
12+
* Fix YAML frontmatter markers in MultiMarkdown (#690)
13+
14+
## New Features
15+
16+
## Changes
17+
18+
* Markdown.sublime-syntax now uses sublime-syntax version 2
19+
* Tweak color schemes to improve yaml key highlighting in frontmatter
20+
* Update syntax definition for LaTeX math equations
21+
22+
[issues]: https://github.com/SublimeText-Markdown/MarkdownEditing/issues

‎schemes/Mariana.sublime-color-scheme‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@
88
},
99
"rules": [
1010

11+
// Frontmatter
12+
{
13+
"name": "Frontmatter: Mapping Key Names",
14+
"scope": "text.html.markdown meta.mapping.key string, text.html.markdown meta.mapping.key constant.language, text.html.markdown meta.mapping.key constant.numeric",
15+
"foreground": "var(blue5)"
16+
},
17+
1118
// Basic Formattings
1219
{
1320
"name": "Markdown: Bold Content",

0 commit comments

Comments
 (0)