8460ea4 · typeable/pandoc

git.iko.soy/typeable/pandoc

EPUB Reader: Integrated into program

commit8460ea417f3bcd4599f1ba4877dd4c6e2a373ed1 authorMatthew Pickering <matthewtpickering@gmail.com> dateWed 30 Jul 2014, 00:57 (12 years ago) parent51051e9

3 files changed+8−2

compare with master

unifiedsplit

pandoc.cabal+4−2 pandoc.hs+1 src/Text/Pandoc.hs+3

pandoc.cabal+4−2

@@ -231,7 +231,7 @@ Library

231231 xml >= 1.3.12 && < 1.4,

232232 random >= 1 && < 1.1,

233233 extensible-exceptions >= 0.1 && < 0.2,

234− pandoc-types >= 1.12.3.3 && < 1.13,

234+ pandoc-types >= 1.12.3.4 && < 1.13,

235235 aeson >= 0.7 && < 0.8,

236236 tagsoup >= 0.13.1 && < 0.14,

237237 base64-bytestring >= 0.1 && < 1.1,

@@ -248,7 +248,8 @@ Library

248248 binary >= 0.5 && < 0.8,

249249 SHA >= 1.6 && < 1.7,

250250 haddock-library >= 1.1 && < 1.2,

251− old-time

251+ old-time,

252+ deepseq-generics >= 0.1 && < 0.2

252253 if flag(https)

253254 Build-Depends: http-client >= 0.3.2 && < 0.4,

254255 http-client-tls >= 0.2 && < 0.3,

@@ -287,6 +288,7 @@ Library

287288 Text.Pandoc.Readers.Native,

288289 Text.Pandoc.Readers.Haddock,

289290 Text.Pandoc.Readers.Docx,

291+ Text.Pandoc.Readers.EPUB,

290292 Text.Pandoc.Writers.Native,

291293 Text.Pandoc.Writers.Docbook,

292294 Text.Pandoc.Writers.OPML,

pandoc.hs+1

@@ -891,6 +891,7 @@ defaultReaderName fallback (x:xs) =

891891 ".json" -> "json"

892892 ".docx" -> "docx"

893893 ".t2t" -> "t2t"

894+ ".epub" -> "epub"

894895 _ -> defaultReaderName fallback xs

895896

896897-- Returns True if extension of first source is .lhs

src/Text/Pandoc.hs+3

@@ -79,6 +79,7 @@ module Text.Pandoc

7979 , readJSON

8080 , readTxt2Tags

8181 , readTxt2TagsNoMacros

82+ , readEPUB

8283 -- * Writers: converting /from/ Pandoc format

8384 , Writer (..)

8485 , writeNative

@@ -134,6 +135,7 @@ import Text.Pandoc.Readers.Native

134135import Text.Pandoc.Readers.Haddock

135136import Text.Pandoc.Readers.Docx

136137import Text.Pandoc.Readers.Txt2Tags

138+import Text.Pandoc.Readers.EPUB

137139import Text.Pandoc.Writers.Native

138140import Text.Pandoc.Writers.Markdown

139141import Text.Pandoc.Writers.RST

@@ -233,6 +235,7 @@ readers = [ ("native" , StringReader $ \_ s -> return $ readNative s)

233235 ,("haddock" , mkStringReader readHaddock)

234236 ,("docx" , mkBSReader readDocx)

235237 ,("t2t" , mkStringReader readTxt2TagsNoMacros)

238+ ,("epub" , mkBSReader readEPUB)

236239 ]

237240

238241data Writer = PureStringWriter (WriterOptions -> Pandoc -> String)