The experiment has succeeded

[Rakka.git] / Rakka / Wiki.hs

diff --git a/Rakka/Wiki.hs b/Rakka/Wiki.hs
index f8341ec8506d6069e4a152d4db50371b5bcaee1b..613869b2a9091b83f1b234aa2c20b85ca08caab3 100644 (file)
--- a/Rakka/Wiki.hs
+++ b/Rakka/Wiki.hs
@@ -35,6 +35,7 @@ data BlockElement
     | Preformatted ![InlineElement]
     | Paragraph ![InlineElement]
     | Div ![Attribute] ![BlockElement]
+    | EmptyBlock
     | BlockCmd !BlockCommand
     deriving (Eq, Show, Typeable, Data)
 
@@ -43,6 +44,10 @@ data InlineElement
     = Text !String
     | Italic ![InlineElement]
     | Bold ![InlineElement]
+    | ObjectLink {
+        objLinkPage :: !PageName
+      , objLinkText :: !(Maybe String)
+      }
     | PageLink {
         linkPage     :: !(Maybe PageName)
       , linkFragment :: !(Maybe String)
@@ -54,8 +59,12 @@ data InlineElement
       }
     | LineBreak ![Attribute]
     | Span ![Attribute] ![InlineElement]
-    | Image ![Attribute]
+    | Image {
+        imgSource :: !PageName
+      , imgAlt    :: !(Maybe String)
+      }
     | Anchor ![Attribute] ![InlineElement]
+    | EmptyInline
     | InlineCmd !InlineCommand
     deriving (Eq, Show, Typeable, Data)