EPPlusSoftware
diff --git a/‎docs/articles/breakingchanges.md
Lines changed: 6 additions & 1 deletion b/‎docs/articles/breakingchanges.md
Lines changed: 6 additions & 1 deletion
diff --git a/‎docs/articles/fixedissues.md
Lines changed: 54 additions & 1 deletion b/‎docs/articles/fixedissues.md
Lines changed: 54 additions & 1 deletion
diff --git a/‎src/.editorconfig
Lines changed: 1 addition & 0 deletions b/‎src/.editorconfig
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/EPPlus.System.Drawing/Drawing/Image/SystemDrawingImageHandler.cs
Lines changed: 1 addition & 1 deletion b/‎src/EPPlus.System.Drawing/Drawing/Image/SystemDrawingImageHandler.cs
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/EPPlus/ConditionalFormatting/Contracts/IExcelConditionalFormattingIconSetGroup.cs
Lines changed: 1 addition & 1 deletion b/‎src/EPPlus/ConditionalFormatting/Contracts/IExcelConditionalFormattingIconSetGroup.cs
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/EPPlus/ConditionalFormatting/Contracts/IRangeConditionalFormatting.cs
Lines changed: 1 addition & 3 deletions b/‎src/EPPlus/ConditionalFormatting/Contracts/IRangeConditionalFormatting.cs
Lines changed: 1 addition & 3 deletions
diff --git a/‎src/EPPlus/ConditionalFormatting/ExcelConditionalFormattingColorScaleValue.cs
Lines changed: 8 additions & 4 deletions b/‎src/EPPlus/ConditionalFormatting/ExcelConditionalFormattingColorScaleValue.cs
Lines changed: 8 additions & 4 deletions
diff --git a/‎src/EPPlus/ConditionalFormatting/ExcelConditionalFormattingEnums.cs
Lines changed: 1 addition & 1 deletion b/‎src/EPPlus/ConditionalFormatting/ExcelConditionalFormattingEnums.cs
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/EPPlus/ConditionalFormatting/ExcelConditionalFormattingIconDatabarValue.cs
Lines changed: 80 additions & 4 deletions b/‎src/EPPlus/ConditionalFormatting/ExcelConditionalFormattingIconDatabarValue.cs
Lines changed: 80 additions & 4 deletions
@@ -125,4 +125,9 @@ Misspelled property `ExcelIgnoreError.CalculatedColumm` has been renamed `Calcul
 * When reading conditional formatting from file Style.Fill.PatternType is now always null if the patternType attribute in the xml has not been set.
 #### Rich Text
 * The `ExcelRichText._collection` has been set to internal.
-* Public static methods in the class `XmlHelper` used to getting richtext properties has been changed to internal.
+* Public static methods in the class `XmlHelper` used to getting richtext properties has been changed to internal.
+
+
+### Breaking Change From EPPlus 7.2
+* Changed class ExcelTextFormatBase to abstract
+* OfficeOpenXml.FormulaParsing.ExcelUtilities.ExcelReferenceType RelativeRowAbsolutColumn corrected to RelativeRowAbsoluteColumn
@@ -1,4 +1,53 @@
 # Features / Fixed issues - EPPlus 7
+## Version 7.2
+### Features
+* Added support for calculating pivot tables - See https://github.com/EPPlusSoftware/EPPlus/wiki/Calculating-Pivot-tables
+	* Supports calculation of data fields on column and row fields. 
+		* Page field filtering
+		* Filters
+                * Slicers
+	        * Show data as on data fields 
+                * Calculated fields.
+	* Access calculated pivot table data via the ExcelPivotTable.CalculatedData property of the ExcelPivotTable.GetPivotData function
+	* GetPivotData function.
+* Added support for copying drawings.
+ 	* Many types of drawings:
+	   	* Shapes
+	   	* Charts
+	   	* Pictures
+	   	* Controls
+	   	* Slicers
+	   	* Group Shapes
+    	* Copy individual drawings.
+	* Copying a range will include drawings.
+  		* Set flag to ignore drawings.
+* Added support for importing and exporting Fixed Width text files.
+* Transpose
+  	* Transpose ranges in import and export functions.
+        * Transpose i range Copy.
+* New functions supported in formula calculations.
+	* GETPIVOTDATA
+	* MMULT
+  	* MINVERSE
+  	* MDETERM
+  	* MUNIT
+  	* TEXTSPLIT
+	* TEXTAFTER
+  	* TEXTBEFORE
+	* LET       
+* Added Full-fledged support for Iconsets and Databar conditionalformattings in HTML-exporter, New features include:
+	* Exporting full visuals of Positive and negative databars with borders and axis colors, position and bar direction
+	* Custom-made embeded .svgs similar to each icon excel supports.
+	* Custom iconsets displaying appropriately and in order.
+	* Icons moving with text when aligned top, middle or bottom as in excel.
+	* Theme colors for colorscales now work correctly in the HTML exporter
+
+### Minor Features and fixed issues
+* Cell text/content now default to vertical-align bottom as data in excel cells are bottom-aligned by default.
+* Added new properties `FirstValueCell`, `LastValueCell` and `DimensionByValue` to ExcelWorksheet to manage cell value boundries for a worksheet.
+* Added ManualLayout property for data labels on charts. Labels can now be positioned and their textbox resized directly. Accessed via e.g `Chart.Series[0].DataLabel.DataLabels[0].Layout.ManualLayout`
+* Conditional Formatting Color Scales now support theme color correctly.
+
 ## Version 7.1.3
 ### Fixed issues 
 * Dxf styles on tables got corrupt if a style contained an alignment and border element.
@@ -12,6 +61,10 @@
 * Loading a workbook with rich text elements with no style element could hang.
 * The rich text `Text` property was not decode for restricted characters.
 
+* Table Column Names
+	* ShowHeaders = True property on tables no longer causes crash in rare cases. It also no longer updates column names.
+	* Table.SyncColumnNames method added to ensures column names and cell-values in header are equal. Applying this method should cover any potential issues caused by above fix not updating column names.
+	* Adding a table column to a table no longer creates a column name that can conflict with existing names.
 ## Version 7.1.2
 ### Fixed issues 
 * Defined Names with `"` symbols no longer get extraneous `"` added when saving in EPPlus.
@@ -1186,4 +1239,4 @@ These overloads have been deprecated:
 * _Formula calc_: Does not remove double-negation from formulatokens.
 * _Formula calc_: Value matcher now supports comparisons between DateTime and double. CompileResultFactory includes float type in DataType.Decimal.
 * _Formula calc_: MultipleRangeCriterasFunction.GetMatchIndexes() looped through max number of rows when a range argument was an entire column now stops as Dimension.End.Row. Fixed a bug in CountIfs function which wasn't working properly with multiple criteria's
-* _Formula calc_: Support Instance_num parameter of SUBSTITUTE function.
+* _Formula calc_: Support Instance_num parameter of SUBSTITUTE function.
@@ -25,6 +25,7 @@ csharp_style_prefer_null_check_over_type_check = true:suggestion
 csharp_prefer_simple_default_expression = true:suggestion
 csharp_style_prefer_local_over_anonymous_function = true:suggestion
 csharp_space_around_binary_operators = before_and_after
+csharp_style_prefer_primary_constructors = true:suggestion
 [*.{cs,vb}]
 #### Naming styles ####
 
 
@@ -50,7 +50,7 @@ public bool GetImageBounds(MemoryStream image, ePictureType type, out double wid
         {
             try
             {
-                var bmp = new Bitmap(image);
+                Bitmap bmp = new Bitmap(image);
                 width = bmp.Width;
                 height = bmp.Height;
                 horizontalResolution = bmp.HorizontalResolution;
 
@@ -42,7 +42,7 @@ public interface IExcelConditionalFormattingIconSetGroup<T>
     bool Custom { get; }
 
     /// <summary>
-    /// IconSet (3, 4 ou 5 IconSet)
+    /// IconSet (3, 4 or 5 IconSet)
     /// </summary>
     T IconSet { get; set; }
     #endregion Public Properties
 
@@ -294,11 +294,9 @@ public interface IRangeConditionalFormatting
         IExcelConditionalFormattingDataBarGroup AddDatabar(Color color);
 
         /// <summary>
-        /// Get dict of all CFs and their addresses in range
+        /// Get a list of all conditional formatting rules that exist on cells in the range
         /// </summary>
         /// <returns></returns>
-        //Dictionary<string, List<ExcelConditionalFormattingRule>> GetConditionalFormattings();
-
         List<ExcelConditionalFormattingRule> GetConditionalFormattings();
     }
 }
@@ -18,6 +18,9 @@ Date               Author                       Change
 
 namespace OfficeOpenXml.ConditionalFormatting
 {
+    /// <summary>
+    /// 
+    /// </summary>
     public class ExcelConditionalFormattingColorScaleValue
     {
         int _priority;
@@ -26,10 +29,11 @@ public class ExcelConditionalFormattingColorScaleValue
             Color color,
             double value,
             string formula,
-            int priority)
+            int priority,
+            ExcelStyles styles)
         {
             Type = (eExcelConditionalFormattingValueObjectType)type;
-            _colorSettings = new ExcelDxfColor(null, eStyleClass.Fill, SetColor);
+            _colorSettings = new ExcelDxfColor(styles, eStyleClass.Fill, SetColor);
             Color = color;
             Value = value;
             if(Type != eExcelConditionalFormattingValueObjectType.Percentile)
@@ -42,8 +46,8 @@ public class ExcelConditionalFormattingColorScaleValue
         internal ExcelConditionalFormattingColorScaleValue(
         eExcelConditionalFormattingValueObjectType? type,
         Color color,
-        int priority) 
-        : this(type, color, double.NaN, null, priority)
+        int priority, ExcelStyles styles) 
+        : this(type, color, double.NaN, null, priority, styles)
         {
         }
 
 
@@ -873,7 +873,7 @@ public enum eExcelconditionalFormattingCustomIcon
         /// </summary>
         GreenCheckSymbol = 0x62,
 
-        //3Symbols2
+        //3Symbols
         //--------
 
         /// <summary>
 
@@ -11,10 +11,13 @@ Date               Author                       Change
   01/27/2020         EPPlus Software AB       Initial release EPPlus 5
   07/07/2023         EPPlus Software AB       Epplus 7
  *************************************************************************************************/
+using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
 using OfficeOpenXml.Style.Dxf;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using OfficeOpenXml.FormulaParsing.Utilities;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.MathFunctions;
 
 namespace OfficeOpenXml.ConditionalFormatting
 {
@@ -25,7 +28,6 @@ namespace OfficeOpenXml.ConditionalFormatting
     public class ExcelConditionalFormattingIconDataBarValue
     {
         private eExcelConditionalFormattingRuleType _ruleType;
-        ExcelConditionalFormattingRule _rule;
 
         internal bool HasValueOrFormula
         {
@@ -84,9 +86,7 @@ internal ExcelConditionalFormattingIconDataBarValue(
 
         internal void SetCustomIconStringAndId(string set, int id)
         {
-            int myKey = _iconStringSetDictionary.FirstOrDefault(x => x.Value == set).Key << 4;
-            myKey += id;
-            CustomIcon = (eExcelconditionalFormattingCustomIcon)myKey;
+            CustomIcon = IconDict.GetIconAtIndex(set, id);
         }
 
         internal virtual string GetCustomIconStringValue()
@@ -153,6 +153,8 @@ public eExcelConditionalFormattingValueObjectType Type
 
         private double? _value = double.NaN;
 
+        internal double _formulaCalculatedValue = double.NaN;
+
         /// <summary>
         /// The value
         /// </summary>
@@ -226,5 +228,79 @@ public string Formula
                 }
             }
         }
+
+        internal bool ShouldApplyIcon(double aValue)
+        {
+            double conditionValue = Value;
+
+            if(Type == eExcelConditionalFormattingValueObjectType.Formula)
+            {
+                conditionValue = _formulaCalculatedValue;
+            }
+
+            if(aValue < conditionValue)
+            {
+                return false;
+            }
+
+            if(aValue == conditionValue && GreaterThanOrEqualTo == false)
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        internal double GetCalculatedValue(double maxValue, double minValue, ExcelWorkbook wb, ExcelAddressBase address, ExcelAddress rangeAddress, List<object> values)
+        {
+            double calculatedValue;
+
+            switch(Type)
+            {
+                case eExcelConditionalFormattingValueObjectType.Max:
+                case eExcelConditionalFormattingValueObjectType.AutoMax:
+                    calculatedValue = maxValue;
+                    break;
+                case eExcelConditionalFormattingValueObjectType.Min:
+                case eExcelConditionalFormattingValueObjectType.AutoMin:
+                    calculatedValue = minValue;
+                    break;
+                case eExcelConditionalFormattingValueObjectType.Num:
+                    calculatedValue = Value;
+                    break;
+                case eExcelConditionalFormattingValueObjectType.Percent:
+                    calculatedValue = ((Value * 0.01) * (maxValue - minValue)) + minValue; 
+                    break;
+                case eExcelConditionalFormattingValueObjectType.Percentile:
+                    var percentileResult = wb.FormulaParserManager.Parse(
+                        $"PERCENTILE.INC({rangeAddress.AddressSpaceSeparated}, {(Value * 0.01).ToString(System.Globalization.CultureInfo.InvariantCulture)})", address.FullAddress, false
+                        );
+                    if (percentileResult.IsNumeric())
+                    {
+                        _formulaCalculatedValue = Convert.ToDouble(percentileResult);
+                        calculatedValue = _formulaCalculatedValue;
+                    }
+                    else
+                    {
+                        throw new Exception($"The databar percentile input '{Value}' must be a numeric value. Error found in databar conditional formatting at cell {address.Address}");
+                    }
+                    break;
+                    case eExcelConditionalFormattingValueObjectType.Formula:
+                    var formulaResult = wb.FormulaParserManager.Parse(Formula, address.FullAddress, false);
+                    if (formulaResult.IsNumeric())
+                    {
+                        _formulaCalculatedValue = Convert.ToDouble(formulaResult);
+                        calculatedValue = _formulaCalculatedValue;
+                    }
+                    else
+                    {
+                        throw new Exception($"The databar formula '{Formula}' must return a numeric value. Error found in databar conditional formatting at cell {address.Address}");
+                    }
+                    break;
+                default:
+                    throw new NotImplementedException($"The type {Type} has not been implemented. Error found in databar conditional formatting at cell {address.Address}");
+            }
+            return calculatedValue;
+        }
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public bool GetImageBounds(MemoryStream image, ePictureType type, out double wid`
`50`	`50`	`{`
`51`	`51`	`try`
`52`	`52`	`{`
`53`		`- var bmp = new Bitmap(image);`
	`53`	`+ Bitmap bmp = new Bitmap(image);`
`54`	`54`	`width = bmp.Width;`
`55`	`55`	`height = bmp.Height;`
`56`	`56`	`horizontalResolution = bmp.HorizontalResolution;`
Original file line number	Diff line number	Diff line change
`@@ -294,11 +294,9 @@ public interface IRangeConditionalFormatting`
`294`	`294`	`IExcelConditionalFormattingDataBarGroup AddDatabar(Color color);`
`295`	`295`
`296`	`296`	`/// <summary>`
`297`		`- /// Get dict of all CFs and their addresses in range`
	`297`	`+ /// Get a list of all conditional formatting rules that exist on cells in the range`
`298`	`298`	`/// </summary>`
`299`	`299`	`/// <returns></returns>`
`300`		`- //Dictionary<string, List<ExcelConditionalFormattingRule>> GetConditionalFormattings();`
`301`		`-`
`302`	`300`	`List<ExcelConditionalFormattingRule> GetConditionalFormattings();`
`303`	`301`	`}`
`304`	`302`	`}`