git.iko.soy/typeable/pandoc
on master help sign in
Muse reader: use getIndent in parseHtmlContent
commit131dcff71d65c343d1721ec0e577b5a773d9e737 authorAlexander Krotov <ilabdsf@gmail.com> dateFri 5 Oct 2018, 18:47 (8 years ago) parent659cce8
1 file changed+6−7
src/Text/Pandoc/Readers/Muse.hs+6−7
src/Text/Pandoc/Readers/Muse.hs+6−7
@@ -169,6 +169,10 @@ firstColumn = getPosition >>= \pos -> guard (sourceColumn pos == 1)
169169eol :: Stream s m Char => ParserT s st m ()
170170eol = void newline <|> eof
171171
172+getIndent :: PandocMonad m
173+ => MuseParser m Int
174+getIndent = subtract 1 . sourceColumn <$ many spaceChar <*> getPosition
175+
172176someUntil :: (Stream s m t)
173177 => ParserT s u m a
174178 -> ParserT s u m b
@@ -202,11 +206,10 @@ parseHtmlContent :: PandocMonad m
202206 => String -- ^ Tag name
203207 -> MuseParser m (Attr, F Blocks)
204208parseHtmlContent tag = try $ do
205− many spaceChar
206− pos <- getPosition
209+ indent <- getIndent
207210 attr <- openTag tag
208211 manyTill spaceChar eol
209− content <- parseBlocksTill $ try $ count (sourceColumn pos - 1) spaceChar *> closeTag tag
212+ content <- parseBlocksTill $ try $ count indent spaceChar *> closeTag tag
210213 manyTill spaceChar eol -- closing tag must be followed by optional whitespace and newline
211214 return (htmlAttrToPandoc attr, content)
212215
@@ -548,10 +551,6 @@ lineBlock = try $ do
548551
549552-- *** List parsers
550553
551−getIndent :: PandocMonad m
552− => MuseParser m Int
553−getIndent = subtract 1 . sourceColumn <$ many spaceChar <*> getPosition
554−
555554bulletListItemsUntil :: PandocMonad m
556555 => Int -- ^ Indentation
557556 -> MuseParser m a -- ^ Terminator parser