diff options
| author | Nicolas Goaziou <n.goaziou@gmail.com> | 2013-04-28 09:41:10 +0200 |
|---|---|---|
| committer | Nicolas Goaziou <n.goaziou@gmail.com> | 2013-04-28 09:41:10 +0200 |
| commit | dac3af93cf78645a0c28804065418bea1c155a24 (patch) | |
| tree | 533105ac03dd798ce5411365dbce4a10dea83958 | |
| parent | 6161bb2c09289f0e28b5b3511e1e9ad1b95bd884 (diff) | |
| parent | 41bd891d48e050aaf9a7cfb2ad604101967f7823 (diff) | |
| download | org-mode-dac3af93cf78645a0c28804065418bea1c155a24.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/org-element.el | 2 | ||||
| -rw-r--r-- | testing/lisp/test-org-element.el | 16 |
2 files changed, 13 insertions, 5 deletions
diff --git a/lisp/org-element.el b/lisp/org-element.el index cf5fe63..16a6cf8 100644 --- a/lisp/org-element.el +++ b/lisp/org-element.el @@ -3775,7 +3775,7 @@ element it has to parse." (goto-char (car affiliated)) (org-element-keyword-parser limit nil)) ;; LaTeX Environment. - ((looking-at "[ \t]*\\\\begin{\\([A-Za-z0-9*]+\\)}[ \t]*$") + ((looking-at "[ \t]*\\\\begin{\\([A-Za-z0-9*]+\\)}") (org-element-latex-environment-parser limit affiliated)) ;; Drawer and Property Drawer. ((looking-at org-drawer-regexp) diff --git a/testing/lisp/test-org-element.el b/testing/lisp/test-org-element.el index 81493fb..ae2e4b6 100644 --- a/testing/lisp/test-org-element.el +++ b/testing/lisp/test-org-element.el @@ -1117,8 +1117,7 @@ Paragraph" "Test `latex-environment' parser." (should (org-test-with-temp-text "\\begin{equation}\ne^{i\\pi}+1=0\n\\end{equation}" - (org-element-map - (org-element-parse-buffer) 'latex-environment 'identity))) + (org-element-map (org-element-parse-buffer) 'latex-environment 'identity))) ;; Allow nested environments. (should (equal @@ -1136,7 +1135,13 @@ e^{i\\pi}+1=0 (org-element-property :value (org-element-map - (org-element-parse-buffer) 'latex-environment 'identity nil t)))))) + (org-element-parse-buffer) 'latex-environment 'identity nil t))))) + ;; Allow environments with options. + (should + (eq 'latex-environment + (org-test-with-temp-text + "\\begin{theorem}[Euler]\ne^{i\\pi}+1=0\n\\end{theorem}" + (org-element-type (org-element-at-point)))))) ;;;; Latex Fragment @@ -2218,7 +2223,10 @@ CLOCK: [2012-01-01 sun. 00:01]--[2012-01-01 sun. 00:02] => 0:01")) "Test latex environment interpreter." (should (equal (org-test-parse-and-interpret "\\begin{equation}\n1+1=2\n\\end{equation}") - "\\begin{equation}\n1+1=2\n\\end{equation}\n"))) + "\\begin{equation}\n1+1=2\n\\end{equation}\n")) + (should (equal (org-test-parse-and-interpret + "\\begin{theorem}[me]\n1+1=2\n\\end{theorem}") + "\\begin{theorem}[me]\n1+1=2\n\\end{theorem}\n"))) (ert-deftest test-org-element/planning-interpreter () "Test planning interpreter." |