diff options
| author | mpickering <matthewtpickering@gmail.com> | 2014-09-25 18:46:36 +0100 |
|---|---|---|
| committer | mpickering <matthewtpickering@gmail.com> | 2014-09-25 18:46:36 +0100 |
| commit | 1f0ba8ec11763d6f6335e0355402c5f4570850e8 (patch) | |
| tree | dc87f70cad5a3b58c8616d1eb9d1120ce05e3224 | |
| parent | 85cff719f667b25131a3e150a5f438fd5be72475 (diff) | |
| download | pandoc-1f0ba8ec11763d6f6335e0355402c5f4570850e8.tar.gz | |
HTML Writer: Don't double render when email-obfuscation=none
Closes #1625
| -rw-r--r-- | src/Text/Pandoc/Writers/HTML.hs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Text/Pandoc/Writers/HTML.hs b/src/Text/Pandoc/Writers/HTML.hs index 652fc979f..1a00c7660 100644 --- a/src/Text/Pandoc/Writers/HTML.hs +++ b/src/Text/Pandoc/Writers/HTML.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE OverloadedStrings, CPP #-} +{-# LANGUAGE OverloadedStrings, CPP, ViewPatterns #-} {-# OPTIONS_GHC -fno-warn-deprecations #-} {- Copyright (C) 2006-2014 John MacFarlane <jgm@berkeley.edu> @@ -348,10 +348,10 @@ parseMailto s = do _ -> fail "not a mailto: URL" -- | Obfuscate a "mailto:" link. -obfuscateLink :: WriterOptions -> String -> String -> Html +obfuscateLink :: WriterOptions -> Html -> String -> Html obfuscateLink opts txt s | writerEmailObfuscation opts == NoObfuscation = - H.a ! A.href (toValue s) $ toHtml txt -obfuscateLink opts txt s = + H.a ! A.href (toValue s) $ txt +obfuscateLink opts (renderHtml -> txt) s = let meth = writerEmailObfuscation opts s' = map toLower (take 7 s) ++ drop 7 s in case parseMailto s' of @@ -753,7 +753,7 @@ inlineToHtml opts inline = | otherwise -> return mempty (Link txt (s,_)) | "mailto:" `isPrefixOf` s -> do linkText <- inlineListToHtml opts txt - return $ obfuscateLink opts (renderHtml linkText) s + return $ obfuscateLink opts linkText s (Link txt (s,tit)) -> do linkText <- inlineListToHtml opts txt let s' = case s of |