Implemented text shaping prototype

QuestPDF.Examples/BarcodeExamples.cs

@@ -13,7 +13,7 @@ namespace QuestPDF.Examples
         [Test]
         public void Example()
         {
-            FontManager.RegisterFont(File.OpenRead("LibreBarcode39-Regular.ttf"));
+            FontManager.RegisterFontType(File.OpenRead("LibreBarcode39-Regular.ttf"));
             
             RenderingTest
                 .Create()
@@ -25,9 +25,7 @@ namespace QuestPDF.Examples
                         .Background(Colors.White)
                         .AlignCenter()
                         .AlignMiddle()
-                        .Text("*QuestPDF*")
-                        .FontFamily("Libre Barcode 39")
-                        .FontSize(64);
+                        .Text("*QuestPDF*", TextStyle.Default.FontType("Libre Barcode 39").Size(64));
                 });
         }
     }

QuestPDF.Examples/CanvasExamples.cs

@@ -49,10 +49,7 @@ namespace QuestPDF.Examples
                                 .PrimaryLayer()
                                 .PaddingVertical(10)
                                 .PaddingHorizontal(20)
-                                .Text("Sample text")
-                                .FontSize(16)
-                                .FontColor(Colors.Blue.Darken2)
-                                .SemiBold();
+                                .Text("Sample text", TextStyle.Default.Size(16).Color(Colors.Blue.Darken2).SemiBold());
                         });
                 });
         }

QuestPDF.Examples/ChartExamples.cs

@@ -57,10 +57,7 @@ namespace QuestPDF.Examples
                             column
                                 .Item()
                                 .PaddingBottom(10)
-                                .Text("Chart example")
-                                .FontSize(20)
-                                .SemiBold()
-                                .FontColor(Colors.Blue.Medium);
+                                .Text("Chart example", TextStyle.Default.Size(20).SemiBold().Color(Colors.Blue.Medium));
                             
                             column
                                 .Item()

QuestPDF.Examples/ContinousPage.cs

@@ -25,7 +25,7 @@ namespace QuestPDF.Examples
                 page.Content().PaddingVertical(10).Border(1).Padding(10).Column(column =>
                 {
                     foreach (var index in Enumerable.Range(1, 100))
-                        column.Item().Text($"Line {index}").FontColor(Placeholders.Color());
+                        column.Item().Text($"Line {index}", TextStyle.Default.Color(Placeholders.Color()));
                 });
                 
                 page.Footer().Text("Footer");

QuestPDF.Examples/DefaultTextStyleExample.cs

@@ -38,7 +38,7 @@ namespace QuestPDF.Examples
                                 text.Line(Placeholders.Sentence());
                             
                                 // this text has size 20 but also semibold and red
-                                text.Span(Placeholders.Sentence()).FontColor(Colors.Red.Medium);
+                                text.Span(Placeholders.Sentence(), TextStyle.Default.Color(Colors.Red.Medium));
                             });
                         });
                     });

QuestPDF.Examples/DefaultTextStyleExamples.cs

@@ -26,8 +26,8 @@ namespace QuestPDF.Examples
                         .DefaultTextStyle(TextStyle.Default.Bold().Underline())
                         .Column(column =>
                         { 
-                            column.Item().Text("Default style applies to all children");
-                            column.Item().Text("You can override certain styles").Underline(false).FontColor(Colors.Green.Darken2);
+                            column.Item().Text("Default style applies to all children", TextStyle.Default);
+                            column.Item().Text("You can override certain styles", TextStyle.Default.Underline(false).Color(Colors.Green.Darken2));
                             
                             column.Item().PaddingTop(10).Border(1).Grid(grid =>
                             {
@@ -43,8 +43,7 @@ namespace QuestPDF.Examples
                                         .Height(50)
                                         .AlignCenter()
                                         .AlignMiddle()
-                                        .Text(i)
-                                        .FontSize(16 + i / 4);   
+                                        .Text(i, TextStyle.Default.Size(16 + i / 4));   
                                 }
                             });
                         });

QuestPDF.Examples/ElementExamples.cs

@@ -43,9 +43,7 @@ namespace QuestPDF.Examples
                                 .Before()
                                 .Background(Colors.Grey.Medium)
                                 .Padding(10)
-                                .Text("Notes")
-                                .FontSize(16)
-                                .FontColor("#FFF");
+                                .Text("Notes", TextStyle.Default.Size(16).Color("#FFF"));
                     
                             decoration
                                 .Content()
@@ -282,15 +280,12 @@ namespace QuestPDF.Examples
                                 .Layer()
                                 .AlignCenter()
                                 .AlignMiddle()
-                                .Text("Watermark")
-                                .FontSize(48)
-                                .Bold()
-                                .FontColor(Colors.Green.Lighten3);
+                                .Text("Watermark", TextStyle.Default.Size(48).Bold().Color(Colors.Green.Lighten3));
 
                             layers
                                 .Layer()
                                 .AlignBottom()
-                                .Text(text => text.CurrentPageNumber().FontSize(16).FontColor(Colors.Green.Medium));
+                                .Text(text => text.CurrentPageNumber(TextStyle.Default.Size(16).Color(Colors.Green.Medium)));
                         });
                 });
         }
@@ -421,9 +416,7 @@ namespace QuestPDF.Examples
                                     .Border(1)
                                     .BorderColor(Colors.Grey.Medium)
                                     .Padding(10)
-                                    .Text(font)
-                                    .FontFamily(font)
-                                    .FontSize(16);
+                                    .Text(font, TextStyle.Default.FontType(font).Size(16));
                             }
                         });
                 });
@@ -463,7 +456,7 @@ namespace QuestPDF.Examples
                             });
                     
                             layers.Layer().Background("#8F00").Extend();
-                            layers.Layer().PaddingTop(40).Text("It works!").FontSize(24);
+                            layers.Layer().PaddingTop(40).Text("It works!", TextStyle.Default.Size(24));
                         });
                 });
         }
@@ -484,7 +477,7 @@ namespace QuestPDF.Examples
                         //.MinimalBox()
                         .Background(Colors.Grey.Lighten2)
                         .Padding(15)
-                        .Text("Test of the \n box element").FontSize(20);
+                        .Text("Test of the \n box element", TextStyle.Default.Size(20));
                 });
         }
 
@@ -510,8 +503,7 @@ namespace QuestPDF.Examples
                             decoration
                                 .Before()
                                 .PaddingBottom(10)
-                                .Text("Example: scale component")
-                                .Style(headerFontStyle);
+                                .Text("Example: scale component", headerFontStyle);
     
                             decoration
                                 .Content()
@@ -533,8 +525,7 @@ namespace QuestPDF.Examples
                                             .Background(fontColor)
                                             .Scale(scale)
                                             .Padding(5)
-                                            .Text($"Content with {scale} scale.")
-                                            .Style(fontStyle);
+                                            .Text($"Content with {scale} scale.", fontStyle);
                                     }
                                 });
                         });
@@ -564,8 +555,7 @@ namespace QuestPDF.Examples
                         .BorderColor(Colors.Green.Darken1)
                         
                         .Padding(50)
-                        .Text("Moved text")
-                        .FontSize(25);
+                        .Text("Moved text", TextStyle.Default.Size(25));
                 });
         }
 
@@ -601,8 +591,7 @@ namespace QuestPDF.Examples
                                     .MinimalBox()
                                     .Background(Colors.White)
                                     .Padding(10)
-                                    .Text($"Rotated {turns * 90}°")
-                                    .FontSize(16);
+                                    .Text($"Rotated {turns * 90}°", TextStyle.Default.Size(16));
                             }
                         });
                 });
@@ -700,8 +689,7 @@ namespace QuestPDF.Examples
                                     .MinimalBox()
                                     .Background(Colors.White)
                                     .Padding(10)
-                                    .Text($"Flipped {turns}")
-                                    .FontSize(16);
+                                    .Text($"Flipped {turns}", TextStyle.Default.Size(16));
                             }
                         });
                 });

QuestPDF.Examples/EnsureSpaceExample.cs

@@ -23,7 +23,7 @@ namespace QuestPDF.Examples
                         page.Size(PageSizes.A7.Landscape());
                         page.Background(Colors.White);
                         
-                        page.Header().Text("With ensure space").SemiBold();
+                        page.Header().Text("With ensure space", TextStyle.Default.SemiBold());
                         
                         page.Content().Column(column =>
                         {

QuestPDF.Examples/FrameExample.cs

@@ -17,9 +17,9 @@ namespace QuestPDF.Examples
                 .Padding(5);
         }
         
-        public static void LabelCell(this IContainer container, string text) => container.Cell(true).Text(text).SemiBold();
+        public static void LabelCell(this IContainer container, string text) => container.Cell(true).Text(text, TextStyle.Default.SemiBold());
         public static IContainer ValueCell(this IContainer container) => container.Cell(false);
-        public static void ValueCell(this IContainer container, string text) => container.ValueCell().Text(text);
+        public static void ValueCell(this IContainer container, string text) => container.ValueCell().Text(text, TextStyle.Default);
     }
     
     public class FrameExample

QuestPDF.Examples/InlinedExamples.cs

@@ -74,8 +74,7 @@ namespace QuestPDF.Examples
                                                     .PrimaryLayer()
                                                     .AlignCenter()
                                                     .AlignMiddle()
-                                                    .Text(sizeText)
-                                                    .FontSize(15);
+                                                    .Text(sizeText, TextStyle.Default.Size(15));
                                             });
                                     }
                                 });

QuestPDF.Examples/MinimalApiExamples.cs

@@ -4,6 +4,8 @@ using QuestPDF.Examples.Engine;
 using QuestPDF.Fluent;
 using QuestPDF.Helpers;
 using QuestPDF.Infrastructure;
+using ShimSkiaSharp;
+using SKTypeface = SkiaSharp.SKTypeface;
 
 namespace QuestPDF.Examples
 {
@@ -17,79 +19,26 @@ namespace QuestPDF.Examples
                 {
                     container.Page(page =>
                     {
-                        page.Size(PageSizes.A4);
-                        page.Margin(2, Unit.Centimetre);
-                        page.Background(Colors.White);
-                        page.DefaultTextStyle(TextStyle.Default.Size(20));
+                        page.Size(PageSizes.A5);
+                        page.Margin(1.5f, Unit.Centimetre);
                         
                         page.Header()
-                            .Text("Hello PDF!").SemiBold().FontSize(36).FontColor(Colors.Blue.Medium);
+                            .Text("Hello PDF!", TextStyle.Default.SemiBold().Size(20));
                         
                         page.Content()
                             .PaddingVertical(1, Unit.Centimetre)
                             .Column(x =>
                             {
-                                x.Spacing(20);
+                                x.Spacing(10);
                                 
                                 x.Item().Text(Placeholders.LoremIpsum());
                                 x.Item().Image(Placeholders.Image(200, 100));
                             });
-                        
-                        page.Footer()
-                            .AlignCenter()
-                            .Text(x =>
-                            {
-                                x.Span("Page ");
-                                x.CurrentPageNumber();
-                            });
                     });
                 })
                 .GeneratePdf("hello.pdf");
 
             Process.Start("explorer.exe", "hello.pdf");
         }
-        
-        [Test]
-        public void MinimalApi2()
-        {
-            RenderingTest
-                .Create()
-                .ProduceImages()
-                .ShowResults()
-                .RenderDocument(container =>
-                {
-                    container.Page(page =>
-                    {
-                        page.Size(PageSizes.A4);
-                        page.Margin(2, Unit.Centimetre);
-                        page.Background(Colors.White);
-                        page.DefaultTextStyle(TextStyle.Default.Size(20));
-                        
-                        page.Header()
-                            .Text("Hello PDF!")
-                            .SemiBold()
-                            .FontSize(36)
-                            .FontColor(Colors.Blue.Medium);
-                        
-                        page.Content()
-                            .PaddingVertical(1, Unit.Centimetre)
-                            .Column(x =>
-                            {
-                                x.Spacing(20);
-                                
-                                x.Item().Text(Placeholders.LoremIpsum());
-                                x.Item().Image(Placeholders.Image(200, 100));
-                            });
-                        
-                        page.Footer()
-                            .AlignCenter()
-                            .Text(x =>
-                            {
-                                x.Span("Page ");
-                                x.CurrentPageNumber();
-                            });
-                    });
-                });
-        }
     }
 }

