From 8b5119dca42e59e85ab0f6707ff38334caa0c036 Mon Sep 17 00:00:00 2001
From: joyqi <magike.net@gmail.com>
Date: Sat, 30 Nov 2013 16:45:31 +0800
Subject: [PATCH] fixed #94

---
 admin/editor-js.php           |  4 ++++
 var/MarkdownExtraExtended.php | 11 ++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/admin/editor-js.php b/admin/editor-js.php
index ed4bdc52..a1bbcd64 100644
--- a/admin/editor-js.php
+++ b/admin/editor-js.php
@@ -70,6 +70,7 @@ $(document).ready(function () {
 
     // 自动跟随
     converter.hooks.chain('postConversion', function (html) {
+        // clear special html tags
         html = html.replace(/<\/?(\!doctype|html|head|body|link|title|input|select|button|textarea|style|noscript)[^>]*>/ig, function (all) {
             return all.replace(/&/g, '&amp;')
                 .replace(/</g, '&lt;')
@@ -78,6 +79,9 @@ $(document).ready(function () {
                 .replace(/"/g, '&quot;');
         });
 
+        // clear hard breaks
+        html = html.replace(/\s*((?:<br>\n)+)\s*(<\/?(?:p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|form|fieldset|iframe|hr|legend|article|section|nav|aside|hgroup|header|footer|figcaption|li|dd|dt)[^\w])/gm, '$2');
+
         if (html.indexOf('<!--more-->') > 0) {
             var parts = html.split(/\s*<\!\-\-more\-\->\s*/),
                 summary = parts.shift(),
diff --git a/var/MarkdownExtraExtended.php b/var/MarkdownExtraExtended.php
index 55258607..a23506c8 100644
--- a/var/MarkdownExtraExtended.php
+++ b/var/MarkdownExtraExtended.php
@@ -3138,8 +3138,12 @@ class MarkdownExtraExtended extends MarkdownExtra {
 		
 	public function __construct() {
 		$this->block_gamut += array(
-			"doFencedFigures" => 7,
+			"doFencedFigures"   => 7
 		);
+
+        $this->document_gamut += array(
+            "doClearBreaks"     =>  100
+        );
 		
 		parent::__construct();
 	}
@@ -3165,6 +3169,11 @@ class MarkdownExtraExtended extends MarkdownExtra {
 			array($this, '_doHardBreaks_callback'), $text);
 	}
 
+    public function doClearBreaks($text) {
+        return preg_replace("/\s*((?:<br \/>\n)+)\s*(<\/?(?:$this->block_tags_re|li)[^\d])/is",
+            "\\2", $text);
+    }
+
 
 	public function doBlockQuotes($text) {
 		$text = preg_replace_callback('/