diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2013-01-15 12:44:50 -0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2013-01-15 12:44:50 -0800 |
| commit | bf3a911a1c3421424ba4d5a0ac3a7f8e494d715a (patch) | |
| tree | 347cd8a1af94ce116c7fe4d215dedfe2923ad9be /src/Text/Pandoc/Parsing.hs | |
| parent | e9b3d5aa7a3095a5ad7a4d5ec3e5bb958a97fa50 (diff) | |
| download | pandoc-bf3a911a1c3421424ba4d5a0ac3a7f8e494d715a.tar.gz | |
Changed Ext_autolink_urls -> Ext_autolink_bare_uris.
Added tests.
Diffstat (limited to 'src/Text/Pandoc/Parsing.hs')
| -rw-r--r-- | src/Text/Pandoc/Parsing.hs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/Text/Pandoc/Parsing.hs b/src/Text/Pandoc/Parsing.hs index 1bc0e689a..26e8c2325 100644 --- a/src/Text/Pandoc/Parsing.hs +++ b/src/Text/Pandoc/Parsing.hs @@ -212,7 +212,7 @@ notFollowedBy' p = try $ join $ do a <- try p -- (This version due to Andrew Pimlott on the Haskell mailing list.) oneOfStrings' :: (Char -> Char -> Bool) -> [String] -> Parser [Char] st String -oneOfStrings' matches [] = fail "no strings" +oneOfStrings' _ [] = fail "no strings" oneOfStrings' matches strs = try $ do c <- anyChar let strs' = [xs | (x:xs) <- strs, x `matches` c] @@ -392,10 +392,13 @@ schemes = ["coap","doi","javascript","aaa","aaas","about","acap","cap","cid", "ventrilo","view-source","webcal","wtai","wyciwyg","xfire","xri", "ymsgr"] +uriScheme :: Parser [Char] st String +uriScheme = oneOfStringsCI schemes + -- | Parses a URI. Returns pair of original and URI-escaped version. uri :: Parser [Char] st (String, String) uri = try $ do - scheme <- oneOfStringsCI schemes + scheme <- uriScheme char ':' -- /^[\/\w\u0080-\uffff]+|%[A-Fa-f0-9]+|&#?\w+;|(?:[,]+|[\S])[%&~\w\u0080-\uffff]/ -- We allow punctuation except at the end, since |