Merge pull request #1781 from bergey/rst

parse RST quoted literal blocks and class directives

2 files changed, 39 insertions, 4 deletions

diff --git a/src/Text/Pandoc/Readers/RST.hs b/src/Text/Pandoc/Readers/RST.hs
index e5eccb116..732956981 100644
--- a/src/Text/Pandoc/Readers/RST.hs
+++ b/src/Text/Pandoc/Readers/RST.hs
@@ -47,7 +47,7 @@ import Text.Pandoc.Builder (Inlines, Blocks, trimInlines, (<>))
 import qualified Text.Pandoc.Builder as B
 import Data.Monoid (mconcat, mempty)
 import Data.Sequence (viewr, ViewR(..))
-import Data.Char (toLower, isHexDigit)
+import Data.Char (toLower, isHexDigit, isSpace)
 
 -- | Parse reStructuredText string and return Pandoc document.
 readRST :: ReaderOptions -- ^ Reader options
@@ -335,6 +335,13 @@ indentedBlock = try $ do
   optional blanklines
   return $ unlines lns
 
+quotedBlock :: Parser [Char] st [Char]
+quotedBlock = try $ do
+    quote <- lookAhead $ oneOf "!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~"
+    lns <- many1 $ lookAhead (char quote) >> anyLine
+    optional blanklines
+    return $ unlines lns
+
 codeBlockStart :: Parser [Char] st Char
 codeBlockStart = string "::" >> blankline >> blankline
 
@@ -342,7 +349,8 @@ codeBlock :: Parser [Char] st Blocks
 codeBlock = try $ codeBlockStart >> codeBlockBody
 
 codeBlockBody :: Parser [Char] st Blocks
-codeBlockBody = try $ B.codeBlock . stripTrailingNewlines <$> indentedBlock
+codeBlockBody = try $ B.codeBlock . stripTrailingNewlines <$>
+                (indentedBlock <|> quotedBlock)
 
 lhsCodeBlock :: RSTParser Blocks
 lhsCodeBlock = try $ do
@@ -513,7 +521,6 @@ directive = try $ do
 -- TODO: line-block, parsed-literal, table, csv-table, list-table
 -- date
 -- include
--- class
 -- title
 directive' :: RSTParser Blocks
 directive' = do
@@ -594,6 +601,13 @@ directive' = do
                           Just t  -> B.link (escapeURI $ trim t) ""
                                      $ B.image src "" alt
                           Nothing -> B.image src "" alt
+        "class" -> do
+            let attrs = ("", (splitBy isSpace $ trim top), map (\(k,v) -> (k, trimr v)) fields)
+            --  directive content or the first immediately following element
+            children <- case body of
+                "" -> block
+                _ -> parseFromString parseBlocks  body'
+            return $ B.divWith attrs children
         _     -> return mempty
 
 -- TODO:
diff --git a/tests/Tests/Readers/RST.hs b/tests/Tests/Readers/RST.hs
index a80dc32b7..c97dcb149 100644
--- a/tests/Tests/Readers/RST.hs
+++ b/tests/Tests/Readers/RST.hs
@@ -67,5 +67,26 @@ tests = [ "line block with blank line" =:
                 link "http://foo.bar.baz" "" "http://foo.bar.baz" <> ". " <>
                 link "http://foo.bar/baz_(bam)" "" "http://foo.bar/baz_(bam)"
                 <> " (" <> link "http://foo.bar" "" "http://foo.bar" <> ")")
+        , "indented literal block" =: unlines
+          [ "::"
+          , ""
+          , "  block quotes"
+          , ""
+          , "  can go on for many lines"
+          , "but must stop here"]
+          =?> (doc $
+           codeBlock "block quotes\n\ncan go on for many lines" <>
+           para "but must stop here")
+        , "line block with 3 lines" =: "| a\n| b\n| c"
+          =?> para ("a" <> linebreak <>  "b" <> linebreak <> "c")
+          , "quoted literal block using >" =: "::\n\n> quoted\n> block\n\nOrdinary paragraph"
+            =?> codeBlock "> quoted\n> block" <> para "Ordinary paragraph"
+          , "quoted literal block using | (not  a line block)" =: "::\n\n| quoted\n| block\n\nOrdinary paragraph"
+            =?> codeBlock "| quoted\n| block" <> para "Ordinary paragraph"
+            , "class directive with single paragraph" =: ".. class:: special\n\nThis is a \"special\" paragraph."
+              =?> divWith ("", ["special"], []) (para "This is a \"special\" paragraph.")
+            , "class directive with two paragraphs" =: ".. class:: exceptional remarkable\n\n    First paragraph.\n\n    Second paragraph."
+              =?> divWith ("", ["exceptional", "remarkable"], []) (para "First paragraph." <> para "Second paragraph.")
+            , "class directive around literal block" =: ".. class:: classy\n\n::\n\n    a\n    b"
+              =?> divWith ("", ["classy"], []) (codeBlock "a\nb")
         ]
-