From a03c93524ba2ca4143c10770a2fa0dd134b57a83 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk 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/Test.html | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'html-test/ref/Test.html') 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: .

  1. This is an ordered list -
    2. This is an ordered list
  2. This is the next item (different kind of bullet) -
    3. This is the next item (different kind of bullet)
cat
a small, furry, domesticated mammal -
a small, furry, domesticated mammal
pineapple
a fruit grown in the tropics -
a fruit grown in the tropics
     This is a block of code, which can include other markup: