X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Rakka%2FWiki%2FInterpreter%2FImage.hs;h=80cd6c318730a794f2f5403f307e78449884ca6c;hb=d72f26d01168e88e6afa1d00bcda8a0f81e9a91d;hp=9b6ff747f63b1f4d0d8886a3a5d3f9abc6b7455f;hpb=7a4f13a3d483c950743e1ced001ade4406d239d3;p=Rakka.git
diff --git a/Rakka/Wiki/Interpreter/Image.hs b/Rakka/Wiki/Interpreter/Image.hs
index 9b6ff74..80cd6c3 100644
--- a/Rakka/Wiki/Interpreter/Image.hs
+++ b/Rakka/Wiki/Interpreter/Image.hs
@@ -18,6 +18,12 @@ interpreters = [ imageInterp
]
+-- -- 空æååã®å ´åã¯ãªã³ã¯ç¡ã
+
--
--
--
@@ -32,16 +38,24 @@ imageInterp
let name = case lookup "src" attrs of
Just x -> x
Nothing -> error "\"src\" attribute is missing"
- hrefAttr = ("href", uriToString id (mkPageURI baseURI name) "")
+ link = case lookup "link" attrs of
+ Just "" -> Nothing
+ Just x -> if isURI x then
+ Just x
+ else
+ Just (uriToString id (mkPageURI baseURI x) "")
+ Nothing -> Just (uriToString id (mkPageURI baseURI name) "")
alt = lookup "alt" attrs
classAttr = case lookup "float" attrs of
- Nothing -> ("class", "inlineImage")
- Just "left" -> ("class", "inlineImage leftFloat")
- Just "right" -> ("class", "inlineImage rightFloat")
+ Nothing -> "inlineImage"
+ Just "left" -> "inlineImage leftFloat"
+ Just "right" -> "inlineImage rightFloat"
Just others -> error ("unknown \"float\" attribute: " ++ others)
- anchorAttrs = [hrefAttr, classAttr]
-
- return (Anchor anchorAttrs [Image (Right name) alt])
+ result = case link of
+ Nothing -> Span [("class", classAttr)] [Image (Right name) alt]
+ Just x -> Anchor [ ("class", classAttr)
+ , ("href" , x ) ] [Image (Right name) alt]
+ return result
}
@@ -66,17 +80,25 @@ imgFrameInterp
let name = case lookup "src" attrs of
Just x -> x
Nothing -> error "\"src\" attribute is missing"
- hrefAttr = ("href", uriToString id (mkPageURI baseURI name) "")
+ link = case lookup "link" attrs of
+ Just "" -> Nothing
+ Just x -> if isURI x then
+ Just x
+ else
+ Just (uriToString id (mkPageURI baseURI x) "")
+ Nothing -> Just (uriToString id (mkPageURI baseURI name) "")
classAttr = case lookup "float" attrs of
Nothing -> ("class", "imageFrame")
Just "left" -> ("class", "imageFrame leftFloat")
Just "right" -> ("class", "imageFrame rightFloat")
Just others -> error ("unknown \"float\" attribute: " ++ others)
+ image = case link of
+ Nothing -> Image (Right name) Nothing
+ Just x -> Anchor [("href" , x)] [Image (Right name) Nothing]
return (Div [classAttr]
[ Block (Div [("class", "imageData")]
- [ Inline (Anchor [hrefAttr]
- [ Image (Right name) Nothing ]) ])
+ [ Inline image ])
, Block (Div [("class", "imageCaption")]
[ Block x | x <- inside ])
]