@@ -1,4 +1,4 @@
1−{-# LANGUAGE OverloadedStrings, CPP #-}
1+{-# LANGUAGE OverloadedStrings, CPP, ViewPatterns #-}
2{-# OPTIONS_GHC -fno-warn-deprecations #-}
2{-# OPTIONS_GHC -fno-warn-deprecations #-}
4Copyright (C) 2006-2014 John MacFarlane <jgm@berkeley.edu>
4Copyright (C) 2006-2014 John MacFarlane <jgm@berkeley.edu>
@@ -348,10 +348,10 @@ parseMailto s = do
348 _ -> fail "not a mailto: URL"
348 _ -> fail "not a mailto: URL"
350-- | Obfuscate a "mailto:" link.
350-- | Obfuscate a "mailto:" link.
351−obfuscateLink :: WriterOptions -> String -> String -> Html
351+obfuscateLink :: WriterOptions -> Html -> String -> Html
352obfuscateLink opts txt s | writerEmailObfuscation opts == NoObfuscation =
352obfuscateLink opts txt s | writerEmailObfuscation opts == NoObfuscation =
353− H.a ! A.href (toValue s) $ toHtml txt
353+ H.a ! A.href (toValue s) $ txt
354−obfuscateLink opts txt s =
354+obfuscateLink opts (renderHtml -> txt) s =
355 let meth = writerEmailObfuscation opts
355 let meth = writerEmailObfuscation opts
356 s' = map toLower (take 7 s) ++ drop 7 s
356 s' = map toLower (take 7 s) ++ drop 7 s
357 in case parseMailto s' of
357 in case parseMailto s' of
@@ -753,7 +753,7 @@ inlineToHtml opts inline =
753 | otherwise -> return mempty
753 | otherwise -> return mempty
754 (Link txt (s,_)) | "mailto:" `isPrefixOf` s -> do
754 (Link txt (s,_)) | "mailto:" `isPrefixOf` s -> do
755 linkText <- inlineListToHtml opts txt
755 linkText <- inlineListToHtml opts txt
756− return $ obfuscateLink opts (renderHtml linkText) s
756+ return $ obfuscateLink opts linkText s
757 (Link txt (s,tit)) -> do
757 (Link txt (s,tit)) -> do
758 linkText <- inlineListToHtml opts txt
758 linkText <- inlineListToHtml opts txt
759 let s' = case s of
759 let s' = case s of