emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed

From: Christian Moe <mail@christianmoe.com>
To: Org Mode <emacs-orgmode@gnu.org>
Cc: Carsten Dominik <carsten.dominik@gmail.com>
Subject: [PATCH] Special blocks: Make well-formed HTML
Date: Thu, 06 Oct 2011 11:53:32 +0200	[thread overview]
Message-ID: <4E8D7A9C.5040903@christianmoe.com> (raw)

* 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

                 reply	other threads:[~2011-10-06  9:51 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

find likely ancestor, descendant, or conflicting patches for this message:
dfblob:2da57f0 dfblob:f4e6258
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4E8D7A9C.5040903@christianmoe.com \
    --to=mail@christianmoe.com \
    --cc=carsten.dominik@gmail.com \
    --cc=emacs-orgmode@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).