Minor code refactoring

README.md

@@ -54,7 +54,8 @@ Choosing a project dependency could be difficult. We need to ensure stability an
 
 ⭐ Please give this repository a star. It takes seconds and help thousands of developers! ⭐
 
-<img src="https://user-images.githubusercontent.com/9263853/232912983-b20e441e-bd47-41df-afa4-f02481252d26.png" width="800" />
+<img src="https://user-images.githubusercontent.com/9263853/224511996-9dd27a99-bef8-4d5e-bc14-9f6cfe0f5191.png" width="800" />
+
 
 ## Please share with the community
 

Source/QuestPDF.Examples/TableExamples.cs

@@ -316,58 +316,6 @@ namespace QuestPDF.Examples
                 });
         }
         
-        [Test]
-        public void Bug_RowSpanWorksIncorrectly()
-        {
-            // https://github.com/QuestPDF/QuestPDF/issues/552
-            
-            RenderingTest
-                .Create()
-                .ProduceImages()
-                .PageSize(PageSizes.A5.Landscape())
-                .ShowResults()
-                .Render(container =>
-                {
-                    container.Padding(20).Table(table => 
-                    {
-                        table.ColumnsDefinition(columns => 
-                        {
-                            columns.RelativeColumn(1);
-                            columns.RelativeColumn(2);
-                            columns.RelativeColumn(2);
-                            columns.RelativeColumn(2);
-                        });
-
-                        foreach (var i in Enumerable.Range(6, 9))
-                        {
-                            table.Cell().Element(CellStyleMainTable).Text($"{i:00}:00");
-                            
-                            foreach (var j in Enumerable.Range(1, 3))
-                                table.Cell().Element(CellStyleMainTable).Text("");
-                        }
-
-                        static IContainer CellStyleMainTable(IContainer container) 
-                        {
-                            return container
-                                .Border(0.5f).BorderColor(Colors.Blue.Lighten4)
-                                .Background(Colors.Blue.Lighten5)
-                                .PaddingVertical(5);
-                        }
-
-                        table.Cell().Row(1).RowSpan(3).Column(2).Element(BlockAccepted).Text("3 rows");
-                        table.Cell().Row(1).RowSpan(6).Column(3).Element(BlockAccepted).Text("6 rows");
-                        table.Cell().Row(3).RowSpan(5).Column(4).Element(BlockAccepted).Text("5 rows");
-                        
-                        static IContainer BlockAccepted(IContainer container)
-                        {
-                            return container
-                                .Border(1.5f).BorderColor(Colors.Green.Lighten2)
-                                .Background(Colors.Green.Lighten4);
-                        }
-                    });
-                });
-        }
-        
         [Test]
         public void TableHeader()
         {

Source/QuestPDF/Elements/Table/Table.cs

@@ -112,7 +112,7 @@ namespace QuestPDF.Elements.Table
             UpdateColumnsWidth(availableSpace.Width);
             var renderingCommands = PlanLayout(availableSpace);
 
-            foreach (var command in renderingCommands.OrderBy(x => x.Cell.ZIndex))
+            foreach (var command in renderingCommands)
             {
                 if (command.Measurement.Type == SpacePlanType.FullRender)
                     command.Cell.IsRendered = true;

Source/QuestPDF/Elements/Table/TableCell.cs

@@ -8,8 +8,6 @@ namespace QuestPDF.Elements.Table
         public int Column { get; set; } = 0;
         public int ColumnSpan { get; set; } = 1;
         
-        public int ZIndex { get; set; }
-        
         public bool IsRendered { get; set; }
     }
 }

Source/QuestPDF/Elements/Table/TableLayoutPlanner.cs

@@ -16,13 +16,9 @@ namespace QuestPDF.Elements.Table
         {
             var cellsWindow = new List<TableCell>();
             (int x, int y) currentLocation = (1, 1);
-            var zIndex = 0;
             
             foreach (var cell in cells)
             {
-                cell.ZIndex = zIndex;
-                zIndex++;
-                
                 if (cellsWindow.Count > Math.Max(columnsCount, 16))
                 {
                     cellsWindow = cellsWindow

Source/QuestPDF/Infrastructure/TextStyleManager.cs

@@ -256,11 +256,9 @@ namespace QuestPDF.Infrastructure
         {
             var result = style;
             
-            if (string.IsNullOrWhiteSpace(result.FontFamily) || overrideFontFamily)
-                result = MutateStyle(result, TextStyleProperty.FontFamily, parent.FontFamily, overrideStyle);
-                
             result = MutateStyle(result, TextStyleProperty.Color, parent.Color, overrideStyle);
             result = MutateStyle(result, TextStyleProperty.BackgroundColor, parent.BackgroundColor, overrideStyle);
+            result = MutateStyle(result, TextStyleProperty.FontFamily, parent.FontFamily, overrideStyle);
             result = MutateStyle(result, TextStyleProperty.Size, parent.Size, overrideStyle);
             result = MutateStyle(result, TextStyleProperty.LineHeight, parent.LineHeight, overrideStyle);
             result = MutateStyle(result, TextStyleProperty.LetterSpacing, parent.LetterSpacing, overrideStyle);

Source/QuestPDF/QuestPDF.csproj

@@ -3,7 +3,7 @@
         <Authors>MarcinZiabek</Authors>
         <Company>CodeFlint</Company>
         <PackageId>QuestPDF</PackageId>
-        <Version>2022.12.5</Version>
+        <Version>2022.12.3</Version>
         <PackageDescription>QuestPDF is an open-source, modern and battle-tested library that can help you with generating PDF documents by offering friendly, discoverable and predictable C# fluent API. Easily generate PDF reports, invoices, exports, etc.</PackageDescription>
         <PackageReleaseNotes>$([System.IO.File]::ReadAllText("$(MSBuildProjectDirectory)/Resources/ReleaseNotes.txt"))</PackageReleaseNotes>
         <LangVersion>9</LangVersion>

Source/QuestPDF/Resources/ReleaseNotes.txt

@@ -1,27 +1,22 @@
-Version 2022.12.0:
 Feature: implemented LetterSpacing property for the Text element
 Improvement: the Text element API accepts now only string values, objects are not automatically converted anymore
 Fix: the Alignment element incorrectly limits size of its child when only one axis is set (horizontal or vertical)
 Maintenance: Updated SkiaSharp dependency to 2.88.3
 
-This release was possible thanks to enormous help of AntonyCorbett, thank you!
-
-Version 2022.12.1:
+In version 2022.12.1:
 Fixed: loading fonts from embedded resource via the FontManager.RegisterFontFromEmbeddedResource method
 Fixed: better layout calculation stability for the Column element
 Improvement: exposed missing API method for the Dynamic component, enabling applying more advanced optimizations
 Improvement: better API documentation for the Settings.DocumentLayoutExceptionThreshold property
 
-Version 2022.12.2:
+In version 2022.12.2:
 Performance improvements in various areas
 Text rendering stability improvements
 Fixed: the Settings.CheckIfAllTextGlyphsAreAvailable setting does not work correctly
 
-Version 2022.12.3:
+In version 2022.12.3:
 Fix: inconsistent text height when using multiple lines with different TextStyles
 Improvement: added validation for color arguments
 Fix: the inlined element is shown only once in the header but should be repeated on each page
 
-Version 2022.12.4:
-Fix: the TextStyle.Fallback property incorrectly inherits parent's and global properties
-Improvement: updated the CreateNotMatchingFontException message to mention that the glyph checking operation can be disabled with the Settings.CheckIfAllTextGlyphsAreAvailable setting
+This release was possible thanks to enormous help of AntonyCorbett, thank you!