diff options
author | John MacFarlane <jgm@berkeley.edu> | 2010-07-08 17:31:55 -0700 |
---|---|---|
committer | John MacFarlane <jgm@berkeley.edu> | 2010-07-08 17:31:55 -0700 |
commit | bf43da01c931f1fda936d6357aa3677804d80add (patch) | |
tree | 41a29db9c97caa6032807b7df99a86f50487b8ff /src/pandoc.hs | |
parent | d67ec663ba65d8001afdc9cf404192ff41108592 (diff) | |
download | pandoc-bf43da01c931f1fda936d6357aa3677804d80add.tar.gz |
Added writerUserDataDir to WriterOptions.
Diffstat (limited to 'src/pandoc.hs')
-rw-r--r-- | src/pandoc.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pandoc.hs b/src/pandoc.hs index a1b8244d7..dd2787e7b 100644 --- a/src/pandoc.hs +++ b/src/pandoc.hs @@ -701,8 +701,7 @@ main = do Just s -> return s Nothing -> readDataFile datadir "epub.css" return (writeEPUB epubstyle) - Just _ | writerName' == "odt" -> return - (writeODT datadir referenceODT) + Just _ | writerName' == "odt" -> return (writeODT referenceODT) Just r -> return $ \o d -> return $ fromString (r o d) Nothing -> error ("Unknown writer: " ++ writerName') @@ -782,7 +781,8 @@ main = do then ReferenceObfuscation else obfuscationMethod, writerIdentifierPrefix = idPrefix, - writerSourceDirectory = sourceDir } + writerSourceDirectory = sourceDir, + writerUserDataDir = datadir } when (isNonTextOutput writerName' && outputFile == "-") $ do UTF8.hPutStrLn stderr ("Error: Cannot write " ++ writerName ++ " output to stdout.\n" ++ |