QuestPDF.Examples/Padding.cs

@@ -50,8 +50,7 @@ namespace QuestPDF.Examples
                         .Background("FFF")
                         .Padding(5)
                         .AlignCenter()
-                        .Text("Sample text")
-                        .FontFamily("Segoe UI emoji");
+                        .Text("Sample text", TextStyle.Default.FontType("Segoe UI emoji"));
                 });
         }
         

QuestPDF.Examples/PageBackgroundForeground.cs

@@ -1,49 +0,0 @@
-using System;
-using System.Linq;
-using NUnit.Framework;
-using QuestPDF.Examples.Engine;
-using QuestPDF.Fluent;
-using QuestPDF.Helpers;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Examples
-{
-    public class PageBackgroundForeground
-    {
-        [Test]
-        public void Test()
-        {
-            RenderingTest
-                .Create()
-                .PageSize(550, 400)
-                .ProducePdf()
-                .ShowResults()
-                .RenderDocument(document =>
-                {
-                    document.Page(page =>
-                    {
-                        page.Size(PageSizes.A4);
-                        page.Margin(1, Unit.Inch);
-                        page.DefaultTextStyle(TextStyle.Default.FontSize(16));
-
-                        page.Foreground()
-                            .AlignMiddle()
-                            .AlignCenter()
-                            .Text("Watermark")
-                            .FontSize(64)
-                            .FontColor(Colors.Blue.Lighten3);
-                        
-                        page.Header().Text("Background and foreground").Bold().FontColor(Colors.Blue.Medium).FontSize(24);
-                        
-                        page.Content().PaddingVertical(25).Column(column =>
-                        {
-                            column.Spacing(25);
-
-                            foreach (var i in Enumerable.Range(0, 100))
-                                column.Item().Background(Colors.Grey.Lighten2).Height(75);
-                        });
-                    });
-                });
-        }
-    }
-}

QuestPDF.Examples/ShowOnceExample.cs

@@ -23,7 +23,7 @@ namespace QuestPDF.Examples
                         page.Size(PageSizes.A7.Landscape());
                         page.Background(Colors.White);
 
-                        page.Header().Text("With show once").SemiBold();
+                        page.Header().Text("With show once", TextStyle.Default.SemiBold());
                         
                         page.Content().PaddingVertical(5).Row(row =>
                         {

QuestPDF.Examples/SkipOnceExample.cs

@@ -31,8 +31,7 @@ namespace QuestPDF.Examples
                         
                         page.Content()
                             .PaddingVertical(10)
-                            .Text(Placeholders.Paragraphs())
-                            .FontColor(Colors.Grey.Medium);
+                            .Text(Placeholders.Paragraphs(), TextStyle.Default.Color(Colors.Grey.Medium));
                         
                         page.Footer().Text(text =>
                         {

QuestPDF.Examples/TextBenchmark.cs

@@ -141,8 +141,8 @@ namespace QuestPDF.Examples
                     .AlignBottom()
                     .Column(column =>
                     {
-                        column.Item().Text("Quo Vadis").FontSize(72).Bold().FontColor(Colors.Blue.Darken2);
-                        column.Item().Text("Henryk Sienkiewicz").FontSize(24).FontColor(Colors.Grey.Darken2);
+                        column.Item().Text("Quo Vadis", TextStyle.Default.Size(72).Bold().Color(Colors.Blue.Darken2));
+                        column.Item().Text("Henryk Sienkiewicz", TextStyle.Default.Size(24).Color(Colors.Grey.Darken2));
                     });
             }
 
@@ -156,8 +156,8 @@ namespace QuestPDF.Examples
                     {
                         column.Item().InternalLink(chapter.Title).Row(row =>
                         {
-                            row.RelativeItem().Text(chapter.Title).Style(normalStyle);
-                            row.ConstantItem(100).AlignRight().Text(text => text.BeginPageNumberOfSection(chapter.Title).Style(normalStyle));
+                            row.RelativeItem().Text(chapter.Title, normalStyle);
+                            row.ConstantItem(100).AlignRight().Text(text => text.PageNumberOfLocation(chapter.Title, normalStyle));
                         });
                     }
                 });
@@ -180,7 +180,7 @@ namespace QuestPDF.Examples
                     column.Item().Text(text =>
                     {
                         text.ParagraphSpacing(5);
-                        text.Span(content).Style(normalStyle);
+                        text.Span(content, normalStyle);
                     });
                     
                     column.Item().PageBreak();
@@ -198,7 +198,7 @@ namespace QuestPDF.Examples
                         text.DefaultTextStyle(normalStyle);
                         
                         text.Span("Ten dokument został wygenerowany na podstawie książki w formacie TXT opublikowanej w serwisie ");
-                        text.Hyperlink("wolnelektury.pl", "https://wolnelektury.pl/").FontColor(Colors.Blue.Medium).Underline();
+                        text.ExternalLocation("wolnelektury.pl", "https://wolnelektury.pl/", normalStyle.Color(Colors.Blue.Medium).Underline());
                         text.Span(". Dziękuję za wspieranie polskiego czytelnictwa!");
                     });
                 });
@@ -206,7 +206,7 @@ namespace QuestPDF.Examples
 
             void SectionTitle(ColumnDescriptor column, string text)
             {
-                column.Item().Location(text).Text(text).Style(subtitleStyle);
+                column.Item().Location(text).Text(text, subtitleStyle);
                 column.Item().PaddingTop(10).PaddingBottom(50).BorderBottom(1).BorderColor(Colors.Grey.Lighten2).ExtendHorizontal();
             }
             

QuestPDF.Examples/TextExamples.cs

@@ -31,7 +31,7 @@ namespace QuestPDF.Examples
                         {
                             text.DefaultTextStyle(TextStyle.Default.Size(20));
                             text.Span("This is a normal text, followed by an ");
-                            text.Span("underlined red text.").FontSize(20).FontColor(Colors.Red.Medium).Underline();
+                            text.Span("underlined red text.", TextStyle.Default.Size(20).Color(Colors.Red.Medium).Underline());
                         });
                 });
         }
@@ -57,7 +57,7 @@ namespace QuestPDF.Examples
     
                             foreach (var i in Enumerable.Range(1, 3))
                             {
-                                text.Span($"Paragraph {i}: ").SemiBold();
+                                text.Span($"Paragraph {i}: ", TextStyle.Default.SemiBold());
                                 text.Line(Placeholders.Paragraph());
                             }
                         });
@@ -120,7 +120,7 @@ namespace QuestPDF.Examples
 
                             text.Line(Placeholders.LoremIpsum());
 
-                            text.Span($"This is target text that should show up. {DateTime.UtcNow:T} > This is a short sentence that will be wrapped into second line hopefully, right? <").Underline();
+                            text.Span($"This is target text that should show up. {DateTime.UtcNow:T} > This is a short sentence that will be wrapped into second line hopefully, right? <", TextStyle.Default.Underline());
                         });
                 });
         }
@@ -173,8 +173,6 @@ namespace QuestPDF.Examples
                         .Padding(10)
                         .Text(text =>
                         {
-                            text.DefaultTextStyle(x => x.Bold());
-                            
                             text.DefaultTextStyle(TextStyle.Default);
                             text.AlignLeft();
                             text.ParagraphSpacing(10);
@@ -184,9 +182,9 @@ namespace QuestPDF.Examples
                             text.EmptyLine();
 
                             text.Span("This text is a normal text, ");
-                            text.Span("this is a bold text, ").Bold();
-                            text.Span("this is a red and underlined text, ").FontColor(Colors.Red.Medium).Underline();
-                            text.Span("and this is slightly bigger text.").FontSize(16);
+                            text.Span("this is a bold text, ", TextStyle.Default.Bold());
+                            text.Span("this is a red and underlined text, ", TextStyle.Default.Color(Colors.Red.Medium).Underline());
+                            text.Span("and this is slightly bigger text.", TextStyle.Default.Size(16));
 
                             text.EmptyLine();
 
@@ -212,7 +210,7 @@ namespace QuestPDF.Examples
                             
                             text.EmptyLine();
 
-                            text.Span(Placeholders.Paragraphs()).Italic();
+                            text.Span(Placeholders.Paragraphs(), TextStyle.Default.Italic());
                             
                             text.Line("This is target text that does not show up. " + Placeholders.Paragraph());
                         });
