From ba38de197eb0662d503d6e237c6812cb20dc269f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 10 Feb 2013 17:51:06 +0100 Subject: [PATCH] ox-latex: Fix behaviour when headline sectionning command is a function * lisp/ox-latex.el (org-latex-headline): When a function returns a sectionning command, only one placeholder should be required. Thanks to Florian Beck for reporting this. --- lisp/ox-latex.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el index df6c7298d..5fc57f142 100644 --- a/lisp/ox-latex.el +++ b/lisp/ox-latex.el @@ -1420,15 +1420,15 @@ holding contextual information." ;; Section formatting will set two placeholders: one for the ;; title and the other for the contents. (section-fmt - (let ((sec (if (and (symbolp (nth 2 class-sectionning)) - (fboundp (nth 2 class-sectionning))) + (let ((sec (if (functionp (nth 2 class-sectionning)) (funcall (nth 2 class-sectionning) level numberedp) (nth (1+ level) class-sectionning)))) (cond ;; No section available for that LEVEL. ((not sec) nil) - ;; Section format directly returned by a function. - ((stringp sec) sec) + ;; Section format directly returned by a function. Add + ;; placeholder for contents. + ((stringp sec) (concat sec "\n%s")) ;; (numbered-section . unnumbered-section) ((not (consp (cdr sec))) (concat (funcall (if numberedp #'car #'cdr) sec) "\n%s"))