Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Markdown, RST writers: unescape URI in links, to make them readable.

Browse source 
(Since they aren't required to be escaped in these formats.)
This commit is contained in:
John MacFarlane 2010-03-23 15:35:19 -07:00
parent 8504055360
commit 14e7cb362a
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Text/Pandoc/Writers/Markdown.hs
View file

@ -400,9 +400,10 @@ inlineToMarkdown _ (HtmlInline str) = return $ text str
inlineToMarkdown _ (LineBreak) = return $ text " \n" inlineToMarkdown _ (LineBreak) = return $ text " \n"
inlineToMarkdown _ Space = return $ char ' ' inlineToMarkdown _ Space = return $ char ' '
inlineToMarkdown opts (Cite _ cits) = inlineListToMarkdown opts cits inlineToMarkdown opts (Cite _ cits) = inlineListToMarkdown opts cits
inlineToMarkdown opts (Link txt (src, tit)) = do inlineToMarkdown opts (Link txt (src', tit)) = do
linktext <- inlineListToMarkdown opts txt linktext <- inlineListToMarkdown opts txt
let linktitle = if null tit then empty else text $ " \"" ++ tit ++ "\"" let linktitle = if null tit then empty else text $ " \"" ++ tit ++ "\""
let src = unescapeURI src'
let srcSuffix = if isPrefixOf "mailto:" src then drop 7 src else src let srcSuffix = if isPrefixOf "mailto:" src then drop 7 src else src
let useRefLinks = writerReferenceLinks opts let useRefLinks = writerReferenceLinks opts
let useAuto = null tit && txt == [Code srcSuffix] let useAuto = null tit && txt == [Code srcSuffix]
@ -423,7 +424,7 @@ inlineToMarkdown opts (Image alternate (source, tit)) = do
(alternate == [Str source]) -- to prevent autolinks (alternate == [Str source]) -- to prevent autolinks
then [Str "image"] then [Str "image"]
else alternate else alternate
linkPart <- inlineToMarkdown opts (Link txt (source, tit)) linkPart <- inlineToMarkdown opts (Link txt (unescapeURI source, tit))
return $ char '!' <> linkPart return $ char '!' <> linkPart
inlineToMarkdown _ (Note contents) = do inlineToMarkdown _ (Note contents) = do
modify (\st -> st{ stNotes = contents : stNotes st }) modify (\st -> st{ stNotes = contents : stNotes st })

8
src/Text/Pandoc/Writers/RST.hs
View file

@ -305,8 +305,9 @@ inlineToRST Space = return $ char ' '
inlineToRST (Link [Code str] (src, _)) | src == str || inlineToRST (Link [Code str] (src, _)) | src == str ||
src == "mailto:" ++ str = do src == "mailto:" ++ str = do
let srcSuffix = if isPrefixOf "mailto:" src then drop 7 src else src let srcSuffix = if isPrefixOf "mailto:" src then drop 7 src else src
return $ text srcSuffix return $ text $ unescapeURI srcSuffix
inlineToRST (Link txt (src, tit)) = do inlineToRST (Link txt (src', tit)) = do
let src = unescapeURI src'
useReferenceLinks <- get >>= (return . writerReferenceLinks . stOptions) useReferenceLinks <- get >>= (return . writerReferenceLinks . stOptions)
linktext <- inlineListToRST $ normalizeSpaces txt linktext <- inlineListToRST $ normalizeSpaces txt
if useReferenceLinks if useReferenceLinks
@ -317,7 +318,8 @@ inlineToRST (Link txt (src, tit)) = do
modify $ \st -> st { stLinks = refs' } modify $ \st -> st { stLinks = refs' }
return $ char '`' <> linktext <> text "`_" return $ char '`' <> linktext <> text "`_"
else return $ char '`' <> linktext <> text " <" <> text src <> text ">`_" else return $ char '`' <> linktext <> text " <" <> text src <> text ">`_"
inlineToRST (Image alternate (source, tit)) = do inlineToRST (Image alternate (source', tit)) = do
let source = unescapeURI source'
pics <- get >>= (return . stImages) pics <- get >>= (return . stImages)
let labelsUsed = map fst pics let labelsUsed = map fst pics
let txt = if null alternate || alternate == [Str ""] || let txt = if null alternate || alternate == [Str ""] ||