summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2017-01-31 09:02:55 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2017-01-31 09:02:55 +0100
commit6b30deaae97cf276e9f0698644ab0eb7155624c4 (patch)
tree32249d2f750923764c88cd7a3eae4cfb272efe9b
parent9cb36f1982e92104828e77d16005351b6c498163 (diff)
parentcaa54d2e987eaca785df87ff51c11a04a38d4842 (diff)
downloadorg-mode-6b30deaae97cf276e9f0698644ab0eb7155624c4.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/ox-latex.el17
1 files changed, 11 insertions, 6 deletions
diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index d059912..7c5ae50 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -1300,8 +1300,7 @@ For non-floats, see `org-latex--wrap-label'."
main)
(and (eq type 'src-block)
(not (plist-get attr :float))
- (memq (plist-get info :latex-listings)
- '(nil minted)))))
+ (null (plist-get info :latex-listings)))))
(short (org-export-get-caption element t))
(caption-from-attr-latex (plist-get attr :caption)))
(cond
@@ -2880,13 +2879,19 @@ contextual information."
(float-env
(cond
((string= "multicolumn" float)
- (format "\\begin{listing*}\n%s%%s\n%s\\end{listing*}"
+ (format "\\begin{listing*}[%s]\n%s%%s\n%s\\end{listing*}"
+ (plist-get info :latex-default-figure-position)
(if caption-above-p caption-str "")
(if caption-above-p "" caption-str)))
(caption
- (concat (if caption-above-p caption-str "")
- "%s"
- (if caption-above-p "" (concat "\n" caption-str))))
+ (format "\\begin{listing}[%s]\n%s%%s\n%s\\end{listing}"
+ (plist-get info :latex-default-figure-position)
+ (if caption-above-p caption-str "")
+ (if caption-above-p "" caption-str)))
+ ((string= "t" float)
+ (concat (format "\\begin{listing}[%s]\n"
+ (plist-get info :latex-default-figure-position))
+ "%s\n\\end{listing}"))
(t "%s")))
(options (plist-get info :latex-minted-options))
(body