summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <n.goaziou@gmail.com>2014-05-16 10:35:17 +0200
committerNicolas Goaziou <n.goaziou@gmail.com>2014-05-16 10:35:17 +0200
commit2e12684aaed36fa71c3ec394be22d42409fc6c86 (patch)
tree54d752b0cf236573cda57f4c195af80b3435ff20
parent1be3c409c24bca707f47d308870abe78cde28f91 (diff)
parent9a60b93d932393eda4a216d79bdcd04c44dd3a24 (diff)
downloadorg-mode-2e12684aaed36fa71c3ec394be22d42409fc6c86.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/ox-latex.el21
1 files changed, 10 insertions, 11 deletions
diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index cea21be..5435a73 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -1624,17 +1624,16 @@ holding contextual information."
(when priority (format "\\framebox{\\#%c} " priority))
title
(when tags (format "\\hfill{}\\textsc{:%s:}"
- (mapconcat 'identity tags ":"))))))
- (format (concat "\\begin{center}\n"
- "\\fbox{\n"
- "\\begin{minipage}[c]{.6\\textwidth}\n"
- "%s\n\n"
- "\\rule[.8em]{\\textwidth}{2pt}\n\n"
- "%s"
- "\\end{minipage}\n"
- "}\n"
- "\\end{center}")
- full-title contents))))))
+ (mapconcat #'identity tags ":"))))))
+ (concat "\\begin{center}\n"
+ "\\fbox{\n"
+ "\\begin{minipage}[c]{.6\\textwidth}\n"
+ full-title "\n\n"
+ (and (org-string-nw-p contents)
+ (concat "\\rule[.8em]{\\textwidth}{2pt}\n\n" contents))
+ "\\end{minipage}\n"
+ "}\n"
+ "\\end{center}"))))))
;;;; Italic