Rendering text paragraphs without the Column element (not fully working)

QuestPDF.Examples/Engine/RenderingTest.cs

@@ -65,9 +65,9 @@ namespace QuestPDF.Examples.Engine
             return this;
         }
 
-        public RenderingTest ShowResults(bool value = true)
+        public RenderingTest ShowResults()
         {
-            ShowResult = value;
+            ShowResult = true;
             return this;
         }
         

QuestPDF.Examples/QuestPDF.Examples.csproj

@@ -6,11 +6,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
+        <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
         <PackageReference Include="microcharts" Version="0.9.5.9" />
-        <PackageReference Include="nunit" Version="3.13.3" />
-        <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
+        <PackageReference Include="nunit" Version="3.13.2" />
+        <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
         <PackageReference Include="SkiaSharp" Version="2.80.4" />
         <PackageReference Include="Svg.Skia" Version="0.5.10" />
     </ItemGroup>

QuestPDF.Examples/TableBenchmark.cs

@@ -1,13 +1,8 @@
-using System;
-using System.Diagnostics;
-using System.Linq;
+using System.Linq;
 using NUnit.Framework;
-using QuestPDF.Drawing;
-using QuestPDF.Elements;
 using QuestPDF.Examples.Engine;
 using QuestPDF.Fluent;
 using QuestPDF.Helpers;
-using QuestPDF.Infrastructure;
 
 namespace QuestPDF.Examples
 {
@@ -16,77 +11,36 @@ namespace QuestPDF.Examples
         [Test]
         public void Benchmark()
         {
-            GenerateAndCollect();
-
-            var stopwatch = new Stopwatch();
-            stopwatch.Start();
-
-            foreach (var _ in Enumerable.Range(0, 10000))
-            {
-                GenerateAndCollect();
-            }
-            
-            stopwatch.Stop();
-            
-            Console.WriteLine($"Execution time: {stopwatch.Elapsed:g}");
-
-            void GenerateAndCollect()
-            {
-                var container = new Container();
-                
-                container
-                    .Padding(10)
-                    .MinimalBox()
-                    .Border(1)
-                    .Column(column =>
-                    {
-                        const int numberOfRows = 100;
-                        const int numberOfColumns = 10;
-
-                        for (var y = 0; y < numberOfRows; y++)
+            RenderingTest
+                .Create()
+                .ProducePdf()
+                .PageSize(PageSizes.A4)
+                .ShowResults()
+                .MaxPages(10_000)
+                .EnableCaching(true)
+                .EnableDebugging(false)
+                .Render(container =>
+                {
+                    container
+                        .Padding(10)
+                        .MinimalBox()
+                        .Border(1)
+                        .Table(table =>
                         {
-                            column.Item().Row(row =>
+                            const int numberOfRows = 100_000;
+                            const int numberOfColumns = 10;
+                            
+                            table.ColumnsDefinition(columns =>
                             {
-                                for (var x = 0; x < numberOfColumns; x++)
-                                {
-                                    row.RelativeItem()
-                                        
-                                        .Background(Colors.Red.Lighten5)
-                                        .Padding(3)
-                                        
-                                        .Background(Colors.Red.Lighten4)
-                                        .Padding(3)
-                                        
-                                        .Background(Colors.Red.Lighten3)
-                                        .Padding(3)
-                                        
-                                        .Background(Colors.Red.Lighten2)
-                                        .Padding(3)
-                                        
-                                        .Background(Colors.Red.Lighten1)
-                                        .Padding(3)
-                                        
-                                        .Background(Colors.Red.Medium)
-                                        .Padding(3)
-                                        
-                                        .Background(Colors.Red.Darken1)
-                                        .Padding(3)
-                                        
-                                        .Background(Colors.Red.Darken2)
-                                        .Padding(3)
-                                        
-                                        .Background(Colors.Red.Darken3)
-                                        .Padding(3)
-                                        
-                                        .Background(Colors.Red.Darken4)
-                                        .Height(3);
-                                }
+                                foreach (var _ in Enumerable.Range(0, numberOfColumns))
+                                    columns.RelativeColumn();
                             });
-                        }  
-                    });
 
-                ElementCacheManager.Collect(container);
-            }
+                            foreach (var row in Enumerable.Range(0, numberOfRows))
+                            foreach (var column in Enumerable.Range(0, numberOfColumns))
+                                table.Cell().Background(Placeholders.BackgroundColor()).Padding(5).Text($"{row}_{column}");
+                        });
+                });
         }
     }
 }

QuestPDF.Previewer/PreviewerWindowViewModel.cs

@@ -49,7 +49,7 @@ namespace QuestPDF.Previewer
             CommunicationService.Instance.OnDocumentRefreshed += HandleUpdatePreview;
             
             ShowPdfCommand = ReactiveCommand.Create(ShowPdf);
-            ShowDocumentationCommand = ReactiveCommand.Create(() => OpenLink("https://www.questpdf.com/api-reference/index.html"));
+            ShowDocumentationCommand = ReactiveCommand.Create(() => OpenLink("https://www.questpdf.com/documentation/api-reference.html"));
             SponsorProjectCommand = ReactiveCommand.Create(() => OpenLink("https://github.com/sponsors/QuestPDF"));
         }
 

QuestPDF.ReportSample/PerformanceTests.cs

@@ -51,7 +51,7 @@ namespace QuestPDF.ReportSample
             Content = documentContainer.Compose();
 
             PageContext = new PageContext();
-            DocumentGenerator.RenderPass(PageContext, new FreeCanvas(), Content, null);
+            DocumentGenerator.RenderPass(PageContext, new FreeCanvas(), Content, Metadata, null);
 
             var sw = new Stopwatch();
             sw.Start();
@@ -69,7 +69,7 @@ namespace QuestPDF.ReportSample
         [Benchmark]
         public void GenerationTest()
         {
-            DocumentGenerator.RenderPass(PageContext, new FreeCanvas(), Content, null);
+            DocumentGenerator.RenderPass(PageContext, new FreeCanvas(), Content, Metadata, null);
         }
     }
 }

QuestPDF.ReportSample/Tests.cs

@@ -48,10 +48,11 @@ namespace QuestPDF.ReportSample
             Report.Compose(container);
             var content = container.Compose();
             
+            var metadata = Report.GetMetadata();
             var pageContext = new PageContext();
 
-            DocumentGenerator.RenderPass(pageContext, new FreeCanvas(), content, null);
-            DocumentGenerator.RenderPass(pageContext, new FreeCanvas(), content, null);
+            DocumentGenerator.RenderPass(pageContext, new FreeCanvas(), content, metadata, null);
+            DocumentGenerator.RenderPass(pageContext, new FreeCanvas(), content, metadata, null);
         }
     }
 }

QuestPDF.UnitTests/QuestPDF.UnitTests.csproj

@@ -6,7 +6,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="FluentAssertions" Version="6.7.0" />
+        <PackageReference Include="FluentAssertions" Version="6.1.0" />
         <PackageReference Include="nunit" Version="3.13.2" />
         <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />

QuestPDF/Drawing/DocumentGenerator.cs

@@ -66,19 +66,19 @@ namespace QuestPDF.Drawing
             var content = container.Compose();
             ApplyDefaultTextStyle(content, TextStyle.LibraryDefault);
             
-            var debuggingState = Settings.EnableDebugging ? ApplyDebugging(content) : null;
+            var metadata = document.GetMetadata();
+            var pageContext = new PageContext();
+
+            var debuggingState = metadata.ApplyDebugging ? ApplyDebugging(content) : null;
             
-            if (Settings.EnableCaching)
+            if (metadata.ApplyCaching)
                 ApplyCaching(content);
 
-            var pageContext = new PageContext();
-            RenderPass(pageContext, new FreeCanvas(), content, debuggingState);
-            RenderPass(pageContext, canvas, content, debuggingState);
-            
-            ElementCacheManager.Collect(content);
+            RenderPass(pageContext, new FreeCanvas(), content, metadata, debuggingState);
+            RenderPass(pageContext, canvas, content, metadata, debuggingState);
         }
         
