From 689f6cb79b7436f387720213cb6a9810649762b6 Mon Sep 17 00:00:00 2001
From: Russ Ross <russ@dixie.edu>
Date: Fri, 1 Jul 2011 11:19:42 -0600
Subject: [PATCH] more consistent spacing of block-level elements

---
 block.go                                     |  2 ++
 block_test.go                                | 22 ++++++++++----------
 html.go                                      | 12 +++++++----
 markdown.go                                  |  1 +
 upskirtref/Auto links.html                   |  2 ++
 upskirtref/Blockquotes with code blocks.html |  2 +-
 upskirtref/Nested blockquotes.html           |  4 +++-
 upskirtref/Ordered and unordered lists.html  | 14 +++++++++++++
 upskirtref/Tabs.html                         |  1 +
 upskirtref/Tidyness.html                     |  2 +-
 10 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/block.go b/block.go
index 8ad2193..d2aec77 100644
--- a/block.go
+++ b/block.go
@@ -942,6 +942,7 @@ func (parser *Parser) blockOliPrefix(data []byte) int {
 // parse ordered or unordered list block
 func (parser *Parser) blockList(out *bytes.Buffer, data []byte, flags int) int {
 	i := 0
+	flags |= LIST_ITEM_BEGINNING_OF_LIST
 	work := func() bool {
 		j := 0
 		for i < len(data) {
@@ -951,6 +952,7 @@ func (parser *Parser) blockList(out *bytes.Buffer, data []byte, flags int) int {
 			if j == 0 || flags&LIST_ITEM_END_OF_LIST != 0 {
 				break
 			}
+			flags &= ^LIST_ITEM_BEGINNING_OF_LIST
 		}
 		return true
 	}
diff --git a/block_test.go b/block_test.go
index e6e9f98..888841e 100644
--- a/block_test.go
+++ b/block_test.go
@@ -86,10 +86,10 @@ func TestPrefixHeaderNoExtensions(t *testing.T) {
 		"<p>Hello</p>\n\n<h1>Header 1</h1>\n\n<p>Goodbye</p>\n",
 
 		"* List\n# Header\n* List\n",
-		"<ul>\n<li><p>List</p>\n\n<h1>Header</h1></li>\n<li><p>List</p></li>\n</ul>\n",
+		"<ul>\n<li><p>List</p>\n\n<h1>Header</h1></li>\n\n<li><p>List</p></li>\n</ul>\n",
 
 		"* List\n#Header\n* List\n",
-		"<ul>\n<li><p>List</p>\n\n<h1>Header</h1></li>\n<li><p>List</p></li>\n</ul>\n",
+		"<ul>\n<li><p>List</p>\n\n<h1>Header</h1></li>\n\n<li><p>List</p></li>\n</ul>\n",
 
 		"*   List\n    * Nested list\n    # Nested header\n",
 		"<ul>\n<li><p>List</p>\n\n<ul>\n<li><p>Nested list</p>\n\n" +
@@ -146,7 +146,7 @@ func TestPrefixHeaderSpaceExtension(t *testing.T) {
 		"<p>Hello</p>\n\n<h1>Header 1</h1>\n\n<p>Goodbye</p>\n",
 
 		"* List\n# Header\n* List\n",
-		"<ul>\n<li><p>List</p>\n\n<h1>Header</h1></li>\n<li><p>List</p></li>\n</ul>\n",
+		"<ul>\n<li><p>List</p>\n\n<h1>Header</h1></li>\n\n<li><p>List</p></li>\n</ul>\n",
 
 		"* List\n#Header\n* List\n",
 		"<ul>\n<li>List\n#Header</li>\n<li>List</li>\n</ul>\n",
@@ -285,10 +285,10 @@ func TestUnorderedList(t *testing.T) {
 		"<ul>\n<li>Ting</li>\n<li>Bong</li>\n<li>Goo</li>\n</ul>\n",
 
 		"* Yin\n\n* Yang\n",
-		"<ul>\n<li><p>Yin</p></li>\n<li><p>Yang</p></li>\n</ul>\n",
+		"<ul>\n<li><p>Yin</p></li>\n\n<li><p>Yang</p></li>\n</ul>\n",
 
 		"* Ting\n\n* Bong\n* Goo\n",
-		"<ul>\n<li><p>Ting</p></li>\n<li><p>Bong</p></li>\n<li><p>Goo</p></li>\n</ul>\n",
+		"<ul>\n<li><p>Ting</p></li>\n\n<li><p>Bong</p></li>\n\n<li><p>Goo</p></li>\n</ul>\n",
 
 		"+ Hello\n",
 		"<ul>\n<li>Hello</li>\n</ul>\n",
@@ -300,10 +300,10 @@ func TestUnorderedList(t *testing.T) {
 		"<ul>\n<li>Ting</li>\n<li>Bong</li>\n<li>Goo</li>\n</ul>\n",
 
 		"+ Yin\n\n+ Yang\n",
-		"<ul>\n<li><p>Yin</p></li>\n<li><p>Yang</p></li>\n</ul>\n",
+		"<ul>\n<li><p>Yin</p></li>\n\n<li><p>Yang</p></li>\n</ul>\n",
 
 		"+ Ting\n\n+ Bong\n+ Goo\n",
-		"<ul>\n<li><p>Ting</p></li>\n<li><p>Bong</p></li>\n<li><p>Goo</p></li>\n</ul>\n",
+		"<ul>\n<li><p>Ting</p></li>\n\n<li><p>Bong</p></li>\n\n<li><p>Goo</p></li>\n</ul>\n",
 
 		"- Hello\n",
 		"<ul>\n<li>Hello</li>\n</ul>\n",
@@ -315,10 +315,10 @@ func TestUnorderedList(t *testing.T) {
 		"<ul>\n<li>Ting</li>\n<li>Bong</li>\n<li>Goo</li>\n</ul>\n",
 
 		"- Yin\n\n- Yang\n",
-		"<ul>\n<li><p>Yin</p></li>\n<li><p>Yang</p></li>\n</ul>\n",
+		"<ul>\n<li><p>Yin</p></li>\n\n<li><p>Yang</p></li>\n</ul>\n",
 
 		"- Ting\n\n- Bong\n- Goo\n",
-		"<ul>\n<li><p>Ting</p></li>\n<li><p>Bong</p></li>\n<li><p>Goo</p></li>\n</ul>\n",
+		"<ul>\n<li><p>Ting</p></li>\n\n<li><p>Bong</p></li>\n\n<li><p>Goo</p></li>\n</ul>\n",
 
 		"*Hello\n",
 		"<p>*Hello</p>\n",
@@ -393,10 +393,10 @@ func TestOrderedList(t *testing.T) {
 		"<ol>\n<li>Ting</li>\n<li>Bong</li>\n<li>Goo</li>\n</ol>\n",
 
 		"1. Yin\n\n2. Yang\n",
-		"<ol>\n<li><p>Yin</p></li>\n<li><p>Yang</p></li>\n</ol>\n",
+		"<ol>\n<li><p>Yin</p></li>\n\n<li><p>Yang</p></li>\n</ol>\n",
 
 		"1. Ting\n\n2. Bong\n3. Goo\n",
-		"<ol>\n<li><p>Ting</p></li>\n<li><p>Bong</p></li>\n<li><p>Goo</p></li>\n</ol>\n",
+		"<ol>\n<li><p>Ting</p></li>\n\n<li><p>Bong</p></li>\n\n<li><p>Goo</p></li>\n</ol>\n",
 
 		"1 Hello\n",
 		"<p>1 Hello</p>\n",
diff --git a/html.go b/html.go
index f0d8cf2..c71ca0e 100644
--- a/html.go
+++ b/html.go
@@ -252,9 +252,10 @@ func (options *Html) BlockCodeGithub(out *bytes.Buffer, text []byte, lang string
 
 
 func (options *Html) BlockQuote(out *bytes.Buffer, text []byte) {
+	doubleSpace(out)
 	out.WriteString("<blockquote>\n")
 	out.Write(text)
-	out.WriteString("</blockquote>")
+	out.WriteString("</blockquote>\n")
 }
 
 func (options *Html) Table(out *bytes.Buffer, header []byte, body []byte, columnData []int) {
@@ -263,7 +264,7 @@ func (options *Html) Table(out *bytes.Buffer, header []byte, body []byte, column
 	out.Write(header)
 	out.WriteString("\n</thead>\n<tbody>\n")
 	out.Write(body)
-	out.WriteString("\n</tbody>\n</table>")
+	out.WriteString("\n</tbody>\n</table>\n")
 }
 
 func (options *Html) TableRow(out *bytes.Buffer, text []byte) {
@@ -295,9 +296,9 @@ func (options *Html) List(out *bytes.Buffer, text func() bool, flags int) {
 	doubleSpace(out)
 
 	if flags&LIST_TYPE_ORDERED != 0 {
-		out.WriteString("<ol>\n")
+		out.WriteString("<ol>")
 	} else {
-		out.WriteString("<ul>\n")
+		out.WriteString("<ul>")
 	}
 	if !text() {
 		out.Truncate(marker)
@@ -311,6 +312,9 @@ func (options *Html) List(out *bytes.Buffer, text func() bool, flags int) {
 }
 
 func (options *Html) ListItem(out *bytes.Buffer, text []byte, flags int) {
+	if flags&LIST_ITEM_CONTAINS_BLOCK != 0 || flags&LIST_ITEM_BEGINNING_OF_LIST != 0 {
+		doubleSpace(out)
+	}
 	out.WriteString("<li>")
 	out.Write(text)
 	out.WriteString("</li>\n")
diff --git a/markdown.go b/markdown.go
index da20f35..0bccdd8 100644
--- a/markdown.go
+++ b/markdown.go
@@ -51,6 +51,7 @@ const (
 const (
 	LIST_TYPE_ORDERED = 1 << iota
 	LIST_ITEM_CONTAINS_BLOCK
+	LIST_ITEM_BEGINNING_OF_LIST
 	LIST_ITEM_END_OF_LIST
 )
 
diff --git a/upskirtref/Auto links.html b/upskirtref/Auto links.html
index 16a24d2..b1791e7 100644
--- a/upskirtref/Auto links.html	
+++ b/upskirtref/Auto links.html	
@@ -7,9 +7,11 @@
 <li><a href="http://example.com/">http://example.com/</a></li>
 <li>It should.</li>
 </ul>
+
 <blockquote>
 <p>Blockquoted: <a href="http://example.com/">http://example.com/</a></p>
 </blockquote>
+
 <p>Auto-links should not occur here: <code>&lt;http://example.com/&gt;</code></p>
 
 <pre><code>or here: &lt;http://example.com/&gt;
diff --git a/upskirtref/Blockquotes with code blocks.html b/upskirtref/Blockquotes with code blocks.html
index fa64335..360fa9b 100644
--- a/upskirtref/Blockquotes with code blocks.html	
+++ b/upskirtref/Blockquotes with code blocks.html	
@@ -12,4 +12,4 @@
     return &quot;working&quot;;
 }
 </code></pre>
-</blockquote>
\ No newline at end of file
+</blockquote>
diff --git a/upskirtref/Nested blockquotes.html b/upskirtref/Nested blockquotes.html
index f1b017e..538bb4f 100644
--- a/upskirtref/Nested blockquotes.html	
+++ b/upskirtref/Nested blockquotes.html	
@@ -1,7 +1,9 @@
 <blockquote>
 <p>foo</p>
+
 <blockquote>
 <p>bar</p>
 </blockquote>
+
 <p>foo</p>
-</blockquote>
\ No newline at end of file
+</blockquote>
diff --git a/upskirtref/Ordered and unordered lists.html b/upskirtref/Ordered and unordered lists.html
index e3219f2..d6fa427 100644
--- a/upskirtref/Ordered and unordered lists.html	
+++ b/upskirtref/Ordered and unordered lists.html	
@@ -12,7 +12,9 @@
 
 <ul>
 <li><p>asterisk 1</p></li>
+
 <li><p>asterisk 2</p></li>
+
 <li><p>asterisk 3</p></li>
 </ul>
 
@@ -30,7 +32,9 @@
 
 <ul>
 <li><p>Plus 1</p></li>
+
 <li><p>Plus 2</p></li>
+
 <li><p>Plus 3</p></li>
 </ul>
 
@@ -48,7 +52,9 @@
 
 <ul>
 <li><p>Minus 1</p></li>
+
 <li><p>Minus 2</p></li>
+
 <li><p>Minus 3</p></li>
 </ul>
 
@@ -74,7 +80,9 @@
 
 <ol>
 <li><p>First</p></li>
+
 <li><p>Second</p></li>
+
 <li><p>Third</p></li>
 </ol>
 
@@ -82,7 +90,9 @@
 
 <ol>
 <li><p>One</p></li>
+
 <li><p>Two</p></li>
+
 <li><p>Three</p></li>
 </ol>
 
@@ -93,7 +103,9 @@
 
 <p>Item 2. graf two. The quick brown fox jumped over the lazy dog's
 back.</p></li>
+
 <li><p>Item 2.</p></li>
+
 <li><p>Item 3.</p></li>
 </ol>
 
@@ -129,6 +141,7 @@ back.</p></li>
 
 <ol>
 <li><p>First</p></li>
+
 <li><p>Second:</p>
 
 <ul>
@@ -136,6 +149,7 @@ back.</p></li>
 <li>Fie</li>
 <li>Foe</li>
 </ul></li>
+
 <li><p>Third</p></li>
 </ol>
 
diff --git a/upskirtref/Tabs.html b/upskirtref/Tabs.html
index 3301ba8..64006d9 100644
--- a/upskirtref/Tabs.html
+++ b/upskirtref/Tabs.html
@@ -1,6 +1,7 @@
 <ul>
 <li><p>this is a list item
 indented with tabs</p></li>
+
 <li><p>this is a list item
 indented with spaces</p></li>
 </ul>
diff --git a/upskirtref/Tidyness.html b/upskirtref/Tidyness.html
index b965bef..9c45b69 100644
--- a/upskirtref/Tidyness.html
+++ b/upskirtref/Tidyness.html
@@ -6,4 +6,4 @@
 <li>asterisk 2</li>
 <li>asterisk 3</li>
 </ul>
-</blockquote>
\ No newline at end of file
+</blockquote>