X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=Rakka%2FWiki.hs;h=3b1802f0e4cc42928fc4341e03f2eb36116eb1a1;hb=16b140fe235a43f9dfb9b57e69ebc302beeaea27;hp=9e80df45271fda486f47f2ee1fdb2dccb8d611aa;hpb=87e8b02490f9ca337c1a25de4454d4ad6d1492c6;p=Rakka.git

diff --git a/Rakka/Wiki.hs b/Rakka/Wiki.hs
index 9e80df4..3b1802f 100644
--- a/Rakka/Wiki.hs
+++ b/Rakka/Wiki.hs
@@ -2,6 +2,10 @@ module Rakka.Wiki
     ( WikiPage
     , BlockElement(..)
     , InlineElement(..)
+
+    , ListElement(..)
+    , ListType(..)
+    , ListItem
     )
     where
 
@@ -16,6 +20,9 @@ data BlockElement
         headingLevel :: !Int
       , headingText  :: !String
       }
+    | HorizontalLine
+    | List !ListElement
+    | LeadingSpaced ![InlineElement]
     | Paragraph ![InlineElement]
     deriving (Eq, Show)
 
@@ -28,3 +35,20 @@ data InlineElement
       , linkText     :: !(Maybe String)
       }
     deriving (Eq, Show)
+
+
+data ListElement
+    = ListElement {
+        listType  :: !ListType
+      , listItems :: ![ListItem]
+      }
+    deriving (Eq, Show)
+
+
+data ListType
+    = Bullet
+    | Numbered
+    deriving (Eq, Show)
+
+
+type ListItem = [Either ListElement InlineElement]