@@ -46,7 +46,7 @@ import Text.Printf ( printf )
46import Text.Pandoc.Builder (Inlines, Blocks, trimInlines)
46import Text.Pandoc.Builder (Inlines, Blocks, trimInlines)
47import qualified Text.Pandoc.Builder as B
47import qualified Text.Pandoc.Builder as B
48import Data.Sequence (viewr, ViewR(..))
48import Data.Sequence (viewr, ViewR(..))
49−import Data.Char (toLower, isHexDigit, isSpace)
49+import Data.Char (toLower, isHexDigit, isSpace, toUpper)
50import Data.Monoid ((<>))
50import Data.Monoid ((<>))
51import Control.Monad.Except (throwError)
51import Control.Monad.Except (throwError)
52import Text.Pandoc.Class (PandocMonad, warning, readFileFromDirs,
52import Text.Pandoc.Class (PandocMonad, warning, readFileFromDirs,
@@ -633,12 +633,14 @@ directive' = do
633 "highlights" -> B.blockQuote <$> parseFromString parseBlocks body'
633 "highlights" -> B.blockQuote <$> parseFromString parseBlocks body'
634 "rubric" -> B.para . B.strong <$> parseInlineFromString top
634 "rubric" -> B.para . B.strong <$> parseInlineFromString top
635 _ | label `elem` ["attention","caution","danger","error","hint",
635 _ | label `elem` ["attention","caution","danger","error","hint",
636− "important","note","tip","warning"] ->
636+ "important","note","tip","warning","admonition"] ->
637 do bod <- parseFromString parseBlocks $ top ++ "\n\n" ++ body'
637 do bod <- parseFromString parseBlocks $ top ++ "\n\n" ++ body'
638+ let lab = case label of
639+ "admonition" -> mempty
638− return $ B.divWith ("",["admonition", label],[]) bod
640+ (l:ls) -> B.divWith ("",["admonition-title"],[])
639− "admonition" ->
641+ (B.para (B.str (toUpper l : ls)))
640− do bod <- parseFromString parseBlocks $ top ++ "\n\n" ++ body'
642+ [] -> mempty
641− return $ B.divWith ("",["admonition"],[]) bod
643+ return $ B.divWith ("",[label],[]) (lab <> bod)
642 "sidebar" ->
644 "sidebar" ->
643 do let subtit = maybe "" trim $ lookup "subtitle" fields
645 do let subtit = maybe "" trim $ lookup "subtitle" fields
644 tit <- B.para . B.strong <$> parseInlineFromString
646 tit <- B.para . B.strong <$> parseInlineFromString