@@ -238,14 +236,14 @@ namespace QuestPDF.Examples
                         .Padding(10)
                         .Text(text =>
                         {
-                            text.DefaultTextStyle(TextStyle.Default);
+                            text.DefaultTextStyle(TextStyle.Default.BackgroundColor(Colors.Grey.Lighten3));
                             text.AlignLeft();
                             text.ParagraphSpacing(10);
 
                             text.Span("This text is a normal text, ");
-                            text.Span("this is a bold text, ").Bold();
-                            text.Span("this is a red and underlined text, ").FontColor(Colors.Red.Medium).Underline();
-                            text.Span("and this is slightly bigger text.").FontSize(16);
+                            text.Span("this is a bold text, ", TextStyle.Default.Bold());
+                            text.Span("this is a red and underlined text, ", TextStyle.Default.Color(Colors.Red.Medium).Underline());
+                            text.Span("and this is slightly bigger text.", TextStyle.Default.Size(16));
                             
                             text.Span("The new text element also supports injecting custom content between words: ");
                             text.Element().PaddingBottom(-10).Height(16).Width(32).Image(Placeholders.Image);
@@ -253,7 +251,7 @@ namespace QuestPDF.Examples
                             
                             text.EmptyLine();
                             
-                            foreach (var i in Enumerable.Range(1, 100))
+                            foreach (var i in Enumerable.Range(1, 1000))
                             {
                                 text.Line($"{i}: {Placeholders.Paragraph()}");
 

QuestPDF.Examples/TextShapingTests.cs

@@ -0,0 +1,161 @@
+using System;
+using System.Linq;
+using System.Text.RegularExpressions;
+using NUnit.Framework;
+using QuestPDF.Drawing;
+using QuestPDF.Examples.Engine;
+using QuestPDF.Fluent;
+using QuestPDF.Helpers;
+using QuestPDF.Infrastructure;
+using SkiaSharp;
+using SkiaSharp.HarfBuzz;
+
+namespace QuestPDF.Examples
+{
+    public class TextShapingTests
+    {
+        [Test]
+        public void ShapeText()
+        {
+            using var textPaint = new SKPaint
+            {
+                Color = SKColors.Black,
+                Typeface = SKTypeface.CreateDefault(),
+                IsAntialias = true,
+                TextSize = 20
+            };
+            
+            using var backgroundPaint = new SKPaint
+            {
+                Color = SKColors.LightGray
+            };
+            
+            RenderingTest
+                .Create()
+                .PageSize(550, 250)
+                .ProduceImages()
+                .ShowResults()
+                .Render(container =>
+                {
+                    //var lorem = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec odio ipsum, aliquam a neque a, lacinia vehicula lectus.";
+                    //var arabic = "ينا الألم. في بعض الأحيان ونظراً للالتزامات التي يفرضها علينا الواجب والعمل سنتنازل غالباً ونرفض الشعور";
+                    
+                    var lorem = "Lorem ipsum dolor sit amet, consectetur adipiscing elit.";
+                    var arabic = "ينا الألم. في بعض الأحيان ونظراً للالتزامات التي يفرضها علينا";
+                    
+                    var text = arabic;
+                    var metrics = textPaint.FontMetrics;
+                    
+                    container
+                        .Padding(25)
+                        .Canvas((canvas, space) =>
+                        {
+                            canvas.Translate(0, 20);
+                            
+                            var width = MeasureText(text, textPaint);
+                            var widthReal = textPaint.MeasureText(text);
+                            canvas.DrawRect(0, metrics.Descent, width, metrics.Ascent - metrics.Descent, backgroundPaint);
+                            
+                            canvas.DrawShapedText(text, 0, 0, textPaint);
+                            
+                            canvas.Translate(0, 40);
+                            canvas.DrawText(text, 0, 0, textPaint);
+                        });
+                });
+        }
+        
+        float MeasureText(string text, SKPaint paint)
+        {
+            var font = paint.ToFont();
+            using var shaper = new SKShaper(paint.Typeface);
+            var result = shaper.Shape(text + " ", paint);
+            return Math.Max(result.Points.First().X, result.Points.Last().X);
+
+            var glyphCount = result.Codepoints.Length;
+            var glyphIds = new ushort[glyphCount];
+            var glyphWidths = new float[glyphCount];
+            var glyphBounds = new SKRect[glyphCount];
+            
+            font.GetGlyphs(result.Codepoints.Select(x => (int)x).ToArray(), glyphIds);
+            font.GetGlyphWidths(glyphIds, glyphWidths, glyphBounds);
+
+            return glyphWidths.Sum();
+            
+            return result.Points.Max(p => p.X);
+
+            using var skTextBlobBuilder = new SKTextBlobBuilder();
+
+            var positionedRunBuffer = skTextBlobBuilder.AllocatePositionedRun(font, result.Codepoints.Length);
+            var glyphSpan = positionedRunBuffer.GetGlyphSpan();
+            var positionSpan = positionedRunBuffer.GetPositionSpan();
+            
+            for (int index = 0; index < result.Codepoints.Length; ++index)
+            {
+                glyphSpan[index] = (ushort) result.Codepoints[index];
+                positionSpan[index] = result.Points[index];
+            }
+
+            using var text1 = skTextBlobBuilder.Build();
+            return text1.Bounds.Width;
+        }
+        
+        [Test]
+        public void ShapeSingle()
+        {
+            using var textPaint = new SKPaint
+            {
+                Color = SKColors.Black,
+                Typeface = SKTypeface.CreateDefault(),
+                IsAntialias = true,
+                TextSize = 20
+            };
+
+            var text = string.Join(" ", Enumerable.Range(0, 10_000).Select(x => Placeholders.Sentence()));
+            
+            using var shaper = new SKShaper(textPaint.Typeface);
+            var result = shaper.Shape(text + " ", textPaint);
+        }
+        
+        [Test]
+        public void ShapeMany()
+        {
+            using var textPaint = new SKPaint
+            {
+                Color = SKColors.Black,
+                Typeface = SKTypeface.CreateDefault(),
+                IsAntialias = true,
+                TextSize = 20
+            };
+
+            var text = string.Join(" ", Enumerable.Range(0, 1_000).Select(x => Placeholders.Sentence()));
+            
+            foreach (var part in Regex.Split(text, "( )|(\\w+)"))
+            {
+                using var shaper = new SKShaper(textPaint.Typeface);
+                var result = shaper.Shape(part + " ", textPaint);
+            }
+        }
+        
+        [Test]
+        public void ShapeMany2()
+        {
+            using var textPaint = new SKPaint
+            {
+                Color = SKColors.Black,
+                Typeface = SKTypeface.CreateDefault(),
+                IsAntialias = true,
+                TextSize = 20
+            };
+
+            using var shaper = new SKShaper(textPaint.Typeface);
+            
+            foreach (var i in Enumerable.Range(0, 10_000))
+            {
+                var text = Placeholders.Paragraph();
+
+                textPaint.MeasureText(text);
+                var result = shaper.Shape(text + " ", textPaint);
+            }
+        }
+    }
+}

QuestPDF.ReportSample/Layouts/DifferentHeadersTemplate.cs

@@ -30,12 +30,12 @@ namespace QuestPDF.ReportSample.Layouts
             {
                 column.Item().ShowOnce().Padding(5).AlignMiddle().Row(row =>
                 {
-                    row.RelativeItem(2).AlignMiddle().Text("PRIMARY HEADER").FontColor(Colors.Grey.Darken3).FontSize(30).Bold();
+                    row.RelativeItem(2).AlignMiddle().Text("PRIMARY HEADER", TextStyle.Default.Color(Colors.Grey.Darken3).Size(30).Bold());
                     row.RelativeItem(1).AlignRight().MinimalBox().AlignMiddle().Background(Colors.Blue.Darken2).Padding(30);
                 });
                 column.Item().SkipOnce().Padding(5).Row(row =>
                 {
-                    row.RelativeItem(2).Text("SECONDARY HEADER").FontColor(Colors.Grey.Darken3).FontSize(30).Bold();
+                    row.RelativeItem(2).Text("SECONDARY HEADER", TextStyle.Default.Color(Colors.Grey.Darken3).Size(30).Bold());
                     row.RelativeItem(1).AlignRight().MinimalBox().Background(Colors.Blue.Lighten4).Padding(15);
                 });
             });

QuestPDF.ReportSample/Layouts/SectionTemplate.cs

@@ -23,8 +23,7 @@ namespace QuestPDF.ReportSample.Layouts
                     decoration
                         .Before()
                         .PaddingBottom(5)
-                        .Text(Model.Title)
-                        .Style(Typography.Headline);
+                        .Text(Model.Title, Typography.Headline);
 
                     decoration.Content().Border(0.75f).BorderColor(Colors.Grey.Medium).Column(column =>
                     {
@@ -70,7 +69,7 @@ namespace QuestPDF.ReportSample.Layouts
         {
             if (model.PhotoCount == 0)
             {
-                container.Text("No photos").Style(Typography.Normal);
+                container.Text("No photos", Typography.Normal);
                 return;
             }
 

QuestPDF.ReportSample/Layouts/StandardReport.cs

@@ -39,9 +39,9 @@ namespace QuestPDF.ReportSample.Layouts
                     
                     page.Footer().AlignCenter().Text(text =>
                     {
-                        text.CurrentPageNumber().Format(x => x?.FormatAsRomanNumeral() ?? "-----");
+                        text.CurrentPageNumber(format: x => x?.FormatAsRomanNumeral() ?? "-----");
                         text.Span(" / ");
-                        text.TotalPages().Format(x => x?.FormatAsRomanNumeral() ?? "-----");
+                        text.TotalPages(format: x => x?.FormatAsRomanNumeral() ?? "-----");
                     });
                 });
         }
@@ -54,7 +54,7 @@ namespace QuestPDF.ReportSample.Layouts
                 {
                     row.Spacing(50);
                     
-                    row.RelativeItem().PaddingTop(-10).Text(Model.Title).Style(Typography.Title);
+                    row.RelativeItem().PaddingTop(-10).Text(Model.Title, Typography.Title);
                     row.ConstantItem(90).ExternalLink("https://www.questpdf.com").MaxHeight(30).Component<ImagePlaceholder>();
                 });
 
@@ -69,7 +69,7 @@ namespace QuestPDF.ReportSample.Layouts
                     {
                         grid.Item().Text(text =>
                         {
-                            text.Span($"{field.Label}: ").SemiBold();
+                            text.Span($"{field.Label}: ", TextStyle.Default.SemiBold());
                             text.Span(field.Value);
                         });
                     }

QuestPDF.ReportSample/Layouts/TableOfContentsTemplate.cs

@@ -23,8 +23,7 @@ namespace QuestPDF.ReportSample.Layouts
                     decoration
                         .Before()
                         .PaddingBottom(5)
-                        .Text("Table of contents")
-                        .Style(Typography.Headline);
+                        .Text("Table of contents", Typography.Headline);
 
                     decoration.Content().Column(column =>
                     {
@@ -54,9 +53,9 @@ namespace QuestPDF.ReportSample.Layouts
 
                         var lengthStyle = TextStyle.Default.Color(Colors.Grey.Medium);
                         
-                        text.Span(" (").Style(lengthStyle);
-                        text.TotalPagesWithinSection(locationName).Style(lengthStyle).Format(x => x == 1 ? "1 page long" : $"{x} pages long");
-                        text.Span(")").Style(lengthStyle);
+                        text.Span(" (", lengthStyle);
+                        text.TotalPagesWithinSection(locationName, lengthStyle, x => x == 1 ? "1 page long" : $"{x} pages long");
+                        text.Span(")", lengthStyle);
                     });
                 });
         }

QuestPDF.UnitTests/TestEngine/MockCanvas.cs

@@ -19,6 +19,7 @@ namespace QuestPDF.UnitTests.TestEngine
 
         public void DrawRectangle(Position vector, Size size, string color) => DrawRectFunc(vector, size, color);
         public void DrawText(string text, Position position, TextStyle style) => DrawTextFunc(text, position, style);
+        public void DrawShapedText(string text, Position position, TextStyle style) => DrawTextFunc(text, position, style);
         public void DrawImage(SKImage image, Position position, Size size) => DrawImageFunc(image, position, size);
 
         public void DrawHyperlink(string url, Size size) => throw new NotImplementedException();

QuestPDF.UnitTests/TestEngine/OperationRecordingCanvas.cs

@@ -16,6 +16,7 @@ namespace QuestPDF.UnitTests.TestEngine
 
         public void DrawRectangle(Position vector, Size size, string color) => Operations.Add(new CanvasDrawRectangleOperation(vector, size, color));
         public void DrawText(string text, Position position, TextStyle style) => Operations.Add(new CanvasDrawTextOperation(text, position, style));
+        public void DrawShapedText(string text, Position position, TextStyle style) => Operations.Add(new CanvasDrawTextOperation(text, position, style));
         public void DrawImage(SKImage image, Position position, Size size) => Operations.Add(new CanvasDrawImageOperation(position, size));
         
         public void DrawHyperlink(string url, Size size) => throw new NotImplementedException();

QuestPDF.UnitTests/TestEngine/TestPlan.cs

@@ -92,7 +92,7 @@ namespace QuestPDF.UnitTests.TestEngine
                     Assert.AreEqual(expected.Position.Y, position.Y, "Draw text: Y");
                     
                     Assert.AreEqual(expected.Style.Color, style.Color, "Draw text: color");
-                    Assert.AreEqual(expected.Style.FontFamily, style.FontFamily, "Draw text: font");
+                    Assert.AreEqual(expected.Style.FontType, style.FontType, "Draw text: font");
                     Assert.AreEqual(expected.Style.Size, style.Size, "Draw text: size");
                 },
                 DrawImageFunc = (image, position, size) =>

QuestPDF/Drawing/FontManager.cs

@@ -4,6 +4,7 @@ using System.IO;
 using System.Linq;
 using QuestPDF.Infrastructure;
 using SkiaSharp;
+using SkiaSharp.HarfBuzz;
 
 namespace QuestPDF.Drawing
 {
@@ -12,6 +13,8 @@ namespace QuestPDF.Drawing
         private static ConcurrentDictionary<string, FontStyleSet> StyleSets = new();
         private static ConcurrentDictionary<object, SKFontMetrics> FontMetrics = new();
         private static ConcurrentDictionary<object, SKPaint> Paints = new();
+        private static ConcurrentDictionary<object, SKFont> Fonts = new();
+        private static ConcurrentDictionary<object, SKShaper> Shapers = new();
         private static ConcurrentDictionary<string, SKPaint> ColorPaint = new();
 
         private static void RegisterFontType(SKData fontData, string? customName = null)
@@ -30,7 +33,7 @@ namespace QuestPDF.Drawing
             }
         }
 
