diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2014-08-30 11:49:50 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2014-08-30 11:49:50 -0700 |
| commit | f70e3c3297bb0d8f953971a84a1a606351fdda40 (patch) | |
| tree | c95d0f44861578c828aabcade0d0584b25d5eb96 /src/Text/Pandoc/Writers/ODT.hs | |
| parent | eb29aab9598eec04a8c2d37ef24f2eaa5ca1435d (diff) | |
| parent | 357172f13af7e7ddb6a01e16c664776d01f55565 (diff) | |
| download | pandoc-f70e3c3297bb0d8f953971a84a1a606351fdda40.tar.gz | |
Merge branch 'mime' of https://github.com/Aelve/John into Aelve-mime
Conflicts:
src/Text/Pandoc/Writers/Docx.hs
Diffstat (limited to 'src/Text/Pandoc/Writers/ODT.hs')
| -rw-r--r-- | src/Text/Pandoc/Writers/ODT.hs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/Text/Pandoc/Writers/ODT.hs b/src/Text/Pandoc/Writers/ODT.hs index feaa0167c..03f8e8ba4 100644 --- a/src/Text/Pandoc/Writers/ODT.hs +++ b/src/Text/Pandoc/Writers/ODT.hs @@ -30,7 +30,7 @@ Conversion of 'Pandoc' documents to ODT. -} module Text.Pandoc.Writers.ODT ( writeODT ) where import Data.IORef -import Data.List ( isPrefixOf, isSuffixOf ) +import Data.List ( isPrefixOf ) import Data.Maybe ( fromMaybe ) import Text.XML.Light.Output import Text.TeXMath @@ -77,11 +77,7 @@ writeODT opts doc@(Pandoc meta _) = do $ contentEntry : picEntries -- construct META-INF/manifest.xml based on archive let toFileEntry fp = case getMimeType fp of - Nothing -> if "Formula-" `isPrefixOf` fp && "/" `isSuffixOf` fp - then selfClosingTag "manifest:file-entry" - [("manifest:media-type","application/vnd.oasis.opendocument.formula") - ,("manifest:full-path",fp)] - else empty + Nothing -> empty Just m -> selfClosingTag "manifest:file-entry" [("manifest:media-type", m) ,("manifest:full-path", fp) |