51178dd · typeable/pandoc

git.iko.soy/typeable/pandoc

Export encodePath/decodePath from UTF8.

Removed duplicate code in src/pandoc.hs.

commit51178dda976fd358bcd091f833254542006cebcc authorJohn MacFarlane <fiddlosopher@gmail.com> dateSun 23 Sep 2012, 10:43 (14 years ago) parent22bd34f

2 files changed+2−15

unifiedsplit

src/Text/Pandoc/UTF8.hs+1

@@ -35,6 +35,7 @@ module Text.Pandoc.UTF8 ( readFile

3535 , hPutStr

3636 , hPutStrLn

3737 , hGetContents

38+ , encodePath

3839 )

3940

4041where

src/pandoc.hs+1−15

@@ -59,20 +59,6 @@ import Network.URI (parseURI, isURI, URI(..))

5959import qualified Data.ByteString.Lazy as B

6060import Data.ByteString.Lazy.UTF8 (toString)

6161import Text.CSL.Reference (Reference(..))

62−#if MIN_VERSION_base(4,4,0)

63−#else

64−import Codec.Binary.UTF8.String (decodeString, encodeString)

65−#endif

66−

67−encodePath, decodeArg :: FilePath -> FilePath

68−#if MIN_VERSION_base(4,4,0)

69−encodePath = id

70−decodeArg = id

71−#else

72−encodePath = encodeString

73−decodeArg = decodeString

74−#endif

75−

7662

7763copyrightMessage :: String

@@ -1037,7 +1023,7 @@ main = do

10371023 else return doc1

10381024

10391025 let writeBinary :: B.ByteString -> IO ()

1040− writeBinary = B.writeFile (encodePath outputFile)

1026+ writeBinary = B.writeFile (UTF8.encodePath outputFile)

10411027

10421028 let writerFn :: FilePath -> String -> IO ()

10431029 writerFn "-" = UTF8.putStr