git.iko.soy/typeable/pandoc
on master help sign in
Markdown reader: Use + rather than %20 for spaces in URLs.

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

commit93d202cbd1d90949e3e744bf4b81ced7be2842b6 authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> dateSun 29 Nov 2009, 19:31 (17 years ago) parentc860fb9
2 files changed+4−4
compare with master
unifiedsplit
src/Text/Pandoc/Readers/Markdown.hs+2−2 tests/markdown-reader-more.native+2−2
src/Text/Pandoc/Readers/Markdown.hs+2−2
@@ -198,7 +198,7 @@ referenceKey = try $ do
198198 tit <- option "" referenceTitle
199199 blanklines
200200 endPos <- getPosition
201− let newkey = (lab, (intercalate "%20" $ words $ removeTrailingSpace src, tit))
201+ let newkey = (lab, (intercalate "+" $ words $ removeTrailingSpace src, tit))
202202 st <- getState
203203 let oldkeys = stateKeys st
204204 updateState $ \s -> s { stateKeys = newkey : oldkeys }
@@ -1109,7 +1109,7 @@ source' = do
11091109 tit <- option "" linkTitle
11101110 skipSpaces
11111111 eof
1112− return (intercalate "%20" $ words $ removeTrailingSpace src, tit)
1112+ return (intercalate "+" $ words $ removeTrailingSpace src, tit)
11131113
11141114linkTitle :: GenParser Char st String
11151115linkTitle = try $ do
tests/markdown-reader-more.native+2−2
@@ -6,8 +6,8 @@ Pandoc (Meta [] [] "")
66, Para [TeX "\\placeformula",Space,TeX "\\startformula\n L_{1} = L_{2}\n \\stopformula"]
77, Para [TeX "\\start[a2]\n\\start[a2]\n\\stop[a2]\n\\stop[a2]"]
88, Header 2 [Str "URLs",Space,Str "with",Space,Str "spaces"]
9−, Para [Link [Str "foo"] ("/bar%20and%20baz",""),Space,Link [Str "foo"] ("/bar%20and%20baz",""),Space,Link [Str "foo"] ("/bar%20and%20baz",""),Space,Link [Str "foo"] ("bar%20baz","title")]
10−, Para [Link [Str "baz"] ("/foo%20foo",""),Space,Link [Str "bam"] ("/foo%20fee",""),Space,Link [Str "bork"] ("/foo/zee%20zob","title")]
9+, Para [Link [Str "foo"] ("/bar+and+baz",""),Space,Link [Str "foo"] ("/bar+and+baz",""),Space,Link [Str "foo"] ("/bar+and+baz",""),Space,Link [Str "foo"] ("bar+baz","title")]
10+, Para [Link [Str "baz"] ("/foo+foo",""),Space,Link [Str "bam"] ("/foo+fee",""),Space,Link [Str "bork"] ("/foo/zee+zob","title")]
1111, Header 2 [Str "Horizontal",Space,Str "rules",Space,Str "with",Space,Str "spaces",Space,Str "at",Space,Str "end"]
1212, HorizontalRule
1313, HorizontalRule