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

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/TextBenchmark.cs

@@ -111,7 +111,7 @@ namespace QuestPDF.Examples
             {
                 page.Margin(50);
                 
-                page.Content().PaddingVertical(10).Column(column =>
+                page.Content().Column(column =>
                 {
                     column.Item().Element(Title);
                     column.Item().PageBreak();

QuestPDF.Examples/TextExamples.cs

@@ -2,7 +2,6 @@
 using System.Linq;
 using System.Text;
 using NUnit.Framework;
-using QuestPDF.Elements.Text;
 using QuestPDF.Examples.Engine;
 using QuestPDF.Fluent;
 using QuestPDF.Helpers;
@@ -619,43 +618,5 @@ namespace QuestPDF.Examples
                         .FontSize(20);
                 });
         }
-        
-        [Test]
-        public void FontFallback()
-        {
-            RenderingTest
-                .Create()
-                .ProduceImages()
-                .ShowResults()
-                .RenderDocument(container =>
-                {
-                    container.Page(page =>
-                    {
-                        page.Margin(50);
-                        page.PageColor(Colors.White);
-                        page.DefaultTextStyle(x => x
-                            .Fallback(y => y.FontFamily("Segoe UI Emoji")
-                                .Fallback(y => y.FontFamily("Microsoft YaHei"))));
-
-                        page.Size(PageSizes.A4);
-
-                        page.Content().Text(t =>
-                        {
-                            t.Line("This is normal text.");
-                            t.EmptyLine();
-                            
-                            t.Line("Following line should use font fallback:");
-                            t.Line("中文文本");
-                            t.EmptyLine();
-                            
-                            t.Line("The following line contains a mix of known and unknown characters.");
-                            t.Line("Mixed line: This 中文 is 文文 a mixed 本 本 line 本 中文文本!");
-                            t.EmptyLine();
-
-                            t.Line("Emojis work out of the box because of font fallback: 😊😅🥳👍❤😍👌");
-                        });
-                    });
-                });
-        }
     }
 }

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.Previewer/QuestPDF.Previewer.csproj

@@ -4,7 +4,7 @@
         <Authors>MarcinZiabek</Authors>
         <Company>CodeFlint</Company>
         <PackageId>QuestPDF.Previewer</PackageId>
-        <Version>2022.9.1</Version>
+        <Version>2022.8.0</Version>
         <PackAsTool>true</PackAsTool>
         <ToolCommandName>questpdf-previewer</ToolCommandName>
         <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>

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

@@ -64,21 +64,21 @@ namespace QuestPDF.Drawing
             var container = new DocumentContainer();
             document.Compose(container);
             var content = container.Compose();
-
-            ApplyRepeatContent(content);
             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);
