Implemented text shaping prototype

.editorconfig

@@ -1,131 +0,0 @@
-# Rules in this file were initially inferred by Visual Studio IntelliCode from the D:\GithubRepos\QuestPDF codebase based on best match to current usage at 16.03.2022
-# You can modify the rules from these initially generated values to suit your own policies
-# You can learn more about editorconfig here: https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference
-[*.cs]
-
-
-#Core editorconfig formatting - indentation
-
-#use soft tabs (spaces) for indentation
-indent_style = space
-
-#Formatting - new line options
-
-#place catch statements on a new line
-csharp_new_line_before_catch = true
-#place else statements on a new line
-csharp_new_line_before_else = true
-#require members of anonymous types to be on separate lines
-csharp_new_line_before_members_in_anonymous_types = true
-#require members of object intializers to be on separate lines
-csharp_new_line_before_members_in_object_initializers = true
-#require braces to be on a new line for object_collection_array_initializers, methods, anonymous_types, control_blocks, types, and lambdas (also known as "Allman" style)
-csharp_new_line_before_open_brace =all
-
-#Formatting - organize using options
-
-#sort System.* using directives alphabetically, and place them before other usings
-dotnet_sort_system_directives_first = true
-
-#Formatting - spacing options
-
-#require NO space between a cast and the value
-csharp_space_after_cast = false
-#require a space before the colon for bases or interfaces in a type declaration
-csharp_space_after_colon_in_inheritance_clause = true
-#require a space after a keyword in a control flow statement such as a for loop
-csharp_space_after_keywords_in_control_flow_statements = true
-#require a space before the colon for bases or interfaces in a type declaration
-csharp_space_before_colon_in_inheritance_clause = true
-#remove space within empty argument list parentheses
-csharp_space_between_method_call_empty_parameter_list_parentheses = false
-#remove space between method call name and opening parenthesis
-csharp_space_between_method_call_name_and_opening_parenthesis = false
-#do not place space characters after the opening parenthesis and before the closing parenthesis of a method call
-csharp_space_between_method_call_parameter_list_parentheses = false
-#remove space within empty parameter list parentheses for a method declaration
-csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
-#place a space character after the opening parenthesis and before the closing parenthesis of a method declaration parameter list.
-csharp_space_between_method_declaration_parameter_list_parentheses = false
-
-#Formatting - wrapping options
-
-#leave code block on single line
-csharp_preserve_single_line_blocks = true
-
-#Style - Code block preferences
-
-#prefer no curly braces if allowed
-csharp_prefer_braces = false:suggestion
-
-#Style - expression bodied member options
-
-#prefer block bodies for constructors
-csharp_style_expression_bodied_constructors = false:suggestion
-#prefer block bodies for methods
-csharp_style_expression_bodied_methods = false:suggestion
-#prefer expression-bodied members for properties
-csharp_style_expression_bodied_properties = true:suggestion
-
-#Style - expression level options
-
-#prefer out variables to be declared inline in the argument list of a method call when possible
-csharp_style_inlined_variable_declaration = true:suggestion
-#prefer the language keyword for member access expressions, instead of the type name, for types that have a keyword to represent them
-dotnet_style_predefined_type_for_member_access = true:suggestion
-
-#Style - Expression-level  preferences
-
-#prefer objects to be initialized using object initializers when possible
-dotnet_style_object_initializer = true:suggestion
-#prefer inferred anonymous type member names
-dotnet_style_prefer_inferred_anonymous_type_member_names = false:suggestion
-#prefer inferred tuple element names
-dotnet_style_prefer_inferred_tuple_names = true:suggestion
-
-#Style - implicit and explicit types
-
-#prefer var over explicit type in all cases, unless overridden by another code style rule
-csharp_style_var_elsewhere = true:suggestion
-#prefer var is used to declare variables with built-in system types such as int
-csharp_style_var_for_built_in_types = true:suggestion
-#prefer var when the type is already mentioned on the right-hand side of a declaration expression
-csharp_style_var_when_type_is_apparent = true:suggestion
-
-#Style - language keyword and framework type options
-
-#prefer the language keyword for local variables, method parameters, and class members, instead of the type name, for types that have a keyword to represent them
-dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
-
-#Style - Miscellaneous preferences
-
-#prefer local functions over anonymous functions
-csharp_style_pattern_local_over_anonymous_function = true:suggestion
-
-#Style - modifier options
-
-#prefer accessibility modifiers to be declared except for public interface members. This will currently not differ from always and will act as future proofing for if C# adds default interface methods.
-dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion
-
-#Style - Modifier preferences
-
-#when this rule is set to a list of modifiers, prefer the specified ordering.
-csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:silent
-
-#Style - Pattern matching
-
-#prefer pattern matching instead of is expression with type casts
-csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
-
-#Style - qualification options
-
-#prefer fields not to be prefaced with this. or Me. in Visual Basic
-dotnet_style_qualification_for_field = false:suggestion
-#prefer methods not to be prefaced with this. or Me. in Visual Basic
-dotnet_style_qualification_for_method = false:suggestion
-#prefer properties not to be prefaced with this. or Me. in Visual Basic
-dotnet_style_qualification_for_property = false:suggestion
-
-[*.{cs,vb}]
-tab_width=4
-indent_size=4

FUNDING.yml

@@ -1 +0,0 @@
-github: QuestPDF

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

@@ -16,7 +16,7 @@ namespace QuestPDF.Examples
                 .PageSize(PageSizes.A4)
                 .ProducePdf()
                 .ShowResults()
-                .Render(x => GenerateStructure(x, 12));
+                .Render(x => GenerateStructure(x, 16));
         }
 
         private void GenerateStructure(IContainer container, int level)

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

@@ -24,7 +24,7 @@ namespace QuestPDF.Examples
                     
                         page.Margin(20);
                         page.Size(PageSizes.A4);
-                        page.PageColor(Colors.White);
+                        page.Background(Colors.White);
         
                         page.Content().Column(column =>
                         {
@@ -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/DifferentHeaderOnFirstPageExample.cs

@@ -24,7 +24,7 @@ namespace QuestPDF.Examples
                     {
                         page.Size(PageSizes.A6);
                         page.Margin(5);
-                        page.PageColor(Colors.White);
+                        page.Background(Colors.White);
                         
                         page.Header().Column(column =>
                         {

QuestPDF.Examples/DynamicFibonacci.cs

@@ -1,106 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using NUnit.Framework;
-using QuestPDF.Elements;
-using QuestPDF.Examples.Engine;
-using QuestPDF.Fluent;
-using QuestPDF.Helpers;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Examples
-{
-    public struct FibonacciHeaderState
-    {
-        public int Previous { get; set; }
-        public int Current { get; set; }
-    }
-    
-    public class FibonacciHeader : IDynamicComponent<FibonacciHeaderState>
-    {
-        public FibonacciHeaderState State { get; set; }
-        
-        public static readonly string[] ColorsTable =
-        {
-            Colors.Red.Lighten2,
-            Colors.Orange.Lighten2,
-            Colors.Green.Lighten2,
-        };
-
-        public FibonacciHeader(int previous, int current)
-        {
-            State = new FibonacciHeaderState
-            {
-                Previous = previous,
-                Current = current
-            };
-        }
-
-        public DynamicComponentComposeResult Compose(DynamicContext context)
-        {
-            var content = context.CreateElement(container =>
-            {
-                var colorIndex = State.Current % ColorsTable.Length;
-                var color = ColorsTable[colorIndex];
-
-                var ratio = (float)State.Current / State.Previous;
-                
-                container
-                    .Background(color)
-                    .Height(50)
-                    .AlignMiddle()
-                    .AlignCenter()
-                    .Text($"{State.Current} / {State.Previous} = {ratio:N5}");
-            });
-
-            State = new FibonacciHeaderState
-            {
-                Previous = State.Current,
-                Current = State.Previous + State.Current
-            };
-            
-            return new DynamicComponentComposeResult
-            {
-                Content = content,
-                HasMoreContent = false
-            };
-        }
-    }
-    
-    public static class DynamicFibonacci
-    {
-        [Test]
-        public static void Dynamic()
-        {
-            RenderingTest
-                .Create()
-                .ShowResults()
-                .MaxPages(100)
-                .ProduceImages()
-                .RenderDocument(container =>
-                {
-                    container.Page(page =>
-                    {
-                        page.Size(PageSizes.A6);
-                        page.PageColor(Colors.White);
-                        page.Margin(1, Unit.Centimetre);
-                        page.DefaultTextStyle(x => x.FontSize(18));
-
-                        page.Header().Dynamic(new FibonacciHeader(17, 19));
-                        
-                        page.Content().Column(column =>
-                        {
-                            foreach (var i in Enumerable.Range(0, 50))
-                                column.Item().PaddingTop(25).Background(Colors.Grey.Lighten2).Height(50);
-                        });
-                        
-                        page.Footer().AlignCenter().Text(text =>
-                        {
-                            text.CurrentPageNumber();
-                            text.Span(" / ");
-                            text.TotalPages();
-                        });
-                    });
-                });
-        }
-    }
-}

QuestPDF.Examples/DynamicOptimizedExample.cs

@@ -1,185 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using NUnit.Framework;
-using QuestPDF.Elements;
-using QuestPDF.Examples.Engine;
-using QuestPDF.Fluent;
-using QuestPDF.Helpers;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Examples
-{
-    public class OrderItem
-    {
-        public string ItemName { get; set; } = Placeholders.Label();
-        public int Price { get; set; } = Placeholders.Random.Next(1, 11) * 10;
-        public int Count { get; set; } = Placeholders.Random.Next(1, 11);
-    }
-
-    public struct OrdersTableState
-    {
-        public int ShownItemsCount { get; set; }
-    }
-    
-    public class OptimizedOrdersTable : IDynamicComponent<OrdersTableState>
-    {
-        private ICollection<OrderItem> Items { get; }
-        public OrdersTableState State { get; set; }
-
-        public OptimizedOrdersTable(ICollection<OrderItem> items)
-        {
-            Items = items;
-
-            State = new OrdersTableState
-            {
-                ShownItemsCount = 0
-            };
-        }
-        
-        public DynamicComponentComposeResult Compose(DynamicContext context)
-        {
-            var header = ComposeHeader(context);
-            var sampleFooter = ComposeFooter(context, Enumerable.Empty<OrderItem>());
-            var decorationHeight = header.Size.Height + sampleFooter.Size.Height;
-            
-            var rows = GetItemsForPage(context, decorationHeight).ToList();
-            var footer = ComposeFooter(context, rows.Select(x => x.Item));
-
-            var content = context.CreateElement(container =>
-            {
-                container.MinimalBox().Decoration(decoration =>
-                {
-                    decoration.Header().Element(header);
-
-                    decoration.Content().Box().Stack(stack =>
-                    {
-                        foreach (var row in rows)
-                            stack.Item().Element(row.Element);
-                    });
-
-                    decoration.Footer().Element(footer);
-                });
-            });
-
-            State = new OrdersTableState
-            {
-                ShownItemsCount = State.ShownItemsCount + rows.Count
-            };
-
-            return new DynamicComponentComposeResult
-            {
-                Content = content,
-                HasMoreContent = State.ShownItemsCount < Items.Count
-            };
-        }
-
-        private IDynamicElement ComposeHeader(DynamicContext context)
-        {
-            return context.CreateElement(element =>
-            {
-                element
-                    .Width(context.AvailableSize.Width)
-                    .BorderBottom(1)
-                    .BorderColor(Colors.Grey.Darken2)
-                    .Padding(5)
-                    .Row(row =>
-                    {
-                        var textStyle = TextStyle.Default.SemiBold();
-
-                        row.ConstantItem(30).Text("#", textStyle);
-                        row.RelativeItem().Text("Item name", textStyle);
-                        row.ConstantItem(50).AlignRight().Text("Count", textStyle);
-                        row.ConstantItem(50).AlignRight().Text("Price", textStyle);
-                        row.ConstantItem(50).AlignRight().Text("Total", textStyle);
-                    });
-            });
-        }
-        
-        private IDynamicElement ComposeFooter(DynamicContext context, IEnumerable<OrderItem> items)
-        {
-            var total = items.Sum(x => x.Count * x.Price);
-
-            return context.CreateElement(element =>
-            {
-                element
-                    .Width(context.AvailableSize.Width)
-                    .Padding(5)
-                    .AlignRight()
-                    .Text($"Subtotal: {total}$", TextStyle.Default.Size(14).SemiBold());
-            });
-        }
-        
-        private IEnumerable<(OrderItem Item, IDynamicElement Element)> GetItemsForPage(DynamicContext context, float decorationHeight)
-        {
-            var totalHeight = decorationHeight;
-
-            foreach (var index in Enumerable.Range(State.ShownItemsCount, Items.Count - State.ShownItemsCount))
-            {
-                var item = Items.ElementAt(index);
-                
-                var element = context.CreateElement(content =>
-                {
-                    content
-                        .Width(context.AvailableSize.Width)
-                        .BorderBottom(1)
-                        .BorderColor(Colors.Grey.Lighten2)
-                        .Padding(5)
-                        .Row(row =>
-                        {
-                            row.ConstantItem(30).Text(index + 1);
-                            row.RelativeItem().Text(item.ItemName);
-                            row.ConstantItem(50).AlignRight().Text(item.Count);
-                            row.ConstantItem(50).AlignRight().Text($"{item.Price}$");
-                            row.ConstantItem(50).AlignRight().Text($"{item.Count*item.Price}$");
-                        });
-                });
-
-                var elementHeight = element.Size.Height;
-                    
-                if (totalHeight + elementHeight > context.AvailableSize.Height)
-                    break;
-                    
-                totalHeight += elementHeight;
-                yield return (item, element);
-            }
-        }
-    }
-    
-    public static class DynamicOptimizedExamples
-    {
-        [Test]
-        public static void Dynamic()
-        {
-            RenderingTest
-                .Create()
-                .PageSize(PageSizes.A5)
-                .ShowResults()
-                .Render(container =>
-                {
-                    var items = Enumerable.Range(0, 25).Select(x => new OrderItem()).ToList();
-                    
-                    container
-                        .Background(Colors.White)
-                        .Padding(25)
-                        .Decoration(decoration =>
-                        {
-                            decoration
-                                .Header()
-                                .PaddingBottom(5)
-                                .Text(text =>
-                                {
-                                    text.DefaultTextStyle(TextStyle.Default.SemiBold().FontColor(Colors.Blue.Darken2).FontSize(16));
-                                    text.Span("Page ");
-                                    text.CurrentPageNumber();
-                                    text.Span(" of ");
-                                    text.TotalPages();
-                                });
-                            
-                            decoration
-                                .Content()
-                                .Dynamic(new OptimizedOrdersTable(items));
-                        });
-                });
-        }
-    }
-}

QuestPDF.Examples/DynamicPageNumberLeftRight.cs

@@ -1,69 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using NUnit.Framework;
-using QuestPDF.Elements;
-using QuestPDF.Examples.Engine;
-using QuestPDF.Fluent;
-using QuestPDF.Helpers;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Examples
-{
-    public class FooterWithAlternatingAlignment : IDynamicComponent<int>
-    {
-        public int State { get; set; }
-        
-        public DynamicComponentComposeResult Compose(DynamicContext context)
-        {
-            var content = context.CreateElement(element =>
-            {
-                element
-                    .Element(x => context.PageNumber % 2 == 0 ? x.AlignLeft() : x.AlignRight())
-                    .Text(x =>
-                    {
-                        x.CurrentPageNumber();
-                        x.Span(" / ");
-                        x.TotalPages();
-                    });
-            });
-            
-            return new DynamicComponentComposeResult()
-            {
-                Content = content,
-                HasMoreContent = false
-            };
-        }
-    }
-    
-    public static class DynamicPageNumberLeftRightExamples
-    {
-        [Test]
-        public static void Dynamic()
-        {
-            RenderingTest
-                .Create()
-                .PageSize(PageSizes.A5)
-                .MaxPages(100)
-                .ShowResults()
-                .ProduceImages()
-                .RenderDocument(container =>
-                {
-                    container.Page(page =>
-                    {
-                        page.Size(PageSizes.A6);
-                        page.PageColor(Colors.White);
-                        page.Margin(1, Unit.Centimetre);
-                        page.DefaultTextStyle(x => x.FontSize(18));
-
-                        page.Content().Column(column =>
-                        {
-                            foreach (var i in Enumerable.Range(0, 50))
-                                column.Item().PaddingTop(25).Background(Colors.Grey.Lighten2).Height(50);
-                        });
-                        
-                        page.Footer().Dynamic(new FooterWithAlternatingAlignment());
-                    });
-                });
-        }
-    }
-}

QuestPDF.Examples/DynamicProgressHeader.cs

@@ -1,76 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using NUnit.Framework;
-using QuestPDF.Elements;
-using QuestPDF.Examples.Engine;
-using QuestPDF.Fluent;
-using QuestPDF.Helpers;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Examples
-{
-    public class ProgressHeader : IDynamicComponent<int>
-    {
-        public int State { get; set; }
-        
-        public DynamicComponentComposeResult Compose(DynamicContext context)
-        {
-            var content = context.CreateElement(container =>
-            {
-                var width = context.AvailableSize.Width * context.PageNumber / context.TotalPages;
-                
-                container
-                    .Background(Colors.Blue.Lighten2)
-                    .Height(25)
-                    .Width(width)
-                    .Background(Colors.Blue.Darken1);
-            });
-
-            return new DynamicComponentComposeResult
-            {
-                Content = content,
-                HasMoreContent = false
-            };
-        }
-    }
-    
-    public static class DynamicProgressHeader
-    {
-        [Test]
-        public static void Dynamic()
-        {
-            RenderingTest
-                .Create()
-                .ShowResults()
-                .MaxPages(100)
-                .ProduceImages()
-                .RenderDocument(container =>
-                {
-                    container.Page(page =>
-                    {
-                        page.Size(PageSizes.A6);
-                        page.Margin(1, Unit.Centimetre);
-                        page.PageColor(Colors.White);
-                        page.DefaultTextStyle(x => x.FontSize(20));
-
-                        page.Header().Dynamic(new ProgressHeader());
-                        
-                        page.Content().Column(column =>
-                        {
-                            foreach (var i in Enumerable.Range(0, 100))
-                                column.Item().PaddingTop(25).Background(Colors.Grey.Lighten2).Height(50);
-                        });
-
-                        page.Footer().AlignCenter().Text(text =>
-                        {
-                            text.DefaultTextStyle(x => x.FontSize(20));
-                            
-                            text.CurrentPageNumber();
-                            text.Span(" / ");
-                            text.TotalPages();
-                        });
-                    });
-                });
-        }
-    }
-}

QuestPDF.Examples/DynamicSimpleTableExample.cs

@@ -1,157 +0,0 @@
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using NUnit.Framework;
-using QuestPDF.Elements;
-using QuestPDF.Examples.Engine;
-using QuestPDF.Fluent;
-using QuestPDF.Helpers;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Examples
-{
-    public class OrdersTable : IDynamicComponent<OrdersTableState>
-    {
-        private IList<OrderItem> Items { get; }
-        public OrdersTableState State { get; set; }
-
-        public OrdersTable(IList<OrderItem> items)
-        {
-            Items = items;
-
-            State = new OrdersTableState
-            {
-                ShownItemsCount = 0
-            };
-        }
-        
-        public DynamicComponentComposeResult Compose(DynamicContext context)
-        {
-            var possibleItems = Enumerable
-                .Range(1, Items.Count - State.ShownItemsCount)
-                .Select(itemsToDisplay => ComposeContent(context, itemsToDisplay))
-                .TakeWhile(x => x.Size.Height <= context.AvailableSize.Height)
-                .ToList();
-
-            State = new OrdersTableState
-            {
-                ShownItemsCount = State.ShownItemsCount + possibleItems.Count
-            };
-
-            return new DynamicComponentComposeResult
-            {
-                Content = possibleItems.Last(),
-                HasMoreContent = State.ShownItemsCount < Items.Count
-            };
-        }
-
-        private IDynamicElement ComposeContent(DynamicContext context, int itemsToDisplay)
-        {
-            var total = Items.Skip(State.ShownItemsCount).Take(itemsToDisplay).Sum(x => x.Count * x.Price);
-
-            return context.CreateElement(container =>
-            {
-                container
-                    .MinimalBox()
-                    .Width(context.AvailableSize.Width)
-                    .Table(table =>
-                    {
-                        table.ColumnsDefinition(columns =>
-                        {
-                            columns.ConstantColumn(30);
-                            columns.RelativeColumn();
-                            columns.ConstantColumn(50);
-                            columns.ConstantColumn(50);
-                            columns.ConstantColumn(50);
-                        });
-                        
-                        table.Header(header =>
-                        {
-                            header.Cell().Element(Style).Text("#");
-                            header.Cell().Element(Style).Text("Item name");
-                            header.Cell().Element(Style).AlignRight().Text("Count");
-                            header.Cell().Element(Style).AlignRight().Text("Price");
-                            header.Cell().Element(Style).AlignRight().Text("Total");
-
-                            IContainer Style(IContainer container)
-                            {
-                                return container
-                                    .DefaultTextStyle(x => x.SemiBold())
-                                    .BorderBottom(1)
-                                    .BorderColor(Colors.Grey.Darken2)
-                                    .Padding(5);
-                            }
-                        });
-                        
-                        table.Footer(footer =>
-                        {
-                            footer
-                                .Cell().ColumnSpan(5)
-                                .AlignRight()
-                                .PaddingTop(10)
-                                .Text($"Subtotal: {total}$", TextStyle.Default.Bold());
-                        });
-                        
-                        foreach (var index in Enumerable.Range(State.ShownItemsCount, itemsToDisplay))
-                        {
-                            var item = Items[index];
-                                
-                            table.Cell().Element(Style).Text(index + 1);
-                            table.Cell().Element(Style).Text(item.ItemName);
-                            table.Cell().Element(Style).AlignRight().Text(item.Count);
-                            table.Cell().Element(Style).AlignRight().Text($"{item.Price}$");
-                            table.Cell().Element(Style).AlignRight().Text($"{item.Count*item.Price}$");
-
-                            IContainer Style(IContainer container)
-                            {
-                                return container
-                                    .BorderBottom(1)
-                                    .BorderColor(Colors.Grey.Lighten2)
-                                    .Padding(5);
-                            }
-                        }
-                    });
-            });
-        }
-    }
-    
-    public static class DynamicSimpleTableExample
-    {
-        [Test]
-        public static void Dynamic()
-        {
-            RenderingTest
-                .Create()
-                .PageSize(PageSizes.A5)
-                .ShowResults()
-                .ProduceImages()
-                .Render(container =>
-                {
-                    var items = Enumerable.Range(0, 15).Select(x => new OrderItem()).ToList();
-                    
-                    container
-                        .Background(Colors.White)
-                        .Padding(25)
-                        .DefaultTextStyle(x => x.FontSize(16))
-                        .Decoration(decoration =>
-                        {
-                            decoration
-                                .Header()
-                                .PaddingBottom(5)
-                                .Text(text =>
-                                {
-                                    text.DefaultTextStyle(TextStyle.Default.SemiBold().FontColor(Colors.Blue.Darken2));
-                                    text.Span("Page ");
-                                    text.CurrentPageNumber();
-                                    text.Span(" / ");
-                                    text.TotalPages();
-                                });
-                            
-                            decoration
-                                .Content()
-                                .Dynamic(new OrdersTable(items));
-                        });
-                });
-        }
-    }
-}

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));
                             }
                         });
                 });
