diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2021-05-22 22:03:51 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2021-05-22 22:03:51 -0700 |
| commit | 80b4b3fe82a19a4ea1e76fc4a81c9c88676c7ce0 (patch) | |
| tree | ee1fcadbe22876db220dad9ff78024d72d210ce3 /src/Text/Pandoc/Readers | |
| parent | f76fe2ab56606528d4710cc6c40bceb5788c3906 (diff) | |
| download | pandoc-80b4b3fe82a19a4ea1e76fc4a81c9c88676c7ce0.tar.gz | |
Revert "HTML reader: simplify col width parsing"
This reverts commit f76fe2ab56606528d4710cc6c40bceb5788c3906.
Diffstat (limited to 'src/Text/Pandoc/Readers')
| -rw-r--r-- | src/Text/Pandoc/Readers/HTML/Table.hs | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/Text/Pandoc/Readers/HTML/Table.hs b/src/Text/Pandoc/Readers/HTML/Table.hs index 6537bbce9..ad0b51253 100644 --- a/src/Text/Pandoc/Readers/HTML/Table.hs +++ b/src/Text/Pandoc/Readers/HTML/Table.hs @@ -1,5 +1,6 @@ {-# LANGUAGE LambdaCase #-} {-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE ViewPatterns #-} {- | Module : Text.Pandoc.Readers.HTML.Table Copyright : © 2006-2021 John MacFarlane, @@ -41,15 +42,18 @@ pCol = try $ do skipMany pBlank optional $ pSatisfy (matchTagClose "col") skipMany pBlank - 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) + 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 pColgroup :: PandocMonad m => TagParser m [ColWidth] pColgroup = try $ do |