2013-01-27 17:11:34 -05:00
|
|
|
|
;;; test-ox.el --- Tests for ox.el
|
2012-02-22 18:57:59 -05:00
|
|
|
|
|
2013-01-01 10:04:24 -05:00
|
|
|
|
;; Copyright (C) 2012, 2013 Nicolas Goaziou
|
2012-02-22 18:57:59 -05:00
|
|
|
|
|
|
|
|
|
;; Author: Nicolas Goaziou <n.goaziou at gmail dot com>
|
|
|
|
|
|
2012-12-13 11:24:19 -05:00
|
|
|
|
;; This file is not part of GNU Emacs.
|
2012-02-22 18:57:59 -05:00
|
|
|
|
|
2012-12-13 11:24:19 -05:00
|
|
|
|
;; This program is free software; you can redistribute it and/or modify
|
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
;; (at your option) any later version.
|
2012-02-22 18:57:59 -05:00
|
|
|
|
|
2012-12-13 11:24:19 -05:00
|
|
|
|
;; This program is distributed in the hope that it will be useful,
|
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
|
|
|
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
|
2012-02-22 18:57:59 -05:00
|
|
|
|
|
|
|
|
|
;;; Code:
|
2012-02-29 12:38:54 -05:00
|
|
|
|
|
2013-01-27 17:11:34 -05:00
|
|
|
|
(unless (featurep 'ox)
|
2012-02-29 12:38:54 -05:00
|
|
|
|
(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))
|
org-export: Internal changes to back-end definition
* contrib/lisp/org-export.el (org-export-registered-backends): New
variable.
(org-export-define-backend, org-export-define-derived-backend): Use
new variable. Also redefine how sub-menus are defined.
(org-export-backend-filters, org-export-backend-menu,
org-export-backend-options, org-export-backend-translate-table): New
functions.
(org-export-get-environment, org-export--parse-option-keyword,
org-export--get-subtree-options, org-export--get-inbuffer-options,
org-export--get-global-options, org-export-install-filters,
org-export-with-backend): Access to data stored in new variable.
(org-export-dispatch-ui): Display sub-menus according to new
definition.
(org-export-dispatch-menu-entries): Removed variable.
* contrib/lisp/org-e-beamer.el: Use new sub-menu definition.
(org-e-beamer--format-section, org-e-beamer-item,
org-e-beamer-keyword): Use `org-export-with-backend' instead of
relying on removed variables.
* testing/lisp/test-org-export.el: Update tests.
This patch gets rid of "invisible" variables, that is variables
defvar'ed within a macro.
2012-11-12 17:21:05 -05:00
|
|
|
|
`(let ((org-export-registered-backends
|
|
|
|
|
',(list
|
|
|
|
|
(list backend
|
|
|
|
|
:translate-alist
|
|
|
|
|
(let (transcode-table)
|
|
|
|
|
(dolist (type (append org-element-all-elements
|
|
|
|
|
org-element-all-objects)
|
|
|
|
|
transcode-table)
|
|
|
|
|
(push
|
|
|
|
|
(cons type
|
|
|
|
|
(lambda (obj contents info)
|
|
|
|
|
(funcall
|
|
|
|
|
(intern (format "org-element-%s-interpreter"
|
|
|
|
|
type))
|
|
|
|
|
obj contents)))
|
|
|
|
|
transcode-table)))))))
|
2012-07-15 14:02:22 -04:00
|
|
|
|
(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
|
|
|
|
|
|
|
|
|
|
2012-09-01 06:59:57 -04:00
|
|
|
|
;;; Internal Tests
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/bind-keyword ()
|
|
|
|
|
"Test reading #+BIND: keywords."
|
2013-01-27 17:11:34 -05:00
|
|
|
|
;; Test with `org-export-allow-bind-keywords' set to t.
|
2012-09-01 06:59:57 -04:00
|
|
|
|
(should
|
|
|
|
|
(org-test-with-temp-text "#+BIND: variable value"
|
2013-01-27 17:11:34 -05:00
|
|
|
|
(let ((org-export-allow-bind-keywords t))
|
2012-09-01 06:59:57 -04:00
|
|
|
|
(org-export--install-letbind-maybe)
|
|
|
|
|
(eq variable 'value))))
|
2013-01-27 17:11:34 -05:00
|
|
|
|
;; Test with `org-export-allow-bind-keywords' set to nil.
|
2012-09-01 06:59:57 -04:00
|
|
|
|
(should-not
|
|
|
|
|
(org-test-with-temp-text "#+BIND: variable value"
|
2013-01-27 17:11:34 -05:00
|
|
|
|
(let ((org-export-allow-bind-keywords nil))
|
2012-09-01 06:59:57 -04:00
|
|
|
|
(org-export--install-letbind-maybe)
|
2012-09-01 08:19:42 -04:00
|
|
|
|
(boundp 'variable))))
|
|
|
|
|
;; BIND keywords are case-insensitive.
|
|
|
|
|
(should
|
|
|
|
|
(org-test-with-temp-text "#+bind: variable value"
|
2013-01-27 17:11:34 -05:00
|
|
|
|
(let ((org-export-allow-bind-keywords t))
|
2012-09-01 08:19:42 -04:00
|
|
|
|
(org-export--install-letbind-maybe)
|
|
|
|
|
(eq variable 'value)))))
|
2012-05-26 07:44:13 -04:00
|
|
|
|
|
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-27 06:31:05 -04:00
|
|
|
|
*:t e:t ::t f:t pri:t -:t ^:t toc:t |:t tags:t tasks:t <:t todo:t inline:nil
|
|
|
|
|
stat:t")
|
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
|
2012-08-27 06:31:05 -04:00
|
|
|
|
:with-special-strings t :with-statistics-cookies 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."
|
2013-02-26 17:32:36 -05:00
|
|
|
|
;; Properties should follow buffer order.
|
2012-02-22 18:57:59 -05:00
|
|
|
|
(should
|
|
|
|
|
(equal
|
2013-02-26 17:32:36 -05:00
|
|
|
|
(org-test-with-temp-text "#+LANGUAGE: fr\n#+CREATOR: Me\n#+EMAIL: email"
|
2012-07-24 10:04:35 -04:00
|
|
|
|
(org-export--get-inbuffer-options))
|
2013-02-26 17:32:36 -05:00
|
|
|
|
'(:language "fr" :creator "Me" :email "email")))
|
|
|
|
|
;; Parse document keywords.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
(org-test-with-temp-text "#+AUTHOR: Me"
|
|
|
|
|
(org-export--get-inbuffer-options))
|
|
|
|
|
'(:author ("Me"))))
|
|
|
|
|
;; Test `space' behaviour.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
(org-test-with-temp-text "#+TITLE: Some title\n#+TITLE: with spaces"
|
|
|
|
|
(org-export--get-inbuffer-options))
|
|
|
|
|
'(:title ("Some title with spaces"))))
|
|
|
|
|
;; Test `newline' behaviour.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
(org-test-with-temp-text "#+DESCRIPTION: With\n#+DESCRIPTION: two lines"
|
|
|
|
|
(org-export--get-inbuffer-options))
|
|
|
|
|
'(:description "With\ntwo lines")))
|
|
|
|
|
;; Test `split' behaviour.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
(org-test-with-temp-text "#+SELECT_TAGS: a\n#+SELECT_TAGS: b"
|
|
|
|
|
(org-export--get-inbuffer-options))
|
|
|
|
|
'(:select-tags ("a" "b"))))
|
|
|
|
|
;; Options set through SETUPFILE.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
(format "#+DESCRIPTION: l1
|
|
|
|
|
#+LANGUAGE: es
|
|
|
|
|
#+SELECT_TAGS: a
|
|
|
|
|
#+TITLE: a
|
|
|
|
|
#+SETUPFILE: \"%s/examples/setupfile.org\"
|
|
|
|
|
#+DESCRIPTION: l3
|
|
|
|
|
#+LANGUAGE: fr
|
|
|
|
|
#+SELECT_TAGS: c
|
|
|
|
|
#+TITLE: c"
|
|
|
|
|
org-test-dir)
|
|
|
|
|
(org-export--get-inbuffer-options))
|
|
|
|
|
'(:description "l1\nl2\nl3":language "fr" :select-tags ("a" "b" "c")
|
|
|
|
|
:title ("a b c")))))
|
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"))))
|
2012-11-18 08:44:20 -05:00
|
|
|
|
;; Properties with `split' behaviour are stored as a list of
|
|
|
|
|
;; strings.
|
|
|
|
|
(should
|
|
|
|
|
(equal '("a" "b")
|
|
|
|
|
(org-test-with-temp-text "#+EXCLUDE_TAGS: noexport
|
|
|
|
|
* Headline
|
|
|
|
|
:PROPERTIES:
|
|
|
|
|
:EXPORT_EXCLUDE_TAGS: a b
|
|
|
|
|
:END:
|
|
|
|
|
Paragraph"
|
|
|
|
|
(progn
|
|
|
|
|
(forward-line)
|
|
|
|
|
(plist-get (org-export-get-environment nil t) :exclude-tags)))))
|
|
|
|
|
;; Handle :PROPERTY+: syntax.
|
|
|
|
|
(should
|
|
|
|
|
(equal '("a" "b")
|
|
|
|
|
(org-test-with-temp-text "#+EXCLUDE_TAGS: noexport
|
|
|
|
|
* Headline
|
|
|
|
|
:PROPERTIES:
|
|
|
|
|
:EXPORT_EXCLUDE_TAGS: a
|
|
|
|
|
:EXPORT_EXCLUDE_TAGS+: b
|
|
|
|
|
:END:
|
|
|
|
|
Paragraph"
|
|
|
|
|
(progn
|
|
|
|
|
(forward-line)
|
|
|
|
|
(plist-get (org-export-get-environment nil t) :exclude-tags)))))
|
2012-07-25 06:25:58 -04:00
|
|
|
|
;; 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)
|
2013-01-26 12:05:56 -05:00
|
|
|
|
'("29-03-2012"))))
|
|
|
|
|
;; Still grab correct options when section above is empty.
|
|
|
|
|
(should
|
|
|
|
|
(equal '("H1")
|
|
|
|
|
(org-test-with-temp-text "* H1\n** H11\n** H12"
|
|
|
|
|
(progn (forward-line 2)
|
|
|
|
|
(plist-get (org-export-get-environment nil t) :title))))))
|
2012-07-04 17:30:23 -04:00
|
|
|
|
|
2012-02-22 18:57:59 -05:00
|
|
|
|
(ert-deftest test-org-export/handle-options ()
|
|
|
|
|
"Test if export options have an impact on output."
|
2013-03-02 08:34:45 -05:00
|
|
|
|
;; Test exclude tags for headlines and inlinetasks.
|
|
|
|
|
(should
|
|
|
|
|
(equal ""
|
|
|
|
|
(org-test-with-temp-text "* Head1 :noexp:"
|
|
|
|
|
(org-test-with-backend test
|
|
|
|
|
(org-export-as 'test nil nil nil '(:exclude-tags ("noexp")))))))
|
|
|
|
|
;; Test include tags for headlines and inlinetasks.
|
|
|
|
|
(should
|
|
|
|
|
(equal "* H2\n** Sub :exp:\n*** Sub Sub\n"
|
|
|
|
|
(org-test-with-temp-text "* H1\n* H2\n** Sub :exp:\n*** Sub Sub\n* H3"
|
|
|
|
|
(let ((org-tags-column 0))
|
|
|
|
|
(org-test-with-backend test
|
|
|
|
|
(org-export-as 'test nil nil nil '(:select-tags ("exp"))))))))
|
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.
|
2013-03-02 08:34:45 -05:00
|
|
|
|
(should
|
|
|
|
|
(equal ""
|
|
|
|
|
(let ((org-todo-keywords '((sequence "TODO" "DONE"))))
|
|
|
|
|
(org-test-with-temp-text "* TODO Head1"
|
|
|
|
|
(org-test-with-backend test
|
|
|
|
|
(org-export-as 'test nil nil nil '(:with-tasks nil)))))))
|
|
|
|
|
(should
|
|
|
|
|
(equal "* TODO Head1\n"
|
|
|
|
|
(let ((org-todo-keywords '((sequence "TODO" "DONE"))))
|
|
|
|
|
(org-test-with-temp-text "* TODO Head1"
|
|
|
|
|
(org-test-with-backend test
|
|
|
|
|
(org-export-as 'test nil nil nil '(:with-tasks t)))))))
|
2012-02-22 18:57:59 -05:00
|
|
|
|
;; 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)))))))
|
2013-01-27 17:11:34 -05:00
|
|
|
|
;; Clocks.
|
|
|
|
|
(let ((org-clock-string "CLOCK:"))
|
|
|
|
|
(org-test-with-temp-text "CLOCK: [2012-04-29 sun. 10:45]"
|
|
|
|
|
(org-test-with-backend test
|
|
|
|
|
(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)) "")))))
|
2012-02-22 18:57:59 -05:00
|
|
|
|
;; 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")))))
|
2013-01-27 17:11:34 -05:00
|
|
|
|
(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
|
2013-01-27 17:11:34 -05:00
|
|
|
|
(equal (org-export-as 'test nil nil nil '(:with-drawers (not "BAR")))
|
|
|
|
|
":FOO:\nkeep\n:END:\n")))))
|
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-08-27 06:31:05 -04:00
|
|
|
|
"")))
|
2013-01-27 17:11:34 -05:00
|
|
|
|
;; Plannings.
|
|
|
|
|
(let ((org-closed-string "CLOSED:"))
|
|
|
|
|
(org-test-with-temp-text "CLOSED: [2012-04-29 sun. 10:45]"
|
|
|
|
|
(org-test-with-backend test
|
|
|
|
|
(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-27 06:31:05 -04:00
|
|
|
|
;; Statistics cookies.
|
|
|
|
|
(should
|
|
|
|
|
(equal ""
|
|
|
|
|
(org-test-with-temp-text "[0/0]"
|
|
|
|
|
(org-test-with-backend test
|
|
|
|
|
(org-export-as
|
2013-01-27 17:11:34 -05:00
|
|
|
|
'test nil nil nil '(:with-statistics-cookies nil))))))
|
|
|
|
|
;; Timestamps.
|
|
|
|
|
(org-test-with-temp-text "[2012-04-29 sun. 10:45]<2012-04-29 sun. 10:45>"
|
|
|
|
|
(org-test-with-backend test
|
|
|
|
|
(should
|
|
|
|
|
(equal (org-export-as 'test nil nil nil '(:with-timestamps t))
|
|
|
|
|
"[2012-04-29 sun. 10:45]<2012-04-29 sun. 10:45>\n"))
|
|
|
|
|
(should
|
|
|
|
|
(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-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"))
|
|
|
|
|
;; 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.
|
2012-10-18 14:44:24 -04:00
|
|
|
|
(should
|
|
|
|
|
(equal ": 3\n"
|
|
|
|
|
(org-test-with-temp-text "
|
2012-03-22 11:49:19 -04:00
|
|
|
|
* Head1
|
|
|
|
|
#+BEGIN_SRC emacs-lisp :noweb yes :exports results
|
|
|
|
|
<<test>>
|
|
|
|
|
#+END_SRC
|
|
|
|
|
* Head2
|
|
|
|
|
#+NAME: test
|
|
|
|
|
#+BEGIN_SRC emacs-lisp
|
|
|
|
|
\(+ 1 2)
|
|
|
|
|
#+END_SRC"
|
2012-10-18 14:44:24 -04:00
|
|
|
|
(org-test-with-backend test
|
|
|
|
|
(forward-line 1)
|
org-export: Internal changes to back-end definition
* contrib/lisp/org-export.el (org-export-registered-backends): New
variable.
(org-export-define-backend, org-export-define-derived-backend): Use
new variable. Also redefine how sub-menus are defined.
(org-export-backend-filters, org-export-backend-menu,
org-export-backend-options, org-export-backend-translate-table): New
functions.
(org-export-get-environment, org-export--parse-option-keyword,
org-export--get-subtree-options, org-export--get-inbuffer-options,
org-export--get-global-options, org-export-install-filters,
org-export-with-backend): Access to data stored in new variable.
(org-export-dispatch-ui): Display sub-menus according to new
definition.
(org-export-dispatch-menu-entries): Removed variable.
* contrib/lisp/org-e-beamer.el: Use new sub-menu definition.
(org-e-beamer--format-section, org-e-beamer-item,
org-e-beamer-keyword): Use `org-export-with-backend' instead of
relying on removed variables.
* testing/lisp/test-org-export.el: Update tests.
This patch gets rid of "invisible" variables, that is variables
defvar'ed within a macro.
2012-11-12 17:21:05 -05:00
|
|
|
|
(org-export-as 'test 'subtree)))))
|
|
|
|
|
;; Body only.
|
|
|
|
|
(org-test-with-temp-text "Text"
|
|
|
|
|
(org-test-with-backend test
|
|
|
|
|
(plist-put
|
|
|
|
|
(cdr (assq 'test org-export-registered-backends))
|
|
|
|
|
:translate-alist
|
|
|
|
|
(cons (cons 'template (lambda (body info) (format "BEGIN\n%sEND" body)))
|
|
|
|
|
(org-export-backend-translate-table 'test)))
|
|
|
|
|
(should (equal (org-export-as 'test nil nil 'body-only) "Text\n"))
|
|
|
|
|
(should (equal (org-export-as 'test) "BEGIN\nText\nEND")))))
|
2012-02-23 15:06:17 -05:00
|
|
|
|
|
2013-02-15 09:06:01 -05:00
|
|
|
|
(ert-deftest test-org-export/output-file-name ()
|
|
|
|
|
"Test `org-export-output-file-name' specifications."
|
|
|
|
|
;; Export from a file: name is built from original file name.
|
|
|
|
|
(should
|
|
|
|
|
(org-test-with-temp-text-in-file "Test"
|
|
|
|
|
(equal (concat (file-name-as-directory ".")
|
|
|
|
|
(file-name-nondirectory
|
|
|
|
|
(file-name-sans-extension (buffer-file-name))))
|
|
|
|
|
(file-name-sans-extension (org-export-output-file-name ".ext")))))
|
|
|
|
|
;; When exporting to subtree, check EXPORT_FILE_NAME property first.
|
|
|
|
|
(should
|
|
|
|
|
(org-test-with-temp-text-in-file
|
|
|
|
|
"* Test\n :PROPERTIES:\n :EXPORT_FILE_NAME: test\n :END:"
|
|
|
|
|
(equal (org-export-output-file-name ".ext" t) "./test.ext")))
|
|
|
|
|
;; From a buffer not associated to a file, too.
|
|
|
|
|
(should
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"* Test\n :PROPERTIES:\n :EXPORT_FILE_NAME: test\n :END:"
|
|
|
|
|
(equal (org-export-output-file-name ".ext" t) "./test.ext")))
|
|
|
|
|
;; When provided name is absolute, preserve it.
|
|
|
|
|
(should
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
(format "* Test\n :PROPERTIES:\n :EXPORT_FILE_NAME: %s\n :END:"
|
|
|
|
|
(expand-file-name "test"))
|
|
|
|
|
(file-name-absolute-p (org-export-output-file-name ".ext" t))))
|
|
|
|
|
;; When PUB-DIR argument is provided, use it.
|
|
|
|
|
(should
|
|
|
|
|
(org-test-with-temp-text-in-file "Test"
|
|
|
|
|
(equal (file-name-directory
|
|
|
|
|
(org-export-output-file-name ".ext" nil "dir/"))
|
|
|
|
|
"dir/")))
|
|
|
|
|
;; When returned name would overwrite original file, add EXTENSION
|
|
|
|
|
;; another time.
|
|
|
|
|
(should
|
|
|
|
|
(org-test-at-id "75282ba2-f77a-4309-a970-e87c149fe125"
|
|
|
|
|
(equal (org-export-output-file-name ".org") "./normal.org.org"))))
|
|
|
|
|
|
2012-02-23 15:06:17 -05:00
|
|
|
|
(ert-deftest test-org-export/expand-include ()
|
|
|
|
|
"Test file inclusion in an Org buffer."
|
2012-10-29 06:31:19 -04:00
|
|
|
|
;; Error when file isn't specified.
|
|
|
|
|
(should-error
|
|
|
|
|
(org-test-with-temp-text "#+INCLUDE: dummy.org"
|
|
|
|
|
(org-export-expand-include-keyword)))
|
2012-02-23 15:06:17 -05:00
|
|
|
|
;; 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.
|
2013-02-18 14:49:43 -05:00
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
"* Top heading\n** Heading\nbody\n"
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
(format
|
|
|
|
|
"* Top heading\n#+INCLUDE: \"%s/examples/include.org\" :lines \"9-\""
|
|
|
|
|
org-test-dir)
|
|
|
|
|
(org-export-expand-include-keyword)
|
|
|
|
|
(buffer-string))))
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
"* Top heading\n* Heading\nbody\n"
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
(format
|
|
|
|
|
"* Top heading\n#+INCLUDE: \"%s/examples/include.org\" :lines \"9-\" :minlevel 1"
|
|
|
|
|
org-test-dir)
|
|
|
|
|
(org-export-expand-include-keyword)
|
|
|
|
|
(buffer-string))))
|
2012-02-23 15:06:17 -05:00
|
|
|
|
;; 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
|
|
|
|
|
2012-10-06 04:27:57 -04:00
|
|
|
|
(ert-deftest test-org-export/expand-macro ()
|
|
|
|
|
"Test macro expansion in an Org buffer."
|
|
|
|
|
;; Standard macro expansion.
|
|
|
|
|
(should
|
2012-10-29 08:42:30 -04:00
|
|
|
|
(equal "#+MACRO: macro1 value\nvalue\n"
|
2012-10-06 04:27:57 -04:00
|
|
|
|
(org-test-with-temp-text "#+MACRO: macro1 value\n{{{macro1}}}"
|
2012-10-29 08:42:30 -04:00
|
|
|
|
(org-test-with-backend test (org-export-as 'test)))))
|
|
|
|
|
;; Expand specific macros.
|
2012-10-06 04:27:57 -04:00
|
|
|
|
(should
|
2012-10-29 08:42:30 -04:00
|
|
|
|
(equal "me 2012-03-29 me@here Title\n"
|
2012-10-06 04:27:57 -04:00
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"
|
|
|
|
|
#+TITLE: Title
|
|
|
|
|
#+DATE: 2012-03-29
|
|
|
|
|
#+AUTHOR: me
|
|
|
|
|
#+EMAIL: me@here
|
|
|
|
|
{{{author}}} {{{date}}} {{{email}}} {{{title}}}"
|
2012-10-29 08:42:30 -04:00
|
|
|
|
(let ((output (org-test-with-backend test (org-export-as 'test))))
|
|
|
|
|
(substring output (string-match ".*\n\\'" output))))))
|
|
|
|
|
;; Expand specific macros when property contained a regular macro
|
|
|
|
|
;; already.
|
|
|
|
|
(should
|
|
|
|
|
(equal "value\n"
|
|
|
|
|
(org-test-with-temp-text "
|
|
|
|
|
#+MACRO: macro1 value
|
|
|
|
|
#+TITLE: {{{macro1}}}
|
|
|
|
|
{{{title}}}"
|
|
|
|
|
(let ((output (org-test-with-backend test (org-export-as 'test))))
|
|
|
|
|
(substring output (string-match ".*\n\\'" output))))))
|
2012-10-10 07:52:54 -04:00
|
|
|
|
;; Expand macros with templates in included files.
|
|
|
|
|
(should
|
2012-10-29 08:42:30 -04:00
|
|
|
|
(equal "success\n"
|
2012-10-10 07:52:54 -04:00
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
(format "#+INCLUDE: \"%s/examples/macro-templates.org\"
|
|
|
|
|
{{{included-macro}}}" org-test-dir)
|
2012-10-29 08:42:30 -04:00
|
|
|
|
(let ((output (org-test-with-backend test (org-export-as 'test))))
|
|
|
|
|
(substring output (string-match ".*\n\\'" output)))))))
|
2012-10-06 04:27:57 -04:00
|
|
|
|
|
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.
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map data 'headline
|
|
|
|
|
(lambda (headline)
|
|
|
|
|
(when (string-match "\\<note\\>"
|
|
|
|
|
(org-element-property :raw-value headline))
|
|
|
|
|
(org-export-ignore-element headline info)))
|
|
|
|
|
info)
|
2012-02-25 07:08:40 -05:00
|
|
|
|
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-11-02 09:06:50 -04:00
|
|
|
|
(ert-deftest test-org-export/before-processing-hook ()
|
|
|
|
|
"Test `org-export-before-processing-hook'."
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
"#+MACRO: mac val\nTest\n"
|
|
|
|
|
(org-test-with-backend test
|
|
|
|
|
(org-test-with-temp-text "#+MACRO: mac val\n{{{mac}}} Test"
|
|
|
|
|
(let ((org-export-before-processing-hook
|
|
|
|
|
'((lambda (backend)
|
|
|
|
|
(while (re-search-forward "{{{" nil t)
|
|
|
|
|
(let ((object (org-element-context)))
|
|
|
|
|
(when (eq (org-element-type object) 'macro)
|
|
|
|
|
(delete-region
|
|
|
|
|
(org-element-property :begin object)
|
|
|
|
|
(org-element-property :end object)))))))))
|
|
|
|
|
(org-export-as 'test)))))))
|
|
|
|
|
|
2012-04-27 18:57:38 -04:00
|
|
|
|
(ert-deftest test-org-export/before-parsing-hook ()
|
|
|
|
|
"Test `org-export-before-parsing-hook'."
|
2012-11-02 09:06:50 -04:00
|
|
|
|
(should
|
|
|
|
|
(equal "Body 1\nBody 2\n"
|
|
|
|
|
(org-test-with-backend test
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-test-with-temp-text "* Headline 1\nBody 1\n* Headline 2\nBody 2"
|
|
|
|
|
(let ((org-export-before-parsing-hook
|
|
|
|
|
'((lambda (backend)
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(while (re-search-forward org-outline-regexp-bol nil t)
|
|
|
|
|
(delete-region
|
|
|
|
|
(point-at-bol) (progn (forward-line) (point))))))))
|
|
|
|
|
(org-export-as 'test)))))))
|
2012-04-27 18:57:38 -04:00
|
|
|
|
|
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)))
|
2013-03-08 18:58:31 -05:00
|
|
|
|
'(:a "1" :b "2")))
|
2012-06-12 04:25:00 -04:00
|
|
|
|
;; Return nil on empty attribute.
|
|
|
|
|
(should-not
|
|
|
|
|
(org-export-read-attribute
|
|
|
|
|
:attr_html
|
2013-03-08 18:58:31 -05:00
|
|
|
|
(org-test-with-temp-text "Paragraph" (org-element-at-point))))
|
|
|
|
|
;; Return nil on "nil" string.
|
|
|
|
|
(should
|
|
|
|
|
(equal '(:a nil :b nil)
|
|
|
|
|
(org-export-read-attribute
|
|
|
|
|
:attr_html
|
|
|
|
|
(org-test-with-temp-text "#+ATTR_HTML: :a nil :b nil\nParagraph"
|
|
|
|
|
(org-element-at-point)))))
|
|
|
|
|
;; Return nil on empty string.
|
|
|
|
|
(should
|
|
|
|
|
(equal '(:a nil :b nil)
|
|
|
|
|
(org-export-read-attribute
|
|
|
|
|
:attr_html
|
|
|
|
|
(org-test-with-temp-text "#+ATTR_HTML: :a :b\nParagraph"
|
|
|
|
|
(org-element-at-point)))))
|
|
|
|
|
;; Ignore text before first property.
|
|
|
|
|
(should-not
|
|
|
|
|
(member "ignore"
|
|
|
|
|
(org-export-read-attribute
|
|
|
|
|
:attr_html
|
|
|
|
|
(org-test-with-temp-text "#+ATTR_HTML: ignore :a 1\nParagraph"
|
|
|
|
|
(org-element-at-point))))))
|
2012-06-12 04:25:00 -04:00
|
|
|
|
|
2012-09-13 10:51:54 -04:00
|
|
|
|
(ert-deftest test-org-export/get-caption ()
|
|
|
|
|
"Test `org-export-get-caption' specifications."
|
|
|
|
|
;; Without optional argument, return long caption
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'("l")
|
|
|
|
|
(org-test-with-temp-text "#+CAPTION[s]: l\nPara"
|
|
|
|
|
(org-export-get-caption (org-element-at-point)))))
|
|
|
|
|
;; With optional argument, return short caption.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'("s")
|
|
|
|
|
(org-test-with-temp-text "#+CAPTION[s]: l\nPara"
|
|
|
|
|
(org-export-get-caption (org-element-at-point) t))))
|
|
|
|
|
;; Multiple lines are separated by white spaces.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'("a" " " "b")
|
|
|
|
|
(org-test-with-temp-text "#+CAPTION: a\n#+CAPTION: b\nPara"
|
|
|
|
|
(org-export-get-caption (org-element-at-point))))))
|
|
|
|
|
|
2012-07-04 17:30:23 -04:00
|
|
|
|
|
2012-11-17 07:33:38 -05:00
|
|
|
|
|
2012-11-23 12:41:58 -05:00
|
|
|
|
;;; Back-End Tools
|
2012-11-17 07:33:38 -05:00
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/define-backend ()
|
|
|
|
|
"Test back-end definition and accessors."
|
|
|
|
|
;; Translate table.
|
|
|
|
|
(should
|
|
|
|
|
(equal '((headline . my-headline-test))
|
|
|
|
|
(let (org-export-registered-backends)
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-export-define-backend 'test '((headline . my-headline-test)))
|
2012-11-17 07:33:38 -05:00
|
|
|
|
(org-export-backend-translate-table 'test))))
|
|
|
|
|
;; Filters.
|
|
|
|
|
(should
|
|
|
|
|
(equal '((:filter-headline . my-filter))
|
|
|
|
|
(let (org-export-registered-backends)
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-export-define-backend 'test
|
|
|
|
|
'((headline . my-headline-test))
|
|
|
|
|
:filters-alist '((:filter-headline . my-filter)))
|
2012-11-17 07:33:38 -05:00
|
|
|
|
(org-export-backend-filters 'test))))
|
|
|
|
|
;; Options.
|
|
|
|
|
(should
|
|
|
|
|
(equal '((:prop value))
|
|
|
|
|
(let (org-export-registered-backends)
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-export-define-backend 'test
|
|
|
|
|
'((headline . my-headline-test))
|
|
|
|
|
:options-alist '((:prop value)))
|
2012-11-17 07:33:38 -05:00
|
|
|
|
(org-export-backend-options 'test))))
|
|
|
|
|
;; Menu.
|
|
|
|
|
(should
|
|
|
|
|
(equal '(?k "Test Export" test)
|
|
|
|
|
(let (org-export-registered-backends)
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-export-define-backend 'test
|
|
|
|
|
'((headline . my-headline-test))
|
|
|
|
|
:menu-entry '(?k "Test Export" test))
|
2012-11-17 07:33:38 -05:00
|
|
|
|
(org-export-backend-menu 'test))))
|
|
|
|
|
;; Export Blocks.
|
|
|
|
|
(should
|
|
|
|
|
(equal '(("TEST" . org-element-export-block-parser))
|
|
|
|
|
(let (org-export-registered-backends org-element-block-name-alist)
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-export-define-backend 'test
|
|
|
|
|
'((headline . my-headline-test))
|
|
|
|
|
:export-block '("test"))
|
2012-11-17 07:33:38 -05:00
|
|
|
|
org-element-block-name-alist))))
|
|
|
|
|
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(ert-deftest test-org-export/define-derived-backend ()
|
|
|
|
|
"Test `org-export-define-derived-backend' specifications."
|
|
|
|
|
;; Error when parent back-end is not defined.
|
|
|
|
|
(should-error
|
|
|
|
|
(let (org-export-registered-backends)
|
|
|
|
|
(org-export-define-derived-backend 'test 'parent)))
|
|
|
|
|
;; Append translation table to parent's.
|
|
|
|
|
(should
|
|
|
|
|
(equal '((:headline . test) (:headline . parent))
|
|
|
|
|
(let (org-export-registered-backends)
|
|
|
|
|
(org-export-define-backend 'parent '((:headline . parent)))
|
|
|
|
|
(org-export-define-derived-backend 'test 'parent
|
|
|
|
|
:translate-alist '((:headline . test)))
|
|
|
|
|
(org-export-backend-translate-table 'test))))
|
|
|
|
|
;; Options defined in the new back have priority over those defined
|
|
|
|
|
;; in parent.
|
|
|
|
|
(should
|
|
|
|
|
(eq 'test
|
|
|
|
|
(let (org-export-registered-backends)
|
|
|
|
|
(org-export-define-backend 'parent
|
|
|
|
|
'((:headline . parent))
|
|
|
|
|
:options-alist '((:a nil nil 'parent)))
|
|
|
|
|
(org-export-define-derived-backend 'test 'parent
|
|
|
|
|
:options-alist '((:a nil nil 'test)))
|
|
|
|
|
(plist-get (org-export--get-global-options 'test) :a)))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/derived-backend-p ()
|
|
|
|
|
"Test `org-export-derived-backend-p' specifications."
|
|
|
|
|
;; Non-nil with direct match.
|
|
|
|
|
(should
|
|
|
|
|
(let (org-export-registered-backends)
|
|
|
|
|
(org-export-define-backend 'test '((headline . test)))
|
|
|
|
|
(org-export-derived-backend-p 'test 'test)))
|
|
|
|
|
(should
|
|
|
|
|
(let (org-export-registered-backends)
|
|
|
|
|
(org-export-define-backend 'test '((headline . test)))
|
|
|
|
|
(org-export-define-derived-backend 'test2 'test)
|
|
|
|
|
(org-export-derived-backend-p 'test2 'test2)))
|
|
|
|
|
;; Non-nil with a direct parent.
|
|
|
|
|
(should
|
|
|
|
|
(let (org-export-registered-backends)
|
|
|
|
|
(org-export-define-backend 'test '((headline . test)))
|
|
|
|
|
(org-export-define-derived-backend 'test2 'test)
|
|
|
|
|
(org-export-derived-backend-p 'test2 'test)))
|
|
|
|
|
;; Non-nil with an indirect parent.
|
|
|
|
|
(should
|
|
|
|
|
(let (org-export-registered-backends)
|
|
|
|
|
(org-export-define-backend 'test '((headline . test)))
|
|
|
|
|
(org-export-define-derived-backend 'test2 'test)
|
|
|
|
|
(org-export-define-derived-backend 'test3 'test2)
|
|
|
|
|
(org-export-derived-backend-p 'test3 'test)))
|
|
|
|
|
;; Nil otherwise.
|
|
|
|
|
(should-not
|
|
|
|
|
(let (org-export-registered-backends)
|
|
|
|
|
(org-export-define-backend 'test '((headline . test)))
|
|
|
|
|
(org-export-define-backend 'test2 '((headline . test2)))
|
|
|
|
|
(org-export-derived-backend-p 'test2 'test)))
|
|
|
|
|
(should-not
|
|
|
|
|
(let (org-export-registered-backends)
|
|
|
|
|
(org-export-define-backend 'test '((headline . test)))
|
|
|
|
|
(org-export-define-backend 'test2 '((headline . test2)))
|
|
|
|
|
(org-export-define-derived-backend 'test3 'test2)
|
|
|
|
|
(org-export-derived-backend-p 'test3 'test))))
|
2012-11-17 07:33:38 -05:00
|
|
|
|
|
2012-11-23 12:41:58 -05:00
|
|
|
|
(ert-deftest test-org-export/with-backend ()
|
|
|
|
|
"Test `org-export-with-backend' definition."
|
|
|
|
|
;; Error when calling an undefined back-end
|
|
|
|
|
(should-error
|
|
|
|
|
(let (org-export-registered-backends)
|
|
|
|
|
(org-export-with-backend 'test "Test")))
|
|
|
|
|
;; Error when called back-end doesn't have an appropriate
|
|
|
|
|
;; transcoder.
|
|
|
|
|
(should-error
|
|
|
|
|
(let (org-export-registered-backends)
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-export-define-backend 'test ((headline . ignore)))
|
2012-11-23 12:41:58 -05:00
|
|
|
|
(org-export-with-backend 'test "Test")))
|
|
|
|
|
;; Otherwise, export using correct transcoder
|
|
|
|
|
(should
|
|
|
|
|
(equal "Success"
|
|
|
|
|
(let (org-export-registered-backends)
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-export-define-backend 'test
|
|
|
|
|
'((plain-text . (lambda (text contents info) "Failure"))))
|
|
|
|
|
(org-export-define-backend 'test2
|
|
|
|
|
'((plain-text . (lambda (text contents info) "Success"))))
|
2012-11-23 12:41:58 -05:00
|
|
|
|
(org-export-with-backend 'test2 "Test")))))
|
|
|
|
|
|
2012-12-19 10:59:12 -05:00
|
|
|
|
(ert-deftest test-org-export/data-with-translations ()
|
|
|
|
|
"Test `org-export-data-with-translations' specifications."
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
"Success!"
|
|
|
|
|
(org-export-data-with-translations
|
|
|
|
|
'(bold nil "Test")
|
|
|
|
|
'((plain-text . (lambda (text info) "Success"))
|
|
|
|
|
(bold . (lambda (bold contents info) (concat contents "!"))))
|
|
|
|
|
'(:with-emphasize t)))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/data-with-backend ()
|
|
|
|
|
"Test `org-export-data-with-backend' specifications."
|
|
|
|
|
;; Error when calling an undefined back-end.
|
|
|
|
|
(should-error
|
|
|
|
|
(let (org-export-registered-backends)
|
|
|
|
|
(org-export-data-with-backend 'test "Test" nil)))
|
|
|
|
|
;; Otherwise, export data recursively, using correct back-end.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
"Success!"
|
|
|
|
|
(let (org-export-registered-backends)
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-export-define-backend 'test
|
|
|
|
|
'((plain-text . (lambda (text info) "Success"))
|
|
|
|
|
(bold . (lambda (bold contents info) (concat contents "!")))))
|
2012-12-19 10:59:12 -05:00
|
|
|
|
(org-export-data-with-backend
|
|
|
|
|
'(bold nil "Test") 'test '(:with-emphasize t))))))
|
|
|
|
|
|
2012-11-17 07:33:38 -05: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
|
org-export: Internal changes to back-end definition
* contrib/lisp/org-export.el (org-export-registered-backends): New
variable.
(org-export-define-backend, org-export-define-derived-backend): Use
new variable. Also redefine how sub-menus are defined.
(org-export-backend-filters, org-export-backend-menu,
org-export-backend-options, org-export-backend-translate-table): New
functions.
(org-export-get-environment, org-export--parse-option-keyword,
org-export--get-subtree-options, org-export--get-inbuffer-options,
org-export--get-global-options, org-export-install-filters,
org-export-with-backend): Access to data stored in new variable.
(org-export-dispatch-ui): Display sub-menus according to new
definition.
(org-export-dispatch-menu-entries): Removed variable.
* contrib/lisp/org-e-beamer.el: Use new sub-menu definition.
(org-e-beamer--format-section, org-e-beamer-item,
org-e-beamer-keyword): Use `org-export-with-backend' instead of
relying on removed variables.
* testing/lisp/test-org-export.el: Update tests.
This patch gets rid of "invisible" variables, that is variables
defvar'ed within a macro.
2012-11-12 17:21:05 -05:00
|
|
|
|
(plist-put
|
|
|
|
|
(cdr (assq 'test org-export-registered-backends))
|
|
|
|
|
:translate-alist
|
|
|
|
|
(cons (cons 'export-snippet
|
|
|
|
|
(lambda (snippet contents info)
|
|
|
|
|
(when (eq (org-export-snippet-backend snippet) 'test)
|
|
|
|
|
(org-element-property :value snippet))))
|
|
|
|
|
(org-export-backend-translate-table 'test)))
|
|
|
|
|
(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-07-04 17:30:23 -04:00
|
|
|
|
|
|
|
|
|
|
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
|
2013-02-13 09:51:08 -05:00
|
|
|
|
"Text[fn:1] [1] [fn:label:C] [fn::D]\n\n[fn:1] A\n\n[1] B"
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'footnote-reference
|
2013-02-13 09:51:08 -05:00
|
|
|
|
(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
|
2013-02-13 09:51:08 -05:00
|
|
|
|
"Text[fn:1:A[fn:2]] [fn:3].\n\n[fn:2] B [fn:3] [fn::D].\n\n[fn:3] C."
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'((1 . "fn:1") (2 . "fn:2") (3 . "fn:3") (4))
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'footnote-reference
|
2013-02-13 09:51:08 -05:00
|
|
|
|
(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."
|
2013-02-13 09:51:08 -05: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
|
org-export: Internal changes to back-end definition
* contrib/lisp/org-export.el (org-export-registered-backends): New
variable.
(org-export-define-backend, org-export-define-derived-backend): Use
new variable. Also redefine how sub-menus are defined.
(org-export-backend-filters, org-export-backend-menu,
org-export-backend-options, org-export-backend-translate-table): New
functions.
(org-export-get-environment, org-export--parse-option-keyword,
org-export--get-subtree-options, org-export--get-inbuffer-options,
org-export--get-global-options, org-export-install-filters,
org-export-with-backend): Access to data stored in new variable.
(org-export-dispatch-ui): Display sub-menus according to new
definition.
(org-export-dispatch-menu-entries): Removed variable.
* contrib/lisp/org-e-beamer.el: Use new sub-menu definition.
(org-e-beamer--format-section, org-e-beamer-item,
org-e-beamer-keyword): Use `org-export-with-backend' instead of
relying on removed variables.
* testing/lisp/test-org-export.el: Update tests.
This patch gets rid of "invisible" variables, that is variables
defvar'ed within a macro.
2012-11-12 17:21:05 -05:00
|
|
|
|
(plist-put
|
|
|
|
|
(cdr (assq 'test org-export-registered-backends))
|
|
|
|
|
:translate-alist
|
|
|
|
|
(cons (cons 'footnote-reference
|
|
|
|
|
(lambda (fn contents info)
|
|
|
|
|
(org-element-interpret-data
|
|
|
|
|
(org-export-get-footnote-definition fn info))))
|
|
|
|
|
(org-export-backend-translate-table 'test)))
|
|
|
|
|
(forward-line)
|
|
|
|
|
(should (equal "ParagraphOut of scope\n"
|
2013-01-30 08:17:30 -05:00
|
|
|
|
(org-export-as 'test 'subtree)))))
|
|
|
|
|
;; 6. Footnotes without a definition should be provided a fallback
|
|
|
|
|
;; definition.
|
|
|
|
|
(should
|
|
|
|
|
(org-test-with-parsed-data "[fn:1]"
|
|
|
|
|
(org-export-get-footnote-definition
|
2013-02-13 09:51:08 -05:00
|
|
|
|
(org-element-map tree 'footnote-reference 'identity info t) info)))
|
|
|
|
|
;; 7. Footnote section should be ignored in TOC and in headlines
|
|
|
|
|
;; numbering.
|
|
|
|
|
(should
|
|
|
|
|
(= 1 (let ((org-footnote-section "Footnotes"))
|
|
|
|
|
(length (org-test-with-parsed-data "* H1\n* Footnotes\n"
|
|
|
|
|
(org-export-collect-headlines info))))))
|
|
|
|
|
(should
|
|
|
|
|
(equal '(2)
|
|
|
|
|
(let ((org-footnote-section "Footnotes"))
|
|
|
|
|
(org-test-with-parsed-data "* H1\n* Footnotes\n* H2"
|
|
|
|
|
(org-element-map tree 'headline
|
|
|
|
|
(lambda (hl)
|
|
|
|
|
(when (equal (org-element-property :raw-value hl) "H2")
|
|
|
|
|
(org-export-get-headline-number hl info)))
|
|
|
|
|
info t)))))))
|
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"
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'headline
|
|
|
|
|
(lambda (h) (org-export-get-relative-level h info))
|
|
|
|
|
info)))))
|
2012-07-04 11:37:55 -04:00
|
|
|
|
;; Missing levels
|
|
|
|
|
(should
|
|
|
|
|
(equal '(1 3)
|
|
|
|
|
(let ((org-odd-levels-only nil))
|
|
|
|
|
(org-test-with-parsed-data "** Headline 1\n**** Headline 2"
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'headline
|
|
|
|
|
(lambda (h) (org-export-get-relative-level h info))
|
|
|
|
|
info))))))
|
2012-07-04 11:37:55 -04:00
|
|
|
|
|
|
|
|
|
(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"
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'headline
|
|
|
|
|
(lambda (h) (if (org-export-low-level-p h info) 'yes 'no))
|
|
|
|
|
(plist-put info :headline-levels 1)))))))
|
2012-07-04 11:37:55 -04:00
|
|
|
|
|
|
|
|
|
(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"
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'headline
|
|
|
|
|
(lambda (h) (org-export-get-headline-number h info))
|
|
|
|
|
info)))))
|
2012-07-04 11:37:55 -04:00
|
|
|
|
;; 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"
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'headline
|
|
|
|
|
(lambda (h) (org-export-get-headline-number h info))
|
|
|
|
|
info))))))
|
2012-07-04 11:37:55 -04:00
|
|
|
|
|
|
|
|
|
(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"
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'headline
|
|
|
|
|
(lambda (h) (org-export-numbered-headline-p h info))
|
|
|
|
|
(plist-put info :section-numbers nil))))
|
2012-07-04 11:37:55 -04:00
|
|
|
|
;; 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"
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'headline
|
|
|
|
|
(lambda (h) (if (org-export-numbered-headline-p h info) 'yes 'no))
|
|
|
|
|
(plist-put info :section-numbers 1)))))
|
2012-07-04 11:37:55 -04:00
|
|
|
|
;; Otherwise, headlines are always numbered.
|
|
|
|
|
(should
|
|
|
|
|
(org-test-with-parsed-data "* Headline"
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'headline
|
|
|
|
|
(lambda (h) (org-export-numbered-headline-p h info))
|
|
|
|
|
(plist-put info :section-numbers t)))))
|
2012-07-04 11:37:55 -04:00
|
|
|
|
|
|
|
|
|
(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")))
|
|
|
|
|
|
2013-02-24 03:15:26 -05:00
|
|
|
|
(ert-deftest test-org-export/get-optional-title ()
|
2013-02-26 18:00:33 -05:00
|
|
|
|
"Test `org-export-get-alt-title' specifications."
|
|
|
|
|
;; If ALT_TITLE property is defined, use it.
|
2013-02-24 03:15:26 -05:00
|
|
|
|
(should
|
|
|
|
|
(equal '("opt")
|
|
|
|
|
(org-test-with-parsed-data
|
2013-02-26 18:00:33 -05:00
|
|
|
|
"* Headline\n:PROPERTIES:\n:ALT_TITLE: opt\n:END:"
|
|
|
|
|
(org-export-get-alt-title
|
2013-02-24 03:15:26 -05:00
|
|
|
|
(org-element-map tree 'headline 'identity info t)
|
|
|
|
|
info))))
|
|
|
|
|
;; Otherwise, fall-back to regular title.
|
|
|
|
|
(should
|
|
|
|
|
(equal '("Headline")
|
|
|
|
|
(org-test-with-parsed-data "* Headline"
|
2013-02-26 18:00:33 -05:00
|
|
|
|
(org-export-get-alt-title
|
2013-02-24 03:15:26 -05:00
|
|
|
|
(org-element-map tree 'headline 'identity info t)
|
|
|
|
|
info)))))
|
|
|
|
|
|
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)
|
2012-10-14 07:19:12 -04:00
|
|
|
|
info '("ignore"))))
|
|
|
|
|
;; Allow tag inheritance.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'(("tag") ("tag"))
|
|
|
|
|
(org-test-with-parsed-data "* Headline :tag:\n** Sub-heading"
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'headline
|
|
|
|
|
(lambda (hl) (org-export-get-tags hl info nil t)) info))))
|
2012-10-30 11:03:59 -04:00
|
|
|
|
;; Tag inheritance checks FILETAGS keywords.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'(("a" "b" "tag"))
|
|
|
|
|
(org-test-with-parsed-data "#+FILETAGS: :a:b:\n* Headline :tag:"
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'headline
|
|
|
|
|
(lambda (hl) (org-export-get-tags hl info nil t)) info))))))
|
2012-05-26 07:44:13 -04:00
|
|
|
|
|
2012-09-23 13:37:21 -04:00
|
|
|
|
(ert-deftest test-org-export/get-node-property ()
|
|
|
|
|
"Test`org-export-get-node-property' specifications."
|
|
|
|
|
;; Standard test.
|
|
|
|
|
(should
|
|
|
|
|
(equal "value"
|
|
|
|
|
(org-test-with-parsed-data "* Headline
|
|
|
|
|
:PROPERTIES:
|
|
|
|
|
:prop: value
|
|
|
|
|
:END:"
|
|
|
|
|
(org-export-get-node-property
|
export-back-ends: Apply changes from b692064e621acbc93876670585f8a4b0fd6a7ffa
* lisp/ox-beamer.el (org-beamer--get-label, org-beamer--frame-level,
org-beamer--format-section, org-beamer--format-frame,
org-beamer--format-block, org-beamer-headline): Apply changes to
properties.
* lisp/ox-html.el (org-html-headline, org-html-link,
org-html-section): Apply changes to properties.
* lisp/ox-icalendar.el (org-icalendar-create-uid,
org-icalendar-blocked-headline-p, org-icalendar-entry,
org-icalendar--valarm): Apply changes to properties.
* lisp/ox-odt.el (org-odt-headline): Apply changes
* lisp/ox-publish.el (org-publish-collect-index): Apply changes to
properties.
* lisp/ox-texinfo.el (org-texinfo--generate-menu-list,
org-texinfo--generate-menu-items, org-texinfo-template,
org-texinfo-headline, org-texinfo-link): Apply changes to
properties.
* lisp/ox.el (org-export-resolve-id-link, org-export-get-category):
Apply changes to properties.
(org-export-get-node-property): Update docstring.
* testing/lisp/test-ox.el: Update tests.
2013-02-17 18:01:21 -05:00
|
|
|
|
:PROP (org-element-map tree 'headline 'identity nil t)))))
|
2012-09-23 13:37:21 -04:00
|
|
|
|
;; Test inheritance.
|
|
|
|
|
(should
|
|
|
|
|
(equal "value"
|
|
|
|
|
(org-test-with-parsed-data "* Parent
|
|
|
|
|
:PROPERTIES:
|
|
|
|
|
:prop: value
|
|
|
|
|
:END:
|
|
|
|
|
** Headline
|
|
|
|
|
Paragraph"
|
|
|
|
|
(org-export-get-node-property
|
export-back-ends: Apply changes from b692064e621acbc93876670585f8a4b0fd6a7ffa
* lisp/ox-beamer.el (org-beamer--get-label, org-beamer--frame-level,
org-beamer--format-section, org-beamer--format-frame,
org-beamer--format-block, org-beamer-headline): Apply changes to
properties.
* lisp/ox-html.el (org-html-headline, org-html-link,
org-html-section): Apply changes to properties.
* lisp/ox-icalendar.el (org-icalendar-create-uid,
org-icalendar-blocked-headline-p, org-icalendar-entry,
org-icalendar--valarm): Apply changes to properties.
* lisp/ox-odt.el (org-odt-headline): Apply changes
* lisp/ox-publish.el (org-publish-collect-index): Apply changes to
properties.
* lisp/ox-texinfo.el (org-texinfo--generate-menu-list,
org-texinfo--generate-menu-items, org-texinfo-template,
org-texinfo-headline, org-texinfo-link): Apply changes to
properties.
* lisp/ox.el (org-export-resolve-id-link, org-export-get-category):
Apply changes to properties.
(org-export-get-node-property): Update docstring.
* testing/lisp/test-ox.el: Update tests.
2013-02-17 18:01:21 -05:00
|
|
|
|
:PROP (org-element-map tree 'paragraph 'identity nil t) t))))
|
2012-09-23 13:37:21 -04:00
|
|
|
|
;; Cannot return a value before the first headline.
|
|
|
|
|
(should-not
|
|
|
|
|
(org-test-with-parsed-data "Paragraph
|
|
|
|
|
* Headline
|
|
|
|
|
:PROPERTIES:
|
|
|
|
|
:prop: value
|
|
|
|
|
:END:"
|
|
|
|
|
(org-export-get-node-property
|
export-back-ends: Apply changes from b692064e621acbc93876670585f8a4b0fd6a7ffa
* lisp/ox-beamer.el (org-beamer--get-label, org-beamer--frame-level,
org-beamer--format-section, org-beamer--format-frame,
org-beamer--format-block, org-beamer-headline): Apply changes to
properties.
* lisp/ox-html.el (org-html-headline, org-html-link,
org-html-section): Apply changes to properties.
* lisp/ox-icalendar.el (org-icalendar-create-uid,
org-icalendar-blocked-headline-p, org-icalendar-entry,
org-icalendar--valarm): Apply changes to properties.
* lisp/ox-odt.el (org-odt-headline): Apply changes
* lisp/ox-publish.el (org-publish-collect-index): Apply changes to
properties.
* lisp/ox-texinfo.el (org-texinfo--generate-menu-list,
org-texinfo--generate-menu-items, org-texinfo-template,
org-texinfo-headline, org-texinfo-link): Apply changes to
properties.
* lisp/ox.el (org-export-resolve-id-link, org-export-get-category):
Apply changes to properties.
(org-export-get-node-property): Update docstring.
* testing/lisp/test-ox.el: Update tests.
2013-02-17 18:01:21 -05:00
|
|
|
|
:PROP (org-element-map tree 'paragraph 'identity nil t)))))
|
2012-09-23 13:37:21 -04:00
|
|
|
|
|
2012-11-02 08:44:46 -04:00
|
|
|
|
(ert-deftest test-org-export/get-category ()
|
|
|
|
|
"Test `org-export-get-category' specifications."
|
|
|
|
|
;; Standard test.
|
|
|
|
|
(should
|
|
|
|
|
(equal "value"
|
|
|
|
|
(org-test-with-parsed-data "* Headline
|
|
|
|
|
:PROPERTIES:
|
|
|
|
|
:CATEGORY: value
|
|
|
|
|
:END:"
|
|
|
|
|
(org-export-get-category
|
|
|
|
|
(org-element-map tree 'headline 'identity nil t) info))))
|
|
|
|
|
;; Test inheritance from a parent headline.
|
|
|
|
|
(should
|
|
|
|
|
(equal '("value" "value")
|
|
|
|
|
(org-test-with-parsed-data "* Headline1
|
|
|
|
|
:PROPERTIES:
|
|
|
|
|
:CATEGORY: value
|
|
|
|
|
:END:
|
|
|
|
|
** Headline2"
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'headline
|
|
|
|
|
(lambda (hl) (org-export-get-category hl info)) info))))
|
2012-11-02 08:44:46 -04:00
|
|
|
|
;; Test inheritance from #+CATEGORY keyword
|
|
|
|
|
(should
|
|
|
|
|
(equal "value"
|
|
|
|
|
(org-test-with-parsed-data "#+CATEGORY: value
|
|
|
|
|
* Headline"
|
|
|
|
|
(org-export-get-category
|
|
|
|
|
(org-element-map tree 'headline 'identity nil t) info))))
|
|
|
|
|
;; Test inheritance from file name.
|
|
|
|
|
(should
|
|
|
|
|
(equal "test"
|
|
|
|
|
(org-test-with-parsed-data "* Headline"
|
|
|
|
|
(let ((info (plist-put info :input-file "~/test.org")))
|
|
|
|
|
(org-export-get-category
|
|
|
|
|
(org-element-map tree 'headline 'identity nil t) info)))))
|
|
|
|
|
;; Fall-back value.
|
|
|
|
|
(should
|
|
|
|
|
(equal "???"
|
|
|
|
|
(org-test-with-parsed-data "* Headline"
|
|
|
|
|
(org-export-get-category
|
|
|
|
|
(org-element-map tree 'headline 'identity nil t) info)))))
|
|
|
|
|
|
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"
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'headline
|
|
|
|
|
(lambda (h) (if (org-export-first-sibling-p h info) 'yes 'no))
|
|
|
|
|
info))))
|
2012-07-27 10:13:57 -04:00
|
|
|
|
;; Ignore headlines not exported.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'(yes)
|
|
|
|
|
(let ((org-export-exclude-tags '("ignore")))
|
|
|
|
|
(org-test-with-parsed-data "* Headline :ignore:\n* Headline 2"
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(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"
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'headline
|
|
|
|
|
(lambda (h) (if (org-export-last-sibling-p h info) 'yes 'no))
|
|
|
|
|
info))))
|
2012-07-27 10:13:57 -04:00
|
|
|
|
;; Ignore headlines not exported.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'(yes)
|
|
|
|
|
(let ((org-export-exclude-tags '("ignore")))
|
|
|
|
|
(org-test-with-parsed-data "* Headline\n* Headline 2 :ignore:"
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(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
|
|
|
|
|
2013-03-02 08:34:45 -05:00
|
|
|
|
(ert-deftest test-org-export/handle-inlinetasks ()
|
|
|
|
|
"Test inlinetask export."
|
|
|
|
|
;; Inlinetask with an exclude tag.
|
|
|
|
|
(when (featurep 'org-inlinetask)
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
""
|
|
|
|
|
(let ((org-inlinetask-min-level 3))
|
|
|
|
|
(org-test-with-temp-text "*** Inlinetask :noexp:\nContents\n*** end"
|
|
|
|
|
(org-test-with-backend test
|
|
|
|
|
(org-export-as 'test nil nil nil '(:exclude-tags ("noexp"))))))))
|
|
|
|
|
;; Inlinetask with an include tag.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
"* H2\n*** Inline :exp:\n"
|
|
|
|
|
(let ((org-inlinetask-min-level 3)
|
|
|
|
|
(org-tags-column 0))
|
|
|
|
|
(org-test-with-temp-text "* H1\n* H2\n*** Inline :exp:"
|
|
|
|
|
(org-test-with-backend test
|
|
|
|
|
(org-export-as 'test nil nil nil '(:select-tags ("exp"))))))))
|
|
|
|
|
;; Ignore inlinetask with a TODO keyword and tasks excluded.
|
|
|
|
|
(should
|
|
|
|
|
(equal ""
|
|
|
|
|
(let ((org-todo-keywords '((sequence "TODO" "DONE")))
|
|
|
|
|
(org-inlinetask-min-level 3))
|
|
|
|
|
(org-test-with-temp-text "*** TODO Inline"
|
|
|
|
|
(org-test-with-backend test
|
|
|
|
|
(org-export-as 'test nil nil nil '(:with-tasks nil)))))))))
|
|
|
|
|
|
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]]"
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map (org-element-parse-buffer) 'link 'identity nil t))
|
2012-07-04 11:37:55 -04:00
|
|
|
|
'(("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
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'link
|
2013-02-15 12:08:03 -05:00
|
|
|
|
(lambda (link)
|
|
|
|
|
(org-export-get-ordinal
|
|
|
|
|
(org-export-resolve-fuzzy-link link info) info)) info)))
|
2012-06-06 18:06:19 -04:00
|
|
|
|
;; 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)
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'link
|
2013-02-15 12:08:03 -05:00
|
|
|
|
(lambda (link)
|
|
|
|
|
(org-export-get-ordinal
|
|
|
|
|
(org-export-resolve-fuzzy-link link info) info)) info t))))
|
2012-06-06 18:06:19 -04:00
|
|
|
|
;; 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)
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'link
|
2013-02-15 12:08:03 -05:00
|
|
|
|
(lambda (link)
|
|
|
|
|
(org-export-get-ordinal
|
|
|
|
|
(org-export-resolve-fuzzy-link link info) info)) info t))))
|
2012-06-06 18:06:19 -04:00
|
|
|
|
;; 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)
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'link
|
2013-02-15 12:08:03 -05:00
|
|
|
|
(lambda (link)
|
|
|
|
|
(org-export-get-ordinal
|
|
|
|
|
(org-export-resolve-fuzzy-link link info) info)) info))))
|
2012-06-06 18:06:19 -04:00
|
|
|
|
;; 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
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'link
|
2013-02-15 12:08:03 -05:00
|
|
|
|
(lambda (link)
|
|
|
|
|
(org-export-get-ordinal
|
|
|
|
|
(org-export-resolve-fuzzy-link link info) info)) info t))))
|
2012-06-06 18:06:19 -04:00
|
|
|
|
;; 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)
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'link
|
2013-02-15 12:08:03 -05:00
|
|
|
|
(lambda (link)
|
|
|
|
|
(org-export-get-ordinal
|
|
|
|
|
(org-export-resolve-fuzzy-link link info) info)) info t))))
|
|
|
|
|
;; 7. Space are not significant when matching a fuzzy link.
|
|
|
|
|
(should
|
|
|
|
|
(org-test-with-parsed-data "* Head 1\n[[Head\n 1]]"
|
2013-02-16 09:05:45 -05:00
|
|
|
|
(org-element-map tree 'link
|
|
|
|
|
(lambda (link) (org-export-resolve-fuzzy-link link info))
|
|
|
|
|
info t)))
|
|
|
|
|
;; 8. Statistics cookies are ignored for headline match.
|
|
|
|
|
(should
|
|
|
|
|
(org-test-with-parsed-data "* Head [0/0]\n[[Head]]"
|
|
|
|
|
(org-element-map tree 'link
|
|
|
|
|
(lambda (link) (org-export-resolve-fuzzy-link link info))
|
|
|
|
|
info t)))
|
|
|
|
|
(should
|
|
|
|
|
(org-test-with-parsed-data "* Head [100%]\n[[Head]]"
|
2013-02-15 12:08:03 -05:00
|
|
|
|
(org-element-map tree 'link
|
|
|
|
|
(lambda (link) (org-export-resolve-fuzzy-link link info))
|
|
|
|
|
info t))))
|
2012-06-06 18:06:19 -04:00
|
|
|
|
|
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:
|
export-back-ends: Apply changes from b692064e621acbc93876670585f8a4b0fd6a7ffa
* lisp/ox-beamer.el (org-beamer--get-label, org-beamer--frame-level,
org-beamer--format-section, org-beamer--format-frame,
org-beamer--format-block, org-beamer-headline): Apply changes to
properties.
* lisp/ox-html.el (org-html-headline, org-html-link,
org-html-section): Apply changes to properties.
* lisp/ox-icalendar.el (org-icalendar-create-uid,
org-icalendar-blocked-headline-p, org-icalendar-entry,
org-icalendar--valarm): Apply changes to properties.
* lisp/ox-odt.el (org-odt-headline): Apply changes
* lisp/ox-publish.el (org-publish-collect-index): Apply changes to
properties.
* lisp/ox-texinfo.el (org-texinfo--generate-menu-list,
org-texinfo--generate-menu-items, org-texinfo-template,
org-texinfo-headline, org-texinfo-link): Apply changes to
properties.
* lisp/ox.el (org-export-resolve-id-link, org-export-get-category):
Apply changes to properties.
(org-export-get-node-property): Update docstring.
* testing/lisp/test-ox.el: Update tests.
2013-02-17 18:01:21 -05:00
|
|
|
|
:CUSTOM_ID: test
|
2012-06-06 17:39:04 -04:00
|
|
|
|
: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:
|
export-back-ends: Apply changes from b692064e621acbc93876670585f8a4b0fd6a7ffa
* lisp/ox-beamer.el (org-beamer--get-label, org-beamer--frame-level,
org-beamer--format-section, org-beamer--format-frame,
org-beamer--format-block, org-beamer-headline): Apply changes to
properties.
* lisp/ox-html.el (org-html-headline, org-html-link,
org-html-section): Apply changes to properties.
* lisp/ox-icalendar.el (org-icalendar-create-uid,
org-icalendar-blocked-headline-p, org-icalendar-entry,
org-icalendar--valarm): Apply changes to properties.
* lisp/ox-odt.el (org-odt-headline): Apply changes
* lisp/ox-publish.el (org-publish-collect-index): Apply changes to
properties.
* lisp/ox-texinfo.el (org-texinfo--generate-menu-list,
org-texinfo--generate-menu-items, org-texinfo-template,
org-texinfo-headline, org-texinfo-link): Apply changes to
properties.
* lisp/ox.el (org-export-resolve-id-link, org-export-get-category):
Apply changes to properties.
(org-export-get-node-property): Update docstring.
* testing/lisp/test-ox.el: Update tests.
2013-02-17 18:01:21 -05:00
|
|
|
|
:CUSTOM_ID: test
|
2012-06-06 17:39:04 -04:00
|
|
|
|
: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.
|
2013-02-15 16:38:29 -05:00
|
|
|
|
(should
|
|
|
|
|
(org-test-with-temp-text "<<<radio>>> radio"
|
|
|
|
|
(org-update-radio-target-regexp)
|
|
|
|
|
(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 targets are case-insensitive.
|
|
|
|
|
(should
|
|
|
|
|
(org-test-with-temp-text "<<<RADIO>>> radio"
|
|
|
|
|
(org-update-radio-target-regexp)
|
2012-05-18 05:20:00 -04:00
|
|
|
|
(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.
|
2013-02-15 16:38:29 -05:00
|
|
|
|
(should
|
|
|
|
|
(org-test-with-temp-text "<<<radio \\alpha>>> radio \\alpha"
|
|
|
|
|
(org-update-radio-target-regexp)
|
2012-05-18 05:20:00 -04:00
|
|
|
|
(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-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
|
|
|
|
|
2013-03-03 13:10:42 -05:00
|
|
|
|
(ert-deftest test-org-export/format-code-default ()
|
|
|
|
|
"Test `org-export-format-code-default' specifications."
|
|
|
|
|
;; Return the empty string when code is empty.
|
|
|
|
|
(should
|
|
|
|
|
(equal ""
|
|
|
|
|
(org-test-with-parsed-data "#+BEGIN_SRC emacs-lisp\n\n\n#+END_SRC"
|
|
|
|
|
(org-export-format-code-default
|
|
|
|
|
(org-element-map tree 'src-block 'identity info t) info))))
|
|
|
|
|
;; Number lines, two whitespace characters before the actual loc.
|
|
|
|
|
(should
|
|
|
|
|
(equal "1 a\n2 b\n"
|
|
|
|
|
(org-test-with-parsed-data
|
|
|
|
|
"#+BEGIN_SRC emacs-lisp +n\na\nb\n#+END_SRC"
|
|
|
|
|
(org-export-format-code-default
|
|
|
|
|
(org-element-map tree 'src-block 'identity info t) info))))
|
|
|
|
|
;; Put references 6 whitespace characters after the widest line,
|
|
|
|
|
;; wrapped within parenthesis.
|
|
|
|
|
(should
|
|
|
|
|
(equal "123 (a)\n1 (b)\n"
|
|
|
|
|
(let ((org-coderef-label-format "(ref:%s)"))
|
|
|
|
|
(org-test-with-parsed-data
|
|
|
|
|
"#+BEGIN_SRC emacs-lisp\n123 (ref:a)\n1 (ref:b)\n#+END_SRC"
|
|
|
|
|
(org-export-format-code-default
|
|
|
|
|
(org-element-map tree 'src-block 'identity info t) info))))))
|
|
|
|
|
|
2012-03-10 14:25:32 -05:00
|
|
|
|
|
2012-10-25 17:54:53 -04:00
|
|
|
|
|
|
|
|
|
;;; Smart Quotes
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/activate-smart-quotes ()
|
|
|
|
|
"Test `org-export-activate-smart-quotes' specifications."
|
|
|
|
|
;; Opening double quotes: standard test.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'("some “paragraph")
|
|
|
|
|
(let ((org-export-default-language "en"))
|
|
|
|
|
(org-test-with-parsed-data "some \"paragraph"
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'plain-text
|
|
|
|
|
(lambda (s) (org-export-activate-smart-quotes s :html info))
|
|
|
|
|
info)))))
|
2012-10-25 17:54:53 -04:00
|
|
|
|
;; Opening quotes: at the beginning of a paragraph.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'("“begin")
|
|
|
|
|
(let ((org-export-default-language "en"))
|
|
|
|
|
(org-test-with-parsed-data "\"begin"
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'plain-text
|
|
|
|
|
(lambda (s) (org-export-activate-smart-quotes s :html info))
|
|
|
|
|
info)))))
|
2012-10-25 17:54:53 -04:00
|
|
|
|
;; Opening quotes: after an object.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'("“begin")
|
|
|
|
|
(let ((org-export-default-language "en"))
|
|
|
|
|
(org-test-with-parsed-data "=verb= \"begin"
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'plain-text
|
|
|
|
|
(lambda (s) (org-export-activate-smart-quotes s :html info))
|
|
|
|
|
info)))))
|
2012-10-25 17:54:53 -04:00
|
|
|
|
;; Closing quotes: standard test.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'("some” paragraph")
|
|
|
|
|
(let ((org-export-default-language "en"))
|
|
|
|
|
(org-test-with-parsed-data "some\" paragraph"
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'plain-text
|
|
|
|
|
(lambda (s) (org-export-activate-smart-quotes s :html info))
|
|
|
|
|
info)))))
|
2012-10-25 17:54:53 -04:00
|
|
|
|
;; Closing quotes: at the end of a paragraph.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'("end”")
|
|
|
|
|
(let ((org-export-default-language "en"))
|
|
|
|
|
(org-test-with-parsed-data "end\""
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'plain-text
|
|
|
|
|
(lambda (s) (org-export-activate-smart-quotes s :html info))
|
|
|
|
|
info)))))
|
2012-10-25 17:54:53 -04:00
|
|
|
|
;; Apostrophe: standard test.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'("It shouldn’t fail")
|
|
|
|
|
(let ((org-export-default-language "en"))
|
|
|
|
|
(org-test-with-parsed-data "It shouldn't fail"
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'plain-text
|
|
|
|
|
(lambda (s) (org-export-activate-smart-quotes s :html info))
|
|
|
|
|
info)))))
|
2012-10-25 17:54:53 -04:00
|
|
|
|
;; Apostrophe: before an object.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'("a’")
|
|
|
|
|
(let ((org-export-default-language "en"))
|
|
|
|
|
(org-test-with-parsed-data "a'=b="
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'plain-text
|
|
|
|
|
(lambda (s) (org-export-activate-smart-quotes s :html info))
|
|
|
|
|
info)))))
|
2012-10-25 17:54:53 -04:00
|
|
|
|
;; Apostrophe: after an object.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'("’s")
|
|
|
|
|
(let ((org-export-default-language "en"))
|
|
|
|
|
(org-test-with-parsed-data "=code='s"
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'plain-text
|
|
|
|
|
(lambda (s) (org-export-activate-smart-quotes s :html info))
|
|
|
|
|
info)))))
|
2012-10-29 15:36:03 -04:00
|
|
|
|
;; Special case: isolated quotes.
|
|
|
|
|
(should
|
|
|
|
|
(equal '("“" "”")
|
|
|
|
|
(let ((org-export-default-language "en"))
|
|
|
|
|
(org-test-with-parsed-data "\"$x$\""
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'plain-text
|
|
|
|
|
(lambda (s) (org-export-activate-smart-quotes s :html info))
|
|
|
|
|
info)))))
|
2012-10-31 07:28:21 -04:00
|
|
|
|
;; Smart quotes in secondary strings.
|
|
|
|
|
(should
|
|
|
|
|
(equal '("“" "”")
|
|
|
|
|
(let ((org-export-default-language "en"))
|
|
|
|
|
(org-test-with-parsed-data "* \"$x$\""
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'plain-text
|
|
|
|
|
(lambda (s) (org-export-activate-smart-quotes s :html info))
|
|
|
|
|
info)))))
|
2012-10-31 07:28:21 -04:00
|
|
|
|
;; Smart quotes in document keywords.
|
|
|
|
|
(should
|
|
|
|
|
(equal '("“" "”")
|
|
|
|
|
(let ((org-export-default-language "en"))
|
|
|
|
|
(org-test-with-parsed-data "#+TITLE: \"$x$\""
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map (plist-get info :title) 'plain-text
|
|
|
|
|
(lambda (s) (org-export-activate-smart-quotes s :html info))
|
|
|
|
|
info)))))
|
2012-10-31 07:28:21 -04:00
|
|
|
|
;; Smart quotes in parsed affiliated keywords.
|
|
|
|
|
(should
|
|
|
|
|
(equal '("“" "”" "Paragraph")
|
|
|
|
|
(let ((org-export-default-language "en"))
|
|
|
|
|
(org-test-with-parsed-data "#+CAPTION: \"$x$\"\nParagraph"
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'plain-text
|
|
|
|
|
(lambda (s) (org-export-activate-smart-quotes s :html info))
|
|
|
|
|
info nil nil t))))))
|
2012-10-25 17:54:53 -04: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
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-parse-buffer) 'table 'identity nil 'first-match))))
|
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
|
|
|
|
;; 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
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-parse-buffer) 'table 'identity nil 'first-match))))
|
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. 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
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-parse-buffer) 'table 'identity nil 'first-match))))
|
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
|
|
|
|
;; 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
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-parse-buffer) 'table 'identity nil 'first-match)))))
|
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
|
|
|
|
|
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))
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'table-cell
|
|
|
|
|
(lambda (cell) (org-export-table-cell-address cell info))
|
|
|
|
|
info))))
|
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
|
|
|
|
;; 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)
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'table-cell
|
|
|
|
|
(lambda (cell)
|
|
|
|
|
(if (org-export-table-cell-starts-colgroup-p cell info) 'yes 'no))
|
|
|
|
|
info)))))
|
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-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)
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'table-cell
|
|
|
|
|
(lambda (cell)
|
|
|
|
|
(if (org-export-table-cell-ends-colgroup-p cell info) 'yes 'no))
|
|
|
|
|
info)))))
|
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-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)
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'table-row
|
|
|
|
|
(lambda (row)
|
|
|
|
|
(if (org-export-table-row-starts-rowgroup-p row info) 'yes 'no))
|
|
|
|
|
info))))
|
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
|
|
|
|
;; 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)
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'table-row
|
|
|
|
|
(lambda (row)
|
|
|
|
|
(if (org-export-table-row-starts-rowgroup-p row info) 'yes 'no))
|
|
|
|
|
info)))))
|
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-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)
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'table-row
|
|
|
|
|
(lambda (row)
|
|
|
|
|
(if (org-export-table-row-ends-rowgroup-p row info) 'yes 'no))
|
|
|
|
|
info))))
|
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
|
|
|
|
;; 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)
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'table-row
|
|
|
|
|
(lambda (row)
|
|
|
|
|
(if (org-export-table-row-ends-rowgroup-p row info) 'yes 'no))
|
|
|
|
|
info)))))
|
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-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)
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'table-row
|
|
|
|
|
(lambda (row)
|
|
|
|
|
(if (org-export-table-row-starts-header-p row info) 'yes 'no))
|
|
|
|
|
info))))
|
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
|
|
|
|
;; 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)
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-element-map tree 'table-row
|
|
|
|
|
(lambda (row)
|
|
|
|
|
(if (org-export-table-row-ends-header-p row info) 'yes 'no))
|
|
|
|
|
info))))
|
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
|
|
|
|
;; 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
|
|
|
|
|
2013-02-11 16:19:23 -05:00
|
|
|
|
|
|
|
|
|
;;; Templates
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/inner-template ()
|
|
|
|
|
"Test `inner-template' translator specifications."
|
|
|
|
|
(should
|
|
|
|
|
(equal "Success!"
|
|
|
|
|
(let (org-export-registered-backends)
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-export-define-backend 'test
|
|
|
|
|
'((inner-template . (lambda (contents info) "Success!"))
|
|
|
|
|
(headline . (lambda (h c i) "Headline"))))
|
2013-02-11 16:19:23 -05:00
|
|
|
|
(org-test-with-temp-text "* Headline"
|
|
|
|
|
(org-export-as 'test)))))
|
|
|
|
|
;; Inner template is applied even in a "body-only" export.
|
|
|
|
|
(should
|
|
|
|
|
(equal "Success!"
|
|
|
|
|
(let (org-export-registered-backends)
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-export-define-backend 'test
|
|
|
|
|
'((inner-template . (lambda (contents info) "Success!"))
|
|
|
|
|
(headline . (lambda (h c i) "Headline"))))
|
2013-02-11 16:19:23 -05:00
|
|
|
|
(org-test-with-temp-text "* Headline"
|
|
|
|
|
(org-export-as 'test nil nil 'body-only))))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-export/template ()
|
|
|
|
|
"Test `template' translator specifications."
|
|
|
|
|
(should
|
|
|
|
|
(equal "Success!"
|
|
|
|
|
(let (org-export-registered-backends)
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-export-define-backend 'test
|
|
|
|
|
'((template . (lambda (contents info) "Success!"))
|
|
|
|
|
(headline . (lambda (h c i) "Headline"))))
|
2013-02-11 16:19:23 -05:00
|
|
|
|
(org-test-with-temp-text "* Headline"
|
|
|
|
|
(org-export-as 'test)))))
|
|
|
|
|
;; Template is not applied in a "body-only" export.
|
|
|
|
|
(should-not
|
|
|
|
|
(equal "Success!"
|
|
|
|
|
(let (org-export-registered-backends)
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(org-export-define-backend 'test
|
|
|
|
|
'((template . (lambda (contents info) "Success!"))
|
|
|
|
|
(headline . (lambda (h c i) "Headline"))))
|
2013-02-11 16:19:23 -05:00
|
|
|
|
(org-test-with-temp-text "* Headline"
|
|
|
|
|
(org-export-as 'test nil nil 'body-only))))))
|
|
|
|
|
|
|
|
|
|
|
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
|
2012-10-31 07:28:21 -04:00
|
|
|
|
(org-element-map tree 'entity 'identity info t) info))))
|
|
|
|
|
;; Find next element in secondary strings.
|
|
|
|
|
(should
|
|
|
|
|
(eq 'verbatim
|
|
|
|
|
(org-test-with-parsed-data "* a =verb="
|
|
|
|
|
(org-element-type
|
|
|
|
|
(org-export-get-next-element
|
|
|
|
|
(org-element-map tree 'plain-text 'identity info t) info)))))
|
|
|
|
|
;; Find next element in document keywords.
|
|
|
|
|
(should
|
|
|
|
|
(eq 'verbatim
|
|
|
|
|
(org-test-with-parsed-data "#+TITLE: a =verb="
|
|
|
|
|
(org-element-type
|
|
|
|
|
(org-export-get-next-element
|
|
|
|
|
(org-element-map
|
2013-03-19 11:27:15 -04:00
|
|
|
|
(plist-get info :title) 'plain-text 'identity info t) info)))))
|
2012-10-31 07:28:21 -04:00
|
|
|
|
;; Find next element in parsed affiliated keywords.
|
|
|
|
|
(should
|
|
|
|
|
(eq 'verbatim
|
|
|
|
|
(org-test-with-parsed-data "#+CAPTION: a =verb=\nParagraph"
|
|
|
|
|
(org-element-type
|
|
|
|
|
(org-export-get-next-element
|
2012-12-08 12:57:10 -05:00
|
|
|
|
(org-element-map tree 'plain-text 'identity info t nil t) info)))))
|
2012-12-10 02:53:00 -05:00
|
|
|
|
;; With optional argument N, return a list containing all the
|
|
|
|
|
;; following elements.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'(bold code underline)
|
|
|
|
|
(org-test-with-parsed-data "_a_ /b/ *c* ~d~ _e_"
|
|
|
|
|
(mapcar 'car
|
|
|
|
|
(org-export-get-next-element
|
|
|
|
|
(org-element-map tree 'italic 'identity info t) info t)))))
|
|
|
|
|
;; When N is a positive integer, return a list containing up to
|
2012-12-08 12:57:10 -05:00
|
|
|
|
;; N following elements.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
'(bold code)
|
2012-12-10 02:53:00 -05:00
|
|
|
|
(org-test-with-parsed-data "_a_ /b/ *c* ~d~ _e_"
|
2012-12-08 12:57:10 -05:00
|
|
|
|
(mapcar 'car
|
|
|
|
|
(org-export-get-next-element
|
|
|
|
|
(org-element-map tree 'italic 'identity info t) info 2))))))
|
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
|
2012-10-31 07:28:21 -04:00
|
|
|
|
(org-element-map tree 'entity 'identity info t) info))))
|
|
|
|
|
;; Find previous element in secondary strings.
|
|
|
|
|
(should
|
|
|
|
|
(eq 'verbatim
|
|
|
|
|
(org-test-with-parsed-data "* =verb= a"
|
|
|
|
|
(org-element-type
|
|
|
|
|
(org-export-get-previous-element
|
|
|
|
|
(org-element-map tree 'plain-text 'identity info t) info)))))
|
|
|
|
|
;; Find previous element in document keywords.
|
|
|
|
|
(should
|
|
|
|
|
(eq 'verbatim
|
|
|
|
|
(org-test-with-parsed-data "#+TITLE: =verb= a"
|
|
|
|
|
(org-element-type
|
|
|
|
|
(org-export-get-previous-element
|
|
|
|
|
(org-element-map
|
2013-02-25 17:16:14 -05:00
|
|
|
|
(plist-get info :title) 'plain-text 'identity info t) info)))))
|
2012-10-31 07:28:21 -04:00
|
|
|
|
;; Find previous element in parsed affiliated keywords.
|
|
|
|
|
(should
|
|
|
|
|
(eq 'verbatim
|
|
|
|
|
(org-test-with-parsed-data "#+CAPTION: =verb= a\nParagraph"
|
|
|
|
|
(org-element-type
|
|
|
|
|
(org-export-get-previous-element
|
2012-12-08 12:57:10 -05:00
|
|
|
|
(org-element-map tree 'plain-text 'identity info t nil t) info)))))
|
|
|
|
|
;; With optional argument N, return a list containing up to
|
|
|
|
|
;; N previous elements.
|
2012-12-10 02:53:00 -05:00
|
|
|
|
(should
|
2013-02-25 17:16:14 -05:00
|
|
|
|
(equal '(underline italic bold)
|
2012-12-10 02:53:00 -05:00
|
|
|
|
(org-test-with-parsed-data "_a_ /b/ *c* ~d~"
|
|
|
|
|
(mapcar 'car
|
|
|
|
|
(org-export-get-previous-element
|
|
|
|
|
(org-element-map tree 'code 'identity info t) info t)))))
|
|
|
|
|
;; When N is a positive integer, return a list containing up to
|
|
|
|
|
;; N previous elements.
|
2012-12-08 12:57:10 -05:00
|
|
|
|
(should
|
2013-02-25 17:16:14 -05:00
|
|
|
|
(equal '(italic bold)
|
2012-12-08 12:57:10 -05:00
|
|
|
|
(org-test-with-parsed-data "_a_ /b/ *c* ~d~"
|
|
|
|
|
(mapcar 'car
|
|
|
|
|
(org-export-get-previous-element
|
|
|
|
|
(org-element-map tree 'code 'identity info t) info 2))))))
|
2012-07-10 13:22:04 -04:00
|
|
|
|
|
|
|
|
|
|
2013-01-27 17:11:34 -05:00
|
|
|
|
(provide 'test-ox)
|
2012-03-10 05:37:13 -05:00
|
|
|
|
;;; test-org-export.el end here
|