+            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(documentDefaultTextStyle);
+                        textSpan.Style.ApplyGlobalStyle(documentDefaultTextStyle);
                     }
                     else if (textBlockItem is TextBlockElement textElement)
                     {
@@ -186,31 +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);
-
-            foreach (var child in content.GetChildren())
-                ApplyDefaultTextStyle(child, documentDefaultTextStyle);
-        }
-        
-        internal static void ApplyRepeatContent(this Element? content, bool enabled = false)
-        {
-            if (content == null)
-                return;
-
-            if (content is RepeatContent repeatContent)
             {
-                ApplyRepeatContent(repeatContent.Child, repeatContent.Repeat);
-                return;
+                defaultTextStyleElement.TextStyle.ApplyParentStyle(documentDefaultTextStyle);
+                targetTextStyle = defaultTextStyleElement.TextStyle;
             }
             
             foreach (var child in content.GetChildren())
-                ApplyRepeatContent(child, enabled);
-            
-            if (!enabled)
-                content.CreateProxy(y => y is IContent ? new ShowOnce { Child = y } : y);
+                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/Exceptions/DocumentDrawingException.cs

@@ -4,11 +4,6 @@ namespace QuestPDF.Drawing.Exceptions
 {
     public class DocumentDrawingException : Exception
     {
-        internal DocumentDrawingException(string message) : base(message)
-        {
-            
-        }
-        
         internal DocumentDrawingException(string message, Exception inner) : base(message, inner)
         {
             

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/TextMeasurement.cs

@@ -0,0 +1,8 @@
+namespace QuestPDF.Drawing
+{
+    internal struct TextMeasurement
+    {
+        public int LineIndex { get; set; }
+        public float FragmentWidth { get; set; }
+    }
+}

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;

QuestPDF/Elements/Canvas.cs

@@ -7,7 +7,7 @@ namespace QuestPDF.Elements
 {
     public delegate void DrawOnCanvas(SKCanvas canvas, Size availableSpace);
     
-    internal class Canvas : Element, ICacheable, IContent
+    internal class Canvas : Element, ICacheable
     {
         public DrawOnCanvas Handler { get; set; }
         

QuestPDF/Elements/Dynamic.cs

@@ -6,12 +6,12 @@ using QuestPDF.Infrastructure;
 
 namespace QuestPDF.Elements
 {
-    internal class DynamicHost : Element, IStateResettable, IContent
+    internal class DynamicHost : Element, IStateResettable
     {
         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/DynamicImage.cs

@@ -6,7 +6,7 @@ using SkiaSharp;
 
 namespace QuestPDF.Elements
 {
-    internal class DynamicImage : Element, IContent
+    internal class DynamicImage : Element
     {
         public Func<Size, byte[]>? Source { get; set; }
         

QuestPDF/Elements/Image.cs

@@ -5,7 +5,7 @@ using SkiaSharp;
 
 namespace QuestPDF.Elements
 {
-    internal class Image : Element, ICacheable, IContent
+    internal class Image : Element, ICacheable
     {
         public SKImage? InternalImage { get; set; }
 

QuestPDF/Elements/Line.cs

@@ -15,7 +15,7 @@ namespace QuestPDF.Elements
         Horizontal
     }
     
-    internal class Line : Element, ILine, ICacheable, IContent
+    internal class Line : Element, ILine, ICacheable
     {
         public LineType Type { get; set; } = LineType.Vertical;
         public string Color { get; set; } = Colors.Black;

QuestPDF/Elements/RepeatContent.cs

@@ -1,9 +0,0 @@
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Elements
-{
-    internal class RepeatContent : ContainerElement
-    {
-        public bool Repeat { get; set; }
-    }
-}

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/FontFallback.cs

@@ -1,150 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using QuestPDF.Drawing;
-using QuestPDF.Drawing.Exceptions;
-using QuestPDF.Elements.Text.Items;
-using QuestPDF.Fluent;
-using QuestPDF.Infrastructure;
-using SkiaSharp;
-
-namespace QuestPDF.Elements.Text
-{
-    internal static class FontFallback
-    {
-        public struct TextRun
-        {
-            public string Content { get; set; }
-            public TextStyle Style { get; set; }
-        }
-
-        public class FallbackOption
-        {
-            public TextStyle Style { get; set; }
-            public SKFont Font { get; set; }
-            public SKTypeface Typeface { get; set; }
-        }
-
-        private static SKFontManager FontManager => SKFontManager.Default;
-
-        public static IEnumerable<TextRun> SplitWithFontFallback(this string text, TextStyle textStyle)
-        {
-            var fallbackOptions = GetFallbackOptions(textStyle).ToArray();
-            
-            var spanStartIndex = 0;
-            var spanFallbackOption = fallbackOptions[0];
-            
-            for (var i = 0; i < text.Length; i += char.IsSurrogatePair(text, i) ? 2 : 1)
-            {
-                var codepoint = char.ConvertToUtf32(text, i);
-                var newFallbackOption = MatchFallbackOption(fallbackOptions, codepoint);
-
-                if (newFallbackOption == spanFallbackOption)
-                    continue;
-
-                yield return new TextRun
-                {
-                    Content = text.Substring(spanStartIndex, i - spanStartIndex),
-                    Style = spanFallbackOption.Style
-                };
-
-                spanStartIndex = i;
-                spanFallbackOption = newFallbackOption;
-            }
-            
-            if (spanStartIndex > text.Length)
-                yield break;
-            
-            yield return new TextRun
-            {
-                Content = text.Substring(spanStartIndex, text.Length - spanStartIndex),
-                Style = spanFallbackOption.Style
-            };
-
-            static IEnumerable<FallbackOption> GetFallbackOptions(TextStyle? textStyle)
-            {
-                while (textStyle != null)
-                {
-                    var font = textStyle.ToFont();
-                    
-                    yield return new FallbackOption
-                    {
-                        Style = textStyle,
-                        Font = font,
-                        Typeface = font.Typeface
-                    };
-
-                    textStyle = textStyle.Fallback;
-                }
-            }
-
-            static FallbackOption MatchFallbackOption(ICollection<FallbackOption> fallbackOptions, int codepoint)
-            {
-                foreach (var fallbackOption in fallbackOptions)
-                {
-                    if (fallbackOption.Font.ContainsGlyph(codepoint))
-                        return fallbackOption;
-                }
-
-                throw CreateNotMatchingFontException(codepoint);
-            }
-
-            static Exception CreateNotMatchingFontException(int codepoint)
-            {
-                var character = char.ConvertFromUtf32(codepoint);
-                var unicode = $"U-{codepoint:X4}";
-
-                var proposedFonts = FindFontsContainingGlyph(codepoint);
-                var proposedFontsFormatted = proposedFonts.Any() ? string.Join(", ", proposedFonts) : "no fonts available";
-                
-                return new DocumentDrawingException(
-                    $"Could not find an appropriate font fallback for glyph: {unicode} '{character}'. " +
-                    $"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. ");
-            }
-            
-            static IEnumerable<string> FindFontsContainingGlyph(int codepoint)
-            {
-                var fontManager = SKFontManager.Default;
-
-                return fontManager
-                    .GetFontFamilies()
-                    .Select(fontManager.MatchFamily)
-                    .Where(x => x.ContainsGlyph(codepoint))
-                    .Select(x => x.FamilyName);
-            }
-        }
-
-        public static IEnumerable<ITextBlockItem> ApplyFontFallback(this ICollection<ITextBlockItem> textBlockItems)
-        {
-            foreach (var textBlockItem in textBlockItems)
-            {
-                if (textBlockItem is TextBlockSpan textBlockSpan and not TextBlockPageNumber)
-                {
-                    if (!Settings.CheckIfAllTextGlyphsAreAvailable && textBlockSpan.Style.Fallback == null)
-                    {
-                        yield return textBlockSpan;
-                        continue;
-                    }
-                    
-                    var textRuns = textBlockSpan.Text.SplitWithFontFallback(textBlockSpan.Style);
-
-                    foreach (var textRun in textRuns)
-                    {
-                        yield return new TextBlockSpan
-                        {
-                            Text = textRun.Content,
-                            Style = textRun.Style
-                        };
-                    }
-                }
-                else
-                {
-                    yield return textBlockItem;
-                }
-            }
-        }
-    }
-}

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,21 +8,19 @@ using QuestPDF.Infrastructure;
 
 namespace QuestPDF.Elements.Text
 {
-    internal class TextBlock : Element, IStateResettable, IContent
+    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));
 
         private Queue<ITextBlockItem> RenderingQueue { get; set; }
         private int CurrentElementIndex { get; set; }
 
-        private bool FontFallbackApplied { get; set; } = false;
-        
         public void ResetState()
         {
-            ApplyFontFallback();
             InitializeQueue();
             CurrentElementIndex = 0;
 
@@ -40,15 +38,6 @@ namespace QuestPDF.Elements.Text
                 foreach (var item in Items)
                     RenderingQueue.Enqueue(item);
             }
-
-            void ApplyFontFallback()
-            {
-                if (FontFallbackApplied)
-                    return;
-
-                Items = Items.ApplyFontFallback().ToList();
-                FontFallbackApplied = true;
-            }
         }
 
         internal override SpacePlan Measure(Size availableSpace)
@@ -122,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/DecorationExtensions.cs

@@ -12,7 +12,7 @@ namespace QuestPDF.Fluent
         {
             var container = new Container();
             Decoration.Before = container;
-            return container.RepeatContent();
+            return container;
         }
         
         public void Before(Action<IContainer> handler)
@@ -36,7 +36,7 @@ namespace QuestPDF.Fluent
         {
             var container = new Container();
             Decoration.After = container;
-            return container.RepeatContent();
+            return container;
         }
         
         public void After(Action<IContainer> handler)

QuestPDF/Fluent/ElementExtensions.cs

@@ -195,13 +195,5 @@ namespace QuestPDF.Fluent
         {
             return element.Element(new ScaleToFit());
         }
-        
-        public static IContainer RepeatContent(this IContainer element, bool enabled = true)
-        {
-            return element.Element(new RepeatContent
-            {
-                Repeat = enabled
-            });
-        }
     }
 }

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,27 +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;
-            AssignFormatFunction(x => x?.ToString());
+            
         }
 
         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)
         {
@@ -80,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)
         {
@@ -99,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)
@@ -138,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()
@@ -185,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.")]
@@ -209,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.")]
@@ -232,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
@@ -273,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,135 +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 Fallback<T>(this T descriptor, TextStyle? value = null) where T : TextSpanDescriptor
-        {
-            descriptor.TextStyle.Fallback = value;
-            return descriptor;
-        }
-        
-        public static T Fallback<T>(this T descriptor, Func<TextStyle, TextStyle> handler) where T : TextSpanDescriptor
-        {
-            return descriptor.Fallback(handler(TextStyle.Default));
-        }
-        
         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
@@ -147,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

@@ -6,6 +6,14 @@ 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)
         {
@@ -14,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.")]
@@ -30,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.")]
@@ -41,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)
@@ -129,7 +137,6 @@ namespace QuestPDF.Fluent
         #endregion
 
         #region Position
-        
         public static TextStyle NormalPosition(this TextStyle style)
         {
             return style.Position(FontPosition.Normal);
@@ -147,23 +154,11 @@ namespace QuestPDF.Fluent
 
         private static TextStyle Position(this TextStyle style, FontPosition fontPosition)
         {
-            return style.Mutate(TextStyleProperty.FontPosition, fontPosition);
-        }
-        
-        #endregion
+            if (style.FontPosition == fontPosition)
+                return style;
 
-        #region Fallback
-        
-        public static TextStyle Fallback(this TextStyle style, TextStyle? value = null)
-        {
-            return style.Mutate(TextStyleProperty.Fallback, value);
+            return style.Mutate(t => t.FontPosition = fontPosition);
         }
-        
-        public static TextStyle Fallback(this TextStyle style, Func<TextStyle, TextStyle> handler)
-        {
-            return style.Fallback(handler(TextStyle.Default));
-        }
-
         #endregion
     }
 }

QuestPDF/Infrastructure/IContent.cs

@@ -1,7 +0,0 @@
-namespace QuestPDF.Infrastructure
-{
-    internal interface IContent
-    {
-        
-    }
-}

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,9 +19,13 @@ namespace QuestPDF.Infrastructure
         internal bool? HasUnderline { get; set; }
         internal bool? WrapAnywhere { get; set; }
 
-        internal TextStyle? Fallback { 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,
@@ -31,10 +37,59 @@ namespace QuestPDF.Infrastructure
             IsItalic = false,
             HasStrikethrough = false,
             HasUnderline = false,
-            WrapAnywhere = false,
-            Fallback = null
+            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,248 +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,
-        Fallback
-    }
-    
-    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> 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));
-        }
-
-        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 };
-            }
-            
-            if (property == TextStyleProperty.Fallback)
-            {
-                if (!overrideValue && origin.Fallback != null)
-                    return origin;
-
-                var castedValue = (TextStyle?)value;
-                
-                if (origin.Fallback == castedValue)
-                    return origin;
-                
-                return origin with { Fallback = 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);
-            return TextStyleApplyGlobalCache.GetOrAdd(cacheKey, key => ApplyStyle(key.origin, key.parent, overrideStyle: false).ApplyFontFallback());
-        }
-        
-        private static TextStyle ApplyFontFallback(this TextStyle style)
-        {
-            var targetFallbackStyle = style
-                ?.Fallback
-                ?.ApplyStyle(style, overrideStyle: false, applyFallback: false)
-                ?.ApplyFontFallback();
-            
-            return MutateStyle(style, TextStyleProperty.Fallback, targetFallbackStyle);
-        }
-        
-        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);
-            });
-        }
-        
-        private static TextStyle ApplyStyle(this TextStyle style, TextStyle parent, bool overrideStyle = true, bool applyFallback = true)
-        {
-            var result = style;
-
-            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.FontWeight, parent.FontWeight, overrideStyle);
-            result = MutateStyle(result, TextStyleProperty.FontPosition, parent.FontPosition, overrideStyle);
-            result = MutateStyle(result, TextStyleProperty.IsItalic, parent.IsItalic, overrideStyle);
-            result = MutateStyle(result, TextStyleProperty.HasStrikethrough, parent.HasStrikethrough, overrideStyle);
-            result = MutateStyle(result, TextStyleProperty.HasUnderline, parent.HasUnderline, overrideStyle);
-            result = MutateStyle(result, TextStyleProperty.WrapAnywhere, parent.WrapAnywhere, overrideStyle);
-            
-            if (applyFallback)
-                result = MutateStyle(result, TextStyleProperty.Fallback, parent.Fallback, overrideStyle);
-
-            return result;
-        }
-    }
-}

