ox-texinfo: Fix erroneous count of blank lines in menu

* lisp/ox-texinfo.el (org-texinfo-section):
(org-texinfo--build-menu): Normalize empty lines in generated menu.

Reported-by: Jonas Bernoulli <jonas@bernoul.li>
<http://permalink.gmane.org/gmane.emacs.orgmode/106145>
This commit is contained in:
Nicolas Goaziou 2016-04-06 22:26:08 +02:00
parent cb683e3a56
commit 9c6811b9d4
1 changed files with 6 additions and 4 deletions

View File

@ -1113,7 +1113,7 @@ is an integer, build the menu recursively, down to this depth."
(org-export-data (org-export-get-alt-title h info) info)
(org-texinfo--format-entries entries info))
(org-texinfo--build-menu h info (1- level))))))
(org-texinfo--menu-entries scope info) "")))))
(org-texinfo--menu-entries scope info) "\n")))))
(defun org-texinfo--format-entries (entries info)
"Format all direct menu entries in SCOPE, as a string.
@ -1295,9 +1295,11 @@ contextual information."
"Transcode a SECTION element from Org to Texinfo.
CONTENTS holds the contents of the section. INFO is a plist
holding contextual information."
(concat contents
(let ((parent (org-export-get-parent-headline section)))
(and parent (org-texinfo-make-menu parent info)))))
(org-trim
(concat contents
"\n"
(let ((parent (org-export-get-parent-headline section)))
(and parent (org-texinfo-make-menu parent info))))))
;;;; Special Block