epub-metadata 4.4 → 4.5
raw patch · 5 files changed
+18/−5 lines, 5 filesdep +regex-compat-tdfadep +utf8-stringdep −regex-compatPVP ok
version bump matches the API change (PVP)
Dependencies added: regex-compat-tdfa, utf8-string
Dependencies removed: regex-compat
API changes (from Hackage documentation)
Files
- changelog.md +5/−0
- epub-metadata.cabal +5/−3
- src/Codec/Epub/IO.hs +2/−2
- testsuite/Epub2/ParseMetadata.hs +5/−0
- testsuite/epub2-full.opf +1/−0
changelog.md view
@@ -1,3 +1,8 @@+4.5 (2016-10-19)++ * Fix merged for UTF8 issue++ 4.4 (2016-10-11) * Removed defunct cabal stability field
epub-metadata.cabal view
@@ -1,5 +1,5 @@ name: epub-metadata-version: 4.4+version: 4.5 cabal-version: >= 1.10 build-type: Simple license: BSD3@@ -63,12 +63,13 @@ Codec.Epub.Util build-depends: base >= 3 && < 5, bytestring,+ utf8-string, containers, directory, filepath, hxt >= 9, mtl,- regex-compat,+ regex-compat-tdfa, zip-archive hs-source-dirs: src ghc-options: -Wall@@ -79,12 +80,13 @@ main-is: test-main.hs build-depends: base >= 3 && < 5, bytestring,+ utf8-string, directory, filepath, HUnit, hxt >= 9, mtl,- regex-compat,+ regex-compat-tdfa, zip-archive hs-source-dirs: src testsuite other-modules: Archive
src/Codec/Epub/IO.hs view
@@ -23,7 +23,7 @@ import qualified Data.ByteString.Char8 as BS import Data.ByteString.Lazy ( fromChunks ) import qualified Data.ByteString.Lazy as B-import qualified Data.ByteString.Lazy.Char8 as BL+import qualified Data.ByteString.Lazy.UTF8 as UTF8 import Data.List import System.Directory import System.FilePath@@ -56,7 +56,7 @@ let mbEntry = findEntryByPath filePath archive maybe (throwError $ "Unable to locate file " ++ filePath)- (return . BL.unpack . fromEntry) mbEntry+ (return . UTF8.toString . fromEntry) mbEntry {- | The static location of the container.xml, as specified by the
testsuite/Epub2/ParseMetadata.hs view
@@ -42,6 +42,11 @@ "Josephine B. Wiggins" , Creator (Just "aut")+ (Just "Dicker, Joël")+ Nothing+ "Joël Dicker"+ , Creator+ (Just "aut") Nothing Nothing "Horatio Cromwell"
testsuite/epub2-full.opf view
@@ -10,6 +10,7 @@ <dc:title>Title Of This Book</dc:title> <dc:title xml:lang="fr">Titre De Ce Livre</dc:title> <dc:creator opf:role="aut" opf:file-as="Wiggins, Josephine B.">Josephine B. Wiggins</dc:creator>+ <dc:creator opf:file-as="Dicker, Joël" opf:role="aut">Joël Dicker</dc:creator> <dc:creator opf:role="aut">Horatio Cromwell</dc:creator> <dc:creator>Natalia Jenkins</dc:creator> <dc:contributor opf:role="ill" opf:file-as="Knickerbocker, Reginald Q.">Reginald Q. Knickerbocker</dc:contributor>