merge branch origin/master

[Rakka.git] / Rakka / Wiki.hs

diff --git a/Rakka/Wiki.hs b/Rakka/Wiki.hs
index 0bf23987b5ffed8c5368fd13d85695183a3b89c8..bdecec7fac00a5da4b3aa5e86865bc6e2fc91955 100644 (file)
--- a/Rakka/Wiki.hs
+++ b/Rakka/Wiki.hs
@@ -1,102 +1,116 @@
+{-# LANGUAGE
+    UnicodeSyntax
+  #-}
 module Rakka.Wiki
     ( WikiPage
+
+    , Element(..)
+    , Attribute
+
     , BlockElement(..)
     , InlineElement(..)
 
-    , ListElement(..)
+    , Definition(..)
+
     , ListType(..)
     , ListItem
 
-    , Definition(..)
-
     , CommandType(..)
-    , Attribute
     , BlockCommand(..)
     , InlineCommand(..)
     )
     where
-
-import           Rakka.Page
-
+import Data.CaseInsensitive (CI)
+import Data.Text (Text)
+import Network.URI
+import Rakka.Page
 
 type WikiPage = [BlockElement]
 
+data Element
+    = Block  !BlockElement
+    | Inline !InlineElement
+    deriving (Eq, Show)
+
+type Attribute = (CI Text, Text)
 
 data BlockElement
     = Heading {
-        headingLevel :: !Int
-      , headingText  :: !String
+        headingLevel ∷ !Int
+      , headingText  ∷ !Text
       }
     | HorizontalLine
-    | List !ListElement
+    | List {
+        listType  ∷ !ListType
+      , listItems ∷ ![ListItem]
+      }
     | DefinitionList ![Definition]
-    | Preformatted ![InlineElement]
-    | Paragraph ![InlineElement]
-    | Div ![Attribute] ![BlockElement]
-    | BlockCmd !BlockCommand
+    | Preformatted   ![InlineElement]
+    | Paragraph      ![InlineElement]
+    | Div            ![Attribute] ![Element]
+    | EmptyBlock
+    | BlockCmd       !BlockCommand
     deriving (Eq, Show)
 
-
 data InlineElement
-    = Text !String
+    = Text   !Text
     | Italic ![InlineElement]
-    | Bold ![InlineElement]
+    | Bold   ![InlineElement]
+    | ObjectLink {
+        objLinkPage ∷ !PageName
+      , objLinkText ∷ !(Maybe Text)
+      }
     | PageLink {
-        linkPage     :: !(Maybe PageName)
-      , linkFragment :: !(Maybe String)
-      , linkText     :: !(Maybe String)
+        linkPage     ∷ !(Maybe PageName)
+      , linkFragment ∷ !(Maybe Text)
+      , linkText     ∷ !(Maybe Text)
+      }
+    | ExternalLink {
+        extLinkURI  ∷ !URI
+      , extLinkText ∷ !(Maybe Text)
       }
     | LineBreak ![Attribute]
-    | Span ![Attribute] ![InlineElement]
-    | InlineCmd !InlineCommand
-    deriving (Eq, Show)
-
-
-data ListElement
-    = ListElement {
-        listType  :: !ListType
-      , listItems :: ![ListItem]
+    | Span      ![Attribute] ![InlineElement]
+    | Image {
+        imgSource ∷ !(Either URI PageName)
+      , imgAlt    ∷ !(Maybe Text)
       }
+    | Anchor    ![Attribute] ![InlineElement]
+    | Input     ![Attribute]
+    | EmptyInline
+    | InlineCmd !InlineCommand
     deriving (Eq, Show)
 
-
 data ListType
     = Bullet
     | Numbered
     deriving (Eq, Show)
 
-
-type ListItem = [Either ListElement InlineElement]
-
+type ListItem = [Element]
 
 data Definition
     = Definition {
-        defTerm :: ![InlineElement]
-      , defDesc :: ![InlineElement]
+        defTerm ∷ ![InlineElement]
+      , defDesc ∷ ![InlineElement]
       }
     deriving (Eq, Show)
 
-
 data CommandType
     = InlineCommandType
     | BlockCommandType
-
-
-type Attribute = (String, String)
-
+    deriving (Eq, Show)
 
 data BlockCommand
     = BlockCommand {
-        bCmdName       :: !String
-      , bCmdAttributes :: ![Attribute]
-      , bCmdContents   :: ![BlockElement]
+        bCmdName       ∷ !Text
+      , bCmdAttributes ∷ ![Attribute]
+      , bCmdContents   ∷ ![BlockElement]
       }
     deriving (Eq, Show)
 
-
 data InlineCommand
     = InlineCommand {
-        iCmdName       :: !String
+        iCmdName       :: !Text
       , iCmdAttributes :: ![Attribute]
       , iCmdContents   :: ![InlineElement]
       }