[commit: packages/pretty] master: Merge pull request #19 from elliottt/annotations (b718d1f)

[git at git.haskell.org]

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

On branch  : master
Link       : http://git.haskell.org/packages/pretty.git/commitdiff/b718d1f65acd5d153820d78684b6b139ac36b8d6

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

commit b718d1f65acd5d153820d78684b6b139ac36b8d6
Merge: e34ba99 764213f
Author: David Terei <github at davidterei.com>
Date:   Mon Jan 26 17:33:51 2015 -0800

    Merge pull request #19 from elliottt/annotations
    
    Add an annotation API



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

b718d1f65acd5d153820d78684b6b139ac36b8d6
 pretty.cabal                                       |   5 +-
 .../{PrettyPrint.hs => PrettyPrint/Annotated.hs}   |  13 +-
 src/Text/PrettyPrint/{ => Annotated}/HughesPJ.hs   | 452 +++++++++-----
 .../PrettyPrint/{ => Annotated}/HughesPJClass.hs   |  18 +-
 src/Text/PrettyPrint/HughesPJ.hs                   | 664 ++-------------------
 tests/Test.hs                                      | 170 +++---
 tests/TestStructures.hs                            |  18 +-
 7 files changed, 495 insertions(+), 845 deletions(-)