@@ -562,13 +562,11 @@ directive' = do
562 "rubric" -> B.para . B.strong <$> parseInlineFromString top
562 "rubric" -> B.para . B.strong <$> parseInlineFromString top
563 _ | label `elem` ["attention","caution","danger","error","hint",
563 _ | label `elem` ["attention","caution","danger","error","hint",
564 "important","note","tip","warning"] ->
564 "important","note","tip","warning"] ->
565− do let tit = B.para $ B.strong $ B.str label
566− bod <- parseFromString parseBlocks $ top ++ "\n\n" ++ body'
565+ do bod <- parseFromString parseBlocks $ top ++ "\n\n" ++ body'
567− return $ B.blockQuote $ tit <> bod
566+ return $ B.divWith ("",["admonition", label],[]) bod
568 "admonition" ->
567 "admonition" ->
569− do tit <- B.para . B.strong <$> parseInlineFromString top
570− bod <- parseFromString parseBlocks body'
568+ do bod <- parseFromString parseBlocks $ top ++ "\n\n" ++ body'
571− return $ B.blockQuote $ tit <> bod
569+ return $ B.divWith ("",["admonition"],[]) bod
572 "sidebar" ->
570 "sidebar" ->
573 do let subtit = maybe "" trim $ lookup "subtitle" fields
571 do let subtit = maybe "" trim $ lookup "subtitle" fields
574 tit <- B.para . B.strong <$> parseInlineFromString
572 tit <- B.para . B.strong <$> parseInlineFromString
@@ -576,11 +574,11 @@ directive' = do
577 else (": " ++ subtit))
575 else (": " ++ subtit))
578 bod <- parseFromString parseBlocks body'
576 bod <- parseFromString parseBlocks body'
579− return $ B.blockQuote $ tit <> bod
577+ return $ B.divWith ("",["sidebar"],[]) $ tit <> bod
580 "topic" ->
578 "topic" ->
581 do tit <- B.para . B.strong <$> parseInlineFromString top
579 do tit <- B.para . B.strong <$> parseInlineFromString top
582 bod <- parseFromString parseBlocks body'
580 bod <- parseFromString parseBlocks body'
583− return $ tit <> bod
581+ return $ B.divWith ("",["topic"],[]) $ tit <> bod
584 "default-role" -> mempty <$ updateState (\s ->
582 "default-role" -> mempty <$ updateState (\s ->
585 s { stateRstDefaultRole =
583 s { stateRstDefaultRole =
586 case trim top of
584 case trim top of