Read vertical alignment

Fixes issue #574

Author: appel1

src/ExcelDataReader.Tests/ExcelTestBase.cs

@@ -980,6 +980,17 @@ public void GitIssue694ExcelTimeFormatTimeSpan()
         Assert.That(TimeSpan.Parse(reader[1].ToString()), Is.EqualTo(TimeSpan.Parse("00:11")));
     }
 
+    [Test]
+    public void GitIssue574VerticalAlignment()
+    {        
+        using var reader = OpenReader("Test_git_issue_574");
+        reader.Read();
+
+        Assert.That(reader.GetCellStyle(0).VerticalAlignment, Is.EqualTo(VerticalAlignment.Top));
+        Assert.That(reader.GetCellStyle(1).VerticalAlignment, Is.EqualTo(VerticalAlignment.Center));
+        Assert.That(reader.GetCellStyle(2).VerticalAlignment, Is.EqualTo(VerticalAlignment.Bottom));
+    }
+
     protected IExcelDataReader OpenReader(string name)
     {
         return OpenReader(OpenStream(name));

src/ExcelDataReader/CellStyle.cs

@@ -46,6 +46,37 @@ public enum HorizontalAlignment
     Distributed,
 }
 
+/// <summary>
+/// Vertical alignment.
+/// </summary>
+public enum VerticalAlignment
+{
+    /// <summary>
+    /// Top.
+    /// </summary>
+    Top,
+
+    /// <summary>
+    /// Center.
+    /// </summary>
+    Center,
+
+    /// <summary>
+    /// Bottom.
+    /// </summary>
+    Bottom,
+
+    /// <summary>
+    /// Justify.
+    /// </summary>
+    Justify,
+
+    /// <summary>
+    /// Distributed.
+    /// </summary>
+    Distributed,
+}
+
 /// <summary>
 /// Holds style information for a cell.
 /// </summary>
@@ -71,6 +102,11 @@ public class CellStyle
     /// </summary>
     public HorizontalAlignment HorizontalAlignment { get; internal set; }
 
+    /// <summary>
+    /// Gets the vertical alignment.
+    /// </summary>
+    public VerticalAlignment VerticalAlignment { get; internal set; }
+
     /// <summary>
     /// Gets a value indicating whether the cell is hidden.
     /// </summary>

src/ExcelDataReader/Core/BinaryFormat/XlsBiffXF.cs

@@ -31,7 +31,8 @@ internal XlsBiffXF(byte[] bytes, int biffVersion)
                 IsHidden = (ReadByte(2) & 2) != 0;
                 IsCellStyleXf = (ReadByte(2) & 4) != 0;
                 ParentCellStyleXf = ReadUInt16(2) >> 4;
-                HorizontalAlignment = (HorizontalAlignment)(ReadByte(4) & 0x07);
+                HorizontalAlignment = (HorizontalAlignment)(ReadByte(4) & 0b111);
+                VerticalAlignment = (VerticalAlignment)(ReadByte(4) >> 4 & 0b111);
                 break;
             default:
                 Font = ReadUInt16(0);
@@ -40,7 +41,8 @@ internal XlsBiffXF(byte[] bytes, int biffVersion)
                 IsHidden = (ReadByte(4) & 2) != 0;
                 IsCellStyleXf = (ReadByte(4) & 4) != 0;
                 ParentCellStyleXf = ReadUInt16(4) >> 4;
-                HorizontalAlignment = (HorizontalAlignment)(ReadByte(6) & 0x07);
+                HorizontalAlignment = (HorizontalAlignment)(ReadByte(6) & 0b111);
+                VerticalAlignment = (VerticalAlignment)(ReadByte(6) >> 4 & 0b111);
                 if (biffVersion == 8)
                 {
                     IndentLevel = ReadByte(8) & 0x0F;
@@ -79,4 +81,6 @@ internal XlsBiffXF(byte[] bytes, int biffVersion)
     public int IndentLevel { get; }
 
     public HorizontalAlignment HorizontalAlignment { get; }
+
+    public VerticalAlignment VerticalAlignment { get; }
 }

src/ExcelDataReader/Core/BinaryFormat/XlsWorkbook.cs

@@ -137,7 +137,7 @@ public IEnumerable<XlsWorksheet> ReadWorksheets()
 
     internal void AddXf(XlsBiffXF xf)
     {
-        var extendedFormat = new ExtendedFormat(xf.ParentCellStyleXf, xf.Font, xf.Format, xf.IsLocked, xf.IsHidden, xf.IndentLevel, xf.HorizontalAlignment);
+        var extendedFormat = new ExtendedFormat(xf.ParentCellStyleXf, xf.Font, xf.Format, xf.IsLocked, xf.IsHidden, xf.IndentLevel, xf.HorizontalAlignment, xf.VerticalAlignment);
 
         // The workbook holds two kinds of XF records: Cell XFs, and Cell Style XFs.
         // In the binary XLS format, both kinds of XF records are saved in a single list,

src/ExcelDataReader/Core/ExtendedFormat.cs

@@ -9,7 +9,7 @@ public ExtendedFormat(int numberFormatIndex)
         NumberFormatIndex = numberFormatIndex;
     }
 