@@ -742,7 +730,7 @@ namespace QuestPDF.Examples
                 {
                     container
                         .Padding(25)
-                        .PaddingLeft(50)
+                        .PaddingLeft(75)
                         .Column(column =>
                         {
                             column.Item().Width(300).Height(150).Background(Colors.Blue.Lighten4);

QuestPDF.Examples/Engine/RenderingTest.cs

@@ -23,8 +23,6 @@ namespace QuestPDF.Examples.Engine
         private bool ApplyCaching { get; set; }
         private bool ApplyDebugging { get; set; }
         private RenderingTestResult ResultType { get; set; } = RenderingTestResult.Images;
-
-        private bool ShowingResultsEnabled = true;
         
         private RenderingTest()
         {
@@ -116,7 +114,7 @@ namespace QuestPDF.Examples.Engine
                 Func<int, string> fileNameSchema = i => $"{FileNamePrefix}-${i}.png";
                 document.GenerateImages(fileNameSchema);
                 
-                if (ShowResult && ShowingResultsEnabled)
+                if (ShowResult)
                     Process.Start("explorer", fileNameSchema(0));
             }
 
@@ -125,7 +123,7 @@ namespace QuestPDF.Examples.Engine
                 var fileName = $"{FileNamePrefix}.pdf";
                 document.GeneratePdf(fileName);
                 
-                if (ShowResult && ShowingResultsEnabled)
+                if (ShowResult)
                     Process.Start("explorer", fileName);
             }
         }

QuestPDF.Examples/EnsureSpaceExample.cs

@@ -21,9 +21,9 @@ namespace QuestPDF.Examples
                     {
                         page.Margin(20);
                         page.Size(PageSizes.A7.Landscape());
-                        page.PageColor(Colors.White);
+                        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/GenerationBenchmark.cs

@@ -1,146 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using NUnit.Framework;
-using QuestPDF.Elements;
-using QuestPDF.Fluent;
-using QuestPDF.Helpers;
-
-namespace QuestPDF.Examples
-{
-    public class ProcessRunningTime
-    {
-        public TimeSpan FluentTime { get; set; }
-        public TimeSpan GenerationTime { get; set; }
-        public float Size { get; set; }
-    }
-    
-    public class GenerationBenchmark
-    {
-        public const int TestSize = 4096;
-        
-        [Test]
-        public void BenchmarkAsync()
-        {
-            RunTest(() => Enumerable
-                .Range(0, TestSize)
-                .AsParallel() // difference
-                .Select(GenerateAndCollect)
-                .ToList());
-        }
-        
-        [Test]
-        public void BenchmarkSync()
-        {
-            RunTest(() => Enumerable
-                .Range(0, TestSize)
-                .Select(GenerateAndCollect)
-                .ToList());
-        }
-
-        public void RunTest(Func<IEnumerable<ProcessRunningTime>> handler)
-        {
-            var totalFluentTime = TimeSpan.Zero;
-            var totalGenerationTime = TimeSpan.Zero;
-
-            var stopWatch = new Stopwatch();
-            
-            stopWatch.Start();
-            var results = handler();
-            stopWatch.Stop();
-            
-            foreach (var result in results)
-            {
-                totalFluentTime += result.FluentTime;
-                totalGenerationTime += result.GenerationTime;
-            }
-
-            Console.WriteLine($"Fluent: {totalFluentTime:g}");
-            Console.WriteLine($"Generation: {totalGenerationTime:g}");
-            Console.WriteLine($"Total: {stopWatch.Elapsed:g}");
-        }
-        
-        static ProcessRunningTime GenerateAndCollect(int attemptNumber)
-        {
-            var stopwatch = new Stopwatch();
-            stopwatch.Start();
-            
-            var container = new Container();
-            
-            container
-                .Padding(10)
-                .MinimalBox()
-                .Border(1)
-                .Column(column =>
-                {
-                    column.Item().Text($"Attempts {attemptNumber}");
-                    
-                    const int numberOfRows = 100;
-                    const int numberOfColumns = 10;
-
-                    for (var y = 0; y < numberOfRows; y++)
-                    {
-                        column.Item().Row(row =>
-                        {
-                            for (var x = 0; x < numberOfColumns; x++)
-                            {
-                                row.RelativeItem()
-                                    
-                                    .Background(Colors.Red.Lighten5)
-                                    .Padding(3)
-                                    
-                                    .Background(Colors.Red.Lighten4)
-                                    .Padding(3)
-                                    
-                                    .Background(Colors.Red.Lighten3)
-                                    .Padding(3)
-                                    
-                                    .Background(Colors.Red.Lighten2)
-                                    .Padding(3)
-                                    
-                                    .Background(Colors.Red.Lighten1)
-                                    .Padding(3)
-                                    
-                                    .Background(Colors.Red.Medium)
-                                    .Padding(3)
-                                    
-                                    .Background(Colors.Red.Darken1)
-                                    .Padding(3)
-                                    
-                                    .Background(Colors.Red.Darken2)
-                                    .Padding(3)
-                                    
-                                    .Background(Colors.Red.Darken3)
-                                    .Padding(3)
-                                    
-                                    .Background(Colors.Red.Darken4)
-                                    .Height(3);
-                            }
-                        });
-                    }  
-                });
-
-            var fluentTime = stopwatch.Elapsed;
-            
-            stopwatch.Reset();
-            stopwatch.Start();
-
-            var size = Document
-                .Create(x => x.Page(page => page.Content().Element(container)))
-                .GeneratePdf()
-                .Length;
-
-            var generationTime = stopwatch.Elapsed;
-            
-            return new ProcessRunningTime
-            {
-                FluentTime = fluentTime,
-                GenerationTime = generationTime,
-                Size = size
-            };
-        }
-    }
-}

QuestPDF.Examples/GridBenchmark.cs

@@ -1,42 +0,0 @@
-using System.Linq;
-using NUnit.Framework;
-using QuestPDF.Examples.Engine;
-using QuestPDF.Fluent;
-using QuestPDF.Helpers;
-
-namespace QuestPDF.Examples
-{
-    public class GridBenchmark
-    {
-        [Test]
-        public void Benchmark()
-        {
-            RenderingTest
-                .Create()
-                .ProducePdf()
-                .PageSize(PageSizes.A4)
-                .ShowResults()
-                .MaxPages(10_000)
-                .EnableCaching(true)
-                .EnableDebugging(false)
-                .Render(container =>
-                {
-                    container
-                        .Padding(10)
-                        .MinimalBox()
-                        .Border(1)
-                        .Grid(grid =>
-                        {
-                            const int numberOfRows = 100_000;
-                            const int numberOfColumns = 10;
-                            
-                            grid.Columns(numberOfColumns);
-                            
-                            foreach (var row in Enumerable.Range(0, numberOfRows))
-                            foreach (var column in Enumerable.Range(0, numberOfColumns))
-                                grid.Item().Background(Placeholders.BackgroundColor()).Padding(5).Text($"{row}_{column}");
-                        });
-                });
-        }
-    }
-}

QuestPDF.Examples/ImageExamples.cs

@@ -1,5 +1,4 @@
-using System;
-using System.IO;
+using System.IO;
 using NUnit.Framework;
 using QuestPDF.Drawing.Exceptions;
 using QuestPDF.Examples.Engine;
@@ -35,21 +34,6 @@ namespace QuestPDF.Examples
                 });
         }
         
-        [Test]
-        public void DynamicImage()
-        {
-            RenderingTest
-                .Create()
-                .PageSize(450, 350)
-                .ProducePdf()
-                .ShowResults()
-                .Render(page =>
-                {
-                    page.Padding(25)
-                        .Image(Placeholders.Image);
-                });
-        }
-        
         [Test]
         public void Exception()
         {
@@ -63,43 +47,5 @@ namespace QuestPDF.Examples
                     .Render(page => page.Image("non_existent.png"));
             });
         }
-        
-        [Test]
-        public void ReusingTheSameImageFileShouldBePossible()
-        {
-            var fileName = Path.GetTempFileName() + ".jpg";
-            
-            try
-            {
-                var image = Placeholders.Image(300, 100);
-                
-                using var file = File.Create(fileName);
-                file.Write(image);
-                file.Dispose();
-                
-                RenderingTest
-                    .Create()
-                    .ProducePdf()
-                    .PageSize(PageSizes.A4)
-                    .ShowResults()
-                    .Render(container =>
-                    {
-                        container
-                            .Padding(20)
-                            .Column(column =>
-                            {
-                                column.Spacing(20);
-                                
-                                column.Item().Image(fileName);
-                                column.Item().Image(fileName);
-                                column.Item().Image(fileName);
-                            });
-                    });
-            }
-            finally
-            {
-                File.Delete(fileName);
-            }
-        }
     }
 }

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,32 +19,21 @@ namespace QuestPDF.Examples
                 {
                     container.Page(page =>
                     {
-                        page.Size(PageSizes.A4);
-                        page.Margin(2, Unit.Centimetre);
-                        page.PageColor(Colors.White);
-                        page.DefaultTextStyle(x => x.FontSize(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");

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

@@ -1,57 +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 PageBackgroundForegroundExample
-    {
-        [Test]
-        public void PageBackgroundForeground()
-        {
-            RenderingTest
-                .Create()
-                .ProduceImages()
-                .MaxPages(100)
-                .ShowResults()
-                .RenderDocument(document =>
-                {
-                    document.Page(page =>
-                    {
-                        page.Size(PageSizes.A4);
-                        page.Margin(1, Unit.Inch);
-                        page.DefaultTextStyle(TextStyle.Default.FontSize(16));
-                        page.PageColor(Colors.White);
-
-                        const string transparentBlue = "#662196f3";
-
-                        page.Background()
-                            .AlignTop()
-                            .ExtendHorizontal()
-                            .Height(200)
-                            .Background(transparentBlue);
-                        
-                        page.Foreground()
-                            .AlignBottom()
-                            .ExtendHorizontal()
-                            .Height(250)
-                            .Background(transparentBlue);
-                        
-                        page.Header().Text("Background and foreground").Bold().FontColor(Colors.Blue.Darken2).FontSize(36);
-                        
-                        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/QuestPDF.Examples.csproj

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

QuestPDF.Examples/RepeatContentExamples.cs

@@ -1,38 +0,0 @@
-using System.Linq;
-using NUnit.Framework;
-using QuestPDF.Examples.Engine;
-using QuestPDF.Fluent;
-using QuestPDF.Helpers;
-
-namespace QuestPDF.Examples
-{
-    public class RepeatContentExamples
-    {
-        [Test]
-        public void ItemTypes()
-        {
-            RenderingTest
-                .Create()
-                .ProducePdf()
-                .PageSize(PageSizes.A4)
-                .ShowResults()
-                .Render(container =>
-                {
-                    container
-                        .Padding(25)
-                        .Decoration(decoration =>
-                        {
-                            decoration.Before().Text("Test").FontSize(22);
-                            
-                            decoration.Content().Column(column =>
-                            {
-                                column.Spacing(20);
-
-                                foreach (var _ in Enumerable.Range(0, 10))
-                                    column.Item().Background(Colors.Grey.Medium).ExtendHorizontal().Height(80);
-                            }); 
-                        });
-                });
-        }
-    }
-}

QuestPDF.Examples/RowExamples.cs

@@ -105,41 +105,5 @@ namespace QuestPDF.Examples
                         .Row(row => { });
                 });
         }
-        
-        [Test]
-        public void RowElementForRelativeHeightDivision()
-        {
-            RenderingTest
-                .Create()
-                .ProduceImages()
-                .ShowResults()
-                .MaxPages(100)
-                .PageSize(250, 400)
-                .Render(container =>
-                {
-                    container
-                        .Padding(25)
-                        .AlignLeft()
-                        .RotateRight()
-                        .Row(row =>
-                        {
-                            row.Spacing(20);
-
-                            row.RelativeItem(1).Element(Content);
-                            row.RelativeItem(2).Element(Content);
-                            row.RelativeItem(3).Element(Content);
-
-                            void Content(IContainer container)
-                            {
-                                container
-                                    .RotateLeft()
-                                    .Border(1)
-                                    .Background(Placeholders.BackgroundColor())
-                                    .Padding(5)
-                                    .Text(Placeholders.Label());
-                            }
-                        });
-                });
-        }
     }
 }

QuestPDF.Examples/ShowOnceExample.cs

@@ -21,9 +21,9 @@ namespace QuestPDF.Examples
                     {
                         page.Margin(20);
                         page.Size(PageSizes.A7.Landscape());
-                        page.PageColor(Colors.White);
+                        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

@@ -21,7 +21,7 @@ namespace QuestPDF.Examples
                     {
                         page.Margin(20);
                         page.Size(PageSizes.A7.Landscape());
-                        page.PageColor(Colors.White);
+                        page.Background(Colors.White);
         
                         page.Header().Column(column =>
                         {
@@ -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/TableBenchmark.cs

@@ -1,46 +0,0 @@
-using System.Linq;
-using NUnit.Framework;
-using QuestPDF.Examples.Engine;
-using QuestPDF.Fluent;
-using QuestPDF.Helpers;
-
-namespace QuestPDF.Examples
-{
-    public class TableBenchmark
-    {
-        [Test]
-        public void Benchmark()
-        {
-            RenderingTest
-                .Create()
-                .ProducePdf()
-                .PageSize(PageSizes.A4)
-                .ShowResults()
-                .MaxPages(10_000)
-                .EnableCaching(true)
-                .EnableDebugging(false)
-                .Render(container =>
-                {
-                    container
-                        .Padding(10)
-                        .MinimalBox()
-                        .Border(1)
-                        .Table(table =>
-                        {
-                            const int numberOfRows = 100_000;
-                            const int numberOfColumns = 10;
-                            
-                            table.ColumnsDefinition(columns =>
-                            {
-                                foreach (var _ in Enumerable.Range(0, numberOfColumns))
-                                    columns.RelativeColumn();
-                            });
-
-                            foreach (var row in Enumerable.Range(0, numberOfRows))
-                            foreach (var column in Enumerable.Range(0, numberOfColumns))
-                                table.Cell().Background(Placeholders.BackgroundColor()).Padding(5).Text($"{row}_{column}");
-                        });
-                });
-        }
-    }
-}

QuestPDF.Examples/TextBenchmark.cs

@@ -23,7 +23,7 @@ namespace QuestPDF.Examples
                 .PageSize(PageSizes.A4)
                 .ProducePdf()
                 .ShowResults()
-                .RenderDocument(x => ComposeBook(x, chapters));
+                .Render(x => ComposeBook(x, chapters));
         }
         
         [Test]
@@ -31,7 +31,7 @@ namespace QuestPDF.Examples
         {
             var chapters = GetBookChapters().ToList();
   
-            var results = PerformTest(128).ToList();
+            var results = PerformTest(16).ToList();
  
             Console.WriteLine($"Min: {results.Min():F}");
             Console.WriteLine($"Max: {results.Max():F}");
@@ -42,8 +42,8 @@ namespace QuestPDF.Examples
                 RenderingTest
                     .Create()
                     .PageSize(PageSizes.A4)
-                    .ProducePdf()
-                    .RenderDocument(x => ComposeBook(x, chapters));
+                        .ProducePdf()
+                    .Render(x => ComposeBook(x, chapters));
             }
 
             IEnumerable<float> PerformTest(int attempts)
@@ -102,30 +102,37 @@ namespace QuestPDF.Examples
             }
         }
         
-        private void ComposeBook(IDocumentContainer container, ICollection<BookChapter> chapters)
+        private void ComposeBook(IContainer container, ICollection<BookChapter> chapters)
         {
             var subtitleStyle = TextStyle.Default.Size(24).SemiBold().Color(Colors.Blue.Medium);
             var normalStyle = TextStyle.Default.Size(14);
+            
+            ComposePage(container);
 
-            container.Page(page =>
+            void ComposePage(IContainer container)
             {
-                page.Margin(50);
-                
-                page.Content().PaddingVertical(10).Column(column =>
-                {
-                    column.Item().Element(Title);
-                    column.Item().PageBreak();
-                    column.Item().Element(TableOfContents);
-                    column.Item().PageBreak();
+                container
+                    .Padding(50)
+                    .Decoration(decoration =>
+                    {
+                        decoration
+                            .Content()
+                            .Column(column =>
+                            {
+                                column.Item().Element(Title);
+                                column.Item().PageBreak();
+                                column.Item().Element(TableOfContents);
+                                column.Item().PageBreak();
 
-                    Chapters(column);
+                                Chapters(column);
 
-                    column.Item().Element(Acknowledgements);
-                });
-                
-                page.Footer().Element(Footer);
-            });
+                                column.Item().Element(Acknowledgements);
+                            });
 
+                        decoration.After().Element(Footer);
+                    });
+            }
+            
             void Title(IContainer container)
             {
                 container
@@ -134,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));
                     });
             }
 
@@ -149,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));
                         });
                     }
                 });