-        [Obsolete("Since version 2022.3, the FontManager class offers better font type matching support. Please use the RegisterFont(Stream stream) method.")]
+        [Obsolete("Since version 2022.3, the FontManager class offers better font type matching support. Please use the RegisterFontType(Stream stream) overload.")]
         public static void RegisterFontType(string fontName, Stream stream)
         {
             using var fontData = SKData.Create(stream);
@@ -38,7 +41,7 @@ namespace QuestPDF.Drawing
             RegisterFontType(fontData, customName: fontName);
         }
 
-        public static void RegisterFont(Stream stream)
+        public static void RegisterFontType(Stream stream)
         {
             using var fontData = SKData.Create(stream);
             RegisterFontType(fontData);
@@ -78,25 +81,35 @@ namespace QuestPDF.Drawing
 
                 var fontStyle = new SKFontStyle(weight, SKFontStyleWidth.Normal, slant);
 
-                if (StyleSets.TryGetValue(style.FontFamily, out var fontStyleSet))
+                if (StyleSets.TryGetValue(style.FontType, out var fontStyleSet))
                     return fontStyleSet.Match(fontStyle);
 
-                var fontFromDefaultSource = SKFontManager.Default.MatchFamily(style.FontFamily, fontStyle);
+                var fontFromDefaultSource = SKFontManager.Default.MatchFamily(style.FontType, fontStyle);
                 
                 if (fontFromDefaultSource != null)
                     return fontFromDefaultSource;
                 
                 throw new ArgumentException(
-                    $"The typeface '{style.FontFamily}' could not be found. " +
+                    $"The typeface '{style.FontType}' could not be found. " +
                     $"Please consider the following options: " +
                     $"1) install the font on your operating system or execution environment. " +
                     $"2) load a font file specifically for QuestPDF usage via the QuestPDF.Drawing.FontManager.RegisterFontType(Stream fileContentStream) static method.");
             }
         }
 
+        internal static SKFont ToFont(this TextStyle style)
+        {
+            return Fonts.GetOrAdd(style.FontMetricsKey, _ => style.ToPaint().Typeface.ToFont());
+        }
+
         internal static SKFontMetrics ToFontMetrics(this TextStyle style)
         {
             return FontMetrics.GetOrAdd(style.FontMetricsKey, key => style.ToPaint().FontMetrics);
         }
+        
+        internal static SKShaper ToShaper(this TextStyle style)
+        {
+            return Shapers.GetOrAdd(style.FontMetricsKey, _ => new SKShaper(style.ToFont().Typeface));
+        }
     }
 }

QuestPDF/Drawing/FreeCanvas.cs

@@ -44,6 +44,11 @@ namespace QuestPDF.Drawing
         public void DrawText(string text, Position position, TextStyle style)
         {
             
+        }
+        
+        public void DrawShapedText(string text, Position position, TextStyle style)
+        {
+            
         }
 
         public void DrawImage(SKImage image, Position position, Size size)

QuestPDF/Drawing/SkiaCanvasBase.cs

@@ -1,5 +1,6 @@
 using QuestPDF.Infrastructure;
 using SkiaSharp;
+using SkiaSharp.HarfBuzz;
 
 namespace QuestPDF.Drawing
 {
@@ -32,6 +33,11 @@ namespace QuestPDF.Drawing
             Canvas.DrawText(text, vector.X, vector.Y, style.ToPaint());
         }
 
+        public void DrawShapedText(string text, Position vector, TextStyle style)
+        {
+            Canvas.DrawShapedText(text, vector.X, vector.Y, style.ToPaint());
+        }
+        
         public void DrawImage(SKImage image, Position vector, Size size)
         {
             Canvas.DrawImage(image, new SKRect(vector.X, vector.Y, size.Width, size.Height));

QuestPDF/Elements/DebugArea.cs

@@ -30,10 +30,7 @@ namespace QuestPDF.Elements
                         .MinimalBox()
                         .Background(Colors.White)
                         .Padding(2)
-                        .Text(Text)
-                        .FontColor(Color)
-                        .FontFamily(Fonts.Consolas)
-                        .FontSize(8);
+                        .Text(Text, TextStyle.Default.Color(Color).FontType(Fonts.Consolas).Size(8));
                 });
         }
     }

QuestPDF/Elements/Page.cs

@@ -20,9 +20,6 @@ namespace QuestPDF.Elements
 
         public string BackgroundColor { get; set; } = Colors.Transparent;
         
-        public Element Background { get; set; } = Empty.Instance;
-        public Element Foreground { get; set; } = Empty.Instance;
-        
         public Element Header { get; set; } = Empty.Instance;
         public Element Content { get; set; } = Empty.Instance;
         public Element Footer { get; set; } = Empty.Instance;
@@ -30,54 +27,39 @@ namespace QuestPDF.Elements
         public void Compose(IContainer container)
         {
             container
-                .Layers(layers =>
-                {
-                    layers
-                        .Layer()
-                        .DebugPointer("Page background layer")
-                        .Element(Background);
-                    
-                    layers
-                        .PrimaryLayer()
-                        .MinWidth(MinSize.Width)
-                        .MinHeight(MinSize.Height)
+                .MinWidth(MinSize.Width)
+                .MinHeight(MinSize.Height)
                 
-                        .MaxWidth(MaxSize.Width)
-                        .MaxHeight(MaxSize.Height)
+                .MaxWidth(MaxSize.Width)
+                .MaxHeight(MaxSize.Height)
                 
-                        .Background(BackgroundColor)
+                .Background(BackgroundColor)
      
-                        .PaddingLeft(MarginLeft)
-                        .PaddingRight(MarginRight)
-                        .PaddingTop(MarginTop)
-                        .PaddingBottom(MarginBottom)
+                .PaddingLeft(MarginLeft)
+                .PaddingRight(MarginRight)
+                .PaddingTop(MarginTop)
+                .PaddingBottom(MarginBottom)
                 
-                        .DefaultTextStyle(DefaultTextStyle)
+                .DefaultTextStyle(DefaultTextStyle)
                 
-                        .Decoration(decoration =>
-                        {
-                            decoration
-                                .Before()
-                                .DebugPointer("Page header")
-                                .Element(Header);
-
-                            decoration
-                                .Content()
-                                .Element(x => IsClose(MinSize.Width, MaxSize.Width) ? x.ExtendHorizontal() : x)
-                                .Element(x => IsClose(MinSize.Height, MaxSize.Height) ? x.ExtendVertical() : x)
-                                .DebugPointer("Page content")
-                                .Element(Content);
-
-                            decoration
-                                .After()
-                                .DebugPointer("Page footer")
-                                .Element(Footer);
-                        });
+                .Decoration(decoration =>
+                {
+                    decoration
+                        .Before()
+                        .DebugPointer("Page header")
+                        .Element(Header);
                     
-                    layers
-                        .Layer()
-                        .DebugPointer("Page foreground layer")
-                        .Element(Foreground);
+                    decoration
+                        .Content()
+                        .Element(x => IsClose(MinSize.Width, MaxSize.Width) ? x.ExtendHorizontal() : x)
+                        .Element(x => IsClose(MinSize.Height, MaxSize.Height) ? x.ExtendVertical() : x)
+                        .DebugPointer("Page content")
+                        .Element(Content);
+                    
+                    decoration
+                        .After()
+                        .DebugPointer("Page footer")
+                        .Element(Footer);
                 });
 
             bool IsClose(float x, float y)

QuestPDF/Elements/Placeholder.cs

@@ -26,7 +26,7 @@ namespace QuestPDF.Elements
                     if (string.IsNullOrWhiteSpace(Text))
                         x.MaxHeight(32).Image(ImageData, ImageScaling.FitArea);
                     else
-                        x.Text(Text).FontSize(14);
+                        x.Text(Text, TextStyle.Default.Size(14));
                 });
         }
     }

QuestPDF/Elements/Text/Calculation/TextBlockSize.cs

@@ -2,7 +2,7 @@
 
 namespace QuestPDF.Elements.Text.Calculation
 {
-    internal class TextMeasurementResult
+    internal class TextBlockSize
     {
         public float Width { get; set; }
         public float Height => Math.Abs(Descent) + Math.Abs(Ascent);
@@ -11,12 +11,5 @@ namespace QuestPDF.Elements.Text.Calculation
         public float Descent { get; set; }
 
         public float LineHeight { get; set; }
-        
-        public int StartIndex { get; set; }
-        public int EndIndex { get; set; }
-        public int NextIndex { get; set; }
-        public int TotalIndex { get; set; }
-
-        public bool IsLast => EndIndex == TotalIndex;
     }
 }

QuestPDF/Elements/Text/Calculation/TextDrawingRequest.cs

@@ -2,14 +2,8 @@
 
 namespace QuestPDF.Elements.Text.Calculation
 {
-    internal class TextDrawingRequest
+    internal struct TextDrawingRequest
     {
-        public ICanvas Canvas { get; set; }
-        public IPageContext PageContext { get; set; }
-        
-        public int StartIndex { get; set; }
-        public int EndIndex { get; set; }
-        
         public float TotalAscent { get; set; }
         public Size TextSize { get; set; }
     }

QuestPDF/Elements/Text/Calculation/TextLineElement.cs

@@ -5,6 +5,6 @@ namespace QuestPDF.Elements.Text.Calculation
     internal class TextLineElement
     {
         public ITextBlockItem Item { get; set; }
-        public TextMeasurementResult Measurement { get; set; }
+        public TextBlockSize Measurement { get; set; }
     }
 }

QuestPDF/Elements/Text/Calculation/TextMeasurementRequest.cs

@@ -1,14 +0,0 @@
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Elements.Text.Calculation
-{
-    internal class TextMeasurementRequest
-    {
-        public ICanvas Canvas { get; set; }
-        public IPageContext PageContext { get; set; }
-        
-        public int StartIndex { get; set; }
-        public float AvailableWidth { get; set; }
-        public bool IsFirstLineElement { get; set; }
-    }
-}

QuestPDF/Elements/Text/Items/ITextBlockItem.cs

@@ -5,7 +5,10 @@ namespace QuestPDF.Elements.Text.Items
 {
     internal interface ITextBlockItem
     {
-        TextMeasurementResult? Measure(TextMeasurementRequest request);
+        ICanvas Canvas { get; set; }
+        IPageContext PageContext { get; set; }
+        
+        TextBlockSize? Measure();
         void Draw(TextDrawingRequest request);
     }
 }

QuestPDF/Elements/Text/Items/TextBlockElement.cs

@@ -7,41 +7,40 @@ namespace QuestPDF.Elements.Text.Items
 {
     internal class TextBlockElement : ITextBlockItem
     {
+        public ICanvas Canvas { get; set; }
+        public IPageContext PageContext { get; set; }
+        
         public Element Element { get; set; } = Empty.Instance;
         
-        public TextMeasurementResult? Measure(TextMeasurementRequest request)
+        public TextBlockSize? Measure()
         {
             Element.VisitChildren(x => (x as IStateResettable)?.ResetState());
-            Element.VisitChildren(x => x.Initialize(request.PageContext, request.Canvas));
+            Element.VisitChildren(x => x.Initialize(PageContext, Canvas));
 
-            var measurement = Element.Measure(new Size(request.AvailableWidth, Size.Max.Height));
+            var measurement = Element.Measure(Size.Max);
 
             if (measurement.Type != SpacePlanType.FullRender)
                 return null;
             
-            return new TextMeasurementResult
+            return new TextBlockSize
             {
                 Width = measurement.Width,
                 
                 Ascent = -measurement.Height,
                 Descent = 0,
                 
-                LineHeight = 1,
-                
-                StartIndex = 0,
-                EndIndex = 0,
-                TotalIndex = 0
+                LineHeight = 1
             };
         }
 
         public void Draw(TextDrawingRequest request)
         {
             Element.VisitChildren(x => (x as IStateResettable)?.ResetState());
-            Element.VisitChildren(x => x.Initialize(request.PageContext, request.Canvas));
+            Element.VisitChildren(x => x.Initialize(PageContext, Canvas));
             
-            request.Canvas.Translate(new Position(0, request.TotalAscent));
+            Canvas.Translate(new Position(0, request.TotalAscent));
             Element.Draw(new Size(request.TextSize.Width, -request.TotalAscent));
-            request.Canvas.Translate(new Position(0, -request.TotalAscent));
+            Canvas.Translate(new Position(0, -request.TotalAscent));
         }
     }
 }

