Merge branch 'st4-develop'

Author: deathaxe

docs/usage.md

@@ -239,7 +239,7 @@ Following key bindings may be used to create or toggle tasks.
 | Linux/Windows | MacOS | Description
 |---------------|-------|-------------
 | <kbd>Alt</kbd> + <kbd>t</kbd>  | <kbd>⌘</kbd> + <kbd>⌥</kbd> + <kbd>t</kbd> | Creates new GFM task (`* [ ] task`)
-| <kbd>Alt</kbd> + <kbd>x</kbd>  | <kbd>⌘</kbd> + <kbd>⌥</kbd> + <kbd>x</kbd> | Toggles GFM task check marks (`* [X] task`)
+| <kbd>Alt</kbd> + <kbd>x</kbd>  | <kbd>⌘</kbd> + <kbd>⌥</kbd> + <kbd>x</kbd> | Toggles GFM task check marks (`* [x] task`)
 
 # References
 

make.cmd

@@ -52,18 +52,25 @@ goto :usage
 
 :RELEASE
     if "%2"== "" goto :usage
-    if not exist "messages/release-%2.md" (
-        echo Missing release-%2.md
+    set st3_changelog=release-st3-%2.md
+    set st4_changelog=release-st4-%2.md
+
+    if not exist "messages/%st3_changelog%" (
+        echo Missing %st3_changelog%
+        exit /b 1
+    )
+    if not exist "messages/%st4_changelog%" (
+        echo Missing %st4_changelog%
         exit /b 1
     )
-    git checkout st3176 && git merge %2 --no-ff
+    git checkout st3176 && git merge st3-develop --no-ff
     if not errorlevel 0 (
-        echo Unable to merge %2 into st3176!
+        echo Unable to merge st3-develop into st3176!
         exit /b 1
     )
-    git checkout master && git merge %2 --no-ff
+    git checkout master && git merge st4-develop --no-ff
     if not errorlevel 0 (
-        echo Unable to merge %2 into master!
+        echo Unable to merge st4-develop into master!
         exit /b 1
     )
     echo Hit any key to push branches!
@@ -81,9 +88,9 @@ goto :usage
     echo Hit any key to publish release!
     pause
     : create release for ST3
-    gh release create --target st3176 -t "MarkdownEditing %2 (ST3176+)" -F "messages/release-%2.md" "3176-%2"
+    gh release create --target st3176 -t "MarkdownEditing %2 (ST3176+)" -F "messages/%st3_changelog%" "3176-%2"
     : create release for ST3
-    gh release create --target master -t "MarkdownEditing %2 (ST4107+)" -F "messages/release-%2.md" "4107-%2"
+    gh release create --target master -t "MarkdownEditing %2 (ST4107+)" -F "messages/%st4_changelog%" "4107-%2"
     git fetch
     goto :eof
 

messages.json

@@ -37,5 +37,6 @@
 	"3.1.0": "messages/3.1.0.md",
 	"3.1.1": "messages/3.1.1.md",
 	"3.1.2": "messages/3.1.2.md",
-	"3.1.3": "messages/3.1.3.md"
+	"3.1.3": "messages/3.1.3.md",
+	"3.1.4": "messages/3.1.4.md"
 }

messages/3.1.4.md

@@ -0,0 +1,21 @@
+# MarkdownEditing 3.1.4 Changelog
+
+Your _MarkdownEditing_ plugin is updated. Enjoy new version. For any type of
+feedback you can use [GitHub issues][issues].
+
+## Bug Fixes
+
+* Fix syntax highlighting of setext headings in list items
+* Fix MultiMarkdown without frontmatter not being highlighted (#695)
+
+## New Features
+
+* syntax highlighting for _Twee_ in fenced code blocks
+
+## Changes
+
+* Use lower case `x` for completed gfm tasks `- [x] task` (#696)
+* Improve accuracy of (incomplete) inline MathJAX ($1+\srqt{b$) expressions
+* Improve incomplete/standalone/inline math blocks highlighting
+
+[issues]: https://github.com/SublimeText-Markdown/MarkdownEditing/issues

plugins/lists.py

@@ -205,21 +205,21 @@ class MdeToggleTaskListItemCommand(MdeTextCommand):
     **Examples:**
 
     ```markdown
-    # Orderd Task List
+    # Ordered Task List
 
     1. [ ] task 1
-    2. [X] task 2
+    2. [x] task 2
 
-    # Unorderd Task List
+    # Unordered Task List
 
     * [ ] task 1
-    - [X] task 2
+    - [x] task 2
     + [ ] task 3
 
     # Quoted Task List
 
     > * [ ] task 1
-    > * [X] task 2
+    > * [x] task 2
     ```
     """
 
@@ -245,7 +245,7 @@ def run(self, edit):
                 region.a += match.start(1)
                 region.b = region.a + 1
 
-                self.view.replace(edit, region, "X" if match.group(1) == " " else " ")
+                self.view.replace(edit, region, "x" if match.group(1) == " " else " ")
 
 
 class MdeJoinLines(MdeTextCommand):