-        internal static void RenderPass<TCanvas>(PageContext pageContext, TCanvas canvas, Container content, DebuggingState? debuggingState)
+        internal static void RenderPass<TCanvas>(PageContext pageContext, TCanvas canvas, Container content, DocumentMetadata documentMetadata, DebuggingState? debuggingState)
             where TCanvas : ICanvas, IRenderingCanvas
         {
             content.VisitChildren(x => x?.Initialize(pageContext, canvas));
@@ -114,7 +114,7 @@ namespace QuestPDF.Drawing
 
                 canvas.EndPage();
 
-                if (currentPage >= Settings.DocumentLayoutExceptionThreshold)
+                if (currentPage >= documentMetadata.DocumentLayoutExceptionThreshold)
                 {
                     canvas.EndDocument();
                     ThrowLayoutException();
@@ -131,8 +131,8 @@ namespace QuestPDF.Drawing
             void ThrowLayoutException()
             {
                 var message = $"Composed layout generates infinite document. This may happen in two cases. " +
-                              $"1) Your document and its layout configuration is correct but the content takes more than {Settings.DocumentLayoutExceptionThreshold} pages. " +
-                              $"In this case, please increase the value {nameof(QuestPDF)}.{nameof(Settings)}.{nameof(Settings.DocumentLayoutExceptionThreshold)} static property. " +
+                              $"1) Your document and its layout configuration is correct but the content takes more than {documentMetadata.DocumentLayoutExceptionThreshold} pages. " +
+                              $"In this case, please increase the value {nameof(DocumentMetadata)}.{nameof(DocumentMetadata.DocumentLayoutExceptionThreshold)} property configured in the {nameof(IDocument.GetMetadata)} method. " +
                               $"2) The layout configuration of your document is invalid. Some of the elements require more space than is provided." +
                               $"Please analyze your documents structure to detect this element and fix its size constraints.";
 
@@ -174,7 +174,7 @@ namespace QuestPDF.Drawing
                 {
                     if (textBlockItem is TextBlockSpan textSpan)
                     {
-                        textSpan.Style = textSpan.Style.ApplyGlobalStyle(TextStyle.LibraryDefault);
+                        textSpan.Style.ApplyGlobalStyle(documentDefaultTextStyle);
                     }
                     else if (textBlockItem is TextBlockElement textElement)
                     {
@@ -186,13 +186,18 @@ namespace QuestPDF.Drawing
             }
 
             if (content is DynamicHost dynamicHost)
-                dynamicHost.TextStyle = dynamicHost.TextStyle.ApplyGlobalStyle(documentDefaultTextStyle);
+                dynamicHost.TextStyle.ApplyGlobalStyle(documentDefaultTextStyle);
+            
+            var targetTextStyle = documentDefaultTextStyle;
             
             if (content is DefaultTextStyle defaultTextStyleElement)
-               documentDefaultTextStyle = defaultTextStyleElement.TextStyle.ApplyGlobalStyle(documentDefaultTextStyle);
-
+            {
+                defaultTextStyleElement.TextStyle.ApplyParentStyle(documentDefaultTextStyle);
+                targetTextStyle = defaultTextStyleElement.TextStyle;
+            }
+            
             foreach (var child in content.GetChildren())
-                ApplyDefaultTextStyle(child, documentDefaultTextStyle);
+                ApplyDefaultTextStyle(child, targetTextStyle);
         }
     }
 }

QuestPDF/Drawing/DocumentMetadata.cs

@@ -1,5 +1,4 @@
 using System;
-using QuestPDF.Infrastructure;
 
 namespace QuestPDF.Drawing
 {
@@ -19,26 +18,14 @@ namespace QuestPDF.Drawing
         public DateTime CreationDate { get; set; } = DateTime.Now;
         public DateTime ModifiedDate { get; set; } = DateTime.Now;
 
-        [Obsolete("This API has been moved since version 2022.9. Please use the QuestPDF.Settings.DocumentLayoutExceptionThreshold static property.")]
-        public int DocumentLayoutExceptionThreshold
-        {
-            get => Settings.DocumentLayoutExceptionThreshold;
-            set => Settings.DocumentLayoutExceptionThreshold = value;
-        }
+        /// <summary>
+        /// If the number of generated pages exceeds this threshold
+        /// (likely due to infinite layout), the exception is thrown.
+        /// </summary>
+        public int DocumentLayoutExceptionThreshold { get; set; } = 250;
 
-        [Obsolete("This API has been moved since version 2022.9. Please use the QuestPDF.Settings.EnableCaching static property.")]
-        public bool ApplyCaching
-        {
-            get => Settings.EnableCaching;
-            set => Settings.EnableCaching = value;
-        }
-        
-        [Obsolete("This API has been moved since version 2022.9. Please use the QuestPDF.Settings.EnableDebugging static property.")]
-        public bool ApplyDebugging
-        {
-            get => Settings.EnableDebugging;
-            set => Settings.EnableDebugging = value;
-        }
+        public bool ApplyCaching { get; set; } = !System.Diagnostics.Debugger.IsAttached;
+        public bool ApplyDebugging { get; set; } = System.Diagnostics.Debugger.IsAttached;
 
         public static DocumentMetadata Default => new DocumentMetadata();
     }

QuestPDF/Drawing/ElementCacheManager.cs

@@ -1,76 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Runtime.CompilerServices;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Drawing
-{
-    internal class CircularBuffer
-    {
-        private const int BufferSize = 11_000;
-
-        private object[] Buffer = new object[BufferSize];
-        private int WriteIndex { get; set; } = 0;
-        private int ReadIndex { get; set; } = 0;
-        
-        public T Get<T>() where T : class, new()
-        {
-            lock (this)
-            {
-                if (ReadIndex == WriteIndex)
-                    return new T();
-                
-                var index = ReadIndex;
-                ReadIndex = (ReadIndex + 1) % BufferSize;
-                
-                var result = Buffer[index] as T;
-                Buffer[index] = null;
-                
-                return result;
-            }
-        }
-
-        public void Store(object value)
-        {
-            lock (this)
-            {
-                Buffer[WriteIndex] = value;
-                WriteIndex = (WriteIndex + 1) % BufferSize;
-            }
-        }
-    }
-    
-    // performance analysis:
-    // without: 115s
-    // ConcurrentQueue: 28s
-    // ConcurrentBag: 38s
-    // CircularBuffer: 30s
-    internal static class ElementCacheManager
-    {
-        private static ConcurrentDictionary<Type, ConcurrentQueue<object>> Cache { get; } = new();
-
-        public static T Get<T>() where T : class, new()
-        {
-            var buffer = Cache.GetOrAdd(typeof(T), _=> new ConcurrentQueue<object>());
-            return buffer.TryDequeue(out var result) ? result as T : new T();
-        }
-
-        public static void Store<T>(T element)
-        {
-            var buffer = Cache.GetOrAdd(element.GetType(), _=> new ConcurrentQueue<object>());
-            buffer.Enqueue(element);
-        }
-
-        public static void Collect(Element element)
-        {
-            foreach (var child in element.GetChildren())
-                Collect(child);
-
-            if (element is ICollectable collectable)
-            {
-                collectable.Collect();
-                Store(element);   
-            }
-        }
-    }
-}

QuestPDF/Drawing/FontManager.cs

@@ -14,13 +14,13 @@ namespace QuestPDF.Drawing
 {
     public static class FontManager
     {
-        private static readonly ConcurrentDictionary<string, FontStyleSet> StyleSets = new();
-        private static readonly ConcurrentDictionary<TextStyle, SKFontMetrics> FontMetrics = new();
-        private static readonly ConcurrentDictionary<TextStyle, SKPaint> FontPaints = new();
-        private static readonly ConcurrentDictionary<string, SKPaint> ColorPaints = new();
-        private static readonly ConcurrentDictionary<TextStyle, Font> ShaperFonts = new();
-        private static readonly ConcurrentDictionary<TextStyle, SKFont> Fonts = new();
-        private static readonly ConcurrentDictionary<TextStyle, TextShaper> TextShapers = new();
+        private static ConcurrentDictionary<string, FontStyleSet> StyleSets = new();
+        private static ConcurrentDictionary<object, SKFontMetrics> FontMetrics = new();
+        private static ConcurrentDictionary<object, SKPaint> FontPaints = new();
+        private static ConcurrentDictionary<string, SKPaint> ColorPaints = new();
+        private static ConcurrentDictionary<object, Font> ShaperFonts = new();
+        private static ConcurrentDictionary<object, SKFont> Fonts = new();
+        private static ConcurrentDictionary<object, TextShaper> TextShapers = new();
 
         static FontManager()
         {
@@ -110,7 +110,7 @@ namespace QuestPDF.Drawing
 
         internal static SKPaint ToPaint(this TextStyle style)
         {
-            return FontPaints.GetOrAdd(style, Convert);
+            return FontPaints.GetOrAdd(style.PaintKey, key => Convert(style));
 
             static SKPaint Convert(TextStyle style)
             {
@@ -172,14 +172,14 @@ namespace QuestPDF.Drawing
 
         internal static SKFontMetrics ToFontMetrics(this TextStyle style)
         {
-            return FontMetrics.GetOrAdd(style, key => key.NormalPosition().ToPaint().FontMetrics);
+            return FontMetrics.GetOrAdd(style.FontMetricsKey, key => style.NormalPosition().ToPaint().FontMetrics);
         }
 
         internal static Font ToShaperFont(this TextStyle style)
         {
-            return ShaperFonts.GetOrAdd(style, key =>
+            return ShaperFonts.GetOrAdd(style.PaintKey, _ =>
             {
-                var typeface = key.ToPaint().Typeface;
+                var typeface = style.ToPaint().Typeface;
 
                 using var harfBuzzBlob = typeface.OpenStream(out var ttcIndex).ToHarfBuzzBlob();
                 
@@ -200,12 +200,12 @@ namespace QuestPDF.Drawing
         
         internal static TextShaper ToTextShaper(this TextStyle style)
         {
-            return TextShapers.GetOrAdd(style, key => new TextShaper(key));
+            return TextShapers.GetOrAdd(style.PaintKey, _ => new TextShaper(style));
         }
         
         internal static SKFont ToFont(this TextStyle style)
         {
-            return Fonts.GetOrAdd(style, key => key.ToPaint().ToFont());
+            return Fonts.GetOrAdd(style.PaintKey, _ => style.ToPaint().ToFont());
         }
     }
 }

QuestPDF/Drawing/TextShaper.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using HarfBuzzSharp;
 using QuestPDF.Infrastructure;
 using SkiaSharp;
@@ -10,16 +9,14 @@ namespace QuestPDF.Drawing
     internal class TextShaper
     {
         public const int FontShapingScale = 512;
+     
+        private Font Font { get; }
+        private SKPaint Paint { get; }
         
-        private TextStyle TextStyle { get; }
-
-        private SKFont Font => TextStyle.ToFont();
-        private Font ShaperFont => TextStyle.ToShaperFont();
-        private SKPaint Paint => TextStyle.ToPaint();
-
-        public TextShaper(TextStyle textStyle)
+        public TextShaper(TextStyle style)
         {
-            TextStyle = textStyle;
+            Font = style.ToShaperFont();
+            Paint = style.ToPaint();
         }
 
         public TextShapingResult Shape(string text)
@@ -29,7 +26,7 @@ namespace QuestPDF.Drawing
             PopulateBufferWithText(buffer, text);
             buffer.GuessSegmentProperties();
 
-            ShaperFont.Shape(buffer);
+            Font.Shape(buffer);
             
             var length = buffer.Length;
             var glyphInfos = buffer.GlyphInfos;
@@ -55,9 +52,6 @@ namespace QuestPDF.Drawing
                 xOffset += glyphPositions[i].XAdvance * scaleX;
                 yOffset += glyphPositions[i].YAdvance * scaleY;
             }
-
-            if (Settings.CheckIfAllTextGlyphsAreAvailableInSpecifiedFont)
-                CheckIfAllGlyphsAreAvailable(glyphs, text);
             
             return new TextShapingResult(glyphs);
         }
@@ -78,20 +72,6 @@ namespace QuestPDF.Drawing
             else
                 throw new NotSupportedException("TextEncoding of type GlyphId is not supported.");
         }
-        
-        void CheckIfAllGlyphsAreAvailable(ShapedGlyph[] glyphs, string originalText)
-        {
-            var containsMissingGlyphs = glyphs.Any(x => x.Codepoint == default);
-            
-            if (!containsMissingGlyphs)
-                return;
-            
-            throw new ArgumentException(
-                $"Detected missing font glyphs while rendering text. " +
-                $"This means that the document contains text with characters not present in the assigned font. " +
-                $"Such characters are replaced by placeholders, usually visible as empty rectangles. " +
-                $"Font family used: {TextStyle.FontFamily}. Issue detected in text: '{originalText}'");
-        }
     }
     
     internal struct ShapedGlyph

QuestPDF/Elements/Border.cs

@@ -41,15 +41,5 @@ namespace QuestPDF.Elements
         {
             return $"Border: Top({Top}) Right({Right}) Bottom({Bottom}) Left({Left}) Color({Color})";
         }
-        
-        public override void Collect()
-        {
-            base.Collect();
-            
-            Left = 0;
-            Right = 0;
-            Bottom = 0;
-            Top = 0;
-        }
     }
 }

QuestPDF/Elements/Column.cs

@@ -19,7 +19,7 @@ namespace QuestPDF.Elements
         public Position Offset { get; set; }
     }
     
-    internal class Column : Element, ICacheable, IStateResettable, ICollectable
+    internal class Column : Element, ICacheable, IStateResettable
     {
         internal List<ColumnItem> Items { get; } = new();
         internal float Spacing { get; set; }
@@ -124,10 +124,5 @@ namespace QuestPDF.Elements
             
             return commands;
         }
-
-        public void Collect()
-        {
-            Items.Clear();
-        }
     }
 }

