c24ab14 · typeable/pandoc

git.iko.soy/typeable/pandoc

LaTeX writer: Use \nolinkurl in email autolinks.

This allows them to be styled using `\urlstyle{tt}`. Thanks to Ulrike Fischer for the solution.

commitc24ab1491808d8be98ab30ba6b3993fa075ca376 authorJohn MacFarlane <jgm@berkeley.edu> dateTue 15 Jul 2014, 16:42 (12 years ago) parent73b0630

2 files changed+11−3

unifiedsplit

src/Text/Pandoc/Writers/LaTeX.hs+9−2

@@ -757,10 +757,17 @@ inlineToLaTeX (Link txt ('#':ident, _)) = do

757757 return $ text "\\hyperref" <> brackets (text lab) <> braces contents

758758inlineToLaTeX (Link txt (src, _)) =

759759 case txt of

760− [Str x] | x == src -> -- autolink

760+ [Str x] | escapeURI x == src -> -- autolink

761761 do modify $ \s -> s{ stUrl = True }

762− src' <- stringToLaTeX URLString x

762+ src' <- stringToLaTeX URLString src

763763 return $ text $ "\\url{" ++ src' ++ "}"

764+ [Str x] | "mailto:" `isPrefixOf` src &&

765+ escapeURI x == drop 7 src -> -- email autolink

766+ do modify $ \s -> s{ stUrl = True }

767+ src' <- stringToLaTeX URLString src

768+ contents <- inlineListToLaTeX txt

769+ return $ "\\href" <> braces (text src') <>

770+ braces ("\\nolinkurl" <> braces contents)

764771 _ -> do contents <- inlineListToLaTeX txt

765772 src' <- stringToLaTeX URLString src

766773 return $ text ("\\href{" ++ src' ++ "}{") <>

tests/writer.latex+2−1

@@ -888,7 +888,8 @@ With an ampersand: \url{http://example.com/?foo=1\&bar=2}

888888 It should.

889889\end{itemize}

890890

891−An e-mail address: \href{mailto:nobody@nowhere.net}{nobody@nowhere.net}

891+An e-mail address:

892+\href{mailto:nobody@nowhere.net}{\nolinkurl{nobody@nowhere.net}}

892893

893894\begin{quote}

894895Blockquoted: \url{http://example.com/}