diff options
author | John MacFarlane <jgm@berkeley.edu> | 2017-05-17 12:47:03 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-17 12:47:03 +0200 |
commit | 377733e08fdaea359e73b03952913cc32b537d9e (patch) | |
tree | 9a3494f15f1c31b1d6d1588838e0fb6e88691390 /src/Text/Pandoc/Readers/Org | |
parent | 602cd6a327ad41e68e47689d3842f349cf33444d (diff) | |
parent | 55ce47d050fd6e1a38db765c7632e1989d60854d (diff) |
Merge pull request #3677 from labdsf/anylinenewline
Move anyLineNewline to Parsing.hs
Diffstat (limited to 'src/Text/Pandoc/Readers/Org')
-rw-r--r-- | src/Text/Pandoc/Readers/Org/Blocks.hs | 4 | ||||
-rw-r--r-- | src/Text/Pandoc/Readers/Org/Parsing.hs | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/Text/Pandoc/Readers/Org/Blocks.hs b/src/Text/Pandoc/Readers/Org/Blocks.hs index 8c78e5157..f5823c7aa 100644 --- a/src/Text/Pandoc/Readers/Org/Blocks.hs +++ b/src/Text/Pandoc/Readers/Org/Blocks.hs @@ -837,7 +837,3 @@ listContinuation markerLength = try $ then count num (char ' ') else choice [ try (count num (char ' ')) , try (char '\t' >> count (num - tabStop) (char ' ')) ] - --- | Parse any line, include the final newline in the output. -anyLineNewline :: Monad m => OrgParser m String -anyLineNewline = (++ "\n") <$> anyLine diff --git a/src/Text/Pandoc/Readers/Org/Parsing.hs b/src/Text/Pandoc/Readers/Org/Parsing.hs index c25b215df..5c93a7eca 100644 --- a/src/Text/Pandoc/Readers/Org/Parsing.hs +++ b/src/Text/Pandoc/Readers/Org/Parsing.hs @@ -31,6 +31,7 @@ functions are adapted to Org-mode specific functionality. module Text.Pandoc.Readers.Org.Parsing ( OrgParser , anyLine + , anyLineNewline , blanklines , newline , parseFromString |