git.iko.soy/typeable/pandoc
on master help sign in
Remove another foldr1 partial function use.
67e173bJohn MacFarlane
src/Text/Pandoc/Readers/Txt2Tags.hs+6−5
@@ -261,7 +261,7 @@ table = try $ do
261 rows <- many1 (many commentLine *> tableRow)
261 rows <- many1 (many commentLine *> tableRow)
262 let columns = transpose rows
262 let columns = transpose rows
263 let ncolumns = length columns
263 let ncolumns = length columns
264− let aligns = map (foldr1 findAlign . map fst) columns
264+ let aligns = map (fromMaybe AlignDefault . foldr findAlign Nothing) columns
265 let rows' = map (map snd) rows
265 let rows' = map (map snd) rows
266 let size = maximum (map length rows')
266 let size = maximum (map length rows')
267 let rowsPadded = map (pad size) rows'
267 let rowsPadded = map (pad size) rows'
@@ -278,10 +278,11 @@ pad :: (Monoid a) => Int -> [a] -> [a]
278pad n xs = xs ++ replicate (n - length xs) mempty
278pad n xs = xs ++ replicate (n - length xs) mempty
279
279
280
280
281−findAlign :: Alignment -> Alignment -> Alignment
281+findAlign :: (Alignment, a) -> Maybe Alignment -> Maybe Alignment
282−findAlign x y
282+findAlign (x,_) (Just y)
283− | x == y = x
283+ | x == y = Just x
284− | otherwise = AlignDefault
284+ | otherwise = Just AlignDefault
285+findAlign (x,_) Nothing = Just x
285
286
286headerRow :: T2T [(Alignment, Blocks)]
287headerRow :: T2T [(Alignment, Blocks)]
287headerRow = genericRow (string "||")
288headerRow = genericRow (string "||")