From 4637de726c32cc9222529c0c35a6b71579f503b0 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Mon, 26 Mar 2012 22:56:02 +0200 Subject: [PATCH] Revert "org-latex.el: Don't insert a linebreak when itemizing a subtree that is just a headline." This reverts commit 6632ea95d3c73c77d90dadfd5dcc01037a999f8a. --- lisp/org-latex.el | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/lisp/org-latex.el b/lisp/org-latex.el index 7c154d2dc..aa48ef956 100644 --- a/lisp/org-latex.el +++ b/lisp/org-latex.el @@ -1218,9 +1218,7 @@ numbered sections and lower levels as unnumbered sections." org-export-latex-add-level)) (occur (number-to-string (cdr (assoc 'occur subcontent)))) (content (cdr (assoc 'content subcontent))) - (content-e (org-export-latex-content content)) (subcontent (cadr (assoc 'subcontent subcontent))) - (subcontent-e (org-export-latex-sub subcontent)) (label (org-get-text-property-any 0 'target heading)) (label-list (cons label (cdr (assoc label org-export-target-aliases)))) @@ -1264,11 +1262,11 @@ numbered sections and lower levels as unnumbered sections." (when label (insert (mapconcat (lambda (l) (format "\\label{%s}" l)) label-list "\n") "\n")) - (insert content-e) + (insert (org-export-latex-content content)) (cond ((stringp subcontent) (insert subcontent)) ((listp subcontent) (while (org-looking-back "\n\n") (backward-delete-char 1)) - subcontent-e)) + (org-export-latex-sub subcontent))) (when (and end (string-match "[^ \t]" end)) (let ((hook (org-get-text-property-any 0 'org-insert-hook end))) (and (functionp hook) (funcall hook))) @@ -1283,9 +1281,9 @@ numbered sections and lower levels as unnumbered sections." (insert (format "\n\\item[%s]%s~\n" heading (if label (format "\\label{%s}" label) ""))) - (insert content-e) + (insert (org-export-latex-content content)) (cond ((stringp subcontent) (insert subcontent)) - ((listp subcontent) subcontent-e)) + ((listp subcontent) (org-export-latex-sub subcontent))) (insert "\\end{description} % ends low level\n")) ((memq org-export-latex-low-levels '(itemize enumerate)) (if (string-match "% ends low level$" @@ -1293,14 +1291,12 @@ numbered sections and lower levels as unnumbered sections." (delete-region (point-at-bol 0) (point)) (insert (format "\\begin{%s}\n" (symbol-name org-export-latex-low-levels)))) - (insert (format (if (not (equal (replace-regexp-in-string "\n" "" content-e) "")) - "\n\\item %s\\\\\n%s%%" - "\n\\item %s\n%s%%") + (insert (format "\n\\item %s\\\\\n%s%%" heading (if label (format "\\label{%s}" label) ""))) - (insert content-e) + (insert (org-export-latex-content content)) (cond ((stringp subcontent) (insert subcontent)) - ((listp subcontent) subcontent-e)) + ((listp subcontent) (org-export-latex-sub subcontent))) (insert (format "\\end{%s} %% ends low level\n" (symbol-name org-export-latex-low-levels)))) @@ -1312,18 +1308,18 @@ numbered sections and lower levels as unnumbered sections." (insert (format (nth 2 org-export-latex-low-levels) heading (if label (format "\\label{%s}" label) ""))) - (insert content-e) + (insert (org-export-latex-content content)) (cond ((stringp subcontent) (insert subcontent)) - ((listp subcontent) subcontent-e)) + ((listp subcontent) (org-export-latex-sub subcontent))) (insert (nth 1 org-export-latex-low-levels) " %% ends low level\n")) ((stringp org-export-latex-low-levels) (insert (format org-export-latex-low-levels heading) "\n") (when label (insert (format "\\label{%s}\n" label))) - (insert content-e) + (insert (org-export-latex-content content)) (cond ((stringp subcontent) (insert subcontent)) - ((listp subcontent) subcontent-e)))))))) + ((listp subcontent) (org-export-latex-sub subcontent))))))))) ;;; Exporting internals: (defun org-export-latex-set-initial-vars (ext-plist level)