Muse reader: add comments support

jgm · Apr 30, 2017 · 02705ba · 02705ba
1 parent 7e8d95d
commit 02705ba
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/src/Text/Pandoc/Readers/Muse.hs b/src/Text/Pandoc/Readers/Muse.hs
@@ -37,7 +37,6 @@ TODO:
 - Tables
 - Images with attributes (floating and width)
 - Anchors
-- Comments
 - Citations and <biblio>
 - <play> environment
 - <verbatim> tag
@@ -179,16 +178,26 @@ block = do
   return res
 
 blockElements :: PandocMonad m => MuseParser m (F Blocks)
-blockElements = choice [ separator
+blockElements = choice [ comment
+                       , separator
                        , header
                        , exampleTag
                        , literal
                        , centerTag
                        , rightTag
                        , quoteTag
+                       , commentTag
                        , noteBlock
                        ]
 
+comment :: PandocMonad m => MuseParser m (F Blocks)
+comment = try $ do
+  char ';'
+  space
+  many $ noneOf "\n"
+  (skip newline) <|> eof
+  return mempty
+
 separator :: PandocMonad m => MuseParser m (F Blocks)
 separator = try $ do
   string "---"
@@ -234,6 +243,9 @@ rightTag = blockTag id "right"
 quoteTag :: PandocMonad m => MuseParser m (F Blocks)
 quoteTag = blockTag B.blockQuote "quote"
 
+commentTag :: PandocMonad m => MuseParser m (F Blocks)
+commentTag = parseHtmlContent "comment" block >> return mempty
+
 para :: PandocMonad m => MuseParser m (F Blocks)
 para = do
  res <- trimInlinesF . mconcat <$> many1Till inline endOfParaElement

diff --git a/test/Tests/Readers/Muse.hs b/test/Tests/Readers/Muse.hs
@@ -84,6 +84,12 @@ tests =
       [ "Quote" =: "<quote>Hello, world</quote>" =?> blockQuote (para $ text "Hello, world")
       , "Center" =: "<center>Hello, world</center>" =?> para (text "Hello, world")
       , "Right" =: "<right>Hello, world</right>" =?> para (text "Hello, world")
+      , testGroup "Comments"
+        [ "Comment tag" =: "<comment>\nThis is a comment\n</comment>" =?> (mempty::Blocks)
+        , "Line comment" =: "; Comment" =?> (mempty::Blocks) 
+        , "Not a comment (does not start with a semicolon)" =: " ; Not a comment" =?> para (text "; Not a comment")
+        , "Not a comment (has no space after semicolon)" =: ";Not a comment" =?> para (text ";Not a comment")
+        ]
       , testGroup "Headers"
         [ "Part" =:
           "* First level\n" =?>