@@ -87,14 +87,15 @@ blockToDokuWiki opts (Plain inlines) =
8787 inlineListToDokuWiki opts inlines
8888
8989-- title beginning with fig: indicates that the image is a figure
90+-- dokuwiki doesn't support captions - so combine together alt and caption into alt
9091blockToDokuWiki opts (Para [Image txt (src,'f':'i':'g':':':tit)]) = do
9192 capt <- if null txt
9293 then return ""
93− else ("|caption " ++) `fmap` inlineListToDokuWiki opts txt
94+ else (" " ++) `fmap` inlineListToDokuWiki opts txt
9495 let opt = if null txt
9596 then ""
96− else "|alt=" ++ if null tit then capt else tit ++ capt
97− return $ "[[Image:" ++ src ++ "|frame|none" ++ opt ++ "]]\n"
97+ else "|" ++ if null tit then capt else tit ++ capt
98+ return $ "{{:" ++ src ++ opt ++ "}}\n"
9899
99100blockToDokuWiki opts (Para inlines) = do
100101 useTags <- get >>= return . stUseTags
@@ -398,7 +399,7 @@ inlineToDokuWiki opts (Image alt (source, tit)) = do
398399 then ""
399400 else "|" ++ alt'
400401 else "|" ++ tit
401− return $ "[[Image:" ++ source ++ txt ++ "]]"
402+ return $ "{{:" ++ source ++ txt ++ "}}"
402403
403404inlineToDokuWiki opts (Note contents) = do
404405 contents' <- blockListToDokuWiki opts contents