@@ -173,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();
@@ -191,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!");
                     });
                 });
@@ -199,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

@@ -2,7 +2,6 @@
 using System.Linq;
 using System.Text;
 using NUnit.Framework;
-using QuestPDF.Elements.Text;
 using QuestPDF.Examples.Engine;
 using QuestPDF.Fluent;
 using QuestPDF.Helpers;
@@ -12,32 +11,12 @@ namespace QuestPDF.Examples
 {
     public class TextExamples
     {
-        [Test]
-        public void SimpleText()
-        {
-            RenderingTest
-                .Create()
-                .PageSize(500, 100)
-                
-                .ProduceImages()
-                .ShowResults()
-                .Render(container =>
-                {
-                    container
-                        .Padding(5)
-                        .MinimalBox()
-                        .Border(1)
-                        .Padding(10)
-                        .Text(Placeholders.Paragraph());
-                });
-        }
-        
         [Test]
         public void SimpleTextBlock()
         {
             RenderingTest
                 .Create()
-                .PageSize(600, 300)
+                .PageSize(500, 300)
                 
                 .ProduceImages()
                 .ShowResults()
@@ -47,173 +26,22 @@ namespace QuestPDF.Examples
                         .Padding(5)
                         .MinimalBox()
                         .Border(1)
-                        .MaxWidth(300)
                         .Padding(10)
                         .Text(text =>
                         {
-                            text.DefaultTextStyle(TextStyle.Default.FontSize(20));
+                            text.DefaultTextStyle(TextStyle.Default.Size(20));
                             text.Span("This is a normal text, followed by an ");
-                            text.Span("underlined red text").FontColor(Colors.Red.Medium).Underline();
-                            text.Span(".");
-                        });
-                });
-        }
-
-        [Test]
-        public void TextWeight()
-        {
-            RenderingTest
-                .Create()
-                .PageSize(500, 500)
-                .ProduceImages()
-                .ShowResults()
-                .Render(container =>
-                {
-                    container
-                        .Padding(20)
-                        .MinimalBox()
-                        .Border(1)
-                        .Padding(20)
-                        .Text(text =>
-                        {
-                            text.DefaultTextStyle(x => x.FontFamily(Fonts.Calibri).FontSize(20));
-
-                            text.Line("Thin").Thin();
-                            text.Line("ExtraLight").ExtraLight();
-                            text.Line("Light").Light();
-                            text.Line("NormalWeight").NormalWeight();
-                            text.Line("Medium").Medium();
-                            text.Line("SemiBold").SemiBold();
-                            text.Line("Bold").Bold();
-                            text.Line("ExtraBold").ExtraBold();
-                            text.Line("Black").Black();
-                            text.Line("ExtraBlack").ExtraBlack();
+                            text.Span("underlined red text.", TextStyle.Default.Size(20).Color(Colors.Red.Medium).Underline());
                         });
                 });
         }
         
-        [Test]
-        public void LineHeight()
-        {
-            RenderingTest
-                .Create()
-                .PageSize(500, 700)
-                .ProduceImages()
-                .ShowResults()
-                .Render(container =>
-                {
-                    container
-                        .Padding(20)
-                        .Column(column =>
-                        {
-                            var lineHeights = new[] { 0.8f, 1f, 1.5f };
-                            var paragraph = Placeholders.Paragraph();
-
-                            foreach (var lineHeight in lineHeights)
-                            {
-                                column
-                                    .Item()
-                                    .Border(1)
-                                    .Padding(10)
-                                    .Text(paragraph)
-                                    .FontSize(16)
-                                    .LineHeight(lineHeight);
-                            }
-                        });
-                });
-        }
-        
-        [Test]
-        public void SuperscriptSubscript_Simple()
-        {
-            RenderingTest
-                .Create()
-                .PageSize(500, 500)
-                .ProduceImages()
-                .ShowResults()
-                .Render(container =>
-                {
-                    container
-                        .Padding(20)
-                        .MinimalBox()
-                        .Border(1)
-                        .Padding(20)
-                        .Text(text =>
-                        {
-                            text.DefaultTextStyle(x => x.FontSize(20));
-                            text.ParagraphSpacing(10);
-
-                            var highlight = TextStyle.Default.BackgroundColor(Colors.Green.Lighten3);
-
-                            text.Span("E=mc").Style(highlight);
-                            text.Span("2").Superscript().Style(highlight);
-                            text.Span(" is the equation of mass–energy equivalence.");
-
-                            text.EmptyLine();
-                            
-                            text.Span("H").Style(highlight);
-                            text.Span("2").Subscript().Style(highlight);
-                            text.Span("O").Style(highlight);
-                            text.Span(" is the chemical formula for water.");
-                        });
-                });
-        }
-
-        [Test]
-        public void SuperscriptSubscript_Effects()
-        {
-            RenderingTest
-               .Create()
-               .PageSize(800, 400)
-               .ProduceImages()
-               .ShowResults()
-               .Render(container =>
-               {
-                   container
-                        .Padding(25)
-                        .DefaultTextStyle(x => x.FontSize(30))
-                        .Column(column =>
-                        {
-                            column.Spacing(25);
-                            
-                            column.Item().Text(text =>
-                            {
-                                text.DefaultTextStyle(x => x.Underline());
-                                
-                                text.Span("Underline of the superscript (E = mc");
-                                text.Span("2").Superscript();
-                                text.Span(") should be at the same height as for normal text.");
-                            });
-                            
-                            column.Item().Text(text =>
-                            {
-                                text.DefaultTextStyle(x => x.Underline());
-                                
-                                text.Span("Underline of the subscript(H");
-                                text.Span("2").Subscript();
-                                text.Span("O) should be slightly lower than a normal text.");
-                            });
-                            
-                            column.Item().Text(text =>
-                            {
-                                text.DefaultTextStyle(x => x.Strikethrough());
-                                
-                                text.Span("Strikethrough of both superscript (E=mc");
-                                text.Span("2").Superscript();
-                                text.Span(") and subscript(H");
-                                text.Span("2").Subscript();
-                                text.Span("O) should be visible in the middle of the text.");
-                            });
-                        });
-               });
-        }
-
         [Test]
         public void ParagraphSpacing()
         {
             RenderingTest
                 .Create()
-                .PageSize(500, 500)
+                .PageSize(500, 300)
                 .ProduceImages()
                 .ShowResults()
                 .Render(container =>
@@ -225,7 +53,13 @@ namespace QuestPDF.Examples
                         .Padding(10)
                         .Text(text =>
                         {
-                            text.Line(Placeholders.Paragraph());
+                            text.ParagraphSpacing(10);
+    
+                            foreach (var i in Enumerable.Range(1, 3))
+                            {
+                                text.Span($"Paragraph {i}: ", TextStyle.Default.SemiBold());
+                                text.Line(Placeholders.Paragraph());
+                            }
                         });
                 });
         }
@@ -247,7 +81,7 @@ namespace QuestPDF.Examples
                         .Padding(10)
                         .Text(text =>
                         {
-                            text.DefaultTextStyle(TextStyle.Default.FontSize(20));
+                            text.DefaultTextStyle(TextStyle.Default.Size(20));
                             text.Span("This is a random image aligned to the baseline: ");
                             
                             text.Element()
@@ -286,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());
                         });
                 });
         }
@@ -339,8 +173,6 @@ namespace QuestPDF.Examples
                         .Padding(10)
                         .Text(text =>
                         {
-                            text.DefaultTextStyle(x => x.Bold());
-                            
                             text.DefaultTextStyle(TextStyle.Default);
                             text.AlignLeft();
                             text.ParagraphSpacing(10);
@@ -350,14 +182,14 @@ 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();
 
                             text.Span("The new text element also supports injecting custom content between words: ");
-                            text.Element().PaddingBottom(-4).Height(16).Width(32).Image(Placeholders.Image);
+                            text.Element().PaddingBottom(-10).Height(16).Width(32).Image(Placeholders.Image);
                             text.Span(".");
 
                             text.EmptyLine();
@@ -369,7 +201,7 @@ namespace QuestPDF.Examples
 
                             text.EmptyLine();
 
-                            text.Hyperlink("Please visit QuestPDF website", "https://www.questpdf.com");
+                            text.ExternalLocation("Please visit QuestPDF website", "https://www.questpdf.com");
 
                             text.EmptyLine();
 
@@ -378,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());
                         });
@@ -404,26 +236,26 @@ namespace QuestPDF.Examples
                         .Padding(10)
                         .Text(text =>
                         {
-                            text.DefaultTextStyle(TextStyle.Default.FontSize(20).BackgroundColor(Colors.Red.Lighten4));
+                            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(-4).Height(16).Width(32).Image(Placeholders.Image);
+                            text.Element().PaddingBottom(-10).Height(16).Width(32).Image(Placeholders.Image);
                             text.Span(".");
                             
                             text.EmptyLine();
                             
-                            foreach (var i in Enumerable.Range(1, 100))
+                            foreach (var i in Enumerable.Range(1, 1000))
                             {
                                 text.Line($"{i}: {Placeholders.Paragraph()}");
 
-                                text.Hyperlink("Please visit QuestPDF website. ", "https://www.questpdf.com");
+                                text.ExternalLocation("Please visit QuestPDF website", "https://www.questpdf.com");
                                 
                                 text.Span("This is page number ");
                                 text.CurrentPageNumber();
@@ -435,259 +267,5 @@ namespace QuestPDF.Examples
                         });
                 });
         }
-        
-        [Test]
-        public void MeasureIssueWhenSpaceAtLineEnd()
-        {
-            // issue 135
-            
-            RenderingTest
-                .Create()
-                .ProduceImages()
-                .ShowResults()
-                .RenderDocument(container =>
-                {
-                    container.Page(page =>
-                    {
-                        page.Margin(50);
-                        page.PageColor(Colors.White);
-
-                        page.Size(PageSizes.A4);
-
-                        page.Content().Text("This is a specially crafted sentence with a specially chosen length for demonstration of the bug that occurs ;;;;;. ").FontSize(11).BackgroundColor(Colors.Red.Lighten3);
-                    });
-                });
-        }
-        
-        [Test]
-        public void EmptyText()
-        {
-            // issue 135
-            
-            RenderingTest
-                .Create()
-                .ProduceImages()
-                .ShowResults()
-                .RenderDocument(container =>
-                {
-                    container.Page(page =>
-                    {
-                        page.Margin(50);
-                        page.PageColor(Colors.White);
-
-                        page.Size(PageSizes.A4);
-
-                        page.Content().Text("         ").FontSize(11).BackgroundColor(Colors.Red.Lighten3);
-                    });
-                });
-        }
-        
-        [Test]
-        public void Whitespaces()
-        {
-            // issue 135
-            
-            RenderingTest
-                .Create()
-                .ProduceImages()
-                .ShowResults()
-                .RenderDocument(container =>
-                {
-                    container.Page(page =>
-                    {
-                        page.Margin(50);
-                        page.PageColor(Colors.White);
-
-                        page.Size(PageSizes.A4);
-
-                        page.Content().Text("     x     ").FontSize(11).BackgroundColor(Colors.Red.Lighten3);
-                    });
-                });
-        }
-        
-        [Test]
-        public void DrawingNullTextShouldNotThrowException()
-        {
-            RenderingTest
-                .Create()
-                .ProduceImages()
-                .ShowResults()
-                .RenderDocument(container =>
-                {
-                    container.Page(page =>
-                    {
-                        page.Margin(50);
-                        page.PageColor(Colors.White);
-
-                        page.Size(PageSizes.A4);
-
-                        page.Content().Column(column =>
-                        {
-                            column.Item().Text(null);
-
-                            column.Item().Text(text =>
-                            {
-                                text.Span(null);
-                                text.Line(null);
-                                text.Hyperlink(null, "http://www.questpdf.com");
-                                text.TotalPages().Format(x => null);
-                            });
-                        });
-                    });
-                });
-        }
-        
-        [Test]
-        public void BreakingLongWord()
-        {
-            RenderingTest
-                .Create()
-                .ProduceImages()
-                .ShowResults()
-                .RenderDocument(container =>
-                {
-                    container.Page(page =>
-                    {
-                        page.Margin(50);
-                        page.PageColor(Colors.White);
-
-                        page.Size(PageSizes.A4);
-
-                        page.Content().Column(column =>
-                        {
-                            column.Item().Text(null);
-
-                            column.Item().Text(text =>
-                            {
-                                text.DefaultTextStyle(x => x.BackgroundColor(Colors.Red.Lighten3).FontSize(24));
-                                
-                                text.Span("       " + Placeholders.LoremIpsum());
-                                text.Span(" 012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789         ").WrapAnywhere();
-                            });
-                        });
-                    });
-                });
-        }
-        
-        [Test]
-        public void TextShaping_Unicode()
-        {
-            RenderingTest
-                .Create()
-                .PageSize(600, 100)
-                
-                .ProduceImages()
-                .ShowResults()
-                .Render(container =>
-                {
-                    container
-                        .Padding(35)
-                        .MinimalBox()
-                        .Background(Colors.Grey.Lighten2)
-                        .Text(text =>
-                        {
-                            text.DefaultTextStyle(TextStyle.Default.FontSize(20));
-                            
-                            text.Span("Complex Unicode structure: ");
-                            
-                            
-                            text.Span("T̶̖̔͆͆̽̔ḩ̷̼̫̐̈́̀͜͝͝ì̶͇̤͓̱̣͇͓͉̎s̵̡̟̹͍̜͉̗̾͛̈̐́͋͂͝͠ͅ ̴̨͙͍͇̭̒͗̀́͝ì̷̡̺͉̼̏̏̉̌͝s̷͍͙̗̰̖͙̈̑̂̔͑͊̌̓̊̇͜ ̶̛̼͚͊̅͘ṭ̷̨̘̣̙̖͉͌̏̂̅͑̄̽̕͝ȅ̶̲̲̙̭͈̬̣͔̝͔̈́͝s̸̢̯̪̫͓̭̮̓̀͆͜ț̸̢͉̞̥̤̏̌̓͝").FontFamily(Fonts.Calibri).FontColor(Colors.Red.Medium);
-                            
-                            
-                            text.Span(".");
-                        });
-                });
-        }
-        
-        [Test]
-        public void TextShaping_Arabic()
-        {
-            RenderingTest
-                .Create()
-                .PageSize(500, 100)
-                
-                .ProduceImages()
-                .ShowResults()
-                .Render(container =>
-                {
-                    container
-                        .Padding(25)
-                        .MinimalBox()
-                        .Background(Colors.Grey.Lighten2)
-                        .Text("ينا الألم. في بعض الأحيان ونظراً للالتزامات التي يفرضها علينا")
-                        .FontFamily(Fonts.Calibri)
-                        .FontSize(20);
-                });
-        }
-        
-        [Test]
-        public void FontFallback()
-        {
-            RenderingTest
-                .Create()
-                .ProduceImages()
-                .ShowResults()
-                .RenderDocument(container =>
-                {
-                    container.Page(page =>
-                    {
-                        page.Margin(50);
-                        page.PageColor(Colors.White);
-                        page.DefaultTextStyle(x => x
-                            .Fallback(y => y.FontFamily("Segoe UI Emoji")
-                                .Fallback(y => y.FontFamily("Microsoft YaHei"))));
-
-                        page.Size(PageSizes.A4);
-
-                        page.Content().Text(t =>
-                        {
-                            t.Line("This is normal text.");
-                            t.EmptyLine();
-                            
-                            t.Line("Following line should use font fallback:");
-                            t.Line("中文文本");
-                            t.EmptyLine();
-                            
-                            t.Line("The following line contains a mix of known and unknown characters.");
-                            t.Line("Mixed line: This 中文 is 文文 a mixed 本 本 line 本 中文文本!");
-                            t.EmptyLine();
-
-                            t.Line("Emojis work out of the box because of font fallback: 😊😅🥳👍❤😍👌");
-                        });
-                    });
-                });
-        }
-        
-        [Test]
-        public void WordWrappingStability()
-        {
-            // instruction: check if any characters repeat when performing the word-wrapping algorithm
-            
-            RenderingTest
-                .Create()
-                .PageSize(PageSizes.A4)
-                .ProducePdf()
-                .ShowResults()
-                .Render(container =>
-                {
-                    var text = "Lorem ipsum dolor sit amet consectetuer";
-                    
-                    container
-                        .Padding(20)
-                        .Column(column =>
-                        {
-                            column.Spacing(10);
-
-                            foreach (var width in Enumerable.Range(25, 200))
-                            {
-                                column
-                                    .Item()
-                                    .MaxWidth(width)
-                                    .Background(Colors.Grey.Lighten3)
-                                    .Text(text);
-                            }
-                        });
-                });
-        }
     }
 }

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.Previewer.Examples/Program.cs

