git.iko.soy/typeable/pandoc
on master help sign in
Docx reader: unwrap sdt elements in footnotes and comments.
8552e18Jesse Rosenthal
src/Text/Pandoc/Readers/Docx/Parse.hs+3−3
compare with master
unifiedsplit
@@ -486,8 +486,8 @@ archiveToNotes zf =
486 Just e -> elemToNameSpaces e
486 Just e -> elemToNameSpaces e
487 Nothing -> []
487 Nothing -> []
488 ns = unionBy (\x y -> fst x == fst y) fn_namespaces en_namespaces
488 ns = unionBy (\x y -> fst x == fst y) fn_namespaces en_namespaces
489− fn = fnElem >>= elemToNotes ns "footnote"
489+ fn = fnElem >>= walkDocument ns >>= elemToNotes ns "footnote"
490− en = enElem >>= elemToNotes ns "endnote"
490+ en = enElem >>= walkDocument ns >>= elemToNotes ns "endnote"
491 in
491 in
492 Notes ns fn en
492 Notes ns fn en
493
493
@@ -498,7 +498,7 @@ archiveToComments zf =
498 cmts_namespaces = case cmtsElem of
498 cmts_namespaces = case cmtsElem of
499 Just e -> elemToNameSpaces e
499 Just e -> elemToNameSpaces e
500 Nothing -> []
500 Nothing -> []
501− cmts = elemToComments cmts_namespaces <$> cmtsElem
501+ cmts = elemToComments cmts_namespaces <$> (cmtsElem >>= walkDocument cmts_namespaces)
502 in
502 in
503 case cmts of
503 case cmts of
504 Just c -> Comments cmts_namespaces c
504 Just c -> Comments cmts_namespaces c