ox-texinfo.el: Use :OPTIONAL_TITLE: instead of backend-specific
authorJonathan Leech-Pepin <jonathan.leechpepin@gmail.com>
Mon, 25 Feb 2013 15:59:03 +0000 (25 10:59 -0500)
committerJonathan Leech-Pepin <jonathan.leechpepin@gmail.com>
Mon, 25 Feb 2013 15:59:03 +0000 (25 10:59 -0500)
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

lisp/ox-texinfo.el

index 28d9ca6..44d466f 100644 (file)
    (: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)))
 
 
 \f
@@ -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