diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2012-09-16 10:19:42 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2012-09-16 10:19:42 -0700 |
| commit | 9f89269941cc8b15612aaddd6ba44e9dac5293c1 (patch) | |
| tree | 14ec2adf2fc04de9c511f475c4705fd1fda4d575 | |
| parent | fc31bf27f575a0ac04c155539a095eb07fc996cc (diff) | |
| parent | b981540f2eee0a43acca7e446e24f76148d528b7 (diff) | |
| download | pandoc-9f89269941cc8b15612aaddd6ba44e9dac5293c1.tar.gz | |
Merge pull request #596 from dlax/rst-fieldlists
improvements to rst reader for field lists
| -rw-r--r-- | src/Text/Pandoc/Readers/RST.hs | 4 | ||||
| -rw-r--r-- | tests/rst-reader.rst | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/Text/Pandoc/Readers/RST.hs b/src/Text/Pandoc/Readers/RST.hs index bd5de161c..74653efcf 100644 --- a/src/Text/Pandoc/Readers/RST.hs +++ b/src/Text/Pandoc/Readers/RST.hs @@ -151,8 +151,8 @@ rawFieldListItem :: String -> Parser [Char] ParserState (String, String) rawFieldListItem indent = try $ do string indent char ':' - name <- many1 $ alphaNum <|> spaceChar - string ": " + name <- many1 $ noneOf ":" + char ':' skipSpaces first <- manyTill anyChar newline rest <- option "" $ try $ do lookAhead (string indent >> spaceChar) diff --git a/tests/rst-reader.rst b/tests/rst-reader.rst index 4d81ccb85..e8dee7e3f 100644 --- a/tests/rst-reader.rst +++ b/tests/rst-reader.rst @@ -279,7 +279,8 @@ Field Lists :address: 61 Main St. :city: *Nowhere*, MA, USA -:phone: 123-4567 +:phone: + 123-4567 HTML Blocks =========== |