ea2ea45 · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

Muse reader: don't interpret XML entities

ea2ea45Alexander Krotov9 years ago

src/Text/Pandoc/Readers/Muse.hs+5−6

compare with master

unifiedsplit

@@ -58,7 +58,6 @@ import Text.Pandoc.Options

58import Text.Pandoc.Parsing

59import Text.Pandoc.Readers.HTML (htmlTag)

60import Text.Pandoc.Shared (crFilter)

61−import Text.Pandoc.XML (fromEntities)

63-- | Read Muse from an input string and return a Pandoc document.

62-- | Read Muse from an input string and return a Pandoc document.

64readMuse :: PandocMonad m

63readMuse :: PandocMonad m

@@ -667,7 +666,7 @@ strikeoutTag = inlineTag B.strikeout "del"

667verbatimTag :: PandocMonad m => MuseParser m (F Inlines)

666verbatimTag :: PandocMonad m => MuseParser m (F Inlines)

668verbatimTag = do

667verbatimTag = do

669 content <- parseHtmlContent "verbatim" anyChar

668 content <- parseHtmlContent "verbatim" anyChar

670− return $ return $ B.text $ fromEntities content

669+ return $ return $ B.text content

671

670

672code :: PandocMonad m => MuseParser m (F Inlines)

671code :: PandocMonad m => MuseParser m (F Inlines)

673code = try $ do

672code = try $ do

@@ -686,7 +685,7 @@ code = try $ do

686codeTag :: PandocMonad m => MuseParser m (F Inlines)

685codeTag :: PandocMonad m => MuseParser m (F Inlines)

687codeTag = do

686codeTag = do

688 (attrs, content) <- parseHtmlContentWithAttrs "code" anyChar

687 (attrs, content) <- parseHtmlContentWithAttrs "code" anyChar

689− return $ return $ B.codeWith attrs $ fromEntities content

688+ return $ return $ B.codeWith attrs content

690

689

691inlineLiteralTag :: PandocMonad m => MuseParser m (F Inlines)

690inlineLiteralTag :: PandocMonad m => MuseParser m (F Inlines)

692inlineLiteralTag = do

691inlineLiteralTag = do

@@ -696,13 +695,13 @@ inlineLiteralTag = do

696 where

695 where

697 -- FIXME: Emacs Muse inserts <literal> without style into all output formats, but we assume HTML

696 -- FIXME: Emacs Muse inserts <literal> without style into all output formats, but we assume HTML

698 format (_, _, kvs) = fromMaybe "html" $ lookup "style" kvs

697 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

700

699

701str :: PandocMonad m => MuseParser m (F Inlines)

700str :: PandocMonad m => MuseParser m (F Inlines)

702−str = fmap (return . B.str) (many1 alphaNum <|> count 1 characterReference)

701+str = return . B.str <$> many1 alphaNum

703

702

704symbol :: PandocMonad m => MuseParser m (F Inlines)

703symbol :: PandocMonad m => MuseParser m (F Inlines)

705−symbol = (return . B.str) <$> count 1 nonspaceChar

704+symbol = return . B.str <$> count 1 nonspaceChar

706

705

707link :: PandocMonad m => MuseParser m (F Inlines)

706link :: PandocMonad m => MuseParser m (F Inlines)

708link = try $ do

707link = try $ do

test/Tests/Readers/Muse.hs+2

@@ -31,6 +31,8 @@ tests =

31 "Hello, World" =?>

32 para "Hello, World"

34+ , "Muse is not XML" =: "<" =?> para "<"

35+

34 , "Emphasis" =:

36 , "Emphasis" =:

35 "*Foo bar*" =?>

37 "*Foo bar*" =?>

36 para (emph . spcSep $ ["Foo", "bar"])

38 para (emph . spcSep $ ["Foo", "bar"])