diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2015-09-20 13:02:47 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2015-09-20 13:02:47 -0700 |
| commit | 9b033672e4302501f11af21dc297a39a9d5960fc (patch) | |
| tree | df771caec195f8bcbbb4a16a5dbf54c713557a5c | |
| parent | 54526665c39fe389ffaa202211e481fa9b692e76 (diff) | |
| parent | 8007dd97b5d403f54c218a178573a818ab80c667 (diff) | |
| download | pandoc-9b033672e4302501f11af21dc297a39a9d5960fc.tar.gz | |
Merge pull request #2406 from tarleb/org-verse-fix
Make sure verse blocks can contain empty lines
| -rw-r--r-- | src/Text/Pandoc/Readers/Org.hs | 2 | ||||
| -rw-r--r-- | tests/Tests/Readers/Org.hs | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/Text/Pandoc/Readers/Org.hs b/src/Text/Pandoc/Readers/Org.hs index 55ac92bcb..388a8f880 100644 --- a/src/Text/Pandoc/Readers/Org.hs +++ b/src/Text/Pandoc/Readers/Org.hs @@ -409,7 +409,7 @@ verseBlock blkProp = try $ do ignHeaders content <- rawBlockContent blkProp fmap B.para . mconcat . intersperse (pure B.linebreak) - <$> mapM (parseFromString parseInlines) (lines content) + <$> mapM (parseFromString parseInlines) (map (++ "\n") . lines $ content) exportsCode :: [(String, String)] -> Bool exportsCode attrs = not (("rundoc-exports", "none") `elem` attrs diff --git a/tests/Tests/Readers/Org.hs b/tests/Tests/Readers/Org.hs index 5eed2c9f4..52aaea52e 100644 --- a/tests/Tests/Readers/Org.hs +++ b/tests/Tests/Readers/Org.hs @@ -1143,6 +1143,15 @@ tests = ] ] + , "Verse block with newlines" =: + unlines [ "#+BEGIN_VERSE" + , "foo" + , "" + , "bar" + , "#+END_VERSE" + ] =?> + para ("foo" <> linebreak <> linebreak <> "bar") + , "LaTeX fragment" =: unlines [ "\\begin{equation}" , "X_i = \\begin{cases}" |