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 2019-03-13 12:16:41 +01:00
parent c3ce8d1c14 48cafd3d3f
commit 35211c479b
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lisp/ox-texinfo.el
View File

@ -1253,13 +1253,21 @@ contextual information."
(if (string-prefix-p "@" i) i (concat "@" i)))) (if (string-prefix-p "@" i) i (concat "@" i))))
(table-type (plist-get attr :table-type)) (table-type (plist-get attr :table-type))
(type (org-element-property :type plain-list)) (type (org-element-property :type plain-list))
(initial-counter
(and (eq type 'ordered)
;; Texinfo only supports initial counters, i.e., it
;; cannot change the numbering mid-list.
(let ((first-item (car (org-element-contents plain-list))))
(org-element-property :counter first-item))))
(list-type (cond (list-type (cond
((eq type 'ordered) "enumerate") ((eq type 'ordered) "enumerate")
((eq type 'unordered) "itemize") ((eq type 'unordered) "itemize")
((member table-type '("ftable" "vtable")) table-type) ((member table-type '("ftable" "vtable")) table-type)
(t "table")))) (t "table"))))
(format "@%s\n%s@end %s" (format "@%s\n%s@end %s"
(if (eq type 'descriptive) (concat list-type " " indic) list-type) (cond ((eq type 'descriptive) (concat list-type " " indic))
(initial-counter (format "%s %d" list-type initial-counter))
(t list-type))
contents contents
list-type))) list-type)))