From a03c93524ba2ca4143c10770a2fa0dd134b57a83 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sun, 8 Sep 2013 01:28:57 +0100
Subject: 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
---
 html-test/ref/Bold.html | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'html-test/ref/Bold.html')

diff --git a/html-test/ref/Bold.html b/html-test/ref/Bold.html
index 4d5f559a..f6bdbd5e 100644
--- a/html-test/ref/Bold.html
+++ b/html-test/ref/Bold.html
@@ -68,8 +68,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bold.html");};
 	    ><li
 	      ><strong
 		>Bold</strong
-		> in a list
-</li
+		> in a list</li
 	      ></ul
 	    ><dl
 	    ><dt
@@ -77,8 +76,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bold.html");};
 		>bold in a definition</strong
 		></dt
 	      ><dd
-	      >list
-</dd
+	      >list</dd
 	      ></dl
 	    ><pre
 	    > bold <strong
-- 
cgit v1.2.3