ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2017-01-31 09:02:55 +01:00
parent 9cb36f1982 caa54d2e98
commit 6b30deaae9
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lisp/ox-latex.el
View File

@ -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