Muse reader: add support for endnotes

Author: Alexander Krotov

src/Text/Pandoc/Readers/Muse.hs

@@ -335,21 +335,31 @@ para = do
    endOfPara        = try $ blankline >> skipMany1 blankline
    newBlockElement  = try $ blankline >> void blockElements
 
-noteMarker :: PandocMonad m => MuseParser m String
-noteMarker = try $ do
-  char '['
+noteBrackets :: NoteType -> (Char, Char)
+noteBrackets nt =
+  case nt of
+    EndNote -> ('{', '}')
+    _       -> ('[', ']')
+
+noteMarker :: PandocMonad m => NoteType -> MuseParser m (NoteType, String)
+noteMarker nt = try $ do
+  char l
   first <- oneOf "123456789"
-  rest <- manyTill digit (char ']')
-  return $ first:rest
+  rest <- manyTill digit (char r)
+  return (nt, [l] ++ (first:rest) ++ [r])
+  where (l, r) = noteBrackets nt
+
+anyNoteMarker :: PandocMonad m => MuseParser m (NoteType, String)
+anyNoteMarker = noteMarker FootNote <|> noteMarker EndNote
 
 -- Amusewiki version of note
 -- Parsing is similar to list item, except that note marker is used instead of list marker
 amuseNoteBlock :: PandocMonad m => MuseParser m (F Blocks)
 amuseNoteBlock = try $ do
   guardEnabled Ext_amuse
   pos <- getPosition
-  ref <- noteMarker <* spaceChar
-  content <- listItemContents $ 3 + length ref
+  (_, ref) <- anyNoteMarker <* spaceChar
+  content <- listItemContents $ 1 + length ref
   oldnotes <- stateNotes' <$> getState
   case M.lookup ref oldnotes of
     Just _  -> logMessage $ DuplicateNoteReference ref pos
@@ -363,7 +373,7 @@ emacsNoteBlock :: PandocMonad m => MuseParser m (F Blocks)
 emacsNoteBlock = try $ do
   guardDisabled Ext_amuse
   pos <- getPosition
-  ref <- noteMarker <* skipSpaces
+  (_, ref) <- anyNoteMarker <* skipSpaces
   content <- mconcat <$> blocksTillNote
   oldnotes <- stateNotes' <$> getState
   case M.lookup ref oldnotes of
@@ -373,7 +383,7 @@ emacsNoteBlock = try $ do
   return mempty
   where
     blocksTillNote =
-      many1Till block (eof <|> () <$ lookAhead noteMarker)
+      many1Till block (eof <|> () <$ lookAhead anyNoteMarker)
 
 --
 -- Verse markup
@@ -647,15 +657,15 @@ anchor = try $ do
 
 footnote :: PandocMonad m => MuseParser m (F Inlines)
 footnote = try $ do
-  ref <- noteMarker
+  (notetype, ref) <- anyNoteMarker
   return $ do
     notes <- asksF stateNotes'
     case M.lookup ref notes of
-      Nothing -> return $ B.str $ "[" ++ ref ++ "]"
+      Nothing -> return $ B.str ref
       Just (_pos, contents) -> do
         st <- askF
         let contents' = runF contents st { stateNotes' = M.empty }
-        return $ B.note contents'
+        return $ B.singleton $ Note notetype $ B.toList contents'
 
 whitespace :: PandocMonad m => MuseParser m (F Inlines)
 whitespace = fmap return (lb <|> regsp)

test/Tests/Readers/Muse.hs

@@ -509,6 +509,22 @@ tests =
           para (text "Here is a footnote" <>
                 note (para "Footnote contents") <>
                 str ".")
+        , "Simple endnote" =:
+          T.unlines [ "Here is an endnote{1}."
+                    , ""
+                    , "{1} Endnote contents"
+                    ] =?>
+          para (text "Here is an endnote" <>
+                endNote (para "Endnote contents") <>
+                str ".")
+        , "Missing footnote" =: "Foo[1]" =?> para "Foo[1]"
+        , "Missing endnote" =: "Foo{1}" =?> para "Foo{1}"
+        , "Wrong note type" =:
+          T.unlines [ "Here is an endnote{1}."
+                    , ""
+                    , "[1] Footnote contents"
+                    ] =?>
+          para "Here is an endnote{1}."
         , "Recursive footnote" =:
           T.unlines [ "Start recursion here[1]"
                     , ""