git.iko.soy/typeable/pandoc
on master help sign in
Docx reader: Remove unnecessary filter in Parse.

mapMaybe does the filtering for us.

commit9614ddfedc18cccbf9fbe1a23fae200c7e67d72d authorJesse Rosenthal <jrosenthal@jhu.edu> dateWed 25 Jun 2014, 11:00 (12 years ago) parented44e4c
1 file changed+2−7
src/Text/Pandoc/Readers/Docx/Parse.hs+2−7
src/Text/Pandoc/Readers/Docx/Parse.hs+2−7
@@ -281,10 +281,6 @@ elemToBody ns element | qName (elName element) == "body" && qURI (elName element
281281 $ map (elemToBodyPart ns) $ filterChildrenName (isParOrTbl ns) element
282282elemToBody _ _ = Nothing
283283
284−isRunOrLinkOrBookmark :: NameSpaces -> QName -> Bool
285−isRunOrLinkOrBookmark ns q = qName q `elem` ["r", "hyperlink", "bookmarkStart"] &&
286− qURI q == (lookup "w" ns)
287−
288284elemToNumInfo :: NameSpaces -> Element -> Maybe (String, String)
289285elemToNumInfo ns element
290286 | qName (elName element) == "p" &&
@@ -319,9 +315,8 @@ elemToBodyPart ns element
319315 | qName (elName element) == "p" &&
320316 qURI (elName element) == (lookup "w" ns) =
321317 let parstyle = elemToParagraphStyle ns element
322− parparts = mapMaybe id
323− $ map (elemToParPart ns)
324− $ filterChildrenName (isRunOrLinkOrBookmark ns) element
318+ parparts = mapMaybe (elemToParPart ns)
319+ $ elChildren element
325320 in
326321 case elemToNumInfo ns element of
327322 Just (numId, lvl) -> Just $ ListItem parstyle numId lvl parparts