diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/RunTests.hs | 4 | ||||
| -rw-r--r-- | tests/rst-reader.native | 46 | ||||
| -rw-r--r-- | tests/rst-reader.rst | 38 |
3 files changed, 86 insertions, 2 deletions
diff --git a/tests/RunTests.hs b/tests/RunTests.hs index 565ce8d7f..635c0b8b0 100644 --- a/tests/RunTests.hs +++ b/tests/RunTests.hs @@ -93,6 +93,8 @@ main = do "markdown-reader-more.txt" "markdown-reader-more.native" r8 <- runTest "rst reader" ["-r", "rst", "-w", "native", "-s", "-S"] "rst-reader.rst" "rst-reader.native" + r8a <- runTest "rst reader (tables)" ["-r", "rst", "-w", "native"] + "tables.rst" "tables-rstsubset.native" r9 <- runTest "html reader" ["-r", "html", "-w", "native", "-s"] "html-reader.html" "html-reader.native" r10 <- runTest "latex reader" ["-r", "latex", "-w", "native", "-s", "-R"] @@ -105,7 +107,7 @@ main = do r13s <- if runLhsTests then mapM runLhsReaderTest lhsReaderFormats else putStrLn "Skipping lhs reader tests because they presuppose highlighting support" >> return [] - let results = r1s ++ [r2, r3, r4, r5, r6, r7, r7a, r8, r9, r10, r11] ++ r12s ++ r13s + let results = r1s ++ [r2, r3, r4, r5, r6, r7, r7a, r8, r8a, r9, r10, r11] ++ r12s ++ r13s if all id results then do putStrLn "\nAll tests passed." diff --git a/tests/rst-reader.native b/tests/rst-reader.native index d5b4ba77b..f3c1e5bd2 100644 --- a/tests/rst-reader.native +++ b/tests/rst-reader.native @@ -243,5 +243,49 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite",Str ":",Space,Str , Para [Str "A",Space,Str "third",Space,Str "paragraph"] , Header 1 [Str "Line",Space,Str "blocks"] , Para [Str "But",Space,Str "can",Space,Str "a",Space,Str "bee",Space,Str "be",Space,Str "said",Space,Str "to",Space,Str "be",LineBreak,Str " ",Str "or",Space,Str "not",Space,Str "to",Space,Str "be",Space,Str "an",Space,Str "entire",Space,Str "bee,",LineBreak,Str " ",Str "when",Space,Str "half",Space,Str "the",Space,Str "bee",Space,Str "is",Space,Str "not",Space,Str "a",Space,Str "bee,",LineBreak,Str " ",Str "due",Space,Str "to",Space,Str "some",Space,Str "ancient",Space,Str "injury?"] -, Para [Str "Continuation",Space,Str "line",LineBreak,Str " ",Str "and",Space,Str "another"] ] +, Para [Str "Continuation",Space,Str "line",LineBreak,Str " ",Str "and",Space,Str "another"] +, Header 1 [Str "Simple",Space,Str "Tables"] +, Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0] + [ [ Plain [Str "col",Space,Str "1"] ] + , [ Plain [Str "col",Space,Str "2"] ] + , [ Plain [Str "col",Space,Str "3"] ] ] [ + [ [ Plain [Str "r1",Space,Str "a"] ] + , [ Plain [Str "b"] ] + , [ Plain [Str "c"] ] ], + [ [ Plain [Str "r2",Space,Str "d"] ] + , [ Plain [Str "e"] ] + , [ Plain [Str "f"] ] ] ] +, Para [Str "Headless"] +, Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0] + [ [] + , [] + , [] ] [ + [ [ Plain [Str "r1",Space,Str "a"] ] + , [ Plain [Str "b"] ] + , [ Plain [Str "c"] ] ], + [ [ Plain [Str "r2",Space,Str "d"] ] + , [ Plain [Str "e"] ] + , [ Plain [Str "f"] ] ] ] +, Header 1 [Str "Grid",Space,Str "Tables"] +, Table [] [AlignDefault,AlignDefault,AlignDefault] [0.2375,0.15,0.1625] + [ [ Plain [Str "col",Space,Str "1"] ] + , [ Plain [Str "col",Space,Str "2"] ] + , [ Plain [Str "col",Space,Str "3"] ] ] [ + [ [ Plain [Str "r1",Space,Str "a",Space,Str "r1",Space,Str "bis"] ] + , [ Plain [Str "b",Space,Str "b",Space,Str "2"] ] + , [ Plain [Str "c",Space,Str "c",Space,Str "2"] ] ], + [ [ Plain [Str "r2",Space,Str "d"] ] + , [ Plain [Str "e"] ] + , [ Plain [Str "f"] ] ] ] +, Para [Str "Headless"] +, Table [] [AlignDefault,AlignDefault,AlignDefault] [0.2375,0.15,0.1625] + [ [] + , [] + , [] ] [ + [ [ Plain [Str "r1",Space,Str "a",Space,Str "r1",Space,Str "bis"] ] + , [ Plain [Str "b",Space,Str "b",Space,Str "2"] ] + , [ Plain [Str "c",Space,Str "c",Space,Str "2"] ] ], + [ [ Plain [Str "r2",Space,Str "d"] ] + , [ Plain [Str "e"] ] + , [ Plain [Str "f"] ] ] ] ] diff --git a/tests/rst-reader.rst b/tests/rst-reader.rst index 676698430..ccc248aee 100644 --- a/tests/rst-reader.rst +++ b/tests/rst-reader.rst @@ -453,3 +453,41 @@ Line blocks | and another +Simple Tables +============= + +================== =========== ========== +col 1 col 2 col 3 +================== =========== ========== +r1 a b c +r2 d e f +================== =========== ========== + +Headless + +================== =========== ========== +r1 a b c +r2 d e f +================== =========== ========== + + +Grid Tables +=========== + ++------------------+-----------+------------+ +| col 1 | col 2 | col 3 | ++==================+===========+============+ +| r1 a | b | c | +| r1 bis | b 2 | c 2 | ++------------------+-----------+------------+ +| r2 d | e | f | ++------------------+-----------+------------+ + +Headless + ++------------------+-----------+------------+ +| r1 a | b | c | +| r1 bis | b 2 | c 2 | ++------------------+-----------+------------+ +| r2 d | e | f | ++------------------+-----------+------------+ |