diff options
| author | Albert Krewinkel <tarleb@moltkeplatz.de> | 2014-05-09 18:23:23 +0200 |
|---|---|---|
| committer | Albert Krewinkel <tarleb@moltkeplatz.de> | 2014-05-09 18:23:23 +0200 |
| commit | 07694b30184bcf2ed0e2998016df394f47a1996f (patch) | |
| tree | b24e06d60092d73e1ba45851e16c732d5b0c105d /src | |
| parent | 757c4f68f3f3cab99db9499936e3ae4775ebbddf (diff) | |
| download | pandoc-07694b30184bcf2ed0e2998016df394f47a1996f.tar.gz | |
Org reader: Fix parsing of blank lines within blocks
Blank lines were parsed as two newlines instead of just one.
Thanks to Xiao Hanyu (@xiaohanyu) for pointing this out.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Text/Pandoc/Readers/Org.hs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/Text/Pandoc/Readers/Org.hs b/src/Text/Pandoc/Readers/Org.hs index c05ac92d0..0f218d43f 100644 --- a/src/Text/Pandoc/Readers/Org.hs +++ b/src/Text/Pandoc/Readers/Org.hs @@ -357,12 +357,8 @@ rawBlockContent :: BlockProperties -> OrgParser String rawBlockContent (indent, blockType) = try $ unlines . map commaEscaped <$> manyTill indentedLine blockEnder where - indentedLine = try $ - choice [ blankline *> pure "\n" - , indentWith indent *> anyLine - ] - blockEnder = try $ - indentWith indent *> stringAnyCase ("#+end_" <> blockType) + indentedLine = try $ ("" <$ blankline) <|> (indentWith indent *> anyLine) + blockEnder = try $ indentWith indent *> stringAnyCase ("#+end_" <> blockType) parsedBlockContent :: BlockProperties -> OrgParser (F Blocks) parsedBlockContent blkProps = try $ do |