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

HTML reader: Use pandoc Div and Span for raw "<div>", "<span>".

Browse source 
Only if --parse-raw.
This commit is contained in:
John MacFarlane 2013-11-03 11:17:39 -08:00
parent 0d95c15e83
commit 732f6abe15
1 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -92,6 +92,7 @@ block = choice
, pHead
, pBody
, pPlain
, pDiv
, pRawHtmlBlock
]
@ -177,6 +178,13 @@ pRawTag = do
then return []
else return $ renderTags' [tag]
pDiv :: TagParser [Block]
pDiv = try $ do
getOption readerParseRaw >>= guard
TagOpen _ attr <- lookAhead $ pSatisfy $ tagOpen (=="div") (const True)
contents <- pInTags "div" block
return [Div (mkAttr attr) contents]
pRawHtmlBlock :: TagParser [Block]
pRawHtmlBlock = do
raw <- pHtmlBlock "script" <|> pHtmlBlock "style" <|> pRawTag
@ -295,11 +303,7 @@ pCodeBlock = try $ do
let result = case reverse result' of
'\n':_ -> init result'
_ -> result'
let attribsId = fromMaybe "" $ lookup "id" attr
let attribsClasses = words $ fromMaybe "" $ lookup "class" attr
let attribsKV = filter (\(k,_) -> k /= "class" && k /= "id") attr
let attribs = (attribsId, attribsClasses, attribsKV)
return [CodeBlock attribs result]
return [CodeBlock (mkAttr attr) result]
inline :: TagParser [Inline]
inline = choice
@ -314,6 +318,7 @@ inline = choice
, pLink
, pImage
, pCode
, pSpan
, pRawHtmlInline
]
@ -397,11 +402,14 @@ pCode :: TagParser [Inline]
pCode = try $ do
(TagOpen open attr) <- pSatisfy $ tagOpen (`elem` ["code","tt"]) (const True)
result <- manyTill pAnyTag (pCloses open)
let ident = fromMaybe "" $ lookup "id" attr
let classes = words $ fromMaybe [] $ lookup "class" attr
let rest = filter (\(x,_) -> x /= "id" && x /= "class") attr
return [Code (ident,classes,rest)
$ intercalate " " $ lines $ innerText result]
return [Code (mkAttr attr) $ intercalate " " $ lines $ innerText result]
pSpan :: TagParser [Inline]
pSpan = try $ do
getOption readerParseRaw >>= guard
TagOpen _ attr <- lookAhead $ pSatisfy $ tagOpen (=="span") (const True)
contents <- pInTags "span" inline
return [Span (mkAttr attr) contents]
pRawHtmlInline :: TagParser [Inline]
pRawHtmlInline = do
@ -648,3 +656,10 @@ htmlTag f = try $ do
_ -> do
rendered <- manyTill anyChar (char '>')
return (next, rendered ++ ">")
mkAttr :: [(String, String)] -> Attr
mkAttr attr = (attribsId, attribsClasses, attribsKV)
where attribsId = fromMaybe "" $ lookup "id" attr
attribsClasses = words $ fromMaybe "" $ lookup "class" attr
attribsKV = filter (\(k,_) -> k /= "class" && k /= "id") attr