HTML writer: don't include p tags in CSL bibliography entries.

Fixes a regression in 2.11.3.
Closes #6966
This commit is contained in:
John MacFarlane 2020-12-20 22:33:26 -08:00
parent 8f402beab9
commit 9cbbf18fe1

View file

@ -778,12 +778,17 @@ blockToHtml opts (Div attr@(ident, classes, kvs') bs) = do
classes' = case slideVariant of
NoSlides -> classes
_ -> filter (\k -> k /= "incremental" && k /= "nonincremental") classes
let paraToPlain (Para ils) = Plain ils
paraToPlain x = x
let bs' = if "csl-entry" `elem` classes'
then walk paraToPlain bs
else bs
contents <- if "columns" `elem` classes'
then -- we don't use blockListToHtml because it inserts
-- a newline between the column divs, which throws
-- off widths! see #4028
mconcat <$> mapM (blockToHtml opts) bs
else blockListToHtml opts' bs
mconcat <$> mapM (blockToHtml opts) bs'
else blockListToHtml opts' bs'
let contents' = nl opts >> contents >> nl opts
let (divtag, classes'') = if html5 && "section" `elem` classes'
then (H5.section, filter (/= "section") classes')