@@ -58,7 +58,6 @@ import Text.Pandoc.Options
5858import Text.Pandoc.Parsing
5959import Text.Pandoc.Readers.HTML (htmlTag)
6060import Text.Pandoc.Shared (crFilter)
61−import Text.Pandoc.XML (fromEntities)
6261
6362-- | Read Muse from an input string and return a Pandoc document.
6463readMuse :: PandocMonad m
@@ -667,7 +666,7 @@ strikeoutTag = inlineTag B.strikeout "del"
667666verbatimTag :: PandocMonad m => MuseParser m (F Inlines)
668667verbatimTag = do
669668 content <- parseHtmlContent "verbatim" anyChar
670− return $ return $ B.text $ fromEntities content
669+ return $ return $ B.text content
671670
672671code :: PandocMonad m => MuseParser m (F Inlines)
673672code = try $ do
@@ -686,7 +685,7 @@ code = try $ do
686685codeTag :: PandocMonad m => MuseParser m (F Inlines)
687686codeTag = do
688687 (attrs, content) <- parseHtmlContentWithAttrs "code" anyChar
689− return $ return $ B.codeWith attrs $ fromEntities content
688+ return $ return $ B.codeWith attrs content
690689
691690inlineLiteralTag :: PandocMonad m => MuseParser m (F Inlines)
692691inlineLiteralTag = do
@@ -696,13 +695,13 @@ inlineLiteralTag = do
696695 where
697696 -- FIXME: Emacs Muse inserts <literal> without style into all output formats, but we assume HTML
698697 format (_, _, kvs) = fromMaybe "html" $ lookup "style" kvs
699− rawInline (attrs, content) = B.rawInline (format attrs) $ fromEntities content
698+ rawInline (attrs, content) = B.rawInline (format attrs) content
700699
701700str :: PandocMonad m => MuseParser m (F Inlines)
702−str = fmap (return . B.str) (many1 alphaNum <|> count 1 characterReference)
701+str = return . B.str <$> many1 alphaNum
703702
704703symbol :: PandocMonad m => MuseParser m (F Inlines)
705−symbol = (return . B.str) <$> count 1 nonspaceChar
704+symbol = return . B.str <$> count 1 nonspaceChar
706705
707706link :: PandocMonad m => MuseParser m (F Inlines)
708707link = try $ do