@@ -1,62 +0,0 @@
-using QuestPDF.Fluent;
-using QuestPDF.Helpers;
-using QuestPDF.Infrastructure;
-using QuestPDF.Previewer;
-using QuestPDF.ReportSample;
-using QuestPDF.ReportSample.Layouts;
-
-//ImagePlaceholder.Solid = true;
-
-// var model = DataSource.GetReport();
-// var report = new StandardReport(model);
-// report.ShowInPreviewer();
-//
-// return;
-
-Document
-    .Create(container =>
-    {
-        container.Page(page =>
-        {
-            page.Size(PageSizes.A4);
-            page.Margin(2, Unit.Centimetre);
-            page.PageColor(Colors.White);
-            page.DefaultTextStyle(x => x.FontSize(20));
-
-            page.Header()
-                .Text("Hot Reload!")
-                .SemiBold().FontSize(36).FontColor(Colors.Blue.Darken2);
-
-            page.Content()
-                .PaddingVertical(1, Unit.Centimetre)
-                .Column(x =>
-                {
-                    x.Spacing(20);
-
-                    x.Item().Table(t =>
-                    {
-                        t.ColumnsDefinition(c =>
-                        {
-                            c.RelativeColumn();
-                            c.RelativeColumn(3);
-                        });
-
-                        t.Cell().Border(1).Background(Colors.Grey.Lighten3).Padding(5).Text("Visual Studio");
-                        t.Cell().Border(1).Padding(5).Text("Start in debug mode with 'Hot Reload on Save' enabled.");
-                        t.Cell().Border(1).Background(Colors.Grey.Lighten3).Padding(5).Text("Command line");
-                        t.Cell().Border(1).Padding(5).Text("Run 'dotnet watch'.");
-                    });
-
-                    x.Item().Text("Modify this line and the preview should show your changes instantly.");
-                });
-
-            page.Footer()
-                .AlignCenter()
-                .Text(x =>
-                {
-                    x.Span("Page ");
-                    x.CurrentPageNumber();
-                });
-        });
-    })
-    .ShowInPreviewer();

QuestPDF.Previewer.Examples/QuestPDF.Previewer.Examples.csproj

@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\QuestPDF.ReportSample\QuestPDF.ReportSample.csproj" />
-    <ProjectReference Include="..\QuestPDF\QuestPDF.csproj" />
-  </ItemGroup>
-
-</Project>

QuestPDF.Previewer/CommunicationService.cs

@@ -1,79 +0,0 @@
-using System.Text.Json;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using SkiaSharp;
-
-namespace QuestPDF.Previewer;
-
-class CommunicationService
-{
-    public static CommunicationService Instance { get; } = new ();
-    
-    public event Action<ICollection<PreviewPage>>? OnDocumentRefreshed;
-
-    private WebApplication? Application { get; set; }
-
-    private readonly JsonSerializerOptions JsonSerializerOptions = new()
-    {
-        PropertyNameCaseInsensitive = true
-    };
-
-    private CommunicationService()
-    {
-        
-    }
-    
-    public Task Start(int port)
-    {
-        var builder = WebApplication.CreateBuilder();
-        builder.Services.AddLogging(x => x.ClearProviders());
-        builder.WebHost.UseKestrel(options => options.Limits.MaxRequestBodySize = null);
-        Application = builder.Build();
-
-        Application.MapGet("ping", HandlePing);
-        Application.MapGet("version", HandleVersion);
-        Application.MapPost("update/preview", HandleUpdatePreview);
-            
-        return Application.RunAsync($"http://localhost:{port}/");
-    }
-
-    public async Task Stop()
-    {
-        await Application.StopAsync();
-        await Application.DisposeAsync();
-    }
-
-    private async Task<IResult> HandlePing()
-    {
-        return OnDocumentRefreshed == null 
-            ? Results.StatusCode(StatusCodes.Status503ServiceUnavailable) 
-            : Results.Ok();
-    }
-    
-    private async Task<IResult> HandleVersion()
-    {
-        return Results.Json(GetType().Assembly.GetName().Version);
-    }
-    
-    private async Task<IResult> HandleUpdatePreview(HttpRequest request)
-    {
-        var command = JsonSerializer.Deserialize<DocumentSnapshot>(request.Form["command"], JsonSerializerOptions);
-
-        var pages = command
-            .Pages
-            .Select(page =>
-            {
-                using var stream = request.Form.Files[page.Id].OpenReadStream();
-                var picture = SKPicture.Deserialize(stream);
-                        
-                return new PreviewPage(picture, page.Width, page.Height);
-            })
-            .ToList();
-
-        Task.Run(() => OnDocumentRefreshed(pages));
-        return Results.Ok();
-    }
-}

QuestPDF.Previewer/Helpers.cs

@@ -1,20 +0,0 @@
-using SkiaSharp;
-
-namespace QuestPDF.Previewer;
-
-class Helpers
-{
-    public static void GeneratePdfFromDocumentSnapshots(string filePath, ICollection<PreviewPage> pages)
-    {
-        using var stream = File.Create(filePath);
-            
-        using var document = SKDocument.CreatePdf(stream);
-            
-        foreach (var page in pages)
-        {
-            using var canvas = document.BeginPage(page.Width, page.Height);
-            canvas.DrawPicture(page.Picture);
-            document.EndPage();
-        }
-    }
-}

QuestPDF.Previewer/InteractiveCanvas.cs

@@ -1,202 +0,0 @@
-using Avalonia;
-using Avalonia.Platform;
-using Avalonia.Rendering.SceneGraph;
-using Avalonia.Skia;
-using SkiaSharp;
-
-namespace QuestPDF.Previewer;
-
-class InteractiveCanvas : ICustomDrawOperation
-{
-    public Rect Bounds { get; set; }
-    public ICollection<PreviewPage> Pages { get; set; }
-
-    private float Width => (float)Bounds.Width;
-    private float Height => (float)Bounds.Height;
-
-    public float Scale { get; private set; } = 1;
-    public float TranslateX { get; set; }
-    public float TranslateY { get; set; }
-
-    private const float MinScale = 0.1f;
-    private const float MaxScale = 10f;
-
-    private const float PageSpacing = 25f;
-    private const float SafeZone = 25f;
-
-    public float TotalPagesHeight => Pages.Sum(x => x.Height) + (Pages.Count - 1) * PageSpacing;
-    public float TotalHeight => TotalPagesHeight + SafeZone * 2 / Scale;
-    public float MaxWidth => Pages.Any() ? Pages.Max(x => x.Width) : 0;
-    
-    public float MaxTranslateY => TotalHeight - Height / Scale;
-
-    public float ScrollPercentY
-    {
-        get
-        {
-            return TranslateY / MaxTranslateY;
-        }
-        set
-        {
-            TranslateY = value * MaxTranslateY;
-        }
-    }
-
-    public float ScrollViewportSizeY
-    {
-        get
-        {
-            var viewPortSize = Height / Scale / TotalHeight;
-            return Math.Clamp(viewPortSize, 0, 1);
-        }
-    }
-
-    #region transformations
-    
-    private void LimitScale()
-    {
-        Scale = Math.Max(Scale, MinScale);
-        Scale = Math.Min(Scale, MaxScale);
-    }
-    
-    private void LimitTranslate()
-    {
-        if (TotalPagesHeight > Height / Scale)
-        {
-            TranslateY = Math.Min(TranslateY, MaxTranslateY);
-            TranslateY = Math.Max(TranslateY, 0);
-        }
-        else
-        {
-            TranslateY = (TotalPagesHeight - Height / Scale) / 2;
-        }
-
-        if (Width / Scale < MaxWidth)
-        {
-            var maxTranslateX = (Width / 2 - SafeZone) / Scale - MaxWidth / 2;
-
-            TranslateX = Math.Min(TranslateX, -maxTranslateX);
-            TranslateX = Math.Max(TranslateX, maxTranslateX);
-        }
-        else
-        {
-            TranslateX = 0;
-        }
-    }
-
-    public void TranslateWithCurrentScale(float x, float y)
-    {
-        TranslateX += x / Scale;
-        TranslateY += y / Scale;
-
-        LimitTranslate();
-    }
-    
-    public void ZoomToPoint(float x, float y, float factor)
-    {
-        var oldScale = Scale;
-        Scale *= factor;
-                
-        LimitScale();
-   
-        TranslateX -= x / Scale - x / oldScale;
-        TranslateY -= y / Scale - y / oldScale;
-
-        LimitTranslate();
-    }
-    
-    #endregion
-    
-    #region rendering
-    
-    public void Render(IDrawingContextImpl context)
-    {
-        if (Pages.Count <= 0)
-            return;
-
-        LimitScale();
-        LimitTranslate();
-        
-        var canvas = (context as ISkiaDrawingContextImpl)?.SkCanvas;
-        
-        if (canvas == null)
-            throw new InvalidOperationException($"Context needs to be ISkiaDrawingContextImpl but got {nameof(context)}");
-
-        var originalMatrix = canvas.TotalMatrix;
-
-        canvas.Translate(Width / 2, 0);
-        
-        canvas.Scale(Scale);
-        canvas.Translate(TranslateX, -TranslateY + SafeZone / Scale);
-        
-        foreach (var page in Pages)
-        {
-            canvas.Translate(-page.Width / 2f, 0);
-            DrawBlankPage(canvas, page.Width, page.Height);
-            canvas.DrawPicture(page.Picture);
-            canvas.Translate(page.Width / 2f, page.Height + PageSpacing);
-        }
-
-        canvas.SetMatrix(originalMatrix);
-        DrawInnerGradient(canvas);
-    }
-    
-    public void Dispose() { }
-    public bool Equals(ICustomDrawOperation? other) => false;
-    public bool HitTest(Point p) => true;
-
-    #endregion
-    
-    #region blank page
-
-    private static SKPaint BlankPagePaint = new SKPaint
-    {
-        Color = SKColors.White
-    };
-    
-    private static SKPaint BlankPageShadowPaint = new SKPaint
-    {
-        ImageFilter = SKImageFilter.CreateBlendMode(
-            SKBlendMode.Overlay, 
-            SKImageFilter.CreateDropShadowOnly(0, 6, 6, 6, SKColors.Black.WithAlpha(64)),
-            SKImageFilter.CreateDropShadowOnly(0, 10, 14, 14, SKColors.Black.WithAlpha(32)))
-    };
-    
-    private void DrawBlankPage(SKCanvas canvas, float width, float height)
-    {
-        canvas.DrawRect(0, 0, width, height, BlankPageShadowPaint);
-        canvas.DrawRect(0, 0, width, height, BlankPagePaint);
-    }
-    
-    #endregion
-
-    #region inner viewport gradient
-
-    private const int InnerGradientSize = (int)SafeZone;
-    private static readonly SKColor InnerGradientColor = SKColor.Parse("#666");
-    
-    private void DrawInnerGradient(SKCanvas canvas)
-    {
-        // gamma correction
-        var colors = Enumerable
-            .Range(0, InnerGradientSize)
-            .Select(x => 1f - x / (float) InnerGradientSize)
-            .Select(x => Math.Pow(x, 2f))
-            .Select(x => (byte)(x * 255))
-            .Select(x => InnerGradientColor.WithAlpha(x))
-            .ToArray();
-        
-        using var fogPaint = new SKPaint
-        {
-            Shader = SKShader.CreateLinearGradient(
-                new SKPoint(0, 0),
-                new SKPoint(0, InnerGradientSize), 
-                colors,
-                SKShaderTileMode.Clamp)
-        };
-        
-        canvas.DrawRect(0, 0, Width, InnerGradientSize, fogPaint);
-    }
-
-    #endregion
-}

QuestPDF.Previewer/PreviewPage.cs

@@ -1,6 +0,0 @@
-using SkiaSharp;
-
-namespace QuestPDF.Previewer
-{
-    record PreviewPage(SKPicture Picture, float Width, float Height);
-}

QuestPDF.Previewer/PreviewerApp.axaml

@@ -1,8 +0,0 @@
-<Application x:Class="QuestPDF.Previewer.PreviewerApp"
-             xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             Name="QuestPDF Document Preview">
-	<Application.Styles>
-		<FluentTheme Mode="Dark" />
-	</Application.Styles>
-</Application>

QuestPDF.Previewer/PreviewerApp.axaml.cs

@@ -1,27 +0,0 @@
-using Avalonia;
-using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Markup.Xaml;
-
-namespace QuestPDF.Previewer
-{
-    internal class PreviewerApp : Application
-    {
-        public override void Initialize()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
-        public override void OnFrameworkInitializationCompleted()
-        {
-            if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
-            {
-                desktop.MainWindow = new PreviewerWindow()
-                {
-                    DataContext = new PreviewerWindowViewModel()
-                };
-            }
-            
-            base.OnFrameworkInitializationCompleted();
-        }
-    }
-}

QuestPDF.Previewer/PreviewerControl.cs

@@ -1,118 +0,0 @@
-using System.Collections.ObjectModel;
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Input;
-using Avalonia.Media;
-
-namespace QuestPDF.Previewer
-{
-    class PreviewerControl : Control
-    {
-        private InteractiveCanvas InteractiveCanvas { get; set; } = new ();
-        
-        public static readonly StyledProperty<ObservableCollection<PreviewPage>> PagesProperty =
-            AvaloniaProperty.Register<PreviewerControl, ObservableCollection<PreviewPage>>(nameof(Pages));
-        
-        public ObservableCollection<PreviewPage>? Pages
-        {
-            get => GetValue(PagesProperty);
-            set => SetValue(PagesProperty, value);
-        }
-
-        public static readonly StyledProperty<float> CurrentScrollProperty = AvaloniaProperty.Register<PreviewerControl, float>(nameof(CurrentScroll));
-        
-        public float CurrentScroll
-        {
-            get => GetValue(CurrentScrollProperty);
-            set => SetValue(CurrentScrollProperty, value);
-        }
-        
-        public static readonly StyledProperty<float> ScrollViewportSizeProperty = AvaloniaProperty.Register<PreviewerControl, float>(nameof(ScrollViewportSize));
-        
-        public float ScrollViewportSize
-        {
-            get => GetValue(ScrollViewportSizeProperty);
-            set => SetValue(ScrollViewportSizeProperty, value);
-        }
-        
-        public PreviewerControl()
-        {
-            PagesProperty.Changed.Subscribe(x =>
-            {
-                InteractiveCanvas.Pages = x.NewValue.Value;
-                InvalidateVisual();
-            });
-
-            CurrentScrollProperty.Changed.Subscribe(x =>
-            {
-                InteractiveCanvas.ScrollPercentY = x.NewValue.Value;
-                InvalidateVisual();
-            });
-
-            ClipToBounds = true;
-        }
-        
-        protected override void OnPointerWheelChanged(PointerWheelEventArgs e)
-        {
-            base.OnPointerWheelChanged(e);
-
-            if ((e.KeyModifiers & KeyModifiers.Control) != 0)
-            {
-                var scaleFactor = 1 + e.Delta.Y / 10f;
-                var point = new Point(Bounds.Center.X, Bounds.Top) - e.GetPosition(this);
-                
-                InteractiveCanvas.ZoomToPoint((float)point.X, -(float)point.Y, (float)scaleFactor);
-            }
-                
-            if (e.KeyModifiers == KeyModifiers.None)
-            {
-                var translation = (float)e.Delta.Y * 25;
-                InteractiveCanvas.TranslateWithCurrentScale(0, -translation);
-            }
-                
-            InvalidateVisual();
-        }
-
-        private bool IsMousePressed { get; set; }
-        private Vector MousePosition { get; set; }
-        
-        protected override void OnPointerMoved(PointerEventArgs e)
-        {
-            base.OnPointerMoved(e);
-
-            if (IsMousePressed)
-            {
-                var currentPosition = e.GetPosition(this);
-                var translation = currentPosition - MousePosition;
-                InteractiveCanvas.TranslateWithCurrentScale((float)translation.X, -(float)translation.Y);
-                
-                InvalidateVisual();
-            }
-
-            MousePosition = e.GetPosition(this);
-        }
-        
-        protected override void OnPointerPressed(PointerPressedEventArgs e)
-        {
-            base.OnPointerPressed(e);
-            IsMousePressed = true;
-        }
-
-        protected override void OnPointerReleased(PointerReleasedEventArgs e)
-        {
-            base.OnPointerReleased(e);
-            IsMousePressed = false;
-        }
-
-        public override void Render(DrawingContext context)
-        {
-            CurrentScroll = InteractiveCanvas.ScrollPercentY;
-            ScrollViewportSize = InteractiveCanvas.ScrollViewportSizeY;
-    
-            InteractiveCanvas.Bounds = new Rect(0, 0, Bounds.Width, Bounds.Height);
-
-            context.Custom(InteractiveCanvas);
-            base.Render(context);
-        }
-    }
-}

QuestPDF.Previewer/PreviewerRefreshCommand.cs

@@ -1,18 +0,0 @@
-using SkiaSharp;
-
-namespace QuestPDF.Previewer;
-
-internal class DocumentSnapshot
-{
-    public ICollection<PageSnapshot> Pages { get; set; }
-
-    public class PageSnapshot
-    {
-        public string Id { get; set; }
-        
-        public float Width { get; set; }
-        public float Height { get; set; }
-        
-        public SKPicture Picture { get; set; }
-    }
-}

QuestPDF.Previewer/PreviewerWindow.axaml

