From 3263ed3c42b0f6d162dba5649ad1c44544fc3683 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@Johns-MacBook-Pro.local>
Date: Wed, 20 Jul 2016 10:14:24 -0700
Subject: RST reader:  use Div for admonitions.

Previously blockquotes were used.  Now a Div is used
with class `admonition` and (if relevant) one of the
following:  `attention`, `caution`, `danger`, `error`,
`hint`, `important`, `note`, `tip`, `warning`.

`sidebar` is also put into a Div.

Note: This will change rendering of RST documents!
It should provide much more flexibility.

Closes #3031.
---
 src/Text/Pandoc/Readers/RST.hs | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'src/Text')

diff --git a/src/Text/Pandoc/Readers/RST.hs b/src/Text/Pandoc/Readers/RST.hs
index 60d69638b..46f082ccd 100644
--- a/src/Text/Pandoc/Readers/RST.hs
+++ b/src/Text/Pandoc/Readers/RST.hs
@@ -562,13 +562,11 @@ directive' = do
         "rubric" -> B.para . B.strong <$> parseInlineFromString top
         _ | label `elem` ["attention","caution","danger","error","hint",
                           "important","note","tip","warning"] ->
-           do let tit = B.para $ B.strong $ B.str label
-              bod <- parseFromString parseBlocks $ top ++ "\n\n" ++ body'
-              return $ B.blockQuote $ tit <> bod
+           do bod <- parseFromString parseBlocks $ top ++ "\n\n" ++ body'
+              return $ B.divWith ("",["admonition", label],[]) bod
         "admonition" ->
-           do tit <- B.para . B.strong <$> parseInlineFromString top
-              bod <- parseFromString parseBlocks body'
-              return $ B.blockQuote $ tit <> bod
+           do bod <- parseFromString parseBlocks $ top ++ "\n\n" ++ body'
+              return $ B.divWith ("",["admonition"],[]) bod
         "sidebar" ->
            do let subtit = maybe "" trim $ lookup "subtitle" fields
               tit <- B.para . B.strong <$> parseInlineFromString
@@ -576,11 +574,11 @@ directive' = do
                                           then ""
                                           else (":  " ++ subtit))
               bod <- parseFromString parseBlocks body'
-              return $ B.blockQuote $ tit <> bod
+              return $ B.divWith ("",["sidebar"],[]) $ tit <> bod
         "topic" ->
            do tit <- B.para . B.strong <$> parseInlineFromString top
               bod <- parseFromString parseBlocks body'
-              return $ tit <> bod
+              return $ B.divWith ("",["topic"],[]) $ tit <> bod
         "default-role" -> mempty <$ updateState (\s ->
                               s { stateRstDefaultRole =
                                   case trim top of
-- 
cgit v1.2.3