@@ -261,8 +261,7 @@ verseLines = do
261verseTag :: PandocMonad m => MuseParser m (F Blocks)
261verseTag :: PandocMonad m => MuseParser m (F Blocks)
262verseTag = do
262verseTag = do
263 (_, content) <- htmlElement "verse"
263 (_, content) <- htmlElement "verse"
264− parsedContent <- parseFromString verseLines content
264+ parseFromString verseLines content
265− return parsedContent
267commentTag :: PandocMonad m => MuseParser m (F Blocks)
266commentTag :: PandocMonad m => MuseParser m (F Blocks)
268commentTag = parseHtmlContent "comment" anyChar >> return mempty
267commentTag = parseHtmlContent "comment" anyChar >> return mempty
@@ -379,8 +378,8 @@ definitionListItem = try $ do
379 pure $ do lineContent' <- lineContent
378 pure $ do lineContent' <- lineContent
380 pure (B.text term, [lineContent'])
379 pure (B.text term, [lineContent'])
382− termParser = (many1 spaceChar) >> -- Initial space as required by Amusewiki, but not Emacs Muse
381+ termParser = many1 spaceChar >> -- Initial space as required by Amusewiki, but not Emacs Muse
383− (many1Till anyChar $ lookAhead (void (try (spaceChar >> string "::")) <|> void newline))
382+ many1Till anyChar (lookAhead (void (try (spaceChar >> string "::")) <|> void newline))
384 endOfInput = try $ skipMany blankline >> skipSpaces >> eof
383 endOfInput = try $ skipMany blankline >> skipSpaces >> eof
385 twoBlankLines = try $ blankline >> skipMany1 blankline
384 twoBlankLines = try $ blankline >> skipMany1 blankline
386 newDefinitionListItem = try $ void termParser
385 newDefinitionListItem = try $ void termParser