ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Notice end of lists. 

* lisp/org-html.el: Notice end of lists.
This commit is contained in:
Nicolas Goaziou 2010-07-10 21:19:06 +02:00
parent 9996da73a3
commit 6167dfa444
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lisp/org-html.el
View File

@ -561,7 +561,11 @@ This may also be a function, building and inserting the postamble.")
(if (string-match "\\`[a-z]\\{1,10\\}:\\(.+\\)" label) (if (string-match "\\`[a-z]\\{1,10\\}:\\(.+\\)" label)
(setq l1 (substring label (match-beginning 1))) (setq l1 (substring label (match-beginning 1)))
(setq l1 label))) (setq l1 label)))
(replace-match (format "[[#%s][%s]]" label l1) t t))))) (replace-match (format "[[#%s][%s]]" label l1) t t))))
(goto-char (point-min))
(while (org-search-forward-unenclosed (org-item-re) nil 'move)
(goto-char (org-list-bottom-point))
(insert "ORG-LIST-END\n")))
;;;###autoload ;;;###autoload
(defun org-export-as-html-and-open (arg) (defun org-export-as-html-and-open (arg)
@ -1486,14 +1490,14 @@ lang=\"%s\" xml:lang=\"%s\">
(setq txt (replace-match "" t t txt))) (setq txt (replace-match "" t t txt)))
(if (<= level (max umax umax-toc)) (if (<= level (max umax umax-toc))
(setq head-count (+ head-count 1))) (setq head-count (+ head-count 1)))
(when in-local-list ;; (when in-local-list
;; Close any local lists before inserting a new header line ;; ;; Close any local lists before inserting a new header line
(while local-list-type ;; (while local-list-type
(org-close-li (car local-list-type)) ;; (org-close-li (car local-list-type))
(insert (format "</%sl>\n" (car local-list-type))) ;; (insert (format "</%sl>\n" (car local-list-type)))
(pop local-list-type)) ;; (pop local-list-type))
(setq local-list-indent nil ;; (setq local-list-indent nil
in-local-list nil)) ;; in-local-list nil))
(setq first-heading-pos (or first-heading-pos (point))) (setq first-heading-pos (or first-heading-pos (point)))
(org-html-level-start level txt umax (org-html-level-start level txt umax
(and org-export-with-toc (<= level umax)) (and org-export-with-toc (<= level umax))
@ -1505,17 +1509,16 @@ lang=\"%s\" xml:lang=\"%s\">
(insert "<pre>") (insert "<pre>")
(setq inquote t))) (setq inquote t)))
((string-match "^[ \t]*- __+[ \t]*$" line) ((string-match "^ORG-LIST-END$" line)
;; Explicit list closure ;; Explicit list closure
(when local-list-type (let ((ind (org-get-indentation line)))
(let ((ind (org-get-indentation line))) (while (and local-list-indent
(while (and local-list-indent (<= ind (car local-list-indent)))
(<= ind (car local-list-indent))) (org-close-li (car local-list-type))
(org-close-li (car local-list-type)) (insert (format "</%sl>\n" (car local-list-type)))
(insert (format "</%sl>\n" (car local-list-type))) (pop local-list-type)
(pop local-list-type) (pop local-list-indent))
(pop local-list-indent)) (or local-list-indent (setq in-local-list nil)))
(or local-list-indent (setq in-local-list nil))))
(throw 'nextline nil)) (throw 'nextline nil))
((and org-export-with-tables ((and org-export-with-tables