QuestPDF/Elements/Text/Items/TextBlockHyperlink.cs

@@ -6,17 +6,12 @@ namespace QuestPDF.Elements.Text.Items
     internal class TextBlockHyperlink : TextBlockSpan
     {
         public string Url { get; set; }
-        
-        public override TextMeasurementResult? Measure(TextMeasurementRequest request)
-        {
-            return MeasureWithoutCache(request);
-        }
 
         public override void Draw(TextDrawingRequest request)
         {
-            request.Canvas.Translate(new Position(0, request.TotalAscent));
-            request.Canvas.DrawHyperlink(Url, new Size(request.TextSize.Width, request.TextSize.Height));
-            request.Canvas.Translate(new Position(0, -request.TotalAscent));
+            Canvas.Translate(new Position(0, request.TotalAscent));
+            Canvas.DrawHyperlink(Url, new Size(request.TextSize.Width, request.TextSize.Height));
+            Canvas.Translate(new Position(0, -request.TotalAscent));
             
             base.Draw(request);
         }

QuestPDF/Elements/Text/Items/TextBlockPageNumber.cs

@@ -9,21 +9,21 @@ namespace QuestPDF.Elements.Text.Items
         public const string PageNumberPlaceholder = "123";
         public Func<IPageContext, string> Source { get; set; } = _ => PageNumberPlaceholder;
         
-        public override TextMeasurementResult? Measure(TextMeasurementRequest request)
+        public override TextBlockSize? Measure()
         {
-            SetPageNumber(request.PageContext);
-            return MeasureWithoutCache(request);
+            SetPageNumber();
+            return base.Measure();
         }
 
         public override void Draw(TextDrawingRequest request)
         {
-            SetPageNumber(request.PageContext);
+            SetPageNumber();
             base.Draw(request);
         }
 
-        private void SetPageNumber(IPageContext context)
+        private void SetPageNumber()
         {
-            Text = Source(context) ?? PageNumberPlaceholder;
+            Text = Source(PageContext) ?? PageNumberPlaceholder;
         }
     }
 }

QuestPDF/Elements/Text/Items/TextBlockSectionLink.cs

@@ -0,0 +1,19 @@
+using QuestPDF.Elements.Text.Calculation;
+using QuestPDF.Infrastructure;
+
+namespace QuestPDF.Elements.Text.Items
+{
+    internal class TextBlockSectionLink : TextBlockSpan
+    {
+        public string SectionName { get; set; }
+
+        public override void Draw(TextDrawingRequest request)
+        {
+            Canvas.Translate(new Position(0, request.TotalAscent));
+            Canvas.DrawSectionLink(SectionName, new Size(request.TextSize.Width, request.TextSize.Height));
+            Canvas.Translate(new Position(0, -request.TotalAscent));
+            
+            base.Draw(request);
+        }
+    }
+}

QuestPDF/Elements/Text/Items/TextBlockSectionlLink.cs

@@ -1,24 +0,0 @@
-using QuestPDF.Elements.Text.Calculation;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Elements.Text.Items
-{
-    internal class TextBlockSectionlLink : TextBlockSpan
-    {
-        public string SectionName { get; set; }
-        
-        public override TextMeasurementResult? Measure(TextMeasurementRequest request)
-        {
-            return MeasureWithoutCache(request);
-        }
-
-        public override void Draw(TextDrawingRequest request)
-        {
-            request.Canvas.Translate(new Position(0, request.TotalAscent));
-            request.Canvas.DrawSectionLink(SectionName, new Size(request.TextSize.Width, request.TextSize.Height));
-            request.Canvas.Translate(new Position(0, -request.TotalAscent));
-            
-            base.Draw(request);
-        }
-    }
-}

QuestPDF/Elements/Text/Items/TextBlockSpan.cs

@@ -1,118 +1,88 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using QuestPDF.Drawing;
 using QuestPDF.Elements.Text.Calculation;
 using QuestPDF.Infrastructure;
+using SkiaSharp.HarfBuzz;
 using Size = QuestPDF.Infrastructure.Size;
 
 namespace QuestPDF.Elements.Text.Items
 {
     internal class TextBlockSpan : ITextBlockItem
     {
-        public string Text { get; set; }
-        public TextStyle Style { get; set; } = new TextStyle();
-
-        private Dictionary<(int startIndex, float availableWidth), TextMeasurementResult?> MeasureCache =
-            new Dictionary<(int startIndex, float availableWidth), TextMeasurementResult?>();
-
-        public virtual TextMeasurementResult? Measure(TextMeasurementRequest request)
-        {
-            var cacheKey = (request.StartIndex, request.AvailableWidth);
-            
-            if (!MeasureCache.ContainsKey(cacheKey))
-                MeasureCache[cacheKey] = MeasureWithoutCache(request);
-            
-            return MeasureCache[cacheKey];
-        }
+        public ICanvas Canvas { get; set; }
+        public IPageContext PageContext { get; set; }
         
-        internal TextMeasurementResult? MeasureWithoutCache(TextMeasurementRequest request)
+        public string Text { get; set; }
+        public TextStyle Style { get; set; }
+        
+        protected TextBlockSize? Size { get; set; }
+        protected bool RequiresShaping { get; set; }
+        
+        public virtual TextBlockSize? Measure()
+        {
+            Size ??= Text == " " ? GetSizeForSpace() : GetSizeForWord();
+            return Size;
+        }
+
+        private TextBlockSize GetSizeForWord()
         {
-            const char space = ' ';
-            
             var paint = Style.ToPaint();
             var fontMetrics = Style.ToFontMetrics();
 
-            var startIndex = request.StartIndex;
+            var shaper = Style.ToShaper();
             
-            if (request.IsFirstLineElement)
-            {
-                while (startIndex + 1 < Text.Length && Text[startIndex] == space)
-                    startIndex++;
-            }
-
-            if (Text.Length == 0)
-            {
-                return new TextMeasurementResult
-                {
-                    Width = 0,
-                    
-                    LineHeight = Style.LineHeight ?? 1,
-                    Ascent = fontMetrics.Ascent,
-                    Descent = fontMetrics.Descent
-                };
-            }
+            // shaper returns positions of all glyphs,
+            // by adding a space, it is possible to capture width of the last original character
+            var result = shaper.Shape(Text + " ", paint); 
             
-            // start breaking text from requested position
-            var text = Text.Substring(startIndex);
+            // when text is left-to-right: last value corresponds to text width
+            // when text is right-to-left: glyphs are in the reverse order, first value represents text width
+            var width = Math.Max(result.Points.First().X, result.Points.Last().X);
+
+            RequiresShaping = result.Points.Length != Text.Length + 1;
             
-            var textLength = (int)paint.BreakText(text, request.AvailableWidth);
-
-            if (textLength <= 0)
-                return null;
-
-            if (textLength < text.Length && text[textLength] == space)
-                textLength++;
-            
-            // break text only on spaces
-            if (textLength < text.Length)
-            {
-                var lastSpaceIndex = text.Substring(0, textLength).LastIndexOf(space) - 1;
-
-                if (lastSpaceIndex <= 0)
-                {
-                    if (!request.IsFirstLineElement)
-                        return null;
-                }
-                else
-                {
-                    textLength = lastSpaceIndex + 1;
-                }
-            }
-
-            text = text.Substring(0, textLength);
-
-            var endIndex = startIndex + textLength;
-            var nextIndex = endIndex;
-
-            while (nextIndex + 1 < Text.Length && Text[nextIndex] == space)
-                nextIndex++;
-            
-            // measure final text
-            var width = paint.MeasureText(text);
-            
-            return new TextMeasurementResult
+            return new TextBlockSize
             {
                 Width = width,
                 
                 Ascent = fontMetrics.Ascent,
                 Descent = fontMetrics.Descent,
      
-                LineHeight = Style.LineHeight ?? 1,
-                
-                StartIndex = startIndex,
-                EndIndex = endIndex,
-                NextIndex = nextIndex,
-                TotalIndex = Text.Length
+                LineHeight = Style.LineHeight ?? 1
             };
         }
         
+        private TextBlockSize GetSizeForSpace()
+        {
+            var paint = Style.ToPaint();
+            var fontMetrics = Style.ToFontMetrics();
+            
+            return new TextBlockSize
+            {
+                Width = paint.MeasureText(" "),
+                
+                Ascent = fontMetrics.Ascent,
+                Descent = fontMetrics.Descent,
+     
+                LineHeight = Style.LineHeight ?? 1
+            };
+        }
+
         public virtual void Draw(TextDrawingRequest request)
         {
             var fontMetrics = Style.ToFontMetrics();
 
-            var text = Text.Substring(request.StartIndex, request.EndIndex - request.StartIndex);
-            
-            request.Canvas.DrawRectangle(new Position(0, request.TotalAscent), new Size(request.TextSize.Width, request.TextSize.Height), Style.BackgroundColor);
-            request.Canvas.DrawText(text, Position.Zero, Style);
+            Canvas.DrawRectangle(new Position(0, request.TotalAscent), new Size(request.TextSize.Width, request.TextSize.Height), Style.BackgroundColor);
+
+            if (!string.IsNullOrWhiteSpace(Text))
+            {
+                if (RequiresShaping)
+                    Canvas.DrawShapedText(Text, Position.Zero, Style);
+                else
+                    Canvas.DrawText(Text, Position.Zero, Style);
+            }
 
             // draw underline
             if ((Style.HasUnderline ?? false) && fontMetrics.UnderlinePosition.HasValue)
@@ -124,7 +94,7 @@ namespace QuestPDF.Elements.Text.Items
 
             void DrawLine(float offset, float thickness)
             {
-                request.Canvas.DrawRectangle(new Position(0, offset - thickness / 2f), new Size(request.TextSize.Width, thickness), Style.Color);
+                Canvas.DrawRectangle(new Position(0, offset - thickness / 2f), new Size(request.TextSize.Width, thickness), Style.Color);
             }
         }
     }

QuestPDF/Elements/Text/TextBlock.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.RegularExpressions;
 using QuestPDF.Drawing;
 using QuestPDF.Elements.Text.Calculation;
 using QuestPDF.Elements.Text.Items;
@@ -11,108 +12,145 @@ namespace QuestPDF.Elements.Text
     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 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; }
 
+        internal override void Initialize(IPageContext pageContext, ICanvas canvas)
+        {
+            Items = SplitElementsBySpace().ToList();
+            
+            Items.ForEach(x =>
+            {
+                x.PageContext = pageContext;
+                x.Canvas = canvas;
+            });
+            
+            base.Initialize(pageContext, canvas);
+        }
+        
         public void ResetState()
         {
-            RenderingQueue = new Queue<ITextBlockItem>(Items);
             CurrentElementIndex = 0;
         }
 
