From 957c0e110dd54cf7adaca6c9d7eb0b01c8b0210c Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sat, 20 Jan 2018 11:08:08 -0800
Subject: [PATCH] RST reader: fix parsing of headers with trailing space.
This was a regression in pandoc 2.0.
Closes #4280.
---
src/Text/Pandoc/Readers/RST.hs | 2 +-
test/command/4280.md | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
create mode 100644 test/command/4280.md
diff --git a/src/Text/Pandoc/Readers/RST.hs b/src/Text/Pandoc/Readers/RST.hs
index 0e90fe945..e88d997f0 100644
--- a/src/Text/Pandoc/Readers/RST.hs
+++ b/src/Text/Pandoc/Readers/RST.hs
@@ -352,7 +352,7 @@ singleHeader' :: PandocMonad m => RSTParser m (Inlines, Char)
singleHeader' = try $ do
notFollowedBy' whitespace
lookAhead $ anyLine >> oneOf underlineChars
- txt <- trimInlines . mconcat <$> many1 (do {notFollowedBy newline; inline})
+ txt <- trimInlines . mconcat <$> many1 (notFollowedBy blankline >> inline)
pos <- getPosition
let len = sourceColumn pos - 1
blankline
diff --git a/test/command/4280.md b/test/command/4280.md
new file mode 100644
index 000000000..6a89b5e63
--- /dev/null
+++ b/test/command/4280.md
@@ -0,0 +1,7 @@
+```
+% pandoc -f rst -t native
+Driver
+------
+^D
+[Header 1 ("driver",[],[]) [Str "Driver"]]
+```