@@ -83,6 +83,7 @@ module Text.Pandoc.Writers
8383
8484import Data.Aeson
8585import Data.List (intercalate)
86+import Data.Text (Text)
8687import Text.Pandoc.Class
8788import Text.Pandoc.Definition
8889import Text.Pandoc.Options
@@ -120,59 +121,59 @@ import Text.Parsec.Error
120121import qualified Text.Pandoc.UTF8 as UTF8
121122import qualified Data.ByteString.Lazy as BL
122123
123−data Writer m = StringWriter (WriterOptions -> Pandoc -> m String)
124+data Writer m = TextWriter (WriterOptions -> Pandoc -> m Text)
124125 | ByteStringWriter (WriterOptions -> Pandoc -> m BL.ByteString)
125126
126127-- | Association list of formats and writers.
127128writers :: PandocMonad m => [ ( String, Writer m) ]
128129writers = [
129− ("native" , StringWriter writeNative)
130− ,("json" , StringWriter $ \o d -> return $ writeJSON o d)
130+ ("native" , TextWriter writeNative)
131+ ,("json" , TextWriter $ \o d -> return $ writeJSON o d)
131132 ,("docx" , ByteStringWriter writeDocx)
132133 ,("odt" , ByteStringWriter writeODT)
133134 ,("epub" , ByteStringWriter writeEPUB3)
134135 ,("epub2" , ByteStringWriter writeEPUB2)
135136 ,("epub3" , ByteStringWriter writeEPUB3)
136− ,("fb2" , StringWriter writeFB2)
137− ,("html" , StringWriter writeHtml5String)
138− ,("html4" , StringWriter writeHtml4String)
139− ,("html5" , StringWriter writeHtml5String)
140− ,("icml" , StringWriter writeICML)
141− ,("s5" , StringWriter writeS5)
142− ,("slidy" , StringWriter writeSlidy)
143− ,("slideous" , StringWriter writeSlideous)
144− ,("dzslides" , StringWriter writeDZSlides)
145− ,("revealjs" , StringWriter writeRevealJs)
146− ,("docbook" , StringWriter writeDocbook5)
147− ,("docbook4" , StringWriter writeDocbook4)
148− ,("docbook5" , StringWriter writeDocbook5)
149− ,("jats" , StringWriter writeJATS)
150− ,("opml" , StringWriter writeOPML)
151− ,("opendocument" , StringWriter writeOpenDocument)
152− ,("latex" , StringWriter writeLaTeX)
153− ,("beamer" , StringWriter writeBeamer)
154− ,("context" , StringWriter writeConTeXt)
155− ,("texinfo" , StringWriter writeTexinfo)
156− ,("man" , StringWriter writeMan)
157− ,("ms" , StringWriter writeMs)
158− ,("markdown" , StringWriter writeMarkdown)
159− ,("markdown_strict" , StringWriter writeMarkdown)
160− ,("markdown_phpextra" , StringWriter writeMarkdown)
161− ,("markdown_github" , StringWriter writeMarkdown)
162− ,("markdown_mmd" , StringWriter writeMarkdown)
163− ,("plain" , StringWriter writePlain)
164− ,("rst" , StringWriter writeRST)
165− ,("mediawiki" , StringWriter writeMediaWiki)
166− ,("dokuwiki" , StringWriter writeDokuWiki)
167− ,("zimwiki" , StringWriter writeZimWiki)
168− ,("textile" , StringWriter writeTextile)
169− ,("rtf" , StringWriter writeRTF)
170− ,("org" , StringWriter writeOrg)
171− ,("asciidoc" , StringWriter writeAsciiDoc)
172− ,("haddock" , StringWriter writeHaddock)
173− ,("commonmark" , StringWriter writeCommonMark)
174− ,("tei" , StringWriter writeTEI)
175− ,("muse" , StringWriter writeMuse)
137+ ,("fb2" , TextWriter writeFB2)
138+ ,("html" , TextWriter writeHtml5String)
139+ ,("html4" , TextWriter writeHtml4String)
140+ ,("html5" , TextWriter writeHtml5String)
141+ ,("icml" , TextWriter writeICML)
142+ ,("s5" , TextWriter writeS5)
143+ ,("slidy" , TextWriter writeSlidy)
144+ ,("slideous" , TextWriter writeSlideous)
145+ ,("dzslides" , TextWriter writeDZSlides)
146+ ,("revealjs" , TextWriter writeRevealJs)
147+ ,("docbook" , TextWriter writeDocbook5)
148+ ,("docbook4" , TextWriter writeDocbook4)
149+ ,("docbook5" , TextWriter writeDocbook5)
150+ ,("jats" , TextWriter writeJATS)
151+ ,("opml" , TextWriter writeOPML)
152+ ,("opendocument" , TextWriter writeOpenDocument)
153+ ,("latex" , TextWriter writeLaTeX)
154+ ,("beamer" , TextWriter writeBeamer)
155+ ,("context" , TextWriter writeConTeXt)
156+ ,("texinfo" , TextWriter writeTexinfo)
157+ ,("man" , TextWriter writeMan)
158+ ,("ms" , TextWriter writeMs)
159+ ,("markdown" , TextWriter writeMarkdown)
160+ ,("markdown_strict" , TextWriter writeMarkdown)
161+ ,("markdown_phpextra" , TextWriter writeMarkdown)
162+ ,("markdown_github" , TextWriter writeMarkdown)
163+ ,("markdown_mmd" , TextWriter writeMarkdown)
164+ ,("plain" , TextWriter writePlain)
165+ ,("rst" , TextWriter writeRST)
166+ ,("mediawiki" , TextWriter writeMediaWiki)
167+ ,("dokuwiki" , TextWriter writeDokuWiki)
168+ ,("zimwiki" , TextWriter writeZimWiki)
169+ ,("textile" , TextWriter writeTextile)
170+ ,("rtf" , TextWriter writeRTF)
171+ ,("org" , TextWriter writeOrg)
172+ ,("asciidoc" , TextWriter writeAsciiDoc)
173+ ,("haddock" , TextWriter writeHaddock)
174+ ,("commonmark" , TextWriter writeCommonMark)
175+ ,("tei" , TextWriter writeTEI)
176+ ,("muse" , TextWriter writeMuse)
176177 ]
177178
178179getWriter :: PandocMonad m => String -> Either String (Writer m)
@@ -182,12 +183,12 @@ getWriter s
182183 Right (writerName, setExts) ->
183184 case lookup writerName writers of
184185 Nothing -> Left $ "Unknown writer: " ++ writerName
185− Just (StringWriter r) -> Right $ StringWriter $
186+ Just (TextWriter r) -> Right $ TextWriter $
186187 \o -> r o{ writerExtensions = setExts $
187188 getDefaultExtensions writerName }
188189 Just (ByteStringWriter r) -> Right $ ByteStringWriter $
189190 \o -> r o{ writerExtensions = setExts $
190191 getDefaultExtensions writerName }
191192
192−writeJSON :: WriterOptions -> Pandoc -> String
193−writeJSON _ = UTF8.toStringLazy . encode
193+writeJSON :: WriterOptions -> Pandoc -> Text
194+writeJSON _ = UTF8.toText . BL.toStrict . encode