ODT reader: parse endnotes

Converted ODT tests for notes from markdown to native,
because markdown does not differentiate between foot- and end-notes.

Author: Alexander Krotov

src/Text/Pandoc/Readers/Odt/ContentReader.hs

@@ -694,8 +694,12 @@ read_link         = matchingElement NsText "a"
 
 read_note        :: InlineMatcher
 read_note         = matchingElement NsText "note"
-                    $ liftA note
-                    $ matchChildContent' [ read_note_body ]
+                    $ liftA2 (\nt -> singleton . Note nt . toList)
+                      (liftA makeNoteType (findAttrWithDefault NsText "note-class" "footnote"))
+                      (matchChildContent' [ read_note_body ])
+  where
+    makeNoteType :: String -> NoteType
+    makeNoteType x = if x == "endnote" then EndNote else FootNote
 
 read_note_body   :: BlockMatcher
 read_note_body    = matchingElement NsText "note-body"

test/Tests/Readers/Odt.hs

@@ -135,9 +135,7 @@ testMediaBag name odtFile = buildTest $ testMediaBagIO name odtFile
 namesOfTestsComparingToMarkdown :: [ String ]
 namesOfTestsComparingToMarkdown  = [ "bold"
 --                                 , "citation"
-                                   , "endnote"
                                    , "externalLink"
-                                   , "footnote"
                                    , "headers"
 --                                 , "horizontalRule"
                                    , "italic"
@@ -150,6 +148,8 @@ namesOfTestsComparingToMarkdown  = [ "bold"
 
 namesOfTestsComparingToNative  :: [ String ]
 namesOfTestsComparingToNative   = [ "blockquote"
+                                  , "endnote"
+                                  , "footnote"
                                   , "image"
                                   , "imageIndex"
                                   , "imageWithCaption"

test/odt/markdown/endnote.md

@@ -0,0 +1 @@
+[Para [Str "Some",Space,Str "text",Note EndNote [Para [Str "Endnote",Space,Str "text"]],Space,Str "with",Space,Str "an",Space,Str "endnote."]]

test/odt/markdown/footnote.md

@@ -0,0 +1 @@
+[Para [Str "Some",Space,Str "text",Note FootNote [Para [Str "Footnote",Space,Str "text"]],Space,Str "with",Space,Str "a",Space,Str "footnote."]]