X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Rakka%2FWiki.hs;h=a519d34a227da9b8a40ec6db7b66108907185fc2;hb=10200315228e613ca2de0b2a5c5e792e721b4ab6;hp=0cf9a135fbdba2658a1da22a79f315908057e15b;hpb=2ad43b49ecc25bdf87dd19037fd63c12428992ae;p=Rakka.git

diff --git a/Rakka/Wiki.hs b/Rakka/Wiki.hs
index 0cf9a13..a519d34 100644
--- a/Rakka/Wiki.hs
+++ b/Rakka/Wiki.hs
@@ -1,36 +1,55 @@
 module Rakka.Wiki
     ( WikiPage
+
+    , Element(..)
+    , Attribute
+
     , BlockElement(..)
     , InlineElement(..)
 
-    , ListElement(..)
+    , Definition(..)
+
     , ListType(..)
     , ListItem
 
-    , Definition(..)
-
     , CommandType(..)
-    , Attribute
+    , BlockCommand(..)
     , InlineCommand(..)
     )
     where
 
+import           Network.URI
 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] ![Element]
+    | EmptyBlock
+    | BlockCmd !BlockCommand
     deriving (Eq, Show)
 
 
@@ -38,21 +57,29 @@ data InlineElement
     = Text !String
     | Italic ![InlineElement]
     | Bold ![InlineElement]
+    | ObjectLink {
+        objLinkPage :: !PageName
+      , objLinkText :: !(Maybe String)
+      }
     | PageLink {
         linkPage     :: !(Maybe PageName)
       , linkFragment :: !(Maybe String)
       , linkText     :: !(Maybe String)
       }
+    | ExternalLink {
+        extLinkURI  :: !URI
+      , extLinkText :: !(Maybe String)
+      }
     | LineBreak ![Attribute]
-    | InlineCmd !InlineCommand
-    deriving (Eq, Show)
-
-
-data ListElement
-    = ListElement {
-        listType  :: !ListType
-      , listItems :: ![ListItem]
+    | Span ![Attribute] ![InlineElement]
+    | Image {
+        imgSource :: !(Either URI PageName)
+      , imgAlt    :: !(Maybe String)
       }
+    | Anchor ![Attribute] ![InlineElement]
+    | Input ![Attribute]
+    | EmptyInline
+    | InlineCmd !InlineCommand
     deriving (Eq, Show)
 
 
@@ -62,7 +89,7 @@ data ListType
     deriving (Eq, Show)
 
 
-type ListItem = [Either ListElement InlineElement]
+type ListItem = [Element]
 
 
 data Definition
@@ -76,9 +103,16 @@ data Definition
 data CommandType
     = InlineCommandType
     | BlockCommandType
+    deriving (Eq, Show)
 
 
-type Attribute = (String, String)
+data BlockCommand
+    = BlockCommand {
+        bCmdName       :: !String
+      , bCmdAttributes :: ![Attribute]
+      , bCmdContents   :: ![BlockElement]
+      }
+    deriving (Eq, Show)
 
 
 data InlineCommand