diff options
author | Bastien Guerry <bzg@altern.org> | 2013-02-24 11:33:34 +0100 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2013-02-24 11:33:34 +0100 |
commit | 398e8af56ed4abb0c4c6824fdcff7617097d5830 (patch) | |
tree | c5ca4200b99f00d78cdf654ccdc5e33709e78f6a | |
parent | d242be2c89d857d41285eb985a0a02f47d6d84da (diff) | |
parent | a15a657bfb44f5b4380a8d69fc56bc4271a27f2e (diff) | |
download | org-mode-398e8af56ed4abb0c4c6824fdcff7617097d5830.tar.gz |
Merge branch 'master' of orgmode.org:org-mode
-rw-r--r-- | lisp/ox-ascii.el | 7 | ||||
-rw-r--r-- | lisp/ox-html.el | 4 | ||||
-rw-r--r-- | lisp/ox-latex.el | 4 | ||||
-rw-r--r-- | lisp/ox.el | 7 | ||||
-rw-r--r-- | testing/lisp/test-ox.el | 18 |
5 files changed, 28 insertions, 12 deletions
diff --git a/lisp/ox-ascii.el b/lisp/ox-ascii.el index dbb6123..11c711a 100644 --- a/lisp/ox-ascii.el +++ b/lisp/ox-ascii.el @@ -551,7 +551,7 @@ If optional argument NOTAGS is non-nil, no tags will be added to the title. When optional argument TOC is non-nil, use optional title if -possible." +possible. It doesn't apply to `inlinetask' elements." (let* ((headlinep (eq (org-element-type element) 'headline)) (numbers ;; Numbering is specific to headlines. @@ -565,8 +565,9 @@ possible." (text (org-trim (org-export-data - (or (and toc headlinep (org-export-get-optional-title element info)) - (org-element-property :title element)) info))) + (if (and toc headlinep) (org-export-get-optional-title element info) + (org-element-property :title element)) + info))) (todo (and (plist-get info :with-todo-keywords) (let ((todo (org-element-property :todo-keyword element))) diff --git a/lisp/ox-html.el b/lisp/ox-html.el index 051bc13..9e4ab2c 100644 --- a/lisp/ox-html.el +++ b/lisp/ox-html.el @@ -1148,9 +1148,7 @@ INFO is a plist used as a communication channel." ;; Body. (concat section-number (org-export-data - (or (org-export-get-optional-title headline info) - (org-element-property :title headline)) - info) + (org-export-get-optional-title headline info) info) (and tags " ") (org-html--tags tags))))) (defun org-html-toc (depth info) diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el index 116bbea..188ce39 100644 --- a/lisp/ox-latex.el +++ b/lisp/ox-latex.el @@ -1480,9 +1480,7 @@ holding contextual information." (funcall org-latex-format-headline-function todo todo-type priority (org-export-data - (or (org-export-get-optional-title headline info) - (org-element-property :title headline)) - info) + (org-export-get-optional-title headline info) info) (and (eq (plist-get info :with-tags) t) tags)))) (if (and opt-title (string-match "\\`\\\\\\(.*?\\){" section-fmt)) (format (replace-match "\\1[%s]" nil nil section-fmt 1) @@ -3550,9 +3550,10 @@ fail, the fall-back value is \"???\"." (defun org-export-get-optional-title (headline info) "Return optional title for HEADLINE, as a secondary string. -INFO is a plist used as a communication channel. If no such -title is defined, return nil." - (org-element-property :optional-title headline)) +INFO is a plist used as a communication channel. If no optional +title is defined, fall-back to the regular title." + (or (org-element-property :optional-title headline) + (org-element-property :title headline))) (defun org-export-first-sibling-p (headline info) "Non-nil when HEADLINE is the first sibling in its sub-tree. diff --git a/testing/lisp/test-ox.el b/testing/lisp/test-ox.el index 1bf21de..876829f 100644 --- a/testing/lisp/test-ox.el +++ b/testing/lisp/test-ox.el @@ -1018,6 +1018,24 @@ Paragraph[fn:1]" ;; Otherwise, return it as a roman number. (should (equal (org-export-number-to-roman 1449) "MCDXLIX"))) +(ert-deftest test-org-export/get-optional-title () + "Test `org-export-get-optional-title' specifications." + ;; If OPTIONAL_TITLE property is defined, use it. + (should + (equal '("opt") + (org-test-with-parsed-data + "* Headline\n:PROPERTIES:\n:OPTIONAL_TITLE: opt\n:END:" + (org-export-get-optional-title + (org-element-map tree 'headline 'identity info t) + info)))) + ;; Otherwise, fall-back to regular title. + (should + (equal '("Headline") + (org-test-with-parsed-data "* Headline" + (org-export-get-optional-title + (org-element-map tree 'headline 'identity info t) + info))))) + (ert-deftest test-org-export/get-tags () "Test `org-export-get-tags' specifications." (let ((org-export-exclude-tags '("noexport")) |