Wrote more

[Rakka.git] / Rakka / Wiki.hs

diff --git a/Rakka/Wiki.hs b/Rakka/Wiki.hs
index 9f8bcdce7d9d47268d557521f7e15e05e0a97efa..613869b2a9091b83f1b234aa2c20b85ca08caab3 100644 (file)
--- a/Rakka/Wiki.hs
+++ b/Rakka/Wiki.hs
@@ -8,9 +8,16 @@ module Rakka.Wiki
     , ListItem
 
     , Definition(..)
+
+    , CommandType(..)
+    , Attribute
+    , BlockCommand(..)
+    , InlineCommand(..)
     )
     where
 
+import           Data.Generics
+import           Network.URI
 import           Rakka.Page
 
 
@@ -25,19 +32,41 @@ data BlockElement
     | HorizontalLine
     | List !ListElement
     | DefinitionList ![Definition]
-    | LeadingSpaced ![InlineElement]
+    | Preformatted ![InlineElement]
     | Paragraph ![InlineElement]
-    deriving (Eq, Show)
+    | Div ![Attribute] ![BlockElement]
+    | EmptyBlock
+    | BlockCmd !BlockCommand
+    deriving (Eq, Show, Typeable, Data)
 
 
 data InlineElement
     = Text !String
+    | Italic ![InlineElement]
+    | Bold ![InlineElement]
+    | ObjectLink {
+        objLinkPage :: !PageName
+      , objLinkText :: !(Maybe String)
+      }
     | PageLink {
         linkPage     :: !(Maybe PageName)
       , linkFragment :: !(Maybe String)
       , linkText     :: !(Maybe String)
       }
-    deriving (Eq, Show)
+    | ExternalLink {
+        extLinkURI  :: !URI
+      , extLinkText :: !(Maybe String)
+      }
+    | LineBreak ![Attribute]
+    | Span ![Attribute] ![InlineElement]
+    | Image {
+        imgSource :: !PageName
+      , imgAlt    :: !(Maybe String)
+      }
+    | Anchor ![Attribute] ![InlineElement]
+    | EmptyInline
+    | InlineCmd !InlineCommand
+    deriving (Eq, Show, Typeable, Data)
 
 
 data ListElement
@@ -45,13 +74,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]
@@ -62,4 +91,31 @@ data Definition
         defTerm :: ![InlineElement]
       , defDesc :: ![InlineElement]
       }
-    deriving (Eq, Show)
\ No newline at end of file
+    deriving (Eq, Show, Typeable, Data)
+
+
+data CommandType
+    = InlineCommandType
+    | BlockCommandType
+    deriving (Eq, Show)
+
+
+type Attribute = (String, String)
+
+
+data BlockCommand
+    = BlockCommand {
+        bCmdName       :: !String
+      , bCmdAttributes :: ![Attribute]
+      , bCmdContents   :: ![BlockElement]
+      }
+    deriving (Eq, Show, Typeable, Data)
+
+
+data InlineCommand
+    = InlineCommand {
+        iCmdName       :: !String
+      , iCmdAttributes :: ![Attribute]
+      , iCmdContents   :: ![InlineElement]
+      }
+    deriving (Eq, Show, Typeable, Data)