377733e · typeable/pandoc

src/Text/Pandoc/Parsing.hs+5

compare with master

unifiedsplit

@@ -36,6 +36,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

36A utility library with parsers used in pandoc readers.

37-}

38module Text.Pandoc.Parsing ( anyLine,

39+ anyLineNewline,

39 many1Till,

40 many1Till,

40 notFollowedBy',

41 notFollowedBy',

41 oneOfStrings,

42 oneOfStrings,

@@ -255,6 +256,10 @@ anyLine = do

255 return this

256 return this

256 _ -> mzero

257 _ -> mzero

257

258

259+-- | Parse any line, include the final newline in the output

260+anyLineNewline :: Stream [Char] m Char => ParserT [Char] st m [Char]

261+anyLineNewline = (++ "\n") <$> anyLine

262+

258-- | Like @manyTill@, but reads at least one item.

263-- | Like @manyTill@, but reads at least one item.

259many1Till :: Stream s m t

264many1Till :: Stream s m t

260 => ParserT s st m a

265 => ParserT s st m a

src/Text/Pandoc/Readers/Markdown.hs+1−1

@@ -614,7 +614,7 @@ hrule = try $ do

614--

615

616indentedLine :: PandocMonad m => MarkdownParser m String

617−indentedLine = indentSpaces >> anyLine >>= return . (++ "\n")

617+indentedLine = indentSpaces >> anyLineNewline

618

619blockDelimiter :: PandocMonad m

620 => (Char -> Bool)

src/Text/Pandoc/Readers/Org/Blocks.hs−4

@@ -837,7 +837,3 @@ listContinuation markerLength = try $

837 then count num (char ' ')

838 else choice [ try (count num (char ' '))

839 , try (char '\t' >> count (num - tabStop) (char ' ')) ]

840−

841−-- | Parse any line, include the final newline in the output.

842−anyLineNewline :: Monad m => OrgParser m String

843−anyLineNewline = (++ "\n") <$> anyLine

src/Text/Pandoc/Readers/Org/Parsing.hs+1

@@ -31,6 +31,7 @@ functions are adapted to Org-mode specific functionality.

31module Text.Pandoc.Readers.Org.Parsing

32 ( OrgParser

33 , anyLine

34+ , anyLineNewline

34 , blanklines

35 , blanklines

35 , newline

36 , newline

36 , parseFromString

37 , parseFromString

src/Text/Pandoc/Readers/Txt2Tags.hs−3

@@ -277,9 +277,6 @@ listContinuation markerLength = try $

277 <*> many blankline)

278 where listLine = try $ indentWith markerLength *> anyLineNewline

279

280−anyLineNewline :: T2T String

281−anyLineNewline = (++ "\n") <$> anyLine

282−

283indentWith :: Int -> T2T String

280indentWith :: Int -> T2T String

284indentWith n = count n space

281indentWith n = count n space

285

282