+        private IEnumerable<ITextBlockItem> SplitElementsBySpace()
+        {
+            foreach (var item in Items)
+            {
+                if (item is TextBlockSpan span)
+                {
+                    span.Text ??= "";
+                    
+                    foreach (var spanItem in Regex.Split(span.Text, "( )|([^ ]+)"))
+                    {
+                        yield return new TextBlockSpan
+                        {
+                            Text = spanItem,
+                            Style = span.Style
+                        };
+                    }
+                }
+            }
+        }
+        
         internal override SpacePlan Measure(Size availableSpace)
         {
-            if (!RenderingQueue.Any())
+            if (!Items.Any())
                 return SpacePlan.FullRender(Size.Zero);
-            
+
             var lines = DivideTextItemsIntoLines(availableSpace.Width, availableSpace.Height).ToList();
 
             if (!lines.Any())
                 return SpacePlan.Wrap();
-            
+
             var width = lines.Max(x => x.Width);
             var height = lines.Sum(x => x.LineHeight);
 
             if (width > availableSpace.Width + Size.Epsilon || height > availableSpace.Height + Size.Epsilon)
                 return SpacePlan.Wrap();
-
-            var fullyRenderedItemsCount = lines
-                .SelectMany(x => x.Elements)
-                .GroupBy(x => x.Item)
-                .Count(x => x.Any(y => y.Measurement.IsLast));
             
-            if (fullyRenderedItemsCount == RenderingQueue.Count)
+            if (CurrentElementIndex + lines.Sum(x => x.Elements.Count) == Items.Count)
                 return SpacePlan.FullRender(width, height);
-            
+
             return SpacePlan.PartialRender(width, height);
         }
 
         internal override void Draw(Size availableSpace)
         {
             var lines = DivideTextItemsIntoLines(availableSpace.Width, availableSpace.Height).ToList();
-            
+
             if (!lines.Any())
                 return;
-            
+
             var heightOffset = 0f;
             var widthOffset = 0f;
-            
-            foreach (var line in lines)
+
+            var isLastPart = lines.Sum(x => x.Elements.Count) + CurrentElementIndex == Items.Count;
+
+            foreach (var sourceLine in lines)
             {
                 widthOffset = 0f;
 
-                var alignmentOffset = GetAlignmentOffset(line.Width);
+                var isLastLine = sourceLine == lines.Last();
+
+                var line = sourceLine;
+
+                if (!(isLastPart && isLastLine))
+                {
+                    var spans = sourceLine.Elements
+                        .Where(x => x.Item is TextBlockSpan)
+                        .SkipWhile(x => string.IsNullOrWhiteSpace((x.Item as TextBlockSpan).Text))
+                        .Reverse()
+                        .SkipWhile(x => string.IsNullOrWhiteSpace((x.Item as TextBlockSpan).Text))
+                        .Reverse()
+                        .ToList();
+
+                    var wordsWidth = spans
+                        .Where(x => !string.IsNullOrWhiteSpace((x.Item as TextBlockSpan).Text))
+                        .Sum(x => x.Measurement.Width);
+
+                    var spaceSpans = spans.Where(x => string.IsNullOrWhiteSpace((x.Item as TextBlockSpan).Text)).ToList();
+                    var spaceWidth = (availableSpace.Width - wordsWidth) / spaceSpans.Count;
+                    spaceSpans.ForEach(x => x.Measurement.Width = spaceWidth);
                 
+                    line = TextLine.From(spans);
+                }
+                
+                var alignmentOffset = GetAlignmentOffset(line.Width);
+
                 Canvas.Translate(new Position(alignmentOffset, 0));
                 Canvas.Translate(new Position(0, -line.Ascent));
-            
+
                 foreach (var item in line.Elements)
                 {
                     var textDrawingRequest = new TextDrawingRequest
                     {
-                        Canvas = Canvas,
-                        PageContext = PageContext,
-                        
-                        StartIndex = item.Measurement.StartIndex,
-                        EndIndex = item.Measurement.EndIndex,
-                        
                         TextSize = new Size(item.Measurement.Width, line.LineHeight),
                         TotalAscent = line.Ascent
                     };
-                
+
                     item.Item.Draw(textDrawingRequest);
-                
+
                     Canvas.Translate(new Position(item.Measurement.Width, 0));
                     widthOffset += item.Measurement.Width;
                 }
-            
+
                 Canvas.Translate(new Position(-alignmentOffset, 0));
                 Canvas.Translate(new Position(-line.Width, line.Ascent));
                 Canvas.Translate(new Position(0, line.LineHeight));
-                
+
                 heightOffset += line.LineHeight;
             }
-            
-            Canvas.Translate(new Position(0, -heightOffset));
-            
-            lines
-                .SelectMany(x => x.Elements)
-                .GroupBy(x => x.Item)
-                .Where(x => x.Any(y => y.Measurement.IsLast))
-                .Select(x => x.Key)
-                .ToList()
-                .ForEach(x => RenderingQueue.Dequeue());
 
-            var lastElementMeasurement = lines.Last().Elements.Last().Measurement;
-            CurrentElementIndex = lastElementMeasurement.IsLast ? 0 : lastElementMeasurement.NextIndex;
+            Canvas.Translate(new Position(0, -heightOffset));
+            CurrentElementIndex += lines.Sum(x => x.Elements.Count);
             
-            if (!RenderingQueue.Any())
+            if (CurrentElementIndex == Items.Count)
                 ResetState();
-            
+
             float GetAlignmentOffset(float lineWidth)
             {
                 if (Alignment == HorizontalAlignment.Left)
@@ -130,19 +168,18 @@ namespace QuestPDF.Elements.Text
             }
         }
 
-        public IEnumerable<TextLine> DivideTextItemsIntoLines(float availableWidth, float availableHeight)
+        private IEnumerable<TextLine> DivideTextItemsIntoLines(float availableWidth, float availableHeight)
         {
-            var queue = new Queue<ITextBlockItem>(RenderingQueue);
             var currentItemIndex = CurrentElementIndex;
             var currentHeight = 0f;
-
-            while (queue.Any())
+            
+            while (true)
             {
                 var line = GetNextLine();
-                
+
                 if (!line.Elements.Any())
                     yield break;
-                
+
                 if (currentHeight + line.LineHeight > availableHeight + Size.Epsilon)
                     yield break;
 
@@ -155,43 +192,29 @@ namespace QuestPDF.Elements.Text
                 var currentWidth = 0f;
 
                 var currentLineElements = new List<TextLineElement>();
-            
+
                 while (true)
                 {
-                    if (!queue.Any())
+                    if (currentItemIndex == Items.Count)
                         break;
 
-                    var currentElement = queue.Peek();
-                    
-                    var measurementRequest = new TextMeasurementRequest
-                    {
-                        Canvas = Canvas,
-                        PageContext = PageContext,
-                        
-                        StartIndex = currentItemIndex,
-                        AvailableWidth = availableWidth - currentWidth,
-                        IsFirstLineElement = !currentLineElements.Any()
-                    };
-                
-                    var measurementResponse = currentElement.Measure(measurementRequest);
-                
-                    if (measurementResponse == null)
+                    var currentElement = Items[currentItemIndex];
+                    var textBlockSize = currentElement.Measure();
+
+                    if (textBlockSize == null)
                         break;
                     
+                    if (currentWidth + textBlockSize.Width > availableWidth + Size.Epsilon)
+                        break;
+
                     currentLineElements.Add(new TextLineElement
                     {
                         Item = currentElement,
-                        Measurement = measurementResponse
+                        Measurement = textBlockSize
                     });
 
-                    currentWidth += measurementResponse.Width;
-                    currentItemIndex = measurementResponse.NextIndex;
-                    
-                    if (!measurementResponse.IsLast)
-                        break;
-
-                    currentItemIndex = 0;
-                    queue.Dequeue();
+                    currentWidth += textBlockSize.Width;
+                    currentItemIndex ++;
                 }
 
                 return TextLine.From(currentLineElements);

QuestPDF/Fluent/ElementExtensions.cs

@@ -177,15 +177,7 @@ namespace QuestPDF.Fluent
                 TextStyle = textStyle
             });
         }
-        
-        public static IContainer DefaultTextStyle(this IContainer element, Func<TextStyle, TextStyle> handler)
-        {
-            return element.Element(new DefaultTextStyle
-            {
-                TextStyle = handler(TextStyle.Default)
-            });
-        }
-        
+
         public static IContainer StopPaging(this IContainer element)
         {
             return element.Element(new StopPaging());

QuestPDF/Fluent/PageExtensions.cs

@@ -83,30 +83,11 @@ namespace QuestPDF.Fluent
             Page.DefaultTextStyle = textStyle;
         }
         
-        public void DefaultTextStyle(Func<TextStyle, TextStyle> handler)
-        {
-            DefaultTextStyle(handler(TextStyle.Default));
-        }
-        
         public void Background(string color)
         {
             Page.BackgroundColor = color;
         }
         
-        public IContainer Background()
-        {
-            var container = new Container();
-            Page.Background = container;
-            return container;
-        }
-        
-        public IContainer Foreground()
-        {
-            var container = new Container();
-            Page.Foreground = container;
-            return container;
-        }
-        
         public IContainer Header()
         {
             var container = new Container();

QuestPDF/Fluent/TextExtensions.cs

@@ -10,34 +10,6 @@ using static System.String;
 
 namespace QuestPDF.Fluent
 {
-    public class TextSpanDescriptor
-    {
-        internal TextStyle TextStyle { get; }
-
-        internal TextSpanDescriptor(TextStyle textStyle)
-        {
-            TextStyle = textStyle;
-        }
-    }
-
-    public delegate string PageNumberFormatter(int? pageNumber);
-    
-    public class TextPageNumberDescriptor : TextSpanDescriptor
-    {
-        internal PageNumberFormatter FormatFunction { get; private set; } = x => (x ?? 123).ToString();
-
-        internal TextPageNumberDescriptor(TextStyle textStyle) : base(textStyle)
-        {
-            
-        }
-
-        public TextPageNumberDescriptor Format(PageNumberFormatter formatter)
-        {
-            FormatFunction = formatter ?? FormatFunction;
-            return this;
-        }
-    }
-    
     public class TextDescriptor
     {
         private ICollection<TextBlock> TextBlocks { get; } = new List<TextBlock>();
@@ -50,11 +22,6 @@ namespace QuestPDF.Fluent
             DefaultStyle = style;
         }
         
-        public void DefaultTextStyle(Func<TextStyle, TextStyle> style)
-        {
-            DefaultStyle = style(TextStyle.Default);
-        }
-        
         public void AlignLeft()
         {
             Alignment = HorizontalAlignment.Left;
@@ -83,15 +50,12 @@ namespace QuestPDF.Fluent
             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)
+        public void Span(string? text, TextStyle? style = null)
         {
-            Span(text).Style(style);
-        }
-        
-        public TextSpanDescriptor Span(string? text)
-        {
-            var style = DefaultStyle.Clone();
+            if (IsNullOrEmpty(text))
+                return;
+            
+            style ??= TextStyle.Default;
  
             var items = text
                 .Replace("\r", string.Empty)
@@ -113,108 +77,102 @@ namespace QuestPDF.Fluent
                 })
                 .ToList()
                 .ForEach(TextBlocks.Add);
-
-            return new TextSpanDescriptor(style);
         }
 
-        public TextSpanDescriptor Line(string? text)
+        public void Line(string? text, TextStyle? style = null)
         {
             text ??= string.Empty;
-            return Span(text + Environment.NewLine);
+            Span(text + Environment.NewLine, style);
         }
 
-        public TextSpanDescriptor EmptyLine()
+        public void EmptyLine()
         {
-            return Span(Environment.NewLine);
+            Span(Environment.NewLine);
         }
+
+        private static Func<int?, string> DefaultTextFormat = x => (x ?? 123).ToString();
         
