git.iko.soy/typeable/pandoc
on master help sign in
ODT writer: Construct META-INF/manifest.xml based on archive contents.

This fixes a bug in ODTs containing images. LibreOffice would signal that these ODTs were corrupt, because the manifest.xml did not contain a reference to the image files.

commite2aec87956762768c5ec7759ec0725c12648dfff authorJohn MacFarlane <jgm@berkeley.edu> dateSun 17 Jul 2011, 23:21 (15 years ago) parentcc20421
1 file changed+28−3
src/Text/Pandoc/Writers/ODT.hs+28−3
src/Text/Pandoc/Writers/ODT.hs+28−3
@@ -29,19 +29,22 @@ Conversion of 'Pandoc' documents to ODT.
2929-}
3030module Text.Pandoc.Writers.ODT ( writeODT ) where
3131import Data.IORef
32+import Data.List ( isPrefixOf )
3233import System.FilePath ( (</>), takeExtension )
3334import qualified Data.ByteString.Lazy as B
3435import Data.ByteString.Lazy.UTF8 ( fromString )
3536import Codec.Archive.Zip
3637import System.Time
3738import Paths_pandoc ( getDataFileName )
38−import Text.Pandoc.Shared ( WriterOptions(..) )
39+import Text.Pandoc.Shared ( WriterOptions(..), getMimeType )
3940import Text.Pandoc.Definition
4041import Text.Pandoc.Generic
4142import Text.Pandoc.Writers.OpenDocument ( writeOpenDocument )
4243import System.Directory
4344import Control.Monad (liftM)
4445import Network.URI ( unEscapeString )
46+import Text.Pandoc.XML
47+import Text.Pandoc.Pretty
4548
4649-- | Produce an ODT file from a Pandoc document.
4750writeODT :: Maybe FilePath -- ^ Path specified by --reference-odt
@@ -70,8 +73,30 @@ writeODT mbRefOdt opts doc = do
7073 (TOD epochtime _) <- getClockTime
7174 let contentEntry = toEntry "content.xml" epochtime $ fromString newContents
7275 picEntries <- readIORef picEntriesRef
73− let archive = foldr addEntryToArchive refArchive (contentEntry : picEntries)
74− return $ fromArchive archive
76+ let archive = foldr addEntryToArchive refArchive $ contentEntry : picEntries
77+ -- construct META-INF/manifest.xml based on archive
78+ let toFileEntry fp = case getMimeType fp of
79+ Nothing -> empty
80+ Just m -> selfClosingTag "manifest:file-entry"
81+ [("manifest:media-type", m)
82+ ,("manifest:full-path", fp)
83+ ]
84+ let files = [ ent | ent <- filesInArchive archive, not ("META-INF" `isPrefixOf` ent) ]
85+ let manifestEntry = toEntry "META-INF/manifest.xml" epochtime
86+ $ fromString $ show
87+ $ text "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
88+ $$
89+ ( inTags True "manifest:manifest"
90+ [("xmlns:manifest","urn:oasis:names:tc:opendocument:xmlns:manifest:1.0")]
91+ $ ( selfClosingTag "manifest:file-entry"
92+ [("manifest:media-type","application/vnd.oasis.opendocument.text")
93+ ,("manifest:version","1.2")
94+ ,("manifest:full-path","/")]
95+ $$ vcat ( map toFileEntry $ files )
96+ )
97+ )
98+ let archive' = addEntryToArchive manifestEntry archive
99+ return $ fromArchive archive'
75100
76101transformPic :: FilePath -> IORef [Entry] -> Inline -> IO Inline
77102transformPic sourceDir entriesRef (Image lab (src,tit)) = do