Allow for nesting of paragraphs under lists.

The nesting rules are similar to Markdown's with the exception that we
can not simply indent the first line of a hard wrapped indented
paragraph and have it treated as if it was fully indented. The reason is
differences in markup as some of our constructs care about whitespace
while others just swallow everything up so it's just a lot easier to not
bother with it rather than making arbitrary rules.

Note that we now drop trailing for string entities inside of lists. They
weren't needed and it makes the output look uniform whether we use a
single or double newline between list elements.

Conflicts:
	src/Haddock/Parser.hs
	test/Haddock/ParserSpec.hs

1 files changed, 6 insertions, 12 deletions

diff --git a/html-test/ref/Test.html b/html-test/ref/Test.html
index 2a3ae350..b54b3a05 100644
--- a/html-test/ref/Test.html
+++ b/html-test/ref/Test.html
@@ -1632,31 +1632,25 @@ using double quotes: <a href=""
 	      >.</p
 	    ><ul
 	    ><li
-	      >This is a bulleted list
-</li
+	      >This is a bulleted list</li
 	      ><li
-	      >This is the next item (different kind of bullet)
-</li
+	      >This is the next item (different kind of bullet)</li
 	      ></ul
 	    ><ol
 	    ><li
-	      >This is an ordered list
-</li
+	      >This is an ordered list</li
 	      ><li
-	      >This is the next item (different kind of bullet)
-</li
+	      >This is the next item (different kind of bullet)</li
 	      ></ol
 	    ><dl
 	    ><dt
 	      >cat</dt
 	      ><dd
-	      >a small, furry, domesticated mammal
-</dd
+	      >a small, furry, domesticated mammal</dd
 	      ><dt
 	      >pineapple</dt
 	      ><dd
-	      >a fruit grown in the tropics
-</dd
+	      >a fruit grown in the tropics</dd
 	      ></dl
 	    ><pre
 	    >     This is a block of code, which can include other markup: <code