9939b0f · typeable/pandoc

git.iko.soy/typeable/pandoc

Make URLs and emails in autolinks appear as Code.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@810 788f1e2b-df1e-0410-8736-df70ead52e1b

commit9939b0f07ed871d091585b4820b309d087b4cb65 authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> dateSat 28 Jul 2007, 02:12 (19 years ago) parentcf87eb8

4 files changed+11−11

compare with master

unifiedsplit

src/Text/Pandoc/Readers/Markdown.hs+2−2 src/Text/Pandoc/Writers/HTML.hs+7−7 src/Text/Pandoc/Writers/LaTeX.hs+1−1 src/Text/Pandoc/Writers/Markdown.hs+1−1

src/Text/Pandoc/Readers/Markdown.hs+2−2

@@ -972,7 +972,7 @@ autoLinkEmail = try $ do

972972 domain <- sepBy1 (many1 (noneOf "/:.@<> \t\n")) (char '.')

973973 let src = name ++ "@" ++ (joinWithSep "." domain)

974974 char '>'

975− return $ Link [Str src] (("mailto:" ++ src), "")

975+ return $ Link [Code src] (("mailto:" ++ src), "")

976976

977977-- a link <http://like.this.com>

978978autoLinkRegular = try $ do

@@ -980,7 +980,7 @@ autoLinkRegular = try $ do

980980 prot <- oneOfStrings ["http:", "ftp:", "mailto:"]

981981 rest <- many1Till (noneOf " \t\n<>") (char '>')

982982 let src = prot ++ rest

983− return $ Link [Str src] (src, "")

983+ return $ Link [Code src] (src, "")

984984

985985image = try (do

986986 char '!'

src/Text/Pandoc/Writers/HTML.hs+7−7

@@ -140,13 +140,13 @@ obfuscateLink opts text src =

140140 (Just [name, domain]) ->

141141 let domain' = substitute "." " dot " domain

142142 at' = obfuscateChar '@'

143− linkText = if src' == ("mailto:" ++ text')

144− then "e"

145− else "'" ++ text' ++ "'"

146− altText = if src' == ("mailto:" ++ text')

147− then name ++ " at " ++ domain'

148− else text' ++ " (" ++ name ++ " at " ++

149− domain' ++ ")" in

143+ (linkText, altText) =

144+ if "mailto:" `isPrefixOf` src' &&

145+ text' == ("<code>" ++ drop 7 src' ++ "</code>")

146+ then ("e", name ++ " at " ++ domain')

147+ else ("'" ++ text' ++ "'",

148+ text' ++ " (" ++ name ++ " at " ++

149+ domain' ++ ")") in

150150 if writerStrictMarkdown opts

151151 then -- need to use primHtml or &'s are escaped to & in URL

152152 primHtml $ "<a href=\"" ++ (obfuscateString src')

src/Text/Pandoc/Writers/LaTeX.hs+1−1

@@ -247,7 +247,7 @@ inlineToLaTeX (HtmlInline str) = return ""

247247inlineToLaTeX (LineBreak) = return "\\\\\n"

248248inlineToLaTeX Space = return " "

249249inlineToLaTeX (Link text (src, tit)) = do

250− contents <- inlineListToLaTeX (deVerb text)

250+ contents <- inlineListToLaTeX text

251251 addToHeader "\\usepackage[breaklinks=true]{hyperref}"

252252 return $ "\\href{" ++ src ++ "}{" ++ contents ++ "}"

253253inlineToLaTeX (Image alternate (source, tit)) = do

src/Text/Pandoc/Writers/Markdown.hs+1−1

@@ -318,7 +318,7 @@ inlineToMarkdown opts (Link txt (src, tit)) = do

318318 let linktitle = if null tit then empty else text $ " \"" ++ tit ++ "\""

319319 let srcSuffix = if isPrefixOf "mailto:" src then drop 7 src else src

320320 let useRefLinks = writerReferenceLinks opts

321− let useAuto = null tit && txt == [Str srcSuffix]

321+ let useAuto = null tit && txt == [Code srcSuffix]

322322 ref <- if useRefLinks then getReference txt (src, tit) else return []

323323 reftext <- inlineListToMarkdown opts ref

324324 return $ if useAuto