X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=Rakka.git;a=blobdiff_plain;f=Rakka%2FWiki%2FInterpreter%2FImage.hs;h=5482d8cffa5eb73cfde7852dea8bf8ce01fc8d57;hp=12ea6d662de735ee33a5b1203599b8dd6feb2c40;hb=e43bb104a7313dd696b8bb8aa3bafff94706a187;hpb=126e9f3faff19add1fb3dea792ec10dc57c30f03

diff --git a/Rakka/Wiki/Interpreter/Image.hs b/Rakka/Wiki/Interpreter/Image.hs
index 12ea6d6..5482d8c 100644
--- a/Rakka/Wiki/Interpreter/Image.hs
+++ b/Rakka/Wiki/Interpreter/Image.hs
@@ -47,11 +47,9 @@ imageInterp
 
 -- <div class="imageFrame ...">
 --   <div class="imageData">
---     <p>
---       <a href="...">
---         <img src="..." />
---       </a>
---     </p>
+--     <a href="...">
+--       <img src="..." />
+--     </a>
 --   </div>
 --   <div class="imageCaption">
 --     ...
@@ -76,11 +74,11 @@ imgFrameInterp
                                    Just others  -> error ("unknown \"float\" attribute: " ++ others)
                
                return (Div [classAttr]
-                       [ Div [("class", "imageData")]
-                         [ Paragraph [ Anchor [hrefAttr]
-                                                  [ Image pageName Nothing ] ]
-                         ]
-                       , Div [("class", "imageCaption")] inside
+                       [ Block (Div [("class", "imageData")]
+                                        [ Inline (Anchor [hrefAttr]
+                                                  [ Image pageName Nothing ]) ])
+                       , Block (Div [("class", "imageCaption")]
+                                        [ Block x | x <- inside ])
                        ]
                       )
       }