summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2017-12-15 22:48:57 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2017-12-15 22:48:57 +0100
commitaab7f65a8bec30d24706f6ddd02f39fb71672142 (patch)
tree6a0857c1dcb347c3593887eb3a3e82656337a318
parent46124812d2f4b2bdadb6e41fbd07c98b8a7727d9 (diff)
downloadorg-mode-aab7f65a8bec30d24706f6ddd02f39fb71672142.tar.gz
ox-latex: Merge check-boxes with bullets
* lisp/ox-latex.el (org-latex-item): Do not display both bullet and checkbox. Reported-by: Ken Mankoff <mankoff@gmail.com> <http://lists.gnu.org/r/emacs-orgmode/2017-12/msg00225.html>
-rw-r--r--lisp/ox-latex.el15
1 files changed, 6 insertions, 9 deletions
diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index 61b6b8c..603bae2 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -2180,19 +2180,16 @@ contextual information."
(nth (1- level) '("i" "ii" "iii" "iv"))
(1- count)))))
(checkbox (cl-case (org-element-property :checkbox item)
- (on "$\\boxtimes$ ")
- (off "$\\square$ ")
- (trans "$\\boxminus$ ")))
+ (on "$\\boxtimes$")
+ (off "$\\square$")
+ (trans "$\\boxminus$")))
(tag (let ((tag (org-element-property :tag item)))
- ;; Check-boxes must belong to the tag.
- (and tag (format "[{%s}] "
- (concat checkbox
- (org-export-data tag info)))))))
+ (and tag (org-export-data tag info)))))
(concat counter
"\\item"
(cond
- (tag)
- (checkbox (concat " " checkbox))
+ ((and checkbox tag) (format "[{%s %s}] " checkbox tag))
+ ((or checkbox tag) (format "[{%s}] " (or checkbox tag)))
;; 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