diff options
| author | JasperVanDerJeugt <> | 2016-12-01 14:03:00 (GMT) |
|---|---|---|
| committer | hdiff <hdiff@hdiff.luite.com> | 2016-12-01 14:03:00 (GMT) |
| commit | 63f35346e7cc0a57f83ca0cced756541dc85e954 (patch) | |
| tree | 94ff7202be220176b1f7c15cd8c8ede6bc03b479 | |
| parent | 107b69cb8bfa2c63c3b64bbfa1fff295a7c8dd3b (diff) | |
version 0.4.2.00.4.2.0
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | patat.cabal | 4 | ||||
| -rw-r--r-- | src/Patat/Presentation/Fragment.hs | 7 |
3 files changed, 15 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b7bb9e..03d151f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +- 0.4.2.0 (2016-12-01) + * Fix issues with man page generation on Travis. + +- 0.4.1.0 (2016-12-01) + * Fix compatibility with `pandoc-1.18` and `pandoc-1.19`. + * Add a man page. + - 0.4.0.0 (2016-11-15) * Add configurable auto advancing. * Support fragmented slides. diff --git a/patat.cabal b/patat.cabal index 917c002..1d880ce 100644 --- a/patat.cabal +++ b/patat.cabal @@ -1,5 +1,5 @@ Name: patat -Version: 0.4.0.0 +Version: 0.4.2.0 Synopsis: Terminal-based presentations using Pandoc Description: Terminal-based presentations using Pandoc License: GPL-2 @@ -35,7 +35,7 @@ Executable patat highlighting-kate >= 0.6 && < 0.7, mtl >= 2.2 && < 2.3, optparse-applicative >= 0.12 && < 0.14, - pandoc >= 1.16 && < 1.19, + pandoc >= 1.16 && < 1.20, terminal-size >= 0.3 && < 0.4, text >= 1.2 && < 1.3, time >= 1.4 && < 1.7, diff --git a/src/Patat/Presentation/Fragment.hs b/src/Patat/Presentation/Fragment.hs index d8bebae..0908381 100644 --- a/src/Patat/Presentation/Fragment.hs +++ b/src/Patat/Presentation/Fragment.hs @@ -1,5 +1,6 @@ -- | For background info on the spec, see the "Incremental lists" section of the -- the pandoc manual. +{-# LANGUAGE CPP #-} {-# LANGUAGE DeriveFoldable #-} {-# LANGUAGE DeriveFunctor #-} {-# LANGUAGE DeriveTraversable #-} @@ -13,8 +14,8 @@ import Data.Foldable (Foldable) import Data.List (foldl', intersperse) import Data.Maybe (fromMaybe) import Data.Traversable (Traversable) -import qualified Text.Pandoc as Pandoc import Prelude +import qualified Text.Pandoc as Pandoc data FragmentSettings = FragmentSettings { fsIncrementalLists :: !Bool @@ -81,6 +82,10 @@ fragmentBlock _ block@(Pandoc.Div _ _) = Unfragmented block fragmentBlock _ block@Pandoc.HorizontalRule = Unfragmented block fragmentBlock _ block@Pandoc.Null = Unfragmented block +#if MIN_VERSION_pandoc(1,18,0) +fragmentBlock _ block@(Pandoc.LineBlock _) = Unfragmented block +#endif + joinFragmentedBlocks :: [Fragmented block] -> Fragmented [block] joinFragmentedBlocks = foldl' append (Unfragmented []) |