瀏覽代碼

ox-html: Better criterion for first paragraphs in lists

* lisp/ox-html.el (org-html-paragraph): Do not wrap first paragraph in
  an item within <p> tags in the most simple cases.

Thanks to Daniel Clemente for suggesting it.
http://permalink.gmane.org/gmane.emacs.orgmode/89413
Nicolas Goaziou 10 年之前
父節點
當前提交
9a34a13c07
共有 1 個文件被更改,包括 6 次插入13 次删除
  1. 6 13
      lisp/ox-html.el

+ 6 - 13
lisp/ox-html.el

@@ -2896,19 +2896,12 @@ the plist used as a communication channel."
 		      (org-export-read-attribute :attr_html paragraph)))
 	 (extra (or (cadr (assoc parent-type style)) "")))
     (cond
-     ((and (eq (org-element-type parent) 'item)
-	   (= (org-element-property :begin paragraph)
-	      (org-element-property :contents-begin parent))
-	   (not (org-element-map (org-export-get-parent parent) 'item
-		  (lambda (item)
-		    (let ((contents (org-element-contents item)))
-		      (and contents
-			   (or (cdr contents)
-			       (not (eq (org-element-type (car contents))
-					'paragraph))))))
-		  info 'first-match 'item)))
-      ;; Leading paragraph in a list item have no tags if every
-      ;; element of the containing list is only a single paragraph.
+     ((and (not (org-export-get-previous-element paragraph info))
+	   (let ((followers (org-export-get-next-element paragraph info 2)))
+	     (and (not (cdr followers))
+		  (memq (org-element-type (car followers)) '(nil plain-list)))))
+      ;; First paragraph in an item has no tag if it is alone or
+      ;; followed, at most, by a sub-list.
       contents)
      ((org-html-standalone-image-p paragraph info)
       ;; Standalone image.