xlsx 0.7.1 → 0.7.2

raw patch · 5 files changed

+34/−3 lines, 5 files

Files

CHANGELOG.markdown +5/−0
src/Codec/Xlsx/Parser/Internal/Fast.hs +1/−1
src/Codec/Xlsx/Types/RichText.hs +26/−0
src/Codec/Xlsx/Types/StyleSheet.hs +1/−1
xlsx.cabal +1/−1

CHANGELOG.markdown view

@@ -1,3 +1,8 @@+0.7.2+-----+* GHC 8.4 compatibility++----- 0.7.1 ----- * improved compatibility with Excel in pivot cache serialization

src/Codec/Xlsx/Parser/Internal/Fast.hs view

@@ -41,7 +41,7 @@ import qualified Data.ByteString.Unsafe as SU import Data.Char (chr) import Data.Maybe-import Data.Monoid+import Data.Monoid ((<>)) import Data.Text (Text) import qualified Data.Text as T import qualified Data.Text.Encoding as T

src/Codec/Xlsx/Types/RichText.hs view

@@ -1,3 +1,4 @@+{-# LANGUAGE CPP #-} {-# LANGUAGE OverloadedStrings  #-} {-# LANGUAGE RecordWildCards    #-} {-# LANGUAGE TemplateHaskell    #-}@@ -310,6 +311,31 @@ {-------------------------------------------------------------------------------   Applying formatting -------------------------------------------------------------------------------}++#if (MIN_VERSION_base(4,11,0))+instance Semigroup RunProperties where+  a <> b = RunProperties {+      _runPropertiesBold          = override _runPropertiesBold+    , _runPropertiesCharset       = override _runPropertiesCharset+    , _runPropertiesColor         = override _runPropertiesColor+    , _runPropertiesCondense      = override _runPropertiesCondense+    , _runPropertiesExtend        = override _runPropertiesExtend+    , _runPropertiesFontFamily    = override _runPropertiesFontFamily+    , _runPropertiesItalic        = override _runPropertiesItalic+    , _runPropertiesOutline       = override _runPropertiesOutline+    , _runPropertiesFont          = override _runPropertiesFont+    , _runPropertiesScheme        = override _runPropertiesScheme+    , _runPropertiesShadow        = override _runPropertiesShadow+    , _runPropertiesStrikeThrough = override _runPropertiesStrikeThrough+    , _runPropertiesSize          = override _runPropertiesSize+    , _runPropertiesUnderline     = override _runPropertiesUnderline+    , _runPropertiesVertAlign     = override _runPropertiesVertAlign+    }+    where+      override :: (RunProperties -> Maybe x) -> Maybe x+      override f = f b `mplus` f a++#endif  -- | The 'Monoid' instance for 'RunProperties' is biased: later properties -- override earlier ones.

src/Codec/Xlsx/Types/StyleSheet.hs view

@@ -134,7 +134,7 @@ import Data.Map.Strict (Map) import qualified Data.Map.Strict as M import Data.Maybe (catMaybes)-import Data.Monoid+import Data.Monoid ((<>)) import Data.Text (Text) import qualified Data.Text as T import GHC.Generics (Generic)

xlsx.cabal view

@@ -1,6 +1,6 @@ Name:                xlsx -Version:             0.7.1+Version:             0.7.2  Synopsis:            Simple and incomplete Excel file parser/writer Description: