2012-02-22 18:57:59 -05:00
|
|
|
|
;;; test-org-export.el --- Tests for org-export.el
|
|
|
|
|
|
|
|
|
|
;; Copyright (C) 2012 Nicolas Goaziou
|
|
|
|
|
|
|
|
|
|
;; Author: Nicolas Goaziou <n.goaziou at gmail dot com>
|
|
|
|
|
|
|
|
|
|
;; Released under the GNU General Public License version 3
|
|
|
|
|
;; see: http://www.gnu.org/licenses/gpl-3.0.html
|
|
|
|
|
|
|
|
|
|
;;;; Comments
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; Code:
|
2012-02-29 12:38:54 -05:00
|
|
|
|
|
|
|
|
|
(unless (featurep 'org-export)
|
|
|
|
|
(signal 'missing-test-dependency "org-export"))
|
2012-02-22 18:57:59 -05:00
|
|
|
|
|
|
|
|
|
(defmacro org-test-with-backend (backend &rest body)
|
|
|
|
|
"Execute body with an export back-end defined.
|
|
|
|
|
|
2012-05-18 04:18:42 -04:00
|
|
|
|
BACKEND is the name of the back-end. BODY is the body to
|
|
|
|
|
execute. The defined back-end simply returns parsed data as Org
|
|
|
|
|
syntax."
|
2012-02-22 18:57:59 -05:00
|
|
|
|
(declare (debug (form body)) (indent 1))
|
2012-05-18 04:18:42 -04:00
|
|
|
|
`(let ((,(intern (format "org-%s-translate-alist" backend))
|
|
|
|
|
',(let (transcode-table)
|
|
|
|
|
(dolist (type (append org-element-all-elements
|
|
|
|
|
org-element-all-objects)
|
|
|
|
|
transcode-table)
|
2012-07-15 14:02:22 -04:00
|
|
|
|
(push
|
|
|
|
|
(cons type
|
|
|
|
|
(lambda (obj contents info)
|
|
|
|
|
(funcall
|
|
|
|
|
(intern (format "org-element-%s-interpreter" type))
|
|
|
|
|
obj contents)))
|
|
|
|
|
transcode-table)))))
|
|
|
|
|
(progn ,@body)))
|
2012-02-22 18:57:59 -05:00
|
|
|
|
|
org-export: Define tools for tables, table rows and table cells
* contrib/lisp/org-export.el (org-export-table-cell-width,
org-export-table-cell-alignment, org-export-table-cell-borders,
org-export-table-row-group, org-export-table-has-special-column-p,
org-export-table-row-is-special-p, org-export-get-parent-table,
org-export-table-dimensions, org-export-table-cell-address,
org-export-get-table-cell-at, org-export-table-has-header-p,
org-export-table-cell-starts-colgroup-p,
org-export-table-cell-ends-colgroup-p,
org-export-table-row-starts-rowgroup-p,
org-export-table-row-ends-rowgroup-p,
org-export-table-row-starts-header-p,
org-export-table-row-ends-header-p): New functions.
(org-export-table-format-info, org-export-clean-table): Removed
functions.
(org-export-filter-table-cell-functions,
org-export-filter-table-row-functions): New variables.
(org-export-filters-alist): Install new filters.
(org-export-collect-tree-properties, org-export--skip-p): Mark special
rows and cells as ignored.
* testing/lisp/test-org-export.el: Add tests.
2012-04-11 02:54:24 -04:00
|
|
|
|
(defmacro org-test-with-parsed-data (data &rest body)
|
|
|
|
|
"Execute body with parsed data available.
|
|
|
|
|
|
|
|
|
|
DATA is a string containing the data to be parsed. BODY is the
|
|
|
|
|
body to execute. Parse tree is available under the `tree'
|
|
|
|
|
variable, and communication channel under `info'.
|
|
|
|
|
|
|
|
|
|
This function calls `org-export-collect-tree-properties'. As
|
|
|
|
|
such, `:ignore-list' (for `org-element-map') and
|
|
|
|
|
`:parse-tree' (for `org-export-get-genealogy') properties are
|
|
|
|
|
already filled in `info'."
|
|
|
|
|
(declare (debug (form body)) (indent 1))
|
|
|
|
|
`(org-test-with-temp-text ,data
|
|
|
|
|
(let* ((tree (org-element-parse-buffer))
|
2012-05-20 05:53:39 -04:00
|
|
|
|
(info (org-export-collect-tree-properties
|
|
|
|
|
tree (org-export-get-environment))))
|
org-export: Define tools for tables, table rows and table cells
* contrib/lisp/org-export.el (org-export-table-cell-width,
org-export-table-cell-alignment, org-export-table-cell-borders,
org-export-table-row-group, org-export-table-has-special-column-p,
org-export-table-row-is-special-p, org-export-get-parent-table,
org-export-table-dimensions, org-export-table-cell-address,
org-export-get-table-cell-at, org-export-table-has-header-p,
org-export-table-cell-starts-colgroup-p,
org-export-table-cell-ends-colgroup-p,
org-export-table-row-starts-rowgroup-p,
org-export-table-row-ends-rowgroup-p,
org-export-table-row-starts-header-p,
org-export-table-row-ends-header-p): New functions.
(org-export-table-format-info, org-export-clean-table): Removed
functions.
(org-export-filter-table-cell-functions,
org-export-filter-table-row-functions): New variables.
(org-export-filters-alist): Install new filters.
(org-export-collect-tree-properties, org-export--skip-p): Mark special
rows and cells as ignored.
* testing/lisp/test-org-export.el: Add tests.
2012-04-11 02:54:24 -04:00
|
|
|
|
,@body)))
|
|
|
|
|
|
2012-05-26 07:44:13 -04:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; Tests
|
|
|
|
|
|
2012-02-22 18:57:59 -05:00
|
|
|
|
(ert-deftest test-org-export/parse-option-keyword ()
|
|
|
|
|
"Test reading all standard #+OPTIONS: items."
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
2012-07-24 10:04:35 -04:00
|
|
|
|
(org-export--parse-option-keyword
|
2012-02-22 18:57:59 -05:00
|
|
|
|
"H:1 num:t \\n:t timestamp:t arch:t author:t creator:t d:t email:t
|
2012-08-16 06:46:49 -04:00
|
|
|
|
*:t e:t ::t f:t pri:t -:t ^:t toc:t |:t tags:t tasks:t <:t todo:t inline:nil")
|
2012-02-22 18:57:59 -05:00
|
|
|
|
'(:headline-levels
|
|
|
|
|
1 :preserve-breaks t :section-numbers t :time-stamp-file t
|
|
|
|
|
:with-archived-trees t :with-author t :with-creator t :with-drawers t
|
|
|
|
|
:with-email t :with-emphasize t :with-entities t :with-fixed-width t
|
2012-08-16 06:46:49 -04:00
|
|
|
|
:with-footnotes t :with-inlinetasks nil :with-priority t
|
|
|
|
|
:with-special-strings t :with-sub-superscript t :with-toc t :with-tables t
|
|
|
|
|
:with-tags t :with-tasks t :with-timestamps t :with-todo-keywords t)))
|
2012-02-22 18:57:59 -05:00
|
|
|
|
;; Test some special values.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
2012-07-24 10:04:35 -04:00
|
|
|
|
(org-export--parse-option-keyword
|
2012-02-22 18:57:59 -05:00
|
|
|
|
"arch:headline creator:comment d:(\"TEST\")
|
2012-04-29 16:55:37 -04:00
|
|
|
|
^:{} toc:1 tags:not-in-toc tasks:todo num:2 <:active")
|
2012-02-29 13:05:45 -05:00
|
|
|
|
'( :section-numbers
|
|
|
|
|
2
|
|
|
|
|
:with-archived-trees headline :with-creator comment
|
|
|
|
|
:with-drawers ("TEST") :with-sub-superscript {} :with-toc 1
|
2012-04-29 16:55:37 -04:00
|
|
|
|
:with-tags not-in-toc :with-tasks todo :with-timestamps active))))
|
2012-02-22 18:57:59 -05:00
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/get-inbuffer-options ()
|
|
|
|
|
"Test reading all standard export keywords."
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
(org-test-with-temp-text "#+AUTHOR: Me, Myself and I
|
|
|
|
|
#+CREATOR: Idem
|
|
|
|
|
#+DATE: Today
|
|
|
|
|
#+DESCRIPTION: Testing
|
|
|
|
|
#+DESCRIPTION: with two lines
|
|
|
|
|
#+EMAIL: some@email.org
|
2012-07-04 17:30:23 -04:00
|
|
|
|
#+EXCLUDE_TAGS: noexport invisible
|
2012-02-22 18:57:59 -05:00
|
|
|
|
#+KEYWORDS: test
|
|
|
|
|
#+LANGUAGE: en
|
2012-07-04 17:30:23 -04:00
|
|
|
|
#+SELECT_TAGS: export
|
2012-02-22 18:57:59 -05:00
|
|
|
|
#+TITLE: Some title
|
|
|
|
|
#+TITLE: with spaces"
|
2012-07-24 10:04:35 -04:00
|
|
|
|
(org-export--get-inbuffer-options))
|
2012-02-22 18:57:59 -05:00
|
|
|
|
'(:author
|
2012-06-22 09:07:07 -04:00
|
|
|
|
("Me, Myself and I") :creator "Idem" :date ("Today")
|
2012-02-22 18:57:59 -05:00
|
|
|
|
:description "Testing\nwith two lines" :email "some@email.org"
|
|
|
|
|
:exclude-tags ("noexport" "invisible") :keywords "test" :language "en"
|
2012-03-28 08:04:26 -04:00
|
|
|
|
:select-tags ("export") :title ("Some title with spaces")))))
|
2012-02-22 18:57:59 -05:00
|
|
|
|
|
2012-07-04 17:30:23 -04:00
|
|
|
|
(ert-deftest test-org-export/get-subtree-options ()
|
|
|
|
|
"Test setting options from headline's properties."
|
|
|
|
|
;; EXPORT_TITLE.
|
|
|
|
|
(org-test-with-temp-text "#+TITLE: Title
|
|
|
|
|
* Headline
|
|
|
|
|
:PROPERTIES:
|
|
|
|
|
:EXPORT_TITLE: Subtree Title
|
|
|
|
|
:END:
|
|
|
|
|
Paragraph"
|
|
|
|
|
(forward-line)
|
|
|
|
|
(should (equal (plist-get (org-export-get-environment nil t) :title)
|
|
|
|
|
'("Subtree Title"))))
|
|
|
|
|
:title
|
|
|
|
|
'("subtree-title")
|
|
|
|
|
;; EXPORT_OPTIONS.
|
|
|
|
|
(org-test-with-temp-text "#+OPTIONS: H:1
|
|
|
|
|
* Headline
|
|
|
|
|
:PROPERTIES:
|
|
|
|
|
:EXPORT_OPTIONS: H:2
|
|
|
|
|
:END:
|
|
|
|
|
Paragraph"
|
|
|
|
|
(forward-line)
|
|
|
|
|
(should
|
|
|
|
|
(= 2 (plist-get (org-export-get-environment nil t) :headline-levels))))
|
2012-07-25 06:25:58 -04:00
|
|
|
|
;; EXPORT_DATE.
|
2012-07-04 17:30:23 -04:00
|
|
|
|
(org-test-with-temp-text "#+DATE: today
|
|
|
|
|
* Headline
|
|
|
|
|
:PROPERTIES:
|
|
|
|
|
:EXPORT_DATE: 29-03-2012
|
|
|
|
|
:END:
|
|
|
|
|
Paragraph"
|
|
|
|
|
(forward-line)
|
2012-07-25 06:25:58 -04:00
|
|
|
|
(should (equal (plist-get (org-export-get-environment nil t) :date)
|
|
|
|
|
'("29-03-2012"))))
|
|
|
|
|
;; Export properties are case-insensitive.
|
|
|
|
|
(org-test-with-temp-text "* Headline
|
|
|
|
|
:PROPERTIES:
|
|
|
|
|
:EXPORT_Date: 29-03-2012
|
|
|
|
|
:END:
|
|
|
|
|
Paragraph"
|
2012-07-04 17:30:23 -04:00
|
|
|
|
(should (equal (plist-get (org-export-get-environment nil t) :date)
|
|
|
|
|
'("29-03-2012")))))
|
|
|
|
|
|
2012-02-22 18:57:59 -05:00
|
|
|
|
(ert-deftest test-org-export/handle-options ()
|
|
|
|
|
"Test if export options have an impact on output."
|
|
|
|
|
;; Test exclude tags.
|
|
|
|
|
(org-test-with-temp-text "* Head1 :noexport:"
|
2012-05-18 04:18:42 -04:00
|
|
|
|
(org-test-with-backend test
|
2012-02-22 18:57:59 -05:00
|
|
|
|
(should
|
|
|
|
|
(equal (org-export-as 'test nil nil nil '(:exclude-tags ("noexport")))
|
|
|
|
|
""))))
|
|
|
|
|
;; Test include tags.
|
2012-02-23 08:52:25 -05:00
|
|
|
|
(org-test-with-temp-text "
|
|
|
|
|
* Head1
|
2012-05-26 05:04:29 -04:00
|
|
|
|
* Head2
|
|
|
|
|
** Sub-Head2.1 :export:
|
|
|
|
|
*** Sub-Head2.1.1
|
2012-02-23 08:52:25 -05:00
|
|
|
|
* Head2"
|
2012-05-18 04:18:42 -04:00
|
|
|
|
(org-test-with-backend test
|
2012-02-22 18:57:59 -05:00
|
|
|
|
(should
|
2012-05-26 05:04:29 -04:00
|
|
|
|
(equal
|
|
|
|
|
"* Head2\n** Sub-Head2.1 :export:\n*** Sub-Head2.1.1\n"
|
|
|
|
|
(let ((org-tags-column 0))
|
|
|
|
|
(org-export-as 'test nil nil nil '(:select-tags ("export"))))))))
|
2012-02-23 08:52:25 -05:00
|
|
|
|
;; Test mixing include tags and exclude tags.
|
|
|
|
|
(org-test-with-temp-text "
|
|
|
|
|
* Head1 :export:
|
|
|
|
|
** Sub-Head1 :noexport:
|
|
|
|
|
** Sub-Head2
|
|
|
|
|
* Head2 :noexport:
|
|
|
|
|
** Sub-Head1 :export:"
|
2012-05-18 04:18:42 -04:00
|
|
|
|
(org-test-with-backend test
|
2012-02-23 08:52:25 -05:00
|
|
|
|
(should
|
|
|
|
|
(string-match
|
|
|
|
|
"\\* Head1[ \t]+:export:\n\\*\\* Sub-Head2\n"
|
|
|
|
|
(org-export-as
|
|
|
|
|
'test nil nil nil
|
|
|
|
|
'(:select-tags ("export") :exclude-tags ("noexport")))))))
|
2012-02-22 18:57:59 -05:00
|
|
|
|
;; Ignore tasks.
|
|
|
|
|
(let ((org-todo-keywords '((sequence "TODO" "DONE"))))
|
|
|
|
|
(org-test-with-temp-text "* TODO Head1"
|
2012-05-18 04:18:42 -04:00
|
|
|
|
(org-test-with-backend test
|
2012-02-22 18:57:59 -05:00
|
|
|
|
(should (equal (org-export-as 'test nil nil nil '(:with-tasks nil))
|
|
|
|
|
"")))))
|
|
|
|
|
(let ((org-todo-keywords '((sequence "TODO" "DONE"))))
|
|
|
|
|
(org-test-with-temp-text "* TODO Head1"
|
2012-05-18 04:18:42 -04:00
|
|
|
|
(org-test-with-backend test
|
2012-02-22 18:57:59 -05:00
|
|
|
|
(should (equal (org-export-as 'test nil nil nil '(:with-tasks t))
|
|
|
|
|
"* TODO Head1\n")))))
|
|
|
|
|
;; Archived tree.
|
|
|
|
|
(org-test-with-temp-text "* Head1 :archive:"
|
|
|
|
|
(let ((org-archive-tag "archive"))
|
2012-05-18 04:18:42 -04:00
|
|
|
|
(org-test-with-backend test
|
2012-02-22 18:57:59 -05:00
|
|
|
|
(should
|
|
|
|
|
(equal (org-export-as 'test nil nil nil '(:with-archived-trees nil))
|
|
|
|
|
"")))))
|
2012-02-23 05:24:58 -05:00
|
|
|
|
(org-test-with-temp-text "* Head1 :archive:\nbody\n** Sub-head 2"
|
|
|
|
|
(let ((org-archive-tag "archive"))
|
2012-05-18 04:18:42 -04:00
|
|
|
|
(org-test-with-backend test
|
2012-02-23 05:24:58 -05:00
|
|
|
|
(should
|
|
|
|
|
(string-match
|
|
|
|
|
"\\* Head1[ \t]+:archive:"
|
|
|
|
|
(org-export-as 'test nil nil nil
|
|
|
|
|
'(:with-archived-trees headline)))))))
|
2012-02-22 18:57:59 -05:00
|
|
|
|
(org-test-with-temp-text "* Head1 :archive:"
|
|
|
|
|
(let ((org-archive-tag "archive"))
|
2012-05-18 04:18:42 -04:00
|
|
|
|
(org-test-with-backend test
|
2012-02-22 18:57:59 -05:00
|
|
|
|
(should
|
|
|
|
|
(string-match
|
|
|
|
|
"\\`\\* Head1[ \t]+:archive:\n\\'"
|
|
|
|
|
(org-export-as 'test nil nil nil '(:with-archived-trees t)))))))
|
|
|
|
|
;; Drawers.
|
|
|
|
|
(let ((org-drawers '("TEST")))
|
|
|
|
|
(org-test-with-temp-text ":TEST:\ncontents\n:END:"
|
2012-05-18 04:18:42 -04:00
|
|
|
|
(org-test-with-backend test
|
2012-02-22 18:57:59 -05:00
|
|
|
|
(should (equal (org-export-as 'test nil nil nil '(:with-drawers nil))
|
2012-04-28 20:11:22 -04:00
|
|
|
|
""))
|
2012-02-22 18:57:59 -05:00
|
|
|
|
(should (equal (org-export-as 'test nil nil nil '(:with-drawers t))
|
2012-04-28 20:11:22 -04:00
|
|
|
|
":TEST:\ncontents\n:END:\n")))))
|
|
|
|
|
(let ((org-drawers '("FOO" "BAR")))
|
|
|
|
|
(org-test-with-temp-text ":FOO:\nkeep\n:END:\n:BAR:\nremove\n:END:"
|
2012-05-18 04:18:42 -04:00
|
|
|
|
(org-test-with-backend test
|
2012-04-28 20:11:22 -04:00
|
|
|
|
(should
|
|
|
|
|
(equal (org-export-as 'test nil nil nil '(:with-drawers ("FOO")))
|
|
|
|
|
":FOO:\nkeep\n:END:\n")))))
|
|
|
|
|
;; Timestamps.
|
2012-04-29 16:55:37 -04:00
|
|
|
|
(org-test-with-temp-text "[2012-04-29 sun. 10:45]<2012-04-29 sun. 10:45>"
|
2012-05-18 04:18:42 -04:00
|
|
|
|
(org-test-with-backend test
|
2012-04-28 20:11:22 -04:00
|
|
|
|
(should
|
|
|
|
|
(equal (org-export-as 'test nil nil nil '(:with-timestamps t))
|
2012-04-29 16:55:37 -04:00
|
|
|
|
"[2012-04-29 sun. 10:45]<2012-04-29 sun. 10:45>\n"))
|
2012-04-28 20:11:22 -04:00
|
|
|
|
(should
|
2012-04-29 16:55:37 -04:00
|
|
|
|
(equal (org-export-as 'test nil nil nil '(:with-timestamps nil)) ""))
|
|
|
|
|
(should
|
|
|
|
|
(equal (org-export-as 'test nil nil nil '(:with-timestamps active))
|
|
|
|
|
"<2012-04-29 sun. 10:45>\n"))
|
|
|
|
|
(should
|
|
|
|
|
(equal (org-export-as 'test nil nil nil '(:with-timestamps inactive))
|
|
|
|
|
"[2012-04-29 sun. 10:45]\n"))))
|
2012-04-28 20:11:22 -04:00
|
|
|
|
;; Clocks.
|
|
|
|
|
(let ((org-clock-string "CLOCK:"))
|
|
|
|
|
(org-test-with-temp-text "CLOCK: [2012-04-29 sun. 10:45]"
|
2012-05-18 04:18:42 -04:00
|
|
|
|
(org-test-with-backend test
|
2012-04-28 20:11:22 -04:00
|
|
|
|
(should
|
|
|
|
|
(equal (org-export-as 'test nil nil nil '(:with-clocks t))
|
|
|
|
|
"CLOCK: [2012-04-29 sun. 10:45]\n"))
|
|
|
|
|
(should
|
|
|
|
|
(equal (org-export-as 'test nil nil nil '(:with-clocks nil)) "")))))
|
|
|
|
|
;; Plannings.
|
|
|
|
|
(let ((org-closed-string "CLOSED:"))
|
|
|
|
|
(org-test-with-temp-text "CLOSED: [2012-04-29 sun. 10:45]"
|
2012-05-18 04:18:42 -04:00
|
|
|
|
(org-test-with-backend test
|
2012-04-28 20:11:22 -04:00
|
|
|
|
(should
|
|
|
|
|
(equal (org-export-as 'test nil nil nil '(:with-plannings t))
|
|
|
|
|
"CLOSED: [2012-04-29 sun. 10:45]\n"))
|
|
|
|
|
(should
|
|
|
|
|
(equal (org-export-as 'test nil nil nil '(:with-plannings nil))
|
2012-08-16 06:46:49 -04:00
|
|
|
|
"")))))
|
|
|
|
|
;; Inlinetasks.
|
|
|
|
|
(when (featurep 'org-inlinetask)
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
(let ((org-inlinetask-min-level 15))
|
|
|
|
|
(org-test-with-temp-text "*************** Task"
|
|
|
|
|
(org-test-with-backend test
|
|
|
|
|
(org-export-as 'test nil nil nil '(:with-inlinetasks nil)))))
|
|
|
|
|
""))
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
(let ((org-inlinetask-min-level 15))
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"*************** Task\nContents\n*************** END"
|
|
|
|
|
(org-test-with-backend test
|
|
|
|
|
(org-export-as 'test nil nil nil '(:with-inlinetasks nil)))))
|
|
|
|
|
""))))
|
2012-02-22 18:57:59 -05:00
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/comment-tree ()
|
|
|
|
|
"Test if export process ignores commented trees."
|
|
|
|
|
(let ((org-comment-string "COMMENT"))
|
|
|
|
|
(org-test-with-temp-text "* COMMENT Head1"
|
2012-05-18 04:18:42 -04:00
|
|
|
|
(org-test-with-backend test
|
2012-02-22 18:57:59 -05:00
|
|
|
|
(should (equal (org-export-as 'test) ""))))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/export-scope ()
|
|
|
|
|
"Test all export scopes."
|
|
|
|
|
(org-test-with-temp-text "
|
|
|
|
|
* Head1
|
|
|
|
|
** Head2
|
|
|
|
|
text
|
|
|
|
|
*** Head3"
|
2012-05-18 04:18:42 -04:00
|
|
|
|
(org-test-with-backend test
|
2012-02-22 18:57:59 -05:00
|
|
|
|
;; Subtree.
|
|
|
|
|
(forward-line 3)
|
|
|
|
|
(should (equal (org-export-as 'test 'subtree) "text\n*** Head3\n"))
|
|
|
|
|
;; Visible.
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(forward-line)
|
|
|
|
|
(org-cycle)
|
|
|
|
|
(should (equal (org-export-as 'test nil 'visible) "* Head1\n"))
|
|
|
|
|
;; Body only.
|
|
|
|
|
(flet ((org-test-template (body info) (format "BEGIN\n%sEND" body)))
|
2012-06-17 19:34:57 -04:00
|
|
|
|
(push '(template . org-test-template) org-test-translate-alist)
|
2012-02-22 18:57:59 -05:00
|
|
|
|
(should (equal (org-export-as 'test nil nil 'body-only)
|
|
|
|
|
"* Head1\n** Head2\ntext\n*** Head3\n"))
|
|
|
|
|
(should (equal (org-export-as 'test)
|
|
|
|
|
"BEGIN\n* Head1\n** Head2\ntext\n*** Head3\nEND")))
|
|
|
|
|
;; Region.
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(forward-line 3)
|
2012-03-04 08:38:57 -05:00
|
|
|
|
(transient-mark-mode 1)
|
|
|
|
|
(push-mark (point) t t)
|
|
|
|
|
(goto-char (point-at-eol))
|
2012-03-22 11:49:19 -04:00
|
|
|
|
(should (equal (org-export-as 'test) "text\n"))))
|
|
|
|
|
;; Subtree with a code block calling another block outside.
|
|
|
|
|
(org-test-with-temp-text "
|
|
|
|
|
* Head1
|
|
|
|
|
#+BEGIN_SRC emacs-lisp :noweb yes :exports results
|
|
|
|
|
<<test>>
|
|
|
|
|
#+END_SRC
|
|
|
|
|
* Head2
|
|
|
|
|
#+NAME: test
|
|
|
|
|
#+BEGIN_SRC emacs-lisp
|
|
|
|
|
\(+ 1 2)
|
|
|
|
|
#+END_SRC"
|
2012-05-18 04:18:42 -04:00
|
|
|
|
(org-test-with-backend test
|
2012-03-22 11:49:19 -04:00
|
|
|
|
(forward-line 1)
|
2012-07-04 17:30:23 -04:00
|
|
|
|
(should (equal (org-export-as 'test 'subtree) ": 3\n")))))
|
2012-02-23 15:06:17 -05:00
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/expand-include ()
|
|
|
|
|
"Test file inclusion in an Org buffer."
|
|
|
|
|
;; Full insertion with recursive inclusion.
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
(format "#+INCLUDE: \"%s/examples/include.org\"" org-test-dir)
|
|
|
|
|
(org-export-expand-include-keyword)
|
|
|
|
|
(should (equal (buffer-string)
|
|
|
|
|
"Small Org file with an include keyword.
|
|
|
|
|
|
2012-02-29 13:05:45 -05:00
|
|
|
|
#+BEGIN_SRC emacs-lisp :exports results\n(+ 2 1)\n#+END_SRC
|
2012-02-23 15:06:17 -05:00
|
|
|
|
|
|
|
|
|
Success!
|
|
|
|
|
|
|
|
|
|
* Heading
|
|
|
|
|
body\n")))
|
|
|
|
|
;; Localized insertion.
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
(format "#+INCLUDE: \"%s/examples/include.org\" :lines \"1-2\""
|
|
|
|
|
org-test-dir)
|
|
|
|
|
(org-export-expand-include-keyword)
|
|
|
|
|
(should (equal (buffer-string)
|
|
|
|
|
"Small Org file with an include keyword.\n")))
|
|
|
|
|
;; Insertion with constraints on headlines level.
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
(format
|
|
|
|
|
"* Top heading\n#+INCLUDE: \"%s/examples/include.org\" :lines \"9-\""
|
|
|
|
|
org-test-dir)
|
|
|
|
|
(org-export-expand-include-keyword)
|
|
|
|
|
(should (equal (buffer-string) "* Top heading\n** Heading\nbody\n")))
|
|
|
|
|
;; Inclusion within an example block.
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
(format "#+INCLUDE: \"%s/examples/include.org\" :lines \"1-2\" example"
|
|
|
|
|
org-test-dir)
|
|
|
|
|
(org-export-expand-include-keyword)
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
(buffer-string)
|
|
|
|
|
"#+BEGIN_EXAMPLE\nSmall Org file with an include keyword.\n#+END_EXAMPLE\n")))
|
|
|
|
|
;; Inclusion within a src-block.
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
(format
|
|
|
|
|
"#+INCLUDE: \"%s/examples/include.org\" :lines \"4-5\" src emacs-lisp"
|
|
|
|
|
org-test-dir)
|
|
|
|
|
(org-export-expand-include-keyword)
|
|
|
|
|
(should (equal (buffer-string)
|
|
|
|
|
"#+BEGIN_SRC emacs-lisp\n(+ 2 1)\n#+END_SRC\n"))))
|
2012-02-25 07:08:40 -05:00
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/user-ignore-list ()
|
|
|
|
|
"Test if `:ignore-list' accepts user input."
|
2012-05-18 04:18:42 -04:00
|
|
|
|
(org-test-with-backend test
|
2012-02-25 07:08:40 -05:00
|
|
|
|
(flet ((skip-note-head
|
|
|
|
|
(data backend info)
|
|
|
|
|
;; Ignore headlines with the word "note" in their title.
|
|
|
|
|
(org-element-map
|
|
|
|
|
data 'headline
|
|
|
|
|
(lambda (headline)
|
|
|
|
|
(when (string-match "\\<note\\>"
|
|
|
|
|
(org-element-property :raw-value headline))
|
|
|
|
|
(org-export-ignore-element headline info)))
|
|
|
|
|
info)
|
|
|
|
|
data))
|
|
|
|
|
;; Install function in parse tree filters.
|
|
|
|
|
(let ((org-export-filter-parse-tree-functions '(skip-note-head)))
|
|
|
|
|
(org-test-with-temp-text "* Head1\n* Head2 (note)\n"
|
|
|
|
|
(should (equal (org-export-as 'test) "* Head1\n")))))))
|
2012-02-25 08:51:15 -05:00
|
|
|
|
|
2012-04-27 18:57:38 -04:00
|
|
|
|
(ert-deftest test-org-export/before-parsing-hook ()
|
|
|
|
|
"Test `org-export-before-parsing-hook'."
|
2012-05-18 04:18:42 -04:00
|
|
|
|
(org-test-with-backend test
|
2012-04-27 18:57:38 -04:00
|
|
|
|
(org-test-with-temp-text "* Headline 1\nBody 1\n* Headline 2\nBody 2"
|
|
|
|
|
(let ((org-export-before-parsing-hook
|
2012-08-24 04:06:14 -04:00
|
|
|
|
'((lambda (backend)
|
org-export: Remove unnecessary back-end arguments
* contrib/lisp/org-e-ascii.el (org-e-ascii--build-title,
org-e-ascii--build-caption, org-e-ascii--list-listings,
org-e-ascii--list-tables, org-e-ascii--describe-links,
org-e-ascii-template--document-title, org-e-ascii-dynamic-block,
org-e-ascii-inlinetask, org-e-ascii-item, org-e-ascii-link,
org-e-ascii-quote-section, org-e-ascii--table-cell-width): Do not
provide back-end symbol.
* contrib/lisp/org-e-html.el (org-e-html--caption/label-string,
org-e-html-footnote-section, org-e-html-template,
org-e-html-dynamic-block, org-e-html-format-headline--wrap,
org-e-html-headline, org-e-html-item, org-e-html-link,
org-e-html-time-stamp): Do not provide back-end symbol.
* contrib/lisp/org-e-latex.el (org-e-latex--caption/label-string,
org-e-latex-template, org-e-latex-dynamic-block,
org-e-latex-footnote-reference, org-e-latex-headline,
org-e-latex-inlinetask, org-e-latex-item, org-e-latex-link,
org-e-latex-src-block): Do not provide back-end symbol.
* contrib/lisp/org-e-odt.el (org-e-odt-format-preamble,
org-e-odt-format-label, org-e-odt-write-manifest-file,
org-e-odt--caption/label-string, org-e-odt-dynamic-block,
org-e-odt-format-headline--wrap, org-e-odt-headline, org-e-odt-item,
org-e-odt-latex-environment, org-e-odt-link, org-e-odt-src-block,
org-e-odt-time-stamp): Do not provide back-end symbol.
* contrib/lisp/org-export.el (org-export-get-environment): Provide
back-end symbol under `:back-end' property.
(org-export-collect-tree-properties, org-export-data,
org-export-filter-verbatim-functions, org-export-install-filters,
org-export-as, org-export-expand-macro,
org-export-filter-apply-functions, org-export-secondary-string):
Remove back-end references.
* testing/lisp/test-org-export.el: Update tests.
Back-end can be found in communication channel with (plist-get
info :back-end). Hence back-ends do not have to hard-code their name
in any transcoder. It will allow to derive a back-end from another
one.
2012-04-28 05:33:16 -04:00
|
|
|
|
(org-map-entries
|
|
|
|
|
(lambda ()
|
|
|
|
|
(delete-region (point) (progn (forward-line) (point)))))))))
|
2012-04-27 18:57:38 -04:00
|
|
|
|
(should (equal (org-export-as 'test) "Body 1\nBody 2\n"))))))
|
|
|
|
|
|
2012-03-10 14:25:32 -05:00
|
|
|
|
|
2012-06-12 04:25:00 -04:00
|
|
|
|
|
|
|
|
|
;;; Affiliated Keywords
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/read-attribute ()
|
|
|
|
|
"Test `org-export-read-attribute' specifications."
|
|
|
|
|
;; Standard test.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
(org-export-read-attribute
|
|
|
|
|
:attr_html
|
|
|
|
|
(org-test-with-temp-text "#+ATTR_HTML: :a 1 :b 2\nParagraph"
|
org-element: Rename a few internal functions
* contrib/lisp/org-element.el (org-element--parse-elements): Renamed
from `org-element-parse-elements'.
(org-element--parse-objects): Renamed from `org-element-parse-objects'.
(org-element--get-next-object-candidates): Renamed from
`org-element-get-next-object-candidates'.
(org-element--interpret-affiliated-keywords): Renamed from
`org-element-interpret--affiliated-keywords'.
(org-element--current-element): Renamed from
`org-element-current-element'.
(org-element--collect-affiliated-keywords): Renamed from
`org-element-collect-affiliated-keywords'.
(org-element-center-block-parser, org-element-drawer-parser,
org-element-dynamic-block-parser,
org-element-footnote-definition-parser, org-element-inlinetask-parser,
org-element-plain-list-parser, org-element-quote-block-parser,
org-element-special-block-parser, org-element-comment-parser,
org-element-comment-block-parser, org-element-example-block-parser,
org-element-export-block-parser, org-element-fixed-width-parser,
org-element-horizontal-rule-parser,
org-element-latex-environment-parser, org-element-paragraph-parser,
org-element-src-block-parser, org-element-table-parser,
org-element-verse-block-parser, org-element-fill-paragraph,
org-element-context, org-element-at-point, org-element-interpret-data,
org-element-parse-secondary-string, org-element-parse-buffer): Apply
name change.
* contrib/lisp/org-export.el (org-export-get-buffer-attributes): Apply
name change.
* testing/lisp/test-org-element.el: Update tests accordingly.
* testing/lisp/test-org-export.el: Update tests accordingly.
2012-07-19 05:23:43 -04:00
|
|
|
|
(org-element-at-point)))
|
2012-06-12 04:25:00 -04:00
|
|
|
|
'(:a 1 :b 2)))
|
|
|
|
|
;; Return nil on empty attribute.
|
|
|
|
|
(should-not
|
|
|
|
|
(org-export-read-attribute
|
|
|
|
|
:attr_html
|
org-element: Rename a few internal functions
* contrib/lisp/org-element.el (org-element--parse-elements): Renamed
from `org-element-parse-elements'.
(org-element--parse-objects): Renamed from `org-element-parse-objects'.
(org-element--get-next-object-candidates): Renamed from
`org-element-get-next-object-candidates'.
(org-element--interpret-affiliated-keywords): Renamed from
`org-element-interpret--affiliated-keywords'.
(org-element--current-element): Renamed from
`org-element-current-element'.
(org-element--collect-affiliated-keywords): Renamed from
`org-element-collect-affiliated-keywords'.
(org-element-center-block-parser, org-element-drawer-parser,
org-element-dynamic-block-parser,
org-element-footnote-definition-parser, org-element-inlinetask-parser,
org-element-plain-list-parser, org-element-quote-block-parser,
org-element-special-block-parser, org-element-comment-parser,
org-element-comment-block-parser, org-element-example-block-parser,
org-element-export-block-parser, org-element-fixed-width-parser,
org-element-horizontal-rule-parser,
org-element-latex-environment-parser, org-element-paragraph-parser,
org-element-src-block-parser, org-element-table-parser,
org-element-verse-block-parser, org-element-fill-paragraph,
org-element-context, org-element-at-point, org-element-interpret-data,
org-element-parse-secondary-string, org-element-parse-buffer): Apply
name change.
* contrib/lisp/org-export.el (org-export-get-buffer-attributes): Apply
name change.
* testing/lisp/test-org-element.el: Update tests accordingly.
* testing/lisp/test-org-export.el: Update tests accordingly.
2012-07-19 05:23:43 -04:00
|
|
|
|
(org-test-with-temp-text "Paragraph" (org-element-at-point)))))
|
2012-06-12 04:25:00 -04:00
|
|
|
|
|
2012-07-04 17:30:23 -04:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; Export Snippets
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/export-snippet ()
|
|
|
|
|
"Test export snippets transcoding."
|
|
|
|
|
(org-test-with-temp-text "@@test:A@@@@t:B@@"
|
|
|
|
|
(org-test-with-backend test
|
2012-07-15 14:02:22 -04:00
|
|
|
|
(let ((org-test-translate-alist
|
|
|
|
|
(cons (cons 'export-snippet
|
|
|
|
|
(lambda (snippet contents info)
|
|
|
|
|
(when (eq (org-export-snippet-backend snippet) 'test)
|
|
|
|
|
(org-element-property :value snippet))))
|
|
|
|
|
org-test-translate-alist)))
|
2012-07-04 17:30:23 -04:00
|
|
|
|
(let ((org-export-snippet-translation-alist nil))
|
|
|
|
|
(should (equal (org-export-as 'test) "A\n")))
|
|
|
|
|
(let ((org-export-snippet-translation-alist '(("t" . "test"))))
|
|
|
|
|
(should (equal (org-export-as 'test) "AB\n")))))))
|
|
|
|
|
|
|
|
|
|
|
2012-03-10 14:25:32 -05:00
|
|
|
|
|
2012-04-27 18:57:38 -04:00
|
|
|
|
;;; Footnotes
|
2012-03-10 14:25:32 -05:00
|
|
|
|
|
2012-02-25 08:51:15 -05:00
|
|
|
|
(ert-deftest test-org-export/footnotes ()
|
|
|
|
|
"Test footnotes specifications."
|
2012-06-06 17:39:04 -04:00
|
|
|
|
(let ((org-footnote-section nil)
|
|
|
|
|
(org-export-with-footnotes t))
|
2012-02-25 19:37:27 -05:00
|
|
|
|
;; 1. Read every type of footnote.
|
2012-07-28 17:21:38 -04:00
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'((1 . "A\n") (2 . "B") (3 . "C") (4 . "D"))
|
|
|
|
|
(org-test-with-parsed-data
|
|
|
|
|
"Text[fn:1] [1] [fn:label:C] [fn::D]\n\n[fn:1] A\n\n[1] B"
|
2012-06-06 17:39:04 -04:00
|
|
|
|
(org-element-map
|
|
|
|
|
tree 'footnote-reference
|
|
|
|
|
(lambda (ref)
|
|
|
|
|
(let ((def (org-export-get-footnote-definition ref info)))
|
|
|
|
|
(cons (org-export-get-footnote-number ref info)
|
|
|
|
|
(if (eq (org-element-property :type ref) 'inline) (car def)
|
|
|
|
|
(car (org-element-contents
|
|
|
|
|
(car (org-element-contents def))))))))
|
|
|
|
|
info))))
|
2012-02-26 04:55:44 -05:00
|
|
|
|
;; 2. Test nested footnotes order.
|
2012-06-06 17:39:04 -04:00
|
|
|
|
(org-test-with-parsed-data
|
2012-02-26 04:55:44 -05:00
|
|
|
|
"Text[fn:1:A[fn:2]] [fn:3].\n\n[fn:2] B [fn:3] [fn::D].\n\n[fn:3] C."
|
2012-06-06 17:39:04 -04:00
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'((1 . "fn:1") (2 . "fn:2") (3 . "fn:3") (4))
|
|
|
|
|
(org-element-map
|
|
|
|
|
tree 'footnote-reference
|
|
|
|
|
(lambda (ref)
|
|
|
|
|
(when (org-export-footnote-first-reference-p ref info)
|
|
|
|
|
(cons (org-export-get-footnote-number ref info)
|
|
|
|
|
(org-element-property :label ref))))
|
|
|
|
|
info))))
|
2012-02-26 04:55:44 -05:00
|
|
|
|
;; 3. Test nested footnote in invisible definitions.
|
|
|
|
|
(org-test-with-temp-text "Text[1]\n\n[1] B [2]\n\n[2] C."
|
|
|
|
|
;; Hide definitions.
|
|
|
|
|
(narrow-to-region (point) (point-at-eol))
|
|
|
|
|
(let* ((tree (org-element-parse-buffer))
|
2012-06-06 17:39:04 -04:00
|
|
|
|
(info (org-combine-plists
|
|
|
|
|
`(:parse-tree ,tree)
|
|
|
|
|
(org-export-collect-tree-properties
|
|
|
|
|
tree (org-export-get-environment)))))
|
2012-02-26 04:55:44 -05:00
|
|
|
|
;; Both footnotes should be seen.
|
|
|
|
|
(should
|
2012-03-04 05:57:16 -05:00
|
|
|
|
(= (length (org-export-collect-footnote-definitions tree info)) 2))))
|
|
|
|
|
;; 4. Test footnotes definitions collection.
|
2012-06-06 17:39:04 -04:00
|
|
|
|
(org-test-with-parsed-data "Text[fn:1:A[fn:2]] [fn:3].
|
2012-03-04 05:57:16 -05:00
|
|
|
|
|
|
|
|
|
\[fn:2] B [fn:3] [fn::D].
|
|
|
|
|
|
|
|
|
|
\[fn:3] C."
|
2012-06-06 17:39:04 -04:00
|
|
|
|
(should (= (length (org-export-collect-footnote-definitions tree info))
|
|
|
|
|
4)))
|
2012-04-13 09:30:02 -04:00
|
|
|
|
;; 5. Test export of footnotes defined outside parsing scope.
|
|
|
|
|
(org-test-with-temp-text "[fn:1] Out of scope
|
|
|
|
|
* Title
|
|
|
|
|
Paragraph[fn:1]"
|
2012-05-18 04:18:42 -04:00
|
|
|
|
(org-test-with-backend test
|
2012-07-15 14:02:22 -04:00
|
|
|
|
(let ((org-test-translate-alist
|
|
|
|
|
(cons (cons 'footnote-reference
|
|
|
|
|
(lambda (fn contents info)
|
|
|
|
|
(org-element-interpret-data
|
|
|
|
|
(org-export-get-footnote-definition fn info))))
|
|
|
|
|
org-test-translate-alist)))
|
2012-04-13 09:30:02 -04:00
|
|
|
|
(forward-line)
|
|
|
|
|
(should (equal "ParagraphOut of scope\n"
|
|
|
|
|
(org-export-as 'test 'subtree))))))))
|
2012-02-20 16:24:38 -05:00
|
|
|
|
|
2012-03-10 14:25:32 -05:00
|
|
|
|
|
2012-05-26 07:44:13 -04:00
|
|
|
|
|
|
|
|
|
;;; Headlines and Inlinetasks
|
|
|
|
|
|
2012-07-04 11:37:55 -04:00
|
|
|
|
(ert-deftest test-org-export/get-relative-level ()
|
|
|
|
|
"Test `org-export-get-relative-level' specifications."
|
|
|
|
|
;; Standard test.
|
|
|
|
|
(should
|
|
|
|
|
(equal '(1 2)
|
|
|
|
|
(let ((org-odd-levels-only nil))
|
|
|
|
|
(org-test-with-parsed-data "* Headline 1\n** Headline 2"
|
|
|
|
|
(org-element-map
|
|
|
|
|
tree 'headline
|
|
|
|
|
(lambda (h) (org-export-get-relative-level h info))
|
|
|
|
|
info)))))
|
|
|
|
|
;; Missing levels
|
|
|
|
|
(should
|
|
|
|
|
(equal '(1 3)
|
|
|
|
|
(let ((org-odd-levels-only nil))
|
|
|
|
|
(org-test-with-parsed-data "** Headline 1\n**** Headline 2"
|
|
|
|
|
(org-element-map
|
|
|
|
|
tree 'headline
|
|
|
|
|
(lambda (h) (org-export-get-relative-level h info))
|
|
|
|
|
info))))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/low-level-p ()
|
|
|
|
|
"Test `org-export-low-level-p' specifications."
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'(no yes)
|
|
|
|
|
(let ((org-odd-levels-only nil))
|
|
|
|
|
(org-test-with-parsed-data "* Headline 1\n** Headline 2"
|
|
|
|
|
(org-element-map
|
|
|
|
|
tree 'headline
|
|
|
|
|
(lambda (h) (if (org-export-low-level-p h info) 'yes 'no))
|
|
|
|
|
(plist-put info :headline-levels 1)))))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/get-headline-number ()
|
|
|
|
|
"Test `org-export-get-headline-number' specifications."
|
|
|
|
|
;; Standard test.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'((1) (1 1))
|
|
|
|
|
(let ((org-odd-levels-only nil))
|
|
|
|
|
(org-test-with-parsed-data "* Headline 1\n** Headline 2"
|
|
|
|
|
(org-element-map
|
|
|
|
|
tree 'headline
|
|
|
|
|
(lambda (h) (org-export-get-headline-number h info))
|
|
|
|
|
info)))))
|
|
|
|
|
;; Missing levels are replaced with 0.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'((1) (1 0 1))
|
|
|
|
|
(let ((org-odd-levels-only nil))
|
|
|
|
|
(org-test-with-parsed-data "* Headline 1\n*** Headline 2"
|
|
|
|
|
(org-element-map
|
|
|
|
|
tree 'headline
|
|
|
|
|
(lambda (h) (org-export-get-headline-number h info))
|
|
|
|
|
info))))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/numbered-headline-p ()
|
|
|
|
|
"Test `org-export-numbered-headline-p' specifications."
|
|
|
|
|
;; If `:section-numbers' is nil, never number headlines.
|
|
|
|
|
(should-not
|
|
|
|
|
(org-test-with-parsed-data "* Headline"
|
|
|
|
|
(org-element-map
|
|
|
|
|
tree 'headline
|
|
|
|
|
(lambda (h) (org-export-numbered-headline-p h info))
|
|
|
|
|
(plist-put info :section-numbers nil))))
|
|
|
|
|
;; If `:section-numbers' is a number, only number headlines with
|
|
|
|
|
;; a level greater that it.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'(yes no)
|
|
|
|
|
(org-test-with-parsed-data "* Headline 1\n** Headline 2"
|
|
|
|
|
(org-element-map
|
|
|
|
|
tree 'headline
|
|
|
|
|
(lambda (h) (if (org-export-numbered-headline-p h info) 'yes 'no))
|
|
|
|
|
(plist-put info :section-numbers 1)))))
|
|
|
|
|
;; Otherwise, headlines are always numbered.
|
|
|
|
|
(should
|
|
|
|
|
(org-test-with-parsed-data "* Headline"
|
|
|
|
|
(org-element-map
|
|
|
|
|
tree 'headline
|
|
|
|
|
(lambda (h) (org-export-numbered-headline-p h info))
|
|
|
|
|
(plist-put info :section-numbers t)))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/number-to-roman ()
|
|
|
|
|
"Test `org-export-number-to-roman' specifications."
|
|
|
|
|
;; If number is negative, return it as a string.
|
|
|
|
|
(should (equal (org-export-number-to-roman -1) "-1"))
|
|
|
|
|
;; Otherwise, return it as a roman number.
|
|
|
|
|
(should (equal (org-export-number-to-roman 1449) "MCDXLIX")))
|
|
|
|
|
|
2012-05-26 07:44:13 -04:00
|
|
|
|
(ert-deftest test-org-export/get-tags ()
|
|
|
|
|
"Test `org-export-get-tags' specifications."
|
|
|
|
|
(let ((org-export-exclude-tags '("noexport"))
|
|
|
|
|
(org-export-select-tags '("export")))
|
|
|
|
|
;; Standard test: tags which are not a select tag, an exclude tag,
|
|
|
|
|
;; or specified as optional argument shouldn't be ignored.
|
|
|
|
|
(should
|
|
|
|
|
(org-test-with-parsed-data "* Headline :tag:"
|
|
|
|
|
(org-export-get-tags (org-element-map tree 'headline 'identity info t)
|
|
|
|
|
info)))
|
|
|
|
|
;; Exclude tags are removed.
|
|
|
|
|
(should-not
|
|
|
|
|
(org-test-with-parsed-data "* Headline :noexport:"
|
|
|
|
|
(org-export-get-tags (org-element-map tree 'headline 'identity info t)
|
|
|
|
|
info)))
|
|
|
|
|
;; Select tags are removed.
|
|
|
|
|
(should-not
|
|
|
|
|
(org-test-with-parsed-data "* Headline :export:"
|
|
|
|
|
(org-export-get-tags (org-element-map tree 'headline 'identity info t)
|
|
|
|
|
info)))
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'("tag")
|
|
|
|
|
(org-test-with-parsed-data "* Headline :tag:export:"
|
|
|
|
|
(org-export-get-tags (org-element-map tree 'headline 'identity info t)
|
|
|
|
|
info))))
|
|
|
|
|
;; Tags provided in the optional argument are also ignored.
|
|
|
|
|
(should-not
|
|
|
|
|
(org-test-with-parsed-data "* Headline :ignore:"
|
|
|
|
|
(org-export-get-tags (org-element-map tree 'headline 'identity info t)
|
|
|
|
|
info '("ignore"))))))
|
|
|
|
|
|
2012-07-04 11:37:55 -04:00
|
|
|
|
(ert-deftest test-org-export/first-sibling-p ()
|
|
|
|
|
"Test `org-export-first-sibling-p' specifications."
|
2012-07-27 10:13:57 -04:00
|
|
|
|
;; Standard test.
|
2012-07-04 11:37:55 -04:00
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'(yes yes no)
|
2012-07-27 10:13:57 -04:00
|
|
|
|
(org-test-with-parsed-data "* Headline\n** Headline 2\n** Headline 3"
|
2012-07-04 11:37:55 -04:00
|
|
|
|
(org-element-map
|
2012-07-27 10:13:57 -04:00
|
|
|
|
tree 'headline
|
|
|
|
|
(lambda (h) (if (org-export-first-sibling-p h info) 'yes 'no))
|
|
|
|
|
info))))
|
|
|
|
|
;; Ignore headlines not exported.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'(yes)
|
|
|
|
|
(let ((org-export-exclude-tags '("ignore")))
|
|
|
|
|
(org-test-with-parsed-data "* Headline :ignore:\n* Headline 2"
|
|
|
|
|
(org-element-map
|
|
|
|
|
tree 'headline
|
|
|
|
|
(lambda (h) (if (org-export-first-sibling-p h info) 'yes 'no))
|
|
|
|
|
info))))))
|
2012-07-04 11:37:55 -04:00
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/last-sibling-p ()
|
|
|
|
|
"Test `org-export-last-sibling-p' specifications."
|
2012-07-27 10:13:57 -04:00
|
|
|
|
;; Standard test.
|
2012-07-04 11:37:55 -04:00
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'(yes no yes)
|
2012-07-27 10:13:57 -04:00
|
|
|
|
(org-test-with-parsed-data "* Headline\n** Headline 2\n** Headline 3"
|
2012-07-04 11:37:55 -04:00
|
|
|
|
(org-element-map
|
2012-07-27 10:13:57 -04:00
|
|
|
|
tree 'headline
|
|
|
|
|
(lambda (h) (if (org-export-last-sibling-p h info) 'yes 'no))
|
|
|
|
|
info))))
|
|
|
|
|
;; Ignore headlines not exported.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'(yes)
|
|
|
|
|
(let ((org-export-exclude-tags '("ignore")))
|
|
|
|
|
(org-test-with-parsed-data "* Headline\n* Headline 2 :ignore:"
|
|
|
|
|
(org-element-map
|
|
|
|
|
tree 'headline
|
|
|
|
|
(lambda (h) (if (org-export-last-sibling-p h info) 'yes 'no))
|
|
|
|
|
info))))))
|
2012-07-04 11:37:55 -04:00
|
|
|
|
|
2012-05-26 07:44:13 -04:00
|
|
|
|
|
2012-03-10 14:25:32 -05:00
|
|
|
|
|
|
|
|
|
;;; Links
|
|
|
|
|
|
2012-07-04 11:37:55 -04:00
|
|
|
|
(ert-deftest test-org-export/get-coderef-format ()
|
|
|
|
|
"Test `org-export-get-coderef-format' specifications."
|
|
|
|
|
;; A link without description returns "%s"
|
|
|
|
|
(should (equal (org-export-get-coderef-format "(ref:line)" nil)
|
|
|
|
|
"%s"))
|
|
|
|
|
;; Return "%s" when path is matched within description.
|
|
|
|
|
(should (equal (org-export-get-coderef-format "path" "desc (path)")
|
|
|
|
|
"desc %s"))
|
|
|
|
|
;; Otherwise return description.
|
|
|
|
|
(should (equal (org-export-get-coderef-format "path" "desc")
|
|
|
|
|
"desc")))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/inline-image-p ()
|
|
|
|
|
"Test `org-export-inline-image-p' specifications."
|
|
|
|
|
(should
|
|
|
|
|
(org-export-inline-image-p
|
|
|
|
|
(org-test-with-temp-text "[[#id]]"
|
|
|
|
|
(org-element-map
|
|
|
|
|
(org-element-parse-buffer) 'link 'identity nil t))
|
|
|
|
|
'(("custom-id" . "id")))))
|
|
|
|
|
|
2012-06-06 18:06:19 -04:00
|
|
|
|
(ert-deftest test-org-export/fuzzy-link ()
|
|
|
|
|
"Test fuzzy links specifications."
|
|
|
|
|
;; 1. Links to invisible (keyword) targets should be ignored.
|
|
|
|
|
(org-test-with-parsed-data
|
|
|
|
|
"Paragraph.\n#+TARGET: Test\n[[Test]]"
|
|
|
|
|
(should-not
|
|
|
|
|
(org-element-map
|
|
|
|
|
tree 'link
|
|
|
|
|
(lambda (link)
|
|
|
|
|
(org-export-get-ordinal
|
|
|
|
|
(org-export-resolve-fuzzy-link link info) info)) info)))
|
|
|
|
|
;; 2. Link to an headline should return headline's number.
|
|
|
|
|
(org-test-with-parsed-data
|
|
|
|
|
"Paragraph.\n* Head1\n* Head2\n* Head3\n[[Head2]]"
|
|
|
|
|
(should
|
|
|
|
|
;; Note: Headline's number is in fact a list of numbers.
|
|
|
|
|
(equal '(2)
|
|
|
|
|
(org-element-map
|
|
|
|
|
tree 'link
|
|
|
|
|
(lambda (link)
|
|
|
|
|
(org-export-get-ordinal
|
|
|
|
|
(org-export-resolve-fuzzy-link link info) info)) info t))))
|
|
|
|
|
;; 3. Link to a target in an item should return item's number.
|
|
|
|
|
(org-test-with-parsed-data
|
|
|
|
|
"- Item1\n - Item11\n - <<test>>Item12\n- Item2\n\n\n[[test]]"
|
|
|
|
|
(should
|
|
|
|
|
;; Note: Item's number is in fact a list of numbers.
|
|
|
|
|
(equal '(1 2)
|
|
|
|
|
(org-element-map
|
|
|
|
|
tree 'link
|
|
|
|
|
(lambda (link)
|
|
|
|
|
(org-export-get-ordinal
|
|
|
|
|
(org-export-resolve-fuzzy-link link info) info)) info t))))
|
|
|
|
|
;; 4. Link to a target in a footnote should return footnote's
|
|
|
|
|
;; number.
|
|
|
|
|
(org-test-with-parsed-data "
|
|
|
|
|
Paragraph[1][2][fn:lbl3:C<<target>>][[test]][[target]]\n[1] A\n\n[2] <<test>>B"
|
|
|
|
|
(should
|
|
|
|
|
(equal '(2 3)
|
|
|
|
|
(org-element-map
|
|
|
|
|
tree 'link
|
|
|
|
|
(lambda (link)
|
|
|
|
|
(org-export-get-ordinal
|
|
|
|
|
(org-export-resolve-fuzzy-link link info) info)) info))))
|
|
|
|
|
;; 5. Link to a named element should return sequence number of that
|
|
|
|
|
;; element.
|
|
|
|
|
(org-test-with-parsed-data
|
|
|
|
|
"#+NAME: tbl1\n|1|2|\n#+NAME: tbl2\n|3|4|\n#+NAME: tbl3\n|5|6|\n[[tbl2]]"
|
|
|
|
|
(should
|
|
|
|
|
(= 2
|
|
|
|
|
(org-element-map
|
|
|
|
|
tree 'link
|
|
|
|
|
(lambda (link)
|
|
|
|
|
(org-export-get-ordinal
|
|
|
|
|
(org-export-resolve-fuzzy-link link info) info)) info t))))
|
|
|
|
|
;; 6. Link to a target not within an item, a table, a footnote
|
|
|
|
|
;; reference or definition should return section number.
|
|
|
|
|
(org-test-with-parsed-data
|
|
|
|
|
"* Head1\n* Head2\nParagraph<<target>>\n* Head3\n[[target]]"
|
|
|
|
|
(should
|
|
|
|
|
(equal '(2)
|
|
|
|
|
(org-element-map
|
|
|
|
|
tree 'link
|
|
|
|
|
(lambda (link)
|
|
|
|
|
(org-export-get-ordinal
|
|
|
|
|
(org-export-resolve-fuzzy-link link info) info)) info t)))))
|
|
|
|
|
|
2012-06-06 17:39:04 -04:00
|
|
|
|
(ert-deftest test-org-export/resolve-coderef ()
|
|
|
|
|
"Test `org-export-resolve-coderef' specifications."
|
|
|
|
|
(let ((org-coderef-label-format "(ref:%s)"))
|
|
|
|
|
;; 1. A link to a "-n -k -r" block returns line number.
|
|
|
|
|
(org-test-with-parsed-data
|
|
|
|
|
"#+BEGIN_EXAMPLE -n -k -r\nText (ref:coderef)\n#+END_EXAMPLE"
|
|
|
|
|
(should (= (org-export-resolve-coderef "coderef" info) 1)))
|
|
|
|
|
(org-test-with-parsed-data
|
|
|
|
|
"#+BEGIN_SRC emacs-lisp -n -k -r\n(+ 1 1) (ref:coderef)\n#+END_SRC"
|
|
|
|
|
(should (= (org-export-resolve-coderef "coderef" info) 1)))
|
|
|
|
|
;; 2. A link to a "-n -r" block returns line number.
|
|
|
|
|
(org-test-with-parsed-data
|
|
|
|
|
"#+BEGIN_EXAMPLE -n -r\nText (ref:coderef)\n#+END_EXAMPLE"
|
|
|
|
|
(should (= (org-export-resolve-coderef "coderef" info) 1)))
|
|
|
|
|
(org-test-with-parsed-data
|
|
|
|
|
"#+BEGIN_SRC emacs-lisp -n -r\n(+ 1 1) (ref:coderef)\n#+END_SRC"
|
|
|
|
|
(should (= (org-export-resolve-coderef "coderef" info) 1)))
|
|
|
|
|
;; 3. A link to a "-n" block returns coderef.
|
|
|
|
|
(org-test-with-parsed-data
|
|
|
|
|
"#+BEGIN_SRC emacs-lisp -n\n(+ 1 1) (ref:coderef)\n#+END_SRC"
|
|
|
|
|
(should (equal (org-export-resolve-coderef "coderef" info) "coderef")))
|
|
|
|
|
(org-test-with-parsed-data
|
|
|
|
|
"#+BEGIN_EXAMPLE -n\nText (ref:coderef)\n#+END_EXAMPLE"
|
|
|
|
|
(should (equal (org-export-resolve-coderef "coderef" info) "coderef")))
|
|
|
|
|
;; 4. A link to a "-r" block returns line number.
|
|
|
|
|
(org-test-with-parsed-data
|
|
|
|
|
"#+BEGIN_SRC emacs-lisp -r\n(+ 1 1) (ref:coderef)\n#+END_SRC"
|
|
|
|
|
(should (= (org-export-resolve-coderef "coderef" info) 1)))
|
|
|
|
|
(org-test-with-parsed-data
|
|
|
|
|
"#+BEGIN_EXAMPLE -r\nText (ref:coderef)\n#+END_EXAMPLE"
|
|
|
|
|
(should (= (org-export-resolve-coderef "coderef" info) 1)))
|
|
|
|
|
;; 5. A link to a block without a switch returns coderef.
|
|
|
|
|
(org-test-with-parsed-data
|
|
|
|
|
"#+BEGIN_SRC emacs-lisp\n(+ 1 1) (ref:coderef)\n#+END_SRC"
|
|
|
|
|
(should (equal (org-export-resolve-coderef "coderef" info) "coderef")))
|
|
|
|
|
(org-test-with-parsed-data
|
|
|
|
|
"#+BEGIN_EXAMPLE\nText (ref:coderef)\n#+END_EXAMPLE"
|
|
|
|
|
(should (equal (org-export-resolve-coderef "coderef" info) "coderef")))
|
|
|
|
|
;; 6. Correctly handle continued line numbers. A "+n" switch
|
|
|
|
|
;; should resume numbering from previous block with numbered
|
|
|
|
|
;; lines, ignoring blocks not numbering lines in the process.
|
|
|
|
|
;; A "-n" switch resets count.
|
|
|
|
|
(org-test-with-parsed-data "
|
|
|
|
|
#+BEGIN_EXAMPLE -n
|
|
|
|
|
Text.
|
|
|
|
|
#+END_EXAMPLE
|
|
|
|
|
|
|
|
|
|
#+BEGIN_SRC emacs-lisp
|
|
|
|
|
\(- 1 1)
|
|
|
|
|
#+END_SRC
|
|
|
|
|
|
|
|
|
|
#+BEGIN_SRC emacs-lisp +n -r
|
|
|
|
|
\(+ 1 1) (ref:addition)
|
|
|
|
|
#+END_SRC
|
|
|
|
|
|
|
|
|
|
#+BEGIN_EXAMPLE -n -r
|
|
|
|
|
Another text. (ref:text)
|
|
|
|
|
#+END_EXAMPLE"
|
|
|
|
|
(should (= (org-export-resolve-coderef "addition" info) 2))
|
|
|
|
|
(should (= (org-export-resolve-coderef "text" info) 1)))
|
|
|
|
|
;; 7. Recognize coderef with user-specified syntax.
|
|
|
|
|
(org-test-with-parsed-data
|
|
|
|
|
"#+BEGIN_EXAMPLE -l \"[ref:%s]\"\nText. [ref:text]\n#+END_EXAMPLE"
|
|
|
|
|
(should (equal (org-export-resolve-coderef "text" info) "text")))))
|
|
|
|
|
|
2012-07-04 11:37:55 -04:00
|
|
|
|
(ert-deftest test-org-export/resolve-fuzzy-link ()
|
2012-06-06 17:39:04 -04:00
|
|
|
|
"Test `org-export-resolve-fuzzy-link' specifications."
|
2012-06-06 18:06:19 -04:00
|
|
|
|
;; 1. Match target objects.
|
|
|
|
|
(org-test-with-parsed-data "<<target>> [[target]]"
|
org-export: Remove unnecessary back-end arguments
* contrib/lisp/org-e-ascii.el (org-e-ascii--build-title,
org-e-ascii--build-caption, org-e-ascii--list-listings,
org-e-ascii--list-tables, org-e-ascii--describe-links,
org-e-ascii-template--document-title, org-e-ascii-dynamic-block,
org-e-ascii-inlinetask, org-e-ascii-item, org-e-ascii-link,
org-e-ascii-quote-section, org-e-ascii--table-cell-width): Do not
provide back-end symbol.
* contrib/lisp/org-e-html.el (org-e-html--caption/label-string,
org-e-html-footnote-section, org-e-html-template,
org-e-html-dynamic-block, org-e-html-format-headline--wrap,
org-e-html-headline, org-e-html-item, org-e-html-link,
org-e-html-time-stamp): Do not provide back-end symbol.
* contrib/lisp/org-e-latex.el (org-e-latex--caption/label-string,
org-e-latex-template, org-e-latex-dynamic-block,
org-e-latex-footnote-reference, org-e-latex-headline,
org-e-latex-inlinetask, org-e-latex-item, org-e-latex-link,
org-e-latex-src-block): Do not provide back-end symbol.
* contrib/lisp/org-e-odt.el (org-e-odt-format-preamble,
org-e-odt-format-label, org-e-odt-write-manifest-file,
org-e-odt--caption/label-string, org-e-odt-dynamic-block,
org-e-odt-format-headline--wrap, org-e-odt-headline, org-e-odt-item,
org-e-odt-latex-environment, org-e-odt-link, org-e-odt-src-block,
org-e-odt-time-stamp): Do not provide back-end symbol.
* contrib/lisp/org-export.el (org-export-get-environment): Provide
back-end symbol under `:back-end' property.
(org-export-collect-tree-properties, org-export-data,
org-export-filter-verbatim-functions, org-export-install-filters,
org-export-as, org-export-expand-macro,
org-export-filter-apply-functions, org-export-secondary-string):
Remove back-end references.
* testing/lisp/test-org-export.el: Update tests.
Back-end can be found in communication channel with (plist-get
info :back-end). Hence back-ends do not have to hard-code their name
in any transcoder. It will allow to derive a back-end from another
one.
2012-04-28 05:33:16 -04:00
|
|
|
|
(should
|
2012-06-06 18:06:19 -04:00
|
|
|
|
(org-export-resolve-fuzzy-link
|
|
|
|
|
(org-element-map tree 'link 'identity info t) info)))
|
|
|
|
|
;; 2. Match target elements.
|
|
|
|
|
(org-test-with-parsed-data "#+TARGET: target\n[[target]]"
|
org-export: Remove unnecessary back-end arguments
* contrib/lisp/org-e-ascii.el (org-e-ascii--build-title,
org-e-ascii--build-caption, org-e-ascii--list-listings,
org-e-ascii--list-tables, org-e-ascii--describe-links,
org-e-ascii-template--document-title, org-e-ascii-dynamic-block,
org-e-ascii-inlinetask, org-e-ascii-item, org-e-ascii-link,
org-e-ascii-quote-section, org-e-ascii--table-cell-width): Do not
provide back-end symbol.
* contrib/lisp/org-e-html.el (org-e-html--caption/label-string,
org-e-html-footnote-section, org-e-html-template,
org-e-html-dynamic-block, org-e-html-format-headline--wrap,
org-e-html-headline, org-e-html-item, org-e-html-link,
org-e-html-time-stamp): Do not provide back-end symbol.
* contrib/lisp/org-e-latex.el (org-e-latex--caption/label-string,
org-e-latex-template, org-e-latex-dynamic-block,
org-e-latex-footnote-reference, org-e-latex-headline,
org-e-latex-inlinetask, org-e-latex-item, org-e-latex-link,
org-e-latex-src-block): Do not provide back-end symbol.
* contrib/lisp/org-e-odt.el (org-e-odt-format-preamble,
org-e-odt-format-label, org-e-odt-write-manifest-file,
org-e-odt--caption/label-string, org-e-odt-dynamic-block,
org-e-odt-format-headline--wrap, org-e-odt-headline, org-e-odt-item,
org-e-odt-latex-environment, org-e-odt-link, org-e-odt-src-block,
org-e-odt-time-stamp): Do not provide back-end symbol.
* contrib/lisp/org-export.el (org-export-get-environment): Provide
back-end symbol under `:back-end' property.
(org-export-collect-tree-properties, org-export-data,
org-export-filter-verbatim-functions, org-export-install-filters,
org-export-as, org-export-expand-macro,
org-export-filter-apply-functions, org-export-secondary-string):
Remove back-end references.
* testing/lisp/test-org-export.el: Update tests.
Back-end can be found in communication channel with (plist-get
info :back-end). Hence back-ends do not have to hard-code their name
in any transcoder. It will allow to derive a back-end from another
one.
2012-04-28 05:33:16 -04:00
|
|
|
|
(should
|
2012-06-06 18:06:19 -04:00
|
|
|
|
(org-export-resolve-fuzzy-link
|
|
|
|
|
(org-element-map tree 'link 'identity info t) info)))
|
|
|
|
|
;; 3. Match named elements.
|
|
|
|
|
(org-test-with-parsed-data "#+NAME: target\nParagraph\n\n[[target]]"
|
org-export: Remove unnecessary back-end arguments
* contrib/lisp/org-e-ascii.el (org-e-ascii--build-title,
org-e-ascii--build-caption, org-e-ascii--list-listings,
org-e-ascii--list-tables, org-e-ascii--describe-links,
org-e-ascii-template--document-title, org-e-ascii-dynamic-block,
org-e-ascii-inlinetask, org-e-ascii-item, org-e-ascii-link,
org-e-ascii-quote-section, org-e-ascii--table-cell-width): Do not
provide back-end symbol.
* contrib/lisp/org-e-html.el (org-e-html--caption/label-string,
org-e-html-footnote-section, org-e-html-template,
org-e-html-dynamic-block, org-e-html-format-headline--wrap,
org-e-html-headline, org-e-html-item, org-e-html-link,
org-e-html-time-stamp): Do not provide back-end symbol.
* contrib/lisp/org-e-latex.el (org-e-latex--caption/label-string,
org-e-latex-template, org-e-latex-dynamic-block,
org-e-latex-footnote-reference, org-e-latex-headline,
org-e-latex-inlinetask, org-e-latex-item, org-e-latex-link,
org-e-latex-src-block): Do not provide back-end symbol.
* contrib/lisp/org-e-odt.el (org-e-odt-format-preamble,
org-e-odt-format-label, org-e-odt-write-manifest-file,
org-e-odt--caption/label-string, org-e-odt-dynamic-block,
org-e-odt-format-headline--wrap, org-e-odt-headline, org-e-odt-item,
org-e-odt-latex-environment, org-e-odt-link, org-e-odt-src-block,
org-e-odt-time-stamp): Do not provide back-end symbol.
* contrib/lisp/org-export.el (org-export-get-environment): Provide
back-end symbol under `:back-end' property.
(org-export-collect-tree-properties, org-export-data,
org-export-filter-verbatim-functions, org-export-install-filters,
org-export-as, org-export-expand-macro,
org-export-filter-apply-functions, org-export-secondary-string):
Remove back-end references.
* testing/lisp/test-org-export.el: Update tests.
Back-end can be found in communication channel with (plist-get
info :back-end). Hence back-ends do not have to hard-code their name
in any transcoder. It will allow to derive a back-end from another
one.
2012-04-28 05:33:16 -04:00
|
|
|
|
(should
|
2012-06-06 18:06:19 -04:00
|
|
|
|
(org-export-resolve-fuzzy-link
|
|
|
|
|
(org-element-map tree 'link 'identity info t) info)))
|
|
|
|
|
;; 4. Match exact headline's name.
|
|
|
|
|
(org-test-with-parsed-data "* My headline\n[[My headline]]"
|
|
|
|
|
(should
|
|
|
|
|
(org-export-resolve-fuzzy-link
|
|
|
|
|
(org-element-map tree 'link 'identity info t) info)))
|
|
|
|
|
;; 5. Targets objects have priority over named elements and headline
|
|
|
|
|
;; titles.
|
org-export: Remove unnecessary back-end arguments
* contrib/lisp/org-e-ascii.el (org-e-ascii--build-title,
org-e-ascii--build-caption, org-e-ascii--list-listings,
org-e-ascii--list-tables, org-e-ascii--describe-links,
org-e-ascii-template--document-title, org-e-ascii-dynamic-block,
org-e-ascii-inlinetask, org-e-ascii-item, org-e-ascii-link,
org-e-ascii-quote-section, org-e-ascii--table-cell-width): Do not
provide back-end symbol.
* contrib/lisp/org-e-html.el (org-e-html--caption/label-string,
org-e-html-footnote-section, org-e-html-template,
org-e-html-dynamic-block, org-e-html-format-headline--wrap,
org-e-html-headline, org-e-html-item, org-e-html-link,
org-e-html-time-stamp): Do not provide back-end symbol.
* contrib/lisp/org-e-latex.el (org-e-latex--caption/label-string,
org-e-latex-template, org-e-latex-dynamic-block,
org-e-latex-footnote-reference, org-e-latex-headline,
org-e-latex-inlinetask, org-e-latex-item, org-e-latex-link,
org-e-latex-src-block): Do not provide back-end symbol.
* contrib/lisp/org-e-odt.el (org-e-odt-format-preamble,
org-e-odt-format-label, org-e-odt-write-manifest-file,
org-e-odt--caption/label-string, org-e-odt-dynamic-block,
org-e-odt-format-headline--wrap, org-e-odt-headline, org-e-odt-item,
org-e-odt-latex-environment, org-e-odt-link, org-e-odt-src-block,
org-e-odt-time-stamp): Do not provide back-end symbol.
* contrib/lisp/org-export.el (org-export-get-environment): Provide
back-end symbol under `:back-end' property.
(org-export-collect-tree-properties, org-export-data,
org-export-filter-verbatim-functions, org-export-install-filters,
org-export-as, org-export-expand-macro,
org-export-filter-apply-functions, org-export-secondary-string):
Remove back-end references.
* testing/lisp/test-org-export.el: Update tests.
Back-end can be found in communication channel with (plist-get
info :back-end). Hence back-ends do not have to hard-code their name
in any transcoder. It will allow to derive a back-end from another
one.
2012-04-28 05:33:16 -04:00
|
|
|
|
(org-test-with-parsed-data
|
2012-06-06 18:06:19 -04:00
|
|
|
|
"* target\n#+NAME: target\n<<target>>\n\n[[target]]"
|
org-export: Remove unnecessary back-end arguments
* contrib/lisp/org-e-ascii.el (org-e-ascii--build-title,
org-e-ascii--build-caption, org-e-ascii--list-listings,
org-e-ascii--list-tables, org-e-ascii--describe-links,
org-e-ascii-template--document-title, org-e-ascii-dynamic-block,
org-e-ascii-inlinetask, org-e-ascii-item, org-e-ascii-link,
org-e-ascii-quote-section, org-e-ascii--table-cell-width): Do not
provide back-end symbol.
* contrib/lisp/org-e-html.el (org-e-html--caption/label-string,
org-e-html-footnote-section, org-e-html-template,
org-e-html-dynamic-block, org-e-html-format-headline--wrap,
org-e-html-headline, org-e-html-item, org-e-html-link,
org-e-html-time-stamp): Do not provide back-end symbol.
* contrib/lisp/org-e-latex.el (org-e-latex--caption/label-string,
org-e-latex-template, org-e-latex-dynamic-block,
org-e-latex-footnote-reference, org-e-latex-headline,
org-e-latex-inlinetask, org-e-latex-item, org-e-latex-link,
org-e-latex-src-block): Do not provide back-end symbol.
* contrib/lisp/org-e-odt.el (org-e-odt-format-preamble,
org-e-odt-format-label, org-e-odt-write-manifest-file,
org-e-odt--caption/label-string, org-e-odt-dynamic-block,
org-e-odt-format-headline--wrap, org-e-odt-headline, org-e-odt-item,
org-e-odt-latex-environment, org-e-odt-link, org-e-odt-src-block,
org-e-odt-time-stamp): Do not provide back-end symbol.
* contrib/lisp/org-export.el (org-export-get-environment): Provide
back-end symbol under `:back-end' property.
(org-export-collect-tree-properties, org-export-data,
org-export-filter-verbatim-functions, org-export-install-filters,
org-export-as, org-export-expand-macro,
org-export-filter-apply-functions, org-export-secondary-string):
Remove back-end references.
* testing/lisp/test-org-export.el: Update tests.
Back-end can be found in communication channel with (plist-get
info :back-end). Hence back-ends do not have to hard-code their name
in any transcoder. It will allow to derive a back-end from another
one.
2012-04-28 05:33:16 -04:00
|
|
|
|
(should
|
2012-06-06 18:06:19 -04:00
|
|
|
|
(eq 'target
|
|
|
|
|
(org-element-type
|
|
|
|
|
(org-export-resolve-fuzzy-link
|
|
|
|
|
(org-element-map tree 'link 'identity info t) info)))))
|
|
|
|
|
;; 6. Named elements have priority over headline titles.
|
org-export: Remove unnecessary back-end arguments
* contrib/lisp/org-e-ascii.el (org-e-ascii--build-title,
org-e-ascii--build-caption, org-e-ascii--list-listings,
org-e-ascii--list-tables, org-e-ascii--describe-links,
org-e-ascii-template--document-title, org-e-ascii-dynamic-block,
org-e-ascii-inlinetask, org-e-ascii-item, org-e-ascii-link,
org-e-ascii-quote-section, org-e-ascii--table-cell-width): Do not
provide back-end symbol.
* contrib/lisp/org-e-html.el (org-e-html--caption/label-string,
org-e-html-footnote-section, org-e-html-template,
org-e-html-dynamic-block, org-e-html-format-headline--wrap,
org-e-html-headline, org-e-html-item, org-e-html-link,
org-e-html-time-stamp): Do not provide back-end symbol.
* contrib/lisp/org-e-latex.el (org-e-latex--caption/label-string,
org-e-latex-template, org-e-latex-dynamic-block,
org-e-latex-footnote-reference, org-e-latex-headline,
org-e-latex-inlinetask, org-e-latex-item, org-e-latex-link,
org-e-latex-src-block): Do not provide back-end symbol.
* contrib/lisp/org-e-odt.el (org-e-odt-format-preamble,
org-e-odt-format-label, org-e-odt-write-manifest-file,
org-e-odt--caption/label-string, org-e-odt-dynamic-block,
org-e-odt-format-headline--wrap, org-e-odt-headline, org-e-odt-item,
org-e-odt-latex-environment, org-e-odt-link, org-e-odt-src-block,
org-e-odt-time-stamp): Do not provide back-end symbol.
* contrib/lisp/org-export.el (org-export-get-environment): Provide
back-end symbol under `:back-end' property.
(org-export-collect-tree-properties, org-export-data,
org-export-filter-verbatim-functions, org-export-install-filters,
org-export-as, org-export-expand-macro,
org-export-filter-apply-functions, org-export-secondary-string):
Remove back-end references.
* testing/lisp/test-org-export.el: Update tests.
Back-end can be found in communication channel with (plist-get
info :back-end). Hence back-ends do not have to hard-code their name
in any transcoder. It will allow to derive a back-end from another
one.
2012-04-28 05:33:16 -04:00
|
|
|
|
(org-test-with-parsed-data
|
2012-06-06 18:06:19 -04:00
|
|
|
|
"* target\n#+NAME: target\nParagraph\n\n[[target]]"
|
org-export: Remove unnecessary back-end arguments
* contrib/lisp/org-e-ascii.el (org-e-ascii--build-title,
org-e-ascii--build-caption, org-e-ascii--list-listings,
org-e-ascii--list-tables, org-e-ascii--describe-links,
org-e-ascii-template--document-title, org-e-ascii-dynamic-block,
org-e-ascii-inlinetask, org-e-ascii-item, org-e-ascii-link,
org-e-ascii-quote-section, org-e-ascii--table-cell-width): Do not
provide back-end symbol.
* contrib/lisp/org-e-html.el (org-e-html--caption/label-string,
org-e-html-footnote-section, org-e-html-template,
org-e-html-dynamic-block, org-e-html-format-headline--wrap,
org-e-html-headline, org-e-html-item, org-e-html-link,
org-e-html-time-stamp): Do not provide back-end symbol.
* contrib/lisp/org-e-latex.el (org-e-latex--caption/label-string,
org-e-latex-template, org-e-latex-dynamic-block,
org-e-latex-footnote-reference, org-e-latex-headline,
org-e-latex-inlinetask, org-e-latex-item, org-e-latex-link,
org-e-latex-src-block): Do not provide back-end symbol.
* contrib/lisp/org-e-odt.el (org-e-odt-format-preamble,
org-e-odt-format-label, org-e-odt-write-manifest-file,
org-e-odt--caption/label-string, org-e-odt-dynamic-block,
org-e-odt-format-headline--wrap, org-e-odt-headline, org-e-odt-item,
org-e-odt-latex-environment, org-e-odt-link, org-e-odt-src-block,
org-e-odt-time-stamp): Do not provide back-end symbol.
* contrib/lisp/org-export.el (org-export-get-environment): Provide
back-end symbol under `:back-end' property.
(org-export-collect-tree-properties, org-export-data,
org-export-filter-verbatim-functions, org-export-install-filters,
org-export-as, org-export-expand-macro,
org-export-filter-apply-functions, org-export-secondary-string):
Remove back-end references.
* testing/lisp/test-org-export.el: Update tests.
Back-end can be found in communication channel with (plist-get
info :back-end). Hence back-ends do not have to hard-code their name
in any transcoder. It will allow to derive a back-end from another
one.
2012-04-28 05:33:16 -04:00
|
|
|
|
(should
|
2012-06-06 18:06:19 -04:00
|
|
|
|
(eq 'paragraph
|
|
|
|
|
(org-element-type
|
|
|
|
|
(org-export-resolve-fuzzy-link
|
|
|
|
|
(org-element-map tree 'link 'identity info t) info)))))
|
|
|
|
|
;; 7. If link's path starts with a "*", only match headline titles,
|
|
|
|
|
;; though.
|
|
|
|
|
(org-test-with-parsed-data
|
|
|
|
|
"* target\n#+NAME: target\n<<target>>\n\n[[*target]]"
|
|
|
|
|
(should
|
|
|
|
|
(eq 'headline
|
|
|
|
|
(org-element-type
|
|
|
|
|
(org-export-resolve-fuzzy-link
|
|
|
|
|
(org-element-map tree 'link 'identity info t) info)))))
|
|
|
|
|
;; 8. Return nil if no match.
|
|
|
|
|
(org-test-with-parsed-data "[[target]]"
|
|
|
|
|
(should-not
|
|
|
|
|
(org-export-resolve-fuzzy-link
|
|
|
|
|
(org-element-map tree 'link 'identity info t) info))))
|
2012-03-10 05:37:13 -05:00
|
|
|
|
|
2012-06-06 17:39:04 -04:00
|
|
|
|
(ert-deftest test-org-export/resolve-id-link ()
|
|
|
|
|
"Test `org-export-resolve-id-link' specifications."
|
|
|
|
|
;; 1. Regular test for custom-id link.
|
|
|
|
|
(org-test-with-parsed-data "* Headline1
|
|
|
|
|
:PROPERTIES:
|
|
|
|
|
:CUSTOM-ID: test
|
|
|
|
|
:END:
|
|
|
|
|
* Headline 2
|
|
|
|
|
\[[#test]]"
|
|
|
|
|
(should
|
|
|
|
|
(org-export-resolve-id-link
|
|
|
|
|
(org-element-map tree 'link 'identity info t) info)))
|
|
|
|
|
;; 2. Failing test for custom-id link.
|
|
|
|
|
(org-test-with-parsed-data "* Headline1
|
|
|
|
|
:PROPERTIES:
|
|
|
|
|
:CUSTOM-ID: test
|
|
|
|
|
:END:
|
|
|
|
|
* Headline 2
|
|
|
|
|
\[[#no-match]]"
|
|
|
|
|
(should-not
|
|
|
|
|
(org-export-resolve-id-link
|
|
|
|
|
(org-element-map tree 'link 'identity info t) info)))
|
|
|
|
|
;; 3. Test for internal id target.
|
|
|
|
|
(org-test-with-parsed-data "* Headline1
|
|
|
|
|
:PROPERTIES:
|
|
|
|
|
:ID: aaaa
|
|
|
|
|
:END:
|
|
|
|
|
* Headline 2
|
|
|
|
|
\[[id:aaaa]]"
|
|
|
|
|
(should
|
|
|
|
|
(org-export-resolve-id-link
|
|
|
|
|
(org-element-map tree 'link 'identity info t) info)))
|
|
|
|
|
;; 4. Test for external id target.
|
|
|
|
|
(org-test-with-parsed-data "[[id:aaaa]]"
|
|
|
|
|
(should
|
|
|
|
|
(org-export-resolve-id-link
|
|
|
|
|
(org-element-map tree 'link 'identity info t)
|
|
|
|
|
(org-combine-plists info '(:id-alist (("aaaa" . "external-file"))))))))
|
2012-03-10 05:37:13 -05:00
|
|
|
|
|
2012-05-18 05:20:00 -04:00
|
|
|
|
(ert-deftest test-org-export/resolve-radio-link ()
|
|
|
|
|
"Test `org-export-resolve-radio-link' specifications."
|
|
|
|
|
;; Standard test.
|
|
|
|
|
(org-test-with-temp-text "<<<radio>>> radio"
|
|
|
|
|
(org-update-radio-target-regexp)
|
|
|
|
|
(should
|
|
|
|
|
(let* ((tree (org-element-parse-buffer))
|
|
|
|
|
(info `(:parse-tree ,tree)))
|
|
|
|
|
(org-export-resolve-radio-link
|
|
|
|
|
(org-element-map tree 'link 'identity info t)
|
|
|
|
|
info))))
|
|
|
|
|
;; Radio target with objects.
|
|
|
|
|
(org-test-with-temp-text "<<<radio \\alpha>>> radio \\alpha"
|
|
|
|
|
(org-update-radio-target-regexp)
|
|
|
|
|
(should
|
|
|
|
|
(let* ((tree (org-element-parse-buffer))
|
|
|
|
|
(info `(:parse-tree ,tree)))
|
|
|
|
|
(org-export-resolve-radio-link
|
|
|
|
|
(org-element-map tree 'link 'identity info t)
|
|
|
|
|
info)))))
|
|
|
|
|
|
2012-03-10 05:37:13 -05:00
|
|
|
|
|
2012-05-20 05:53:39 -04:00
|
|
|
|
|
|
|
|
|
;;; Macro
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/define-macro ()
|
|
|
|
|
"Try defining various Org macro using in-buffer #+MACRO: keyword."
|
|
|
|
|
;; Parsed macro.
|
|
|
|
|
(should (equal (org-test-with-temp-text "#+MACRO: one 1"
|
2012-07-24 10:04:35 -04:00
|
|
|
|
(org-export--get-inbuffer-options))
|
2012-05-20 05:53:39 -04:00
|
|
|
|
'(:macro-one ("1"))))
|
|
|
|
|
;; Evaled macro.
|
|
|
|
|
(should (equal (org-test-with-temp-text "#+MACRO: two (eval (+ 1 1))"
|
2012-07-24 10:04:35 -04:00
|
|
|
|
(org-export--get-inbuffer-options))
|
2012-05-20 05:53:39 -04:00
|
|
|
|
'(:macro-two ("(eval (+ 1 1))"))))
|
|
|
|
|
;; Incomplete macro.
|
|
|
|
|
(should-not (org-test-with-temp-text "#+MACRO: three"
|
2012-07-24 10:04:35 -04:00
|
|
|
|
(org-export--get-inbuffer-options)))
|
2012-05-20 05:53:39 -04:00
|
|
|
|
;; Macro with newline character.
|
|
|
|
|
(should (equal (org-test-with-temp-text "#+MACRO: four a\\nb"
|
2012-07-24 10:04:35 -04:00
|
|
|
|
(org-export--get-inbuffer-options))
|
2012-05-20 05:53:39 -04:00
|
|
|
|
'(:macro-four ("a\nb"))))
|
|
|
|
|
;; Macro with protected newline character.
|
|
|
|
|
(should (equal (org-test-with-temp-text "#+MACRO: five a\\\\nb"
|
2012-07-24 10:04:35 -04:00
|
|
|
|
(org-export--get-inbuffer-options))
|
2012-05-20 05:53:39 -04:00
|
|
|
|
'(:macro-five ("a\\nb"))))
|
|
|
|
|
;; Recursive macro.
|
|
|
|
|
(org-test-with-temp-text "#+MACRO: six 6\n#+MACRO: seven 1 + {{{six}}}"
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
2012-07-24 10:04:35 -04:00
|
|
|
|
(org-export--get-inbuffer-options)
|
2012-05-20 05:53:39 -04:00
|
|
|
|
'(:macro-six
|
|
|
|
|
("6")
|
|
|
|
|
:macro-seven
|
|
|
|
|
("1 + " (macro (:key "six" :value "{{{six}}}" :args nil :begin 5 :end 14
|
2012-06-08 17:57:45 -04:00
|
|
|
|
:post-blank 0 :parent nil))))))))
|
2012-05-20 05:53:39 -04:00
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/expand-macro ()
|
|
|
|
|
"Test `org-export-expand-macro' specifications."
|
|
|
|
|
;; Standard test.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
"some text"
|
|
|
|
|
(org-test-with-parsed-data "#+MACRO: macro some text\n{{{macro}}}"
|
|
|
|
|
(org-export-expand-macro
|
|
|
|
|
(org-element-map tree 'macro 'identity info t) info))))
|
|
|
|
|
;; Macro with arguments.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
"some text"
|
|
|
|
|
(org-test-with-parsed-data "#+MACRO: macro $1 $2\n{{{macro(some,text)}}}"
|
|
|
|
|
(org-export-expand-macro
|
|
|
|
|
(org-element-map tree 'macro 'identity info t) info))))
|
|
|
|
|
;; Macro with "eval"
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
"3"
|
|
|
|
|
(org-test-with-parsed-data "#+MACRO: add (eval (+ $1 $2))\n{{{add(1,2)}}}"
|
|
|
|
|
(org-export-expand-macro
|
|
|
|
|
(org-element-map tree 'macro 'identity info t) info))))
|
|
|
|
|
;; Nested macros.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
"inner outer"
|
|
|
|
|
(org-test-with-parsed-data
|
|
|
|
|
"#+MACRO: in inner\n#+MACRO: out {{{in}}} outer\n{{{out}}}"
|
|
|
|
|
(flet ((translate-macro (macro contents info)
|
|
|
|
|
(org-export-expand-macro macro info)))
|
|
|
|
|
(org-export-expand-macro
|
|
|
|
|
(org-element-map tree 'macro 'identity info t)
|
|
|
|
|
(org-combine-plists
|
|
|
|
|
info `(:translate-alist ((macro . translate-macro))))))))))
|
|
|
|
|
|
|
|
|
|
|
2012-03-10 14:25:32 -05:00
|
|
|
|
|
|
|
|
|
;;; Src-block and example-block
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/unravel-code ()
|
|
|
|
|
"Test `org-export-unravel-code' function."
|
|
|
|
|
(let ((org-coderef-label-format "(ref:%s)"))
|
|
|
|
|
;; 1. Code without reference.
|
|
|
|
|
(org-test-with-temp-text "#+BEGIN_EXAMPLE\n(+ 1 1)\n#+END_EXAMPLE"
|
org-element: Rename a few internal functions
* contrib/lisp/org-element.el (org-element--parse-elements): Renamed
from `org-element-parse-elements'.
(org-element--parse-objects): Renamed from `org-element-parse-objects'.
(org-element--get-next-object-candidates): Renamed from
`org-element-get-next-object-candidates'.
(org-element--interpret-affiliated-keywords): Renamed from
`org-element-interpret--affiliated-keywords'.
(org-element--current-element): Renamed from
`org-element-current-element'.
(org-element--collect-affiliated-keywords): Renamed from
`org-element-collect-affiliated-keywords'.
(org-element-center-block-parser, org-element-drawer-parser,
org-element-dynamic-block-parser,
org-element-footnote-definition-parser, org-element-inlinetask-parser,
org-element-plain-list-parser, org-element-quote-block-parser,
org-element-special-block-parser, org-element-comment-parser,
org-element-comment-block-parser, org-element-example-block-parser,
org-element-export-block-parser, org-element-fixed-width-parser,
org-element-horizontal-rule-parser,
org-element-latex-environment-parser, org-element-paragraph-parser,
org-element-src-block-parser, org-element-table-parser,
org-element-verse-block-parser, org-element-fill-paragraph,
org-element-context, org-element-at-point, org-element-interpret-data,
org-element-parse-secondary-string, org-element-parse-buffer): Apply
name change.
* contrib/lisp/org-export.el (org-export-get-buffer-attributes): Apply
name change.
* testing/lisp/test-org-element.el: Update tests accordingly.
* testing/lisp/test-org-export.el: Update tests accordingly.
2012-07-19 05:23:43 -04:00
|
|
|
|
(should (equal (org-export-unravel-code (org-element-at-point))
|
2012-03-10 14:25:32 -05:00
|
|
|
|
'("(+ 1 1)\n"))))
|
|
|
|
|
;; 2. Code with reference.
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"#+BEGIN_EXAMPLE\n(+ 1 1) (ref:test)\n#+END_EXAMPLE"
|
org-element: Rename a few internal functions
* contrib/lisp/org-element.el (org-element--parse-elements): Renamed
from `org-element-parse-elements'.
(org-element--parse-objects): Renamed from `org-element-parse-objects'.
(org-element--get-next-object-candidates): Renamed from
`org-element-get-next-object-candidates'.
(org-element--interpret-affiliated-keywords): Renamed from
`org-element-interpret--affiliated-keywords'.
(org-element--current-element): Renamed from
`org-element-current-element'.
(org-element--collect-affiliated-keywords): Renamed from
`org-element-collect-affiliated-keywords'.
(org-element-center-block-parser, org-element-drawer-parser,
org-element-dynamic-block-parser,
org-element-footnote-definition-parser, org-element-inlinetask-parser,
org-element-plain-list-parser, org-element-quote-block-parser,
org-element-special-block-parser, org-element-comment-parser,
org-element-comment-block-parser, org-element-example-block-parser,
org-element-export-block-parser, org-element-fixed-width-parser,
org-element-horizontal-rule-parser,
org-element-latex-environment-parser, org-element-paragraph-parser,
org-element-src-block-parser, org-element-table-parser,
org-element-verse-block-parser, org-element-fill-paragraph,
org-element-context, org-element-at-point, org-element-interpret-data,
org-element-parse-secondary-string, org-element-parse-buffer): Apply
name change.
* contrib/lisp/org-export.el (org-export-get-buffer-attributes): Apply
name change.
* testing/lisp/test-org-element.el: Update tests accordingly.
* testing/lisp/test-org-export.el: Update tests accordingly.
2012-07-19 05:23:43 -04:00
|
|
|
|
(should (equal (org-export-unravel-code (org-element-at-point))
|
2012-03-10 14:25:32 -05:00
|
|
|
|
'("(+ 1 1)\n" (1 . "test")))))
|
|
|
|
|
;; 3. Code with user-defined reference.
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"#+BEGIN_EXAMPLE -l \"[ref:%s]\"\n(+ 1 1) [ref:test]\n#+END_EXAMPLE"
|
org-element: Rename a few internal functions
* contrib/lisp/org-element.el (org-element--parse-elements): Renamed
from `org-element-parse-elements'.
(org-element--parse-objects): Renamed from `org-element-parse-objects'.
(org-element--get-next-object-candidates): Renamed from
`org-element-get-next-object-candidates'.
(org-element--interpret-affiliated-keywords): Renamed from
`org-element-interpret--affiliated-keywords'.
(org-element--current-element): Renamed from
`org-element-current-element'.
(org-element--collect-affiliated-keywords): Renamed from
`org-element-collect-affiliated-keywords'.
(org-element-center-block-parser, org-element-drawer-parser,
org-element-dynamic-block-parser,
org-element-footnote-definition-parser, org-element-inlinetask-parser,
org-element-plain-list-parser, org-element-quote-block-parser,
org-element-special-block-parser, org-element-comment-parser,
org-element-comment-block-parser, org-element-example-block-parser,
org-element-export-block-parser, org-element-fixed-width-parser,
org-element-horizontal-rule-parser,
org-element-latex-environment-parser, org-element-paragraph-parser,
org-element-src-block-parser, org-element-table-parser,
org-element-verse-block-parser, org-element-fill-paragraph,
org-element-context, org-element-at-point, org-element-interpret-data,
org-element-parse-secondary-string, org-element-parse-buffer): Apply
name change.
* contrib/lisp/org-export.el (org-export-get-buffer-attributes): Apply
name change.
* testing/lisp/test-org-element.el: Update tests accordingly.
* testing/lisp/test-org-export.el: Update tests accordingly.
2012-07-19 05:23:43 -04:00
|
|
|
|
(should (equal (org-export-unravel-code (org-element-at-point))
|
2012-03-10 14:25:32 -05:00
|
|
|
|
'("(+ 1 1)\n" (1 . "test")))))
|
|
|
|
|
;; 4. Code references keys are relative to the current block.
|
|
|
|
|
(org-test-with-temp-text "
|
|
|
|
|
#+BEGIN_EXAMPLE -n
|
|
|
|
|
\(+ 1 1)
|
|
|
|
|
#+END_EXAMPLE
|
|
|
|
|
#+BEGIN_EXAMPLE +n
|
|
|
|
|
\(+ 2 2)
|
|
|
|
|
\(+ 3 3) (ref:one)
|
|
|
|
|
#+END_EXAMPLE"
|
|
|
|
|
(goto-line 5)
|
org-element: Rename a few internal functions
* contrib/lisp/org-element.el (org-element--parse-elements): Renamed
from `org-element-parse-elements'.
(org-element--parse-objects): Renamed from `org-element-parse-objects'.
(org-element--get-next-object-candidates): Renamed from
`org-element-get-next-object-candidates'.
(org-element--interpret-affiliated-keywords): Renamed from
`org-element-interpret--affiliated-keywords'.
(org-element--current-element): Renamed from
`org-element-current-element'.
(org-element--collect-affiliated-keywords): Renamed from
`org-element-collect-affiliated-keywords'.
(org-element-center-block-parser, org-element-drawer-parser,
org-element-dynamic-block-parser,
org-element-footnote-definition-parser, org-element-inlinetask-parser,
org-element-plain-list-parser, org-element-quote-block-parser,
org-element-special-block-parser, org-element-comment-parser,
org-element-comment-block-parser, org-element-example-block-parser,
org-element-export-block-parser, org-element-fixed-width-parser,
org-element-horizontal-rule-parser,
org-element-latex-environment-parser, org-element-paragraph-parser,
org-element-src-block-parser, org-element-table-parser,
org-element-verse-block-parser, org-element-fill-paragraph,
org-element-context, org-element-at-point, org-element-interpret-data,
org-element-parse-secondary-string, org-element-parse-buffer): Apply
name change.
* contrib/lisp/org-export.el (org-export-get-buffer-attributes): Apply
name change.
* testing/lisp/test-org-element.el: Update tests accordingly.
* testing/lisp/test-org-export.el: Update tests accordingly.
2012-07-19 05:23:43 -04:00
|
|
|
|
(should (equal (org-export-unravel-code (org-element-at-point))
|
2012-09-30 11:45:21 -04:00
|
|
|
|
'("(+ 2 2)\n(+ 3 3)\n" (2 . "one")))))))
|
2012-03-10 14:25:32 -05:00
|
|
|
|
|
|
|
|
|
|
org-export: Define tools for tables, table rows and table cells
* contrib/lisp/org-export.el (org-export-table-cell-width,
org-export-table-cell-alignment, org-export-table-cell-borders,
org-export-table-row-group, org-export-table-has-special-column-p,
org-export-table-row-is-special-p, org-export-get-parent-table,
org-export-table-dimensions, org-export-table-cell-address,
org-export-get-table-cell-at, org-export-table-has-header-p,
org-export-table-cell-starts-colgroup-p,
org-export-table-cell-ends-colgroup-p,
org-export-table-row-starts-rowgroup-p,
org-export-table-row-ends-rowgroup-p,
org-export-table-row-starts-header-p,
org-export-table-row-ends-header-p): New functions.
(org-export-table-format-info, org-export-clean-table): Removed
functions.
(org-export-filter-table-cell-functions,
org-export-filter-table-row-functions): New variables.
(org-export-filters-alist): Install new filters.
(org-export-collect-tree-properties, org-export--skip-p): Mark special
rows and cells as ignored.
* testing/lisp/test-org-export.el: Add tests.
2012-04-11 02:54:24 -04:00
|
|
|
|
|
|
|
|
|
;;; Tables
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/special-column ()
|
|
|
|
|
"Test if the table's special column is properly recognized."
|
|
|
|
|
;; 1. First column is special if it contains only a special marking
|
|
|
|
|
;; characters or empty cells.
|
|
|
|
|
(org-test-with-temp-text "
|
|
|
|
|
| ! | 1 |
|
|
|
|
|
| | 2 |"
|
|
|
|
|
(should
|
|
|
|
|
(org-export-table-has-special-column-p
|
|
|
|
|
(org-element-map
|
|
|
|
|
(org-element-parse-buffer) 'table 'identity nil 'first-match))))
|
|
|
|
|
;; 2. If the column contains anything else, it isn't special.
|
|
|
|
|
(org-test-with-temp-text "
|
|
|
|
|
| ! | 1 |
|
|
|
|
|
| b | 2 |"
|
|
|
|
|
(should-not
|
|
|
|
|
(org-export-table-has-special-column-p
|
|
|
|
|
(org-element-map
|
|
|
|
|
(org-element-parse-buffer) 'table 'identity nil 'first-match))))
|
|
|
|
|
;; 3. Special marking characters are "#", "^", "*", "_", "/", "$"
|
|
|
|
|
;; and "!".
|
|
|
|
|
(org-test-with-temp-text "
|
|
|
|
|
| # | 1 |
|
|
|
|
|
| ^ | 2 |
|
|
|
|
|
| * | 3 |
|
|
|
|
|
| _ | 4 |
|
|
|
|
|
| / | 5 |
|
|
|
|
|
| $ | 6 |
|
|
|
|
|
| ! | 7 |"
|
|
|
|
|
(should
|
|
|
|
|
(org-export-table-has-special-column-p
|
|
|
|
|
(org-element-map
|
|
|
|
|
(org-element-parse-buffer) 'table 'identity nil 'first-match))))
|
|
|
|
|
;; 4. A first column with only empty cells isn't considered as
|
|
|
|
|
;; special.
|
|
|
|
|
(org-test-with-temp-text "
|
|
|
|
|
| | 1 |
|
|
|
|
|
| | 2 |"
|
|
|
|
|
(should-not
|
|
|
|
|
(org-export-table-has-special-column-p
|
|
|
|
|
(org-element-map
|
|
|
|
|
(org-element-parse-buffer) 'table 'identity nil 'first-match)))))
|
|
|
|
|
|
2012-05-03 08:29:30 -04:00
|
|
|
|
(ert-deftest test-org-export/table-row-is-special-p ()
|
|
|
|
|
"Test `org-export-table-row-is-special-p' specifications."
|
org-export: Define tools for tables, table rows and table cells
* contrib/lisp/org-export.el (org-export-table-cell-width,
org-export-table-cell-alignment, org-export-table-cell-borders,
org-export-table-row-group, org-export-table-has-special-column-p,
org-export-table-row-is-special-p, org-export-get-parent-table,
org-export-table-dimensions, org-export-table-cell-address,
org-export-get-table-cell-at, org-export-table-has-header-p,
org-export-table-cell-starts-colgroup-p,
org-export-table-cell-ends-colgroup-p,
org-export-table-row-starts-rowgroup-p,
org-export-table-row-ends-rowgroup-p,
org-export-table-row-starts-header-p,
org-export-table-row-ends-header-p): New functions.
(org-export-table-format-info, org-export-clean-table): Removed
functions.
(org-export-filter-table-cell-functions,
org-export-filter-table-row-functions): New variables.
(org-export-filters-alist): Install new filters.
(org-export-collect-tree-properties, org-export--skip-p): Mark special
rows and cells as ignored.
* testing/lisp/test-org-export.el: Add tests.
2012-04-11 02:54:24 -04:00
|
|
|
|
;; 1. A row is special if it has a special marking character in the
|
|
|
|
|
;; special column.
|
|
|
|
|
(org-test-with-parsed-data "| ! | 1 |"
|
|
|
|
|
(should
|
|
|
|
|
(org-export-table-row-is-special-p
|
|
|
|
|
(org-element-map tree 'table-row 'identity nil 'first-match) info)))
|
|
|
|
|
;; 2. A row is special when its first field is "/"
|
|
|
|
|
(org-test-with-parsed-data "
|
|
|
|
|
| / | 1 |
|
|
|
|
|
| a | b |"
|
|
|
|
|
(should
|
|
|
|
|
(org-export-table-row-is-special-p
|
|
|
|
|
(org-element-map tree 'table-row 'identity nil 'first-match) info)))
|
|
|
|
|
;; 3. A row only containing alignment cookies is also considered as
|
|
|
|
|
;; special.
|
|
|
|
|
(org-test-with-parsed-data "| <5> | | <l> | <l22> |"
|
|
|
|
|
(should
|
|
|
|
|
(org-export-table-row-is-special-p
|
|
|
|
|
(org-element-map tree 'table-row 'identity nil 'first-match) info)))
|
|
|
|
|
;; 4. Everything else isn't considered as special.
|
2012-05-03 08:29:30 -04:00
|
|
|
|
(org-test-with-parsed-data "| \alpha | | c |"
|
org-export: Define tools for tables, table rows and table cells
* contrib/lisp/org-export.el (org-export-table-cell-width,
org-export-table-cell-alignment, org-export-table-cell-borders,
org-export-table-row-group, org-export-table-has-special-column-p,
org-export-table-row-is-special-p, org-export-get-parent-table,
org-export-table-dimensions, org-export-table-cell-address,
org-export-get-table-cell-at, org-export-table-has-header-p,
org-export-table-cell-starts-colgroup-p,
org-export-table-cell-ends-colgroup-p,
org-export-table-row-starts-rowgroup-p,
org-export-table-row-ends-rowgroup-p,
org-export-table-row-starts-header-p,
org-export-table-row-ends-header-p): New functions.
(org-export-table-format-info, org-export-clean-table): Removed
functions.
(org-export-filter-table-cell-functions,
org-export-filter-table-row-functions): New variables.
(org-export-filters-alist): Install new filters.
(org-export-collect-tree-properties, org-export--skip-p): Mark special
rows and cells as ignored.
* testing/lisp/test-org-export.el: Add tests.
2012-04-11 02:54:24 -04:00
|
|
|
|
(should-not
|
|
|
|
|
(org-export-table-row-is-special-p
|
|
|
|
|
(org-element-map tree 'table-row 'identity nil 'first-match) info)))
|
|
|
|
|
;; 5. Table's rules are never considered as special rows.
|
|
|
|
|
(org-test-with-parsed-data "|---+---|"
|
|
|
|
|
(should-not
|
|
|
|
|
(org-export-table-row-is-special-p
|
|
|
|
|
(org-element-map tree 'table-row 'identity nil 'first-match) info))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/has-header-p ()
|
|
|
|
|
"Test `org-export-table-has-header-p' specifications."
|
|
|
|
|
;; 1. With an header.
|
|
|
|
|
(org-test-with-parsed-data "
|
|
|
|
|
| a | b |
|
|
|
|
|
|---+---|
|
|
|
|
|
| c | d |"
|
|
|
|
|
(should
|
|
|
|
|
(org-export-table-has-header-p
|
|
|
|
|
(org-element-map tree 'table 'identity info 'first-match)
|
|
|
|
|
info)))
|
|
|
|
|
;; 2. Without an header.
|
|
|
|
|
(org-test-with-parsed-data "
|
|
|
|
|
| a | b |
|
|
|
|
|
| c | d |"
|
|
|
|
|
(should-not
|
|
|
|
|
(org-export-table-has-header-p
|
|
|
|
|
(org-element-map tree 'table 'identity info 'first-match)
|
|
|
|
|
info)))
|
|
|
|
|
;; 3. Don't get fooled with starting and ending rules.
|
|
|
|
|
(org-test-with-parsed-data "
|
|
|
|
|
|---+---|
|
|
|
|
|
| a | b |
|
|
|
|
|
| c | d |
|
|
|
|
|
|---+---|"
|
|
|
|
|
(should-not
|
|
|
|
|
(org-export-table-has-header-p
|
|
|
|
|
(org-element-map tree 'table 'identity info 'first-match)
|
|
|
|
|
info))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/table-row-group ()
|
|
|
|
|
"Test `org-export-table-row-group' specifications."
|
|
|
|
|
;; 1. A rule creates a new group.
|
|
|
|
|
(org-test-with-parsed-data "
|
|
|
|
|
| a | b |
|
|
|
|
|
|---+---|
|
|
|
|
|
| 1 | 2 |"
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'(1 nil 2)
|
|
|
|
|
(mapcar (lambda (row) (org-export-table-row-group row info))
|
|
|
|
|
(org-element-map tree 'table-row 'identity)))))
|
|
|
|
|
;; 2. Special rows are ignored in count.
|
|
|
|
|
(org-test-with-parsed-data "
|
|
|
|
|
| / | < | > |
|
|
|
|
|
|---|---+---|
|
|
|
|
|
| | 1 | 2 |"
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'(nil nil 1)
|
|
|
|
|
(mapcar (lambda (row) (org-export-table-row-group row info))
|
|
|
|
|
(org-element-map tree 'table-row 'identity)))))
|
|
|
|
|
;; 3. Double rules also are ignored in count.
|
|
|
|
|
(org-test-with-parsed-data "
|
|
|
|
|
| a | b |
|
|
|
|
|
|---+---|
|
|
|
|
|
|---+---|
|
|
|
|
|
| 1 | 2 |"
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'(1 nil nil 2)
|
|
|
|
|
(mapcar (lambda (row) (org-export-table-row-group row info))
|
|
|
|
|
(org-element-map tree 'table-row 'identity))))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/table-cell-width ()
|
|
|
|
|
"Test `org-export-table-cell-width' specifications."
|
|
|
|
|
;; 1. Width is primarily determined by width cookies. If no cookie
|
|
|
|
|
;; is found, cell's width is nil.
|
|
|
|
|
(org-test-with-parsed-data "
|
|
|
|
|
| / | <l> | <6> | <l7> |
|
|
|
|
|
| | a | b | c |"
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'(nil 6 7)
|
|
|
|
|
(mapcar (lambda (cell) (org-export-table-cell-width cell info))
|
|
|
|
|
(org-element-map tree 'table-cell 'identity info)))))
|
|
|
|
|
;; 2. The last width cookie has precedence.
|
|
|
|
|
(org-test-with-parsed-data "
|
|
|
|
|
| <6> |
|
|
|
|
|
| <7> |
|
|
|
|
|
| a |"
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'(7)
|
|
|
|
|
(mapcar (lambda (cell) (org-export-table-cell-width cell info))
|
|
|
|
|
(org-element-map tree 'table-cell 'identity info)))))
|
|
|
|
|
;; 3. Valid width cookies must have a specific row.
|
|
|
|
|
(org-test-with-parsed-data "| <6> | cell |"
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'(nil nil)
|
|
|
|
|
(mapcar (lambda (cell) (org-export-table-cell-width cell info))
|
|
|
|
|
(org-element-map tree 'table-cell 'identity))))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/table-cell-alignment ()
|
|
|
|
|
"Test `org-export-table-cell-alignment' specifications."
|
|
|
|
|
(let ((org-table-number-fraction 0.5)
|
|
|
|
|
(org-table-number-regexp "^[0-9]+$"))
|
|
|
|
|
;; 1. Alignment is primarily determined by alignment cookies.
|
|
|
|
|
(org-test-with-temp-text "| <l> | <c> | <r> |"
|
|
|
|
|
(let* ((tree (org-element-parse-buffer))
|
|
|
|
|
(info `(:parse-tree ,tree)))
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'(left center right)
|
|
|
|
|
(mapcar (lambda (cell) (org-export-table-cell-alignment cell info))
|
|
|
|
|
(org-element-map tree 'table-cell 'identity))))))
|
|
|
|
|
;; 2. The last alignment cookie has precedence.
|
2012-05-18 04:18:42 -04:00
|
|
|
|
(org-test-with-parsed-data "
|
org-export: Define tools for tables, table rows and table cells
* contrib/lisp/org-export.el (org-export-table-cell-width,
org-export-table-cell-alignment, org-export-table-cell-borders,
org-export-table-row-group, org-export-table-has-special-column-p,
org-export-table-row-is-special-p, org-export-get-parent-table,
org-export-table-dimensions, org-export-table-cell-address,
org-export-get-table-cell-at, org-export-table-has-header-p,
org-export-table-cell-starts-colgroup-p,
org-export-table-cell-ends-colgroup-p,
org-export-table-row-starts-rowgroup-p,
org-export-table-row-ends-rowgroup-p,
org-export-table-row-starts-header-p,
org-export-table-row-ends-header-p): New functions.
(org-export-table-format-info, org-export-clean-table): Removed
functions.
(org-export-filter-table-cell-functions,
org-export-filter-table-row-functions): New variables.
(org-export-filters-alist): Install new filters.
(org-export-collect-tree-properties, org-export--skip-p): Mark special
rows and cells as ignored.
* testing/lisp/test-org-export.el: Add tests.
2012-04-11 02:54:24 -04:00
|
|
|
|
| <l8> |
|
|
|
|
|
| cell |
|
|
|
|
|
| <r9> |"
|
2012-05-18 04:18:42 -04:00
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'(right right right)
|
|
|
|
|
(mapcar (lambda (cell) (org-export-table-cell-alignment cell info))
|
|
|
|
|
(org-element-map tree 'table-cell 'identity)))))
|
org-export: Define tools for tables, table rows and table cells
* contrib/lisp/org-export.el (org-export-table-cell-width,
org-export-table-cell-alignment, org-export-table-cell-borders,
org-export-table-row-group, org-export-table-has-special-column-p,
org-export-table-row-is-special-p, org-export-get-parent-table,
org-export-table-dimensions, org-export-table-cell-address,
org-export-get-table-cell-at, org-export-table-has-header-p,
org-export-table-cell-starts-colgroup-p,
org-export-table-cell-ends-colgroup-p,
org-export-table-row-starts-rowgroup-p,
org-export-table-row-ends-rowgroup-p,
org-export-table-row-starts-header-p,
org-export-table-row-ends-header-p): New functions.
(org-export-table-format-info, org-export-clean-table): Removed
functions.
(org-export-filter-table-cell-functions,
org-export-filter-table-row-functions): New variables.
(org-export-filters-alist): Install new filters.
(org-export-collect-tree-properties, org-export--skip-p): Mark special
rows and cells as ignored.
* testing/lisp/test-org-export.el: Add tests.
2012-04-11 02:54:24 -04:00
|
|
|
|
;; 3. If there's no cookie, cell's contents determine alignment.
|
|
|
|
|
;; A column mostly made of cells containing numbers will align
|
|
|
|
|
;; its cells to the right.
|
2012-05-18 04:18:42 -04:00
|
|
|
|
(org-test-with-parsed-data "
|
org-export: Define tools for tables, table rows and table cells
* contrib/lisp/org-export.el (org-export-table-cell-width,
org-export-table-cell-alignment, org-export-table-cell-borders,
org-export-table-row-group, org-export-table-has-special-column-p,
org-export-table-row-is-special-p, org-export-get-parent-table,
org-export-table-dimensions, org-export-table-cell-address,
org-export-get-table-cell-at, org-export-table-has-header-p,
org-export-table-cell-starts-colgroup-p,
org-export-table-cell-ends-colgroup-p,
org-export-table-row-starts-rowgroup-p,
org-export-table-row-ends-rowgroup-p,
org-export-table-row-starts-header-p,
org-export-table-row-ends-header-p): New functions.
(org-export-table-format-info, org-export-clean-table): Removed
functions.
(org-export-filter-table-cell-functions,
org-export-filter-table-row-functions): New variables.
(org-export-filters-alist): Install new filters.
(org-export-collect-tree-properties, org-export--skip-p): Mark special
rows and cells as ignored.
* testing/lisp/test-org-export.el: Add tests.
2012-04-11 02:54:24 -04:00
|
|
|
|
| 123 |
|
|
|
|
|
| some text |
|
|
|
|
|
| 12345 |"
|
2012-05-18 04:18:42 -04:00
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'(right right right)
|
|
|
|
|
(mapcar (lambda (cell)
|
|
|
|
|
(org-export-table-cell-alignment cell info))
|
|
|
|
|
(org-element-map tree 'table-cell 'identity)))))
|
|
|
|
|
;; 4. Otherwise, they will be aligned to the left.
|
|
|
|
|
(org-test-with-parsed-data "
|
org-export: Define tools for tables, table rows and table cells
* contrib/lisp/org-export.el (org-export-table-cell-width,
org-export-table-cell-alignment, org-export-table-cell-borders,
org-export-table-row-group, org-export-table-has-special-column-p,
org-export-table-row-is-special-p, org-export-get-parent-table,
org-export-table-dimensions, org-export-table-cell-address,
org-export-get-table-cell-at, org-export-table-has-header-p,
org-export-table-cell-starts-colgroup-p,
org-export-table-cell-ends-colgroup-p,
org-export-table-row-starts-rowgroup-p,
org-export-table-row-ends-rowgroup-p,
org-export-table-row-starts-header-p,
org-export-table-row-ends-header-p): New functions.
(org-export-table-format-info, org-export-clean-table): Removed
functions.
(org-export-filter-table-cell-functions,
org-export-filter-table-row-functions): New variables.
(org-export-filters-alist): Install new filters.
(org-export-collect-tree-properties, org-export--skip-p): Mark special
rows and cells as ignored.
* testing/lisp/test-org-export.el: Add tests.
2012-04-11 02:54:24 -04:00
|
|
|
|
| text |
|
|
|
|
|
| some text |
|
2012-05-03 08:29:30 -04:00
|
|
|
|
| \alpha |"
|
2012-05-18 04:18:42 -04:00
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'(left left left)
|
|
|
|
|
(mapcar (lambda (cell)
|
|
|
|
|
(org-export-table-cell-alignment cell info))
|
|
|
|
|
(org-element-map tree 'table-cell 'identity)))))))
|
org-export: Define tools for tables, table rows and table cells
* contrib/lisp/org-export.el (org-export-table-cell-width,
org-export-table-cell-alignment, org-export-table-cell-borders,
org-export-table-row-group, org-export-table-has-special-column-p,
org-export-table-row-is-special-p, org-export-get-parent-table,
org-export-table-dimensions, org-export-table-cell-address,
org-export-get-table-cell-at, org-export-table-has-header-p,
org-export-table-cell-starts-colgroup-p,
org-export-table-cell-ends-colgroup-p,
org-export-table-row-starts-rowgroup-p,
org-export-table-row-ends-rowgroup-p,
org-export-table-row-starts-header-p,
org-export-table-row-ends-header-p): New functions.
(org-export-table-format-info, org-export-clean-table): Removed
functions.
(org-export-filter-table-cell-functions,
org-export-filter-table-row-functions): New variables.
(org-export-filters-alist): Install new filters.
(org-export-collect-tree-properties, org-export--skip-p): Mark special
rows and cells as ignored.
* testing/lisp/test-org-export.el: Add tests.
2012-04-11 02:54:24 -04:00
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/table-cell-borders ()
|
|
|
|
|
"Test `org-export-table-cell-borders' specifications."
|
|
|
|
|
;; 1. Recognize various column groups indicators.
|
|
|
|
|
(org-test-with-parsed-data "| / | < | > | <> |"
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'((right bottom top) (left bottom top) (right bottom top)
|
|
|
|
|
(right left bottom top))
|
|
|
|
|
(mapcar (lambda (cell)
|
|
|
|
|
(org-export-table-cell-borders cell info))
|
|
|
|
|
(org-element-map tree 'table-cell 'identity)))))
|
|
|
|
|
;; 2. Accept shortcuts to define column groups.
|
|
|
|
|
(org-test-with-parsed-data "| / | < | < |"
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'((right bottom top) (right left bottom top) (left bottom top))
|
|
|
|
|
(mapcar (lambda (cell)
|
|
|
|
|
(org-export-table-cell-borders cell info))
|
|
|
|
|
(org-element-map tree 'table-cell 'identity)))))
|
|
|
|
|
;; 3. A valid column groups row must start with a "/".
|
|
|
|
|
(org-test-with-parsed-data "
|
|
|
|
|
| | < |
|
|
|
|
|
| a | b |"
|
|
|
|
|
(should
|
|
|
|
|
(equal '((top) (top) (bottom) (bottom))
|
|
|
|
|
(mapcar (lambda (cell)
|
|
|
|
|
(org-export-table-cell-borders cell info))
|
|
|
|
|
(org-element-map tree 'table-cell 'identity)))))
|
|
|
|
|
;; 4. Take table rules into consideration.
|
|
|
|
|
(org-test-with-parsed-data "
|
|
|
|
|
| 1 |
|
|
|
|
|
|---|
|
|
|
|
|
| 2 |"
|
|
|
|
|
(should
|
|
|
|
|
(equal '((below top) (bottom above))
|
|
|
|
|
(mapcar (lambda (cell)
|
|
|
|
|
(org-export-table-cell-borders cell info))
|
|
|
|
|
(org-element-map tree 'table-cell 'identity)))))
|
|
|
|
|
;; 5. Top and (resp. bottom) rules induce both `top' and `above'
|
|
|
|
|
;; (resp. `bottom' and `below') borders. Any special row is
|
|
|
|
|
;; ignored.
|
|
|
|
|
(org-test-with-parsed-data "
|
|
|
|
|
|---+----|
|
|
|
|
|
| / | |
|
|
|
|
|
| | 1 |
|
|
|
|
|
|---+----|"
|
|
|
|
|
(should
|
|
|
|
|
(equal '((bottom below top above))
|
|
|
|
|
(last
|
|
|
|
|
(mapcar (lambda (cell)
|
|
|
|
|
(org-export-table-cell-borders cell info))
|
|
|
|
|
(org-element-map tree 'table-cell 'identity)))))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/table-dimensions ()
|
|
|
|
|
"Test `org-export-table-dimensions' specifications."
|
|
|
|
|
;; 1. Standard test.
|
|
|
|
|
(org-test-with-parsed-data "
|
|
|
|
|
| 1 | 2 | 3 |
|
|
|
|
|
| 4 | 5 | 6 |"
|
|
|
|
|
(should
|
|
|
|
|
(equal '(2 . 3)
|
|
|
|
|
(org-export-table-dimensions
|
|
|
|
|
(org-element-map tree 'table 'identity info 'first-match) info))))
|
|
|
|
|
;; 2. Ignore horizontal rules and special columns.
|
|
|
|
|
(org-test-with-parsed-data "
|
|
|
|
|
| / | < | > |
|
|
|
|
|
| 1 | 2 | 3 |
|
|
|
|
|
|---+---+---|
|
|
|
|
|
| 4 | 5 | 6 |"
|
|
|
|
|
(should
|
|
|
|
|
(equal '(2 . 3)
|
|
|
|
|
(org-export-table-dimensions
|
|
|
|
|
(org-element-map tree 'table 'identity info 'first-match) info)))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/table-cell-address ()
|
|
|
|
|
"Test `org-export-table-cell-address' specifications."
|
|
|
|
|
;; 1. Standard test: index is 0-based.
|
|
|
|
|
(org-test-with-parsed-data "| a | b |"
|
|
|
|
|
(should
|
|
|
|
|
(equal '((0 . 0) (0 . 1))
|
|
|
|
|
(org-element-map
|
|
|
|
|
tree 'table-cell
|
|
|
|
|
(lambda (cell) (org-export-table-cell-address cell info))
|
|
|
|
|
info))))
|
|
|
|
|
;; 2. Special column isn't counted, nor are special rows.
|
|
|
|
|
(org-test-with-parsed-data "
|
|
|
|
|
| / | <> |
|
|
|
|
|
| | c |"
|
|
|
|
|
(should
|
|
|
|
|
(equal '(0 . 0)
|
|
|
|
|
(org-export-table-cell-address
|
|
|
|
|
(car (last (org-element-map tree 'table-cell 'identity info)))
|
|
|
|
|
info))))
|
|
|
|
|
;; 3. Tables rules do not count either.
|
|
|
|
|
(org-test-with-parsed-data "
|
|
|
|
|
| a |
|
|
|
|
|
|---|
|
|
|
|
|
| b |
|
|
|
|
|
|---|
|
|
|
|
|
| c |"
|
|
|
|
|
(should
|
|
|
|
|
(equal '(2 . 0)
|
|
|
|
|
(org-export-table-cell-address
|
|
|
|
|
(car (last (org-element-map tree 'table-cell 'identity info)))
|
|
|
|
|
info))))
|
|
|
|
|
;; 4. Return nil for special cells.
|
|
|
|
|
(org-test-with-parsed-data "| / | a |"
|
|
|
|
|
(should-not
|
|
|
|
|
(org-export-table-cell-address
|
|
|
|
|
(org-element-map tree 'table-cell 'identity nil 'first-match)
|
|
|
|
|
info))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/get-table-cell-at ()
|
|
|
|
|
"Test `org-export-get-table-cell-at' specifications."
|
|
|
|
|
;; 1. Address ignores special columns, special rows and rules.
|
|
|
|
|
(org-test-with-parsed-data "
|
|
|
|
|
| / | <> |
|
|
|
|
|
| | a |
|
|
|
|
|
|---+----|
|
|
|
|
|
| | b |"
|
|
|
|
|
(should
|
|
|
|
|
(equal '("b")
|
|
|
|
|
(org-element-contents
|
|
|
|
|
(org-export-get-table-cell-at
|
|
|
|
|
'(1 . 0)
|
|
|
|
|
(org-element-map tree 'table 'identity info 'first-match)
|
|
|
|
|
info)))))
|
|
|
|
|
;; 2. Return value for a non-existent address is nil.
|
|
|
|
|
(org-test-with-parsed-data "| a |"
|
|
|
|
|
(should-not
|
|
|
|
|
(org-export-get-table-cell-at
|
|
|
|
|
'(2 . 2)
|
|
|
|
|
(org-element-map tree 'table 'identity info 'first-match)
|
|
|
|
|
info)))
|
|
|
|
|
(org-test-with-parsed-data "| / |"
|
|
|
|
|
(should-not
|
|
|
|
|
(org-export-get-table-cell-at
|
|
|
|
|
'(0 . 0)
|
|
|
|
|
(org-element-map tree 'table 'identity info 'first-match)
|
|
|
|
|
info))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/table-cell-starts-colgroup-p ()
|
|
|
|
|
"Test `org-export-table-cell-starts-colgroup-p' specifications."
|
|
|
|
|
;; 1. A cell at a beginning of a row always starts a column group.
|
|
|
|
|
(org-test-with-parsed-data "| a |"
|
|
|
|
|
(should
|
|
|
|
|
(org-export-table-cell-starts-colgroup-p
|
|
|
|
|
(org-element-map tree 'table-cell 'identity info 'first-match)
|
|
|
|
|
info)))
|
|
|
|
|
;; 2. Special column should be ignored when determining the
|
|
|
|
|
;; beginning of the row.
|
|
|
|
|
(org-test-with-parsed-data "
|
|
|
|
|
| / | |
|
|
|
|
|
| | a |"
|
|
|
|
|
(should
|
|
|
|
|
(org-export-table-cell-starts-colgroup-p
|
|
|
|
|
(org-element-map tree 'table-cell 'identity info 'first-match)
|
|
|
|
|
info)))
|
|
|
|
|
;; 2. Explicit column groups.
|
|
|
|
|
(org-test-with-parsed-data "
|
|
|
|
|
| / | | < |
|
|
|
|
|
| a | b | c |"
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'(yes no yes)
|
|
|
|
|
(org-element-map
|
|
|
|
|
tree 'table-cell
|
|
|
|
|
(lambda (cell)
|
|
|
|
|
(if (org-export-table-cell-starts-colgroup-p cell info) 'yes 'no))
|
|
|
|
|
info)))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/table-cell-ends-colgroup-p ()
|
|
|
|
|
"Test `org-export-table-cell-ends-colgroup-p' specifications."
|
|
|
|
|
;; 1. A cell at the end of a row always ends a column group.
|
|
|
|
|
(org-test-with-parsed-data "| a |"
|
|
|
|
|
(should
|
|
|
|
|
(org-export-table-cell-ends-colgroup-p
|
|
|
|
|
(org-element-map tree 'table-cell 'identity info 'first-match)
|
|
|
|
|
info)))
|
|
|
|
|
;; 2. Special column should be ignored when determining the
|
|
|
|
|
;; beginning of the row.
|
|
|
|
|
(org-test-with-parsed-data "
|
|
|
|
|
| / | |
|
|
|
|
|
| | a |"
|
|
|
|
|
(should
|
|
|
|
|
(org-export-table-cell-ends-colgroup-p
|
|
|
|
|
(org-element-map tree 'table-cell 'identity info 'first-match)
|
|
|
|
|
info)))
|
|
|
|
|
;; 3. Explicit column groups.
|
|
|
|
|
(org-test-with-parsed-data "
|
|
|
|
|
| / | < | |
|
|
|
|
|
| a | b | c |"
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'(yes no yes)
|
|
|
|
|
(org-element-map
|
|
|
|
|
tree 'table-cell
|
|
|
|
|
(lambda (cell)
|
|
|
|
|
(if (org-export-table-cell-ends-colgroup-p cell info) 'yes 'no))
|
|
|
|
|
info)))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/table-row-starts-rowgroup-p ()
|
|
|
|
|
"Test `org-export-table-row-starts-rowgroup-p' specifications."
|
|
|
|
|
;; 1. A row at the beginning of a table always starts a row group.
|
|
|
|
|
;; So does a row following a table rule.
|
|
|
|
|
(org-test-with-parsed-data "
|
|
|
|
|
| a |
|
|
|
|
|
|---|
|
|
|
|
|
| b |"
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'(yes no yes)
|
|
|
|
|
(org-element-map
|
|
|
|
|
tree 'table-row
|
|
|
|
|
(lambda (row)
|
|
|
|
|
(if (org-export-table-row-starts-rowgroup-p row info) 'yes 'no))
|
|
|
|
|
info))))
|
|
|
|
|
;; 2. Special rows should be ignored when determining the beginning
|
|
|
|
|
;; of the row.
|
|
|
|
|
(org-test-with-parsed-data "
|
|
|
|
|
| / | < |
|
|
|
|
|
| | a |
|
|
|
|
|
|---+---|
|
|
|
|
|
| / | < |
|
|
|
|
|
| | b |"
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'(yes no yes)
|
|
|
|
|
(org-element-map
|
|
|
|
|
tree 'table-row
|
|
|
|
|
(lambda (row)
|
|
|
|
|
(if (org-export-table-row-starts-rowgroup-p row info) 'yes 'no))
|
|
|
|
|
info)))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/table-row-ends-rowgroup-p ()
|
|
|
|
|
"Test `org-export-table-row-ends-rowgroup-p' specifications."
|
|
|
|
|
;; 1. A row at the end of a table always ends a row group. So does
|
|
|
|
|
;; a row preceding a table rule.
|
|
|
|
|
(org-test-with-parsed-data "
|
|
|
|
|
| a |
|
|
|
|
|
|---|
|
|
|
|
|
| b |"
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'(yes no yes)
|
|
|
|
|
(org-element-map
|
|
|
|
|
tree 'table-row
|
|
|
|
|
(lambda (row)
|
|
|
|
|
(if (org-export-table-row-ends-rowgroup-p row info) 'yes 'no))
|
|
|
|
|
info))))
|
|
|
|
|
;; 2. Special rows should be ignored when determining the beginning
|
|
|
|
|
;; of the row.
|
|
|
|
|
(org-test-with-parsed-data "
|
|
|
|
|
| | a |
|
|
|
|
|
| / | < |
|
|
|
|
|
|---+---|
|
|
|
|
|
| | b |
|
|
|
|
|
| / | < |"
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'(yes no yes)
|
|
|
|
|
(org-element-map
|
|
|
|
|
tree 'table-row
|
|
|
|
|
(lambda (row)
|
|
|
|
|
(if (org-export-table-row-ends-rowgroup-p row info) 'yes 'no))
|
|
|
|
|
info)))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/table-row-starts-header-p ()
|
|
|
|
|
"Test `org-export-table-row-starts-header-p' specifications."
|
|
|
|
|
;; 1. Only the row starting the first row group starts the table
|
|
|
|
|
;; header.
|
|
|
|
|
(org-test-with-parsed-data "
|
|
|
|
|
| a |
|
|
|
|
|
| b |
|
|
|
|
|
|---|
|
|
|
|
|
| c |"
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'(yes no no no)
|
|
|
|
|
(org-element-map
|
|
|
|
|
tree 'table-row
|
|
|
|
|
(lambda (row)
|
|
|
|
|
(if (org-export-table-row-starts-header-p row info) 'yes 'no))
|
|
|
|
|
info))))
|
|
|
|
|
;; 2. A row cannot start an header if there's no header in the
|
|
|
|
|
;; table.
|
|
|
|
|
(org-test-with-parsed-data "
|
|
|
|
|
| a |
|
|
|
|
|
|---|"
|
|
|
|
|
(should-not
|
|
|
|
|
(org-export-table-row-starts-header-p
|
|
|
|
|
(org-element-map tree 'table-row 'identity info 'first-match)
|
|
|
|
|
info))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/table-row-ends-header-p ()
|
|
|
|
|
"Test `org-export-table-row-ends-header-p' specifications."
|
|
|
|
|
;; 1. Only the row starting the first row group starts the table
|
|
|
|
|
;; header.
|
|
|
|
|
(org-test-with-parsed-data "
|
|
|
|
|
| a |
|
|
|
|
|
| b |
|
|
|
|
|
|---|
|
|
|
|
|
| c |"
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'(no yes no no)
|
|
|
|
|
(org-element-map
|
|
|
|
|
tree 'table-row
|
|
|
|
|
(lambda (row)
|
|
|
|
|
(if (org-export-table-row-ends-header-p row info) 'yes 'no))
|
|
|
|
|
info))))
|
|
|
|
|
;; 2. A row cannot start an header if there's no header in the
|
|
|
|
|
;; table.
|
|
|
|
|
(org-test-with-parsed-data "
|
|
|
|
|
| a |
|
|
|
|
|
|---|"
|
|
|
|
|
(should-not
|
|
|
|
|
(org-export-table-row-ends-header-p
|
|
|
|
|
(org-element-map tree 'table-row 'identity info 'first-match)
|
|
|
|
|
info))))
|
|
|
|
|
|
2012-03-10 05:37:13 -05:00
|
|
|
|
|
2012-07-10 13:22:04 -04:00
|
|
|
|
|
|
|
|
|
;;; Topology
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/get-next-element ()
|
|
|
|
|
"Test `org-export-get-next-element' specifications."
|
|
|
|
|
;; Standard test.
|
|
|
|
|
(should
|
|
|
|
|
(equal "b"
|
|
|
|
|
(org-test-with-parsed-data "* Headline\n*a* b"
|
|
|
|
|
(org-export-get-next-element
|
2012-07-27 10:13:57 -04:00
|
|
|
|
(org-element-map tree 'bold 'identity info t) info))))
|
2012-07-10 13:22:04 -04:00
|
|
|
|
;; Return nil when no previous element.
|
|
|
|
|
(should-not
|
|
|
|
|
(org-test-with-parsed-data "* Headline\na *b*"
|
|
|
|
|
(org-export-get-next-element
|
2012-07-27 10:13:57 -04:00
|
|
|
|
(org-element-map tree 'bold 'identity info t) info)))
|
|
|
|
|
;; Non-exportable elements are ignored.
|
|
|
|
|
(should-not
|
|
|
|
|
(let ((org-export-with-timestamps nil))
|
|
|
|
|
(org-test-with-parsed-data "\alpha <2012-03-29 Thu>"
|
|
|
|
|
(org-export-get-next-element
|
|
|
|
|
(org-element-map tree 'entity 'identity info t) info)))))
|
2012-07-10 13:22:04 -04:00
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/get-previous-element ()
|
|
|
|
|
"Test `org-export-get-previous-element' specifications."
|
|
|
|
|
;; Standard test.
|
|
|
|
|
(should
|
|
|
|
|
(equal "a "
|
|
|
|
|
(org-test-with-parsed-data "* Headline\na *b*"
|
|
|
|
|
(org-export-get-previous-element
|
2012-07-27 10:13:57 -04:00
|
|
|
|
(org-element-map tree 'bold 'identity info t) info))))
|
2012-07-10 13:22:04 -04:00
|
|
|
|
;; Return nil when no previous element.
|
|
|
|
|
(should-not
|
|
|
|
|
(org-test-with-parsed-data "* Headline\n*a* b"
|
|
|
|
|
(org-export-get-previous-element
|
2012-07-27 10:13:57 -04:00
|
|
|
|
(org-element-map tree 'bold 'identity info t) info)))
|
|
|
|
|
;; Non-exportable elements are ignored.
|
|
|
|
|
(should-not
|
|
|
|
|
(let ((org-export-with-timestamps nil))
|
|
|
|
|
(org-test-with-parsed-data "<2012-03-29 Thu> \alpha"
|
|
|
|
|
(org-export-get-previous-element
|
|
|
|
|
(org-element-map tree 'entity 'identity info t) info)))))
|
2012-07-10 13:22:04 -04:00
|
|
|
|
|
|
|
|
|
|
2012-03-10 05:37:13 -05:00
|
|
|
|
(provide 'test-org-export)
|
|
|
|
|
;;; test-org-export.el end here
|