git.iko.soy/typeable/pandoc
on master help sign in
Don't use OverloadedStrings in ODT writer.

Remove version dependency from bytestring. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1359 788f1e2b-df1e-0410-8736-df70ead52e1b

commit7b986acd72157ef2b3a4747f197604d55558e31f authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> dateFri 1 Aug 2008, 15:17 (18 years ago) parent31e261c
2 files changed+4−9
Text/Pandoc/ODT.hs+3−7 pandoc.cabal+1−2
Text/Pandoc/ODT.hs+3−7
@@ -1,4 +1,4 @@
1−{-# LANGUAGE TemplateHaskell, OverloadedStrings #-}
1+{-# LANGUAGE TemplateHaskell #-}
22{-
33Copyright (C) 2008 John MacFarlane <jgm@berkeley.edu>
44
@@ -43,11 +43,7 @@ import Text.XML.Light
4343import Text.XML.Light.Cursor
4444import Text.Pandoc.Shared ( withTempDir )
4545import Network.URI ( isURI )
46−import Data.String ( IsString (..) )
47−import qualified Data.ByteString.Char8 as B ( writeFile, pack, ByteString )
48−
49−instance IsString B.ByteString
50− where fromString = B.pack
46+import qualified Data.ByteString.Char8 as B ( writeFile, pack )
5147
5248-- | Produce an ODT file from OpenDocument XML.
5349saveOpenDocumentAsODT :: FilePath -- ^ Pathname of ODT file to be produced.
@@ -68,7 +64,7 @@ saveOpenDocumentAsODT destinationODTPath sourceDirRelative xml = do
6864 withTempDir "pandoc-odt" $ \tempDir -> do
6965 let tempODT = tempDir </> "reference.odt"
7066 copyFile "odt-styles/reference.odt" tempODT
71− B.writeFile tempODT $(contentsOf "odt-styles/reference.odt")
67+ B.writeFile tempODT $ B.pack $(contentsOf "odt-styles/reference.odt")
7268 createDirectory $ tempDir </> "Pictures"
7369 xml' <- handlePictures tempODT sourceDirRelative xml
7470 writeFile (tempDir </> "content.xml") xml'
pandoc.cabal+1−2
@@ -74,8 +74,7 @@ Library
7474 Build-depends: highlighting-kate
7575 cpp-options: -DHIGHLIGHTING
7676 Build-Depends: parsec < 3, xhtml, mtl, network, filepath, process, directory, utf8-string,
77− template-haskell, bytestring == 0.9.0.1
78− -- Note: bytestring-0.9.1.0 contains an InString instance for ByteString
77+ template-haskell, bytestring
7978 Hs-Source-Dirs: .
8079 Exposed-Modules: Text.Pandoc,
8180 Text.Pandoc.Blocks,