-        private TextPageNumberDescriptor PageNumber(Func<IPageContext, int?> pageNumber)
+        private void PageNumber(Func<IPageContext, int?> pageNumber, TextStyle? style, Func<int?, string>? format)
         {
-            var style = DefaultStyle.Clone();
-            var descriptor = new TextPageNumberDescriptor(DefaultStyle);
+            style ??= TextStyle.Default;
+            format ??= DefaultTextFormat;
             
-            AddItemToLastTextBlock(new TextBlockPageNumber
+            AddItemToLastTextBlock(new TextBlockPageNumber()
             {
-                Source = context => descriptor.FormatFunction(pageNumber(context)),
+                Source = context => format(pageNumber(context)),
                 Style = style
             });
-            
-            return descriptor;
         }
 
-        public TextPageNumberDescriptor CurrentPageNumber()
+        public void CurrentPageNumber(TextStyle? style = null, Func<int?, string>? format = null)
         {
-            return PageNumber(x => x.CurrentPage);
+            PageNumber(x => x.CurrentPage, style, format);
         }
         
-        public TextPageNumberDescriptor TotalPages()
+        public void TotalPages(TextStyle? style = null, Func<int?, string>? format = null)
         {
-            return PageNumber(x => x.GetLocation(PageContext.DocumentLocation)?.Length);
+            PageNumber(x => x.GetLocation(PageContext.DocumentLocation)?.Length, style, format);
         }
 
         [Obsolete("This element has been renamed since version 2022.3. Please use the BeginPageNumberOfSection method.")]
         public void PageNumberOfLocation(string locationName, TextStyle? style = null)
         {
-            BeginPageNumberOfSection(locationName).Style(style);
+            BeginPageNumberOfSection(locationName);
         }
         
-        public TextPageNumberDescriptor BeginPageNumberOfSection(string locationName)
+        public void BeginPageNumberOfSection(string locationName, TextStyle? style = null, Func<int?, string>? format = null)
         {
-            return PageNumber(x => x.GetLocation(locationName)?.PageStart);
+            PageNumber(x => x.GetLocation(locationName)?.PageStart, style, format);
         }
         
-        public TextPageNumberDescriptor EndPageNumberOfSection(string locationName)
+        public void EndPageNumberOfSection(string locationName, TextStyle? style = null, Func<int?, string>? format = null)
         {
-            return PageNumber(x => x.GetLocation(locationName)?.PageEnd);
+            PageNumber(x => x.GetLocation(locationName)?.PageEnd, style, format);
         }
         
-        public TextPageNumberDescriptor PageNumberWithinSection(string locationName)
+        public void PageNumberWithinSection(string locationName, TextStyle? style = null, Func<int?, string>? format = null)
         {
-            return PageNumber(x => x.CurrentPage + 1 - x.GetLocation(locationName)?.PageEnd);
+            PageNumber(x => x.CurrentPage + 1 - x.GetLocation(locationName)?.PageEnd, style, format);
         }
         
-        public TextPageNumberDescriptor TotalPagesWithinSection(string locationName)
+        public void TotalPagesWithinSection(string locationName, TextStyle? style = null, Func<int?, string>? format = null)
         {
-            return PageNumber(x => x.GetLocation(locationName)?.Length);
+            PageNumber(x => x.GetLocation(locationName)?.Length, style, format);
         }
         
-        public TextSpanDescriptor SectionLink(string? text, string sectionName)
+        public void SectionLink(string? text, string sectionName, TextStyle? style = null)
         {
+            if (IsNullOrEmpty(text))
+                return;
+            
             if (IsNullOrEmpty(sectionName))
                 throw new ArgumentException(nameof(sectionName));
 
-            var style = DefaultStyle.Clone();
-            var descriptor = new TextSpanDescriptor(style);
+            style ??= TextStyle.Default;
             
-            if (IsNullOrEmpty(text))
-                return descriptor;
-            
-            AddItemToLastTextBlock(new TextBlockSectionlLink
+            AddItemToLastTextBlock(new TextBlockSectionLink
             {
                 Style = style,
                 Text = text,
                 SectionName = sectionName
             });
-
-            return descriptor;
         }
         
         [Obsolete("This element has been renamed since version 2022.3. Please use the SectionLink method.")]
         public void InternalLocation(string? text, string locationName, TextStyle? style = null)
         {
-            SectionLink(text, locationName).Style(style);
+            SectionLink(text, locationName, style);
         }
         
-        public TextSpanDescriptor Hyperlink(string? text, string url)
+        public void Hyperlink(string? text, string url, TextStyle? style = null)
         {
+            if (IsNullOrEmpty(text))
+                return;
+            
             if (IsNullOrEmpty(url))
                 throw new ArgumentException(nameof(url));
-
-            var style = DefaultStyle.Clone();
-            var descriptor = new TextSpanDescriptor(style);
-
-            if (IsNullOrEmpty(text))
-                return descriptor;
+            
+            style ??= TextStyle.Default;
             
             AddItemToLastTextBlock(new TextBlockHyperlink
             {
@@ -222,14 +180,12 @@ namespace QuestPDF.Fluent
                 Text = text,
                 Url = url
             });
-
-            return descriptor;
         }
         
         [Obsolete("This element has been renamed since version 2022.3. Please use the Hyperlink method.")]
         public void ExternalLocation(string? text, string url, TextStyle? style = null)
         {
-            Hyperlink(text, url).Style(style);
+            Hyperlink(text, url, style);
         }
         
         public IContainer Element()
@@ -271,17 +227,9 @@ namespace QuestPDF.Fluent
             descriptor.Compose(element);
         }
         
-        [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 static void Text(this IContainer element, object? text, TextStyle style)
+        public static void Text(this IContainer element, object? text, TextStyle? style = null)
         {
-            element.Text(text).Style(style);
-        }
-        
-        public static TextSpanDescriptor Text(this IContainer element, object? text)
-        {
-            var descriptor = (TextSpanDescriptor) null;
-            element.Text(x => descriptor = x.Span(text?.ToString()));
-            return descriptor;
+            element.Text(x => x.Span(text?.ToString(), style));
         }
     }
 }

QuestPDF/Fluent/TextSpanDescriptorExtensions.cs

@@ -1,126 +0,0 @@
-using System;
-using System.Runtime.CompilerServices;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Fluent
-{
-    public static class TextSpanDescriptorExtensions
-    {
-        public static T Style<T>(this T descriptor, TextStyle style) where T : TextSpanDescriptor
-        {
-            if (style == null)
-                return descriptor;
-            
-            descriptor.TextStyle.OverrideStyle(style);
-            return descriptor;
-        }
-        
-        public static T FontColor<T>(this T descriptor, string value) where T : TextSpanDescriptor
-        {
-            descriptor.TextStyle.Color = value;
-            return descriptor;
-        }
-        
-        public static T BackgroundColor<T>(this T descriptor, string value) where T : TextSpanDescriptor
-        {
-            descriptor.TextStyle.BackgroundColor = value;
-            return descriptor;
-        }
-        
-        public static T FontFamily<T>(this T descriptor, string value) where T : TextSpanDescriptor
-        {
-            descriptor.TextStyle.FontFamily = value;
-            return descriptor;
-        }
-        
-        public static T FontSize<T>(this T descriptor, float value) where T : TextSpanDescriptor
-        {
-            descriptor.TextStyle.Size = value;
-            return descriptor;
-        }
-        
-        public static T LineHeight<T>(this T descriptor, float value) where T : TextSpanDescriptor
-        {
-            descriptor.TextStyle.LineHeight = value;
-            return descriptor;
-        }
-        
-        public static T Italic<T>(this T descriptor, bool value = true) where T : TextSpanDescriptor
-        {
-            descriptor.TextStyle.IsItalic = value;
-            return descriptor;
-        }
-        
-        public static T Strikethrough<T>(this T descriptor, bool value = true) where T : TextSpanDescriptor
-        {
-            descriptor.TextStyle.HasStrikethrough = value;
-            return descriptor;
-        }
-        
-        public static T Underline<T>(this T descriptor, bool value = true) where T : TextSpanDescriptor
-        {
-            descriptor.TextStyle.HasUnderline = 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
-        {
-            return descriptor.Weight(FontWeight.Thin);
-        }
-        
-        public static T ExtraLight<T>(this T descriptor) where T : TextSpanDescriptor
-        {
-            return descriptor.Weight(FontWeight.ExtraLight);
-        }
-        
-        public static T Light<T>(this T descriptor) where T : TextSpanDescriptor
-        {
-            return descriptor.Weight(FontWeight.Light);
-        }
-        
-        public static T NormalWeight<T>(this T descriptor) where T : TextSpanDescriptor
-        {
-            return descriptor.Weight(FontWeight.Normal);
-        }
-        
-        public static T Medium<T>(this T descriptor) where T : TextSpanDescriptor
-        {
-            return descriptor.Weight(FontWeight.Medium);
-        }
-        
-        public static T SemiBold<T>(this T descriptor) where T : TextSpanDescriptor
-        {
-            return descriptor.Weight(FontWeight.SemiBold);
-        }
-        
-        public static T Bold<T>(this T descriptor) where T : TextSpanDescriptor
-        {
-            return descriptor.Weight(FontWeight.Bold);
-        }
-        
-        public static T ExtraBold<T>(this T descriptor) where T : TextSpanDescriptor
-        {
-            return descriptor.Weight(FontWeight.ExtraBold);
-        }
-        
-        public static T Black<T>(this T descriptor) where T : TextSpanDescriptor
-        {
-            return descriptor.Weight(FontWeight.Black);
-        }
-        
-        public static T ExtraBlack<T>(this T descriptor) where T : TextSpanDescriptor
-        {
-            return descriptor.Weight(FontWeight.ExtraBlack);
-        }
-        
-        #endregion
-    }
-}

QuestPDF/Fluent/TextStyleExtensions.cs

@@ -13,13 +13,7 @@ namespace QuestPDF.Fluent
             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)
-        {
-            return style.FontColor(value);
-        }
-        
-        public static TextStyle FontColor(this TextStyle style, string value)
         {
             return style.Mutate(x => x.Color = value);
         }
@@ -29,24 +23,12 @@ namespace QuestPDF.Fluent
             return style.Mutate(x => x.BackgroundColor = value);
         }
         
-        [Obsolete("This element has been renamed since version 2022.3. Please use the FontFamily method.")]
         public static TextStyle FontType(this TextStyle style, string value)
         {
-            return style.FontFamily(value);
+            return style.Mutate(x => x.FontType = value);
         }
         
-        public static TextStyle FontFamily(this TextStyle style, string value)
-        {
-            return style.Mutate(x => x.FontFamily = value);
-        }
-        
-        [Obsolete("This element has been renamed since version 2022.3. Please use the FontSize method.")]
         public static TextStyle Size(this TextStyle style, float value)
-        {
-            return style.FontSize(value);
-        }
-        
-        public static TextStyle FontSize(this TextStyle style, float value)
         {
             return style.Mutate(x => x.Size = value);
         }

QuestPDF/Infrastructure/ICanvas.cs

@@ -8,6 +8,7 @@ namespace QuestPDF.Infrastructure
         
         void DrawRectangle(Position vector, Size size, string color);
         void DrawText(string text, Position position, TextStyle style);
+        void DrawShapedText(string text, Position position, TextStyle style);
         void DrawImage(SKImage image, Position position, Size size);
 
         void DrawHyperlink(string url, Size size);

QuestPDF/Infrastructure/TextStyle.cs

@@ -9,7 +9,7 @@ namespace QuestPDF.Infrastructure
         
         internal string? Color { get; set; }
         internal string? BackgroundColor { get; set; }
-        internal string? FontFamily { get; set; }
+        internal string? FontType { get; set; }
         internal float? Size { get; set; }
         internal float? LineHeight { get; set; }
         internal FontWeight? FontWeight { get; set; }
@@ -24,7 +24,7 @@ namespace QuestPDF.Infrastructure
         {
             Color = Colors.Black,
             BackgroundColor = Colors.Transparent,
-            FontFamily = Fonts.Calibri,
+            FontType = Fonts.Calibri,
             Size = 12,
             LineHeight = 1.2f,
             FontWeight = Infrastructure.FontWeight.Normal,
@@ -43,15 +43,15 @@ namespace QuestPDF.Infrastructure
             HasGlobalStyleApplied = true;
 
             ApplyParentStyle(globalStyle);
-            PaintKey ??= (FontFamily, Size, FontWeight, IsItalic, Color);
-            FontMetricsKey ??= (FontFamily, Size, FontWeight, IsItalic);
+            PaintKey ??= (FontType, Size, FontWeight, IsItalic, Color);
+            FontMetricsKey ??= (FontType, Size, FontWeight, IsItalic);
         }
         
         internal void ApplyParentStyle(TextStyle parentStyle)
         {
             Color ??= parentStyle.Color;
             BackgroundColor ??= parentStyle.BackgroundColor;
-            FontFamily ??= parentStyle.FontFamily;
+            FontType ??= parentStyle.FontType;
             Size ??= parentStyle.Size;
             LineHeight ??= parentStyle.LineHeight;
             FontWeight ??= parentStyle.FontWeight;
@@ -60,19 +60,6 @@ namespace QuestPDF.Infrastructure
             HasUnderline ??= parentStyle.HasUnderline;
         }
 
