2012-02-23 10:28:13 -05:00
|
|
|
|
;;; test-org-element.el --- Tests for org-element.el
|
|
|
|
|
|
|
|
|
|
;; Copyright (C) 2012 Nicolas Goaziou
|
|
|
|
|
|
|
|
|
|
;; Author: Nicolas Goaziou <n.goaziou at gmail dot com>
|
|
|
|
|
|
|
|
|
|
;; This program is free software; you can redistribute it and/or modify
|
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
;; (at your option) any later version.
|
|
|
|
|
|
|
|
|
|
;; This program is distributed in the hope that it will be useful,
|
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
|
|
|
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
2012-02-29 12:38:54 -05:00
|
|
|
|
(unless (featurep 'org-element)
|
|
|
|
|
(signal 'missing-test-dependency "org-element"))
|
2012-02-23 10:28:13 -05:00
|
|
|
|
|
2012-04-27 11:16:17 -04:00
|
|
|
|
(defun org-test-parse-and-interpret (text)
|
|
|
|
|
"Parse TEXT as Org syntax and interpret it.
|
|
|
|
|
Return interpreted string."
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(org-mode)
|
|
|
|
|
(insert text)
|
|
|
|
|
(org-element-interpret-data (org-element-parse-buffer))))
|
|
|
|
|
|
2012-02-23 10:28:13 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; Tests:
|
|
|
|
|
|
2012-03-10 05:37:13 -05:00
|
|
|
|
|
2012-02-23 10:28:13 -05:00
|
|
|
|
;;;; Headlines
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-element/headline-quote-keyword ()
|
|
|
|
|
"Test QUOTE keyword recognition."
|
|
|
|
|
;; Reference test.
|
|
|
|
|
(org-test-with-temp-text "* Headline"
|
|
|
|
|
(let ((org-quote-string "QUOTE"))
|
|
|
|
|
(should-not (org-element-property :quotedp (org-element-at-point)))))
|
|
|
|
|
;; Standard position.
|
|
|
|
|
(org-test-with-temp-text "* QUOTE Headline"
|
|
|
|
|
(let ((org-quote-string "QUOTE"))
|
|
|
|
|
(let ((headline (org-element-at-point)))
|
|
|
|
|
(should (org-element-property :quotedp headline))
|
|
|
|
|
;; Test removal from raw value.
|
|
|
|
|
(should (equal (org-element-property :raw-value headline) "Headline"))))
|
|
|
|
|
;; Case sensitivity.
|
|
|
|
|
(let ((org-quote-string "Quote"))
|
|
|
|
|
(should-not (org-element-property :quotedp (org-element-at-point)))))
|
|
|
|
|
;; With another keyword.
|
|
|
|
|
(org-test-with-temp-text "* TODO QUOTE Headline"
|
|
|
|
|
(let ((org-quote-string "QUOTE")
|
|
|
|
|
(org-todo-keywords '((sequence "TODO" "DONE"))))
|
|
|
|
|
(should (org-element-property :quotedp (org-element-at-point))))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-element/headline-comment-keyword ()
|
|
|
|
|
"Test COMMENT keyword recognition."
|
|
|
|
|
;; Reference test.
|
|
|
|
|
(org-test-with-temp-text "* Headline"
|
|
|
|
|
(let ((org-comment-string "COMMENT"))
|
|
|
|
|
(should-not (org-element-property :commentedp (org-element-at-point)))))
|
|
|
|
|
;; Standard position.
|
|
|
|
|
(org-test-with-temp-text "* COMMENT Headline"
|
|
|
|
|
(let ((org-comment-string "COMMENT"))
|
|
|
|
|
(let ((headline (org-element-at-point)))
|
|
|
|
|
(should (org-element-property :commentedp headline))
|
|
|
|
|
;; Test removal from raw value.
|
|
|
|
|
(should (equal (org-element-property :raw-value headline) "Headline"))))
|
|
|
|
|
;; Case sensitivity.
|
|
|
|
|
(let ((org-comment-string "Comment"))
|
|
|
|
|
(should-not (org-element-property :commentedp (org-element-at-point)))))
|
|
|
|
|
;; With another keyword.
|
|
|
|
|
(org-test-with-temp-text "* TODO COMMENT Headline"
|
|
|
|
|
(let ((org-comment-string "COMMENT")
|
|
|
|
|
(org-todo-keywords '((sequence "TODO" "DONE"))))
|
|
|
|
|
(should (org-element-property :commentedp (org-element-at-point))))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-element/headline-archive-tag ()
|
|
|
|
|
"Test ARCHIVE tag recognition."
|
|
|
|
|
;; Reference test.
|
|
|
|
|
(org-test-with-temp-text "* Headline"
|
|
|
|
|
(let ((org-archive-tag "ARCHIVE"))
|
|
|
|
|
(should-not (org-element-property :archivedp (org-element-at-point)))))
|
|
|
|
|
;; Single tag.
|
|
|
|
|
(org-test-with-temp-text "* Headline :ARCHIVE:"
|
|
|
|
|
(let ((org-archive-tag "ARCHIVE"))
|
|
|
|
|
(let ((headline (org-element-at-point)))
|
|
|
|
|
(should (org-element-property :archivedp headline))
|
|
|
|
|
;; Test tag removal.
|
|
|
|
|
(should-not (org-element-property :tags headline))))
|
|
|
|
|
(let ((org-archive-tag "Archive"))
|
|
|
|
|
(should-not (org-element-property :archivedp (org-element-at-point)))))
|
|
|
|
|
;; Multiple tags.
|
|
|
|
|
(org-test-with-temp-text "* Headline :test:ARCHIVE:"
|
|
|
|
|
(let ((org-archive-tag "ARCHIVE"))
|
|
|
|
|
(let ((headline (org-element-at-point)))
|
|
|
|
|
(should (org-element-property :archivedp headline))
|
|
|
|
|
;; Test tag removal.
|
|
|
|
|
(should (equal (org-element-property :tags headline) ":test:"))))))
|
|
|
|
|
|
|
|
|
|
|
2012-03-10 05:37:13 -05:00
|
|
|
|
|
|
|
|
|
;;;; Example-blocks and Src-blocks
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-element/block-switches ()
|
|
|
|
|
"Test `example-block' and `src-block' switches parsing."
|
|
|
|
|
(let ((org-coderef-label-format "(ref:%s)"))
|
|
|
|
|
;; 1. Test "-i" switch.
|
|
|
|
|
(org-test-with-temp-text "#+BEGIN_SRC emacs-lisp\n(+ 1 1)\n#+END_SRC"
|
|
|
|
|
(let ((element (org-element-current-element)))
|
|
|
|
|
(should-not (org-element-property :preserve-indent element))))
|
|
|
|
|
(org-test-with-temp-text "#+BEGIN_SRC emacs-lisp -i\n(+ 1 1)\n#+END_SRC"
|
|
|
|
|
(let ((element (org-element-current-element)))
|
|
|
|
|
(should (org-element-property :preserve-indent element))))
|
|
|
|
|
(org-test-with-temp-text "#+BEGIN_EXAMPLE\nText.\n#+END_EXAMPLE"
|
|
|
|
|
(let ((element (org-element-current-element)))
|
|
|
|
|
(should-not (org-element-property :preserve-indent element))))
|
|
|
|
|
(org-test-with-temp-text "#+BEGIN_EXAMPLE -i\nText.\n#+END_EXAMPLE"
|
|
|
|
|
(let ((element (org-element-current-element)))
|
|
|
|
|
(should (org-element-property :preserve-indent element))))
|
|
|
|
|
;; 2. "-n -r -k" combination should number lines, retain labels but
|
|
|
|
|
;; not use them in coderefs.
|
2012-04-28 15:12:30 -04:00
|
|
|
|
(org-test-with-temp-text "#+BEGIN_EXAMPLE -n -r -k\nText.\n#+END_EXAMPLE"
|
2012-03-10 05:37:13 -05:00
|
|
|
|
(let ((element (org-element-current-element)))
|
|
|
|
|
(should (and (org-element-property :number-lines element)
|
|
|
|
|
(org-element-property :retain-labels element)
|
|
|
|
|
(not (org-element-property :use-labels element))))))
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"#+BEGIN_SRC emacs-lisp -n -r -k\n(+ 1 1)\n#+END_SRC"
|
|
|
|
|
(let ((element (org-element-current-element)))
|
|
|
|
|
(should (and (org-element-property :number-lines element)
|
|
|
|
|
(org-element-property :retain-labels element)
|
|
|
|
|
(not (org-element-property :use-labels element))))))
|
|
|
|
|
;; 3. "-n -r" combination should number-lines remove labels and not
|
|
|
|
|
;; use them in coderefs.
|
|
|
|
|
(org-test-with-temp-text "#+BEGIN_EXAMPLE -n -r\nText.\n#+END_EXAMPLE"
|
|
|
|
|
(let ((element (org-element-current-element)))
|
|
|
|
|
(should (and (org-element-property :number-lines element)
|
|
|
|
|
(not (org-element-property :retain-labels element))
|
|
|
|
|
(not (org-element-property :use-labels element))))))
|
|
|
|
|
(org-test-with-temp-text "#+BEGIN_SRC emacs-lisp -n -r\n(+ 1 1)\n#+END_SRC"
|
|
|
|
|
(let ((element (org-element-current-element)))
|
|
|
|
|
(should (and (org-element-property :number-lines element)
|
|
|
|
|
(not (org-element-property :retain-labels element))
|
|
|
|
|
(not (org-element-property :use-labels element))))))
|
|
|
|
|
;; 4. "-n" or "+n" should number lines, retain labels and use them
|
|
|
|
|
;; in coderefs.
|
|
|
|
|
(org-test-with-temp-text "#+BEGIN_EXAMPLE -n\nText.\n#+END_EXAMPLE"
|
|
|
|
|
(let ((element (org-element-current-element)))
|
|
|
|
|
(should (and (org-element-property :number-lines element)
|
|
|
|
|
(org-element-property :retain-labels element)
|
|
|
|
|
(org-element-property :use-labels element)))))
|
|
|
|
|
(org-test-with-temp-text "#+BEGIN_SRC emacs-lisp -n\n(+ 1 1)\n#+END_SRC"
|
|
|
|
|
(let ((element (org-element-current-element)))
|
|
|
|
|
(should (and (org-element-property :number-lines element)
|
|
|
|
|
(org-element-property :retain-labels element)
|
|
|
|
|
(org-element-property :use-labels element)))))
|
|
|
|
|
(org-test-with-temp-text "#+BEGIN_EXAMPLE +n\nText.\n#+END_EXAMPLE"
|
|
|
|
|
(let ((element (org-element-current-element)))
|
|
|
|
|
(should (and (org-element-property :number-lines element)
|
|
|
|
|
(org-element-property :retain-labels element)
|
|
|
|
|
(org-element-property :use-labels element)))))
|
|
|
|
|
(org-test-with-temp-text "#+BEGIN_SRC emacs-lisp +n\n(+ 1 1)\n#+END_SRC"
|
|
|
|
|
(let ((element (org-element-current-element)))
|
|
|
|
|
(should (and (org-element-property :number-lines element)
|
|
|
|
|
(org-element-property :retain-labels element)
|
|
|
|
|
(org-element-property :use-labels element)))))
|
|
|
|
|
;; 5. No switch should not number lines, but retain labels and use
|
|
|
|
|
;; them in coderefs.
|
|
|
|
|
(org-test-with-temp-text "#+BEGIN_EXAMPLE\nText.\n#+END_EXAMPLE"
|
|
|
|
|
(let ((element (org-element-current-element)))
|
|
|
|
|
(should (and (not (org-element-property :number-lines element))
|
|
|
|
|
(org-element-property :retain-labels element)
|
|
|
|
|
(org-element-property :use-labels element)))))
|
|
|
|
|
(org-test-with-temp-text "#+BEGIN_SRC emacs-lisp\n(+ 1 1)\n#+END_SRC"
|
|
|
|
|
(let ((element (org-element-current-element)))
|
|
|
|
|
(should (and (not (org-element-property :number-lines element))
|
|
|
|
|
(org-element-property :retain-labels element)
|
|
|
|
|
(org-element-property :use-labels element)))))
|
|
|
|
|
;; 6. "-r" switch only: do not number lines, remove labels, and
|
|
|
|
|
;; don't use labels in coderefs.
|
|
|
|
|
(org-test-with-temp-text "#+BEGIN_EXAMPLE -r\nText.\n#+END_EXAMPLE"
|
|
|
|
|
(let ((element (org-element-current-element)))
|
|
|
|
|
(should (and (not (org-element-property :number-lines element))
|
|
|
|
|
(not (org-element-property :retain-labels element))
|
|
|
|
|
(not (org-element-property :use-labels element))))))
|
|
|
|
|
(org-test-with-temp-text "#+BEGIN_SRC emacs-lisp -r\n(+ 1 1)\n#+END_SRC"
|
|
|
|
|
(let ((element (org-element-current-element)))
|
|
|
|
|
(should (and (not (org-element-property :number-lines element))
|
|
|
|
|
(not (org-element-property :retain-labels element))
|
|
|
|
|
(not (org-element-property :use-labels element))))))
|
|
|
|
|
;; 7. Recognize coderefs with user-defined syntax.
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"#+BEGIN_EXAMPLE -l \"[ref:%s]\"\nText [ref:text]\n#+END_EXAMPLE"
|
|
|
|
|
(let ((element (org-element-current-element)))
|
|
|
|
|
(should
|
2012-03-10 07:46:35 -05:00
|
|
|
|
(equal (org-element-property :label-fmt element) "[ref:%s]"))))
|
2012-03-10 05:37:13 -05:00
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"#+BEGIN_SRC emacs-lisp -l \"[ref:%s]\"\n(+ 1 1) [ref:text]\n#+END_SRC"
|
|
|
|
|
(let ((element (org-element-current-element)))
|
|
|
|
|
(should
|
2012-03-10 07:46:35 -05:00
|
|
|
|
(equal (org-element-property :label-fmt element) "[ref:%s]"))))))
|
2012-03-10 05:37:13 -05:00
|
|
|
|
|
|
|
|
|
|
2012-04-06 17:50:00 -04:00
|
|
|
|
|
|
|
|
|
;;;; Footnotes references and definitions
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-element/footnote-reference ()
|
|
|
|
|
"Test footnote-reference parsing."
|
|
|
|
|
;; 1. Parse a standard reference.
|
|
|
|
|
(org-test-with-temp-text "[fn:label]"
|
|
|
|
|
(should (equal (org-element-footnote-reference-parser)
|
|
|
|
|
'(footnote-reference
|
|
|
|
|
(:label "fn:label" :type standard :inline-definition nil
|
|
|
|
|
:begin 1 :end 11 :post-blank 0)))))
|
|
|
|
|
;; 2. Parse a normalized reference.
|
|
|
|
|
(org-test-with-temp-text "[1]"
|
|
|
|
|
(should (equal (org-element-footnote-reference-parser)
|
|
|
|
|
'(footnote-reference
|
|
|
|
|
(:label "1" :type standard :inline-definition nil
|
|
|
|
|
:begin 1 :end 4 :post-blank 0)))))
|
|
|
|
|
;; 3. Parse an inline reference.
|
|
|
|
|
(org-test-with-temp-text "[fn:test:def]"
|
|
|
|
|
(should (equal (org-element-footnote-reference-parser)
|
|
|
|
|
'(footnote-reference
|
|
|
|
|
(:label "fn:test" :type inline :inline-definition ("def")
|
|
|
|
|
:begin 1 :end 14 :post-blank 0)))))
|
|
|
|
|
;; 4. Parse an anonymous reference.
|
|
|
|
|
(org-test-with-temp-text "[fn::def]"
|
|
|
|
|
(should (equal (org-element-footnote-reference-parser)
|
|
|
|
|
'(footnote-reference
|
|
|
|
|
(:label nil :type inline :inline-definition ("def")
|
|
|
|
|
:begin 1 :end 10 :post-blank 0)))))
|
|
|
|
|
;; 5. Parse nested footnotes.
|
|
|
|
|
(org-test-with-temp-text "[fn::def [fn:label]]"
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
(org-element-footnote-reference-parser)
|
|
|
|
|
'(footnote-reference
|
|
|
|
|
(:label nil :type inline
|
|
|
|
|
:inline-definition
|
|
|
|
|
("def "
|
|
|
|
|
(footnote-reference
|
|
|
|
|
(:label "fn:label" :type standard :inline-definition nil
|
|
|
|
|
:begin 5 :end 15 :post-blank 0)))
|
|
|
|
|
:begin 1 :end 21 :post-blank 0)))))
|
|
|
|
|
;; 6. Parse adjacent footnotes.
|
|
|
|
|
(org-test-with-temp-text "[fn:label1][fn:label2]"
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
(org-element-footnote-reference-parser)
|
|
|
|
|
'(footnote-reference
|
|
|
|
|
(:label "fn:label1" :type standard :inline-definition nil :begin 1
|
|
|
|
|
:end 12 :post-blank 0)))))
|
|
|
|
|
;; 7. Only properly closed footnotes are recognized as such.
|
|
|
|
|
(org-test-with-temp-text "Text [fn:label"
|
|
|
|
|
(should-not
|
|
|
|
|
(org-element-map
|
|
|
|
|
(org-element-parse-buffer) 'footnote-reference 'identity))))
|
|
|
|
|
|
|
|
|
|
|
2012-04-25 16:15:29 -04:00
|
|
|
|
|
|
|
|
|
;;;; Verse blocks
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-element/verse-block ()
|
|
|
|
|
"Test verse block parsing."
|
|
|
|
|
;; Standard test.
|
|
|
|
|
(org-test-with-temp-text "#+BEGIN_VERSE\nVerse block\n#+END_VERSE"
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
(org-element-map (org-element-parse-buffer) 'verse-block 'identity nil t)
|
|
|
|
|
'(verse-block
|
|
|
|
|
(:begin 1 :end 38 :contents-begin 15 :contents-end 27 :hiddenp nil
|
|
|
|
|
:post-blank 0)
|
|
|
|
|
"Verse block\n"))))
|
|
|
|
|
;; Ignore case.
|
|
|
|
|
(org-test-with-temp-text "#+begin_verse\nVerse block\n#+end_verse"
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
(org-element-map (org-element-parse-buffer) 'verse-block 'identity nil t)
|
|
|
|
|
'(verse-block
|
|
|
|
|
(:begin 1 :end 38 :contents-begin 15 :contents-end 27 :hiddenp nil
|
|
|
|
|
:post-blank 0)
|
|
|
|
|
"Verse block\n"))))
|
|
|
|
|
;; Parse folding.
|
|
|
|
|
(org-test-with-temp-text "#+BEGIN_VERSE\nVerse block\n#+END_VERSE"
|
|
|
|
|
(org-hide-block-all)
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
(org-element-map (org-element-parse-buffer) 'verse-block 'identity nil t)
|
|
|
|
|
'(verse-block
|
|
|
|
|
(:begin 1 :end 38 :contents-begin 15 :contents-end 27
|
|
|
|
|
:hiddenp org-hide-block :post-blank 0)
|
|
|
|
|
"Verse block\n"))))
|
|
|
|
|
;; Parse objects in verse blocks.
|
|
|
|
|
(org-test-with-temp-text "#+BEGIN_VERSE\nVerse \\alpha\n#+END_VERSE"
|
|
|
|
|
(should (org-element-map (org-element-parse-buffer) 'entity 'identity))))
|
|
|
|
|
|
|
|
|
|
|
2012-03-28 09:33:20 -04:00
|
|
|
|
|
2012-04-10 17:15:32 -04:00
|
|
|
|
;;;; Granularity
|
2012-03-28 10:40:43 -04:00
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-element/granularity ()
|
|
|
|
|
"Test granularity impact on buffer parsing."
|
|
|
|
|
(org-test-with-temp-text "
|
|
|
|
|
* Head 1
|
|
|
|
|
** Head 2
|
|
|
|
|
#+BEGIN_CENTER
|
|
|
|
|
Centered paragraph.
|
|
|
|
|
#+END_CENTER
|
|
|
|
|
Paragraph \\alpha."
|
|
|
|
|
;; 1.1. Granularity set to `headline' should parse every headline
|
|
|
|
|
;; in buffer, and only them.
|
|
|
|
|
(let ((tree (org-element-parse-buffer 'headline)))
|
|
|
|
|
(should (= 2 (length (org-element-map tree 'headline 'identity))))
|
|
|
|
|
(should-not (org-element-map tree 'paragraph 'identity)))
|
|
|
|
|
;; 1.2. Granularity set to `greater-element' should not enter
|
|
|
|
|
;; greater elements excepted headlines and sections.
|
|
|
|
|
(let ((tree (org-element-parse-buffer 'greater-element)))
|
|
|
|
|
(should (= 1 (length (org-element-map tree 'center-block 'identity))))
|
|
|
|
|
(should (= 1 (length (org-element-map tree 'paragraph 'identity))))
|
|
|
|
|
(should-not (org-element-map tree 'entity 'identity)))
|
|
|
|
|
;; 1.3. Granularity set to `element' should enter every
|
|
|
|
|
;; greater-element.
|
|
|
|
|
(let ((tree (org-element-parse-buffer 'element)))
|
|
|
|
|
(should (= 2 (length (org-element-map tree 'paragraph 'identity))))
|
|
|
|
|
(should-not (org-element-map tree 'entity 'identity)))
|
|
|
|
|
;; 1.4. Granularity set to `object' can see everything.
|
|
|
|
|
(let ((tree (org-element-parse-buffer 'object)))
|
|
|
|
|
(should (= 1 (length (org-element-map tree 'entity 'identity)))))))
|
2012-03-28 09:33:20 -04:00
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-element/secondary-string-parsing ()
|
2012-03-28 10:40:43 -04:00
|
|
|
|
"Test if granularity correctly toggles secondary strings parsing."
|
2012-03-28 09:33:20 -04:00
|
|
|
|
;; 1. With a granularity bigger than `object', no secondary string
|
|
|
|
|
;; should be parsed.
|
|
|
|
|
;;
|
|
|
|
|
;; 1.1. Test with `headline' type.
|
|
|
|
|
(org-test-with-temp-text "* Headline"
|
|
|
|
|
(let ((headline
|
|
|
|
|
(org-element-map (org-element-parse-buffer 'headline) 'headline
|
|
|
|
|
'identity
|
|
|
|
|
nil
|
|
|
|
|
'first-match)))
|
|
|
|
|
(should (stringp (org-element-property :title headline)))))
|
|
|
|
|
;; 1.2. Test with `item' type.
|
|
|
|
|
(org-test-with-temp-text "* Headline\n- tag :: item"
|
|
|
|
|
(let ((item (org-element-map (org-element-parse-buffer 'element)
|
|
|
|
|
'item
|
|
|
|
|
'identity
|
|
|
|
|
nil
|
|
|
|
|
'first-match)))
|
|
|
|
|
(should (stringp (org-element-property :tag item)))))
|
2012-04-25 14:40:13 -04:00
|
|
|
|
;; 1.3. Test with `inlinetask' type, if avalaible.
|
2012-03-28 09:33:20 -04:00
|
|
|
|
(when (featurep 'org-inlinetask)
|
|
|
|
|
(let ((org-inlinetask-min-level 15))
|
|
|
|
|
(org-test-with-temp-text "*************** Inlinetask"
|
|
|
|
|
(let ((inlinetask (org-element-map (org-element-parse-buffer 'element)
|
|
|
|
|
'inlinetask
|
|
|
|
|
'identity
|
|
|
|
|
nil
|
|
|
|
|
'first-match)))
|
|
|
|
|
(should (stringp (org-element-property :title inlinetask)))))))
|
|
|
|
|
;; 2. With a default granularity, secondary strings should be
|
|
|
|
|
;; parsed.
|
|
|
|
|
(org-test-with-temp-text "* Headline"
|
|
|
|
|
(let ((headline
|
|
|
|
|
(org-element-map (org-element-parse-buffer) 'headline
|
|
|
|
|
'identity
|
|
|
|
|
nil
|
|
|
|
|
'first-match)))
|
|
|
|
|
(should (listp (org-element-property :title headline)))))
|
|
|
|
|
;; 3. `org-element-at-point' should never parse a secondary string.
|
|
|
|
|
(org-test-with-temp-text "* Headline"
|
|
|
|
|
(should (stringp (org-element-property :title (org-element-at-point))))))
|
|
|
|
|
|
|
|
|
|
|
2012-02-23 19:23:25 -05:00
|
|
|
|
|
2012-04-10 17:15:32 -04:00
|
|
|
|
;;;; Interpretation.
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-element/interpret-affiliated-keywords ()
|
|
|
|
|
"Test if affiliated keywords are correctly interpreted."
|
|
|
|
|
;; Interpret simple keywords.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
(org-element-interpret-data
|
|
|
|
|
'(org-data nil (paragraph (:name "para") "Paragraph")))
|
|
|
|
|
"#+NAME: para\nParagraph\n"))
|
|
|
|
|
;; Interpret multiple keywords.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
(org-element-interpret-data
|
|
|
|
|
'(org-data nil (paragraph (:attr_ascii ("line1" "line2")) "Paragraph")))
|
|
|
|
|
"#+ATTR_ASCII: line1\n#+ATTR_ASCII: line2\nParagraph\n"))
|
|
|
|
|
;; Interpret parsed keywords.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
(org-element-interpret-data
|
|
|
|
|
'(org-data nil (paragraph (:caption ("caption")) "Paragraph")))
|
|
|
|
|
"#+CAPTION: caption\nParagraph\n"))
|
|
|
|
|
;; Interpret dual keywords.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
(org-element-interpret-data
|
|
|
|
|
'(org-data nil (paragraph (:caption (("long") "short")) "Paragraph")))
|
|
|
|
|
"#+CAPTION[short]: long\nParagraph\n")))
|
|
|
|
|
|
2012-04-27 11:16:17 -04:00
|
|
|
|
(ert-deftest test-org-element/center-block-interpreter ()
|
|
|
|
|
"Test center block interpreter."
|
|
|
|
|
(should
|
|
|
|
|
(equal (org-test-parse-and-interpret "#+BEGIN_CENTER\nTest\n#+END_CENTER")
|
|
|
|
|
"#+BEGIN_CENTER\nTest\n#+END_CENTER\n")))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-element/drawer-interpreter ()
|
|
|
|
|
"Test drawer interpreter."
|
|
|
|
|
(should
|
|
|
|
|
(equal (let ((org-drawers '("TEST")))
|
|
|
|
|
(org-test-parse-and-interpret ":TEST:\nTest\n:END:"))
|
|
|
|
|
":TEST:\nTest\n:END:\n")))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-element/dynamic-block-interpreter ()
|
|
|
|
|
"Test dynamic block interpreter."
|
|
|
|
|
(should
|
|
|
|
|
(equal (org-test-parse-and-interpret
|
|
|
|
|
"#+BEGIN: myblock :parameter value1\nTest\n#+END:")
|
|
|
|
|
"#+BEGIN: myblock :parameter value1\nTest\n#+END:\n")))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-element/footnote-definition-interpreter ()
|
|
|
|
|
"Test footnote definition interpreter."
|
|
|
|
|
(should (equal (org-test-parse-and-interpret "[fn:1] Test") "[fn:1] Test\n")))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-element/headline-interpreter ()
|
|
|
|
|
"Test headline and section interpreters."
|
|
|
|
|
;; 1. Standard test.
|
|
|
|
|
(should (equal (org-test-parse-and-interpret "* Headline") "* Headline\n"))
|
|
|
|
|
;; 2. With TODO keywords.
|
|
|
|
|
(should
|
|
|
|
|
(equal (let ((org-todo-keywords '((sequence "TODO" "DONE"))))
|
|
|
|
|
(org-test-parse-and-interpret "* TODO Headline"))
|
|
|
|
|
"* TODO Headline\n"))
|
|
|
|
|
;; 3. With tags...
|
|
|
|
|
;;
|
|
|
|
|
;; 3.1. ... and a positive `org-tags-column' value.
|
|
|
|
|
(should
|
|
|
|
|
(equal (let ((org-tags-column 20))
|
|
|
|
|
(org-test-parse-and-interpret "* Headline :tag:"))
|
|
|
|
|
"* Headline :tag:\n"))
|
|
|
|
|
;; 3.2. ... and a negative `org-tags-column' value.
|
|
|
|
|
(should
|
|
|
|
|
(equal (let ((org-tags-column -20))
|
|
|
|
|
(org-test-parse-and-interpret "* Headline :tag:"))
|
|
|
|
|
"* Headline :tag:\n"))
|
|
|
|
|
;; 3.3. ... and a null `org-tags-column' value.
|
|
|
|
|
(should
|
|
|
|
|
(equal (let ((org-tags-column 0))
|
|
|
|
|
(org-test-parse-and-interpret "* Headline :tag:"))
|
|
|
|
|
"* Headline :tag:\n"))
|
|
|
|
|
;; 4. With priority cookie.
|
|
|
|
|
(should
|
|
|
|
|
(equal (org-test-parse-and-interpret "* [#B] Headline")
|
|
|
|
|
"* [#B] Headline\n"))
|
|
|
|
|
;; 5. With comment keyword.
|
|
|
|
|
(should
|
|
|
|
|
(equal (let ((org-comment-string "COMMENT"))
|
|
|
|
|
(org-test-parse-and-interpret "* COMMENT Headline"))
|
|
|
|
|
"* COMMENT Headline\n"))
|
|
|
|
|
;; 6. With quote section.
|
|
|
|
|
(should
|
|
|
|
|
(equal (let ((org-quote-string "QUOTE"))
|
|
|
|
|
(org-test-parse-and-interpret "* QUOTE Headline"))
|
|
|
|
|
"* QUOTE Headline\n"))
|
|
|
|
|
;; 7. Keep same number of blank lines before body.
|
|
|
|
|
(should
|
|
|
|
|
(equal (org-test-parse-and-interpret
|
|
|
|
|
"* Headline\n\n\nText after two blank lines.")
|
|
|
|
|
"* Headline\n\n\nText after two blank lines.\n")))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-element/inlinetask-interpreter ()
|
|
|
|
|
"Test inlinetask interpretation."
|
|
|
|
|
(when (featurep 'org-inlinetask)
|
|
|
|
|
(let ((org-inlinetask-min-level 15))
|
|
|
|
|
;; 1. Regular inlinetask.
|
|
|
|
|
(should (equal (org-test-parse-and-interpret
|
|
|
|
|
"*************** Task\nTest\n*************** END")
|
|
|
|
|
"*************** Task\nTest\n*************** END\n"))
|
|
|
|
|
;; 2. Degenerate inlinetask.
|
|
|
|
|
(should (equal (org-test-parse-and-interpret "*************** Task")
|
|
|
|
|
"*************** Task\n"))
|
|
|
|
|
;; 3. Prefer degenerate form when there are no contents.
|
|
|
|
|
(should (equal (org-test-parse-and-interpret
|
|
|
|
|
"*************** Task\n*************** END")
|
|
|
|
|
"*************** Task\n"))
|
|
|
|
|
;; 4. With TODO keywords.
|
|
|
|
|
(should
|
|
|
|
|
(equal (let ((org-todo-keywords '((sequence "TODO" "DONE"))))
|
|
|
|
|
(org-test-parse-and-interpret "*************** TODO Task"))
|
|
|
|
|
"*************** TODO Task\n"))
|
|
|
|
|
;; 5. With tags...
|
|
|
|
|
;;
|
|
|
|
|
;; 5.1. ... and a positive `org-tags-column' value.
|
|
|
|
|
(should
|
|
|
|
|
(equal (let ((org-tags-column 30))
|
|
|
|
|
(org-test-parse-and-interpret "*************** Task :tag:"))
|
|
|
|
|
"*************** Task :tag:\n"))
|
|
|
|
|
;; 5.2. ... and a negative `org-tags-column' value.
|
|
|
|
|
(should
|
|
|
|
|
(equal (let ((org-tags-column -30))
|
|
|
|
|
(org-test-parse-and-interpret "*************** Task :tag:"))
|
|
|
|
|
"*************** Task :tag:\n"))
|
|
|
|
|
;; 5.3. ... and a null `org-tags-column' value.
|
|
|
|
|
(should
|
|
|
|
|
(equal (let ((org-tags-column 0))
|
|
|
|
|
(org-test-parse-and-interpret "*************** Task :tag:"))
|
|
|
|
|
"*************** Task :tag:\n"))
|
|
|
|
|
;; 6. With priority cookie.
|
|
|
|
|
(should
|
|
|
|
|
(equal (org-test-parse-and-interpret "*************** [#B] Task")
|
|
|
|
|
"*************** [#B] Task\n")))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-element/plain-list-interpreter ()
|
|
|
|
|
"Test plain-list and item interpreters."
|
|
|
|
|
;; 1. Unordered list.
|
|
|
|
|
(should (equal (org-test-parse-and-interpret "- item 1") "- item 1\n"))
|
|
|
|
|
;; 2. Description list.
|
|
|
|
|
(should
|
|
|
|
|
(equal (org-test-parse-and-interpret "- tag :: desc") "- tag :: desc\n"))
|
|
|
|
|
;; 3. Ordered list.
|
|
|
|
|
(should
|
|
|
|
|
(equal (let ((org-plain-list-ordered-item-terminator t))
|
|
|
|
|
(org-test-parse-and-interpret "1. Item"))
|
|
|
|
|
"1. Item\n"))
|
|
|
|
|
;; 4. Ordered list with counter.
|
|
|
|
|
(should
|
|
|
|
|
(equal (let ((org-plain-list-ordered-item-terminator t))
|
|
|
|
|
(org-test-parse-and-interpret "1. [@5] Item"))
|
|
|
|
|
"5. [@5] Item\n"))
|
|
|
|
|
;; 5. List with check-boxes.
|
|
|
|
|
(should
|
|
|
|
|
(equal (org-test-parse-and-interpret
|
|
|
|
|
"- [-] Item 1\n - [X] Item 2\n - [ ] Item 3")
|
|
|
|
|
"- [-] Item 1\n - [X] Item 2\n - [ ] Item 3\n")))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-element/quote-block-interpreter ()
|
|
|
|
|
"Test quote block interpreter."
|
|
|
|
|
(should (equal (org-test-parse-and-interpret
|
|
|
|
|
"#+BEGIN_QUOTE\nTest\n#+END_QUOTE")
|
|
|
|
|
"#+BEGIN_QUOTE\nTest\n#+END_QUOTE\n")))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-element/special-block-interpreter ()
|
|
|
|
|
"Test special block interpreter."
|
|
|
|
|
(should (equal (org-test-parse-and-interpret
|
|
|
|
|
"#+BEGIN_SPECIAL\nTest\n#+END_SPECIAL")
|
|
|
|
|
"#+BEGIN_SPECIAL\nTest\n#+END_SPECIAL\n")))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-element/babel-call-interpreter ()
|
|
|
|
|
"Test babel call interpreter."
|
|
|
|
|
;; 1. Without argument.
|
|
|
|
|
(should (equal (org-test-parse-and-interpret "#+CALL: test()")
|
|
|
|
|
"#+CALL: test()\n"))
|
|
|
|
|
;; 2. With argument.
|
|
|
|
|
(should (equal (org-test-parse-and-interpret "#+CALL: test(x=2)")
|
|
|
|
|
"#+CALL: test(x=2)\n"))
|
|
|
|
|
;; 3. With header arguments.
|
|
|
|
|
(should (equal (org-test-parse-and-interpret
|
|
|
|
|
"#+CALL: test[:results output]()[:results html]")
|
|
|
|
|
"#+CALL: test[:results output]()[:results html]\n")))
|
|
|
|
|
|
2012-04-28 16:59:25 -04:00
|
|
|
|
(ert-deftest test-org-element/clock-interpreter ()
|
|
|
|
|
"Test clock interpreter."
|
|
|
|
|
;; Running clock.
|
|
|
|
|
(should
|
|
|
|
|
(equal (let ((org-clock-string "CLOCK:"))
|
|
|
|
|
(org-test-parse-and-interpret "CLOCK: [2012-01-01 sun. 00:01]"))
|
|
|
|
|
"CLOCK: [2012-01-01 sun. 00:01]\n"))
|
|
|
|
|
;; Closed clock.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
(let ((org-clock-string "CLOCK:"))
|
|
|
|
|
(org-test-parse-and-interpret "
|
|
|
|
|
CLOCK: [2012-01-01 sun. 00:01]--[2012-01-01 sun. 00:02] => 0:01"))
|
|
|
|
|
"CLOCK: [2012-01-01 sun. 00:01]--[2012-01-01 sun. 00:02] => 0:01\n")))
|
|
|
|
|
|
2012-04-27 11:16:17 -04:00
|
|
|
|
(ert-deftest test-org-element/comment-interpreter ()
|
|
|
|
|
"Test comment interpreter."
|
|
|
|
|
;; Regular comment.
|
|
|
|
|
(should (equal (org-test-parse-and-interpret "#Comment") "#Comment\n"))
|
|
|
|
|
;; Inline comment.
|
|
|
|
|
(should (equal (org-test-parse-and-interpret " #+ Comment")
|
|
|
|
|
" #+ Comment\n")))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-element/comment-block-interpreter ()
|
|
|
|
|
"Test comment block interpreter."
|
|
|
|
|
(should (equal (org-test-parse-and-interpret
|
|
|
|
|
"#+BEGIN_COMMENT\nTest\n#+END_COMMENT")
|
|
|
|
|
"#+BEGIN_COMMENT\nTest\n#+END_COMMENT\n")))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-element/example-block-interpreter ()
|
|
|
|
|
"Test example block interpreter."
|
|
|
|
|
(should (equal (org-test-parse-and-interpret
|
|
|
|
|
"#+BEGIN_EXAMPLE\nTest\n#+END_EXAMPLE")
|
|
|
|
|
"#+BEGIN_EXAMPLE\nTest\n#+END_EXAMPLE\n")))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-element/export-block-interpreter ()
|
|
|
|
|
"Test export block interpreter."
|
|
|
|
|
(should (equal (org-test-parse-and-interpret
|
|
|
|
|
"#+BEGIN_HTML\nTest\n#+END_HTML")
|
|
|
|
|
"#+BEGIN_HTML\nTest\n#+END_HTML\n")))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-element/fixed-width-interpreter ()
|
|
|
|
|
"Test fixed width interpreter."
|
|
|
|
|
(should (equal (org-test-parse-and-interpret ": Test") ": Test\n")))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-element/horizontal-rule-interpreter ()
|
|
|
|
|
"Test horizontal rule interpreter."
|
|
|
|
|
(should (equal (org-test-parse-and-interpret "-------") "-----\n")))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-element/keyword-interpreter ()
|
|
|
|
|
"Test keyword interpreter."
|
|
|
|
|
(should (equal (org-test-parse-and-interpret "#+KEYWORD: value")
|
|
|
|
|
"#+KEYWORD: value\n")))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-element/latex-environment-interpreter ()
|
|
|
|
|
"Test latex environment interpreter."
|
|
|
|
|
(should (equal (org-test-parse-and-interpret
|
2012-04-28 16:59:25 -04:00
|
|
|
|
"\\begin{equation}\n1+1=2\n\\end{equation}")
|
|
|
|
|
"\\begin{equation}\n1+1=2\n\\end{equation}\n")))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-element/planning-interpreter ()
|
|
|
|
|
"Test planning interpreter."
|
|
|
|
|
(let ((org-closed-string "CLOSED:")
|
|
|
|
|
(org-deadline-string "DEADLINE:")
|
|
|
|
|
(org-scheduled-string "SCHEDULED:"))
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
(org-test-parse-and-interpret
|
|
|
|
|
"* Headline
|
|
|
|
|
CLOSED: <2012-01-01> DEADLINE: <2012-01-01> SCHEDULED: <2012-01-01>")
|
|
|
|
|
"* Headline
|
|
|
|
|
CLOSED: <2012-01-01> DEADLINE: <2012-01-01> SCHEDULED: <2012-01-01>\n"))))
|
2012-04-27 11:16:17 -04:00
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-element/property-drawer-interpreter ()
|
|
|
|
|
"Test property drawer interpreter."
|
|
|
|
|
(should (equal (let ((org-property-format "%-10s %s"))
|
|
|
|
|
(org-test-parse-and-interpret
|
|
|
|
|
":PROPERTIES:\n:prop: value\n:END:"))
|
|
|
|
|
":PROPERTIES:\n:prop: value\n:END:\n")))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-element/src-block-interpreter ()
|
|
|
|
|
"Test src block interpreter."
|
|
|
|
|
(should
|
|
|
|
|
(equal (org-test-parse-and-interpret
|
|
|
|
|
"#+BEGIN_SRC emacs-lisp :results silent\n(+ 1 1)\n#+END_SRC")
|
|
|
|
|
"#+BEGIN_SRC emacs-lisp :results silent\n(+ 1 1)\n#+END_SRC\n")))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-element/table-interpreter ()
|
|
|
|
|
"Test table, table-row and table-cell interpreters."
|
|
|
|
|
;; 1. Simple table.
|
|
|
|
|
(should (equal (org-test-parse-and-interpret "| a | b |\n| c | d |")
|
|
|
|
|
"| a | b |\n| c | d |\n"))
|
|
|
|
|
;; 2. Table with horizontal rules.
|
|
|
|
|
(should (equal (org-test-parse-and-interpret
|
|
|
|
|
"| a | b |\n|---+---|\n| c | d |")
|
|
|
|
|
"| a | b |\n|---+---|\n| c | d |\n"))
|
|
|
|
|
;; 3. Table with meta-data.
|
|
|
|
|
(should (equal (org-test-parse-and-interpret "| / | < | > |\n| * | 1 | 2 |")
|
|
|
|
|
"| / | < | > |\n| * | 1 | 2 |\n")))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-element/verse-block-interpreter ()
|
|
|
|
|
"Test verse block interpretation."
|
|
|
|
|
(should
|
|
|
|
|
(equal (org-test-parse-and-interpret "#+BEGIN_VERSE\nTest\n#+END_VERSE")
|
|
|
|
|
"#+BEGIN_VERSE\nTest\n#+END_VERSE\n")))
|
|
|
|
|
|
org-element: Define new objects (bold, code, italic, ...)
* contrib/lisp/org-e-ascii.el (org-e-ascii-option-alist): Fix typo.
(org-e-ascii-bold, org-e-ascii-code, org-e-ascii-strike-through,
org-e-ascii-underline): New functions.
(org-e-ascii-emphasis): Remove function.
* contrib/lisp/org-e-html.el (org-e-html-text-markup-alist): Variable
renamed from `org-e-html-emphasis-alist'. Change value type.
(org-e-html-bold, org-e-html-italic, org-e-html-strike-through,
org-e-html-underline): New functions.
(org-e-html-verbatim): Update function.
(org-e-html-emphasis): Remove function.
* contrib/lisp/org-e-latex.el (org-e-latex-text-markup-alist):
Variable renamed from `org-e-latex-emphasis-alist'. Change value
type.
(org-e-latex-center-block): Fix docstring.
(org-e-latex--text-markup, org-e-latex-bold, org-e-latex-code,
org-e-latex-italic, org-e-latex-strike-through,
org-e-latex-underline): New functions.
(org-e-latex-verbatim): Update function.
(org-e-latex-emphasis): Remove function.
* contrib/lisp/org-e-odt.el (org-e-odt-bold, org-e-odt-code,
org-e-odt-italic, org-e-odt-strike-through, org-e-odt-underline):
New functions.
(org-e-odt-verbatim): Update function.
(org-e-odt-center-block): Fix docstring.
(org-e-odt-emphasis): Remove function.
* contrib/lisp/org-element.el (org-element-bold-parser):
(org-element-bold-interpreter, org-element-code-parser,
org-element-code-interpreter, org-element-italic-parser,
org-element-italic-interpreter, org-element-strike-through-parser,
org-element-strike-through-interpreter, org-element-underline-parser,
org-element-underline-interpreter): New functions.
(org-element-emphasis-parser, org-element-emphasis-interpreter):
Remove functions.
(org-element-verbatim-parser, org-element-verbatim-interpreter,
org-element-text-markup-successor): Update function.
(org-element-object-successor-alist): Add associations for new object
types.
(org-element-recursive-objects): Add `bold', `italic',
`strike-through' and `underline' as recursive types.
(org-element-object-restrictions): Add restrictions for new recursive
object types.
* contrib/lisp/org-export.el (org-export-filters-alist): Add filters
for new object types.
(org-export-with-todo-keywords): Add missing keywords.
(org-export-filter-center-block-functions,
org-export-filter-drawer-functions,
org-export-filter-dynamic-block-functions,
org-export-filter-headline-functions,
org-export-filter-inlinetask-functions,
org-export-filter-plain-list-functions,
org-export-filter-item-functions, org-export-filter-comment-functions,
org-export-filter-comment-block-functions,
org-export-filter-example-block-functions,
org-export-filter-export-block-functions,
org-export-filter-fixed-width-functions,
org-export-filter-footnote-definition-functions,
org-export-filter-horizontal-rule-functions,
org-export-filter-keyword-functions,
org-export-filter-latex-environment-functions,
org-export-filter-babel-call-functions,
org-export-filter-paragraph-functions,
org-export-filter-property-drawer-functions,
org-export-filter-quote-section-functions,
org-export-filter-quote-block-functions,
org-export-filter-section-functions,
org-export-filter-special-block-functions,
org-export-filter-src-block-functions,
org-export-filter-table-functions,
org-export-filter-table-cell-functions,
org-export-filter-table-row-functions,
org-export-filter-verse-block-functions,
org-export-filter-entity-functions,
org-export-filter-export-snippet-functions,
org-export-filter-footnote-reference-functions,
org-export-filter-inline-babel-call-functions,
org-export-filter-inline-src-block-functions,
org-export-filter-latex-fragment-functions,
org-export-filter-line-break-functions,
org-export-filter-link-functions, org-export-filter-macro-functions,
org-export-filter-radio-target-functions,
org-export-filter-statistics-cookie-functions,
org-export-filter-subscript-functions,
org-export-filter-superscript-functions,
org-export-filter-target-functions,
org-export-filter-time-stamp-functions,
org-export-filter-verbatim-functions): Fix docstring.
(org-export-filter-bold-functions, org-export-filter-code-functions,
org-export-filter-italic-functions,
org-export-filter-strike-through-functions,
org-export-filter-underline-functions): New variables.
(org-export-filter-emphasis-functions): Remove variable.
* testing/lisp/test-org-element.el: Add tests.
2012-04-28 12:00:50 -04:00
|
|
|
|
(ert-deftest test-org-element/bold-interpreter ()
|
|
|
|
|
"Test bold interpreter."
|
|
|
|
|
(should (equal (org-test-parse-and-interpret "*text*") "*text*\n")))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-element/code-interpreter ()
|
|
|
|
|
"Test code interpreter."
|
|
|
|
|
(should (equal (org-test-parse-and-interpret "~text~") "~text~\n")))
|
|
|
|
|
|
2012-04-27 11:16:17 -04:00
|
|
|
|
(ert-deftest test-org-element/entity-interpreter ()
|
|
|
|
|
"Test entity interpreter."
|
|
|
|
|
;; 1. Without brackets.
|
|
|
|
|
(should
|
|
|
|
|
(equal (org-test-parse-and-interpret "\\alpha text") "\\alpha text\n"))
|
|
|
|
|
;; 2. With brackets.
|
|
|
|
|
(should
|
|
|
|
|
(equal (org-test-parse-and-interpret "\\alpha{}text") "\\alpha{}text\n")))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-element/export-snippet-interpreter ()
|
|
|
|
|
"Test export snippet interpreter."
|
|
|
|
|
(should (equal (org-test-parse-and-interpret "@back-end{test}")
|
|
|
|
|
"@back-end{test}\n")))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-element/footnote-reference-interpreter ()
|
|
|
|
|
"Test footnote reference interpreter."
|
|
|
|
|
;; 1. Regular reference.
|
|
|
|
|
(should (equal (org-test-parse-and-interpret "Text[fn:1]") "Text[fn:1]\n"))
|
|
|
|
|
;; 2. Normalized reference.
|
|
|
|
|
(should (equal (org-test-parse-and-interpret "Text[1]") "Text[1]\n"))
|
|
|
|
|
;; 3. Named reference.
|
|
|
|
|
(should (equal (org-test-parse-and-interpret "Text[fn:label]")
|
|
|
|
|
"Text[fn:label]\n"))
|
|
|
|
|
;; 4. Inline reference.
|
|
|
|
|
(should (equal (org-test-parse-and-interpret "Text[fn:label:def]")
|
|
|
|
|
"Text[fn:label:def]\n"))
|
|
|
|
|
;; 5. Anonymous reference.
|
|
|
|
|
(should (equal (org-test-parse-and-interpret "Text[fn::def]")
|
|
|
|
|
"Text[fn::def]\n")))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-element/inline-babel-call-interpreter ()
|
|
|
|
|
"Test inline babel call interpreter."
|
|
|
|
|
;; 1. Without arguments.
|
|
|
|
|
(should (equal (org-test-parse-and-interpret "call_test()") "call_test()\n"))
|
|
|
|
|
;; 2. With arguments.
|
|
|
|
|
(should (equal (org-test-parse-and-interpret "call_test(x=2)")
|
|
|
|
|
"call_test(x=2)\n"))
|
|
|
|
|
;; 3. With header arguments.
|
|
|
|
|
(should (equal (org-test-parse-and-interpret
|
|
|
|
|
"call_test[:results output]()[:results html]")
|
|
|
|
|
"call_test[:results output]()[:results html]\n")))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-element/inline-src-block-interpreter ()
|
|
|
|
|
"Test inline src block interpreter."
|
|
|
|
|
;; 1. Without header argument.
|
|
|
|
|
(should (equal (org-test-parse-and-interpret "src_emacs-lisp{(+ 1 1)}")
|
|
|
|
|
"src_emacs-lisp{(+ 1 1)}\n"))
|
|
|
|
|
;; 2. With header arguments.
|
|
|
|
|
(should (equal (org-test-parse-and-interpret
|
|
|
|
|
"src_emacs-lisp[:results silent]{(+ 1 1)}")
|
|
|
|
|
"src_emacs-lisp[:results silent]{(+ 1 1)}\n")))
|
|
|
|
|
|
org-element: Define new objects (bold, code, italic, ...)
* contrib/lisp/org-e-ascii.el (org-e-ascii-option-alist): Fix typo.
(org-e-ascii-bold, org-e-ascii-code, org-e-ascii-strike-through,
org-e-ascii-underline): New functions.
(org-e-ascii-emphasis): Remove function.
* contrib/lisp/org-e-html.el (org-e-html-text-markup-alist): Variable
renamed from `org-e-html-emphasis-alist'. Change value type.
(org-e-html-bold, org-e-html-italic, org-e-html-strike-through,
org-e-html-underline): New functions.
(org-e-html-verbatim): Update function.
(org-e-html-emphasis): Remove function.
* contrib/lisp/org-e-latex.el (org-e-latex-text-markup-alist):
Variable renamed from `org-e-latex-emphasis-alist'. Change value
type.
(org-e-latex-center-block): Fix docstring.
(org-e-latex--text-markup, org-e-latex-bold, org-e-latex-code,
org-e-latex-italic, org-e-latex-strike-through,
org-e-latex-underline): New functions.
(org-e-latex-verbatim): Update function.
(org-e-latex-emphasis): Remove function.
* contrib/lisp/org-e-odt.el (org-e-odt-bold, org-e-odt-code,
org-e-odt-italic, org-e-odt-strike-through, org-e-odt-underline):
New functions.
(org-e-odt-verbatim): Update function.
(org-e-odt-center-block): Fix docstring.
(org-e-odt-emphasis): Remove function.
* contrib/lisp/org-element.el (org-element-bold-parser):
(org-element-bold-interpreter, org-element-code-parser,
org-element-code-interpreter, org-element-italic-parser,
org-element-italic-interpreter, org-element-strike-through-parser,
org-element-strike-through-interpreter, org-element-underline-parser,
org-element-underline-interpreter): New functions.
(org-element-emphasis-parser, org-element-emphasis-interpreter):
Remove functions.
(org-element-verbatim-parser, org-element-verbatim-interpreter,
org-element-text-markup-successor): Update function.
(org-element-object-successor-alist): Add associations for new object
types.
(org-element-recursive-objects): Add `bold', `italic',
`strike-through' and `underline' as recursive types.
(org-element-object-restrictions): Add restrictions for new recursive
object types.
* contrib/lisp/org-export.el (org-export-filters-alist): Add filters
for new object types.
(org-export-with-todo-keywords): Add missing keywords.
(org-export-filter-center-block-functions,
org-export-filter-drawer-functions,
org-export-filter-dynamic-block-functions,
org-export-filter-headline-functions,
org-export-filter-inlinetask-functions,
org-export-filter-plain-list-functions,
org-export-filter-item-functions, org-export-filter-comment-functions,
org-export-filter-comment-block-functions,
org-export-filter-example-block-functions,
org-export-filter-export-block-functions,
org-export-filter-fixed-width-functions,
org-export-filter-footnote-definition-functions,
org-export-filter-horizontal-rule-functions,
org-export-filter-keyword-functions,
org-export-filter-latex-environment-functions,
org-export-filter-babel-call-functions,
org-export-filter-paragraph-functions,
org-export-filter-property-drawer-functions,
org-export-filter-quote-section-functions,
org-export-filter-quote-block-functions,
org-export-filter-section-functions,
org-export-filter-special-block-functions,
org-export-filter-src-block-functions,
org-export-filter-table-functions,
org-export-filter-table-cell-functions,
org-export-filter-table-row-functions,
org-export-filter-verse-block-functions,
org-export-filter-entity-functions,
org-export-filter-export-snippet-functions,
org-export-filter-footnote-reference-functions,
org-export-filter-inline-babel-call-functions,
org-export-filter-inline-src-block-functions,
org-export-filter-latex-fragment-functions,
org-export-filter-line-break-functions,
org-export-filter-link-functions, org-export-filter-macro-functions,
org-export-filter-radio-target-functions,
org-export-filter-statistics-cookie-functions,
org-export-filter-subscript-functions,
org-export-filter-superscript-functions,
org-export-filter-target-functions,
org-export-filter-time-stamp-functions,
org-export-filter-verbatim-functions): Fix docstring.
(org-export-filter-bold-functions, org-export-filter-code-functions,
org-export-filter-italic-functions,
org-export-filter-strike-through-functions,
org-export-filter-underline-functions): New variables.
(org-export-filter-emphasis-functions): Remove variable.
* testing/lisp/test-org-element.el: Add tests.
2012-04-28 12:00:50 -04:00
|
|
|
|
(ert-deftest test-org-element/italic-interpreter ()
|
|
|
|
|
"Test italic interpreter."
|
|
|
|
|
(should (equal (org-test-parse-and-interpret "/text/") "/text/\n")))
|
|
|
|
|
|
2012-04-27 11:16:17 -04:00
|
|
|
|
(ert-deftest test-org-element/latex-fragment-interpreter ()
|
|
|
|
|
"Test latex fragment interpreter."
|
|
|
|
|
(let ((org-latex-regexps
|
|
|
|
|
'(("begin" "^[ ]*\\(\\\\begin{\\([a-zA-Z0-9\\*]+\\)[^ |