diff options
author | John MacFarlane <jgm@berkeley.edu> | 2019-07-26 12:00:44 -0700 |
---|---|---|
committer | John MacFarlane <jgm@berkeley.edu> | 2019-07-28 19:25:45 -0700 |
commit | b35fae651145482f1218d32dbea5fffff60e0b0b (patch) | |
tree | 02175f056c40aee4329b8f944ada9c9cd6ac1284 /test/Tests/Readers | |
parent | 99e24cf18337b0b460005bf77e367783c34b75e7 (diff) | |
download | pandoc-b35fae651145482f1218d32dbea5fffff60e0b0b.tar.gz |
Use doctemplates 0.3, change type of writerTemplate.
* Require recent doctemplates. It is more flexible and
supports partials.
* Changed type of writerTemplate to Maybe Template instead
of Maybe String.
* Remove code from the LaTeX, Docbook, and JATS writers that looked in
the template for strings to determine whether it is a book or an
article, or whether csquotes is used. This was always kludgy and
unreliable. To use csquotes for LaTeX, set `csquotes` in your
variables or metadata. It is no longer sufficient to put
`\usepackage{csquotes}` in your template or header includes.
To specify a book style, use the `documentclass` variable or
`--top-level-division`.
* Change template code to use new API for doctemplates.
Diffstat (limited to 'test/Tests/Readers')
-rw-r--r-- | test/Tests/Readers/Docx.hs | 2 | ||||
-rw-r--r-- | test/Tests/Readers/FB2.hs | 2 | ||||
-rw-r--r-- | test/Tests/Readers/Odt.hs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/test/Tests/Readers/Docx.hs b/test/Tests/Readers/Docx.hs index e5bbabadf..9d0913e55 100644 --- a/test/Tests/Readers/Docx.hs +++ b/test/Tests/Readers/Docx.hs @@ -46,7 +46,7 @@ instance ToString NoNormPandoc where where s = case d of NoNormPandoc (Pandoc (Meta m) _) | M.null m -> Nothing - | otherwise -> Just "" -- need this to get meta output + | otherwise -> Just mempty -- need this to get meta output instance ToPandoc NoNormPandoc where toPandoc = unNoNorm diff --git a/test/Tests/Readers/FB2.hs b/test/Tests/Readers/FB2.hs index e64e8a2ce..dd228aeae 100644 --- a/test/Tests/Readers/FB2.hs +++ b/test/Tests/Readers/FB2.hs @@ -24,7 +24,7 @@ import Data.Text.Lazy (fromStrict) import System.FilePath (replaceExtension) fb2ToNative :: Text -> Text -fb2ToNative = purely (writeNative def{ writerTemplate = Just "" }) . purely (readFB2 def) +fb2ToNative = purely (writeNative def{ writerTemplate = Just mempty }) . purely (readFB2 def) fb2Test :: TestName -> FilePath -> TestTree fb2Test name path = goldenVsString name native (fromTextLazy . fromStrict . fb2ToNative . toText <$> BS.readFile path) diff --git a/test/Tests/Readers/Odt.hs b/test/Tests/Readers/Odt.hs index d66a4e98b..9dc93c92e 100644 --- a/test/Tests/Readers/Odt.hs +++ b/test/Tests/Readers/Odt.hs @@ -61,7 +61,7 @@ instance ToString NoNormPandoc where where s = case d of NoNormPandoc (Pandoc (Meta m) _) | M.null m -> Nothing - | otherwise -> Just "" -- need this for Meta output + | otherwise -> Just mempty -- need this for Meta output instance ToPandoc NoNormPandoc where toPandoc = unNoNorm |