summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2017-06-26 22:08:46 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2017-06-26 22:08:46 +0200
commitdf0c345eacaaa7033ffa3e561abd735d3ea26d71 (patch)
treee644b81c25da1c99a13f8a9bc5b0da1825f3c641
parent09e61233ed5a24687e20b7dc18a1c985d423fb24 (diff)
parentbc1d6aadfd0f0a84f5dcc4681370b14b5d3fbb1c (diff)
downloadorg-mode-df0c345eacaaa7033ffa3e561abd735d3ea26d71.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-element.el33
-rw-r--r--testing/lisp/test-org-element.el36
2 files changed, 54 insertions, 15 deletions
diff --git a/lisp/org-element.el b/lisp/org-element.el
index c1c2e9b..1480c05 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -2982,16 +2982,8 @@ Assume point is at the beginning of the LaTeX fragment."
(save-excursion
(let* ((begin (point))
(after-fragment
- (if (eq (char-after) ?$)
- (if (eq (char-after (1+ (point))) ?$)
- (search-forward "$$" nil t 2)
- (and (not (eq (char-before) ?$))
- (search-forward "$" nil t 2)
- (not (memq (char-before (match-beginning 0))
- '(?\s ?\t ?\n ?, ?.)))
- (looking-at-p
- "\\(\\s.\\|\\s-\\|\\s(\\|\\s)\\|\\s\"\\|'\\|$\\)")
- (point)))
+ (cond
+ ((not (eq ?$ (char-after)))
(pcase (char-after (1+ (point)))
(?\( (search-forward "\\)" nil t))
(?\[ (search-forward "\\]" nil t))
@@ -2999,10 +2991,23 @@ Assume point is at the beginning of the LaTeX fragment."
;; Macro.
(and (looking-at "\\\\[a-zA-Z]+\\*?\\(\\(\\[[^][\n{}]*\\]\\)\
\\|\\({[^{}\n]*}\\)\\)*")
- (match-end 0))))))
- (post-blank (if (not after-fragment) (throw 'no-object nil)
- (goto-char after-fragment)
- (skip-chars-forward " \t")))
+ (match-end 0)))))
+ ((eq ?$ (char-after (1+ (point))))
+ (search-forward "$$" nil t 2))
+ (t
+ (and (not (eq ?$ (char-before)))
+ (not (memq (char-after (1+ (point)))
+ '(?\s ?\t ?\n ?, ?. ?\;)))
+ (search-forward "$" nil t 2)
+ (not (memq (char-before (match-beginning 0))
+ '(?\s ?\t ?\n ?, ?.)))
+ (looking-at-p
+ "\\(\\s.\\|\\s-\\|\\s(\\|\\s)\\|\\s\"\\|'\\|$\\)")
+ (point)))))
+ (post-blank
+ (if (not after-fragment) (throw 'no-object nil)
+ (goto-char after-fragment)
+ (skip-chars-forward " \t")))
(end (point)))
(list 'latex-fragment
(list :value (buffer-substring-no-properties begin after-fragment)
diff --git a/testing/lisp/test-org-element.el b/testing/lisp/test-org-element.el
index 556184d..7d1c55f 100644
--- a/testing/lisp/test-org-element.el
+++ b/testing/lisp/test-org-element.el
@@ -1548,10 +1548,16 @@ e^{i\\pi}+1=0
(ert-deftest test-org-element/latex-fragment-parser ()
"Test `latex-fragment' parser."
+ ;; Basic $...$ test.
(should
(eq 'latex-fragment
(org-test-with-temp-text "$a$"
(org-element-type (org-element-context)))))
+ ;; Test valid characters after $...$ construct.
+ (should-not
+ (eq 'latex-fragment
+ (org-test-with-temp-text "$a$a"
+ (org-element-type (org-element-context)))))
(should
(eq 'latex-fragment
(org-test-with-temp-text "$a$!"
@@ -1576,18 +1582,46 @@ e^{i\\pi}+1=0
(eq 'latex-fragment
(org-test-with-temp-text "$a$'"
(org-element-type (org-element-context)))))
+ ;; Test forbidden characters inside $...$.
(should-not
(eq 'latex-fragment
- (org-test-with-temp-text "$a$a"
+ (org-test-with-temp-text "$.a$"
+ (org-element-type (org-element-context)))))
+ (should-not
+ (eq 'latex-fragment
+ (org-test-with-temp-text "$,a$"
+ (org-element-type (org-element-context)))))
+ (should-not
+ (eq 'latex-fragment
+ (org-test-with-temp-text "$;a$"
+ (org-element-type (org-element-context)))))
+ (should-not
+ (eq 'latex-fragment
+ (org-test-with-temp-text "$ a$"
+ (org-element-type (org-element-context)))))
+ (should-not
+ (eq 'latex-fragment
+ (org-test-with-temp-text "$a.$"
+ (org-element-type (org-element-context)))))
+ (should-not
+ (eq 'latex-fragment
+ (org-test-with-temp-text "$a,$"
+ (org-element-type (org-element-context)))))
+ (should-not
+ (eq 'latex-fragment
+ (org-test-with-temp-text "$a $"
(org-element-type (org-element-context)))))
+ ;; Test $$...$$.
(should
(eq 'latex-fragment
(org-test-with-temp-text "$$a$$"
(org-element-type (org-element-context)))))
+ ;; Test \(...\).
(should
(eq 'latex-fragment
(org-test-with-temp-text "\\(a\\)"
(org-element-type (org-element-context)))))
+ ;; Test \[...\].
(should
(eq 'latex-fragment
(org-test-with-temp-text "\\[a\\]"