QuestPDF/Elements/Container.cs

@@ -4,7 +4,7 @@ namespace QuestPDF.Elements
 {
     internal class Container : ContainerElement
     {
-        public Container()
+        internal Container()
         {
             
         }

QuestPDF/Elements/Dynamic.cs

@@ -11,7 +11,7 @@ namespace QuestPDF.Elements
         private DynamicComponentProxy Child { get; }
         private object InitialComponentState { get; set; }
 
-        internal TextStyle TextStyle { get; set; } = TextStyle.Default;
+        internal TextStyle TextStyle { get; } = new();
 
         public DynamicHost(DynamicComponentProxy child)
         {

QuestPDF/Elements/Padding.cs

@@ -4,7 +4,7 @@ using QuestPDF.Infrastructure;
 
 namespace QuestPDF.Elements
 {
-    internal class Padding : ContainerElement, ICacheable, ICollectable
+    internal class Padding : ContainerElement, ICacheable
     {
         public float Top { get; set; }
         public float Right { get; set; }
@@ -62,15 +62,5 @@ namespace QuestPDF.Elements
         {
             return $"Padding: Top({Top}) Right({Right}) Bottom({Bottom}) Left({Left})";
         }
-        
-        public override void Collect()
-        {
-            base.Collect();
-            
-            Left = 0;
-            Right = 0;
-            Bottom = 0;
-            Top = 0;
-        }
     }
 }

QuestPDF/Elements/Row.cs

@@ -31,7 +31,7 @@ namespace QuestPDF.Elements
         public Position Offset { get; set; }
     }
     
-    internal class Row : Element, ICacheable, IStateResettable, ICollectable
+    internal class Row : Element, ICacheable, IStateResettable
     {
         internal List<RowItem> Items { get; } = new();
         internal float Spacing { get; set; }
@@ -156,10 +156,5 @@ namespace QuestPDF.Elements
             
             return renderingCommands;
         }
-
-        public void Collect()
-        {
-            Items.Clear();
-        }
     }
 }

QuestPDF/Elements/Text/Calculation/TextMeasurementResult.cs

@@ -19,5 +19,6 @@ namespace QuestPDF.Elements.Text.Calculation
         public int TotalIndex { get; set; }
 
         public bool IsLast => EndIndex == TotalIndex;
+        public bool IsNewLine { get; set; }
     }
 }

QuestPDF/Elements/Text/Items/TextBlockSpan.cs

