diff options
| author | Florian Beeres <yuuki@protonmail.com> | 2019-11-11 17:55:58 +0100 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2019-11-11 08:55:58 -0800 |
| commit | bf2eb4f288df5d5b5e054cdc4ffa3b3c4dd187fa (patch) | |
| tree | f49ab82d214ec4bd4badf8e67d89362d8c70a10a /src/Text/Pandoc/Readers/HTML.hs | |
| parent | 3bf53628984a91d9456d40b1202e9d15f1ad3088 (diff) | |
| download | pandoc-bf2eb4f288df5d5b5e054cdc4ffa3b3c4dd187fa.tar.gz | |
Change the implementation of `htmlSpanLikeElements` and implement `<dfn>` (#5882)
* Add HTML Reader support for `<dfn>`, parsing this as a Span with class `dfn`.
* Change `htmlSpanLikeElements` implementation to retain classes,
attributes and inline content.
Diffstat (limited to 'src/Text/Pandoc/Readers/HTML.hs')
| -rw-r--r-- | src/Text/Pandoc/Readers/HTML.hs | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/Text/Pandoc/Readers/HTML.hs b/src/Text/Pandoc/Readers/HTML.hs index 697a3aa9d..e03ac6a97 100644 --- a/src/Text/Pandoc/Readers/HTML.hs +++ b/src/Text/Pandoc/Readers/HTML.hs @@ -719,10 +719,17 @@ pSubscript :: PandocMonad m => TagParser m Inlines pSubscript = pInlinesInTags "sub" B.subscript pSpanLike :: PandocMonad m => TagParser m Inlines -pSpanLike = Set.foldr - (\tag acc -> acc <|> pInlinesInTags tag (B.spanWith ("",[T.unpack tag],[]))) - mzero - htmlSpanLikeElements +pSpanLike = + Set.foldr + (\tagName acc -> acc <|> parseTag tagName) + mzero + htmlSpanLikeElements + where + parseTag tagName = do + TagOpen _ attrs <- pSatisfy $ tagOpenLit tagName (const True) + let (ids, cs, kvs) = mkAttr . toStringAttr $ attrs + content <- mconcat <$> manyTill inline (pCloses tagName <|> eof) + return $ B.spanWith (ids, T.unpack tagName : cs, kvs) content pSmall :: PandocMonad m => TagParser m Inlines pSmall = pInlinesInTags "small" (B.spanWith ("",["small"],[])) |