diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2012-07-25 22:35:41 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2012-07-25 22:35:41 -0700 |
| commit | acde1e82d2f070ceab8d0fd01ad3677c6c9e078c (patch) | |
| tree | cc067dff2c2d81d4d30afbcd513e39c5cb2951dd /src/Tests | |
| parent | 9b5d2031c7d643de3397da2e4f38b2f6b45feb64 (diff) | |
| download | pandoc-acde1e82d2f070ceab8d0fd01ad3677c6c9e078c.tar.gz | |
Changed reader parameters from ParserState to ReaderOptions.
Diffstat (limited to 'src/Tests')
| -rw-r--r-- | src/Tests/Readers/LaTeX.hs | 2 | ||||
| -rw-r--r-- | src/Tests/Readers/Markdown.hs | 11 | ||||
| -rw-r--r-- | src/Tests/Readers/RST.hs | 2 |
3 files changed, 6 insertions, 9 deletions
diff --git a/src/Tests/Readers/LaTeX.hs b/src/Tests/Readers/LaTeX.hs index d60026b20..febc91765 100644 --- a/src/Tests/Readers/LaTeX.hs +++ b/src/Tests/Readers/LaTeX.hs @@ -9,7 +9,7 @@ import Text.Pandoc.Builder import Text.Pandoc latex :: String -> Pandoc -latex = readLaTeX defaultParserState +latex = readLaTeX def infix 4 =: (=:) :: ToString c diff --git a/src/Tests/Readers/Markdown.hs b/src/Tests/Readers/Markdown.hs index ca7dc457b..543802795 100644 --- a/src/Tests/Readers/Markdown.hs +++ b/src/Tests/Readers/Markdown.hs @@ -10,12 +10,10 @@ import Text.Pandoc.Builder import Text.Pandoc markdown :: String -> Pandoc -markdown = readMarkdown defaultParserState +markdown = readMarkdown def markdownSmart :: String -> Pandoc -markdownSmart = readMarkdown defaultParserState{ stateOptions = - let oldOpts = stateOptions defaultParserState in - oldOpts { readerSmart = True } } +markdownSmart = readMarkdown def { readerSmart = True } infix 4 =: (=:) :: ToString c @@ -27,7 +25,7 @@ p_markdown_round_trip :: Block -> Bool p_markdown_round_trip b = matches d' d'' where d' = normalize $ Pandoc (Meta [] [] []) [b] d'' = normalize - $ readMarkdown defaultParserState{ stateSmart = True } + $ readMarkdown def { readerSmart = True } $ writeMarkdown defaultWriterOptions d' matches (Pandoc _ [Plain []]) (Pandoc _ []) = True matches (Pandoc _ [Para []]) (Pandoc _ []) = True @@ -93,8 +91,7 @@ tests = [ testGroup "inline code" =?> para (note (para "See [^1]")) ] , testGroup "lhs" - [ test (readMarkdown def{stateOptions = - def{readerLiterateHaskell = True}}) + [ test (readMarkdown def{ readerLiterateHaskell = True }) "inverse bird tracks and html" $ "> a\n\n< b\n\n<div>\n" =?> codeBlockWith ("",["sourceCode","literate","haskell"],[]) "a" diff --git a/src/Tests/Readers/RST.hs b/src/Tests/Readers/RST.hs index 5601731a0..fdce7c8f6 100644 --- a/src/Tests/Readers/RST.hs +++ b/src/Tests/Readers/RST.hs @@ -9,7 +9,7 @@ import Text.Pandoc.Builder import Text.Pandoc rst :: String -> Pandoc -rst = readRST defaultParserState +rst = readRST def infix 4 =: (=:) :: ToString c |