From mboxrd@z Thu Jan  1 00:00:00 1970
From: Christian Moe <mail@christianmoe.com>
Subject: [PATCH] Special blocks: Make well-formed HTML
Date: Thu, 06 Oct 2011 11:53:32 +0200
Message-ID: <4E8D7A9C.5040903@christianmoe.com>
Reply-To: mail@christianmoe.com
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([140.186.70.92]:41776)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mail@christianmoe.com>) id 1RBkbY-0000HG-0U
	for emacs-orgmode@gnu.org; Thu, 06 Oct 2011 05:51:07 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mail@christianmoe.com>) id 1RBkbW-00059Z-QI
	for emacs-orgmode@gnu.org; Thu, 06 Oct 2011 05:51:03 -0400
Received: from mars.hitrost.net ([91.185.211.18]:55796)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mail@christianmoe.com>) id 1RBkbW-00059U-Kv
	for emacs-orgmode@gnu.org; Thu, 06 Oct 2011 05:51:02 -0400
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: </archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: Org Mode <emacs-orgmode@gnu.org>
Cc: Carsten Dominik <carsten.dominik@gmail.com>

* org-special-blocks.el
(org-special-blocks-convert-html-special-cookies): Close paragraph
before opening or closing the <div>, and open paragraph after. Also
changed newline placement to be the same as for other blocks.

The problem was that special blocks did not produce well-formed HTML
because they  wrapped the opening and closing
<div> tags in <p> tags.

TINYCHANGE

This patch only borrows a few lines from the handling of `CENTER'
blocks in org-export-as-html.

---
  lisp/org-special-blocks.el |   22 +++++++++++++---------
  1 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/lisp/org-special-blocks.el b/lisp/org-special-blocks.el
index 2da57f0..f4e6258 100644
--- a/lisp/org-special-blocks.el
+++ b/lisp/org-special-blocks.el
@@ -78,15 +78,19 @@ seen.  This is run after a few special cases are 
taken care of."

  (defvar line)
  (defun org-special-blocks-convert-html-special-cookies ()
-  "Converts the special cookies into div blocks."
-  ;; Uses the dynamically-bound variable `line'.
-  (when (string-match "^ORG-\\(.*\\)-\\(START\\|END\\)$" line)
-;    (org-close-par-maybe)
-    (message "%s" (match-string 1))
-    (if (equal (match-string 2 line) "START")
-	(insert "<div class=\"" (match-string 1 line) "\">\n")
-      (insert "</div>\n"))
-    (throw 'nextline nil)))
+"Converts the special cookies into div blocks."
+;; Uses the dynamically-bound variable `line'.
+(when (string-match "^ORG-\\(.*\\)-\\(START\\|END\\)$" line)
+  (message "%s" (match-string 1))
+  (when (equal (match-string 2 line) "START")
+    (org-close-par-maybe)
+    (insert "\n<div class=\"" (match-string 1 line) "\">")
+    (org-open-par))
+  (when (equal (match-string 2 line) "END")
+    (org-close-par-maybe)
+    (insert "\n</div>")
+    (org-open-par))
+  (throw 'nextline nil)))

  (add-hook 'org-export-html-after-blockquotes-hook
  	  'org-special-blocks-convert-html-special-cookies)
-- 
1.7.4.1