2022.12.6 release

* Fixed applying text style for fallback styles

* Code refactoring

* FontStyle: making method arguments explicit

* Bug fixes + test

* Minor code refactoring

README.md

@@ -54,8 +54,7 @@ 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/224511996-9dd27a99-bef8-4d5e-bc14-9f6cfe0f5191.png" width="800" />
-
+<img src="https://user-images.githubusercontent.com/9263853/232912983-b20e441e-bd47-41df-afa4-f02481252d26.png" width="800" />
 
 ## Please share with the community
 

Source/QuestPDF.Examples/TableExamples.cs

@@ -316,6 +316,58 @@ 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.Examples/TextExamples.cs

@@ -1004,5 +1004,40 @@ namespace QuestPDF.Examples
                         });
                 });
         }
+        
+        [Test]
+         public void FontFallback_Nested()
+        {
+            RenderingTest
+                .Create()
+                .ProduceImages()
+                .ShowResults()
+                .RenderDocument(container =>
+                {
+                    container.Page(page =>
+                    {
+                        page.Margin(50);
+                        page.PageColor(Colors.White);
+                        page.Size(PageSizes.A5.Landscape());
+                        
+                        page.DefaultTextStyle(x => x
+                            .FontSize(24)
+                            .Bold()
+                            .FontFamily("Times New Roman")
+                            .Fallback(y => y
+                                .FontFamily("Microsoft YaHei")
+                                .Underline()
+                                .BackgroundColor(Colors.Red.Lighten2)));
+
+                        page.Content().Text(text =>
+                        {
+                            text.Line("Default times new roman 中文文本 text.");
+                            text.Line("Normal weight and green 中文文本 text.").NormalWeight().BackgroundColor(Colors.Green.Lighten2);
+                            text.Line("Strikethrough without underline 中文文本 text.").Strikethrough().Underline(false);
+                            text.Line("Lato italic 中文文本 text.").FontFamily("Lato").Italic();
+                        });
+                    });
+                });
+        }
     }
 }

Source/QuestPDF.UnitTests/QuestPDF.UnitTests.csproj

@@ -3,6 +3,7 @@
     <PropertyGroup>
         <TargetFramework>netcoreapp3.1</TargetFramework>
         <IsPackable>false</IsPackable>
+        <LangVersion>9</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>

Source/QuestPDF.UnitTests/TextStyleTests.cs

@@ -0,0 +1,59 @@
+using FluentAssertions;
+using NUnit.Framework;
+using QuestPDF.Fluent;
+using QuestPDF.Helpers;
+using QuestPDF.Infrastructure;
+
+namespace QuestPDF.UnitTests
+{
+    [TestFixture]
+    public class TextStyleTests
+    {
+        [Test]
+        public void ApplyInheritedAndGlobalStyle()
+        {
+            // arrange
+            var defaultTextStyle = TextStyle
+                .Default
+                .FontSize(20)
+                .FontFamily("Arial")
+                .BackgroundColor(Colors.Green.Lighten2)
+                .Fallback(y => y
+                    .FontFamily("Microsoft YaHei")
+                    .Underline()
+                    .NormalWeight()
+                    .BackgroundColor(Colors.Blue.Lighten2));
+
+            var spanTextStyle = TextStyle
+                .Default
+                .FontFamily("Times New Roman")
+                .Bold()
+                .Strikethrough()
+                .BackgroundColor(Colors.Red.Lighten2);
+            
+            // act
+            var targetStyle = spanTextStyle.ApplyInheritedStyle(defaultTextStyle).ApplyGlobalStyle();
+            
+            // assert
+            var expectedStyle = TextStyle.LibraryDefault with
+            {
+                Size = 20, 
+                FontFamily = "Times New Roman",
+                FontWeight = FontWeight.Bold,
+                BackgroundColor = Colors.Red.Lighten2,
+                HasStrikethrough = true,
+                Fallback = TextStyle.LibraryDefault with
+                {
+                    Size = 20,
+                    FontFamily = "Microsoft YaHei",
+                    FontWeight = FontWeight.Bold,
+                    BackgroundColor = Colors.Red.Lighten2,
+                    HasUnderline = true,
+                    HasStrikethrough = true
+                }
+            };
+
+            targetStyle.Should().BeEquivalentTo(expectedStyle);
+        }
+    }
+}

Source/QuestPDF/Drawing/DocumentGenerator.cs

@@ -64,7 +64,7 @@ namespace QuestPDF.Drawing
             var container = new DocumentContainer();
             document.Compose(container);
             var content = container.Compose();
