summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Leech-Pepin <jonathan.leechpepin@gmail.com>2013-02-25 10:59:03 -0500
committerJonathan Leech-Pepin <jonathan.leechpepin@gmail.com>2013-02-25 10:59:03 -0500
commitb632d6ff6edf0bcf4b2af1484458baab89c1a228 (patch)
treeace24f5658ac9051c990c6a9dd92aa3034f7ee25
parentc94cae1ee6cfa0280fa49f77536b6fa9eae77e67 (diff)
downloadorg-mode-b632d6ff6edf0bcf4b2af1484458baab89c1a228.tar.gz
ox-texinfo.el: Use :OPTIONAL_TITLE: instead of backend-specific
property * lisp/ox-texinfo.el (org-texinfo--get-node) and (org-texinfo--generate-menu-items): Use :OPTIONAL_TITLE:. (org-export-define-backend): Remove :TEXINFO_MENU_TITLE from options-alist
-rw-r--r--lisp/ox-texinfo.el7
1 files changed, 3 insertions, 4 deletions
diff --git a/lisp/ox-texinfo.el b/lisp/ox-texinfo.el
index 28d9ca6..44d466f 100644
--- a/lisp/ox-texinfo.el
+++ b/lisp/ox-texinfo.el
@@ -128,8 +128,7 @@
(:subauthor "SUBAUTHOR" nil nil newline)
(:texinfo-dircat "TEXINFO_DIR_CATEGORY" nil nil t)
(:texinfo-dirtitle "TEXINFO_DIR_TITLE" nil nil t)
- (:texinfo-dirdesc "TEXINFO_DIR_DESC" nil nil t)
- (:texinfo-menu-title "TEXINFO_MENU_TITLE" nil nil newline)))
+ (:texinfo-dirdesc "TEXINFO_DIR_DESC" nil nil t)))
@@ -443,7 +442,7 @@ See `org-texinfo-text-markup-alist' for details."
(defun org-texinfo--get-node (headline info)
"Return node entry associated to HEADLINE.
INFO is a plist used as a communication channel."
- (let ((menu-title (org-element-property :TEXINFO_MENU_TITLE headline)))
+ (let ((menu-title (org-export-get-optional-title headline info)))
(org-texinfo--sanitize-menu
(replace-regexp-in-string
"%" "%%"
@@ -577,7 +576,7 @@ menu using `org-texinfo--format-menu'."
(loop for headline in items collect
(let* ((menu-title (org-texinfo--sanitize-menu
(org-export-data
- (org-element-property :TEXINFO_MENU_TITLE headline)
+ (org-export-get-optional-title headline info)
info)))
(title (org-texinfo--sanitize-menu
(org-texinfo--sanitize-headline