X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Rakka%2FWiki.hs;h=a519d34a227da9b8a40ec6db7b66108907185fc2;hb=b51bb0c6d9385938eab21c70ed7ea631883260d0;hp=0fcf38a6bca33b31550bb2ddbc8d5d49f37a19e7;hpb=3c5211253dc61c31196a47486c538b64c32d8c5e;p=Rakka.git

diff --git a/Rakka/Wiki.hs b/Rakka/Wiki.hs
index 0fcf38a..a519d34 100644
--- a/Rakka/Wiki.hs
+++ b/Rakka/Wiki.hs
@@ -1,22 +1,23 @@
 module Rakka.Wiki
     ( WikiPage
+
+    , Element(..)
+    , Attribute
+
     , BlockElement(..)
     , InlineElement(..)
 
-    , ListElement(..)
+    , Definition(..)
+
     , ListType(..)
     , ListItem
 
-    , Definition(..)
-
     , CommandType(..)
-    , Attribute
     , BlockCommand(..)
     , InlineCommand(..)
     )
     where
 
-import           Data.Generics
 import           Network.URI
 import           Rakka.Page
 
@@ -24,26 +25,42 @@ import           Rakka.Page
 type WikiPage = [BlockElement]
 
 
+data Element
+    = Block  !BlockElement
+    | Inline !InlineElement
+    deriving (Eq, Show)
+
+
+type Attribute = (String, String)
+
+
 data BlockElement
     = Heading {
         headingLevel :: !Int
       , headingText  :: !String
       }
     | HorizontalLine
-    | List !ListElement
+    | List {
+        listType  :: !ListType
+      , listItems :: ![ListItem]
+      }
     | DefinitionList ![Definition]
     | Preformatted ![InlineElement]
     | Paragraph ![InlineElement]
-    | Div ![Attribute] ![BlockElement]
+    | Div ![Attribute] ![Element]
     | EmptyBlock
     | BlockCmd !BlockCommand
-    deriving (Eq, Show, Typeable, Data)
+    deriving (Eq, Show)
 
 
 data InlineElement
     = Text !String
     | Italic ![InlineElement]
     | Bold ![InlineElement]
+    | ObjectLink {
+        objLinkPage :: !PageName
+      , objLinkText :: !(Maybe String)
+      }
     | PageLink {
         linkPage     :: !(Maybe PageName)
       , linkFragment :: !(Maybe String)
@@ -55,28 +72,24 @@ data InlineElement
       }
     | LineBreak ![Attribute]
     | Span ![Attribute] ![InlineElement]
-    | Image ![Attribute]
+    | Image {
+        imgSource :: !(Either URI PageName)
+      , imgAlt    :: !(Maybe String)
+      }
     | Anchor ![Attribute] ![InlineElement]
+    | Input ![Attribute]
     | EmptyInline
     | InlineCmd !InlineCommand
-    deriving (Eq, Show, Typeable, Data)
-
-
-data ListElement
-    = ListElement {
-        listType  :: !ListType
-      , listItems :: ![ListItem]
-      }
-    deriving (Eq, Show, Typeable, Data)
+    deriving (Eq, Show)
 
 
 data ListType
     = Bullet
     | Numbered
-    deriving (Eq, Show, Typeable, Data)
+    deriving (Eq, Show)
 
 
-type ListItem = [Either ListElement InlineElement]
+type ListItem = [Element]
 
 
 data Definition
@@ -84,7 +97,7 @@ data Definition
         defTerm :: ![InlineElement]
       , defDesc :: ![InlineElement]
       }
-    deriving (Eq, Show, Typeable, Data)
+    deriving (Eq, Show)
 
 
 data CommandType
@@ -93,16 +106,13 @@ data CommandType
     deriving (Eq, Show)
 
 
-type Attribute = (String, String)
-
-
 data BlockCommand
     = BlockCommand {
         bCmdName       :: !String
       , bCmdAttributes :: ![Attribute]
       , bCmdContents   :: ![BlockElement]
       }
-    deriving (Eq, Show, Typeable, Data)
+    deriving (Eq, Show)
 
 
 data InlineCommand
@@ -111,4 +121,4 @@ data InlineCommand
       , iCmdAttributes :: ![Attribute]
       , iCmdContents   :: ![InlineElement]
       }
-    deriving (Eq, Show, Typeable, Data)
+    deriving (Eq, Show)