QuestPDF/Previewer/PreviewerService.cs

@@ -19,7 +19,7 @@ namespace QuestPDF.Previewer
         public  event Action? OnPreviewerStopped;
 
         private const int RequiredPreviewerVersionMajor = 2022;
-        private const int RequiredPreviewerVersionMinor = 9;
+        private const int RequiredPreviewerVersionMinor = 8;
         
         public PreviewerService(int port)
         {

QuestPDF/QuestPDF.csproj

@@ -3,7 +3,7 @@
         <Authors>MarcinZiabek</Authors>
         <Company>CodeFlint</Company>
         <PackageId>QuestPDF</PackageId>
-        <Version>2022.9.0</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

@@ -1,6 +1,20 @@
-2022.9.0
-- Implemented font-fallback algorithm,
-- Introduced new Settings API,
-- Significantly reduced memory allocation cost for TextStyle objects,
-- Implemented optional checking if all font glyphs are available,
-- Minor text-rendering optimizations.
+2022.8.0:
+
+- Improved library performance,
+- Breaking change: changed default font from Calibri to an open-source Lato,
+- Default font files are included with the nuget package, making it safe to deploy on any environment,
+- Default font files are significantly smaller, so output document files should be smaller too (up to 20x reduction in size),
+- When requested font is not available on the runtime environment, library provides list of available fonts,
+- Fixed a rare layout overflow exception with the Inlined element,
+- Fixed a memory leak connected to the HarfBuzz library.
+
+
+2022.8.1:
+- Fixed: default text style does not always work
+- Fixed: page breaking rendering does not work in very specific corner cases
+- Stability improvements for text wrapping
+- Updated stability of rendering elements in negative space
+- Optimization for the Column element: do not measure child when available height is negative
+
+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 length 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 CheckIfAllTextGlyphsAreAvailable { get; set; } = System.Diagnostics.Debugger.IsAttached;
-    }
-}

readme.md

@@ -23,8 +23,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/190931857-8ca52ec8-cc7d-4d12-9467-4442b3342fa1.png" width="700" />
-
+<img src="https://user-images.githubusercontent.com/9263853/184642026-27dd7567-a46a-45d4-9594-e6a70a7193e9.png" width="700" />
 
 ## Please share with the community