@@ -225,7 +225,7 @@ parseEmacsDirective :: PandocMonad m => MuseParser m (String, F Inlines)
225parseEmacsDirective = (,)
225parseEmacsDirective = (,)
226 <$> parseDirectiveKey
226 <$> parseDirectiveKey
227 <* spaceChar
227 <* spaceChar
228− <*> (trimInlinesF . mconcat <$> manyTill (choice inlineList) eol)
228+ <*> (trimInlinesF . mconcat <$> manyTill inline' eol)
230parseAmuseDirective :: PandocMonad m => MuseParser m (String, F Inlines)
230parseAmuseDirective :: PandocMonad m => MuseParser m (String, F Inlines)
231parseAmuseDirective = (,)
231parseAmuseDirective = (,)
@@ -455,7 +455,7 @@ playTag = do
455verseLine :: PandocMonad m => MuseParser m (F Inlines)
455verseLine :: PandocMonad m => MuseParser m (F Inlines)
456verseLine = do
456verseLine = do
457 indent <- (B.str <$> many1 ('\160' <$ char ' ')) <|> pure mempty
457 indent <- (B.str <$> many1 ('\160' <$ char ' ')) <|> pure mempty
458− rest <- manyTill (choice inlineList) newline
458+ rest <- manyTill inline' newline
459 return $ trimInlinesF $ mconcat (pure indent : rest)
459 return $ trimInlinesF $ mconcat (pure indent : rest)
461-- | Parse @\<verse>@ tag.
461-- | Parse @\<verse>@ tag.
@@ -546,7 +546,7 @@ lineVerseLine = try $ do
546 string "> "
546 string "> "
547 indent <- many ('\160' <$ char ' ')
547 indent <- many ('\160' <$ char ' ')
548 let indentEl = if null indent then mempty else B.str indent
548 let indentEl = if null indent then mempty else B.str indent
549− rest <- manyTill (choice inlineList) eol
549+ rest <- manyTill inline' eol
550 return $ trimInlinesF $ mconcat (pure indentEl : rest)
550 return $ trimInlinesF $ mconcat (pure indentEl : rest)
552blanklineVerseLine :: PandocMonad m => MuseParser m (F Inlines)
552blanklineVerseLine :: PandocMonad m => MuseParser m (F Inlines)
@@ -648,7 +648,7 @@ definitionListItemsUntil indent end =
649 continuation = try $ do
649 continuation = try $ do
650 pos <- getPosition
650 pos <- getPosition
651− term <- trimInlinesF . mconcat <$> manyTill (choice inlineList) (try $ string "::")
651+ term <- trimInlinesF . mconcat <$> manyTill inline' (try $ string "::")
652 (x, (xs, e)) <- descriptionsUntil (sourceColumn pos) (try (optional blankline *> indentWith indent *> continuation) <|> (([],) <$> end))
652 (x, (xs, e)) <- descriptionsUntil (sourceColumn pos) (try (optional blankline *> indentWith indent *> continuation) <|> (([],) <$> end))
653 let xx = (,) <$> term <*> sequence x
653 let xx = (,) <$> term <*> sequence x
654 return (xx:xs, e)
654 return (xx:xs, e)
@@ -753,33 +753,33 @@ tableParseCaption = try $ fmap MuseCaption . trimInlinesF . mconcat
754-- ** Inline parsers
754-- ** Inline parsers
756−inlineList :: PandocMonad m => [MuseParser m (F Inlines)]
756+inline' :: PandocMonad m => MuseParser m (F Inlines)
757−inlineList = [ whitespace
757+inline' = whitespace
759− , anchor
759+ <|> anchor
760− , footnote
760+ <|> footnote
761− , strong
761+ <|> strong
762− , strongTag
762+ <|> strongTag
764− , emphTag
764+ <|> emphTag
765− , underlined
765+ <|> underlined
766− , superscriptTag
766+ <|> superscriptTag
767− , subscriptTag
767+ <|> subscriptTag
768− , strikeoutTag
768+ <|> strikeoutTag
769− , verbatimTag
769+ <|> verbatimTag
770− , classTag
770+ <|> classTag
772− , linkOrImage
772+ <|> linkOrImage
774− , codeTag
774+ <|> codeTag
775− , mathTag
775+ <|> mathTag
776− , inlineLiteralTag
776+ <|> inlineLiteralTag
778− , symbol
778+ <|> symbol
781inline :: PandocMonad m => MuseParser m (F Inlines)
781inline :: PandocMonad m => MuseParser m (F Inlines)
782−inline = endline <|> choice inlineList <?> "inline"
782+inline = endline <|> inline'
784-- | Parse a soft break.
784-- | Parse a soft break.
785endline :: PandocMonad m => MuseParser m (F Inlines)
785endline :: PandocMonad m => MuseParser m (F Inlines)