Muse reader: don't interpret XML entities

2 files changed, 7 insertions, 6 deletions

diff --git a/src/Text/Pandoc/Readers/Muse.hs b/src/Text/Pandoc/Readers/Muse.hs
index 56ca9b640..2d701fb91 100644
--- a/src/Text/Pandoc/Readers/Muse.hs
+++ b/src/Text/Pandoc/Readers/Muse.hs
@@ -58,7 +58,6 @@ import Text.Pandoc.Options
 import Text.Pandoc.Parsing
 import Text.Pandoc.Readers.HTML (htmlTag)
 import Text.Pandoc.Shared (crFilter)
-import Text.Pandoc.XML (fromEntities)
 
 -- | Read Muse from an input string and return a Pandoc document.
 readMuse :: PandocMonad m
@@ -667,7 +666,7 @@ strikeoutTag = inlineTag B.strikeout "del"
 verbatimTag :: PandocMonad m => MuseParser m (F Inlines)
 verbatimTag = do
   content <- parseHtmlContent "verbatim" anyChar
-  return $ return $ B.text $ fromEntities content
+  return $ return $ B.text content
 
 code :: PandocMonad m => MuseParser m (F Inlines)
 code = try $ do
@@ -686,7 +685,7 @@ code = try $ do
 codeTag :: PandocMonad m => MuseParser m (F Inlines)
 codeTag = do
   (attrs, content) <- parseHtmlContentWithAttrs "code" anyChar
-  return $ return $ B.codeWith attrs $ fromEntities content
+  return $ return $ B.codeWith attrs content
 
 inlineLiteralTag :: PandocMonad m => MuseParser m (F Inlines)
 inlineLiteralTag = do
@@ -696,13 +695,13 @@ inlineLiteralTag = do
   where
     -- FIXME: Emacs Muse inserts <literal> without style into all output formats, but we assume HTML
     format (_, _, kvs)        = fromMaybe "html" $ lookup "style" kvs
-    rawInline (attrs, content) = B.rawInline (format attrs) $ fromEntities content
+    rawInline (attrs, content) = B.rawInline (format attrs) content
 
 str :: PandocMonad m => MuseParser m (F Inlines)
-str = fmap (return . B.str) (many1 alphaNum <|> count 1 characterReference)
+str = return . B.str <$> many1 alphaNum
 
 symbol :: PandocMonad m => MuseParser m (F Inlines)
-symbol = (return . B.str) <$> count 1 nonspaceChar
+symbol = return . B.str <$> count 1 nonspaceChar
 
 link :: PandocMonad m => MuseParser m (F Inlines)
 link = try $ do
diff --git a/test/Tests/Readers/Muse.hs b/test/Tests/Readers/Muse.hs
index aa35e6063..1095ada31 100644
--- a/test/Tests/Readers/Muse.hs
+++ b/test/Tests/Readers/Muse.hs
@@ -31,6 +31,8 @@ tests =
           "Hello, World" =?>
           para "Hello, World"
 
+      , "Muse is not XML" =: "&lt;" =?> para "&lt;"
+
       , "Emphasis" =:
         "*Foo bar*" =?>
         para (emph . spcSep $ ["Foo", "bar"])