diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2021-03-09 13:03:27 -0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2021-03-09 13:03:27 -0800 |
| commit | 1c23e3a824bc4d850a908193443ad1915a3ebc61 (patch) | |
| tree | 4119ba4c9713c25b1792520c8cf97ea56c2b9f82 | |
| parent | a8b2031bb43aaca9b4c5643d8d118166f93041c3 (diff) | |
| download | pandoc-1c23e3a824bc4d850a908193443ad1915a3ebc61.tar.gz | |
RST reader: fix logic for ending comments.
Previously comments sometimes got extended too far. Closes #7134.
| -rw-r--r-- | src/Text/Pandoc/Readers/RST.hs | 3 | ||||
| -rw-r--r-- | test/command/7134.md | 16 |
2 files changed, 18 insertions, 1 deletions
diff --git a/src/Text/Pandoc/Readers/RST.hs b/src/Text/Pandoc/Readers/RST.hs index 29f81b046..514e3b88d 100644 --- a/src/Text/Pandoc/Readers/RST.hs +++ b/src/Text/Pandoc/Readers/RST.hs @@ -613,8 +613,9 @@ comment = try $ do string ".." skipMany1 spaceChar <|> (() <$ lookAhead newline) -- notFollowedBy' directiveLabel -- comment comes after directive so unnec. - manyTill anyChar blanklines + _ <- anyLine optional indentedBlock + optional blanklines return mempty directiveLabel :: Monad m => RSTParser m Text diff --git a/test/command/7134.md b/test/command/7134.md new file mode 100644 index 000000000..c69ae4bd0 --- /dev/null +++ b/test/command/7134.md @@ -0,0 +1,16 @@ +``` +% pandoc -f rst -t native +This is a paragraph. + + This is a block quote. + +.. + + This should be a second block quote. +^D +[Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "paragraph."] +,BlockQuote + [Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "block",Space,Str "quote."]] +,BlockQuote + [Para [Str "This",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "second",Space,Str "block",Space,Str "quote."]]] +``` |