summaryrefslogtreecommitdiff
path: root/src/pandoc.hs
diff options
context:
space:
mode:
authorJohn MacFarlane <fiddlosopher@gmail.com>2012-07-24 09:56:00 -0700
committerJohn MacFarlane <fiddlosopher@gmail.com>2012-07-24 09:56:00 -0700
commit999edd960836ee6b43e7854f204b86f4cd845d06 (patch)
tree1eabddcc2dbefb7c0eabc6c77ca5008d3c2f0d68 /src/pandoc.hs
parentcd19d4596bc696670756c8ad6440d3f3b75cb5e8 (diff)
Changed signatures of writeODT, writeDocx, writeEPUB.
These now take WriterOptions and Pandoc only. The extra parameters for epub stylesheet, epub fonts, reference Docx, and reference ODT have been removed, since these things are now in WriterOptions. Note: breaking API change!
Diffstat (limited to 'src/pandoc.hs')
-rw-r--r--src/pandoc.hs12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/pandoc.hs b/src/pandoc.hs
index 5cebab28f..fde906eb1 100644
--- a/src/pandoc.hs
+++ b/src/pandoc.hs
@@ -979,7 +979,11 @@ main = do
writerHighlight = highlight,
writerHighlightStyle = highlightStyle,
writerSetextHeaders = setextHeaders,
- writerTeXLigatures = texLigatures
+ writerTeXLigatures = texLigatures,
+ writerEpubStylesheet = epubStylesheet,
+ writerEpubFonts = epubFonts,
+ writerReferenceODT = referenceODT,
+ writerReferenceDocx = referenceDocx
}
when (writerName' `elem` nonTextFormats&& outputFile == "-") $
@@ -1043,12 +1047,12 @@ main = do
writerFn outputFile d
(Nothing, Nothing)
| writerName' == "epub" ->
- writeEPUB epubStylesheet epubFonts writerOptions doc2
+ writeEPUB writerOptions doc2
>>= writeBinary
| writerName' == "odt" ->
- writeODT referenceODT writerOptions doc2 >>= writeBinary
+ writeODT writerOptions doc2 >>= writeBinary
| writerName' == "docx" ->
- writeDocx referenceDocx writerOptions doc2 >>= writeBinary
+ writeDocx writerOptions doc2 >>= writeBinary
| otherwise -> err 9 ("Unknown writer: " ++ writerName')
(Just w, _)
| pdfOutput -> do