2 files changed, 24 insertions, 23 deletions
diff --git a/tests/Tests/Readers/RST.hs b/tests/Tests/Readers/RST.hs
index d404ef0ce..c0f60ff51 100644
--- a/tests/Tests/Readers/RST.hs
+++ b/tests/Tests/Readers/RST.hs
@@ -27,20 +27,20 @@ tests = [ "field list" =:
 :Authors: - Me
               - Myself
               - I
-:Indentation: Since the field marker may be quite long, the second 
-   and subsequent lines of the field body do not have to line up 
-   with the first line, but they must be indented relative to the 
-   field name marker, and they must line up with each other. 
-:Parameter i: integer 
+:Indentation: Since the field marker may be quite long, the second
+   and subsequent lines of the field body do not have to line up
+   with the first line, but they must be indented relative to the
+   field name marker, and they must line up with each other.
+:Parameter i: integer
 |]         =?> ( setAuthors ["Me","Myself","I"]
                $ setDate "2001-08-16"
                $ doc
-               $ definitionList [ (str "Hostname", [plain "media08"])
-                                , (str "IP address", [plain "10.0.0.19"])
-                                , (str "Size", [plain "3ru"])
-                                , (str "Version", [plain "1"])
-                                , (str "Indentation", [para "Since the field marker may be quite long, the second. and subsequent lines of the field body do not have to line up. with the first line, but they must be indented relative to the. field name marker, and they must line up with each other."])
-                                , (str "Parameter i", [plain "integer"])
+               $ definitionList [ (str "Hostname", [para "media08"])
+                                , (str "IP address", [para "10.0.0.19"])
+                                , (str "Size", [para "3ru"])
+                                , (str "Version", [para "1"])
+                                , (str "Indentation", [para "Since the field marker may be quite long, the second and subsequent lines of the field body do not have to line up with the first line, but they must be indented relative to the field name marker, and they must line up with each other."])
+                                , (str "Parameter i", [para "integer"])
                               ])
         ]
 
diff --git a/tests/rst-reader.native b/tests/rst-reader.native
index e11e7b0ed..0213f789e 100644
--- a/tests/rst-reader.native
+++ b/tests/rst-reader.native
@@ -1,7 +1,7 @@
 Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite",Str ":",Space,Str "Subtitle"], docAuthors = [[Str "John",Space,Str "MacFarlane"],[Str "Anonymous"]], docDate = [Str "July",Space,Str "17,",Space,Str "2006"]})
 [DefinitionList
  [([Str "Revision"],
-   [[Plain [Str "3"]]])]
+   [[Para [Str "3"]]])]
 ,Header 1 [Str "Level",Space,Str "one",Space,Str "header"]
 ,Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "set",Space,Str "of",Space,Str "tests",Space,Str "for",Space,Str "pandoc",Str ".",Space,Str "Most",Space,Str "of",Space,Str "them",Space,Str "are",Space,Str "adapted",Space,Str "from",Space,Str "John",Space,Str "Gruber",Apostrophe,Str "s",Space,Str "markdown",Space,Str "test",Space,Str "suite",Str "."]
 ,Header 2 [Str "Level",Space,Str "two",Space,Str "header"]
@@ -158,20 +158,21 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite",Str ":
  ,([Str "term",Space,Str "with",Space,Emph [Str "emphasis"]],
    [[Para [Str "Definition",Space,Str "3",Str "."]]])]
 ,Header 1 [Str "Field",Space,Str "Lists"]
+,BlockQuote
+ [DefinitionList
+  [([Str "address"],
+    [[Para [Str "61",Space,Str "Main",Space,Str "St",Str "."]]])
+  ,([Str "city"],
+    [[Para [Emph [Str "Nowhere"],Str ",",Space,Str "MA,",Space,Str "USA"]]])
+  ,([Str "phone"],
+    [[Para [Str "123",EnDash,Str "4567"]]])]]
 ,DefinitionList
  [([Str "address"],
-   [[Plain [Str "61",Space,Str "Main",Space,Str "St",Str "."]]])
- ,([Str "city"],
-   [[Plain [Emph [Str "Nowhere"],Str ",",Space,Str "MA,",Space,Str "USA"]]])
- ,([Str "phone"],
-   [[Plain [Str "123",EnDash,Str "4567"]]])]
-,DefinitionList
- [([Str "address"],
-   [[Plain [Str "61",Space,Str "Main",Space,Str "St",Str "."]]])
+   [[Para [Str "61",Space,Str "Main",Space,Str "St",Str "."]]])
  ,([Str "city"],
-   [[Plain [Emph [Str "Nowhere"],Str ",",Space,Str "MA,",Space,Str "USA"]]])
+   [[Para [Emph [Str "Nowhere"],Str ",",Space,Str "MA,",Space,Str "USA"]]])
  ,([Str "phone"],
-   [[Plain [Str "123",EnDash,Str "4567"]]])]
+   [[Para [Str "123",EnDash,Str "4567"]]])]
 ,Header 1 [Str "HTML",Space,Str "Blocks"]
 ,Para [Str "Simple",Space,Str "block",Space,Str "on",Space,Str "one",Space,Str "line",Str ":"]
 ,RawBlock "html" "<div>foo</div>\n"
@@ -223,7 +224,7 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite",Str ":
 ,Header 1 [Str "Images"]
 ,Para [Str "From",Space,Quoted DoubleQuote [Str "Voyage",Space,Str "dans",Space,Str "la",Space,Str "Lune"],Space,Str "by",Space,Str "Georges",Space,Str "Melies",Space,Str "(1902)",Str ":"]
 ,Plain [Image [Str "image"] ("lalune.jpg","")]
-,Plain [Image [Str "Voyage dans la Lune"] ("lalune.jpg","Voyage dans la Lune")]
+,Plain [Image [Str "Voyage dans la Lune"] ("lalune.jpg","")]
 ,Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "movie",Space,Image [Str "movie"] ("movie.jpg",""),Space,Str "icon",Str "."]
 ,Header 1 [Str "Comments"]
 ,Para [Str "First",Space,Str "paragraph"]