a1abb3e · typeable/pandoc

changelog+4

compare with master

unifiedsplit

@@ -1,3 +1,7 @@

1+pandoc (1.12.3.1)

2+

3+ * Relaxed version constraint on binary, allowing the use of binary 0.5.

4+

1pandoc (1.12.3)

5pandoc (1.12.3)

2

6

3 * The `--bibliography` option now sets the `biblio-files` variable.

7 * The `--bibliography` option now sets the `biblio-files` variable.

pandoc.cabal+2−2

@@ -1,5 +1,5 @@

1Name: pandoc

2−Version: 1.12.3

2+Version: 1.12.3.1

3Cabal-Version: >= 1.10

4Build-Type: Custom

5License: GPL

@@ -233,7 +233,7 @@ Library

233 yaml >= 0.8.3 && < 0.9,

234 vector >= 0.10 && < 0.11,

235 hslua >= 0.3 && < 0.4,

236− binary >= 0.6 && < 0.8

236+ binary >= 0.5 && < 0.8

237 Build-Tools: alex, happy

238 if flag(http-conduit)

239 Build-Depends: http-conduit >= 1.9 && < 2.1,

src/Text/Pandoc/ImageSize.hs+6−3

@@ -182,9 +182,12 @@ findJfifSize bs = do

182 Nothing -> fail "Did not find length record"

183

184exifSize :: ByteString -> Maybe ImageSize

185−exifSize = -- runGet ((Just <$> exifHeader) `mplus` return Nothing) .

185+exifSize = runGet (Just <$> exifHeader) . BL.fromChunks . (:[])

186− runGet (Just <$> exifHeader) .

186+-- NOTE: It would be nicer to do

187− BL.fromChunks . (:[])

187+-- runGet ((Just <$> exifHeader) <|> return Nothing)

188+-- which would prevent pandoc from raising an error when an exif header can't

189+-- be parsed. But we only get an Alternative instance for Get in binary 0.6,

190+-- and binary 0.5 ships with ghc 7.6.

188

191

189exifHeader :: Get ImageSize

192exifHeader :: Get ImageSize

190exifHeader = do

193exifHeader = do