git.iko.soy/typeable/pandoc
on master help sign in
DokuWiki writer: More tweaks to email links. (#1398)
71da4f8John MacFarlane
src/Text/Pandoc/Writers/DokuWiki.hs+3−4
@@ -44,7 +44,7 @@ import Text.Pandoc.Options
44import Text.Pandoc.Shared
44import Text.Pandoc.Shared
45import Text.Pandoc.Writers.Shared
45import Text.Pandoc.Writers.Shared
46import Text.Pandoc.Templates (renderTemplate')
46import Text.Pandoc.Templates (renderTemplate')
47−import Data.List ( intersect, intercalate )
47+import Data.List ( intersect, intercalate, isPrefixOf )
48import Network.URI ( isURI )
48import Network.URI ( isURI )
49import Control.Monad.State
49import Control.Monad.State
50
50
@@ -418,9 +418,8 @@ inlineToDokuWiki _ Space = return " "
418inlineToDokuWiki opts (Link txt (src, _)) = do
418inlineToDokuWiki opts (Link txt (src, _)) = do
419 label <- inlineListToDokuWiki opts txt
419 label <- inlineListToDokuWiki opts txt
420 case txt of
420 case txt of
421− [Str s] | escapeURI s == src -> return src
422− | "mailto:" ++ escapeURI s == src -> return $
421+ [Str s] | "mailto:" `isPrefixOf` src -> return $ "<" ++ s ++ ">"
423− "<" ++ s ++ ">"
422+ | escapeURI s == src -> return src
424 _ -> if isURI src
423 _ -> if isURI src
425 then return $ "[[" ++ src ++ "|" ++ label ++ "]]"
424 then return $ "[[" ++ src ++ "|" ++ label ++ "]]"
426 else return $ "[[" ++ src' ++ "|" ++ label ++ "]]"
425 else return $ "[[" ++ src' ++ "|" ++ label ++ "]]"