RST reader: Use Text.Pandoc.Builder.

This will give us more flexibility in the future.
It also gives built-in normalization.  Performance slightly
better.

1 files changed, 22 insertions, 22 deletions

diff --git a/tests/tables-rstsubset.native b/tests/tables-rstsubset.native
index ef89fea29..887d0ca17 100644
--- a/tests/tables-rstsubset.native
+++ b/tests/tables-rstsubset.native
@@ -1,4 +1,4 @@
-[Para [Str "Simple",Space,Str "table",Space,Str "with",Space,Str "caption",Str ":"]
+[Para [Str "Simple",Space,Str "table",Space,Str "with",Space,Str "caption:"]
 ,Table [] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.125,0.1125,0.1375,0.15]
  [[Plain [Str "Right"]]
  ,[Plain [Str "Left"]]
@@ -16,8 +16,8 @@
   ,[Plain [Str "1"]]
   ,[Plain [Str "1"]]
   ,[Plain [Str "1"]]]]
-,Para [Str "Table",Str ":",Space,Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax",Str "."]
-,Para [Str "Simple",Space,Str "table",Space,Str "without",Space,Str "caption",Str ":"]
+,Para [Str "Table:",Space,Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."]
+,Para [Str "Simple",Space,Str "table",Space,Str "without",Space,Str "caption:"]
 ,Table [] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.125,0.1125,0.1375,0.15]
  [[Plain [Str "Right"]]
  ,[Plain [Str "Left"]]
@@ -35,7 +35,7 @@
   ,[Plain [Str "1"]]
   ,[Plain [Str "1"]]
   ,[Plain [Str "1"]]]]
-,Para [Str "Simple",Space,Str "table",Space,Str "indented",Space,Str "two",Space,Str "spaces",Str ":"]
+,Para [Str "Simple",Space,Str "table",Space,Str "indented",Space,Str "two",Space,Str "spaces:"]
 ,Table [] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.125,0.1125,0.1375,0.15]
  [[Plain [Str "Right"]]
  ,[Plain [Str "Left"]]
@@ -53,8 +53,8 @@
   ,[Plain [Str "1"]]
   ,[Plain [Str "1"]]
   ,[Plain [Str "1"]]]]
-,Para [Str "Table",Str ":",Space,Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax",Str "."]
-,Para [Str "Multiline",Space,Str "table",Space,Str "with",Space,Str "caption",Str ":"]
+,Para [Str "Table:",Space,Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."]
+,Para [Str "Multiline",Space,Str "table",Space,Str "with",Space,Str "caption:"]
 ,Table [] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.175,0.1625,0.1875,0.3625]
  [[Plain [Str "Centered",Space,Str "Header"]]
  ,[Plain [Str "Left",Space,Str "Aligned"]]
@@ -62,14 +62,14 @@
  ,[Plain [Str "Default",Space,Str "aligned"]]]
  [[[Plain [Str "First"]]
   ,[Plain [Str "row"]]
-  ,[Plain [Str "12",Str ".",Str "0"]]
-  ,[Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",Space,Str "multiple",Space,Str "lines",Str "."]]]
+  ,[Plain [Str "12.0"]]
+  ,[Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",Space,Str "multiple",Space,Str "lines."]]]
  ,[[Plain [Str "Second"]]
   ,[Plain [Str "row"]]
-  ,[Plain [Str "5",Str ".",Str "0"]]
-  ,[Plain [Str "Here",Str "'",Str "s",Space,Str "another",Space,Str "one",Str ".",Space,Str "Note",Space,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows",Str "."]]]]
-,Para [Str "Table",Str ":",Space,Str "Here",Str "'",Str "s",Space,Str "the",Space,Str "caption",Str ".",Space,Str "It",Space,Str "may",Space,Str "span",Space,Str "multiple",Space,Str "lines",Str "."]
-,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "caption",Str ":"]
+  ,[Plain [Str "5.0"]]
+  ,[Plain [Str "Here's",Space,Str "another",Space,Str "one.",Space,Str "Note",Space,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows."]]]]
+,Para [Str "Table:",Space,Str "Here's",Space,Str "the",Space,Str "caption.",Space,Str "It",Space,Str "may",Space,Str "span",Space,Str "multiple",Space,Str "lines."]
+,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "caption:"]
 ,Table [] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.175,0.1625,0.1875,0.3625]
  [[Plain [Str "Centered",Space,Str "Header"]]
  ,[Plain [Str "Left",Space,Str "Aligned"]]
@@ -77,13 +77,13 @@
  ,[Plain [Str "Default",Space,Str "aligned"]]]
  [[[Plain [Str "First"]]
   ,[Plain [Str "row"]]
-  ,[Plain [Str "12",Str ".",Str "0"]]
-  ,[Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",Space,Str "multiple",Space,Str "lines",Str "."]]]
+  ,[Plain [Str "12.0"]]
+  ,[Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",Space,Str "multiple",Space,Str "lines."]]]
  ,[[Plain [Str "Second"]]
   ,[Plain [Str "row"]]
-  ,[Plain [Str "5",Str ".",Str "0"]]
-  ,[Plain [Str "Here",Str "'",Str "s",Space,Str "another",Space,Str "one",Str ".",Space,Str "Note",Space,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows",Str "."]]]]
-,Para [Str "Table",Space,Str "without",Space,Str "column",Space,Str "headers",Str ":"]
+  ,[Plain [Str "5.0"]]
+  ,[Plain [Str "Here's",Space,Str "another",Space,Str "one.",Space,Str "Note",Space,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows."]]]]
+,Para [Str "Table",Space,Str "without",Space,Str "column",Space,Str "headers:"]
 ,Table [] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.1,0.1,0.1,0.1]
  [[]
  ,[]
@@ -101,7 +101,7 @@
   ,[Plain [Str "1"]]
   ,[Plain [Str "1"]]
   ,[Plain [Str "1"]]]]
-,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "column",Space,Str "headers",Str ":"]
+,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "column",Space,Str "headers:"]
 ,Table [] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.175,0.1625,0.1875,0.3625]
  [[]
  ,[]
@@ -109,9 +109,9 @@
  ,[]]
  [[[Plain [Str "First"]]
   ,[Plain [Str "row"]]
-  ,[Plain [Str "12",Str ".",Str "0"]]
-  ,[Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",Space,Str "multiple",Space,Str "lines",Str "."]]]
+  ,[Plain [Str "12.0"]]
+  ,[Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",Space,Str "multiple",Space,Str "lines."]]]
  ,[[Plain [Str "Second"]]
   ,[Plain [Str "row"]]
-  ,[Plain [Str "5",Str ".",Str "0"]]
-  ,[Plain [Str "Here",Str "'",Str "s",Space,Str "another",Space,Str "one",Str ".",Space,Str "Note",Space,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows",Str "."]]]]]
+  ,[Plain [Str "5.0"]]
+  ,[Plain [Str "Here's",Space,Str "another",Space,Str "one.",Space,Str "Note",Space,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows."]]]]]