implemented more markup stuffs

[Rakka.git] / Rakka / Wiki.hs

diff --git a/Rakka/Wiki.hs b/Rakka/Wiki.hs
index 3b1802f0e4cc42928fc4341e03f2eb36116eb1a1..b8be3a3fabf8bc5d3a56ef77cdd9207da6c81baf 100644 (file)
--- a/Rakka/Wiki.hs
+++ b/Rakka/Wiki.hs
@@ -6,6 +6,8 @@ module Rakka.Wiki
     , ListElement(..)
     , ListType(..)
     , ListItem
+
+    , Definition(..)
     )
     where
 
@@ -22,13 +24,16 @@ data BlockElement
       }
     | HorizontalLine
     | List !ListElement
-    | LeadingSpaced ![InlineElement]
+    | DefinitionList ![Definition]
+    | Preformatted ![InlineElement]
     | Paragraph ![InlineElement]
     deriving (Eq, Show)
 
 
 data InlineElement
     = Text !String
+    | Italic ![InlineElement]
+    | Bold ![InlineElement]
     | PageLink {
         linkPage     :: !(Maybe PageName)
       , linkFragment :: !(Maybe String)
@@ -52,3 +57,11 @@ data ListType
 
 
 type ListItem = [Either ListElement InlineElement]
+
+
+data Definition
+    = Definition {
+        defTerm :: ![InlineElement]
+      , defDesc :: ![InlineElement]
+      }
+    deriving (Eq, Show)
\ No newline at end of file