pandoc 1.15.1 → 1.15.1.1

raw patch · 5 files changed

+25/−5 lines, 5 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• changelog +8/−1
• man/pandoc.1 +6/−1
• pandoc.cabal +1/−1
• src/Text/Pandoc/Data.hsb +9/−1
• src/Text/Pandoc/Shared.hs +1/−1

@@ -1,3 +1,10 @@+pandoc (1.15.1.1)++  * `Text.Pandoc.Data`:  store paths in dataFiles using posix separators.+    This way we have uniform separators, whether on Windows or Linux.+    This should solve a problem where on some Windows versions+    the data files weren't being found (#2459).+ pandoc (1.15.1)    * `pandocVersion` is now defined in `Text.Pandoc.Shared`@@ -154,7 +161,7 @@    * EPUB writer: -    + In TOC, replace literal "<br/>" with space (#2105).+    + In TOC, replace literal `<br/>` with space (#2105).     + With `--webtex`, include image file rather than `data:` URI (#2363).    * Native writer: format Div properly, with blocks separated.

@@ -4237,7 +4237,7 @@ presentation. Notes are not yet supported for other slide formats, but the notes will not appear on the slides themselves.-.SS Marking frames "fragile" in beamer+.SS Frame attributes in beamer .PP Sometimes it is necessary to add the LaTeX \f[C][fragile]\f[] option to a frame in beamer (for example, when using the \f[C]minted\f[]@@ -4250,6 +4250,11 @@ #\ Fragile\ slide\ {.fragile} \f[] .fi+.PP+All of the other frame attributes described in Section 8.1 of the Beamer+User\[aq]s Guide may also be used: \f[C]allowdisplaybreaks\f[],+\f[C]allowframebreaks\f[], \f[C]b\f[], \f[C]c\f[], \f[C]t\f[],+\f[C]environment\f[], \f[C]label\f[], \f[C]plain\f[], \f[C]shrink\f[]. .SH EPUB METADATA .PP EPUB metadata may be specified using the \f[C]\-\-epub\-metadata\f[]

@@ -1,5 +1,5 @@ Name:            pandoc-Version:         1.15.1+Version:         1.15.1.1 Cabal-Version:   >= 1.10 Build-Type:      Custom License:         GPL

@@ -2,6 +2,14 @@ -- to be processed using hsb2hs module Text.Pandoc.Data (dataFiles) where import qualified Data.ByteString as B+import System.FilePath (splitDirectories)+import qualified System.FilePath.Posix as Posix +-- We ensure that the data files are stored using Posix+-- path separators (/), even on Windows. dataFiles :: [(FilePath, B.ByteString)]-dataFiles = ("README", %blob "README") : %blobs "data"+dataFiles = map (\(fp, contents) ->+  (Posix.joinPath (splitDirectories fp), contents)) dataFiles'++dataFiles' :: [(FilePath, B.ByteString)]+dataFiles' = ("README", %blob "README") : %blobs "data"

@@ -854,7 +854,6 @@ #else   getDataFileName fname' >>= checkExistence >>= BS.readFile     where fname' = if fname == "README" then fname else "data" </> fname-#endif  checkExistence :: FilePath -> IO FilePath checkExistence fn = do@@ -862,6 +861,7 @@   if exists      then return fn      else err 97 ("Could not find data file " ++ fn)+#endif  -- | Read file from specified user data directory or, if not found there, from -- Cabal data directory.