@@ -1,97 +0,0 @@
-<Window xmlns="https://github.com/avaloniaui"
-		xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-		xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-		xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-		xmlns:previewer="clr-namespace:QuestPDF.Previewer"
-		mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-		x:Class="QuestPDF.Previewer.PreviewerWindow"
-		x:DataType="previewer:PreviewerWindowViewModel"
-		x:CompileBindings="True"
-		WindowStartupLocation="CenterScreen"
-		ExtendClientAreaToDecorationsHint="true"
-		ExtendClientAreaTitleBarHeightHint="-1"
-		Background="#666"
-		Icon="/Resources/Logo.png"
-		UseLayoutRounding="True"
-		Title="QuestPDF Document Preview">
-	
-	<Window.Styles>
-		<Style Selector="Button.actions">
-			<Setter Property="VerticalAlignment" Value="Bottom"/>
-			<Setter Property="HorizontalAlignment" Value="Left"/>
-			<Setter Property="Padding" Value="10"/>
-			<Setter Property="CornerRadius" Value="100"/>
-			<Setter Property="Background" Value="#888"/>
-		</Style>
-		
-		<Style Selector="Button:pointerover /template/ ContentPresenter">
-			<Setter Property="Background" Value="#999"/>
-		</Style>
-	</Window.Styles>
-
-	<Panel>
-		<Grid>
-			<Grid.RowDefinitions>
-				<RowDefinition Height="32" />
-				<RowDefinition Height="*" />
-			</Grid.RowDefinitions>
-
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="*" />
-				<ColumnDefinition Width="Auto" />
-			</Grid.ColumnDefinitions>
-			
-			<TextBlock Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"
-			           VerticalAlignment="Center" HorizontalAlignment="Center" 
-			           TextAlignment="Center" Text="QuestPDF Previewer" FontSize="14" Foreground="#DFFF" FontWeight="Regular" IsHitTestVisible="False" />
-			
-			<previewer:PreviewerControl Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2"
-			                            HorizontalAlignment="Stretch" 
-			                            VerticalAlignment="Stretch"
-			                            CurrentScroll="{Binding CurrentScroll, Mode=TwoWay}"
-			                            ScrollViewportSize="{Binding ScrollViewportSize, Mode=OneWayToSource}"
-			                            Pages="{Binding Pages, Mode=OneWay}" />
-			
-			<StackPanel Grid.Row="1" Grid.Column="0" Orientation="Vertical" VerticalAlignment="Bottom" Spacing="16" Margin="32">
-				<Button Classes="actions"
-				        Command="{Binding ShowPdfCommand, Mode=OneTime}"
-				        IsVisible="{Binding !!Pages.Count}"
-				        ToolTip.Tip="Generates PDF file and shows it in the default browser. Useful for testing compatibility and interactive links.">
-					<Viewbox Width="24" Height="24">
-						<Canvas Width="24" Height="24">
-							<Path Fill="White" Data="M14,2H6A2,2 0 0,0 4,4V20A2,2 0 0,0 6,22H13C12.59,21.75 12.2,21.44 11.86,21.1C11.53,20.77 11.25,20.4 11,20H6V4H13V9H18V10.18C18.71,10.34 19.39,10.61 20,11V8L14,2M20.31,18.9C21.64,16.79 21,14 18.91,12.68C16.8,11.35 14,12 12.69,14.08C11.35,16.19 12,18.97 14.09,20.3C15.55,21.23 17.41,21.23 18.88,20.32L22,23.39L23.39,22L20.31,18.9M16.5,19A2.5,2.5 0 0,1 14,16.5A2.5,2.5 0 0,1 16.5,14A2.5,2.5 0 0,1 19,16.5A2.5,2.5 0 0,1 16.5,19Z" />
-						</Canvas>
-					</Viewbox>
-				</Button>
-				
-				<Button Classes="actions"
-				        Command="{Binding ShowDocumentationCommand, Mode=OneTime}"
-				        ToolTip.Tip="Opens official QuestPDF documentation">
-					<Viewbox Width="24" Height="24">
-						<Canvas Width="24" Height="24">
-							<Path Fill="White" Data="M19 1L14 6V17L19 12.5V1M21 5V18.5C19.9 18.15 18.7 18 17.5 18C15.8 18 13.35 18.65 12 19.5V6C10.55 4.9 8.45 4.5 6.5 4.5C4.55 4.5 2.45 4.9 1 6V20.65C1 20.9 1.25 21.15 1.5 21.15C1.6 21.15 1.65 21.1 1.75 21.1C3.1 20.45 5.05 20 6.5 20C8.45 20 10.55 20.4 12 21.5C13.35 20.65 15.8 20 17.5 20C19.15 20 20.85 20.3 22.25 21.05C22.35 21.1 22.4 21.1 22.5 21.1C22.75 21.1 23 20.85 23 20.6V6C22.4 5.55 21.75 5.25 21 5M10 18.41C8.75 18.09 7.5 18 6.5 18C5.44 18 4.18 18.19 3 18.5V7.13C3.91 6.73 5.14 6.5 6.5 6.5C7.86 6.5 9.09 6.73 10 7.13V18.41Z" />
-						</Canvas>
-					</Viewbox>
-				</Button>
-				
-				<Button Classes="actions"
-				        Command="{Binding SponsorProjectCommand, Mode=OneTime}"
-				        ToolTip.Tip="Do you like QuestPDF? Please consider sponsoring the project. It really helps!">
-					<Viewbox Width="24" Height="24">
-						<Canvas Width="24" Height="24">
-							<Path Fill="White" Data="M12,21.1L10.5,22.4C3.9,16.5 0.5,13.4 0.5,9.6C0.5,8.4 0.9,7.3 1.5,6.4C1.5,6.6 1.5,6.8 1.5,7C1.5,11.7 5.4,15.2 12,21.1M13.6,17C18.3,12.7 21.5,9.9 21.6,7C21.6,5 20.1,3.5 18.1,3.5C16.5,3.5 15,4.5 14.5,5.9H12.6C12,4.5 10.5,3.5 9,3.5C7,3.5 5.5,5 5.5,7C5.5,9.9 8.6,12.7 13.4,17L13.5,17.1M18,1.5C21.1,1.5 23.5,3.9 23.5,7C23.5,10.7 20.1,13.8 13.5,19.8C6.9,13.9 3.5,10.8 3.5,7C3.5,3.9 5.9,1.5 9,1.5C10.7,1.5 12.4,2.3 13.5,3.6C14.6,2.3 16.3,1.5 18,1.5Z" />
-						</Canvas>
-					</Viewbox>
-				</Button>
-			</StackPanel>
-			
-			<ScrollBar Grid.Row="1" Grid.Column="1"
-			           Orientation="Vertical" 
-			           AllowAutoHide="False" 
-			           Minimum="0" Maximum="1" 
-			           IsVisible="{Binding VerticalScrollbarVisible, Mode=OneWay}"
-			           Value="{Binding CurrentScroll, Mode=TwoWay}" 
-			           ViewportSize="{Binding ScrollViewportSize, Mode=OneWay}"></ScrollBar>
-		</Grid>
-	</Panel>
-</Window>

QuestPDF.Previewer/PreviewerWindow.axaml.cs

@@ -1,23 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace QuestPDF.Previewer
-{
-    class PreviewerWindow : Window
-    {
-        public PreviewerWindow()
-        {
-            InitializeComponent();
-        }
-
-        protected override void OnClosed(EventArgs e)
-        {
-            
-        }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-    }
-}

QuestPDF.Previewer/PreviewerWindowViewModel.cs

@@ -1,89 +0,0 @@
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using ReactiveUI;
-using Unit = System.Reactive.Unit;
-using Avalonia.Threading;
-
-namespace QuestPDF.Previewer
-{
-    internal class PreviewerWindowViewModel : ReactiveObject
-    {
-        private ObservableCollection<PreviewPage> _pages = new();
-        public ObservableCollection<PreviewPage> Pages
-        {
-            get => _pages;
-            set => this.RaiseAndSetIfChanged(ref _pages, value);
-        }
-        
-        private float _currentScroll;
-        public float CurrentScroll
-        {
-            get => _currentScroll;
-            set => this.RaiseAndSetIfChanged(ref _currentScroll, value);
-        }
-
-        private float _scrollViewportSize;
-        public float ScrollViewportSize
-        {
-            get => _scrollViewportSize;
-            set
-            {
-                this.RaiseAndSetIfChanged(ref _scrollViewportSize, value);
-                VerticalScrollbarVisible = value < 1;
-            }
-        }
-
-        private bool _verticalScrollbarVisible;
-        public bool VerticalScrollbarVisible
-        {
-            get => _verticalScrollbarVisible;
-            private set => Dispatcher.UIThread.Post(() => this.RaiseAndSetIfChanged(ref _verticalScrollbarVisible, value));
-        }
-
-        public ReactiveCommand<Unit, Unit> ShowPdfCommand { get; }
-        public ReactiveCommand<Unit, Unit> ShowDocumentationCommand { get; }
-        public ReactiveCommand<Unit, Unit> SponsorProjectCommand { get; }
-
-        public PreviewerWindowViewModel()
-        {
-            CommunicationService.Instance.OnDocumentRefreshed += HandleUpdatePreview;
-            
-            ShowPdfCommand = ReactiveCommand.Create(ShowPdf);
-            ShowDocumentationCommand = ReactiveCommand.Create(() => OpenLink("https://www.questpdf.com/api-reference/index.html"));
-            SponsorProjectCommand = ReactiveCommand.Create(() => OpenLink("https://github.com/sponsors/QuestPDF"));
-        }
-
-        private void ShowPdf()
-        {
-            var filePath = Path.Combine(Path.GetTempPath(), $"{Guid.NewGuid():N}.pdf");
-            Helpers.GeneratePdfFromDocumentSnapshots(filePath, Pages);
-
-            OpenLink(filePath);
-        }
-        
-        private void OpenLink(string path)
-        {
-            using var openBrowserProcess = new Process
-            {
-                StartInfo = new()
-                {
-                    UseShellExecute = true,
-                    FileName = path
-                }
-            };
-
-            openBrowserProcess.Start();
-        }
-        
-        private void HandleUpdatePreview(ICollection<PreviewPage> pages)
-        {
-            var oldPages = Pages;
-            
-            Pages.Clear();
-            Pages = new ObservableCollection<PreviewPage>(pages);
-            
-            foreach (var page in oldPages)
-                page.Picture.Dispose();
-        }
-    }
-}

QuestPDF.Previewer/Program.cs

@@ -1,38 +0,0 @@
-using Avalonia;
-using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.ReactiveUI;
-using QuestPDF.Previewer;
-
-var applicationPort = GetCommunicationPort();
-CommunicationService.Instance.Start(applicationPort);
-
-if(Application.Current?.ApplicationLifetime is ClassicDesktopStyleApplicationLifetime desktop)
-{
-    desktop.MainWindow = new PreviewerWindow()
-    {
-        DataContext = new PreviewerWindowViewModel()
-    };
-                
-    desktop.MainWindow.Show();
-    desktop.Start(Array.Empty<string>());
-                
-    return;
-}
-
-AppBuilder
-    .Configure(() => new PreviewerApp())
-    .UsePlatformDetect()    
-    .UseReactiveUI()
-    .StartWithClassicDesktopLifetime(Array.Empty<string>());
-
-static int GetCommunicationPort()
-{
-    const int defaultApplicationPort = 12500;
-    
-    var arguments = Environment.GetCommandLineArgs();
-
-    if (arguments.Length < 2)
-        return defaultApplicationPort;
-
-    return int.TryParse(arguments[1], out var port) ? port : defaultApplicationPort;
-}    

QuestPDF.Previewer/QuestPDF.Previewer.csproj

@@ -1,55 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <Authors>MarcinZiabek</Authors>
-        <Company>CodeFlint</Company>
-        <PackageId>QuestPDF.Previewer</PackageId>
-        <Version>2022.9.1</Version>
-        <PackAsTool>true</PackAsTool>
-        <ToolCommandName>questpdf-previewer</ToolCommandName>
-        <PackageDescription>QuestPDF is an open-source, modern and battle-tested library that can help you with generating PDF documents by offering friendly, discoverable and predictable C# fluent API.</PackageDescription>
-        <PackageReleaseNotes>Initial release.</PackageReleaseNotes>
-        <LangVersion>10</LangVersion>
-        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <PackageIcon>Logo.png</PackageIcon>
-        <PackageIconUrl>https://www.questpdf.com/images/package-logo.png</PackageIconUrl>
-        <PackageProjectUrl>https://www.questpdf.com/</PackageProjectUrl>
-        <RepositoryUrl>https://github.com/QuestPDF/library.git</RepositoryUrl>
-        <RepositoryType>git</RepositoryType>
-        <Copyright>Marcin Ziąbek, QuestPDF contributors</Copyright>
-        <PackageTags>pdf report file export generate generation tool create creation render portable document format quest html library converter open source free standard core previewer</PackageTags>
-        <PackageLicenseExpression>MIT</PackageLicenseExpression>
-        <IncludeSymbols>true</IncludeSymbols>
-        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-        <OutputType>exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <AvaloniaResource Include="Resources\Logo.png" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <EmbeddedResource Include="Resources\Logo.png" />
-        <None Include="Resources\Logo.png">
-            <Pack>true</Pack>
-            <Visible>false</Visible>
-            <PackagePath>\</PackagePath>
-        </None>
-    </ItemGroup>
-    
-    <ItemGroup>
-        <FrameworkReference Include="Microsoft.AspNetCore.App" />
-        <PackageReference Include="Avalonia" Version="0.10.10" />
-        <PackageReference Include="Avalonia.Desktop" Version="0.10.10" />
-        <PackageReference Include="Avalonia.Diagnostics" Version="0.10.10" />
-        <PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="0.10.10" />
-        <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.10" />
-        <PackageReference Include="ReactiveUI" Version="17.1.50" />
-        <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.80.4" />
-        <PackageReference Include="System.Reactive" Version="5.0.0" />
-        <PackageReference Include="SkiaSharp" Version="2.80.4" />
-    </ItemGroup>
-</Project>

QuestPDF.Previewer/readme.md

@@ -1,23 +0,0 @@
-Install nuget locally (in directory where nupkg file is located)
-
-```
-dotnet tool install --global --add-source . QuestPDF.Previewer --global
-```
-
-Run on default port
-
-```
-questpdf-previewer
-```
-
-Run on custom port
-
-```
-questpdf-previewer 12500
-```
-
-Remove nuget locally 
-
-```
-dotnet tool uninstall QuestPDF.Previewer --global
-```

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

@@ -1,4 +1,3 @@
-using System;
 using QuestPDF.Fluent;
 using QuestPDF.Helpers;
 using QuestPDF.Infrastructure;
@@ -48,7 +47,7 @@ namespace QuestPDF.ReportSample.Layouts
             container.Border(0.75f).BorderColor(Colors.Grey.Medium).Grid(grid =>
             {
                 grid.Columns(6);
-
+                
                 grid.Item().LabelCell().Text("Date");
                 grid.Item(2).ValueCell().Text(Model.Date?.ToString("g") ?? string.Empty);
                 grid.Item().LabelCell().Text("Location");

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,8 +54,8 @@ namespace QuestPDF.ReportSample.Layouts
                 {
                     row.Spacing(50);
                     
-                    row.RelativeItem().PaddingTop(-10).Text(Model.Title).Style(Typography.Title);
-                    row.ConstantItem(90).Hyperlink("https://www.questpdf.com").MaxHeight(30).Component<ImagePlaceholder>();
+                    row.RelativeItem().PaddingTop(-10).Text(Model.Title, Typography.Title);
+                    row.ConstantItem(90).ExternalLink("https://www.questpdf.com").MaxHeight(30).Component<ImagePlaceholder>();
                 });
 
                 column.Item().ShowOnce().PaddingVertical(15).Border(1f).BorderColor(Colors.Grey.Lighten1).ExtendHorizontal();
@@ -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);
                         });
                     }
@@ -88,14 +88,14 @@ namespace QuestPDF.ReportSample.Layouts
                 column.Item().PageBreak();
                 
                 foreach (var section in Model.Sections)
-                    column.Item().Section(section.Title).Component(new SectionTemplate(section));
+                    column.Item().Location(section.Title).Component(new SectionTemplate(section));
                 
                 column.Item().PageBreak();
-                column.Item().Section("Photos");
+                column.Item().Location("Photos");
                 
                 foreach (var photo in Model.Photos)
                     column.Item().Component(new PhotoTemplate(photo));
             });
         }
     }
-}
+}

QuestPDF.ReportSample/Layouts/TableOfContentsTemplate.cs

@@ -3,7 +3,6 @@ using System.Drawing;
 using QuestPDF.Fluent;
 using QuestPDF.Helpers;
 using QuestPDF.Infrastructure;
