tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'master' of orgmode.org:org-mode

This commit is contained in:
Eric Schulte 2011-03-16 07:45:51 -06:00
parent 814012ca80 87c427981f
commit 59ad74f047
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/org-docbook.el
View File

@ -1371,7 +1371,9 @@ the alist of previous items."
"</listitem></varlistentry>\n"
"</listitem>\n"))
;; We're ending last item of the list: end list.
(when lastp (insert (format "</%slist>\n" type)))))
(when lastp
(insert (format "</%slist>\n" type))
(org-export-docbook-open-para))))
(funcall get-closings pos))
(cond
;; At an item: insert appropriate tags in export buffer.

6
lisp/org-html.el
View File

@ -1838,7 +1838,7 @@ lang=\"%s\" xml:lang=\"%s\">
(concat
(if caption
(format "%s@<div %sclass=\"figure\">
<p>"
@<p>"
(if org-par-open "@</p>\n" "")
(if label (format "id=\"%s\" " (org-solidify-link-text label)) "")))
(format "@<img src=\"%s\"%s />"
@ -2474,7 +2474,9 @@ the alist of previous items."
;; Ending for every item
(org-close-li type)
;; We're ending last item of the list: end list.
(when lastp (insert (format "</%sl>\n" type)))))
(when lastp
(insert (format "</%sl>\n" type))
(org-open-par))))
(funcall get-closings pos))
(cond
;; At an item: insert appropriate tags in export buffer.