[commit: haddock] master: Allow for headings inside function documentation. (b11f371)

[git at git.haskell.org]

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

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

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

commit b11f371fdc9197cb45a6dafbcc0b095273d6614f
Author: Mateusz Kowalczyk <fuuzetsu at fuuzetsu.co.uk>
Date:   Tue Sep 3 01:29:27 2013 +0100

    Allow for headings inside function documentation.
    
    LaTeX will treat the h3-h6 headings the same as we'd have to hack the
    style file heavily otherwise and it would make the headings tiny
    anyway.
    
    Hoogle upstream said they will put in the functionality on their end.
    
    Conflicts:
    	src/Haddock/Interface/Rename.hs
    	src/Haddock/Types.hs
    	test/Haddock/ParserSpec.hs


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

b11f371fdc9197cb45a6dafbcc0b095273d6614f
 src/Haddock/Backends/Hoogle.hs          |    3 ++-
 src/Haddock/Backends/LaTeX.hs           |    9 ++++++++-
 src/Haddock/Backends/Xhtml/DocMarkup.hs |   13 ++++++++++++-
 src/Haddock/Interface/LexParseRn.hs     |    1 +
 src/Haddock/InterfaceFile.hs            |   18 ++++++++++++++++--
 src/Haddock/Parser.hs                   |   14 ++++++++++++--
 src/Haddock/Types.hs                    |   16 ++++++++++++++++
 src/Haddock/Utils.hs                    |    4 +++-
 test/Haddock/ParserSpec.hs              |   19 +++++++++++++++++++
 9 files changed, 89 insertions(+), 8 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 b11f371fdc9197cb45a6dafbcc0b095273d6614f