Merge branch 'maint'
This commit is contained in:
commit
d99ffcf954
|
@ -1391,7 +1391,13 @@ holding contextual information."
|
||||||
(when (org-export-first-sibling-p headline info)
|
(when (org-export-first-sibling-p headline info)
|
||||||
(format "\\begin{%s}\n" (if numberedp 'enumerate 'itemize)))
|
(format "\\begin{%s}\n" (if numberedp 'enumerate 'itemize)))
|
||||||
;; Itemize headline
|
;; Itemize headline
|
||||||
"\\item " full-text "\n" headline-label pre-blanks contents)))
|
"\\item"
|
||||||
|
(and full-text (org-string-match-p "\\`[ \t]*\\[" full-text)
|
||||||
|
"\\relax")
|
||||||
|
" " full-text "\n"
|
||||||
|
headline-label
|
||||||
|
pre-blanks
|
||||||
|
contents)))
|
||||||
;; If headline is not the last sibling simply return
|
;; If headline is not the last sibling simply return
|
||||||
;; LOW-LEVEL-BODY. Otherwise, also close the list, before
|
;; LOW-LEVEL-BODY. Otherwise, also close the list, before
|
||||||
;; any blank line.
|
;; any blank line.
|
||||||
|
@ -1581,7 +1587,25 @@ contextual information."
|
||||||
(and tag (format "[{%s}] "
|
(and tag (format "[{%s}] "
|
||||||
(concat checkbox
|
(concat checkbox
|
||||||
(org-export-data tag info)))))))
|
(org-export-data tag info)))))))
|
||||||
(concat counter "\\item" (or tag (concat " " checkbox))
|
(concat counter
|
||||||
|
"\\item"
|
||||||
|
(cond
|
||||||
|
(tag)
|
||||||
|
(checkbox (concat " " checkbox))
|
||||||
|
;; Without a tag or a check-box, if CONTENTS starts with
|
||||||
|
;; an opening square bracket, add "\relax" to "\item",
|
||||||
|
;; unless the brackets comes from an initial export
|
||||||
|
;; snippet (i.e. it is inserted willingly by the user).
|
||||||
|
((and contents
|
||||||
|
(org-string-match-p "\\`[ \t]*\\[" contents)
|
||||||
|
(not (let ((e (car (org-element-contents item))))
|
||||||
|
(and (eq (org-element-type e) 'paragraph)
|
||||||
|
(let ((o (car (org-element-contents e))))
|
||||||
|
(and (eq (org-element-type o) 'export-snippet)
|
||||||
|
(eq (org-export-snippet-backend o)
|
||||||
|
'latex)))))))
|
||||||
|
"\\relax ")
|
||||||
|
(t " "))
|
||||||
(and contents (org-trim contents))
|
(and contents (org-trim contents))
|
||||||
;; If there are footnotes references in tag, be sure to
|
;; If there are footnotes references in tag, be sure to
|
||||||
;; add their definition at the end of the item. This
|
;; add their definition at the end of the item. This
|
||||||
|
|
Loading…
Reference in New Issue