From 6167dfa4449d16f341e4dfa09d76496d103e8a17 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 10 Jul 2010 21:19:06 +0200 Subject: [PATCH] Notice end of lists. * lisp/org-html.el: Notice end of lists. --- lisp/org-html.el | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/lisp/org-html.el b/lisp/org-html.el index 099b2e300..f0c04c31d 100644 --- a/lisp/org-html.el +++ b/lisp/org-html.el @@ -561,7 +561,11 @@ This may also be a function, building and inserting the postamble.") (if (string-match "\\`[a-z]\\{1,10\\}:\\(.+\\)" label) (setq l1 (substring label (match-beginning 1))) (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 (defun org-export-as-html-and-open (arg) @@ -1486,14 +1490,14 @@ lang=\"%s\" xml:lang=\"%s\"> (setq txt (replace-match "" t t txt))) (if (<= level (max umax umax-toc)) (setq head-count (+ head-count 1))) - (when in-local-list - ;; Close any local lists before inserting a new header line - (while local-list-type - (org-close-li (car local-list-type)) - (insert (format "\n" (car local-list-type))) - (pop local-list-type)) - (setq local-list-indent nil - in-local-list nil)) + ;; (when in-local-list + ;; ;; Close any local lists before inserting a new header line + ;; (while local-list-type + ;; (org-close-li (car local-list-type)) + ;; (insert (format "\n" (car local-list-type))) + ;; (pop local-list-type)) + ;; (setq local-list-indent nil + ;; in-local-list nil)) (setq first-heading-pos (or first-heading-pos (point))) (org-html-level-start level txt umax (and org-export-with-toc (<= level umax)) @@ -1505,17 +1509,16 @@ lang=\"%s\" xml:lang=\"%s\"> (insert "
")
 	      (setq inquote t)))
 
-	   ((string-match "^[ \t]*- __+[ \t]*$" line)
+	   ((string-match "^ORG-LIST-END$" line)
 	    ;; Explicit list closure
-	    (when local-list-type
-	      (let ((ind (org-get-indentation line)))
-		(while (and local-list-indent
-			    (<= ind (car local-list-indent)))
-		  (org-close-li (car local-list-type))
-		  (insert (format "\n" (car local-list-type)))
-		  (pop local-list-type)
-		  (pop local-list-indent))
-		(or local-list-indent (setq in-local-list nil))))
+	    (let ((ind (org-get-indentation line)))
+	      (while (and local-list-indent
+			  (<= ind (car local-list-indent)))
+		(org-close-li (car local-list-type))
+		(insert (format "\n" (car local-list-type)))
+		(pop local-list-type)
+		(pop local-list-indent))
+	      (or local-list-indent (setq in-local-list nil)))
 	    (throw 'nextline nil))
 
 	   ((and org-export-with-tables