diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2011-01-28 08:42:04 -0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2011-01-28 08:42:04 -0800 |
| commit | 382564ed9e62a42ec03650d178f48552df0071b7 (patch) | |
| tree | 7c118abf2b609dcba3e676638c6a6a2fdbb417ae /src/pandoc.hs | |
| parent | 0acf774011877a8de6363a79b4bb7a5b2ed83913 (diff) | |
RTF writer: Embed images when possible.
* Resolves Issue #275.
* PNG and JPEG supported.
* Export rtfEmbedImage.
Diffstat (limited to 'src/pandoc.hs')
| -rw-r--r-- | src/pandoc.hs | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/pandoc.hs b/src/pandoc.hs index e2d85111e..7289eb973 100644 --- a/src/pandoc.hs +++ b/src/pandoc.hs @@ -823,9 +823,13 @@ main = do doc <- fmap (reader startParserState . convertTabs . intercalate "\n") (readSources sources) - let doc' = foldr ($) doc transforms + let doc0 = foldr ($) doc transforms - doc'' <- do + doc1 <- if writerName' == "rtf" + then bottomUpM rtfEmbedImage doc0 + else return doc0 + + doc2 <- do if citeMethod == Citeproc && not (null refs) then do csldir <- getAppUserDataDirectory "csl" @@ -839,10 +843,10 @@ main = do replaceDirectory (replaceExtension cslfile "csl") csldir - processBiblio cslfile' refs doc' - else return doc' + processBiblio cslfile' refs doc1 + else return doc1 - writerOutput <- writer writerOptions doc'' + writerOutput <- writer writerOptions doc2 let writerOutput' = if standalone' then writerOutput |