@@ -169,6 +169,10 @@ firstColumn = getPosition >>= \pos -> guard (sourceColumn pos == 1)
169eol :: Stream s m Char => ParserT s st m ()
169eol :: Stream s m Char => ParserT s st m ()
170eol = void newline <|> eof
170eol = void newline <|> eof
172+getIndent :: PandocMonad m
174+getIndent = subtract 1 . sourceColumn <$ many spaceChar <*> getPosition
172someUntil :: (Stream s m t)
176someUntil :: (Stream s m t)
173 => ParserT s u m a
177 => ParserT s u m a
174 -> ParserT s u m b
178 -> ParserT s u m b
@@ -202,11 +206,10 @@ parseHtmlContent :: PandocMonad m
202 => String -- ^ Tag name
206 => String -- ^ Tag name
203 -> MuseParser m (Attr, F Blocks)
207 -> MuseParser m (Attr, F Blocks)
204parseHtmlContent tag = try $ do
208parseHtmlContent tag = try $ do
205− many spaceChar
209+ indent <- getIndent
207 attr <- openTag tag
210 attr <- openTag tag
208 manyTill spaceChar eol
211 manyTill spaceChar eol
209− content <- parseBlocksTill $ try $ count (sourceColumn pos - 1) spaceChar *> closeTag tag
212+ content <- parseBlocksTill $ try $ count indent spaceChar *> closeTag tag
210 manyTill spaceChar eol -- closing tag must be followed by optional whitespace and newline
213 manyTill spaceChar eol -- closing tag must be followed by optional whitespace and newline
211 return (htmlAttrToPandoc attr, content)
214 return (htmlAttrToPandoc attr, content)
@@ -548,10 +551,6 @@ lineBlock = try $ do
549-- *** List parsers
552-- *** List parsers
551−getIndent :: PandocMonad m
553−getIndent = subtract 1 . sourceColumn <$ many spaceChar <*> getPosition
555bulletListItemsUntil :: PandocMonad m
554bulletListItemsUntil :: PandocMonad m
556 => Int -- ^ Indentation
555 => Int -- ^ Indentation
557 -> MuseParser m a -- ^ Terminator parser
556 -> MuseParser m a -- ^ Terminator parser