aboutsummaryrefslogtreecommitdiff
path: root/src/Haddock/Backends
diff options
context:
space:
mode:
authorMark Lentczner <markl@glyphic.com>2010-06-17 22:20:56 +0000
committerMark Lentczner <markl@glyphic.com>2010-06-17 22:20:56 +0000
commit92eb93b4d7ede4a28aff90a1697951c6aef093cf (patch)
treea15c8846410a24b49f906f6369303873e420e624 /src/Haddock/Backends
parent3da5ad49bb4e18705fdf0f3428648ed425e8009b (diff)
remove <++> connector
Diffstat (limited to 'src/Haddock/Backends')
-rw-r--r--src/Haddock/Backends/Xhtml.hs14
-rw-r--r--src/Haddock/Backends/Xhtml/Util.hs7
2 files changed, 9 insertions, 12 deletions
diff --git a/src/Haddock/Backends/Xhtml.hs b/src/Haddock/Backends/Xhtml.hs
index 167250b4..c8a64ece 100644
--- a/src/Haddock/Backends/Xhtml.hs
+++ b/src/Haddock/Backends/Xhtml.hs
@@ -662,15 +662,15 @@ processForMiniSynopsis mdl unicode (ExportDecl (L _loc decl0) _doc _ _insts) =
case decl0 of
TyClD d@(TyFamily{}) -> ppTyFamHeader True False d unicode
TyClD d@(TyData{tcdTyPats = ps})
- | Nothing <- ps -> keyword "data" <++> ppTyClBinderWithVarsMini mdl d
- | Just _ <- ps -> keyword "data" <++> keyword "instance"
- <++> ppTyClBinderWithVarsMini mdl d
+ | Nothing <- ps -> keyword "data" <+> ppTyClBinderWithVarsMini mdl d
+ | Just _ <- ps -> keyword "data" <+> keyword "instance"
+ <+> ppTyClBinderWithVarsMini mdl d
TyClD d@(TySynonym{tcdTyPats = ps})
- | Nothing <- ps -> keyword "type" <++> ppTyClBinderWithVarsMini mdl d
- | Just _ <- ps -> keyword "type" <++> keyword "instance"
- <++> ppTyClBinderWithVarsMini mdl d
+ | Nothing <- ps -> keyword "type" <+> ppTyClBinderWithVarsMini mdl d
+ | Just _ <- ps -> keyword "type" <+> keyword "instance"
+ <+> ppTyClBinderWithVarsMini mdl d
TyClD d@(ClassDecl {}) ->
- keyword "class" <++> ppTyClBinderWithVarsMini mdl d
+ keyword "class" <+> ppTyClBinderWithVarsMini mdl d
SigD (TypeSig (L _ n) (L _ _)) ->
let nm = docNameOcc n
in ppNameMini mdl nm
diff --git a/src/Haddock/Backends/Xhtml/Util.hs b/src/Haddock/Backends/Xhtml/Util.hs
index 8229e002..9e13acd6 100644
--- a/src/Haddock/Backends/Xhtml/Util.hs
+++ b/src/Haddock/Backends/Xhtml/Util.hs
@@ -16,7 +16,7 @@ module Haddock.Backends.Xhtml.Util (
namedAnchor, linkedAnchor,
spliceURL,
- (<+>), (<++>), char, empty,
+ (<+>), char, empty,
keyword, punctuate,
braces, brackets, pabrackets, parens, parenList, ubxParenList,
@@ -93,13 +93,10 @@ hsep :: [Html] -> Html
hsep [] = noHtml
hsep htmls = foldr1 (\a b -> a+++" "+++b) htmls
-infixr 8 <+>, <++>
+infixr 8 <+>
(<+>) :: Html -> Html -> Html
a <+> b = a +++ toHtml " " +++ b
-(<++>) :: Html -> Html -> Html
-a <++> b = a +++ spaceHtml +++ b
-
keyword :: String -> Html
keyword s = thespan ! [theclass "keyword"] << toHtml s