diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown --- a/CHANGELOG.markdown +++ b/CHANGELOG.markdown @@ -1,3 +1,8 @@ +0.2.1 +------- +* added number formats (thanks to Alan Zimmerman ) +* loosened dependency on zip-archive package + 0.2.0 ----- * added style sheet support (thanks to Edsko de Vries ) diff --git a/src/Codec/Xlsx/Formatted.hs b/src/Codec/Xlsx/Formatted.hs --- a/src/Codec/Xlsx/Formatted.hs +++ b/src/Codec/Xlsx/Formatted.hs @@ -14,6 +14,7 @@ , formattedBorder , formattedFill , formattedFont + , formattedNumberFormat , formattedProtection , formattedPivotButton , formattedQuotePrefix @@ -95,16 +96,17 @@ -- * Add a number format ('_cellXfApplyNumberFormat', '_cellXfNumFmtId') -- * Add references to the named style sheets ('_cellXfId') data FormattedCell = FormattedCell { - _formattedAlignment :: Maybe Alignment - , _formattedBorder :: Maybe Border - , _formattedFill :: Maybe Fill - , _formattedFont :: Maybe Font - , _formattedProtection :: Maybe Protection - , _formattedPivotButton :: Maybe Bool - , _formattedQuotePrefix :: Maybe Bool - , _formattedValue :: Maybe CellValue - , _formattedColSpan :: Int - , _formattedRowSpan :: Int + _formattedAlignment :: Maybe Alignment + , _formattedBorder :: Maybe Border + , _formattedFill :: Maybe Fill + , _formattedFont :: Maybe Font + , _formattedNumberFormat :: Maybe NumberFormat + , _formattedProtection :: Maybe Protection + , _formattedPivotButton :: Maybe Bool + , _formattedQuotePrefix :: Maybe Bool + , _formattedValue :: Maybe CellValue + , _formattedColSpan :: Int + , _formattedRowSpan :: Int } deriving (Show, Eq) @@ -112,16 +114,17 @@ instance Default FormattedCell where def = FormattedCell { - _formattedAlignment = Nothing - , _formattedBorder = Nothing - , _formattedFill = Nothing - , _formattedFont = Nothing - , _formattedProtection = Nothing - , _formattedPivotButton = Nothing - , _formattedQuotePrefix = Nothing - , _formattedValue = Nothing - , _formattedColSpan = 1 - , _formattedRowSpan = 1 + _formattedAlignment = Nothing + , _formattedBorder = Nothing + , _formattedFill = Nothing + , _formattedFont = Nothing + , _formattedNumberFormat = Nothing + , _formattedProtection = Nothing + , _formattedPivotButton = Nothing + , _formattedQuotePrefix = Nothing + , _formattedValue = Nothing + , _formattedColSpan = 1 + , _formattedRowSpan = 1 } {------------------------------------------------------------------------------- @@ -240,17 +243,18 @@ mBorderId <- getId formattingBorders `mapM` _formattedBorder mFillId <- getId formattingFills `mapM` _formattedFill mFontId <- getId formattingFonts `mapM` _formattedFont + let mNumFmtId = fmap numberFormatId _formattedNumberFormat let xf = CellXf { _cellXfApplyAlignment = apply _formattedAlignment , _cellXfApplyBorder = apply mBorderId , _cellXfApplyFill = apply mFillId , _cellXfApplyFont = apply mFontId - , _cellXfApplyNumberFormat = Nothing -- TODO + , _cellXfApplyNumberFormat = apply _formattedNumberFormat , _cellXfApplyProtection = apply _formattedProtection , _cellXfBorderId = mBorderId , _cellXfFillId = mFillId , _cellXfFontId = mFontId - , _cellXfNumFmtId = Nothing -- TODO + , _cellXfNumFmtId = mNumFmtId , _cellXfPivotButton = _formattedPivotButton , _cellXfQuotePrefix = _formattedQuotePrefix , _cellXfId = Nothing -- TODO diff --git a/src/Codec/Xlsx/Types/StyleSheet.hs b/src/Codec/Xlsx/Types/StyleSheet.hs --- a/src/Codec/Xlsx/Types/StyleSheet.hs +++ b/src/Codec/Xlsx/Types/StyleSheet.hs @@ -17,6 +17,7 @@ , Fill(..) , FillPattern(..) , Font(..) + , NumberFormat(..), numberFormatId , Protection(..) -- * Supporting enumerations , CellHorizontalAlignment(..) @@ -552,6 +553,70 @@ , _fontVertAlign :: Maybe FontVerticalAlignment } deriving (Show, Eq, Ord) + +-- Section 18.2.30 "font (Font)" (p. 1777) +-- Note: This only implements the predefined values for 18.2.30 "All Languages", +-- not the extended languages or custom ones from 18.2.31 +data NumberFormat = + NfGeneral -- ^> 0 General + | NfZero -- ^> 1 0 + | Nf2Decimal -- ^> 2 0.00 + | NfMax3Decimal -- ^> 3 #,##0 + | NfThousandSeparator2Decimal -- ^> 4 #,##0.00 + | NfPercent -- ^> 9 0% + | NfPercent2Decimal -- ^> 10 0.00% + | NfExponent2Decimal -- ^> 11 0.00E+00 + | NfSingleSpacedFraction -- ^> 12 # ?/? + | NfDoubleSpacedFraction -- ^> 13 # ??/?? + | NfMmDdYy -- ^> 14 mm-dd-yy + | NfDMmmYy -- ^> 15 d-mmm-yy + | NfDMmm -- ^> 16 d-mmm + | NfMmmYy -- ^> 17 mmm-yy + | NfHMm12Hr -- ^> 18 h:mm AM/PM + | NfHMmSs12Hr -- ^> 19 h:mm:ss AM/PM + | NfHMm -- ^> 20 h:mm + | NfHMmSs -- ^> 21 h:mm:ss + | NfMdyHMm -- ^> 22 m/d/yy h:mm + | NfThousandsNegativeParens -- ^> 37 #,##0 ;(#,##0) + | NfThousandsNegativeRed -- ^> 38 #,##0 ;[Red](#,##0) + | NfThousands2DecimalNegativeParens -- ^> 39 #,##0.00;(#,##0.00) + | NfTousands2DecimalNEgativeRed -- ^> 40 #,##0.00;[Red](#,##0.00) + | NfMmSs -- ^> 45 mm:ss + | NfOptHMmSs -- ^> 46 [h]:mm:ss + | NfMmSs1Decimal -- ^> 47 mmss.0 + | NfExponent1Decimal -- ^> 48 ##0.0E+0 + | NfTextPlaceHolder -- ^> 49 @ + deriving (Show, Eq, Ord) + +numberFormatId :: NumberFormat -> Int +numberFormatId NfGeneral = 0 -- General +numberFormatId NfZero = 1 -- 0 +numberFormatId Nf2Decimal = 2 -- 0.00 +numberFormatId NfMax3Decimal = 3 -- #,##0 +numberFormatId NfThousandSeparator2Decimal = 4 -- #,##0.00 +numberFormatId NfPercent = 9 -- 0% +numberFormatId NfPercent2Decimal = 10 -- 0.00% +numberFormatId NfExponent2Decimal = 11 -- 0.00E+00 +numberFormatId NfSingleSpacedFraction = 12 -- # ?/? +numberFormatId NfDoubleSpacedFraction = 13 -- # ??/?? +numberFormatId NfMmDdYy = 14 -- mm-dd-yy +numberFormatId NfDMmmYy = 15 -- d-mmm-yy +numberFormatId NfDMmm = 16 -- d-mmm +numberFormatId NfMmmYy = 17 -- mmm-yy +numberFormatId NfHMm12Hr = 18 -- h:mm AM/PM +numberFormatId NfHMmSs12Hr = 19 -- h:mm:ss AM/PM +numberFormatId NfHMm = 20 -- h:mm +numberFormatId NfHMmSs = 21 -- h:mm:ss +numberFormatId NfMdyHMm = 22 -- m/d/yy h:mm +numberFormatId NfThousandsNegativeParens = 37 -- #,##0 ;(#,##0) +numberFormatId NfThousandsNegativeRed = 38 -- #,##0 ;[Red](#,##0) +numberFormatId NfThousands2DecimalNegativeParens = 39 -- #,##0.00;(#,##0.00) +numberFormatId NfTousands2DecimalNEgativeRed = 40 -- #,##0.00;[Red](#,##0.00) +numberFormatId NfMmSs = 45 -- mm:ss +numberFormatId NfOptHMmSs = 46 -- [h]:mm:ss +numberFormatId NfMmSs1Decimal = 47 -- mmss.0 +numberFormatId NfExponent1Decimal = 48 -- ##0.0E+0 +numberFormatId NfTextPlaceHolder = 49 -- @ -- | Protection properties -- diff --git a/xlsx.cabal b/xlsx.cabal --- a/xlsx.cabal +++ b/xlsx.cabal @@ -1,6 +1,6 @@ Name: xlsx -Version: 0.2.0 +Version: 0.2.1 Synopsis: Simple and incomplete Excel file parser/writer Description: @@ -56,7 +56,7 @@ , conduit >= 1.0.0 , xml-types == 0.3.* , xml-conduit >= 1.1.0 - , zip-archive == 0.2.* + , zip-archive >= 0.2 , digest == 0.0.* , zlib >= 0.5.4.0 , utf8-string >= 0.3.7