Browse Source

Export: Start paragraphs after the end of literal examples.

Patch by Baoqiu Cui.
Carsten Dominik 16 năm trước cách đây
mục cha
commit
f48c35a8e6
3 tập tin đã thay đổi với 20 bổ sung2 xóa
  1. 8 0
      lisp/ChangeLog
  2. 6 1
      lisp/org-docbook.el
  3. 6 1
      lisp/org-html.el

+ 8 - 0
lisp/ChangeLog

@@ -1,3 +1,11 @@
+2009-04-09  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org-html.el (org-export-as-html): Start paragraphs after literal
+	examples.
+
+	* org-docbook.el (org-export-as-docbook): Start paragraphs after
+	literal examples.
+
 2009-04-08  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org.el (org-todo): Honor the NOBLOCKING property.

+ 6 - 1
lisp/org-docbook.el

@@ -607,6 +607,7 @@ publishing directory."
 	  ;; End of quote section?
 	  (when (and inquote (string-match "^\\*+ " line))
 	    (insert "]]>\n</programlisting>\n")
+	    (org-export-docbook-open-para)
 	    (setq inquote nil))
 	  ;; Inside a quote section?
 	  (when inquote
@@ -625,7 +626,8 @@ publishing directory."
 		      (not (string-match "^[ \t]*\\(:.*\\)"
 					 (car lines))))
 	      (setq infixed nil)
-	      (insert "]]>\n</programlisting>\n"))
+	      (insert "]]>\n</programlisting>\n")
+	      (org-export-docbook-open-para))
 	    (throw 'nextline nil))
 
 	  ;; Protected HTML
@@ -682,11 +684,13 @@ publishing directory."
 	  (when (equal "ORG-BLOCKQUOTE-END" line)
 	    (org-export-docbook-close-para-maybe)
 	    (insert "</blockquote>\n")
+	    (org-export-docbook-open-para)
 	    (throw 'nextline nil))
 
 	  ;; End of verses
 	  (when (equal "ORG-VERSE-END" line)
 	    (insert "</literallayout>\n</blockquote>\n")
+	    (org-export-docbook-open-para)
 	    (setq inverse nil)
 	    (throw 'nextline nil))
 
@@ -705,6 +709,7 @@ publishing directory."
 	    (org-export-docbook-close-para-maybe)
 	    (insert "</entry></row></tbody>\n"
 		    "</tgroup>\n</informaltable>\n")
+	    (org-export-docbook-open-para)
 	    (throw 'nextline nil))
 
 	  ;; Make targets to anchors.  Note that currently FOP does not

+ 6 - 1
lisp/org-html.el

@@ -761,6 +761,7 @@ lang=\"%s\" xml:lang=\"%s\">
 	  ;; end of quote section?
 	  (when (and inquote (string-match "^\\*+ " line))
 	    (insert "</pre>\n")
+	    (org-open-par)
 	    (setq inquote nil))
 	  ;; inside a quote section?
 	  (when inquote
@@ -780,7 +781,8 @@ lang=\"%s\" xml:lang=\"%s\">
 		      (not (string-match "^[ \t]*:\\(\\([ \t]\\|$\\)\\(.*\\)\\)"
 					 (car lines))))
 	      (setq infixed nil)
-	      (insert "</pre>\n"))
+	      (insert "</pre>\n")
+	      (org-open-par))
 	    (throw 'nextline nil))
 
 	  ;; Protected HTML
@@ -814,6 +816,7 @@ lang=\"%s\" xml:lang=\"%s\">
 	  (when (equal "ORG-BLOCKQUOTE-END" line)
 	    (org-close-par-maybe)
 	    (insert "\n</blockquote>\n")
+	    (org-open-par)
 	    (throw 'nextline nil))
 	  (when (equal "ORG-VERSE-START" line)
 	    (org-close-par-maybe)
@@ -822,6 +825,7 @@ lang=\"%s\" xml:lang=\"%s\">
 	    (throw 'nextline nil))
 	  (when (equal "ORG-VERSE-END" line)
 	    (insert "</p>\n")
+	    (org-open-par)
 	    (setq inverse nil)
 	    (throw 'nextline nil))
 	  (when (equal "ORG-CENTER-START" line)
@@ -832,6 +836,7 @@ lang=\"%s\" xml:lang=\"%s\">
 	  (when (equal "ORG-CENTER-END" line)
 	    (org-close-par-maybe)
 	    (insert "\n</div>")
+	    (org-open-par)
 	    (throw 'nextline nil))
 	  (when inverse
 	    (let ((i (org-get-string-indentation line)))