X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Rakka%2FWiki.hs;h=a519d34a227da9b8a40ec6db7b66108907185fc2;hb=01a4a132192ed8b65c8aa7b86cb0e9bc08b725ff;hp=719ed62cc646699ebb4069a2bc1c6b51506b3de0;hpb=e43bb104a7313dd696b8bb8aa3bafff94706a187;p=Rakka.git

diff --git a/Rakka/Wiki.hs b/Rakka/Wiki.hs
index 719ed62..a519d34 100644
--- a/Rakka/Wiki.hs
+++ b/Rakka/Wiki.hs
@@ -18,7 +18,6 @@ module Rakka.Wiki
     )
     where
 
-import           Data.Generics
 import           Network.URI
 import           Rakka.Page
 
@@ -29,7 +28,7 @@ type WikiPage = [BlockElement]
 data Element
     = Block  !BlockElement
     | Inline !InlineElement
-    deriving (Eq, Show, Typeable, Data)
+    deriving (Eq, Show)
 
 
 type Attribute = (String, String)
@@ -51,7 +50,7 @@ data BlockElement
     | Div ![Attribute] ![Element]
     | EmptyBlock
     | BlockCmd !BlockCommand
-    deriving (Eq, Show, Typeable, Data)
+    deriving (Eq, Show)
 
 
 data InlineElement
@@ -74,19 +73,20 @@ data InlineElement
     | LineBreak ![Attribute]
     | Span ![Attribute] ![InlineElement]
     | Image {
-        imgSource :: !PageName
+        imgSource :: !(Either URI PageName)
       , imgAlt    :: !(Maybe String)
       }
     | Anchor ![Attribute] ![InlineElement]
+    | Input ![Attribute]
     | EmptyInline
     | InlineCmd !InlineCommand
-    deriving (Eq, Show, Typeable, Data)
+    deriving (Eq, Show)
 
 
 data ListType
     = Bullet
     | Numbered
-    deriving (Eq, Show, Typeable, Data)
+    deriving (Eq, Show)
 
 
 type ListItem = [Element]
@@ -97,7 +97,7 @@ data Definition
         defTerm :: ![InlineElement]
       , defDesc :: ![InlineElement]
       }
-    deriving (Eq, Show, Typeable, Data)
+    deriving (Eq, Show)
 
 
 data CommandType
@@ -112,7 +112,7 @@ data BlockCommand
       , bCmdAttributes :: ![Attribute]
       , bCmdContents   :: ![BlockElement]
       }
-    deriving (Eq, Show, Typeable, Data)
+    deriving (Eq, Show)
 
 
 data InlineCommand
@@ -121,4 +121,4 @@ data InlineCommand
       , iCmdAttributes :: ![Attribute]
       , iCmdContents   :: ![InlineElement]
       }
-    deriving (Eq, Show, Typeable, Data)
+    deriving (Eq, Show)