git.iko.soy/typeable/pandoc
on master help sign in
Muse reader: use getIndent more for code cleanup
commit37cc977b12233203f0af27a15918e7d5b73189c5 authorAlexander Krotov <ilabdsf@gmail.com> dateFri 5 Oct 2018, 19:14 (8 years ago) parent131dcff
1 file changed+4−7
src/Text/Pandoc/Readers/Muse.hs+4−7
src/Text/Pandoc/Readers/Muse.hs+4−7
@@ -458,12 +458,10 @@ verseLine = (<>)
458458-- | Parse @\<verse>@ tag.
459459verseTag :: PandocMonad m => MuseParser m (F Blocks)
460460verseTag = try $ do
461− many spaceChar
462− pos <- getPosition
461+ indent <- getIndent
463462 openTag "verse"
464463 manyTill spaceChar eol
465− let indent = count (sourceColumn pos - 1) spaceChar
466− content <- sequence <$> manyTill (indent *> verseLine) (try $ indent *> closeTag "verse")
464+ content <- sequence <$> manyTill (count indent spaceChar *> verseLine) (try $ count indent spaceChar *> closeTag "verse")
467465 manyTill spaceChar eol
468466 return $ B.lineBlock <$> content
469467
@@ -541,9 +539,8 @@ emacsNoteBlock = try $ do
541539-- | Parse a line block indicated by @\'>\'@ characters.
542540lineBlock :: PandocMonad m => MuseParser m (F Blocks)
543541lineBlock = try $ do
544− many spaceChar
545− col <- sourceColumn <$> getPosition
546− lns <- (blankVerseLine <|> nonblankVerseLine) `sepBy1'` try (indentWith (col - 1))
542+ indent <- getIndent
543+ lns <- (blankVerseLine <|> nonblankVerseLine) `sepBy1'` try (indentWith indent)
547544 return $ B.lineBlock <$> sequence lns
548545 where
549546 blankVerseLine = try $ mempty <$ char '>' <* blankline