-using SkiaSharp;
 
 namespace QuestPDF.ReportSample.Layouts
 {
@@ -24,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 =>
                     {
@@ -42,37 +40,24 @@ namespace QuestPDF.ReportSample.Layouts
         private void DrawLink(IContainer container, int number, string locationName)
         {
             container
-                .SectionLink(locationName)
+                .InternalLink(locationName)
                 .Row(row =>
                 {
-                    row.ConstantItem(20).Text($"{number}.");
-                    row.AutoItem().Text(locationName);
-                    
-                    row.RelativeItem().PaddingHorizontal(2).AlignBottom().TranslateY(-3).Height(1).Canvas((canvas, space) =>
-                    {
-                        // best to statically cache
-                        using var paint = new SKPaint
-                        {
-                            StrokeWidth = space.Height,
-                            PathEffect = SKPathEffect.CreateDash(new float[] { 1, 3 }, 0)
-                        };
-                        
-                        canvas.DrawLine(0, 0, space.Width, 0, paint);
-                    });
-                    
-                    row.AutoItem().Text(text =>
+                    row.ConstantItem(25).Text($"{number}.");
+                    row.RelativeItem().Text(locationName);
+                    row.ConstantItem(150).AlignRight().Text(text =>
                     {
                         text.BeginPageNumberOfSection(locationName);
                         text.Span(" - ");
                         text.EndPageNumberOfSection(locationName);
 
-                        var lengthStyle = TextStyle.Default.FontColor(Colors.Grey.Medium);
+                        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.ReportSample/PerformanceTests.cs

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

QuestPDF.ReportSample/QuestPDF.ReportSample.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
         <IsPackable>false</IsPackable>
         <LangVersion>8</LangVersion>
         <RootNamespace>QuestPDF.ReportSample</RootNamespace>
@@ -12,7 +12,7 @@
         <PackageReference Include="nunit" Version="3.13.2" />
         <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
-        <PackageReference Include="SkiaSharp" Version="2.80.4" />
+        <PackageReference Include="SkiaSharp" Version="2.80.3" />
     </ItemGroup>
 
     <ItemGroup>

QuestPDF.ReportSample/Tests.cs

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

QuestPDF.ReportSample/Typography.cs

@@ -6,8 +6,8 @@ namespace QuestPDF.ReportSample
 {
     public static class Typography
     {
-        public static TextStyle Title => TextStyle.Default.FontFamily(Fonts.Lato).FontColor(Colors.Blue.Darken3).FontSize(26).Black();
-        public static TextStyle Headline => TextStyle.Default.FontFamily(Fonts.Lato).FontColor(Colors.Blue.Medium).FontSize(16).SemiBold();
-        public static TextStyle Normal => TextStyle.Default.FontFamily(Fonts.Lato).FontColor(Colors.Black).FontSize(10).LineHeight(1.2f);
+        public static TextStyle Title => TextStyle.Default.FontType(Fonts.Calibri).Color(Colors.Blue.Darken3).Size(26).Black();
+        public static TextStyle Headline => TextStyle.Default.FontType(Fonts.Calibri).Color(Colors.Blue.Medium).Size(16).SemiBold();
+        public static TextStyle Normal => TextStyle.Default.FontType(Fonts.Verdana).Color(Colors.Black).Size(10).LineHeight(1.2f);
     }
-}
+}

QuestPDF.UnitTests/QuestPDF.UnitTests.csproj

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

QuestPDF.UnitTests/TestEngine/MockCanvas.cs

@@ -1,5 +1,4 @@
 using System;
-using QuestPDF.Drawing;
 using QuestPDF.Infrastructure;
 using SkiaSharp;
 
@@ -11,6 +10,7 @@ namespace QuestPDF.UnitTests.TestEngine
         public Action<float> RotateFunc { get; set; }
         public Action<float, float> ScaleFunc { get; set; }
         public Action<SKImage, Position, Size> DrawImageFunc { get; set; }
+        public Action<string, Position, TextStyle> DrawTextFunc { get; set; }
         public Action<Position, Size, string> DrawRectFunc { get; set; }
 
         public void Translate(Position vector) => TranslateFunc(vector);
@@ -18,7 +18,8 @@ namespace QuestPDF.UnitTests.TestEngine
         public void Scale(float scaleX, float scaleY) => ScaleFunc(scaleX, scaleY);
 
         public void DrawRectangle(Position vector, Size size, string color) => DrawRectFunc(vector, size, color);
-        public void DrawText(SKTextBlob skTextBlob, Position position, TextStyle style) => throw new NotImplementedException();
+        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

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using QuestPDF.Drawing;
 using QuestPDF.Infrastructure;
 using QuestPDF.UnitTests.TestEngine.Operations;
 using SkiaSharp;
@@ -16,7 +15,8 @@ namespace QuestPDF.UnitTests.TestEngine
         public void Scale(float scaleX, float scaleY) => Operations.Add(new CanvasScaleOperation(scaleX, scaleY));
 
         public void DrawRectangle(Position vector, Size size, string color) => Operations.Add(new CanvasDrawRectangleOperation(vector, size, color));
-        public void DrawText(SKTextBlob skTextBlob, Position position, TextStyle style) => throw new NotImplementedException();
+        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

@@ -82,6 +82,19 @@ namespace QuestPDF.UnitTests.TestEngine
                     
                     Assert.AreEqual(expected.Color, color, "Draw rectangle: color");
                 },
+                DrawTextFunc = (text, position, style) => 
+                {
+                    var expected = GetExpected<CanvasDrawTextOperation>();
+                    
+                    Assert.AreEqual(expected.Text, text);
+                    
+                    Assert.AreEqual(expected.Position.X, position.X, "Draw text: X");
+                    Assert.AreEqual(expected.Position.Y, position.Y, "Draw text: Y");
+                    
+                    Assert.AreEqual(expected.Style.Color, style.Color, "Draw text: color");
+                    Assert.AreEqual(expected.Style.FontType, style.FontType, "Draw text: font");
+                    Assert.AreEqual(expected.Style.Size, style.Size, "Draw text: size");
+                },
                 DrawImageFunc = (image, position, size) =>
                 {
                     var expected = GetExpected<CanvasDrawImageOperation>();
@@ -188,6 +201,11 @@ namespace QuestPDF.UnitTests.TestEngine
             return AddOperation(new CanvasDrawRectangleOperation(position, size, color));
         }
         
+        public TestPlan ExpectCanvasDrawText(string text, Position position, TextStyle style)
+        {
+            return AddOperation(new CanvasDrawTextOperation(text, position, style));
+        }
+        
         public TestPlan ExpectCanvasDrawImage(Position position, Size size)
         {
             return AddOperation(new CanvasDrawImageOperation(position, size));

QuestPDF.sln

@@ -8,15 +8,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuestPDF.UnitTests", "Quest
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuestPDF.Examples", "QuestPDF.Examples\QuestPDF.Examples.csproj", "{8BD0A2B4-2DC1-47BA-9724-C158320D9CAE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuestPDF.Previewer.Examples", "QuestPDF.Previewer.Examples\QuestPDF.Previewer.Examples.csproj", "{CA413A39-038F-4A9F-B56F-0E5413B6B158}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Configuration", "Configuration", "{73123649-216A-47B4-BFB2-DADF13FBE75D}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuestPDF.Previewer", "QuestPDF.Previewer\QuestPDF.Previewer.csproj", "{B2FF6003-3A45-4A78-A85D-B86C7F01D054}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -39,13 +30,5 @@ Global
 		{8BD0A2B4-2DC1-47BA-9724-C158320D9CAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8BD0A2B4-2DC1-47BA-9724-C158320D9CAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8BD0A2B4-2DC1-47BA-9724-C158320D9CAE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CA413A39-038F-4A9F-B56F-0E5413B6B158}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CA413A39-038F-4A9F-B56F-0E5413B6B158}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CA413A39-038F-4A9F-B56F-0E5413B6B158}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CA413A39-038F-4A9F-B56F-0E5413B6B158}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B2FF6003-3A45-4A78-A85D-B86C7F01D054}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B2FF6003-3A45-4A78-A85D-B86C7F01D054}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B2FF6003-3A45-4A78-A85D-B86C7F01D054}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B2FF6003-3A45-4A78-A85D-B86C7F01D054}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal

QuestPDF/Assembly.cs

@@ -0,0 +1,6 @@
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
+[assembly: InternalsVisibleTo("QuestPDF.UnitTests")]
+[assembly: InternalsVisibleTo("QuestPDF.Examples")]
+[assembly: InternalsVisibleTo("QuestPDF.ReportSample")]

QuestPDF/Drawing/DocumentGenerator.cs

@@ -17,30 +17,19 @@ namespace QuestPDF.Drawing
     {
         internal static void GeneratePdf(Stream stream, IDocument document)
         {
-            CheckIfStreamIsCompatible(stream);
-            
             var metadata = document.GetMetadata();
-            var canvas = new PdfCanvas(stream, metadata);
+            var writeOnlyStream = new WriteOnlyStream(stream);
+            var canvas = new PdfCanvas(writeOnlyStream, metadata);
             RenderDocument(canvas, document);
         }
         
         internal static void GenerateXps(Stream stream, IDocument document)
         {
-            CheckIfStreamIsCompatible(stream);
-            
             var metadata = document.GetMetadata();
-            var canvas = new XpsCanvas(stream, metadata);
+            var writeOnlyStream = new WriteOnlyStream(stream);
+            var canvas = new XpsCanvas(writeOnlyStream, metadata);
             RenderDocument(canvas, document);
         }
-
-        private static void CheckIfStreamIsCompatible(Stream stream)
-        {
-            if (!stream.CanWrite)
-                throw new ArgumentException("The library requires a Stream object with the 'write' capability available (the CanWrite flag). Please consider using the MemoryStream class.");
-            
-            if (!stream.CanSeek)
-                throw new ArgumentException("The library requires a Stream object with the 'seek' capability available (the CanSeek flag). Please consider using the MemoryStream class.");
-        }
         
         internal static ICollection<byte[]> GenerateImages(IDocument document)
         {
@@ -51,39 +40,31 @@ namespace QuestPDF.Drawing
             return canvas.Images;
         }
 
-        internal static ICollection<PreviewerPicture> GeneratePreviewerPictures(IDocument document)
-        {
-            var canvas = new SkiaPictureCanvas();
-            RenderDocument(canvas, document);
-            return canvas.Pictures;
-        }
-        
-        internal static void RenderDocument<TCanvas>(TCanvas canvas, IDocument document)
+        private static void RenderDocument<TCanvas>(TCanvas canvas, IDocument document)
             where TCanvas : ICanvas, IRenderingCanvas
         {
             var container = new DocumentContainer();
             document.Compose(container);
             var content = container.Compose();
             ApplyDefaultTextStyle(content, TextStyle.LibraryDefault);
-            ApplyContentRepeatState(content, false);
-
-            var debuggingState = Settings.EnableDebugging ? ApplyDebugging(content) : null;
             
-            if (Settings.EnableCaching)
+            var metadata = document.GetMetadata();
+            var pageContext = new PageContext();
+
+            var debuggingState = metadata.ApplyDebugging ? ApplyDebugging(content) : null;
+            
+            if (metadata.ApplyCaching)
                 ApplyCaching(content);
 
-            var pageContext = new PageContext(); 
-            RenderPass(pageContext, new FreeCanvas(), content, debuggingState);
-            RenderPass(pageContext, canvas, content, debuggingState);
+            RenderPass(pageContext, new FreeCanvas(), content, metadata, debuggingState);
+            RenderPass(pageContext, canvas, content, metadata, debuggingState);
         }
         
-        internal static void RenderPass<TCanvas>(PageContext pageContext, TCanvas canvas, Container content, DebuggingState? debuggingState)
+        internal static void RenderPass<TCanvas>(PageContext pageContext, TCanvas canvas, Container content, DocumentMetadata documentMetadata, DebuggingState? debuggingState)
             where TCanvas : ICanvas, IRenderingCanvas
         {
             content.VisitChildren(x => x?.Initialize(pageContext, canvas));
             content.VisitChildren(x => (x as IStateResettable)?.ResetState());
-
-            ResetIsRenderedState(content);
             
             canvas.BeginDocument();
 
@@ -115,7 +96,7 @@ namespace QuestPDF.Drawing
 
                 canvas.EndPage();
 
-                if (currentPage >= Settings.DocumentLayoutExceptionThreshold)
+                if (currentPage >= documentMetadata.DocumentLayoutExceptionThreshold)
                 {
                     canvas.EndDocument();
                     ThrowLayoutException();
@@ -132,14 +113,15 @@ namespace QuestPDF.Drawing
             void ThrowLayoutException()
             {
                 var message = $"Composed layout generates infinite document. This may happen in two cases. " +
-                              $"1) Your document and its layout configuration is correct but the content takes more than {Settings.DocumentLayoutExceptionThreshold} pages. " +
-                              $"In this case, please increase the value {nameof(QuestPDF)}.{nameof(Settings)}.{nameof(Settings.DocumentLayoutExceptionThreshold)} static property. " +
+                              $"1) Your document and its layout configuration is correct but the content takes more than {documentMetadata.DocumentLayoutExceptionThreshold} pages. " +
+                              $"In this case, please increase the value {nameof(DocumentMetadata)}.{nameof(DocumentMetadata.DocumentLayoutExceptionThreshold)} property configured in the {nameof(IDocument.GetMetadata)} method. " +
                               $"2) The layout configuration of your document is invalid. Some of the elements require more space than is provided." +
                               $"Please analyze your documents structure to detect this element and fix its size constraints.";
-
-                var elementTrace = debuggingState?.BuildTrace() ?? "Debug trace is available only in the DEBUG mode.";
-
-                throw new DocumentLayoutException(message, elementTrace);
+                
+                throw new DocumentLayoutException(message)
+                {
+                    ElementTrace = debuggingState?.BuildTrace() ?? "Debug trace is available only in the DEBUG mode."
+                };
             }
         }
 
@@ -163,52 +145,8 @@ namespace QuestPDF.Drawing
 
             return debuggingState;
         }
-        
-        private static void ApplyContentRepeatState(Element? content, bool repeatContent)
-        {
-            if (content == null)
-                return;
-            
-            if (content is IVisual visual)
-                visual.RepeatContent = repeatContent;
-            
-            if (content is TextBlock textBlock)
-            {
-                foreach (var textBlockItem in textBlock.Items)
-                {
-                    if (textBlockItem is TextBlockElement textElement)
-                    {
-                        ApplyContentRepeatState(textElement.Element, true);
-                    }
-                }
-                
-                return;
-            }
 
-            // TODO: apply RepeatState in dynamic content
-            //if (content is DynamicHost dynamicHost)
-            //  dynamicHost.TextStyle = dynamicHost.TextStyle.ApplyGlobalStyle(documentDefaultTextStyle);
-
-            if (content is RepeatContentSetter repeatContentSetter)
-                repeatContent = repeatContentSetter.RepeatContent;
-            
-            foreach (var child in content.GetChildren())
-                ApplyContentRepeatState(child, repeatContent);
-        }
-        
-        private static void ResetIsRenderedState(Element? content)
-        {
-            if (content == null)
-                return;
-            
-            if (content is IVisual visual)
-                visual.IsRendered = false;
-
-            foreach (var child in content.GetChildren())
-                ResetIsRenderedState(child);
-        }
-
-        internal static void ApplyDefaultTextStyle(this Element? content, TextStyle documentDefaultTextStyle)
+        private static void ApplyDefaultTextStyle(this Element? content, TextStyle documentDefaultTextStyle)
         {
             if (content == null)
                 return;
@@ -219,7 +157,7 @@ namespace QuestPDF.Drawing
                 {
                     if (textBlockItem is TextBlockSpan textSpan)
                     {
-                        textSpan.Style = textSpan.Style.ApplyGlobalStyle(documentDefaultTextStyle);
+                        textSpan.Style.ApplyGlobalStyle(documentDefaultTextStyle);
                     }
                     else if (textBlockItem is TextBlockElement textElement)
                     {
@@ -230,14 +168,16 @@ namespace QuestPDF.Drawing
                 return;
             }
 
-            if (content is DynamicHost dynamicHost)
-                dynamicHost.TextStyle = dynamicHost.TextStyle.ApplyGlobalStyle(documentDefaultTextStyle);
+            var targetTextStyle = documentDefaultTextStyle;
             
             if (content is DefaultTextStyle defaultTextStyleElement)
-               documentDefaultTextStyle = defaultTextStyleElement.TextStyle.ApplyGlobalStyle(documentDefaultTextStyle);
-
+            {
+                defaultTextStyleElement.TextStyle.ApplyParentStyle(documentDefaultTextStyle);
+                targetTextStyle = defaultTextStyleElement.TextStyle;
+            }
+            
             foreach (var child in content.GetChildren())
-                ApplyDefaultTextStyle(child, documentDefaultTextStyle);
+                ApplyDefaultTextStyle(child, targetTextStyle);
         }
     }
 }

QuestPDF/Drawing/DocumentMetadata.cs

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

QuestPDF/Drawing/Exceptions/DocumentComposeException.cs

@@ -4,7 +4,17 @@ namespace QuestPDF.Drawing.Exceptions
 {
     public class DocumentComposeException : Exception
     {
-        internal DocumentComposeException(string message) : base(message)
+        public DocumentComposeException()
+        {
+            
+        }
+
+        public DocumentComposeException(string message) : base(message)
+        {
+            
+        }
+
+        public DocumentComposeException(string message, Exception inner) : base(message, inner)
         {
             
         }

QuestPDF/Drawing/Exceptions/DocumentDrawingException.cs

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

QuestPDF/Drawing/Exceptions/DocumentLayoutException.cs

@@ -4,11 +4,21 @@ namespace QuestPDF.Drawing.Exceptions
 {
     public class DocumentLayoutException : Exception
     {
-        public string? ElementTrace { get; }
-
-        internal DocumentLayoutException(string message, string? elementTrace = null) : base(message)
+        public string ElementTrace { get; set; }
+        
+        public DocumentLayoutException()
         {
-            ElementTrace = elementTrace;
+            
+        }
+
+        public DocumentLayoutException(string message) : base(message)
+        {
+            
+        }
+
+        public DocumentLayoutException(string message, Exception inner) : base(message, inner)
+        {
+            
         }
     }
 }

QuestPDF/Drawing/Exceptions/InitializationException.cs

@@ -1,36 +0,0 @@
-using System;
-
-namespace QuestPDF.Drawing.Exceptions
-{
-    public class InitializationException : Exception
-    {
-        internal InitializationException(string documentType, Exception innerException) : base(CreateMessage(documentType, innerException.Message), innerException)
-        {
-            
-        }
-
-        private static string CreateMessage(string documentType, string innerExceptionMessage)
-        {
-            var (libraryName, nugetConvention) = GetLibraryName();
-            
-            return $"Cannot create the {documentType} document using the {libraryName} library. " +
-                   $"This exception usually means that, on your operating system where you run the application, {libraryName} requires installing additional dependencies. " +
-                   $"Such dependencies are available as additional nuget packages, for example {nugetConvention}.Linux.NoDependencies. " +
-                   $"Some operating systems may require installing multiple nugets, e.g. MacOS may need both {nugetConvention}.macOS.NoDependencies and {nugetConvention}.Linux.NoDependencies." +
-                   $"Please refer to the {libraryName} documentation for more details. " +
-                   $"Also, please consult the inner exception that has been originally thrown by the dependency library.";
-
-            (string GetLibraryName, string nugetConvention) GetLibraryName()
-            {
-                if (innerExceptionMessage.Contains("libSkiaSharp"))
-                    return ("SkiaSharp", "SkiaSharp.NativeAssets");
-                
-                if (innerExceptionMessage.Contains("libHarfBuzzSharp"))
-                    return ("HarfBuzzSharp", "HarfBuzzSharp.NativeAssets");
-                
-                // default
-                return ("SkiaSharp-related", "*.NativeAssets");
-            }
-        }
-    }
-}

QuestPDF/Drawing/FontManager.cs

@@ -1,11 +1,7 @@
 using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Reflection;
-using HarfBuzzSharp;
-using QuestPDF.Fluent;
 using QuestPDF.Infrastructure;
 using SkiaSharp;
 using SkiaSharp.HarfBuzz;
@@ -14,19 +10,13 @@ namespace QuestPDF.Drawing
 {
     public static class FontManager
     {
-        private static readonly ConcurrentDictionary<string, FontStyleSet> StyleSets = new();
-        private static readonly ConcurrentDictionary<TextStyle, SKFontMetrics> FontMetrics = new();
-        private static readonly ConcurrentDictionary<TextStyle, SKPaint> FontPaints = new();
-        private static readonly ConcurrentDictionary<string, SKPaint> ColorPaints = new();
-        private static readonly ConcurrentDictionary<TextStyle, Font> ShaperFonts = new();
-        private static readonly ConcurrentDictionary<TextStyle, SKFont> Fonts = new();
-        private static readonly ConcurrentDictionary<TextStyle, TextShaper> TextShapers = new();
+        private static ConcurrentDictionary<string, FontStyleSet> StyleSets = new();
+        private static ConcurrentDictionary<object, SKFontMetrics> FontMetrics = new();
+        private static ConcurrentDictionary<object, SKPaint> Paints = new();
+        private static ConcurrentDictionary<object, SKFont> Fonts = new();
+        private static ConcurrentDictionary<object, SKShaper> Shapers = new();
+        private static ConcurrentDictionary<string, SKPaint> ColorPaint = new();
 
-        static FontManager()
-        {
-            RegisterLibraryDefaultFonts();
-        }
-        
         private static void RegisterFontType(SKData fontData, string? customName = null)
         {
             foreach (var index in Enumerable.Range(0, 256))
@@ -43,74 +33,36 @@ namespace QuestPDF.Drawing
             }
         }
 
-        [Obsolete("Since version 2022.8 this method has been renamed. Please use the RegisterFontWithCustomName 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)
-        {
-            RegisterFontWithCustomName(fontName, stream);
-        }
-        
-        public static void RegisterFontWithCustomName(string fontName, Stream stream)
         {
             using var fontData = SKData.Create(stream);
             RegisterFontType(fontData);
             RegisterFontType(fontData, customName: fontName);
         }
 
-        public static void RegisterFont(Stream stream)
+        public static void RegisterFontType(Stream stream)
         {
             using var fontData = SKData.Create(stream);
             RegisterFontType(fontData);
         }
-        
-        public static void RegisterFontFromEmbeddedResource(string pathName)
-        {
-            using var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream(pathName);
-            RegisterFont(stream);
-        }
-        
-        private static void RegisterLibraryDefaultFonts()
-        {
-            var fontFileNames = new[]
-            {
-                "Lato-Black.ttf",
-                "Lato-BlackItalic.ttf",
-                
-                "Lato-Bold.ttf",
-                "Lato-BoldItalic.ttf",
-                
-                "Lato-Regular.ttf",
-                "Lato-Italic.ttf",
-                
-                "Lato-Light.ttf",
-                "Lato-LightItalic.ttf",
-                
-                "Lato-Thin.ttf",
-                "Lato-ThinItalic.ttf"
-            };
-            
-            fontFileNames
-                .Select(x => $"QuestPDF.Resources.DefaultFont.{x}")
-                .ToList()
-                .ForEach(RegisterFontFromEmbeddedResource);
-        }
 
         internal static SKPaint ColorToPaint(this string color)
         {
-            return ColorPaints.GetOrAdd(color, Convert);
+            return ColorPaint.GetOrAdd(color, Convert);
 
             static SKPaint Convert(string color)
             {
                 return new SKPaint
                 {
-                    Color = SKColor.Parse(color),
-                    IsAntialias = true
+                    Color = SKColor.Parse(color)
                 };
             }
         }
 
         internal static SKPaint ToPaint(this TextStyle style)
         {
-            return FontPaints.GetOrAdd(style, Convert);
+            return Paints.GetOrAdd(style.PaintKey, key => Convert(style));
 
             static SKPaint Convert(TextStyle style)
             {
@@ -118,94 +70,46 @@ namespace QuestPDF.Drawing
                 {
                     Color = SKColor.Parse(style.Color),
                     Typeface = GetTypeface(style),
-                    TextSize = (style.Size ?? 12) * GetTextScale(style),
-                    IsAntialias = true,
+                    TextSize = style.Size ?? 12
                 };
             }
 
             static SKTypeface GetTypeface(TextStyle style)
             {
                 var weight = (SKFontStyleWeight)(style.FontWeight ?? FontWeight.Normal);
-
-                // superscript and subscript use slightly bolder font to match visually line thickness
-                if (style.FontPosition is FontPosition.Superscript or FontPosition.Subscript)
-                {
-                    var weightValue = (int)weight;
-                    weightValue = Math.Min(weightValue + 100, 1000);
-                    
-                    weight = (SKFontStyleWeight) (weightValue);
-                }
-
                 var slant = (style.IsItalic ?? false) ? SKFontStyleSlant.Italic : SKFontStyleSlant.Upright;
 
                 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;
-
-                var availableFontNames = string.Join(", ", SKFontManager.Default.GetFontFamilies());
                 
                 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. " +
-                    $"Available font family names: [{availableFontNames}]");
-            }
-            
-            static float GetTextScale(TextStyle style)
-            {
-                return style.FontPosition switch
-                {
-                    FontPosition.Normal => 1f,
-                    FontPosition.Subscript => 0.625f,
-                    FontPosition.Superscript => 0.625f,
-                    _ => throw new ArgumentOutOfRangeException()
-                };
+                    $"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, key => key.NormalPosition().ToPaint().FontMetrics);
-        }
-
-        internal static Font ToShaperFont(this TextStyle style)
-        {
-            return ShaperFonts.GetOrAdd(style, key =>
-            {
-                var typeface = key.ToPaint().Typeface;
-
-                using var harfBuzzBlob = typeface.OpenStream(out var ttcIndex).ToHarfBuzzBlob();
-                
-                using var face = new Face(harfBuzzBlob, ttcIndex)
-                {
-                    Index = ttcIndex,
-                    UnitsPerEm = typeface.UnitsPerEm,
-                    GlyphCount = typeface.GlyphCount
-                };
-                
-                var font = new Font(face);
-                font.SetScale(TextShaper.FontShapingScale, TextShaper.FontShapingScale);
-                font.SetFunctionsOpenType();
-
-                return font;
-            });
+            return FontMetrics.GetOrAdd(style.FontMetricsKey, key => style.ToPaint().FontMetrics);
         }
         
-        internal static TextShaper ToTextShaper(this TextStyle style)
+        internal static SKShaper ToShaper(this TextStyle style)
         {
-            return TextShapers.GetOrAdd(style, key => new TextShaper(key));
-        }
-        
-        internal static SKFont ToFont(this TextStyle style)
-        {
-            return Fonts.GetOrAdd(style, key => key.ToPaint().ToFont());
+            return Shapers.GetOrAdd(style.FontMetricsKey, _ => new SKShaper(style.ToFont().Typeface));
         }
     }
 }

QuestPDF/Drawing/FreeCanvas.cs

@@ -41,7 +41,12 @@ namespace QuestPDF.Drawing
             
         }
 
-        public void DrawText(SKTextBlob skTextBlob, Position position, TextStyle style)
+        public void DrawText(string text, Position position, TextStyle style)
+        {
+            
+        }
+        
+        public void DrawShapedText(string text, Position position, TextStyle style)
         {
             
         }

QuestPDF/Drawing/PdfCanvas.cs

@@ -1,6 +1,4 @@
-using System;
-using System.IO;
-using QuestPDF.Drawing.Exceptions;
+using System.IO;
 using QuestPDF.Helpers;
 using SkiaSharp;
 
@@ -9,23 +7,11 @@ namespace QuestPDF.Drawing
     internal class PdfCanvas : SkiaDocumentCanvasBase
     {
         public PdfCanvas(Stream stream, DocumentMetadata documentMetadata) 
-            : base(CreatePdf(stream, documentMetadata))
+            : base(SKDocument.CreatePdf(stream, MapMetadata(documentMetadata)))
         {
             
         }
-
-        private static SKDocument CreatePdf(Stream stream, DocumentMetadata documentMetadata)
-        {
-            try
-            {
-                return SKDocument.CreatePdf(stream, MapMetadata(documentMetadata));
-            }
-            catch (TypeInitializationException exception)
-            {
-                throw new InitializationException("PDF", exception);
-            }
-        }
-
+        
         private static SKDocumentPdfMetadata MapMetadata(DocumentMetadata metadata)
         {
             return new SKDocumentPdfMetadata

QuestPDF/Drawing/SkiaCanvasBase.cs

@@ -28,11 +28,16 @@ namespace QuestPDF.Drawing
             Canvas.DrawRect(vector.X, vector.Y, size.Width, size.Height, paint);
         }
 
-        public void DrawText(SKTextBlob skTextBlob, Position position, TextStyle style)
+        public void DrawText(string text, Position vector, TextStyle style)
         {
-            Canvas.DrawText(skTextBlob, position.X, position.Y, style.ToPaint());
+            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/Drawing/SkiaDocumentCanvasBase.cs

@@ -6,16 +6,16 @@ namespace QuestPDF.Drawing
 {
     internal class SkiaDocumentCanvasBase : SkiaCanvasBase
     {
-        private SKDocument? Document { get; }
+        private SKDocument Document { get; }
 
-        protected SkiaDocumentCanvasBase(SKDocument document)
+        public SkiaDocumentCanvasBase(SKDocument document)
         {
             Document = document;
         }
 
         ~SkiaDocumentCanvasBase()
         {
-            Document?.Dispose();
+            Document.Dispose();
         }
         
         public override void BeginDocument()
@@ -25,7 +25,7 @@ namespace QuestPDF.Drawing
 
         public override void EndDocument()
         {
-            Canvas?.Dispose();
+            Canvas.Dispose();
             
             Document.Close();
             Document.Dispose();

QuestPDF/Drawing/SkiaPictureCanvas.cs

@@ -1,55 +0,0 @@
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using QuestPDF.Helpers;
-using QuestPDF.Infrastructure;
-using SkiaSharp;
-
-namespace QuestPDF.Drawing
-{
-    public class PreviewerPicture
-    {
-        public SKPicture Picture { get; set; }
-        public Size Size { get; set; }
-
-        public PreviewerPicture(SKPicture picture, Size size)
-        {
-            Picture = picture;
-            Size = size;
-        }
-    }
-    
-    internal class SkiaPictureCanvas : SkiaCanvasBase
-    {
-        private SKPictureRecorder? PictureRecorder { get; set; }
-        private Size? CurrentPageSize { get; set; }
-
-        public ICollection<PreviewerPicture> Pictures { get; } = new List<PreviewerPicture>();
-        
-        public override void BeginDocument()
-        {
-            Pictures.Clear();
-        }
-
-        public override void BeginPage(Size size)
-        {
-            CurrentPageSize = size;
-            PictureRecorder = new SKPictureRecorder();
-
-            Canvas = PictureRecorder.BeginRecording(new SKRect(0, 0, size.Width, size.Height));
-        }
-
-        public override void EndPage()
-        {
-            var picture = PictureRecorder?.EndRecording();
-            
-            if (picture != null && CurrentPageSize.HasValue)
-                Pictures.Add(new PreviewerPicture(picture, CurrentPageSize.Value));
-
-            PictureRecorder?.Dispose();
-            PictureRecorder = null;
-        }
-
-        public override void EndDocument() { }
-    }
-}

QuestPDF/Drawing/TextMeasurement.cs

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

QuestPDF/Drawing/TextShaper.cs

@@ -1,161 +0,0 @@
-using System;
-using System.Linq;
-using HarfBuzzSharp;
-using QuestPDF.Infrastructure;
-using SkiaSharp;
-using Buffer = HarfBuzzSharp.Buffer;
-
-namespace QuestPDF.Drawing
-{
-    internal class TextShaper
-    {
-        public const int FontShapingScale = 512;
-        
-        private TextStyle TextStyle { get; }
-
-        private SKFont Font => TextStyle.ToFont();
-        private Font ShaperFont => TextStyle.ToShaperFont();
-        private SKPaint Paint => TextStyle.ToPaint();
-
-        public TextShaper(TextStyle textStyle)
-        {
-            TextStyle = textStyle;
-        }
-
-        public TextShapingResult Shape(string text)
-        {
-            using var buffer = new Buffer();
-            
-            PopulateBufferWithText(buffer, text);
-            buffer.GuessSegmentProperties();
-
-            ShaperFont.Shape(buffer);
-            
-            var length = buffer.Length;
-            var glyphInfos = buffer.GlyphInfos;
-            var glyphPositions = buffer.GlyphPositions;
-            
-            var scaleY = Paint.TextSize / FontShapingScale;
-            var scaleX = scaleY * Paint.TextScaleX;
-            
-            var xOffset = 0f;
-            var yOffset = 0f;
-            
-            var glyphs = new ShapedGlyph[length];
-            
-            for (var i = 0; i < length; i++)
-            {
-                glyphs[i] = new ShapedGlyph
-                {
-                    Codepoint = (ushort)glyphInfos[i].Codepoint,
-                    Position = new SKPoint(xOffset + glyphPositions[i].XOffset * scaleX, yOffset - glyphPositions[i].YOffset * scaleY),
-                    Width = glyphPositions[i].XAdvance * scaleX
-                };
-                
-                xOffset += glyphPositions[i].XAdvance * scaleX;
-                yOffset += glyphPositions[i].YAdvance * scaleY;
-            }
-            
-            return new TextShapingResult(glyphs);
-        }
-        
-        void PopulateBufferWithText(Buffer buffer, string text)
-        {
-            var encoding = Paint.TextEncoding;
-
-            if (encoding == SKTextEncoding.Utf8)
-                buffer.AddUtf8(text);
-                
-            else if (encoding == SKTextEncoding.Utf16)
-                buffer.AddUtf16(text);
-
-            else if (encoding == SKTextEncoding.Utf32)
-                buffer.AddUtf32(text);
-
-            else
-                throw new NotSupportedException("TextEncoding of type GlyphId is not supported.");
-        }
-    }
-    
-    internal struct ShapedGlyph
-    {
-        public ushort Codepoint;
-        public SKPoint Position;
-        public float Width;
-    }
-
-    internal struct DrawTextCommand
-    {
-        public SKTextBlob SkTextBlob;
-        public float TextOffsetX;
-    }
-    
-    internal class TextShapingResult
-    {
-        public ShapedGlyph[] Glyphs { get; }
-
-        public TextShapingResult(ShapedGlyph[] glyphs)
-        {
-            Glyphs = glyphs;
-        }
-
-        public int BreakText(int startIndex, float maxWidth)
-        {
-            var index = startIndex;
-            maxWidth += Glyphs[startIndex].Position.X;
-
-            while (index < Glyphs.Length)
-            {
-                var glyph = Glyphs[index];
-                
-                if (glyph.Position.X + glyph.Width > maxWidth + Size.Epsilon)
-                    break;
-                
-                index++;
-            }
-
-            return index - 1;
-        }
-        
-        public float MeasureWidth(int startIndex, int endIndex)
-        {
-            if (Glyphs.Length == 0)
-                return 0;
-            
-            var start = Glyphs[startIndex];
-            var end = Glyphs[endIndex];
-
-            return end.Position.X - start.Position.X + end.Width;
-        }
-        
-        public DrawTextCommand? PositionText(int startIndex, int endIndex, TextStyle textStyle)
-        {
-            if (Glyphs.Length == 0)
-                return null;
-
-            if (startIndex > endIndex)
-                return null;
-            
-            using var skTextBlobBuilder = new SKTextBlobBuilder();
-            
-            var positionedRunBuffer = skTextBlobBuilder.AllocatePositionedRun(textStyle.ToFont(), endIndex - startIndex + 1);
-            var glyphSpan = positionedRunBuffer.GetGlyphSpan();
-            var positionSpan = positionedRunBuffer.GetPositionSpan();
-                
-            for (var sourceIndex = startIndex; sourceIndex <= endIndex; sourceIndex++)
-            {
-                var runIndex = sourceIndex - startIndex;
-                
-                glyphSpan[runIndex] = Glyphs[sourceIndex].Codepoint;
-                positionSpan[runIndex] = Glyphs[sourceIndex].Position;
-            }
-            
-            return new DrawTextCommand
-            {
-                SkTextBlob = skTextBlobBuilder.Build(),
-                TextOffsetX = -Glyphs[startIndex].Position.X
-            };
-        }
-    }
-    
-}

QuestPDF/Drawing/XpsCanvas.cs

@@ -1,6 +1,4 @@
-using System;
-using System.IO;
-using QuestPDF.Drawing.Exceptions;
+using System.IO;
 using QuestPDF.Helpers;
 using SkiaSharp;
 
@@ -9,21 +7,9 @@ namespace QuestPDF.Drawing
     internal class XpsCanvas : SkiaDocumentCanvasBase
     {
         public XpsCanvas(Stream stream, DocumentMetadata documentMetadata) 
-            : base(CreateXps(stream, documentMetadata))
+            : base(SKDocument.CreateXps(stream, documentMetadata.RasterDpi))
         {
             
         }
-        
-        private static SKDocument CreateXps(Stream stream, DocumentMetadata documentMetadata)
-        {
-            try
-            {
-                return SKDocument.CreateXps(stream, documentMetadata.RasterDpi);
-            }
-            catch (TypeInitializationException exception)
-            {
-                throw new InitializationException("XPS", exception);
-            }
-        }
     }
 }

QuestPDF/Elements/Canvas.cs

@@ -1,5 +1,4 @@
 using QuestPDF.Drawing;
-using QuestPDF.Helpers;
 using QuestPDF.Infrastructure;
 using SkiaSharp;
 
@@ -7,28 +6,17 @@ namespace QuestPDF.Elements
 {
     public delegate void DrawOnCanvas(SKCanvas canvas, Size availableSpace);
     
-    internal class Canvas : Element, IVisual, ICacheable
+    internal class Canvas : Element, ICacheable
     {
-        public bool IsRendered { get; set; }
-        public bool RepeatContent { get; set; }
-        
         public DrawOnCanvas Handler { get; set; }
         
         internal override SpacePlan Measure(Size availableSpace)
         {
-            if (availableSpace.IsNegative())
-                return SpacePlan.Wrap();
-            
-            if (IsRendered && !RepeatContent)
-                return SpacePlan.FullRender(Size.Zero);
-            
             return SpacePlan.FullRender(availableSpace);
         }
 
         internal override void Draw(Size availableSpace)
         {
-            IsRendered = true;
-            
             var skiaCanvas = (Canvas as Drawing.SkiaCanvasBase)?.Canvas;
             
             if (Handler == null || skiaCanvas == null)

QuestPDF/Elements/Column.cs

@@ -94,12 +94,7 @@ namespace QuestPDF.Elements
                 if (item.IsRendered)
                     continue;
 
-                var availableHeight = availableSpace.Height - topOffset;
-                
-                if (availableHeight < 0)
-                    break;
-
-                var itemSpace = new Size(availableSpace.Width, availableHeight);
+                var itemSpace = new Size(availableSpace.Width, availableSpace.Height - topOffset);
                 var measurement = item.Measure(itemSpace);
                 
                 if (measurement.Type == SpacePlanType.Wrap)

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

@@ -1,106 +0,0 @@
-using System;
-using QuestPDF.Drawing;
-using QuestPDF.Drawing.Exceptions;
-using QuestPDF.Helpers;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Elements
-{
-    internal class DynamicHost : Element, IStateResettable
-    {
-        private DynamicComponentProxy Child { get; }
-        private object InitialComponentState { get; set; }
-
-        internal TextStyle TextStyle { get; set; } = TextStyle.Default;
-
-        public DynamicHost(DynamicComponentProxy child)
-        {
-            Child = child;
-            
-            InitialComponentState = Child.GetState();
-        }
-
-        public void ResetState()
-        {
-            Child.SetState(InitialComponentState);
-        }
-        
-        internal override SpacePlan Measure(Size availableSpace)
-        {
-            var result = GetContent(availableSpace, acceptNewState: false);
-            var content = result.Content as Element ?? Empty.Instance;
-            var measurement = content.Measure(availableSpace);
-
-            if (measurement.Type != SpacePlanType.FullRender)
-                throw new DocumentLayoutException("Dynamic component generated content that does not fit on a single page.");
-            
-            return result.HasMoreContent 
-                ? SpacePlan.PartialRender(measurement) 
-                : SpacePlan.FullRender(measurement);
-        }
-
-        internal override void Draw(Size availableSpace)
-        {
-            var content = GetContent(availableSpace, acceptNewState: true).Content as Element; 
-            content?.Draw(availableSpace);
-        }
-
-        private DynamicComponentComposeResult GetContent(Size availableSize, bool acceptNewState)
-        {
-            var componentState = Child.GetState();
-            
-            var context = new DynamicContext
-            {
-                PageNumber = PageContext.CurrentPage,
-                TotalPages = PageContext.GetLocation(Infrastructure.PageContext.DocumentLocation).PageEnd,
-                PageContext = PageContext,
-                Canvas = Canvas,
-                TextStyle = TextStyle,
-                
-                AvailableSize = availableSize
-            };
-            
-            var result = Child.Compose(context);
-
-            if (!acceptNewState)
-                Child.SetState(componentState);
-
-            return result;
-        }
-    }
-
-    public class DynamicContext
-    {
-        internal IPageContext PageContext { get; set; }
-        internal ICanvas Canvas { get; set; }
-        internal TextStyle TextStyle { get; set; }
-    
-        public int PageNumber { get; internal set; }
-        public int TotalPages { get; internal set; }
-        public Size AvailableSize { get; internal set; }
-
-        public IDynamicElement CreateElement(Action<IContainer> content)
-        {
-            var container = new DynamicElement();
-            content(container);
-            
-            container.ApplyDefaultTextStyle(TextStyle);
-            container.VisitChildren(x => x?.Initialize(PageContext, Canvas));
-            container.VisitChildren(x => (x as IStateResettable)?.ResetState());
-
-            container.Size = container.Measure(Size.Max);
-            
-            return container;
-        }
-    }
-
-    public interface IDynamicElement : IElement
-    {
-        Size Size { get; }
-    }
-
-    internal class DynamicElement : ContainerElement, IDynamicElement
-    {
-        public Size Size { get; internal set; }
-    }
-}

QuestPDF/Elements/DynamicImage.cs

@@ -1,43 +1,33 @@
 using System;
 using QuestPDF.Drawing;
-using QuestPDF.Helpers;
 using QuestPDF.Infrastructure;
 using SkiaSharp;
 
 namespace QuestPDF.Elements
 {
-    internal class DynamicImage : Element, IVisual
+    internal class DynamicImage : Element
     {
-        public bool IsRendered { get; set; }
-        public bool RepeatContent { get; set; }
-        
         public Func<Size, byte[]>? Source { get; set; }
         
         internal override SpacePlan Measure(Size availableSpace)
         {
-            if (availableSpace.IsNegative())
-                return SpacePlan.Wrap();
-            
-            if (IsRendered && !RepeatContent)
-                return SpacePlan.FullRender(Size.Zero);
-            
-            return SpacePlan.FullRender(availableSpace);
+            return SpacePlan.FullRender(availableSpace.Width, availableSpace.Height);
         }
 
         internal override void Draw(Size availableSpace)
         {
-            IsRendered = true;
-            
-            if (availableSpace.Width < Size.Epsilon || availableSpace.Height < Size.Epsilon)
-                return;
-            
             var imageData = Source?.Invoke(availableSpace);
             
             if (imageData == null)
                 return;
 
-            using var image = SKImage.FromEncodedData(imageData);
-            Canvas.DrawImage(image, Position.Zero, availableSpace);
+            var imageElement = new Image
+            {
+                InternalImage = SKImage.FromEncodedData(imageData)
+            };
+            
+            imageElement.Initialize(PageContext, Canvas);
+            imageElement.Draw(availableSpace);
         }
     }
 }

QuestPDF/Elements/Empty.cs

@@ -1,5 +1,4 @@
 using QuestPDF.Drawing;
-using QuestPDF.Helpers;
 using QuestPDF.Infrastructure;
 
 namespace QuestPDF.Elements
@@ -10,9 +9,7 @@ namespace QuestPDF.Elements
         
         internal override SpacePlan Measure(Size availableSpace)
         {
-            return availableSpace.IsNegative() 
-                ? SpacePlan.Wrap() 
-                : SpacePlan.FullRender(0, 0);
+            return SpacePlan.FullRender(0, 0);
         }
 
         internal override void Draw(Size availableSpace)

QuestPDF/Elements/Image.cs

@@ -1,15 +1,11 @@
 using QuestPDF.Drawing;
-using QuestPDF.Helpers;
 using QuestPDF.Infrastructure;
 using SkiaSharp;
 
 namespace QuestPDF.Elements
 {
-    internal class Image : Element, IVisual, ICacheable
+    internal class Image : Element, ICacheable
     {
-        public bool IsRendered { get; set; }
-        public bool RepeatContent { get; set; }
-        
         public SKImage? InternalImage { get; set; }
 
         ~Image()
@@ -19,12 +15,6 @@ namespace QuestPDF.Elements
         
         internal override SpacePlan Measure(Size availableSpace)
         {
-            if (availableSpace.IsNegative())
-                return SpacePlan.Wrap();
-            
-            if (IsRendered && !RepeatContent)
-                return SpacePlan.FullRender(Size.Zero);
-            
             return SpacePlan.FullRender(availableSpace);
         }
 
@@ -33,7 +23,6 @@ namespace QuestPDF.Elements
             if (InternalImage == null)
                 return;
 
-            IsRendered = true;
             Canvas.DrawImage(InternalImage, Position.Zero, availableSpace);
         }
     }

QuestPDF/Elements/Inlined.cs

@@ -19,12 +19,6 @@ namespace QuestPDF.Elements
         Justify,
         SpaceAround
     }
-
-    internal struct InlinedMeasurement
-    {
-        public Element Element { get; set; }
-        public SpacePlan Size { get; set; }
-    }
     
     internal class Inlined : Element, IStateResettable
     {
@@ -86,7 +80,10 @@ namespace QuestPDF.Elements
             
             foreach (var line in lines)
             {
-                var height = line.Max(x => x.Size.Height);
+                var height = line
+                    .Select(x => x.Measure(Size.Max))
+                    .Where(x => x.Type != SpacePlanType.Wrap)
+                    .Max(x => x.Height);
                 
                 DrawLine(line);
 
@@ -97,24 +94,24 @@ namespace QuestPDF.Elements
             Canvas.Translate(new Position(0, -topOffset));
             lines.SelectMany(x => x).ToList().ForEach(x => ChildrenQueue.Dequeue());
 
-            void DrawLine(ICollection<InlinedMeasurement> lineMeasurements)
+            void DrawLine(ICollection<InlinedElement> elements)
             {
-                var lineSize = GetLineSize(lineMeasurements);
+                var lineSize = GetLineSize(elements);
 
                 var elementOffset = ElementOffset();
                 var leftOffset = AlignOffset();
                 Canvas.Translate(new Position(leftOffset, 0));
                 
-                foreach (var measurement in lineMeasurements)
+                foreach (var element in elements)
                 {
-                    var size = (Size)measurement.Size;
+                    var size = (Size)element.Measure(Size.Max);
                     var baselineOffset = BaselineOffset(size, lineSize.Height);
 
                     if (size.Height == 0)
                         size = new Size(size.Width, lineSize.Height);
                     
                     Canvas.Translate(new Position(0, baselineOffset));
-                    measurement.Element.Draw(size);
+                    element.Draw(size);
                     Canvas.Translate(new Position(0, -baselineOffset));
 
                     leftOffset += size.Width + elementOffset;
@@ -127,20 +124,20 @@ namespace QuestPDF.Elements
                 {
                     var difference = availableSpace.Width - lineSize.Width;
 
-                    if (lineMeasurements.Count == 1)
+                    if (elements.Count == 1)
                         return 0;
 
                     return ElementsAlignment switch
                     {
-                        InlinedAlignment.Justify => difference / (lineMeasurements.Count - 1),
-                        InlinedAlignment.SpaceAround => difference / (lineMeasurements.Count + 1),
+                        InlinedAlignment.Justify => difference / (elements.Count - 1),
+                        InlinedAlignment.SpaceAround => difference / (elements.Count + 1),
                         _ => HorizontalSpacing
                     };
                 }
 
                 float AlignOffset()
                 {
-                    var difference = availableSpace.Width - lineSize.Width - (lineMeasurements.Count - 1) * HorizontalSpacing;
+                    var difference = availableSpace.Width - lineSize.Width - (elements.Count - 1) * HorizontalSpacing;
 
                     return ElementsAlignment switch
                     {
@@ -167,19 +164,24 @@ namespace QuestPDF.Elements
             }
         }
 
-        Size GetLineSize(ICollection<InlinedMeasurement> measurements)
+        Size GetLineSize(ICollection<InlinedElement> elements)
         {
-            var width = measurements.Sum(x => x.Size.Width);
-            var height = measurements.Max(x => x.Size.Height);
+            var sizes = elements
+                .Select(x => x.Measure(Size.Max))
+                .Where(x => x.Type != SpacePlanType.Wrap)
+                .ToList();
+            
+            var width = sizes.Sum(x => x.Width);
+            var height = sizes.Max(x => x.Height);
 
             return new Size(width, height);
         }
         
         // list of lines, each line is a list of elements
-        private ICollection<ICollection<InlinedMeasurement>> Compose(Size availableSize)
+        private ICollection<ICollection<InlinedElement>> Compose(Size availableSize)
         {
             var queue = new Queue<InlinedElement>(ChildrenQueue);
-            var result = new List<ICollection<InlinedMeasurement>>();
+            var result = new List<ICollection<InlinedElement>>();
 
             var topOffset = 0f;
             
@@ -190,7 +192,10 @@ namespace QuestPDF.Elements
                 if (!line.Any())
                     break;
 
-                var height = line.Max(x => x.Size.Height);
+                var height = line
+                    .Select(x => x.Measure(availableSize))
+                    .Where(x => x.Type != SpacePlanType.Wrap)
+                    .Max(x => x.Height);
                 
                 if (topOffset + height > availableSize.Height + Size.Epsilon)
                     break;
@@ -201,9 +206,9 @@ namespace QuestPDF.Elements
 
             return result;
 
-            ICollection<InlinedMeasurement> GetNextLine()
+            ICollection<InlinedElement> GetNextLine()
             {
-                var result = new List<InlinedMeasurement>();
+                var result = new List<InlinedElement>();
                 var leftOffset = GetInitialAlignmentOffset();
                 
                 while (true)
@@ -212,7 +217,7 @@ namespace QuestPDF.Elements
                         break;
                     
                     var element = queue.Peek();
-                    var size = element.Measure(new Size(availableSize.Width, Size.Max.Height));
+                    var size = element.Measure(Size.Max);
                     
                     if (size.Type == SpacePlanType.Wrap)
                         break;
@@ -222,12 +227,7 @@ namespace QuestPDF.Elements
 
                     queue.Dequeue();
                     leftOffset += size.Width + HorizontalSpacing;
-                    
-                    result.Add(new InlinedMeasurement
-                    {
-                        Element = element,
-                        Size = size
-                    });    
+                    result.Add(element);    
                 }
 
                 return result;

QuestPDF/Elements/Line.cs

@@ -15,42 +15,31 @@ namespace QuestPDF.Elements
         Horizontal
     }
     
-    internal class Line : Element, ILine, IVisual, ICacheable
+    internal class Line : Element, ILine, ICacheable
     {
-        public bool IsRendered { get; set; }
-        public bool RepeatContent { get; set; }
-        
         public LineType Type { get; set; } = LineType.Vertical;
         public string Color { get; set; } = Colors.Black;
-        public float Thickness { get; set; } = 1;
+        public float Size { get; set; } = 1;
         
         internal override SpacePlan Measure(Size availableSpace)
         {
-            if (availableSpace.IsNegative())
-                return SpacePlan.Wrap();
-
-            if (IsRendered && !RepeatContent)
-                return SpacePlan.FullRender(Size.Zero);
-            
             return Type switch
             {
-                LineType.Vertical when availableSpace.Width + Infrastructure.Size.Epsilon >= Thickness => SpacePlan.FullRender(Thickness, 0),
-                LineType.Horizontal when availableSpace.Height + Infrastructure.Size.Epsilon >= Thickness => SpacePlan.FullRender(0, Thickness),
+                LineType.Vertical when availableSpace.Width >= Size => SpacePlan.FullRender(Size, 0),
+                LineType.Horizontal when availableSpace.Height >= Size => SpacePlan.FullRender(0, Size),
                 _ => SpacePlan.Wrap()
             };
         }
 
         internal override void Draw(Size availableSpace)
         {
-            IsRendered = true;
-            
             if (Type == LineType.Vertical)
             {
-                Canvas.DrawRectangle(new Position(-Thickness/2, 0), new Size(Thickness, availableSpace.Height), Color);
+                Canvas.DrawRectangle(new Position(-Size/2, 0), new Size(Size, availableSpace.Height), Color);
             }
             else if (Type == LineType.Horizontal)
             {
-                Canvas.DrawRectangle(new Position(0, -Thickness/2), new Size(availableSpace.Width, Thickness), Color);
+                Canvas.DrawRectangle(new Position(0, -Size/2), new Size(availableSpace.Width, Size), Color);
             }
         }
     }

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,53 +27,39 @@ namespace QuestPDF.Elements
         public void Compose(IContainer container)
         {
             container
+                .MinWidth(MinSize.Width)
+                .MinHeight(MinSize.Height)
+                
+                .MaxWidth(MaxSize.Width)
+                .MaxHeight(MaxSize.Height)
+                
                 .Background(BackgroundColor)
-                .Layers(layers =>
+     
+                .PaddingLeft(MarginLeft)
+                .PaddingRight(MarginRight)
+                .PaddingTop(MarginTop)
+                .PaddingBottom(MarginBottom)
+                
+                .DefaultTextStyle(DefaultTextStyle)
+                
+                .Decoration(decoration =>
                 {
-                    layers
-                        .Layer()
-                        .DebugPointer("Page background layer")
-                        .Element(Background);
+                    decoration
+                        .Before()
+                        .DebugPointer("Page header")
+                        .Element(Header);
                     
-                    layers
-                        .PrimaryLayer()
-                        .MinWidth(MinSize.Width)
-                        .MinHeight(MinSize.Height)
-                
-                        .MaxWidth(MaxSize.Width)
-                        .MaxHeight(MaxSize.Height)
-
-                        .PaddingLeft(MarginLeft)
-                        .PaddingRight(MarginRight)
-                        .PaddingTop(MarginTop)
-                        .PaddingBottom(MarginBottom)
-                
-                        .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
+                        .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);
                     
-                    layers
-                        .Layer()
-                        .DebugPointer("Page foreground layer")
-                        .Element(Foreground);
+                    decoration
+                        .After()
+                        .DebugPointer("Page footer")
+                        .Element(Footer);
                 });
 
             bool IsClose(float x, float y)

QuestPDF/Elements/PageBreak.cs

@@ -1,5 +1,4 @@
 using QuestPDF.Drawing;
-using QuestPDF.Helpers;
 using QuestPDF.Infrastructure;
 
 namespace QuestPDF.Elements
@@ -15,9 +14,6 @@ namespace QuestPDF.Elements
 
         internal override SpacePlan Measure(Size availableSpace)
         {
-            if (availableSpace.IsNegative())
-                return SpacePlan.Wrap();
-            
             if (IsRendered)
                 return SpacePlan.FullRender(0, 0);
 

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

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

QuestPDF/Elements/Row.cs

@@ -102,14 +102,13 @@ namespace QuestPDF.Elements
 
         private void UpdateItemsWidth(float availableWidth)
         {
-            foreach (var rowItem in Items.Where(x => x.Type == RowItemType.Auto))
-                rowItem.Size = rowItem.Measure(Size.Max).Width;
+            HandleItemsWithAutoWidth();
             
-            var constantWidth = Items.Where(x => x.Type != RowItemType.Relative).Sum(x => x.Size);
+            var constantWidth = Items.Where(x => x.Type == RowItemType.Constant).Sum(x => x.Size);
             var relativeWidth = Items.Where(x => x.Type == RowItemType.Relative).Sum(x => x.Size);
             var spacingWidth = (Items.Count - 1) * Spacing;
 
-            foreach (var item in Items.Where(x => x.Type != RowItemType.Relative))
+            foreach (var item in Items.Where(x => x.Type == RowItemType.Constant))
                 item.Width = item.Size;
             
             if (relativeWidth <= 0)
@@ -120,7 +119,16 @@ namespace QuestPDF.Elements
             foreach (var item in Items.Where(x => x.Type == RowItemType.Relative))
                 item.Width = item.Size * widthPerRelativeUnit;
         }
-        
+
+        private void HandleItemsWithAutoWidth()
+        {
+            foreach (var rowItem in Items.Where(x => x.Type == RowItemType.Auto))
+            {
+                rowItem.Size = rowItem.Measure(Size.Max).Width;
+                rowItem.Type = RowItemType.Constant;
+            }
+        }
+
         private ICollection<RowItemRenderingCommand> PlanLayout(Size availableSpace)
         {
             var leftOffset = 0f;

QuestPDF/Elements/ScaleToFit.cs

@@ -17,10 +17,8 @@ namespace QuestPDF.Elements
             if (perfectScale == null)
                 return SpacePlan.Wrap();
 
-            var scaledSpace = ScaleSize(availableSpace, 1 / perfectScale.Value);
-            var childSizeInScale = Child.Measure(scaledSpace);
-            var childSizeInOriginalScale = ScaleSize(childSizeInScale, perfectScale.Value);
-            return SpacePlan.FullRender(childSizeInOriginalScale);
+            var targetSpace = ScaleSize(availableSpace, perfectScale.Value);
+            return SpacePlan.FullRender(targetSpace);
         }
         
         internal override void Draw(Size availableSpace)

QuestPDF/Elements/Table/Table.cs

@@ -19,23 +19,15 @@ namespace QuestPDF.Elements.Table
         private int RowsCount { get; set; }
         private int CurrentRow { get; set; }
         
-        // cache that stores all cells
-        // first index: row number
-        // inner table: list of all cells that ends at the corresponding row
-        private TableCell[][] CellsCache { get; set; }
-        private int MaxRow { get; set; }
-        private int MaxRowSpan { get; set; }
-        
         internal override void Initialize(IPageContext pageContext, ICanvas canvas)
         {
             StartingRowsCount = Cells.Select(x => x.Row).DefaultIfEmpty(0).Max();
             RowsCount = Cells.Select(x => x.Row + x.RowSpan - 1).DefaultIfEmpty(0).Max();
             Cells = Cells.OrderBy(x => x.Row).ThenBy(x => x.Column).ToList();
-            BuildCache();
 
             base.Initialize(pageContext, canvas);
         }
-
+        
         internal override IEnumerable<Element?> GetChildren()
         {
             return Cells;
@@ -43,38 +35,9 @@ namespace QuestPDF.Elements.Table
 
         public void ResetState()
         {
-            foreach (var x in Cells)
-                x.IsRendered = false;
-            
+            Cells.ForEach(x => x.IsRendered = false);
             CurrentRow = 1;
         }
-
-        private void BuildCache()
-        {
-            if (CellsCache != null)
-                return;
-
-            if (Cells.Count == 0)
-            {
-                MaxRow = 0;
-                MaxRowSpan = 1;
-                CellsCache = Array.Empty<TableCell[]>();
-                
-                return;
-            }
-            
-            var groups = Cells
-                .GroupBy(x => x.Row + x.RowSpan - 1)
-                .ToDictionary(x => x.Key, x => x.OrderBy(x => x.Column).ToArray());
-
-            MaxRow = groups.Max(x => x.Key);
-            MaxRowSpan = Cells.Max(x => x.RowSpan);
-
-            CellsCache = Enumerable
-                .Range(0, MaxRow + 1)
-                .Select(x => groups.ContainsKey(x) ? groups[x] : Array.Empty<TableCell>())
-                .ToArray();
-        }
         
         internal override SpacePlan Measure(Size availableSpace)
         {
@@ -180,10 +143,7 @@ namespace QuestPDF.Elements.Table
                 var rowBottomOffsets = new DynamicDictionary<int, float>();
                 var commands = new List<TableCellRenderingCommand>();
                 
-                var cellsToTry = Enumerable
-                    .Range(CurrentRow, MaxRow - CurrentRow + 1)
-                    .SelectMany(x => CellsCache[x]);
-                
+                var cellsToTry = Cells.Where(x => x.Row + x.RowSpan - 1 >= CurrentRow);
                 var currentRow = CurrentRow;
                 var maxRenderingRow = RowsCount;
                 
@@ -202,9 +162,9 @@ namespace QuestPDF.Elements.Table
                         
                         currentRow = cell.Row;
                     }
-                    
+
                     // cell visibility optimizations
-                    if (cell.Row > maxRenderingRow + MaxRowSpan)
+                    if (cell.Row > maxRenderingRow)
                         break;
 
                     // calculate cell position / size
@@ -221,14 +181,14 @@ namespace QuestPDF.Elements.Table
                     {
                         maxRenderingRow = Math.Min(maxRenderingRow, cell.Row + cell.RowSpan - 1);
                     }
-
+                    
                     // corner case: if cell within the row want to wrap to the next page, do not attempt to render this row
                     if (cellSize.Type == SpacePlanType.Wrap)
                     {
                         maxRenderingRow = Math.Min(maxRenderingRow, cell.Row - 1);
                         continue;
                     }
-
+                    
                     // update position of the last row that cell occupies
                     var bottomRow = cell.Row + cell.RowSpan - 1;
                     rowBottomOffsets[bottomRow] = Math.Max(rowBottomOffsets[bottomRow], topOffset + cellSize.Height);

QuestPDF/Elements/Table/TableLayoutPlanner.cs

@@ -5,7 +5,7 @@ using QuestPDF.Fluent;
 
 namespace QuestPDF.Elements.Table
 {
-    static class TableLayoutPlanner
+    static class TableLayoutValidator
     {
         public static void PlanCellPositions(this Table table)
         {