@@ -36,7 +36,7 @@ import Data.ByteString.Lazy.UTF8 ( fromString )
36import Codec.Archive.Zip
36import Codec.Archive.Zip
37import Data.Time.Clock.POSIX
37import Data.Time.Clock.POSIX
38import Paths_pandoc ( getDataFileName )
38import Paths_pandoc ( getDataFileName )
39−import Text.Pandoc.Shared ( WriterOptions(..) )
39+import Text.Pandoc.Shared hiding (Element)
40import Text.Pandoc.ImageSize ( readImageSize, sizeInPoints )
40import Text.Pandoc.ImageSize ( readImageSize, sizeInPoints )
41import Text.Pandoc.MIME ( getMimeType )
41import Text.Pandoc.MIME ( getMimeType )
42import Text.Pandoc.Definition
42import Text.Pandoc.Definition
@@ -53,7 +53,7 @@ writeODT :: Maybe FilePath -- ^ Path specified by --reference-odt
53 -> WriterOptions -- ^ Writer options
53 -> WriterOptions -- ^ Writer options
54 -> Pandoc -- ^ Document to convert
54 -> Pandoc -- ^ Document to convert
55 -> IO B.ByteString
55 -> IO B.ByteString
56−writeODT mbRefOdt opts doc = do
56+writeODT mbRefOdt opts doc@(Pandoc (Meta title _ _) _) = do
57 let datadir = writerUserDataDir opts
57 let datadir = writerUserDataDir opts
58 refArchive <- liftM toArchive $
58 refArchive <- liftM toArchive $
59 case mbRefOdt of
59 case mbRefOdt of
@@ -98,7 +98,25 @@ writeODT mbRefOdt opts doc = do
100 let archive' = addEntryToArchive manifestEntry archive
100 let archive' = addEntryToArchive manifestEntry archive
101+ let metaEntry = toEntry "meta.xml" epochtime
103+ $ text "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
105+ ( inTags True "office:document-meta"
106+ [("xmlns:office","urn:oasis:names:tc:opendocument:xmlns:office:1.0")
107+ ,("xmlns:xlink","http://www.w3.org/1999/xlink")
108+ ,("xmlns:dc","http://purl.org/dc/elements/1.1/")
109+ ,("xmlns:meta","urn:oasis:names:tc:opendocument:xmlns:meta:1.0")
110+ ,("xmlns:ooo","http://openoffice.org/2004/office")
111+ ,("xmlns:grddl","http://www.w3.org/2003/g/data-view#")
112+ ,("office:version","1.2")]
113+ $ ( inTagsSimple "office:meta"
114+ $ ( inTagsSimple "dc:title" (text $ escapeStringForXML (stringify title))
118+ let archive'' = addEntryToArchive metaEntry archive'
101− return $ fromArchive archive'
119+ return $ fromArchive archive''
103transformPic :: FilePath -> IORef [Entry] -> Inline -> IO Inline
121transformPic :: FilePath -> IORef [Entry] -> Inline -> IO Inline
104transformPic sourceDir entriesRef (Image lab (src,tit)) = do
122transformPic sourceDir entriesRef (Image lab (src,tit)) = do