-    public ExtendedFormat(int parentCellStyleXf, int fontIndex, int numberFormatIndex, bool locked, bool hidden, int indentLevel, HorizontalAlignment horizontalAlignment)
+    public ExtendedFormat(int parentCellStyleXf, int fontIndex, int numberFormatIndex, bool locked, bool hidden, int indentLevel, HorizontalAlignment horizontalAlignment, VerticalAlignment verticalAlignment)
     {
         ParentCellStyleXf = parentCellStyleXf;
         FontIndex = fontIndex;
@@ -18,6 +18,7 @@ public ExtendedFormat(int parentCellStyleXf, int fontIndex, int numberFormatInde
         Hidden = hidden;
         IndentLevel = indentLevel;
         HorizontalAlignment = horizontalAlignment;
+        VerticalAlignment = verticalAlignment;
     }
 
     private ExtendedFormat()
@@ -43,4 +44,6 @@ private ExtendedFormat()
     public int IndentLevel { get; }
 
     public HorizontalAlignment HorizontalAlignment { get; }
+
+    public VerticalAlignment VerticalAlignment { get; }
 }

src/ExcelDataReader/Core/OpenXmlFormat/BinaryFormat/BiffStylesReader.cs

@@ -54,7 +54,8 @@ protected override Record ReadOverride(byte[] buffer, uint recordId, uint record
                         (buffer[13] & 0x10000) != 0,
                         (buffer[13] & 0x100000) != 0,
                         (int)(uint)buffer[11],
-                        (HorizontalAlignment)(buffer[12] & 0b111));
+                        (HorizontalAlignment)(buffer[12] & 0b111),
+                        (VerticalAlignment)(buffer[12] >> 3 & 0b111));
 
                     if (_inCellXf)
                         return new ExtendedFormatRecord(extendedFormat);

src/ExcelDataReader/Core/OpenXmlFormat/XmlFormat/XmlStylesReader.cs

@@ -26,6 +26,8 @@ internal sealed class XmlStylesReader(XmlReader reader) : XmlRecordReader(reader
     private const string AIndent = "indent";
     private const string AHorizontal = "horizontal";
 
+    private const string AVertical = "vertical";
+
     private const string NProtection = "protection";
     private const string AHidden = "hidden";
     private const string ALocked = "locked";
@@ -101,9 +103,9 @@ private IEnumerable<ExtendedFormat> ReadCellXfs(string nsSpreadsheetMl)
                 // var applyNumberFormat = Reader.GetAttribute(AApplyNumberFormat) == "1";
                 // var applyAlignment = Reader.GetAttribute(AApplyAlignment) == "1";
                 // var applyProtection = Reader.GetAttribute(AApplyProtection) == "1";
-                ReadAlignment(Reader, nsSpreadsheetMl, out int indentLevel, out HorizontalAlignment horizontalAlignment, out var hidden, out var locked);
+                ReadAlignment(Reader, nsSpreadsheetMl, out int indentLevel, out HorizontalAlignment horizontalAlignment, out var verticalAlignment, out var hidden, out var locked);
 
-                yield return new ExtendedFormat(xfId, -1, numFmtId, locked, hidden, indentLevel, horizontalAlignment);
+                yield return new ExtendedFormat(xfId, -1, numFmtId, locked, hidden, indentLevel, horizontalAlignment, verticalAlignment);
 
                 // reader.Skip();
             }
@@ -113,10 +115,11 @@ private IEnumerable<ExtendedFormat> ReadCellXfs(string nsSpreadsheetMl)
             }
         }
 
-        static void ReadAlignment(XmlReader reader, string nsSpreadsheetMl, out int indentLevel, out HorizontalAlignment horizontalAlignment, out bool hidden, out bool locked)
+        static void ReadAlignment(XmlReader reader, string nsSpreadsheetMl, out int indentLevel, out HorizontalAlignment horizontalAlignment, out VerticalAlignment verticalAlignment, out bool hidden, out bool locked)
         {
             indentLevel = 0;
             horizontalAlignment = HorizontalAlignment.General;
+            verticalAlignment = VerticalAlignment.Bottom;
             hidden = false;
             locked = false;
 
@@ -137,6 +140,12 @@ static void ReadAlignment(XmlReader reader, string nsSpreadsheetMl, out int inde
                         Enum.TryParse(attrValue, true, out horizontalAlignment);
                     }
 
+                    attrValue = reader.GetAttribute(AVertical);
+                    if (attrValue is not null)
+                    {
+                        Enum.TryParse(attrValue, true, out verticalAlignment);
+                    }
+
                     reader.Skip();
                 }
                 else if (reader.IsStartElement(NProtection, nsSpreadsheetMl))

src/ExcelDataReader/ExcelDataReader.cs

@@ -194,6 +194,7 @@ public CellStyle GetCellStyle(int i)
         result.NumberFormatIndex = effectiveStyle.NumberFormatIndex;
         result.IndentLevel = effectiveStyle.IndentLevel;
         result.HorizontalAlignment = effectiveStyle.HorizontalAlignment;
+        result.VerticalAlignment = effectiveStyle.VerticalAlignment;
         result.Hidden = effectiveStyle.Hidden;
         result.Locked = effectiveStyle.Locked;
         return result;