X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Rakka%2FWiki.hs;h=96231a46c72174bc33c7df3733e8c9457e230b09;hb=bd2b1344f5ed3d4de91297bfe08658e52d682b82;hp=f0e38fedd47994f629efdd6ae1f2dbe74ac4b784;hpb=7c3065043cdfbd96539a9bf6bff9b1d4281c0b2a;p=Rakka.git diff --git a/Rakka/Wiki.hs b/Rakka/Wiki.hs index f0e38fe..96231a4 100644 --- a/Rakka/Wiki.hs +++ b/Rakka/Wiki.hs @@ -16,6 +16,7 @@ module Rakka.Wiki ) where +import Data.Generics import Rakka.Page @@ -34,7 +35,7 @@ data BlockElement | Paragraph ![InlineElement] | Div ![Attribute] ![BlockElement] | BlockCmd !BlockCommand - deriving (Eq, Show) + deriving (Eq, Show, Typeable, Data) data InlineElement @@ -51,7 +52,7 @@ data InlineElement | Image ![Attribute] | Anchor ![Attribute] ![InlineElement] | InlineCmd !InlineCommand - deriving (Eq, Show) + deriving (Eq, Show, Typeable, Data) data ListElement @@ -59,13 +60,13 @@ data ListElement listType :: !ListType , listItems :: ![ListItem] } - deriving (Eq, Show) + deriving (Eq, Show, Typeable, Data) data ListType = Bullet | Numbered - deriving (Eq, Show) + deriving (Eq, Show, Typeable, Data) type ListItem = [Either ListElement InlineElement] @@ -76,12 +77,13 @@ data Definition defTerm :: ![InlineElement] , defDesc :: ![InlineElement] } - deriving (Eq, Show) + deriving (Eq, Show, Typeable, Data) data CommandType = InlineCommandType | BlockCommandType + deriving (Eq, Show) type Attribute = (String, String) @@ -93,7 +95,7 @@ data BlockCommand , bCmdAttributes :: ![Attribute] , bCmdContents :: ![BlockElement] } - deriving (Eq, Show) + deriving (Eq, Show, Typeable, Data) data InlineCommand @@ -102,4 +104,4 @@ data InlineCommand , iCmdAttributes :: ![Attribute] , iCmdContents :: ![InlineElement] } - deriving (Eq, Show) + deriving (Eq, Show, Typeable, Data)