= InlineCommandInterpreter {
iciName = "img"
, iciInterpret
- = \ ctx (InlineCommand _ attrs inside) ->
+ = \ ctx (InlineCommand _ attrs _) ->
do BaseURI baseURI <- getSysConf (ctxSysConf ctx)
- let pageName = lookup "src" attrs
- when (pageName == Nothing)
- $ fail "\"src\" attribute is missing"
-
- let hrefAttr = ("href", uriToString id (mkPageURI baseURI (fromJust pageName)) "")
- srcAttr = ("src" , uriToString id (mkObjectURI baseURI (fromJust pageName)) "")
- altAttr = do alt <- lookup "alt" attrs
- return ("alt", alt)
+ let name = case lookup "src" attrs of
+ Just x -> x
+ Nothing -> error "\"src\" attribute is missing"
+ hrefAttr = ("href", 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")
Just others -> error ("unknown \"float\" attribute: " ++ others)
anchorAttrs = [hrefAttr, classAttr]
- imgAttrs = catMaybes [Just srcAttr, altAttr]
- return (Anchor anchorAttrs [Image imgAttrs])
+ return (Anchor anchorAttrs [Image (Right name) alt])
}
-- <div class="imageFrame ...">
-- <div class="imageData">
--- <p>
--- <a href="...">
--- <img src="..." />
--- </a>
--- </p>
+-- <a href="...">
+-- <img src="..." />
+-- </a>
-- </div>
-- <div class="imageCaption">
-- ...
= \ ctx (BlockCommand _ attrs inside) ->
do BaseURI baseURI <- getSysConf (ctxSysConf ctx)
- let pageName = lookup "src" attrs
- when (pageName == Nothing)
- $ fail "\"src\" attribute is missing"
-
- let hrefAttr = ("href", uriToString id (mkPageURI baseURI (fromJust pageName)) "")
- srcAttr = ("src" , uriToString id (mkObjectURI baseURI (fromJust pageName)) "")
+ let name = case lookup "src" attrs of
+ Just x -> x
+ Nothing -> error "\"src\" attribute is missing"
+ hrefAttr = ("href", uriToString id (mkPageURI baseURI name) "")
classAttr = case lookup "float" attrs of
Nothing -> ("class", "imageFrame")
Just "left" -> ("class", "imageFrame leftFloat")
Just others -> error ("unknown \"float\" attribute: " ++ others)
return (Div [classAttr]
- [ Div [("class", "imageData")]
- [ Paragraph [ Anchor [hrefAttr]
- [ Image [srcAttr] ] ]
- ]
- , Div [("class", "imageCaption")] inside
+ [ Block (Div [("class", "imageData")]
+ [ Inline (Anchor [hrefAttr]
+ [ Image (Right name) Nothing ]) ])
+ , Block (Div [("class", "imageCaption")]
+ [ Block x | x <- inside ])
]
)
}