-        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;
-            IsItalic = parentStyle.IsItalic ?? IsItalic;
-            HasStrikethrough = parentStyle.HasStrikethrough ?? HasStrikethrough;
-            HasUnderline = parentStyle.HasUnderline ?? HasUnderline;
-        }
-        
         internal TextStyle Clone()
         {
             var clone = (TextStyle)MemberwiseClone();

QuestPDF/QuestPDF.csproj

@@ -4,7 +4,7 @@
         <Authors>MarcinZiabek</Authors>
         <Company>CodeFlint</Company>
         <PackageId>QuestPDF</PackageId>
-        <Version>2022.3.0</Version>
+        <Version>2022.2.3</Version>
         <PackageDescription>QuestPDF is an open-source, modern and battle-tested library that can help you with generating PDF documents by offering friendly, discoverable and predictable C# fluent API.</PackageDescription>
         <PackageReleaseNotes>$([System.IO.File]::ReadAllText("$(MSBuildProjectDirectory)/Resources/ReleaseNotes.txt"))</PackageReleaseNotes>
         <LangVersion>9</LangVersion>
@@ -25,6 +25,7 @@
 
     <ItemGroup>
       <PackageReference Include="SkiaSharp" Version="2.80.3" />
+      <PackageReference Include="SkiaSharp.HarfBuzz" Version="2.80.3" />
     </ItemGroup>
 
     <ItemGroup>

readme.md

@@ -8,84 +8,215 @@ I have designed this layouting engine with full paging support in mind. The docu
 
 ## Support QuestPDF
 
-All great frameworks and libraries started from zero. Please help me make QuestPDF a commonly known library and an obvious choice for generating PDF documents. 
-
-- ⭐ Give this repository a star,
-- 💬 Share it with your team members. 
+All great frameworks and libraries started from zero. Please help me make QuestPDF a commonly known library and an obvious choice in case of generating PDF documents. Please give it a start ⭐ and share with your colleagues 💬👨‍💻.
 
 ## Installation
 
 The library is available as a nuget package. You can install it as any other nuget package from your IDE, try to search by `QuestPDF`. You can find package details [on this webpage](https://www.nuget.org/packages/QuestPDF/).
 
-```c#
-// Package Manager
+```
 Install-Package QuestPDF
-
-// .NET CLI
-dotnet add package QuestPDF
-
-// Package reference in .csproj file
-<PackageReference Include="QuestPDF" Version="2022.2.5" />
 ```
 
 ## Documentation
 
-**[🚀 Getting started tutorial](https://www.questpdf.com/documentation/getting-started.html)** - a short and easy to follow tutorial showing how to design an invoice document under 200 lines of code.
+**[Release notes and roadmap](https://www.questpdf.com/documentation/releases.html)** - everything that is planned for future library iterations, description of new features and information about potential breaking changes.
 
-**[📖 API Reference](https://www.questpdf.com/documentation/api-reference.html)** - a detailed description of behavior of all available components and how to use them with C# Fluent API.
+**[Getting started tutorial](https://www.questpdf.com/documentation/getting-started.html)** - a short and easy to follow tutorial showing how to design an invoice document under 200 lines of code.
 
-**[ℹ️ Patterns and practices](https://www.questpdf.com/documentation/patterns-and-practices.html#document-metadata)** - everything that may help you designing great reports and create reusable code that is easy to maintain.
+**[API Reference](https://www.questpdf.com/documentation/api-reference.html)** - a detailed description of behavior of all available components and how to use them with C# Fluent API.
 
-## Simplicity is the key
+**[Patterns and practices](https://www.questpdf.com/documentation/patterns-and-practices.html#document-metadata)** - everything that may help you designing great reports and reusable code that is easy to maintain.
 
-How easy it is to start and prototype with QuestPDF? Really easy thanks to its minimal API! Please analyse the code below:
+## Example invoice
+
+Do you believe that creating a complete invoice document can take less than 200 lines of code? We have prepared for you a step-by-step instruction that shows every detail of this implementation and describes the best patterns and practices.
+
+For tutorial, documentation and API reference, please visit [the QuestPDF documentation](https://www.questpdf.com/documentation/getting-started.html).
+
+<a href="https://github.com/QuestPDF/example-invoice">
+  <img src="https://github.com/QuestPDF/example-invoice/raw/main/images/invoice.png" width="595px">
+</a>
+
+Here you can find an example code showing how easy is to write and understand the fluent API.
+
+**General document structure** with header, content and footer:
 
 ```csharp
-using QuestPDF.Fluent;
-using QuestPDF.Helpers;
-using QuestPDF.Infrastructure;
-
-// code in your main method
-Document.Create(container =>
+public void Compose(IDocumentContainer container)
 {
-    container.Page(page =>
-    {
-        page.Size(PageSizes.A4);
-        page.Margin(2, Unit.Centimetre);
-        page.Background(Colors.White);
-        page.DefaultTextStyle(TextStyle.Default.Size(20));
-        
-        page.Header()
-            .Text("Hello PDF!", TextStyle.Default.SemiBold().Size(36).Color(Colors.Blue.Medium));
-        
-        page.Content()
-            .PaddingVertical(1, Unit.Centimetre)
-            .Column(x =>
+    container
+        .Page(page =>
+        {
+            page.Margin(50);
+            
+            page.Header().Element(ComposeHeader);
+            page.Content().Element(ComposeContent);
+            
+            page.Footer().AlignCenter().Text(x =>
             {
-                x.Spacing(20);
-                
-                x.Item().Text(Placeholders.LoremIpsum());
-                x.Item().Image(Placeholders.Image(200, 100));
-            });
-        
-        page.Footer()
-            .AlignCenter()
-            .Text(x =>
-            {
-                x.Span("Page ");
                 x.CurrentPageNumber();
+                x.Span(" / ");
+                x.TotalPages();
             });
-    });
-})
-.GeneratePdf("hello.pdf");
+        });
+}
 ```
 
-And compare it to the produced PDF file:
+**The header area** consists of basic invoice information along with a logo placeholder.
 
+```csharp
+void ComposeHeader(IContainer container)
+{
+    var titleTextStyle = TextStyle.Default.Size(20).SemiBold().Color(Colors.Blue.Medium);
+    
+    container.Row(row =>
+    {
+        row.RelativeColumn().Stack(stack =>
+        {
+            stack.Item().Text($"Invoice #{Model.InvoiceNumber}", titleStyle);
 
+            stack.Item().Text(text =>
+            {
+                text.Span("Issue date: ", TextStyle.Default.SemiBold());
+                text.Span($"{Model.IssueDate:d}");
+            });
 
-## Are you ready for more?
+            stack.Item().Text(text =>
+            {
+                text.Span("Due date: ", TextStyle.Default.SemiBold());
+                text.Span($"{Model.DueDate:d}");
+            });
+        });
+        
+        row.ConstantColumn(100).Height(50).Placeholder();
+    });
+}
+```
 
-The Fluent API of QuestPDF scales really well. It is easy to create and maintain even most complex documents. Read [the Getting started tutorial](https://www.questpdf.com/documentation/getting-started.html) to learn QuestPDF basics and implement an invoice under 200 lines of code. You can also investigate and play with the code from [the example repository](https://github.com/QuestPDF/example-invoice).
+Implementation of **the content area** that contains seller and customer details, then listing of all bought products, then a comments section.
 
-<img src="https://github.com/QuestPDF/example-invoice/raw/main/images/invoice.png" width="595px">
+```csharp
+void ComposeContent(IContainer container)
+{
+    container.PaddingVertical(40).Stack(column => 
+    {
+        column.Spacing(20);
+        
+        column.Item().Row(row =>
+        {
+            row.RelativeColumn().Component(new AddressComponent("From", Model.SellerAddress));
+            row.ConstantColumn(50);
+            row.RelativeColumn().Component(new AddressComponent("For", Model.CustomerAddress));
+        });
+
+        column.Item().Element(ComposeTable);
+
+        var totalPrice = Model.Items.Sum(x => x.Price * x.Quantity);
+        
+        column
+            .Item()
+            .PaddingRight(5)
+            .AlignRight()
+            .Text($"Grand total: {totalPrice}$", TextStyle.Default.SemiBold());
+
+        if (!string.IsNullOrWhiteSpace(Model.Comments))
+            column.Item().PaddingTop(25).Element(ComposeComments);
+    });
+}
+```
+
+**The table and comments** codes are extracted into separate methods to increase clarity:
+
+```csharp
+void ComposeTable(IContainer container)
+{
+    var headerStyle = TextStyle.Default.SemiBold();
+    
+    container.Table(table =>
+    {
+        table.ColumnsDefinition(columns =>
+        {
+            columns.ConstantColumn(25);
+            columns.RelativeColumn(3);
+            columns.RelativeColumn();
+            columns.RelativeColumn();
+            columns.RelativeColumn();
+        });
+        
+        table.Header(header =>
+        {
+            header.Cell().Text("#", headerStyle);
+            header.Cell().Text("Product", headerStyle);
+            header.Cell().AlignRight().Text("Unit price", headerStyle);
+            header.Cell().AlignRight().Text("Quantity", headerStyle);
+            header.Cell().AlignRight().Text("Total", headerStyle);
+            
+            header.Cell().ColumnSpan(5)
+                  .PaddingVertical(5).BorderBottom(1).BorderColor(Colors.Black);
+        });
+        
+        foreach (var item in Model.Items)
+        {
+            table.Cell().Element(CellStyle).Text(Model.Items.IndexOf(item) + 1);
+            table.Cell().Element(CellStyle).Text(item.Name);
+            table.Cell().Element(CellStyle).AlignRight().Text($"{item.Price}$");
+            table.Cell().Element(CellStyle).AlignRight().Text(item.Quantity);
+            table.Cell().Element(CellStyle).AlignRight().Text($"{item.Price * item.Quantity}$");
+            
+            static IContainer CellStyle(IContainer container)
+            {
+                container.BorderBottom(1).BorderColor(Colors.Grey.Lighten2).PaddingVertical(5);
+            }
+        }
+    });
+}
+```
+
+```csharp
+void ComposeComments(IContainer container)
+{
+    container.ShowEntire().Background(Colors.Grey.Lighten3).Padding(10).Stack(message => 
+    {
+        message.Spacing(5);
+        message.Item().Text("Comments", TextStyle.Default.Size(14).SemiBold());
+        message.Item().Text(Model.Comments);
+    });
+}
+```
+
+**The address details section** is implemented using components. This way the code can be easily reused for both seller and customer:
+
+```csharp
+public class AddressComponent : IComponent
+{
+    private string Title { get; }
+    private Address Address { get; }
+
+    public AddressComponent(string title, Address address)
+    {
+        Title = title;
+        Address = address;
+    }
+    
+    public void Compose(IContainer container)
+    {
+        container.ShowEntire().Stack(column =>
+        {
+            column.Spacing(5);
+
+            column
+                .Item()
+                .BorderBottom(1)
+                .PaddingBottom(5)
+                .Text(Title, TextStyle.Default.SemiBold());
+            
+            column.Item().Text(Address.CompanyName);
+            column.Item().Text(Address.Street);
+            column.Item().Text($"{Address.City}, {Address.State}");
+            column.Item().Text(Address.Email);
+            column.Item().Text(Address.Phone);
+        });
+    }
+}
+```