-            ApplyDefaultTextStyle(content, TextStyle.LibraryDefault);
+            ApplyInheritedAndGlobalTexStyle(content, TextStyle.Default);
             ApplyContentDirection(content, ContentDirection.LeftToRight);
             
             var debuggingState = Settings.EnableDebugging ? ApplyDebugging(content) : null;
@@ -192,7 +192,7 @@ namespace QuestPDF.Drawing
                 ApplyContentDirection(child, direction);
         }
 
-        internal static void ApplyDefaultTextStyle(this Element? content, TextStyle documentDefaultTextStyle)
+        internal static void ApplyInheritedAndGlobalTexStyle(this Element? content, TextStyle documentDefaultTextStyle)
         {
             if (content == null)
                 return;
@@ -202,26 +202,23 @@ namespace QuestPDF.Drawing
                 foreach (var textBlockItem in textBlock.Items)
                 {
                     if (textBlockItem is TextBlockSpan textSpan)
-                    {
-                        textSpan.Style = textSpan.Style.ApplyGlobalStyle(documentDefaultTextStyle);
-                    }
-                    else if (textBlockItem is TextBlockElement textElement)
-                    {
-                        ApplyDefaultTextStyle(textElement.Element, documentDefaultTextStyle);
-                    }
+                        textSpan.Style = textSpan.Style.ApplyInheritedStyle(documentDefaultTextStyle).ApplyGlobalStyle();
+                    
+                    if (textBlockItem is TextBlockElement textElement)
+                        ApplyInheritedAndGlobalTexStyle(textElement.Element, documentDefaultTextStyle);
                 }
                 
                 return;
             }
 
             if (content is DynamicHost dynamicHost)
-                dynamicHost.TextStyle = dynamicHost.TextStyle.ApplyGlobalStyle(documentDefaultTextStyle);
+                dynamicHost.TextStyle = dynamicHost.TextStyle.ApplyInheritedStyle(documentDefaultTextStyle);
             
             if (content is DefaultTextStyle defaultTextStyleElement)
-               documentDefaultTextStyle = defaultTextStyleElement.TextStyle.ApplyGlobalStyle(documentDefaultTextStyle);
+               documentDefaultTextStyle = defaultTextStyleElement.TextStyle.ApplyInheritedStyle(documentDefaultTextStyle);
 
             foreach (var child in content.GetChildren())
-                ApplyDefaultTextStyle(child, documentDefaultTextStyle);
+                ApplyInheritedAndGlobalTexStyle(child, documentDefaultTextStyle);
         }
     }
 }

Source/QuestPDF/Elements/Dynamic.cs

@@ -89,7 +89,7 @@ namespace QuestPDF.Elements
             var container = new DynamicElement();
             content(container);
             
-            container.ApplyDefaultTextStyle(TextStyle);
+            container.ApplyInheritedAndGlobalTexStyle(TextStyle);
             container.ApplyContentDirection(ContentDirection);
             
             container.InjectDependencies(PageContext, Canvas);

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)
+            foreach (var command in renderingCommands.OrderBy(x => x.Cell.ZIndex))
             {
                 if (command.Measurement.Type == SpacePlanType.FullRender)
                     command.Cell.IsRendered = true;

Source/QuestPDF/Elements/Table/TableCell.cs

@@ -8,6 +8,8 @@ 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,9 +16,13 @@ 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/Elements/Text/FontFallback.cs

@@ -105,7 +105,9 @@ namespace QuestPDF.Elements.Text
                     $"Font families available on current environment that contain this glyph: {proposedFontsFormatted}. " +
                     $"Possible solutions: " +
                     $"1) Use one of the listed fonts as the primary font in your document. " +
-                    $"2) Configure the fallback TextStyle using the 'TextStyle.Fallback' method with one of the listed fonts. ");
+                    $"2) Configure the fallback TextStyle using the 'TextStyle.Fallback' method with one of the listed fonts. " +
+                    $"You can disable this check by setting the 'Settings.CheckIfAllTextGlyphsAreAvailable' option to 'false'. " +
+                    $"However, this may result with text glyphs being incorrectly rendered without any warning.");
             }
             
             static IEnumerable<string> FindFontsContainingGlyph(int codepoint)

Source/QuestPDF/Infrastructure/TextStyleManager.cs

