diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2021-03-18 21:10:22 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2021-03-18 21:10:22 -0700 |
| commit | 67e173bda116ba9793dd625f782a12ab8e35839b (patch) | |
| tree | 3e6768355b4c2cb7845f42ae6b097c7cd57b6c73 /src/Text/Pandoc | |
| parent | fd76e605cde2639d6bb1b6891dd4b097a6eded01 (diff) | |
| download | pandoc-67e173bda116ba9793dd625f782a12ab8e35839b.tar.gz | |
Remove another foldr1 partial function use.
Diffstat (limited to 'src/Text/Pandoc')
| -rw-r--r-- | src/Text/Pandoc/Readers/Txt2Tags.hs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/Text/Pandoc/Readers/Txt2Tags.hs b/src/Text/Pandoc/Readers/Txt2Tags.hs index 08083b177..0ce8e286f 100644 --- a/src/Text/Pandoc/Readers/Txt2Tags.hs +++ b/src/Text/Pandoc/Readers/Txt2Tags.hs @@ -261,7 +261,7 @@ table = try $ do rows <- many1 (many commentLine *> tableRow) let columns = transpose rows let ncolumns = length columns - let aligns = map (foldr1 findAlign . map fst) columns + let aligns = map (fromMaybe AlignDefault . foldr findAlign Nothing) columns let rows' = map (map snd) rows let size = maximum (map length rows') let rowsPadded = map (pad size) rows' @@ -278,10 +278,11 @@ pad :: (Monoid a) => Int -> [a] -> [a] pad n xs = xs ++ replicate (n - length xs) mempty -findAlign :: Alignment -> Alignment -> Alignment -findAlign x y - | x == y = x - | otherwise = AlignDefault +findAlign :: (Alignment, a) -> Maybe Alignment -> Maybe Alignment +findAlign (x,_) (Just y) + | x == y = Just x + | otherwise = Just AlignDefault +findAlign (x,_) Nothing = Just x headerRow :: T2T [(Alignment, Blocks)] headerRow = genericRow (string "||") |