Merge pull request #681 from jrblevin/better-super-sub-script

Support plus sign and Unicode minus sign

Author: syohex

CHANGES.md

@@ -48,7 +48,7 @@
     -   Auto set `sh-shell` when `markdown-edit-code-block` enter indirect buffer with `sh-mode`
     -   Add value check and avoid raising the exception at `markdown-edit-code-block` [GH-663][]
     -   Add NonGNU ELPA badge to README and website
-    -   Support negative exponent in super script [GH-346][]
+    -   Support plus/negative(also Unicode minus sign) exponent in super script [GH-346][]
 
 *   Bug fixes:
     -   Fix issue with `nil` being returned from `markdown-imenu-create-nested-index` [GH-578][]

markdown-mode.el

@@ -995,7 +995,7 @@ Compatible with Pandoc, Python Markdown, PHP Markdown Extra, and Leanpub.")
   "Regular expression for Leanpub section markers and related syntax.")
 
 (defconst markdown-regex-sub-superscript
-  "\\(?:^\\|[^\\~^]\\)\\(?1:\\(?2:[~^]\\)\\(?3:[-]?[[:alnum:]]+\\)\\(?4:\\2\\)\\)"
+  "\\(?:^\\|[^\\~^]\\)\\(?1:\\(?2:[~^]\\)\\(?3:[+-\u2212]?[[:alnum:]]+\\)\\(?4:\\2\\)\\)"
   "The regular expression matching a sub- or superscript.
 The leading un-numbered group matches the character before the
 opening tilde or carat, if any, ensuring that it is not a

tests/markdown-test.el

@@ -3337,11 +3337,24 @@ takes precedence)."
     (markdown-test-range-has-face 4 4 'markdown-markup-face) ; First ^
     (markdown-test-range-has-face 5 6 nil) ; 10
     (markdown-test-range-has-face 7 7 'markdown-markup-face)) ; Second ^
-  (markdown-test-string "1.0 x 10^-15^"
+  (markdown-test-string "1.0 x 10^-15^
+10^+15^"
+    ;; -
     (markdown-test-range-has-face 1 8 nil)
     (markdown-test-range-has-face 9 9 'markdown-markup-face)
     (markdown-test-range-has-face 10 12 nil)
-    (markdown-test-range-has-face 13 13 'markdown-markup-face)))
+    (markdown-test-range-has-face 13 13 'markdown-markup-face)
+    ;; +
+    (markdown-test-range-has-face 15 16 nil)
+    (markdown-test-range-has-face 17 17 'markdown-markup-face)
+    (markdown-test-range-has-face 18 20 nil)
+    (markdown-test-range-has-face 21 21 'markdown-markup-face))
+  ;; Unicode minus sign
+  (markdown-test-string "10^−15^" ;; unicode minus sign U+2212
+    (search-forward "^")
+    (markdown-test-range-has-face (1- (point)) (1- (point)) 'markdown-markup-face)
+    (search-forward "^")
+    (markdown-test-range-has-face (1- (point)) (1- (point)) 'markdown-markup-face)))
 
 (ert-deftest test-markdown-font-lock/hidden-urls-inline ()
   "Test URL hiding and toggling."