Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

HTML reader: simplify col width parsing

Browse source
This commit is contained in:
Albert Krewinkel 2021-05-22 13:29:13 +02:00
parent 4b229e5955
commit f76fe2ab56
No known key found for this signature in database
GPG key ID: 388DC0B21F631124
1 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/Text/Pandoc/Readers/HTML/Table.hs
View file

@ -1,6 +1,5 @@
{-# LANGUAGE LambdaCase #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE ViewPatterns #-}
{- |
Module : Text.Pandoc.Readers.HTML.Table
Copyright : © 2006-2021 John MacFarlane,
@ -42,18 +41,15 @@ pCol = try $ do
skipMany pBlank
optional $ pSatisfy (matchTagClose "col")
skipMany pBlank
let width = case lookup "width" attribs of
Nothing -> case lookup "style" attribs of
Just (T.stripPrefix "width:" -> Just xs) | T.any (== '%') xs ->
fromMaybe 0.0 $ safeRead (T.filter
(`notElem` (" \t\r\n%'\";" :: [Char])) xs)
_ -> 0.0
Just (T.unsnoc -> Just (xs, '%')) ->
fromMaybe 0.0 $ safeRead xs
_ -> 0.0
if width > 0.0
then return $ ColWidth $ width / 100.0
else return ColWidthDefault
let toColWidth = maybe ColWidthDefault (ColWidth . (/100.0)) . safeRead
return $ fromMaybe ColWidthDefault $
(case lookup "width" attribs >>= T.unsnoc of
Just (xs, '%') -> Just (toColWidth xs)
_ -> Nothing) <|>
(case lookup "style" attribs >>= T.stripPrefix "width" of
Just xs | T.any (== '%') xs -> Just . toColWidth $
T.filter (`notElem` (" \t\r\n%'\";" :: [Char])) xs
_ -> Nothing)
pColgroup :: PandocMonad m => TagParser m [ColWidth]
pColgroup = try $ do