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

HTML reader: Understand style=width: as well as width in col.

Browse source 
Closes #3286.
This commit is contained in:
John MacFarlane 2016-12-07 15:21:01 +01:00
parent 65c0e527f8
commit 7ce622475c
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Text/Pandoc/Readers/HTML.hs
View file

@ -69,6 +69,7 @@ import Text.Pandoc.CSS (foldOrElse, pickStyleAttrProps)
import Data.Monoid ((<>)) import Data.Monoid ((<>))
import Text.Parsec.Error import Text.Parsec.Error
import qualified Data.Set as Set import qualified Data.Set as Set
import Debug.Trace (traceShowId)
-- | Convert HTML-formatted string to 'Pandoc' document. -- | Convert HTML-formatted string to 'Pandoc' document.
readHtml :: ReaderOptions -- ^ Reader options readHtml :: ReaderOptions -- ^ Reader options
@ -422,7 +423,6 @@ pTable = try $ do
TagOpen _ _ <- pSatisfy (~== TagOpen "table" []) TagOpen _ _ <- pSatisfy (~== TagOpen "table" [])
skipMany pBlank skipMany pBlank
caption <- option mempty $ pInTags "caption" inline <* skipMany pBlank caption <- option mempty $ pInTags "caption" inline <* skipMany pBlank
-- TODO actually read these and take width information from them
widths' <- (mconcat <$> many1 pColgroup) <|> many pCol widths' <- (mconcat <$> many1 pColgroup) <|> many pCol
let pTh = option [] $ pInTags "tr" (pCell "th") let pTh = option [] $ pInTags "tr" (pCell "th")
pTr = try $ skipMany pBlank >> pInTags "tr" (pCell "td" <|> pCell "th") pTr = try $ skipMany pBlank >> pInTags "tr" (pCell "td" <|> pCell "th")
@ -450,7 +450,7 @@ pTable = try $ do
| otherwise -> r | otherwise -> r
let rows = map addEmpties rows'' let rows = map addEmpties rows''
let aligns = replicate cols AlignDefault let aligns = replicate cols AlignDefault
let widths = if null widths' let widths = if null (traceShowId widths')
then if isSimple then if isSimple
then replicate cols 0 then replicate cols 0
else replicate cols (1.0 / fromIntegral cols) else replicate cols (1.0 / fromIntegral cols)
@ -464,6 +464,11 @@ pCol = try $ do
optional $ pSatisfy (~== TagClose "col") optional $ pSatisfy (~== TagClose "col")
skipMany pBlank skipMany pBlank
return $ case lookup "width" attribs of return $ case lookup "width" attribs of
Nothing -> case lookup "style" attribs of
Just ('w':'i':'d':'t':'h':':':xs) | '%' `elem` xs ->
fromMaybe 0.0 $ safeRead ('0':'.':filter
(`notElem` " \t\r\n%'\";") xs)
_ -> 0.0
Just x | not (null x) && last x == '%' -> Just x | not (null x) && last x == '%' ->
fromMaybe 0.0 $ safeRead ('0':'.':init x) fromMaybe 0.0 $ safeRead ('0':'.':init x)
_ -> 0.0 _ -> 0.0