summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2017-01-26 22:40:57 +0100
committerJohn MacFarlane <jgm@berkeley.edu>2017-01-26 22:40:57 +0100
commitb6c1d491f5379f1924657f525540766dbbc1ae0f (patch)
treece5c2dfcbf5cea06936bdec4924d8bb2330b4d72 /tests
parent190943e1fd75b7fa30689387e4416dd81b584f5e (diff)
Split writeDocbook into writeDocbook4, writeDocbook5.
Removed writerDocbookVersion in WriterOptions. Renamed default.docbook template to default.docbook4. Allow docbook4 as an output format. But alias docbook = docbook4.
Diffstat (limited to 'tests')
-rw-r--r--tests/Tests/Old.hs2
-rw-r--r--tests/Tests/Writers/Docbook.hs2
-rw-r--r--tests/tables.docbook4 (renamed from tests/tables.docbook)0
-rw-r--r--tests/writer.docbook4 (renamed from tests/writer.docbook)0
4 files changed, 2 insertions, 2 deletions
diff --git a/tests/Tests/Old.hs b/tests/Tests/Old.hs
index a46ac2260..f22636747 100644
--- a/tests/Tests/Old.hs
+++ b/tests/Tests/Old.hs
@@ -99,7 +99,7 @@ tests = [ testGroup "markdown"
"textile-reader.textile" "textile-reader.native"
]
, testGroup "docbook"
- [ testGroup "writer" $ writerTests "docbook"
+ [ testGroup "writer" $ writerTests "docbook4"
, test "reader" ["-r", "docbook", "-w", "native", "-s"]
"docbook-reader.docbook" "docbook-reader.native"
, test "reader" ["-r", "docbook", "-w", "native", "-s"]
diff --git a/tests/Tests/Writers/Docbook.hs b/tests/Tests/Writers/Docbook.hs
index adf6e9050..f34f2495c 100644
--- a/tests/Tests/Writers/Docbook.hs
+++ b/tests/Tests/Writers/Docbook.hs
@@ -11,7 +11,7 @@ docbook :: (ToPandoc a) => a -> String
docbook = docbookWithOpts def{ writerWrapText = WrapNone }
docbookWithOpts :: ToPandoc a => WriterOptions -> a -> String
-docbookWithOpts opts = purely (writeDocbook opts) . toPandoc
+docbookWithOpts opts = purely (writeDocbook4 opts) . toPandoc
{-
"my test" =: X =?> Y
diff --git a/tests/tables.docbook b/tests/tables.docbook4
index f86b1c390..f86b1c390 100644
--- a/tests/tables.docbook
+++ b/tests/tables.docbook4
diff --git a/tests/writer.docbook b/tests/writer.docbook4
index eee19cdd9..eee19cdd9 100644
--- a/tests/writer.docbook
+++ b/tests/writer.docbook4