@@ -14,7 +14,7 @@ namespace QuestPDF.Elements.Text.Items
     internal class TextBlockSpan : ITextBlockItem
     {
         public string Text { get; set; }
-        public TextStyle Style { get; set; } = TextStyle.Default;
+        public TextStyle Style { get; set; } = new();
         public TextShapingResult? TextShapingResult { get; set; }
 
         private Dictionary<(int startIndex, float availableWidth), TextMeasurementResult?> MeasureCache = new ();
@@ -39,18 +39,34 @@ namespace QuestPDF.Elements.Text.Items
             
             var paint = Style.ToPaint();
             var fontMetrics = Style.ToFontMetrics();
-            var spaceCodepoint = paint.ToFont().Typeface.GetGlyphs(" ")[0];
 
+            // if the element is the first one within the line,
+            // ignore leading spaces and new lines
+            var spaceCodepoint = paint.ToFont().Typeface.GetGlyph(' ');
+            var newLineCodepoint = paint.ToFont().Typeface.GetGlyph('\n');
+            var returnCodepoint = paint.ToFont().Typeface.GetGlyph('\r');
+            
             var startIndex = request.StartIndex;
             
-            // if the element is the first one within the line,
-            // ignore leading spaces
             if (!request.IsFirstElementInBlock && request.IsFirstElementInLine)
             {
-                while (startIndex < TextShapingResult.Glyphs.Length && Text[startIndex] == spaceCodepoint)
+                while (startIndex < TextShapingResult.Glyphs.Length && (Text[startIndex] == spaceCodepoint || Text[startIndex] == newLineCodepoint || Text[startIndex] == returnCodepoint))
                     startIndex++;
             }
 
+            // calculate max index (new new line)
+            var newLineIndex = startIndex;
+
+            while (newLineIndex < TextShapingResult.Glyphs.Length)
+            {
+                var glyphCodepoint = TextShapingResult.Glyphs[newLineIndex].Codepoint;
+                
+                if (glyphCodepoint == newLineCodepoint || glyphCodepoint == returnCodepoint)
+                    break;
+
+                newLineIndex++;
+            }
+            
             if (TextShapingResult.Glyphs.Length == 0 || startIndex == TextShapingResult.Glyphs.Length)
             {
                 return new TextMeasurementResult
@@ -68,6 +84,8 @@ namespace QuestPDF.Elements.Text.Items
 
             if (endIndex < startIndex)
                 return null;
+
+            endIndex = Math.Min(endIndex, newLineIndex);
   
             // break text only on spaces
             var wrappedText = WrapText(startIndex, endIndex, request.IsFirstElementInLine);
@@ -90,7 +108,9 @@ namespace QuestPDF.Elements.Text.Items
                 StartIndex = startIndex,
                 EndIndex = wrappedText.Value.endIndex,
                 NextIndex = wrappedText.Value.nextIndex,
-                TotalIndex = TextShapingResult.Glyphs.Length - 1
+                TotalIndex = TextShapingResult.Glyphs.Length - 1,
+                
+                IsNewLine = endIndex == newLineIndex
             };
         }
         

QuestPDF/Elements/Text/TextBlock.cs

@@ -8,10 +8,11 @@ using QuestPDF.Infrastructure;
 
 namespace QuestPDF.Elements.Text
 {
-    internal class TextBlock : Element, IStateResettable, ICollectable
+    internal class TextBlock : Element, IStateResettable
     {
         public HorizontalAlignment Alignment { get; set; } = HorizontalAlignment.Left;
-        public List<ITextBlockItem> Items { get; set; } = new List<ITextBlockItem>();
+        public List<ITextBlockItem> Items { get; set; } = new();
+        public float ParagraphSpacing { get; set; } = 0;
 
         public string Text => string.Join(" ", Items.Where(x => x is TextBlockSpan).Cast<TextBlockSpan>().Select(x => x.Text));
 
@@ -38,11 +39,6 @@ namespace QuestPDF.Elements.Text
                     RenderingQueue.Enqueue(item);
             }
         }
-        
-        public void Collect()
-        {
-            Items.Clear();
-        }
 
         internal override SpacePlan Measure(Size availableSpace)
         {
@@ -115,6 +111,12 @@ namespace QuestPDF.Elements.Text
                 Canvas.Translate(new Position(0, line.LineHeight));
                 
                 heightOffset += line.LineHeight;
+
+                if (line.Elements.Last().Measurement.IsNewLine)
+                {
+                    heightOffset += ParagraphSpacing;
+                    Canvas.Translate(new Position(0, ParagraphSpacing));
+                }
             }
             
             Canvas.Translate(new Position(0, -heightOffset));

QuestPDF/Fluent/BorderExtensions.cs

@@ -1,5 +1,4 @@
 using System;
-using QuestPDF.Drawing;
 using QuestPDF.Elements;
 using QuestPDF.Infrastructure;
 
