From b07ea7a02d94de042003a2287e5f5216a41e4e4e Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sun, 30 Sep 2012 09:59:22 -0700
Subject: RST reader: Consolidated rawBlock into directive.

---
 src/Text/Pandoc/Readers/RST.hs | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/Text/Pandoc/Readers/RST.hs b/src/Text/Pandoc/Readers/RST.hs
index d6aa5aba1..e3ab7032b 100644
--- a/src/Text/Pandoc/Readers/RST.hs
+++ b/src/Text/Pandoc/Readers/RST.hs
@@ -132,7 +132,6 @@ parseBlocks = mconcat <$> manyTill block eof
 
 block :: RSTParser Blocks
 block = choice [ codeBlock
-               , rawBlock
                , blockQuote
                , fieldList
                , directive
@@ -353,18 +352,6 @@ lhsCodeBlock = try $ do
 birdTrackLine :: Parser [Char] st [Char]
 birdTrackLine = char '>' >> manyTill anyChar newline
 
---
--- raw html/latex/etc
---
-
-rawBlock :: Parser [Char] st Blocks
-rawBlock = try $ do
-  string ".. raw:: "
-  lang <- many1 (letter <|> digit)
-  blanklines
-  result <- indentedBlock
-  return $ B.rawBlock lang result
-
 --
 -- block quotes
 --
@@ -501,10 +488,8 @@ directive = try $ do
   directive'
 
 -- TODO: line-block, parsed-literal, table, csv-table, list-table
--- replace, unicode
 -- date
 -- include
--- raw (consolidate)
 -- class
 -- title
 directive' :: RSTParser Blocks
@@ -523,6 +508,7 @@ directive' = do
   optional blanklines
   let body' = body ++ "\n\n"
   case label of
+        "raw" -> return $ B.rawBlock (trim top) (stripTrailingNewlines body)
         "container" -> parseFromString parseBlocks body'
         "replace" -> B.para <$>  -- consumed by substKey
                    parseFromString (trimInlines . mconcat <$> many inline)
-- 
cgit v1.2.3