git.iko.soy/typeable/pandoc
on master help sign in
Merge commit 'd25656571a4662a4e67b195daed69e77d80c4c2c'
a6dcae1John MacFarlane
src/Text/Pandoc/Writers/ODT.hs+21−2
compare with master
unifiedsplit
@@ -37,6 +37,7 @@ import Codec.Archive.Zip
37import Data.Time.Clock.POSIX
37import Data.Time.Clock.POSIX
38import Paths_pandoc ( getDataFileName )
38import Paths_pandoc ( getDataFileName )
39import Text.Pandoc.Options ( WriterOptions(..) )
39import Text.Pandoc.Options ( WriterOptions(..) )
40+import Text.Pandoc.Shared ( stringify )
40import Text.Pandoc.ImageSize ( readImageSize, sizeInPoints )
41import Text.Pandoc.ImageSize ( readImageSize, sizeInPoints )
41import Text.Pandoc.MIME ( getMimeType )
42import Text.Pandoc.MIME ( getMimeType )
42import Text.Pandoc.Definition
43import Text.Pandoc.Definition
@@ -53,7 +54,7 @@ import qualified Control.Exception as E
53writeODT :: WriterOptions -- ^ Writer options
54writeODT :: WriterOptions -- ^ Writer options
54 -> Pandoc -- ^ Document to convert
55 -> Pandoc -- ^ Document to convert
55 -> IO B.ByteString
56 -> IO B.ByteString
56−writeODT opts doc = do
57+writeODT opts doc@(Pandoc (Meta title _ _) _) = do
57 let datadir = writerUserDataDir opts
58 let datadir = writerUserDataDir opts
58 refArchive <- liftM toArchive $
59 refArchive <- liftM toArchive $
59 case writerReferenceODT opts of
60 case writerReferenceODT opts of
@@ -98,7 +99,25 @@ writeODT opts doc = do
98 )
99 )
99 )
100 )
100 let archive' = addEntryToArchive manifestEntry archive
101 let archive' = addEntryToArchive manifestEntry archive
102+ let metaEntry = toEntry "meta.xml" epochtime
103+ $ fromString $ show
104+ $ text "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
105+ $$
106+ ( inTags True "office:document-meta"
107+ [("xmlns:office","urn:oasis:names:tc:opendocument:xmlns:office:1.0")
108+ ,("xmlns:xlink","http://www.w3.org/1999/xlink")
109+ ,("xmlns:dc","http://purl.org/dc/elements/1.1/")
110+ ,("xmlns:meta","urn:oasis:names:tc:opendocument:xmlns:meta:1.0")
111+ ,("xmlns:ooo","http://openoffice.org/2004/office")
112+ ,("xmlns:grddl","http://www.w3.org/2003/g/data-view#")
113+ ,("office:version","1.2")]
114+ $ ( inTagsSimple "office:meta"
115+ $ ( inTagsSimple "dc:title" (text $ escapeStringForXML (stringify title))
116+ )
117+ )
118+ )
119+ let archive'' = addEntryToArchive metaEntry archive'
101− return $ fromArchive archive'
120+ return $ fromArchive archive''
102
121
103transformPic :: FilePath -> IORef [Entry] -> Inline -> IO Inline
122transformPic :: FilePath -> IORef [Entry] -> Inline -> IO Inline
104transformPic sourceDir entriesRef (Image lab (src,tit)) = do
123transformPic sourceDir entriesRef (Image lab (src,tit)) = do