Docbook writer: handle admonitions

Similarly to d6fdfe6f2b,
we should handle admonitions.
This commit is contained in:
Jan Tojnar 2020-12-04 09:16:56 +01:00
parent 6f35600204
commit dc6856530c
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
2 changed files with 82 additions and 12 deletions

View file

@ -188,18 +188,36 @@ blockToDocbook opts (Div (id',"section":_,_) (Header lvl _ ils : xs)) = do
title' <- inlinesToDocbook opts ils
contents <- blocksToDocbook opts bs
return $ inTags True tag attribs $ inTagsSimple "title" title' $$ contents
blockToDocbook opts (Div (ident,_,_) [Para lst]) =
let attribs = [("id", ident) | not (T.null ident)] in
if hasLineBreaks lst
then flush . nowrap . inTags False "literallayout" attribs
<$> inlinesToDocbook opts lst
else inTags True "para" attribs <$> inlinesToDocbook opts lst
blockToDocbook opts (Div (ident,_,_) bs) = do
contents <- blocksToDocbook opts (map plainToPara bs)
return $
(if T.null ident
then mempty
else selfClosingTag "anchor" [("id", ident)]) $$ contents
blockToDocbook opts (Div (ident,classes,_) bs) =
let identAttribs = [("id", ident) | not (T.null ident)]
admonitions = ["attention","caution","danger","error","hint",
"important","note","tip","warning"]
in case classes of
(l:_) | l `elem` admonitions -> do
let (mTitleBs, bodyBs) =
case bs of
-- Matches AST produced by the Docbook reader.
(Div (_,["title"],_) ts : rest) -> (Just (blocksToDocbook opts ts), rest)
_ -> (Nothing, bs)
admonitionTitle <- case mTitleBs of
Nothing -> return mempty
-- id will be attached to the admonition so lets pass empty identAttrs.
Just titleBs -> inTags False "title" [] <$> titleBs
admonitionBody <- handleDivBody [] bodyBs
return (inTags True l identAttribs (admonitionTitle $$ admonitionBody))
_ -> handleDivBody identAttribs bs
where
handleDivBody identAttribs [Para lst] =
if hasLineBreaks lst
then flush . nowrap . inTags False "literallayout" identAttribs
<$> inlinesToDocbook opts lst
else inTags True "para" identAttribs <$> inlinesToDocbook opts lst
handleDivBody identAttribs bodyBs = do
contents <- blocksToDocbook opts (map plainToPara bodyBs)
return $
(if null identAttribs
then mempty
else selfClosingTag "anchor" identAttribs) $$ contents
blockToDocbook _ h@Header{} = do
-- should be handled by Div section above, except inside lists/blockquotes
report $ BlockNotRendered h

View file

@ -70,6 +70,58 @@ tests = [ testGroup "line blocks"
, "</para>" ]
)
]
, testGroup "divs"
[ "admonition" =: divWith ("foo", ["warning"], []) (para "This is a test")
=?> unlines
[ "<warning id=\"foo\">"
, " <para>"
, " This is a test"
, " </para>"
, "</warning>"
]
, "admonition-with-title" =:
divWith ("foo", ["attention"], []) (
divWith ("foo", ["title"], [])
(plain (text "This is title")) <>
para "This is a test"
)
=?> unlines
[ "<attention id=\"foo\">"
, " <title>This is title</title>"
, " <para>"
, " This is a test"
, " </para>"
, "</attention>"
]
, "single-child" =:
divWith ("foo", [], []) (para "This is a test")
=?> unlines
[ "<para id=\"foo\">"
, " This is a test"
, "</para>"
]
, "single-literal-child" =:
divWith ("foo", [], []) lineblock
=?> unlines
[ "<literallayout id=\"foo\">some text"
, "and more lines"
, "and again</literallayout>"
]
, "multiple-children" =:
divWith ("foo", [], []) (
para "This is a test" <>
para "This is an another test"
)
=?> unlines
[ "<anchor id=\"foo\" />"
, "<para>"
, " This is a test"
, "</para>"
, "<para>"
, " This is an another test"
, "</para>"
]
]
, testGroup "compact lists"
[ testGroup "bullet"
[ "compact" =: bulletList [plain "a", plain "b", plain "c"]