@@ -25,16 +25,17 @@ namespace QuestPDF.Infrastructure
     internal static class TextStyleManager
     {
         private static readonly ConcurrentDictionary<(TextStyle origin, TextStyleProperty property, object value), TextStyle> TextStyleMutateCache = new();
-        private static readonly ConcurrentDictionary<(TextStyle origin, TextStyle parent), TextStyle> TextStyleApplyGlobalCache = new();
+        private static readonly ConcurrentDictionary<(TextStyle origin, TextStyle parent), TextStyle> TextStyleApplyInheritedCache = new();
+        private static readonly ConcurrentDictionary<TextStyle, TextStyle> TextStyleApplyGlobalCache = new();
         private static readonly ConcurrentDictionary<(TextStyle origin, TextStyle parent), TextStyle> TextStyleOverrideCache = new();
 
         public static TextStyle Mutate(this TextStyle origin, TextStyleProperty property, object value)
         {
             var cacheKey = (origin, property, value);
-            return TextStyleMutateCache.GetOrAdd(cacheKey, x => MutateStyle(x.origin, x.property, x.value));
+            return TextStyleMutateCache.GetOrAdd(cacheKey, x => MutateStyle(x.origin, x.property, x.value, overrideValue: true));
         }
 
-        private static TextStyle MutateStyle(TextStyle origin, TextStyleProperty property, object? value, bool overrideValue = true)
+        private static TextStyle MutateStyle(this TextStyle origin, TextStyleProperty property, object? value, bool overrideValue)
         {
             if (overrideValue && value == null)
                 return origin;
@@ -224,40 +225,42 @@ namespace QuestPDF.Infrastructure
             throw new ArgumentOutOfRangeException(nameof(property), property, "Expected to mutate the TextStyle object. Provided property type is not supported.");
         }
         
-        internal static TextStyle ApplyGlobalStyle(this TextStyle style, TextStyle parent)
+        internal static TextStyle ApplyInheritedStyle(this TextStyle style, TextStyle parent)
         {
             var cacheKey = (style, parent);
-            return TextStyleApplyGlobalCache.GetOrAdd(cacheKey, key => ApplyStyle(key.origin, key.parent, overrideStyle: false).ApplyFontFallback());
+            return TextStyleApplyInheritedCache.GetOrAdd(cacheKey, key => key.origin.ApplyStyleProperties(key.parent, overrideStyle: false, overrideFontFamily: false, applyFallback: true).UpdateFontFallback(overrideStyle: true));
         }
         
-        private static TextStyle ApplyFontFallback(this TextStyle style)
+        internal static TextStyle ApplyGlobalStyle(this TextStyle style)
+        {
+            return TextStyleApplyGlobalCache.GetOrAdd(style, key => key.ApplyStyleProperties(TextStyle.LibraryDefault, overrideStyle: false, overrideFontFamily: false, applyFallback: true).UpdateFontFallback(overrideStyle: false));
+        }
+        
+        private static TextStyle UpdateFontFallback(this TextStyle style, bool overrideStyle)
         {
             var targetFallbackStyle = style
                 ?.Fallback
-                ?.ApplyStyle(style, overrideStyle: false, applyFallback: false)
-                ?.ApplyFontFallback();
+                ?.ApplyStyleProperties(style, overrideStyle: overrideStyle, overrideFontFamily: false, applyFallback: false)
+                ?.UpdateFontFallback(overrideStyle);
             
-            return MutateStyle(style, TextStyleProperty.Fallback, targetFallbackStyle);
+            return style.MutateStyle(TextStyleProperty.Fallback, targetFallbackStyle, overrideValue: true);
         }
         
         internal static TextStyle OverrideStyle(this TextStyle style, TextStyle parent)
         {
             var cacheKey = (style, parent);
-            
-            return TextStyleOverrideCache.GetOrAdd(cacheKey, key =>
-            {
-                var result = ApplyStyle(key.origin, key.parent);
-                return MutateStyle(result, TextStyleProperty.Fallback, key.parent.Fallback);
-            });
+            return TextStyleOverrideCache.GetOrAdd(cacheKey, key => ApplyStyleProperties(key.origin, key.parent, overrideStyle: true, overrideFontFamily: true, applyFallback: true));
         }
         
-        private static TextStyle ApplyStyle(this TextStyle style, TextStyle parent, bool overrideStyle = true, bool applyFallback = true)
+        private static TextStyle ApplyStyleProperties(this TextStyle style, TextStyle parent, bool overrideStyle, bool overrideFontFamily, bool applyFallback)
         {
             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.3</Version>
+        <Version>2022.12.6</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,22 +1,30 @@
+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
 
-In version 2022.12.1:
+This release was possible thanks to enormous help of AntonyCorbett, thank you!
+
+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
 
-In version 2022.12.2:
+Version 2022.12.2:
 Performance improvements in various areas
 Text rendering stability improvements
 Fixed: the Settings.CheckIfAllTextGlyphsAreAvailable setting does not work correctly
 
-In version 2022.12.3:
+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
 
-This release was possible thanks to enormous help of AntonyCorbett, thank you!
+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
+
+Version 2022.12.6:
+Fix: fixed the rendering order of table cells in certain scenarios