|
@@ -1337,14 +1337,14 @@ modifications to buffer. STRUCT is the list structure. PREVS is
|
|
|
the alist of previous items."
|
|
|
(let* ((get-type
|
|
|
(function
|
|
|
- ;; Return type of list containing element POS, among
|
|
|
- ;; "ordered", "variable" or "itemized".
|
|
|
- (lambda (pos)
|
|
|
- (cond
|
|
|
- ((string-match "[[:alnum:]]" (org-list-get-bullet pos struct))
|
|
|
- "ordered")
|
|
|
- ((org-list-get-tag pos struct) "variable")
|
|
|
- (t "itemized")))))
|
|
|
+ ;; Translate type of list containing POS to "ordered",
|
|
|
+ ;; "variable" or "itemized".
|
|
|
+ (lambda (pos struct prevs)
|
|
|
+ (let ((type (org-list-get-list-type pos struct prevs)))
|
|
|
+ (cond
|
|
|
+ ((eq 'ordered type) "ordered")
|
|
|
+ ((eq 'descriptive type) "variable")
|
|
|
+ (t "itemized"))))))
|
|
|
(get-closings
|
|
|
(function
|
|
|
;; Return list of all items and sublists ending at POS, in
|
|
@@ -1364,7 +1364,7 @@ the alist of previous items."
|
|
|
(mapc (lambda (e)
|
|
|
(let* ((lastp (= (org-list-get-last-item e struct prevs) e))
|
|
|
(first-item (org-list-get-list-begin e struct prevs))
|
|
|
- (type (funcall get-type first-item)))
|
|
|
+ (type (funcall get-type first-item struct prevs)))
|
|
|
;; Ending for every item
|
|
|
(org-export-docbook-close-para-maybe)
|
|
|
(insert (if (equal type "variable")
|
|
@@ -1389,7 +1389,7 @@ the alist of previous items."
|
|
|
(firstp (= list-beg pos))
|
|
|
;; Always refer to first item to determine list type, in
|
|
|
;; case list is ill-formed.
|
|
|
- (type (funcall get-type list-beg))
|
|
|
+ (type (funcall get-type list-beg struct prevs))
|
|
|
;; Special variables for ordered lists.
|
|
|
(order-type (let ((bullet (org-list-get-bullet list-beg struct)))
|
|
|
(cond
|