@@ -9,7 +8,7 @@ namespace QuestPDF.Fluent
     {
         private static IContainer Border(this IContainer element, Action<Border> handler)
         {
-            var border = element as Border ?? ElementCacheManager.Get<Border>();
+            var border = element as Border ?? new Border();
             handler(border);
             
             return element.Element(border);

QuestPDF/Fluent/ColumnExtensions.cs

@@ -1,14 +1,12 @@
 using System;
-using QuestPDF.Drawing;
 using QuestPDF.Elements;
 using QuestPDF.Infrastructure;
-using Container = System.ComponentModel.Container;
 
 namespace QuestPDF.Fluent
 {
     public class ColumnDescriptor
     {
-        internal Column Column { get; set; }
+        internal Column Column { get; } = new();
 
         public void Spacing(float value, Unit unit = Unit.Point)
         {
@@ -17,9 +15,14 @@ namespace QuestPDF.Fluent
         
         public IContainer Item()
         {
-            var columnItem = ElementCacheManager.Get<ColumnItem>();
-            Column.Items.Add(columnItem);
-            return columnItem;
+            var container = new Container();
+            
+            Column.Items.Add(new ColumnItem
+            {
+                Child = container
+            });
+            
+            return container;
         }
     }
     
@@ -33,8 +36,7 @@ namespace QuestPDF.Fluent
         
         public static void Column(this IContainer element, Action<ColumnDescriptor> handler)
         {
-            var descriptor = ElementCacheManager.Get<ColumnDescriptor>();
-            descriptor.Column = ElementCacheManager.Get<Column>();
+            var descriptor = new ColumnDescriptor();
             handler(descriptor);
             element.Element(descriptor.Column);
         }

QuestPDF/Fluent/ElementExtensions.cs

@@ -1,5 +1,4 @@
 using System;
-using QuestPDF.Drawing;
 using QuestPDF.Drawing.Exceptions;
 using QuestPDF.Elements;
 using QuestPDF.Infrastructure;
@@ -53,10 +52,10 @@ namespace QuestPDF.Fluent
 
         public static IContainer Background(this IContainer element, string color)
         {
-            var background = ElementCacheManager.Get<Background>();
-            background.Color = color;
-
-            return element.Element(background);
+            return element.Element(new Background
+            {
+                Color = color
+            });
         }
 
         public static void Placeholder(this IContainer element, string? text = null)
@@ -163,7 +162,7 @@ namespace QuestPDF.Fluent
         
         public static IContainer MinimalBox(this IContainer element)
         {
-            return element.Element(ElementCacheManager.Get<MinimalBox>());
+            return element.Element(new MinimalBox());
         }
         
         public static IContainer Unconstrained(this IContainer element)

QuestPDF/Fluent/PaddingExtensions.cs

@@ -1,5 +1,4 @@
 using System;
-using QuestPDF.Drawing;
 using QuestPDF.Elements;
 using QuestPDF.Infrastructure;
 
@@ -9,7 +8,7 @@ namespace QuestPDF.Fluent
     { 
         private static IContainer Padding(this IContainer element, Action<Padding> handler)
         {
-            var padding = element as Padding ?? ElementCacheManager.Get<Padding>();
+            var padding = element as Padding ?? new Padding();
             handler(padding);
             
             return element.Element(padding);

QuestPDF/Fluent/RowExtensions.cs

@@ -1,5 +1,4 @@
 using System;
-using QuestPDF.Drawing;
 using QuestPDF.Elements;
 using QuestPDF.Infrastructure;
 
@@ -7,7 +6,7 @@ namespace QuestPDF.Fluent
 {
     public class RowDescriptor
     {
-        internal Row Row { get; set; } 
+        internal Row Row { get; } = new();
 
         public void Spacing(float value)
         {
@@ -16,12 +15,14 @@ namespace QuestPDF.Fluent
 
         private IContainer Item(RowItemType type, float size = 0)
         {
-            var rowItem = ElementCacheManager.Get<RowItem>();
-            rowItem.Type = type;
-            rowItem.Size = size;
+            var element = new RowItem
+            {
+                Type = type,
+                Size = size
+            };
             
-            Row.Items.Add(rowItem);
-            return rowItem;
+            Row.Items.Add(element);
+            return element;
         }
         
         [Obsolete("This element has been renamed since version 2022.2. Please use the RelativeItem method.")]
@@ -56,12 +57,9 @@ namespace QuestPDF.Fluent
     {
         public static void Row(this IContainer element, Action<RowDescriptor> handler)
         {
-            var descriptor = ElementCacheManager.Get<RowDescriptor>();
-            descriptor.Row = ElementCacheManager.Get<Row>();
-            
+            var descriptor = new RowDescriptor();
             handler(descriptor);
             element.Element(descriptor.Row);
-            ElementCacheManager.Store(descriptor);
         }
     }
 }

QuestPDF/Fluent/TextExtensions.cs

@@ -12,18 +12,11 @@ namespace QuestPDF.Fluent
 {
     public class TextSpanDescriptor
     {
-        internal TextStyle TextStyle = TextStyle.Default;
-        internal Action<TextStyle> AssignTextStyle { get; }
+        internal TextStyle TextStyle { get; }
 
-        internal TextSpanDescriptor(Action<TextStyle> assignTextStyle)
+        internal TextSpanDescriptor(TextStyle textStyle)
         {
-            AssignTextStyle = assignTextStyle;
-        }
-
-        internal void MutateTextStyle(Func<TextStyle, TextStyle> handler)
-        {
-            TextStyle = handler(TextStyle);
-            AssignTextStyle(TextStyle);
+            TextStyle = textStyle;
         }
     }
 
@@ -31,26 +24,25 @@ namespace QuestPDF.Fluent
     
     public class TextPageNumberDescriptor : TextSpanDescriptor
     {
-        internal Action<PageNumberFormatter> AssignFormatFunction { get; }
-        
-        internal TextPageNumberDescriptor(Action<TextStyle> assignTextStyle, Action<PageNumberFormatter> assignFormatFunction) : base(assignTextStyle)
+        internal PageNumberFormatter FormatFunction { get; private set; } = x => x?.ToString() ?? string.Empty;
+
+        internal TextPageNumberDescriptor(TextStyle textStyle) : base(textStyle)
         {
-            AssignFormatFunction = assignFormatFunction;
+            
         }
 
         public TextPageNumberDescriptor Format(PageNumberFormatter formatter)
         {
-            AssignFormatFunction(formatter);
+            FormatFunction = formatter ?? FormatFunction;
             return this;
         }
     }
     
     public class TextDescriptor
     {
-        private ICollection<TextBlock> TextBlocks { get; } = new List<TextBlock>();
-        private TextStyle? DefaultStyle { get; set; }
+        internal TextBlock TextBlock = new();
+        private TextStyle DefaultStyle { get; set; } = TextStyle.Default;
         internal HorizontalAlignment Alignment { get; set; } = HorizontalAlignment.Left;
-        private float Spacing { get; set; } = 0f;
 
         public void DefaultTextStyle(TextStyle style)
         {
@@ -79,17 +71,9 @@ namespace QuestPDF.Fluent
 
         public void ParagraphSpacing(float value, Unit unit = Unit.Point)
         {
-            Spacing = value.ToPoints(unit);
+            TextBlock.ParagraphSpacing = value.ToPoints(unit);
         }
 
-        private void AddItemToLastTextBlock(ITextBlockItem item)
-        {
-            if (!TextBlocks.Any())
-                TextBlocks.Add(new TextBlock());
-            
-            TextBlocks.Last().Items.Add(item);
-        }
-        
         [Obsolete("This element has been renamed since version 2022.3. Please use the overload that returns a TextSpanDescriptor object which allows to specify text style.")]
         public void Span(string? text, TextStyle style)
         {
@@ -98,30 +82,19 @@ namespace QuestPDF.Fluent
         
         public TextSpanDescriptor Span(string? text)
         {
+            var style = DefaultStyle.Clone();
+            var descriptor = new TextSpanDescriptor(style);
+
             if (text == null)
-                return new TextSpanDescriptor(_ => { });
- 
-            var items = text
-                .Replace("\r", string.Empty)
-                .Split(new[] { '\n' }, StringSplitOptions.None)
-                .Select(x => new TextBlockSpan
-                {
-                    Text = x
-                })
-                .ToList();
-
-            AddItemToLastTextBlock(items.First());
-
-            items
-                .Skip(1)
-                .Select(x => new TextBlock
-                {   
-                    Items = new List<ITextBlockItem> { x }
-                })
-                .ToList()
-                .ForEach(TextBlocks.Add);
-
-            return new TextSpanDescriptor(x => items.ForEach(y => y.Style = x));
+                return descriptor;
+            
+            TextBlock.Items.Add(new TextBlockSpan
+            {
+                Text = text,
+                Style = style
+            });
+            
+            return descriptor;
         }
 
         public TextSpanDescriptor Line(string? text)
@@ -137,10 +110,16 @@ namespace QuestPDF.Fluent
         
         private TextPageNumberDescriptor PageNumber(Func<IPageContext, int?> pageNumber)
         {
-            var textBlockItem = new TextBlockPageNumber();
-            AddItemToLastTextBlock(textBlockItem);
+            var style = DefaultStyle.Clone();
+            var descriptor = new TextPageNumberDescriptor(style);
             
-            return new TextPageNumberDescriptor(x => textBlockItem.Style = x, x => textBlockItem.Source = context => x(pageNumber(context)));
+            TextBlock.Items.Add(new TextBlockPageNumber
+            {
+                Source = context => descriptor.FormatFunction(pageNumber(context)),
+                Style = style
+            });
+            
+            return descriptor;
         }
 
         public TextPageNumberDescriptor CurrentPageNumber()
@@ -184,17 +163,20 @@ namespace QuestPDF.Fluent
             if (IsNullOrEmpty(sectionName))
                 throw new ArgumentException("Section name cannot be null or empty", nameof(sectionName));
 
+            var style = DefaultStyle.Clone();
+            var descriptor = new TextSpanDescriptor(style);
+            
             if (IsNullOrEmpty(text))
-                return new TextSpanDescriptor(_ => { });
-
-            var textBlockItem = new TextBlockSectionLink
+                return descriptor;
+            
+            TextBlock.Items.Add(new TextBlockSectionLink
             {
+                Style = style,
                 Text = text,
                 SectionName = sectionName
-            };
+            });
 
-            AddItemToLastTextBlock(textBlockItem);
-            return new TextSpanDescriptor(x => textBlockItem.Style = x);
+            return descriptor;
         }
         
         [Obsolete("This element has been renamed since version 2022.3. Please use the SectionLink method.")]
@@ -208,17 +190,20 @@ namespace QuestPDF.Fluent
             if (IsNullOrEmpty(url))
                 throw new ArgumentException("Url cannot be null or empty", nameof(url));
 
+            var style = DefaultStyle.Clone();
+            var descriptor = new TextSpanDescriptor(style);
+
             if (IsNullOrEmpty(text))
-                return new TextSpanDescriptor(_ => { });
+                return descriptor;
             
-            var textBlockItem = new TextBlockHyperlink
+            TextBlock.Items.Add(new TextBlockHyperlink
             {
+                Style = style,
                 Text = text,
                 Url = url
-            };
+            });
 
-            AddItemToLastTextBlock(textBlockItem);
-            return new TextSpanDescriptor(x => textBlockItem.Style = x);
+            return descriptor;
         }
         
         [Obsolete("This element has been renamed since version 2022.3. Please use the Hyperlink method.")]
@@ -231,35 +216,13 @@ namespace QuestPDF.Fluent
         {
             var container = new Container();
                 
-            AddItemToLastTextBlock(new TextBlockElement
+            TextBlock.Items.Add(new TextBlockElement
             {
                 Element = container
             });
             
             return container.AlignBottom().MinimalBox();
         }
-        
-        internal void Compose(IContainer container)
-        {
-            TextBlocks.ToList().ForEach(x => x.Alignment = Alignment);
-            
-            if (DefaultStyle != null)
-                container = container.DefaultTextStyle(DefaultStyle);
-
-            if (TextBlocks.Count == 1)
-            {
-                container.Element(TextBlocks.First());
-                return;
-            }
-            
-            container.Column(column =>
-            {
-                column.Spacing(Spacing);
-
-                foreach (var textBlock in TextBlocks)
-                    column.Item().Element(textBlock);
-            }); 
-        }
     }
     
     public static class TextExtensions
@@ -272,7 +235,7 @@ namespace QuestPDF.Fluent
                 descriptor.Alignment = alignment.Horizontal;
             
             content?.Invoke(descriptor);
-            descriptor.Compose(element);
+            element.Element(descriptor.TextBlock);
         }
         
         [Obsolete("This element has been renamed since version 2022.3. Please use the overload that returns a TextSpanDescriptor object which allows to specify text style.")]

QuestPDF/Fluent/TextSpanDescriptorExtensions.cs

@@ -11,124 +11,120 @@ namespace QuestPDF.Fluent
             if (style == null)
                 return descriptor;
             
-            descriptor.MutateTextStyle(x => x.OverrideStyle(style));
+            descriptor.TextStyle.OverrideStyle(style);
             return descriptor;
         }
         
         public static T FontColor<T>(this T descriptor, string value) where T : TextSpanDescriptor
         {
-            descriptor.MutateTextStyle(x => x.FontColor(value));
+            descriptor.TextStyle.Color = value;
             return descriptor;
         }
         
         public static T BackgroundColor<T>(this T descriptor, string value) where T : TextSpanDescriptor
         {
-            descriptor.MutateTextStyle(x => x.BackgroundColor(value));
+            descriptor.TextStyle.BackgroundColor = value;
             return descriptor;
         }
         
         public static T FontFamily<T>(this T descriptor, string value) where T : TextSpanDescriptor
         {
-            descriptor.MutateTextStyle(x => x.FontFamily(value));
+            descriptor.TextStyle.FontFamily = value;
             return descriptor;
         }
         
         public static T FontSize<T>(this T descriptor, float value) where T : TextSpanDescriptor
         {
-            descriptor.MutateTextStyle(x => x.FontSize(value));
+            descriptor.TextStyle.Size = value;
             return descriptor;
         }
         
         public static T LineHeight<T>(this T descriptor, float value) where T : TextSpanDescriptor
         {
-            descriptor.MutateTextStyle(x => x.LineHeight(value));
+            descriptor.TextStyle.LineHeight = value;
             return descriptor;
         }
         
         public static T Italic<T>(this T descriptor, bool value = true) where T : TextSpanDescriptor
         {
-            descriptor.MutateTextStyle(x => x.Italic(value));
+            descriptor.TextStyle.IsItalic = value;
             return descriptor;
         }
         
         public static T Strikethrough<T>(this T descriptor, bool value = true) where T : TextSpanDescriptor
         {
-            descriptor.MutateTextStyle(x => x.Strikethrough(value));
+            descriptor.TextStyle.HasStrikethrough = value;
             return descriptor;
         }
         
         public static T Underline<T>(this T descriptor, bool value = true) where T : TextSpanDescriptor
         {
-            descriptor.MutateTextStyle(x => x.Underline(value));
+            descriptor.TextStyle.HasUnderline = value;
             return descriptor;
         }
 
         public static T WrapAnywhere<T>(this T descriptor, bool value = true) where T : TextSpanDescriptor
         {
-            descriptor.MutateTextStyle(x => x.WrapAnywhere(value));
+            descriptor.TextStyle.WrapAnywhere = value;
             return descriptor;
         }
 
         #region Weight
         
+        public static T Weight<T>(this T descriptor, FontWeight weight) where T : TextSpanDescriptor
+        {
+            descriptor.TextStyle.FontWeight = weight;
+            return descriptor;
+        }
+        
         public static T Thin<T>(this T descriptor) where T : TextSpanDescriptor
         {
-            descriptor.MutateTextStyle(x => x.Thin());
-            return descriptor;
+            return descriptor.Weight(FontWeight.Thin);
         }
         
         public static T ExtraLight<T>(this T descriptor) where T : TextSpanDescriptor
         {
-            descriptor.MutateTextStyle(x => x.ExtraLight());
-            return descriptor;
+            return descriptor.Weight(FontWeight.ExtraLight);
         }
         
         public static T Light<T>(this T descriptor) where T : TextSpanDescriptor
         {
-            descriptor.MutateTextStyle(x => x.Light());
-            return descriptor;
+            return descriptor.Weight(FontWeight.Light);
         }
         
         public static T NormalWeight<T>(this T descriptor) where T : TextSpanDescriptor
         {
-            descriptor.MutateTextStyle(x => x.NormalWeight());
-            return descriptor;
+            return descriptor.Weight(FontWeight.Normal);
         }
         
         public static T Medium<T>(this T descriptor) where T : TextSpanDescriptor
         {
-            descriptor.MutateTextStyle(x => x.Medium());
-            return descriptor;
+            return descriptor.Weight(FontWeight.Medium);
         }
         
         public static T SemiBold<T>(this T descriptor) where T : TextSpanDescriptor
         {
-            descriptor.MutateTextStyle(x => x.SemiBold());
-            return descriptor;
+            return descriptor.Weight(FontWeight.SemiBold);
         }
         
         public static T Bold<T>(this T descriptor) where T : TextSpanDescriptor
         {
-            descriptor.MutateTextStyle(x => x.Bold());
-            return descriptor;
+            return descriptor.Weight(FontWeight.Bold);
         }
         
         public static T ExtraBold<T>(this T descriptor) where T : TextSpanDescriptor
         {
-            descriptor.MutateTextStyle(x => x.ExtraBold());
-            return descriptor;
+            return descriptor.Weight(FontWeight.ExtraBold);
         }
         
         public static T Black<T>(this T descriptor) where T : TextSpanDescriptor
         {
-            descriptor.MutateTextStyle(x => x.Black());
-            return descriptor;
+            return descriptor.Weight(FontWeight.Black);
         }
         
         public static T ExtraBlack<T>(this T descriptor) where T : TextSpanDescriptor
         {
-            descriptor.MutateTextStyle(x => x.ExtraBlack());
-            return descriptor;
+            return descriptor.Weight(FontWeight.ExtraBlack);
         }
 
         #endregion
@@ -136,22 +132,24 @@ namespace QuestPDF.Fluent
         #region Position
         public static T NormalPosition<T>(this T descriptor) where T : TextSpanDescriptor
         {
-            descriptor.MutateTextStyle(x => x.NormalPosition());
-            return descriptor;
+            return descriptor.Position(FontPosition.Normal);
         }
 
         public static T Subscript<T>(this T descriptor) where T : TextSpanDescriptor
         {
-            descriptor.MutateTextStyle(x => x.Subscript());
-            return descriptor;
+            return descriptor.Position(FontPosition.Subscript);
         }
 
         public static T Superscript<T>(this T descriptor) where T : TextSpanDescriptor
         {
-            descriptor.MutateTextStyle(x => x.Superscript());
+            return descriptor.Position(FontPosition.Superscript);
+        }
+
+        private static T Position<T>(this T descriptor, FontPosition fontPosition) where T : TextSpanDescriptor
+        {
+            descriptor.TextStyle.FontPosition = fontPosition;
             return descriptor;
         }
-        
         #endregion
     }
 }

QuestPDF/Fluent/TextStyleExtensions.cs

@@ -4,10 +4,16 @@ using QuestPDF.Infrastructure;
 
 namespace QuestPDF.Fluent
 {
-    
-    
     public static class TextStyleExtensions
     {
+        private static TextStyle Mutate(this TextStyle style, Action<TextStyle> handler)
+        {
+            style = style.Clone();
+            
+            handler(style);
+            return style;
+        }
+        
         [Obsolete("This element has been renamed since version 2022.3. Please use the FontColor method.")]
         public static TextStyle Color(this TextStyle style, string value)
         {
@@ -16,12 +22,12 @@ namespace QuestPDF.Fluent
         
         public static TextStyle FontColor(this TextStyle style, string value)
         {
-            return style.Mutate(TextStyleProperty.Color, value);
+            return style.Mutate(x => x.Color = value);
         }
         
         public static TextStyle BackgroundColor(this TextStyle style, string value)
         {
-            return style.Mutate(TextStyleProperty.BackgroundColor, value);
+            return style.Mutate(x => x.BackgroundColor = value);
         }
         
         [Obsolete("This element has been renamed since version 2022.3. Please use the FontFamily method.")]
@@ -32,7 +38,7 @@ namespace QuestPDF.Fluent
         
         public static TextStyle FontFamily(this TextStyle style, string value)
         {
-            return style.Mutate(TextStyleProperty.FontFamily, value);
+            return style.Mutate(x => x.FontFamily = value);
         }
         
         [Obsolete("This element has been renamed since version 2022.3. Please use the FontSize method.")]
@@ -43,39 +49,39 @@ namespace QuestPDF.Fluent
         
         public static TextStyle FontSize(this TextStyle style, float value)
         {
-            return style.Mutate(TextStyleProperty.Size, value);
+            return style.Mutate(x => x.Size = value);
         }
         
         public static TextStyle LineHeight(this TextStyle style, float value)
         {
-            return style.Mutate(TextStyleProperty.LineHeight, value);
+            return style.Mutate(x => x.LineHeight = value);
         }
         
         public static TextStyle Italic(this TextStyle style, bool value = true)
         {
-            return style.Mutate(TextStyleProperty.IsItalic, value);
+            return style.Mutate(x => x.IsItalic = value);
         }
         
         public static TextStyle Strikethrough(this TextStyle style, bool value = true)
         {
-            return style.Mutate(TextStyleProperty.HasStrikethrough, value);
+            return style.Mutate(x => x.HasStrikethrough = value);
         }
         
         public static TextStyle Underline(this TextStyle style, bool value = true)
         {
-            return style.Mutate(TextStyleProperty.HasUnderline, value);
+            return style.Mutate(x => x.HasUnderline = value);
         }
         
         public static TextStyle WrapAnywhere(this TextStyle style, bool value = true)
         {
-            return style.Mutate(TextStyleProperty.WrapAnywhere, value);
+            return style.Mutate(x => x.WrapAnywhere = value);
         }
 
         #region Weight
         
         public static TextStyle Weight(this TextStyle style, FontWeight weight)
         {
-            return style.Mutate(TextStyleProperty.FontWeight, weight);
+            return style.Mutate(x => x.FontWeight = weight);
         }
         
         public static TextStyle Thin(this TextStyle style)
@@ -148,7 +154,10 @@ namespace QuestPDF.Fluent
 
         private static TextStyle Position(this TextStyle style, FontPosition fontPosition)
         {
-            return style.Mutate(TextStyleProperty.FontPosition, fontPosition);
+            if (style.FontPosition == fontPosition)
+                return style;
+
+            return style.Mutate(t => t.FontPosition = fontPosition);
         }
         #endregion
     }

QuestPDF/Infrastructure/ContainerElement.cs

@@ -5,7 +5,7 @@ using QuestPDF.Elements;
 
 namespace QuestPDF.Infrastructure
 {
-    internal abstract class ContainerElement : Element, IContainer, ICollectable
+    internal abstract class ContainerElement : Element, IContainer
     {
         internal Element? Child { get; set; } = Empty.Instance;
 
@@ -34,10 +34,5 @@ namespace QuestPDF.Infrastructure
         {
             Child?.Draw(availableSpace);
         }
-
-        public virtual void Collect()
-        {
-            Child = default;
-        }
     }
 }

QuestPDF/Infrastructure/ICollectable.cs

@@ -1,7 +0,0 @@
-namespace QuestPDF.Infrastructure
-{
-    public interface ICollectable
-    {
-        void Collect();
-    }
-}

QuestPDF/Infrastructure/TextStyle.cs

@@ -3,8 +3,10 @@ using QuestPDF.Helpers;
 
 namespace QuestPDF.Infrastructure
 {
-    public record TextStyle
+    public class TextStyle
     {
+        internal bool HasGlobalStyleApplied { get; private set; }
+        
         internal string? Color { get; set; }
         internal string? BackgroundColor { get; set; }
         internal string? FontFamily { get; set; }
@@ -17,7 +19,13 @@ namespace QuestPDF.Infrastructure
         internal bool? HasUnderline { get; set; }
         internal bool? WrapAnywhere { get; set; }
 
-        internal static TextStyle LibraryDefault { get; } = new()
+        internal object PaintKey { get; private set; }
+        internal object FontMetricsKey { get; private set; }
+        
+        // REVIEW: Should this be a method call that news up a TextStyle,
+        // or can it be a static variable?
+        // (style mutations seem to create a clone anyway)
+        internal static readonly TextStyle LibraryDefault = new TextStyle
         {
             Color = Colors.Black,
             BackgroundColor = Colors.Transparent,
@@ -32,6 +40,56 @@ namespace QuestPDF.Infrastructure
             WrapAnywhere = false
         };
 
-        public static TextStyle Default { get; } = new();
+        // it is important to create new instances for the DefaultTextStyle element to work correctly
+        public static TextStyle Default => new TextStyle();
+        
+        internal void ApplyGlobalStyle(TextStyle globalStyle)
+        {
+            if (HasGlobalStyleApplied)
+                return;
+            
+            HasGlobalStyleApplied = true;
+
+            ApplyParentStyle(globalStyle);
+            PaintKey ??= (FontFamily, Size, FontWeight, FontPosition, IsItalic, Color);
+            FontMetricsKey ??= (FontFamily, Size, FontWeight, IsItalic);
+        }
+        
+        internal void ApplyParentStyle(TextStyle parentStyle)
+        {
+            Color ??= parentStyle.Color;
+            BackgroundColor ??= parentStyle.BackgroundColor;
+            FontFamily ??= parentStyle.FontFamily;
+            Size ??= parentStyle.Size;
+            LineHeight ??= parentStyle.LineHeight;
+            FontWeight ??= parentStyle.FontWeight;
+            FontPosition ??= parentStyle.FontPosition;
+            IsItalic ??= parentStyle.IsItalic;
+            HasStrikethrough ??= parentStyle.HasStrikethrough;
+            HasUnderline ??= parentStyle.HasUnderline;
+            WrapAnywhere ??= parentStyle.WrapAnywhere;
+        }
+
+        internal void OverrideStyle(TextStyle parentStyle)
+        {
+            Color = parentStyle.Color ?? Color;
+            BackgroundColor = parentStyle.BackgroundColor ?? BackgroundColor;
+            FontFamily = parentStyle.FontFamily ?? FontFamily;
+            Size = parentStyle.Size ?? Size;
+            LineHeight = parentStyle.LineHeight ?? LineHeight;
+            FontWeight = parentStyle.FontWeight ?? FontWeight;
+            FontPosition = parentStyle.FontPosition ?? FontPosition;
+            IsItalic = parentStyle.IsItalic ?? IsItalic;
+            HasStrikethrough = parentStyle.HasStrikethrough ?? HasStrikethrough;
+            HasUnderline = parentStyle.HasUnderline ?? HasUnderline;
+            WrapAnywhere = parentStyle.WrapAnywhere ?? WrapAnywhere;
+        }
+        
+        internal TextStyle Clone()
+        {
+            var clone = (TextStyle)MemberwiseClone();
+            clone.HasGlobalStyleApplied = false;
+            return clone;
+        }
     }
 }

QuestPDF/Infrastructure/TextStyleManager.cs

@@ -1,215 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using QuestPDF.Fluent;
-
-namespace QuestPDF.Infrastructure
-{
-    internal enum TextStyleProperty
-    {
-        Color,
-        BackgroundColor,
-        FontFamily,
-        Size,
-        LineHeight,
-        FontWeight,
-        FontPosition,
-        IsItalic,
-        HasStrikethrough,
-        HasUnderline,
-        WrapAnywhere
-    }
-    
-    internal static class TextStyleManager
-    {
-        public static ConcurrentDictionary<(TextStyle origin, TextStyleProperty property, object value), TextStyle> TextStyleMutateCache = new();
-        public static ConcurrentDictionary<(TextStyle origin, TextStyle parent, bool overrideValue), TextStyle> TextStyleApplyCache = 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));
-        }
-
-        private static TextStyle MutateStyle(TextStyle origin, TextStyleProperty property, object value, bool overrideValue = true)
-        {
-            if (overrideValue && value == null)
-                return origin;
-            
-            if (property == TextStyleProperty.Color)
-            {
-                if (!overrideValue && origin.Color != null)
-                    return origin;
-                
-                var castedValue = (string?)value;
-
-                if (origin.Color == castedValue)
-                    return origin;
-
-                return origin with { Color = castedValue };
-            }
-            
-            if (property == TextStyleProperty.BackgroundColor)
-            {
-                if (!overrideValue && origin.BackgroundColor != null)
-                    return origin;
-                
-                var castedValue = (string?)value;
-                
-                if (origin.BackgroundColor == castedValue)
-                    return origin;
-
-                return origin with { BackgroundColor = castedValue };
-            }
-            
-            if (property == TextStyleProperty.FontFamily)
-            {
-                if (!overrideValue && origin.FontFamily != null)
-                    return origin;
-                
-                var castedValue = (string?)value;
-                
-                if (origin.FontFamily == castedValue)
-                    return origin;
-
-                return origin with { FontFamily = castedValue };
-            }
-            
-            if (property == TextStyleProperty.Size)
-            {
-                if (!overrideValue && origin.Size != null)
-                    return origin;
-                
-                var castedValue = (float?)value;
-                
-                if (origin.Size == castedValue)
-                    return origin;
-
-                return origin with { Size = castedValue };
-            }
-            
-            if (property == TextStyleProperty.LineHeight)
-            {
-                if (!overrideValue && origin.LineHeight != null)
-                    return origin;
-                
-                var castedValue = (float?)value;
-                
-                if (origin.LineHeight == castedValue)
-                    return origin;
-
-                return origin with { LineHeight = castedValue };
-            }
-            
-            if (property == TextStyleProperty.FontWeight)
-            {
-                if (!overrideValue && origin.FontWeight != null)
-                    return origin;
-                
-                var castedValue = (FontWeight?)value;
-                
-                if (origin.FontWeight == castedValue)
-                    return origin;
-
-                return origin with { FontWeight = castedValue };
-            }
-            
-            if (property == TextStyleProperty.FontPosition)
-            {
-                if (!overrideValue && origin.FontPosition != null)
-                    return origin;
-                
-                var castedValue = (FontPosition?)value;
-                
-                if (origin.FontPosition == castedValue)
-                    return origin;
-
-                return origin with { FontPosition = castedValue };
-            }
-            
-            if (property == TextStyleProperty.IsItalic)
-            {
-                if (!overrideValue && origin.IsItalic != null)
-                    return origin;
-                
-                var castedValue = (bool?)value;
-                
-                if (origin.IsItalic == castedValue)
-                    return origin;
-
-                return origin with { IsItalic = castedValue };
-            }
-            
-            if (property == TextStyleProperty.HasStrikethrough)
-            {
-                if (!overrideValue && origin.HasStrikethrough != null)
-                    return origin;
-                
-                var castedValue = (bool?)value;
-                
-                if (origin.HasStrikethrough == castedValue)
-                    return origin;
-
-                return origin with { HasStrikethrough = castedValue };
-            }
-            
-            if (property == TextStyleProperty.HasUnderline)
-            {
-                if (!overrideValue && origin.HasUnderline != null)
-                    return origin;
-                
-                var castedValue = (bool?)value;
-                
-                if (origin.HasUnderline == castedValue)
-                    return origin;
-
-                return origin with { HasUnderline = castedValue };
-            }
-            
-            if (property == TextStyleProperty.WrapAnywhere)
-            {
-                if (!overrideValue && origin.WrapAnywhere != null)
-                    return origin;
-
-                var castedValue = (bool?)value;
-                
-                if (origin.WrapAnywhere == castedValue)
-                    return origin;
-                
-                return origin with { WrapAnywhere = castedValue };
-            }
-
-            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)
-        {
-            var cacheKey = (style, parent, false);
-            return TextStyleApplyCache.GetOrAdd(cacheKey, key => ApplyStyle(key.origin, key.parent, key.overrideValue));
-        }
-        
-        internal static TextStyle OverrideStyle(this TextStyle style, TextStyle parent)
-        {
-            var cacheKey = (style, parent, true);
-            return TextStyleApplyCache.GetOrAdd(cacheKey, key => ApplyStyle(key.origin, key.parent, key.overrideValue));
-        }
-        
-        private static TextStyle ApplyStyle(TextStyle style, TextStyle parent, bool overrideValue)
-        {
-            var result = style;
-
-            result = MutateStyle(result, TextStyleProperty.Color, parent.Color, overrideValue);
-            result = MutateStyle(result, TextStyleProperty.BackgroundColor, parent.BackgroundColor, overrideValue);
-            result = MutateStyle(result, TextStyleProperty.FontFamily, parent.FontFamily, overrideValue);
-            result = MutateStyle(result, TextStyleProperty.Size, parent.Size, overrideValue);
-            result = MutateStyle(result, TextStyleProperty.LineHeight, parent.LineHeight, overrideValue);
-            result = MutateStyle(result, TextStyleProperty.FontWeight, parent.FontWeight, overrideValue);
-            result = MutateStyle(result, TextStyleProperty.FontPosition, parent.FontPosition, overrideValue);
-            result = MutateStyle(result, TextStyleProperty.IsItalic, parent.IsItalic, overrideValue);
-            result = MutateStyle(result, TextStyleProperty.HasStrikethrough, parent.HasStrikethrough, overrideValue);
-            result = MutateStyle(result, TextStyleProperty.HasUnderline, parent.HasUnderline, overrideValue);
-            result = MutateStyle(result, TextStyleProperty.WrapAnywhere, parent.WrapAnywhere, overrideValue);
-            
-            return result;
-        }
-    }
-}

QuestPDF/QuestPDF.csproj

@@ -3,7 +3,7 @@
         <Authors>MarcinZiabek</Authors>
         <Company>CodeFlint</Company>
         <PackageId>QuestPDF</PackageId>
-        <Version>2022.8.2</Version>
+        <Version>2202.8.2</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.</PackageDescription>
         <PackageReleaseNotes>$([System.IO.File]::ReadAllText("$(MSBuildProjectDirectory)/Resources/ReleaseNotes.txt"))</PackageReleaseNotes>
         <LangVersion>9</LangVersion>

QuestPDF/Resources/ReleaseNotes.txt

@@ -16,5 +16,5 @@
 - Updated stability of rendering elements in negative space
 - Optimization for the Column element: do not measure child when available height is negative
 
-2022.8.2
+2202.8.2
 - Fixed: the Column element incorrectly renders zero-height elements.

QuestPDF/Settings.cs

@@ -1,40 +0,0 @@
-namespace QuestPDF
-{
-    public static class Settings
-    {
-        /// <summary>
-        /// This value represents the maximum lenght of the document that the library produces.
-        /// This is useful when layout constraints are too strong, e.g. one element does not fit in another.
-        /// In such cases, the library would produce document of infinite length, consuming all available resources.
-        /// To break the algorithm and save the environment, the library breaks the rendering process after reaching specified length of document.
-        /// If your content requires generating longer documents, please assign the most reasonable value.
-        /// </summary>
-        public static int DocumentLayoutExceptionThreshold { get; set; } = 250;
-        
-        /// <summary>
-        /// This flag generates additional document elements to cache layout calculation results.
-        /// In the vast majority of cases, this significantly improves performance, while slightly increasing memory consumption.
-        /// </summary>
-        /// <remarks>By default, this flag is enabled only when the debugger is NOT attached.</remarks>
-        public static bool EnableCaching { get; set; } = !System.Diagnostics.Debugger.IsAttached;
-        
-        /// <summary>
-        /// This flag generates additional document elements to improve layout debugging experience.
-        /// When the DocumentLayoutException is thrown, the library is able to provide additional execution context.
-        /// It includes layout calculation results and path to the problematic area.
-        /// </summary>
-        /// <remarks>By default, this flag is enabled only when the debugger IS attached.</remarks>
-        public static bool EnableDebugging { get; set; } = System.Diagnostics.Debugger.IsAttached;
-        
-        /// <summary>
-        /// This flag enables checking the font glyph availability.
-        /// If your text contains glyphs that are not present in the specified font,
-        /// 1) when this flag is enabled: the DocumentDrawingException is thrown. OR 
-        /// 2) when this flag is disabled: placeholder characters are visible in the produced PDF file. 
-        /// Enabling this flag may slightly decrease document generation performance.
-        /// However, it provides hints that used fonts are not sufficient to produce correct results.
-        /// </summary>
-        /// <remarks>By default, this flag is enabled only when the debugger IS attached.</remarks>
-        public static bool CheckIfAllTextGlyphsAreAvailableInSpecifiedFont { get; set; } = System.Diagnostics.Debugger.IsAttached;
-    }
-}