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

diff --git a/Rakka/Wiki.hs b/Rakka/Wiki.hs
index 3011b13..a519d34 100644
--- a/Rakka/Wiki.hs
+++ b/Rakka/Wiki.hs
@@ -1,37 +1,124 @@
 module Rakka.Wiki
     ( WikiPage
-    , WikiElement(..)
+
+    , Element(..)
+    , Attribute
+
     , BlockElement(..)
     , InlineElement(..)
+
+    , Definition(..)
+
+    , ListType(..)
+    , ListItem
+
+    , CommandType(..)
+    , BlockCommand(..)
+    , InlineCommand(..)
     )
     where
 
+import           Network.URI
 import           Rakka.Page
 
 
-type WikiPage = [WikiElement]
+type WikiPage = [BlockElement]
 
 
-data WikiElement
+data Element
     = Block  !BlockElement
     | Inline !InlineElement
     deriving (Eq, Show)
 
 
+type Attribute = (String, String)
+
+
 data BlockElement
     = Heading {
         headingLevel :: !Int
       , headingText  :: !String
       }
-    | EmptyLine
+    | HorizontalLine
+    | List {
+        listType  :: !ListType
+      , listItems :: ![ListItem]
+      }
+    | DefinitionList ![Definition]
+    | Preformatted ![InlineElement]
+    | Paragraph ![InlineElement]
+    | Div ![Attribute] ![Element]
+    | EmptyBlock
+    | BlockCmd !BlockCommand
     deriving (Eq, Show)
 
 
 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]
+    | Span ![Attribute] ![InlineElement]
+    | Image {
+        imgSource :: !(Either URI PageName)
+      , imgAlt    :: !(Maybe String)
+      }
+    | Anchor ![Attribute] ![InlineElement]
+    | Input ![Attribute]
+    | EmptyInline
+    | InlineCmd !InlineCommand
+    deriving (Eq, Show)
+
+
+data ListType
+    = Bullet
+    | Numbered
+    deriving (Eq, Show)
+
+
+type ListItem = [Element]
+
+
+data Definition
+    = Definition {
+        defTerm :: ![InlineElement]
+      , defDesc :: ![InlineElement]
+      }
+    deriving (Eq, Show)
+
+
+data CommandType
+    = InlineCommandType
+    | BlockCommandType
+    deriving (Eq, Show)
+
+
+data BlockCommand
+    = BlockCommand {
+        bCmdName       :: !String
+      , bCmdAttributes :: ![Attribute]
+      , bCmdContents   :: ![BlockElement]
+      }
+    deriving (Eq, Show)
+
+
+data InlineCommand
+    = InlineCommand {
+        iCmdName       :: !String
+      , iCmdAttributes :: ![Attribute]
+      , iCmdContents   :: ![InlineElement]
+      }
     deriving (Eq, Show)