lee/pandoc
1
0
Fork 0
mirror of https://github.com/jgm/pandoc.git synced 2026-09-26 09:25:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

T.P.Readers.Odt.StyleReader: rewrite foldr1 use as foldr.

Browse Source 
This avoids a partial function.
This commit is contained in:
John MacFarlane
2021-03-18 21:02:05 -07:00
parent 2d10f46de5
commit fd76e605cd
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Text/Pandoc/Readers/Odt/StyleReader.hs
+6 -5
View File
@@ -563,12 +563,13 @@ readListLevelStyle levelType = readAttr NsText "level"
--
chooseMostSpecificListLevelStyle :: S.Set ListLevelStyle -> Maybe ListLevelStyle
chooseMostSpecificListLevelStyle ls | ls == mempty = Nothing
| otherwise = Just ( F.foldr1 select ls )
chooseMostSpecificListLevelStyle ls = F.foldr select Nothing ls
where
select ( ListLevelStyle t1 p1 s1 f1 b1 )
( ListLevelStyle t2 p2 s2 f2 _ )
= ListLevelStyle (select' t1 t2) (p1 <|> p2) (s1 <|> s2) (selectLinf f1 f2) b1
select l Nothing = Just l
select ( ListLevelStyle t1 p1 s1 f1 b1 )
( Just ( ListLevelStyle t2 p2 s2 f2 _ ))
= Just $ ListLevelStyle (select' t1 t2) (p1 <|> p2) (s1 <|> s2)
(selectLinf f1 f2) b1
select' LltNumbered _ = LltNumbered
select' _ LltNumbered = LltNumbered
select' _ _ = LltBullet