From 00dc1e715e6317ab499c864137bb2a6bf7a75364 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Thu, 26 Jul 2012 22:59:56 -0700 Subject: Moved WriterOptions and associated types Shared -> Options. --- tests/Tests/Writers/ConTeXt.hs | 5 ++--- tests/Tests/Writers/HTML.hs | 2 +- tests/Tests/Writers/LaTeX.hs | 2 +- tests/Tests/Writers/Markdown.hs | 2 +- tests/Tests/Writers/Native.hs | 4 ++-- 5 files changed, 7 insertions(+), 8 deletions(-) (limited to 'tests/Tests/Writers') diff --git a/tests/Tests/Writers/ConTeXt.hs b/tests/Tests/Writers/ConTeXt.hs index beb6411f0..2cb8ececa 100644 --- a/tests/Tests/Writers/ConTeXt.hs +++ b/tests/Tests/Writers/ConTeXt.hs @@ -8,11 +8,10 @@ import Tests.Helpers import Tests.Arbitrary() context :: (ToString a, ToPandoc a) => a -> String -context = writeConTeXt defaultWriterOptions . toPandoc +context = writeConTeXt def . toPandoc context' :: (ToString a, ToPandoc a) => a -> String -context' = writeConTeXt defaultWriterOptions{ writerWrapText = False } - . toPandoc +context' = writeConTeXt def{ writerWrapText = False } . toPandoc {- "my test" =: X =?> Y diff --git a/tests/Tests/Writers/HTML.hs b/tests/Tests/Writers/HTML.hs index 8561aa421..5d6e301c5 100644 --- a/tests/Tests/Writers/HTML.hs +++ b/tests/Tests/Writers/HTML.hs @@ -9,7 +9,7 @@ import Tests.Arbitrary() import Text.Pandoc.Highlighting (languages) -- null if no hl support html :: (ToString a, ToPandoc a) => a -> String -html = writeHtmlString defaultWriterOptions{ writerWrapText = False } . toPandoc +html = writeHtmlString def{ writerWrapText = False } . toPandoc {- "my test" =: X =?> Y diff --git a/tests/Tests/Writers/LaTeX.hs b/tests/Tests/Writers/LaTeX.hs index 7987716f3..16e0c3f23 100644 --- a/tests/Tests/Writers/LaTeX.hs +++ b/tests/Tests/Writers/LaTeX.hs @@ -8,7 +8,7 @@ import Tests.Helpers import Tests.Arbitrary() latex :: (ToString a, ToPandoc a) => a -> String -latex = writeLaTeX defaultWriterOptions . toPandoc +latex = writeLaTeX def . toPandoc {- "my test" =: X =?> Y diff --git a/tests/Tests/Writers/Markdown.hs b/tests/Tests/Writers/Markdown.hs index d90dc83b1..22ce8b27c 100644 --- a/tests/Tests/Writers/Markdown.hs +++ b/tests/Tests/Writers/Markdown.hs @@ -8,7 +8,7 @@ import Tests.Helpers import Tests.Arbitrary() markdown :: (ToString a, ToPandoc a) => a -> String -markdown = writeMarkdown defaultWriterOptions . toPandoc +markdown = writeMarkdown def . toPandoc {- "my test" =: X =?> Y diff --git a/tests/Tests/Writers/Native.hs b/tests/Tests/Writers/Native.hs index 19740e0f4..e199cf94e 100644 --- a/tests/Tests/Writers/Native.hs +++ b/tests/Tests/Writers/Native.hs @@ -8,11 +8,11 @@ import Tests.Arbitrary() p_write_rt :: Pandoc -> Bool p_write_rt d = - read (writeNative defaultWriterOptions{ writerStandalone = True } d) == d + read (writeNative def{ writerStandalone = True } d) == d p_write_blocks_rt :: [Block] -> Bool p_write_blocks_rt bs = length bs > 20 || - read (writeNative defaultWriterOptions (Pandoc (Meta [] [] []) bs)) == + read (writeNative def (Pandoc (Meta [] [] []) bs)) == bs tests :: [Test] -- cgit v1.2.3