[commit: haddock] master: Allow for nesting of paragraphs under lists. (a03c935)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/haddock

On branch  : master
Link       : http://git.haskell.org/haddock.git/commitdiff/a03c93524ba2ca4143c10770a2fa0dd134b57a83

>---------------------------------------------------------------

commit a03c93524ba2ca4143c10770a2fa0dd134b57a83
Author: Mateusz Kowalczyk <fuuzetsu at fuuzetsu.co.uk>
Date:   Sun Sep 8 01:28:57 2013 +0100

    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


>---------------------------------------------------------------

a03c93524ba2ca4143c10770a2fa0dd134b57a83
 html-test/ref/Bold.html               |    6 +-
 html-test/ref/DeprecatedReExport.html |    3 +-
 html-test/ref/Nesting.html            |  288 +++++++++++++++++++++++++++++++++
 html-test/ref/PruneWithWarning.html   |    3 +-
 html-test/ref/Test.html               |   18 +--
 html-test/src/Nesting.hs              |  115 +++++++++++++
 src/Haddock/Doc.hs                    |    2 +
 src/Haddock/Parser.hs                 |  110 ++++++++++---
 src/Haddock/Types.hs                  |    2 +-
 test/Haddock/ParserSpec.hs            |  155 +++++++++++++-----
 10 files changed, 613 insertions(+), 89 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc a03c93524ba2ca4143c10770a2fa0dd134b57a83