Improved text run calculation

# Conflicts:
#	QuestPDF/Elements/Stack.cs

QuestPDF.Examples/BarCode.cs

@@ -1,32 +0,0 @@
-using System.IO;
-using NUnit.Framework;
-using QuestPDF.Drawing;
-using QuestPDF.Examples.Engine;
-using QuestPDF.Fluent;
-using QuestPDF.Helpers;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Examples
-{
-    public class BarCode
-    {
-        [Test]
-        public void Example()
-        {
-            FontManager.RegisterFontType("LibreBarcode39", File.OpenRead("LibreBarcode39-Regular.ttf"));
-            
-            RenderingTest
-                .Create()
-                .PageSize(400, 100)
-                .ShowResults()
-                .Render(container =>
-                {
-                    container
-                        .Background(Colors.White)
-                        .AlignCenter()
-                        .AlignMiddle()
-                        .Text("*QuestPDF*", TextStyle.Default.FontType("LibreBarcode39").Size(64));
-                });
-        }
-    }
-}

QuestPDF.Examples/BarcodeExamples.cs

@@ -1,31 +0,0 @@
-using NUnit.Framework;
-using QuestPDF.Examples.Engine;
-using QuestPDF.Fluent;
-using QuestPDF.Helpers;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Examples
-{
-    [TestFixture]
-    public class BarcodeExamples
-    {
-        [Test]
-        public void Barcode()
-        {
-            RenderingTest
-                .Create()
-                .PageSize(300, 300)
-                .Render(container =>
-                {
-                    container
-                        .Background("#FFF")
-                        .Padding(25)
-                        .Stack(stack =>
-                        {
-                            stack.Item().Border(1).Background(Colors.Grey.Lighten3).Padding(5).Text("Barcode Example");
-                            stack.Item().Border(1).Padding(5).AlignCenter().Text("*123456789*", TextStyle.Default.FontType("CarolinaBar-Demo-25E2").Size(20));
-                        });
-                });
-        }
-    }
-}

QuestPDF.Examples/ChartExamples.cs

@@ -1,85 +0,0 @@
-using System.Linq;
-using NUnit.Framework;
-using QuestPDF.Examples.Engine;
-using QuestPDF.Fluent;
-using QuestPDF.Helpers;
-using QuestPDF.Infrastructure;
-using Microcharts;
-using SkiaSharp;
-
-namespace QuestPDF.Examples
-{    
-    public class ChartExample
-    {
-        [Test]
-        public void MicrochartChart()
-        {
-            var entries = new[]
-            {
-                new ChartEntry(212)
-                {
-                    Label = "UWP",
-                    ValueLabel = "112",
-                    Color = SKColor.Parse("#2c3e50")
-                },
-                new ChartEntry(248)
-                {
-                    Label = "Android",
-                    ValueLabel = "648",
-                    Color = SKColor.Parse("#77d065")
-                },
-                new ChartEntry(128)
-                {
-                    Label = "iOS",
-                    ValueLabel = "428",
-                    Color = SKColor.Parse("#b455b6")
-                },
-                new ChartEntry(514)
-                {
-                    Label = "Forms",
-                    ValueLabel = "214",
-                    Color = SKColor.Parse("#3498db")
-                }
-            };
-
-            RenderingTest
-                .Create()
-                .PageSize(400, 600)
-                .ProduceImages()
-                .ShowResults()
-                .Render(container =>
-                {
-                    container
-                        .Background(Colors.White)
-                        .Padding(25)
-                        .Stack(stack =>
-                        {
-                            stack
-                                .Item()
-                                .PaddingBottom(10)
-                                .Text("Chart example", TextStyle.Default.Size(20).SemiBold().Color(Colors.Blue.Medium));
-                            
-                            stack
-                                .Item()
-                                .Border(1)
-                                .ExtendHorizontal()
-                                .Height(300)
-                                .Canvas((canvas, size) =>
-                                {
-                                    var chart = new BarChart
-                                    {
-                                        Entries = entries,
-       
-                                        LabelOrientation = Orientation.Horizontal,
-                                        ValueLabelOrientation = Orientation.Horizontal,
-                                        
-                                        IsAnimated = false,
-                                    };
-                                    
-                                    chart.DrawContent(canvas, (int)size.Width, (int)size.Height);
-                                });
-                        });
-                });
-        }
-    }
-}

QuestPDF.Examples/ComplexLayoutBenchmark.cs

@@ -1,56 +0,0 @@
-using NUnit.Framework;
-using QuestPDF.Examples.Engine;
-using QuestPDF.Fluent;
-using QuestPDF.Helpers;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Examples
-{
-    public class ComplexLayoutBenchmark
-    {
-        [Test]
-        public void ComplexLayout()
-        {
-            RenderingTest
-                .Create()
-                .PageSize(PageSizes.A4)
-                .ProducePdf()
-                .ShowResults()
-                .Render(x => GenerateStructure(x, 16));
-        }
-
-        private void GenerateStructure(IContainer container, int level)
-        {
-            if (level <= 0)
-            {
-                container.Background(Placeholders.BackgroundColor()).Height(10);
-                return;
-            }
-
-            level--;
-
-            if (level % 3 == 0)
-            {
-                container
-                    .Border(level / 4f)
-                    .BorderColor(Colors.Black)
-                    .Row(row =>
-                    {
-                        row.RelativeColumn().Element(x => GenerateStructure(x, level));
-                        row.RelativeColumn().Element(x => GenerateStructure(x, level));
-                    });
-            }
-            else
-            {
-                container
-                    .Border(level / 4f)
-                    .BorderColor(Colors.Black)
-                    .Stack(stack =>
-                    {
-                        stack.Item().Element(x => GenerateStructure(x, level));
-                        stack.Item().Element(x => GenerateStructure(x, level));
-                    });
-            }
-        }
-    }
-}

QuestPDF.Examples/ContinousPage.cs

@@ -1,46 +0,0 @@
-using System.Diagnostics;
-using System.Linq;
-using NUnit.Framework;
-using QuestPDF.Drawing;
-using QuestPDF.Examples.Engine;
-using QuestPDF.Fluent;
-using QuestPDF.Helpers;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Examples
-{
-    public class ContinuousPageDocument : IDocument
-    {
-        public DocumentMetadata GetMetadata() => DocumentMetadata.Default;
-
-        public void Compose(IDocumentContainer container)
-        {
-            container.Page(page =>
-            {
-                page.Margin(20);
-                page.ContinuousSize(150);
-                
-                page.Header().Text("Header");
-                
-                page.Content().PaddingVertical(10).Border(1).Padding(10).Stack(stack =>
-                {
-                    foreach (var index in Enumerable.Range(1, 100))
-                        stack.Item().Text($"Line {index}", TextStyle.Default.Color(Placeholders.Color()));
-                });
-                
-                page.Footer().Text("Footer");
-            });
-        }
-    }
-    
-    public class ContinuousPageExamples
-    {
-        [Test]
-        public void ContinuousPage()
-        {
-            var path = "example.pdf";
-            new ContinuousPageDocument().GeneratePdf(path);
-            Process.Start("explorer", path);
-        }
-    }
-}

QuestPDF.Examples/DebuggingTesting.cs

@@ -1,63 +0,0 @@
-using NUnit.Framework;
-using QuestPDF.Examples.Engine;
-using QuestPDF.Fluent;
-using QuestPDF.Helpers;
-
-namespace QuestPDF.Examples
-{
-    public class DebuggingTesting
-    {
-        [Test]
-        public void Stack()
-        {
-            RenderingTest
-                .Create()
-                .PageSize(500, 360)
-                .Render(container =>
-                {
-                    container
-                        .Padding(10)
-                        .Width(100)
-                        .Background(Colors.Grey.Lighten3)
-                        .DebugPointer("Example debug pointer")
-                        .Stack(x =>
-                        {
-                            x.Item().Text("Test");
-                            x.Item().Width(150);
-                        });
-                });
-        }
-        
-        [Test]
-        public void Simple()
-        {
-            RenderingTest
-                .Create()
-                .PageSize(500, 360)
-                .Render(container =>
-                {
-                    container
-                        .Padding(10)
-                        .Width(100)
-                        .Background(Colors.Grey.Lighten3)
-                        .Width(150)
-                        .Text("Test");
-                });
-        }
-        
-        [Test]
-        public void DebugPointer()
-        {
-            RenderingTest
-                .Create()
-                .PageSize(500, 360)
-                .Render(container =>
-                {
-                    container
-                        .Width(100)
-                        .DebugPointer("Example debug pointer")
-                        .Width(150);
-                });
-        }
-    }
-}

QuestPDF.Examples/DefaultTextStyleExample.cs

@@ -1,48 +0,0 @@
-using NUnit.Framework;
-using QuestPDF.Examples.Engine;
-using QuestPDF.Fluent;
-using QuestPDF.Helpers;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Examples
-{
-    public class DefaultTextStyleExample
-    {
-        [Test]
-        public void DefaultTextStyle()
-        {
-            RenderingTest
-                .Create()
-                .ProduceImages()
-                .ShowResults()
-                .RenderDocument(container =>
-                {
-                    container.Page(page =>
-                    {
-                        // all text in this set of pages has size 20
-                        page.DefaultTextStyle(TextStyle.Default.Size(20));
-                    
-                        page.Margin(20);
-                        page.Size(PageSizes.A4);
-                        page.Background(Colors.White);
-        
-                        page.Content().Stack(stack =>
-                        {
-                            stack.Item().Text(Placeholders.Sentence());
-                        
-                            stack.Item().Text(text =>
-                            {
-                                // text in this block is additionally semibold
-                                text.DefaultTextStyle(TextStyle.Default.SemiBold());
-        
-                                text.Line(Placeholders.Sentence());
-                            
-                                // this text has size 20 but also semibold and red
-                                text.Span(Placeholders.Sentence(), TextStyle.Default.Color(Colors.Red.Medium));
-                            });
-                        });
-                    });
-                });
-        }
-    }
-}

QuestPDF.Examples/Engine/ExampleTestBase.cs

@@ -0,0 +1,95 @@
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using NUnit.Framework;
+using QuestPDF.Elements;
+using QuestPDF.Fluent;
+using QuestPDF.Infrastructure;
+using SkiaSharp;
+
+namespace QuestPDF.Examples.Engine
+{
+    [TestFixture]
+    public class ExampleTestBase
+    {
+        private readonly Size DefaultImageSize = new Size(400, 300);
+        private const string ResultPath = "Result";
+
+        [SetUp]
+        public void Setup()
+        {
+            if (Directory.Exists(ResultPath))
+                Directory.Delete(ResultPath, true);
+            
+            Directory.CreateDirectory(ResultPath);
+        }
+        
+        [Test]
+        public void RunTest()
+        {
+            GetType()
+                .GetMethods()
+                .Where(IsExampleMethod)
+                .ToList()
+                .ForEach(HandleExample);
+        }
+
+        private bool IsExampleMethod(MethodInfo method)
+        {
+            var parameters = method.GetParameters();
+            return parameters.Length == 1 && parameters.First().ParameterType == typeof(IContainer);
+        }
+        
+        private T GetAttribute<T>(MethodInfo methodInfo) where T : Attribute
+        {
+            return methodInfo.GetCustomAttributes().FirstOrDefault(y => y is T) as T;
+        }
+        
+        private void HandleExample(MethodInfo methodInfo)
+        {
+            var size = GetAttribute<ImageSizeAttribute>(methodInfo)?.Size ?? DefaultImageSize;
+            var fileName = GetAttribute<FileNameAttribute>(methodInfo)?.FileName ?? methodInfo.Name;
+            var showResult = GetAttribute<ShowResultAttribute>(methodInfo) != null;
+            var shouldIgnore = GetAttribute<IgnoreAttribute>(methodInfo) != null;
+
+            if (shouldIgnore)
+                return;
+            
+            var container = new Container();
+            methodInfo.Invoke(this, new object[] {container});
+
+            Func<int, string> fileNameSchema = i => $"{fileName.ToLower()}-${i}.png";
+
+            try
+            {
+                var document = new SimpleDocument(container, size);
+                document.GenerateImages(fileNameSchema);
+            }
+            catch (Exception e)
+            {
+                throw new Exception($"Cannot perform test {fileName}", e);
+            }
+
+            if (showResult)
+                Process.Start("explorer", fileNameSchema(0));
+        }
+        
+        private byte[] RenderPage(Element element, Size size)
+        {
+            // scale the result so it is more readable
+            const float scalingFactor = 2;
+            
+            var imageInfo = new SKImageInfo((int)(size.Width * scalingFactor), (int)(size.Height * scalingFactor));
+            using var surface = SKSurface.Create(imageInfo);
+            surface.Canvas.Scale(scalingFactor);
+
+            var canvas = new Drawing.Canvas(surface.Canvas);
+            element?.Draw(canvas, size);
+
+            surface.Canvas.Save();
+            return surface.Snapshot().Encode(SKEncodedImageFormat.Png, 100).ToArray();
+        }
+    }
+}

QuestPDF.Examples/Engine/FileNameAttribute.cs

@@ -0,0 +1,14 @@
+using System;
+
+namespace QuestPDF.Examples.Engine
+{
+    public class FileNameAttribute : Attribute
+    {
+        public string FileName { get; }
+
+        public FileNameAttribute(string fileName)
+        {
+            FileName = fileName;
+        }
+    }
+}

QuestPDF.Examples/Engine/IgnoreAttribute.cs

@@ -0,0 +1,9 @@
+using System;
+
+namespace QuestPDF.Examples.Engine
+{
+    public class IgnoreAttribute : Attribute
+    {
+        
+    }
+}

QuestPDF.Examples/Engine/ImageSizeAttribute.cs

@@ -0,0 +1,19 @@
+using System;
+using QuestPDF.Infrastructure;
+
+namespace QuestPDF.Examples.Engine
+{
+    public class ImageSizeAttribute : Attribute
+    {
+        private int Width { get; }
+        private int Height { get; }
+
+        public Size Size => new Size(Width, Height);
+        
+        public ImageSizeAttribute(int width, int height)
+        {
+            Width = width;
+            Height = height;
+        }
+    }
+}

QuestPDF.Examples/Engine/RenderingTest.cs

@@ -1,116 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Runtime.CompilerServices;
-using QuestPDF.Elements;
-using QuestPDF.Fluent;
-using QuestPDF.Helpers;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Examples.Engine
-{
-    public enum RenderingTestResult
-    {
-        Pdf,
-        Images
-    }
-    
-    public class RenderingTest
-    {
-        private string FileNamePrefix = "test";
-        private Size Size { get; set; }
-        private int? MaxPagesThreshold { get; set; }
-        private bool ShowResult { get; set; }
-        private RenderingTestResult ResultType { get; set; } = RenderingTestResult.Images;
-        
-        private RenderingTest()
-        {
-            
-        }
-
-        public static RenderingTest Create([CallerMemberName] string fileName = "test")
-        {
-            return new RenderingTest().FileName(fileName);
-        }
-
-        public RenderingTest FileName(string fileName)
-        {
-            FileNamePrefix = fileName;
-            return this;
-        }
-        
-        public RenderingTest PageSize(Size size)
-        {
-            Size = size;
-            return this;
-        }
-        
-        public RenderingTest PageSize(int width, int height)
-        {
-            return PageSize(new Size(width, height));
-        }
-
-        public RenderingTest ProducePdf()
-        {
-            ResultType = RenderingTestResult.Pdf;
-            return this;
-        }
-        
-        public RenderingTest ProduceImages()
-        {
-            ResultType = RenderingTestResult.Images;
-            return this;
-        }
-
-        public RenderingTest ShowResults()
-        {
-            ShowResult = true;
-            return this;
-        }
-        
-        public void Render(Action<IContainer> content)
-        {
-            RenderDocument(container =>
-            {
-                container.Page(page =>
-                {
-                    page.Size(new PageSize(Size.Width, Size.Height));
-                    page.Content().Container().Background(Colors.White).Element(content);
-                });
-            });
-        }
-        
-        public void MaxPages(int value)
-        {
-            MaxPagesThreshold = value;
-        }
-
-        public void RenderDocument(Action<IDocumentContainer> content)
-        {
-            MaxPagesThreshold ??= ResultType == RenderingTestResult.Pdf ? 1000 : 10;
-            var document = new SimpleDocument(content, MaxPagesThreshold.Value);
-
-            Render(document);
-        }
-        
-        private void Render(IDocument document)
-        {
-            if (ResultType == RenderingTestResult.Images)
-            {
-                Func<int, string> fileNameSchema = i => $"{FileNamePrefix}-${i}.png";
-                document.GenerateImages(fileNameSchema);
-                
-                if (ShowResult)
-                    Process.Start("explorer", fileNameSchema(0));
-            }
-
-            if (ResultType == RenderingTestResult.Pdf)
-            {
-                var fileName = $"{FileNamePrefix}.pdf";
-                document.GeneratePdf(fileName);
-                
-                if (ShowResult)
-                    Process.Start("explorer", fileName);
-            }
-        }
-    }
-}

QuestPDF.Examples/Engine/ShowResultAttribute.cs

@@ -0,0 +1,9 @@
+using System;
+
+namespace QuestPDF.Examples.Engine
+{
+    public class ShowResultAttribute : Attribute
+    {
+        
+    }
+}

QuestPDF.Examples/Engine/SimpleDocument.cs

@@ -1,6 +1,4 @@
-using System;
-using QuestPDF.Drawing;
-using QuestPDF.Elements;
+using QuestPDF.Drawing;
 using QuestPDF.Fluent;
 using QuestPDF.Helpers;
 using QuestPDF.Infrastructure;
@@ -9,29 +7,27 @@ namespace QuestPDF.Examples.Engine
 {
     public class SimpleDocument : IDocument
     {
-        public const int ImageScalingFactor = 2;
-        
-        private Action<IDocumentContainer> Content { get; }
-        private int MaxPages { get; }
+        private IContainer Container { get; }
+        private Size Size { get; }
 
-        public SimpleDocument(Action<IDocumentContainer> content, int maxPages)
+        public SimpleDocument(IContainer container, Size size)
         {
-            Content = content;
-            MaxPages = maxPages;
+            Container = container;
+            Size = size;
         }
         
         public DocumentMetadata GetMetadata()
         {
             return new DocumentMetadata()
             {
-                RasterDpi = PageSizes.PointsPerInch * ImageScalingFactor,
-                DocumentLayoutExceptionThreshold = MaxPages
+                RasterDpi = PageSizes.PointsPerInch * 2,
+                Size = Size
             };
         }
-        
-        public void Compose(IDocumentContainer container)
+
+        public void Compose(IContainer container)
         {
-            Content(container);
+            container.Background("#FFF").Element(Container.Child);
         }
     }
 }

QuestPDF.Examples/EnsureSpaceExample.cs

@@ -1,53 +0,0 @@
-using NUnit.Framework;
-using QuestPDF.Examples.Engine;
-using QuestPDF.Fluent;
-using QuestPDF.Helpers;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Examples
-{
-    public class EnsureSpaceExample
-    {
-        [Test]
-        public void EnsureSpaceWith()
-        {
-            RenderingTest
-                .Create()
-                .ProduceImages()
-                .ShowResults()
-                .RenderDocument(container =>
-                {
-                    container.Page(page =>
-                    {
-                        page.Margin(20);
-                        page.Size(PageSizes.A7.Landscape());
-                        page.Background(Colors.White);
-                        
-                        page.Header().Text("With ensure space", TextStyle.Default.SemiBold());
-                        
-                        page.Content().Stack(stack =>
-                        {
-                            stack
-                                .Item()
-                                .ExtendHorizontal()
-                                .Height(75)
-                                .Background(Colors.Grey.Lighten2);
-                            
-                            stack
-                                .Item()
-                                .EnsureSpace(100)
-                                .Text(Placeholders.LoremIpsum());
-                        });
-                        
-                        page.Footer().Text(text =>
-                        {
-                            text.Span("Page ");
-                            text.CurrentPageNumber();
-                            text.Span(" out of ");
-                            text.TotalPages();
-                        });
-                    });
-                });
-        }
-    }
-}

QuestPDF.Examples/FrameExample.cs

@@ -1,4 +1,3 @@
-using NUnit.Framework;
 using QuestPDF.Examples.Engine;
 using QuestPDF.Fluent;
 using QuestPDF.Helpers;
@@ -12,39 +11,33 @@ namespace QuestPDF.Examples
         {
             return container
                 .Border(1)
-                .Background(dark ? Colors.Grey.Lighten2 : Colors.White)
+                .Background(dark ? "#EEE" : "#FFF")
                 .Padding(10);
         }
         
-        public static void LabelCell(this IContainer container, string text) => container.Cell(true).Text(text, TextStyle.Default.Medium());
+        public static IContainer LabelCell(this IContainer container) => container.Cell(true);
         public static IContainer ValueCell(this IContainer container) => container.Cell(false);
     }
     
-    public class FrameExample
+    public class FrameExample: ExampleTestBase
     {
-        [Test]
-        public void Frame()
+        [ImageSize(550, 400)]
+        [ShowResult]
+        public void Frame(IContainer container)
         {
-            RenderingTest
-                .Create()
-                .PageSize(550, 400)
-                .ShowResults()
-                .Render(container =>
+            container
+                .Background("#FFF")
+                .Padding(25)
+                .Stack(stack =>
                 {
-                    container
-                        .Background("#FFF")
-                        .Padding(25)
-                        .Stack(stack =>
+                    for(var i=1; i<=4; i++)
+                    {
+                        stack.Item().Row(row =>
                         {
-                            for(var i=1; i<=4; i++)
-                            {
-                                stack.Item().Row(row =>
-                                {
-                                    row.RelativeColumn(2).LabelCell(Placeholders.Label());
-                                    row.RelativeColumn(3).ValueCell().Text(Placeholders.Paragraph());
-                                });
-                            }
+                            row.RelativeColumn(2).LabelCell().Text(Placeholders.Label());
+                            row.RelativeColumn(3).ValueCell().Text(Placeholders.Paragraph());
                         });
+                    }
                 });
         }
     }

QuestPDF.Examples/ImageExamples.cs

@@ -1,47 +0,0 @@
-using System.IO;
-using NUnit.Framework;
-using QuestPDF.Examples.Engine;
-using QuestPDF.Fluent;
-using QuestPDF.Helpers;
-
-namespace QuestPDF.Examples
-{
-    public class ImageExamples
-    {
-        [Test]
-        public void LoadingImage()
-        {
-            RenderingTest
-                .Create()
-                .PageSize(PageSizes.A5)
-                .ProducePdf()
-                .ShowResults()
-                .Render(page =>
-                {
-                    page.Padding(25).Stack(stack =>
-                    {
-                        stack.Spacing(25);
-                        
-                        stack.Item().Image("logo.png");
-
-                        var binaryData = File.ReadAllBytes("logo.png");
-                        stack.Item().Image(binaryData);
-                        
-                        using var stream = new FileStream("logo.png", FileMode.Open);
-                        stack.Item().Image(stream);
-                    });
-                });
-        }
-        
-        [Test]
-        public void Exception()
-        {
-            RenderingTest
-                .Create()
-                .PageSize(PageSizes.A5)
-                .ProducePdf()
-                .ShowResults()
-                .Render(page => page.Image("non_existent.png"));
-        }
-    }
-}

QuestPDF.Examples/InlinedExamples.cs

@@ -1,123 +0,0 @@
-using System;
-using System.Linq;
-using System.Reflection.Metadata.Ecma335;
-using NUnit.Framework;
-using QuestPDF.Examples.Engine;
-using QuestPDF.Fluent;
-using QuestPDF.Helpers;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Examples
-{
-    public class InlinedExamples
-    {
-        [Test]
-        public void Inlined()
-        {
-            RenderingTest
-                .Create()
-                .PageSize(800, 650)
-                .ProduceImages()
-                .ShowResults()
-                .Render(container =>
-                {
-                    container
-                        .Padding(25)
-                        .Decoration(decoration =>
-                        {
-                            decoration.Header().Text(text =>
-                            {
-                                text.DefaultTextStyle(TextStyle.Default.Size(20));
-                                
-                                text.CurrentPageNumber();
-                                text.Span(" / ");
-                                text.TotalPages();
-                            });
-                            
-                            decoration
-                                .Content()
-                                .PaddingTop(25)
-                                //.Box()
-                                .Border(1)
-                                .Background(Colors.Grey.Lighten2)
-                                .Inlined(inlined =>
-                                {
-                                    inlined.Spacing(25);
-
-                                    inlined.AlignSpaceAround();
-                                    inlined.BaselineMiddle();
-
-                                    var random = new Random(123);
-
-                                    foreach (var _ in Enumerable.Range(0, 50))
-                                    {
-                                        var width = random.Next(2, 7);
-                                        var height = random.Next(2, 7);
-
-                                        var sizeText = $"{width}×{height}";
-                                        
-                                        inlined
-                                            .Item()
-                                            .Border(1)
-                                            .Width(width * 25)
-                                            .Height(height * 25)
-                                            .Background(Placeholders.BackgroundColor())
-                                            .Layers(layers =>
-                                            {
-                                                layers.Layer().Grid(grid =>
-                                                {
-                                                    grid.Columns(width);
-                                                    Enumerable.Range(0, width * height).ToList().ForEach(x => grid.Item().Border(1).BorderColor(Colors.White).Width(25).Height(25));
-                                                });
-                                                
-                                                layers
-                                                    .PrimaryLayer()
-                                                    .AlignCenter()
-                                                    .AlignMiddle()
-                                                    .Text(sizeText, TextStyle.Default.Size(15));
-                                            });
-                                    }
-                                });
-                        });
-                });
-        }
-        
-        [Test]
-        public void Inline_AlignLeft_BaselineBottom()
-        {
-            RenderingTest
-                .Create()
-                .PageSize(800, 600)
-                .ProduceImages()
-                .ShowResults()
-                .Render(container =>
-                {
-                    container
-                        .Padding(20)
-                        .Box()
-                        .Border(1)
-                        .Background(Colors.Grey.Lighten4)
-                        .Inlined(inlined =>
-                        {
-                            inlined.VerticalSpacing(50);
-                            inlined.HorizontalSpacing(25);
-                            inlined.AlignRight();
-                            inlined.BaselineMiddle();
-
-                            foreach (var _ in Enumerable.Range(0, 100))
-                                inlined.Item().Element(RandomBlock);
-                        });
-                });
-
-            void RandomBlock(IContainer container)
-            {
-                container
-                    .Width(Placeholders.Random.Next(1, 5) * 20)
-                    .Height(Placeholders.Random.Next(1, 5) * 20)
-                    .Border(1)
-                    .BorderColor(Colors.Grey.Darken2)
-                    .Background(Placeholders.BackgroundColor());
-            }
-        }
-    }
-}

QuestPDF.Examples/LoremPicsumExample.cs

@@ -1,5 +1,4 @@
 using System.Net;
-using NUnit.Framework;
 using QuestPDF.Examples.Engine;
 using QuestPDF.Fluent;
 using QuestPDF.Infrastructure;
@@ -28,34 +27,27 @@ namespace QuestPDF.Examples
         }
     }
     
-    public class LoremPicsumExample
+    public class LoremPicsumExample : ExampleTestBase
     {
-        [Test]
-        public void LoremPicsum()
+        [ShowResult]
+        [ImageSize(350, 280)]
+        public void LoremPicsum(IContainer container)
         {
-            RenderingTest
-                .Create()
-                .PageSize(350, 280)
-                .ProducePdf()
-                .ShowResults()
-                .Render(container =>
+            container
+                .Background("#FFF")
+                .Padding(25)
+                .Stack(column =>
                 {
-                    container
-                        .Background("#FFF")
-                        .Padding(25)
-                        .Stack(column =>
-                        {
-                            column.Spacing(10);
+                    column.Spacing(10);
 
-                            column
-                                .Item()
-                                .Component(new LoremPicsum(true));
+                    column
+                        .Item()
+                        .Component(new LoremPicsum(true));
                     
-                            column
-                                .Item()
-                                .AlignRight()
-                                .Text("From Lorem Picsum");
-                        });
+                    column
+                        .Item()
+                        .AlignRight()
+                        .Text("From Lorem Picsum");
                 });
         }
     }

QuestPDF.Examples/Padding.cs

@@ -1,163 +1,132 @@
-using NUnit.Framework;
-using QuestPDF.Examples.Engine;
+using QuestPDF.Examples.Engine;
 using QuestPDF.Fluent;
 using QuestPDF.Infrastructure;
 
 namespace QuestPDF.Examples
 {
-    public class Examples
+    public class Examples : ExampleTestBase
     {
-        [Test]
-        public void Padding()
+        public void Padding(IContainer container)
         {
-            RenderingTest
-                .Create()
-                .PageSize(300, 300)
-                .ShowResults()
-                .Render(container =>
-                {
-                    container
-                        .Background("#FDD")
-                        .Padding(50)
+            container
+                .Background("#FDD")
+                .Padding(50)
 
-                        .Background("#AFA")
-                        .PaddingVertical(50)
+                .Background("#AFA")
+                .PaddingVertical(50)
 
-                        .Background("#77F")
-                        .PaddingHorizontal(50)
+                .Background("#77F")
+                .PaddingHorizontal(50)
 
-                        .Background("#444");
-                });
+                .Background("#444");
         }
         
-        [Test]
-        public void Border()
+        public void Border(IContainer container)
         {
-            RenderingTest
-                .Create()
-                .PageSize(200, 150)
-                .Render(container =>
-                {
-                    container
-                        .Background("#EEE")
-                        .Padding(25)
+            container
+                .Background("#EEE")
+                .Padding(25)
 
-                        .AlignBottom()
-                        .AlignCenter()
-                        .BorderBottom(2)
-                        .BorderColor("#000")
+                .AlignBottom()
+                .AlignCenter()
+                .BorderBottom(2)
+                .BorderColor("#000")
                 
-                        .Background("FFF")
-                        .Padding(5)
+                .Background("FFF")
+                .Padding(5)
+                .Text("Sample text", TextStyle.Default.FontType("Segoe UI emoji").Alignment(HorizontalAlignment.Center));
+        }
+        
+        public void Alignment(IContainer container)
+        {
+            container
+                .Stack(column =>
+                {
+                    column
+                        .Item()
+                        .Height(100)
+                        .Background("#FFF")
+                        
+                        .AlignLeft()
+                        .AlignMiddle()
+
+                        .Width(50)
+                        .Height(50)
+                        .Background("#444");
+                    
+                    column
+                        .Item()
+                        .Height(100)
+                        .Background("#DDD")
+                        
                         .AlignCenter()
-                        .Text("Sample text", TextStyle.Default.FontType("Segoe UI emoji"));
+                        .AlignMiddle()
+
+                        .Width(50)
+                        .Height(50)
+                        .Background("#222");
+                    
+                    column
+                        .Item()
+                        .Height(100)
+                        .Background("#BBB")
+                        
+                        .AlignRight()
+                        .AlignMiddle()
+
+                        .Width(50)
+                        .Height(50)
+                        .Background("#000");
                 });
         }
         
-        [Test]
-        public void Alignment()
+        public void Expand(IContainer container)
         {
-            RenderingTest
-                .Create()
-                .PageSize(200, 150)
-                .Render(container =>
+            container
+                .Stack(column =>
                 {
-                    container
-                        .Stack(column =>
+                    column
+                        .Item()
+                        .Height(150)
+                        .Row(row =>
                         {
-                            column
-                                .Item()
-                                .Height(100)
-                                .Background("#FFF")
-                        
-                                .AlignLeft()
-                                .AlignMiddle()
+                            row.RelativeColumn()
+                                .Extend()
+                                .Background("FFF")
 
-                                .Width(50)
                                 .Height(50)
-                                .Background("#444");
-                    
-                            column
-                                .Item()
-                                .Height(100)
-                                .Background("#DDD")
-                        
-                                .AlignCenter()
-                                .AlignMiddle()
+                                .Width(50)
+                                .Background("444");
+                            
+                            row.RelativeColumn()
+                                .Extend()
+                                .Background("BBB")
 
-                                .Width(50)
                                 .Height(50)
-                                .Background("#222");
-                    
-                            column
-                                .Item()
-                                .Height(100)
-                                .Background("#BBB")
-                        
-                                .AlignRight()
-                                .AlignMiddle()
-
-                                .Width(50)
-                                .Height(50)
-                                .Background("#000");
+                                .ExtendHorizontal()
+                                .Background("444");
                         });
-                });
-        }
-        
-        [Test]
-        public void Expand()
-        {
-            RenderingTest
-                .Create()
-                .PageSize(200, 150)
-                .Render(container =>
-                {
-                    container
-                        .Stack(column =>
-                        {
-                            column
-                                .Item()
-                                .Height(150)
-                                .Row(row =>
-                                {
-                                    row.RelativeColumn()
-                                        .Extend()
-                                        .Background("FFF")
-
-                                        .Height(50)
-                                        .Width(50)
-                                        .Background("444");
-                            
-                                    row.RelativeColumn()
-                                        .Extend()
-                                        .Background("BBB")
-
-                                        .Height(50)
-                                        .ExtendHorizontal()
-                                        .Background("444");
-                                });
                     
-                            column
-                                .Item()
-                                .Height(150)
-                                .Row(row =>
-                                {
-                                    row.RelativeColumn()
-                                        .Extend()
-                                        .Background("BBB")
+                    column
+                        .Item()
+                        .Height(150)
+                        .Row(row =>
+                        {
+                            row.RelativeColumn()
+                                .Extend()
+                                .Background("BBB")
 
-                                        .ExtendVertical()
-                                        .Width(50)
-                                        .Background("444");
+                                .ExtendVertical()
+                                .Width(50)
+                                .Background("444");
                             
-                                    row.RelativeColumn()
-                                        .Extend()
-                                        .Background("BBB")
+                            row.RelativeColumn()
+                                .Extend()
+                                .Background("BBB")
 
-                                        .ExtendVertical()
-                                        .ExtendHorizontal()
-                                        .Background("444");
-                                });
+                                .ExtendVertical()
+                                .ExtendHorizontal()
+                                .Background("444");
                         });
                 });
         }

QuestPDF.Examples/QuestPDF.Examples.csproj

@@ -6,27 +6,14 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="microcharts" Version="0.9.5.9" />
-        <PackageReference Include="nunit" Version="3.13.2" />
-        <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
+        <PackageReference Include="nunit" Version="3.12.0" />
+        <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
-        <PackageReference Include="SkiaSharp" Version="2.80.3" />
+        <PackageReference Include="SkiaSharp" Version="2.80.2" />
     </ItemGroup>
 
     <ItemGroup>
       <ProjectReference Include="..\QuestPDF\QuestPDF.csproj" />
     </ItemGroup>
 
-    <ItemGroup>
-      <None Update="quo-vadis.txt">
-        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      </None>
-      <None Update="LibreBarcode39-Regular.ttf">
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      </None>
-      <None Update="logo.png">
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      </None>
-    </ItemGroup>
-
 </Project>

QuestPDF.Examples/ShowOnceExample.cs

@@ -1,54 +0,0 @@
-using NUnit.Framework;
-using QuestPDF.Examples.Engine;
-using QuestPDF.Fluent;
-using QuestPDF.Helpers;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Examples
-{
-    public class ShowOnceExample
-    {
-        [Test]
-        public void ShowOnce()
-        {
-            RenderingTest
-                .Create()
-                .ProduceImages()
-                .ShowResults()
-                .RenderDocument(container =>
-                {
-                    container.Page(page =>
-                    {
-                        page.Margin(20);
-                        page.Size(PageSizes.A7.Landscape());
-                        page.Background(Colors.White);
-
-                        page.Header().Text("With show once", TextStyle.Default.SemiBold());
-                        
-                        page.Content().PaddingVertical(5).Row(row =>
-                        {
-                            row.RelativeColumn()
-                                .Background(Colors.Grey.Lighten2)
-                                .Border(1)
-                                .Padding(5)
-                                .ShowOnce()
-                                .Text(Placeholders.Label());
-                            
-                            row.RelativeColumn(2)
-                                .Border(1)
-                                .Padding(5)
-                                .Text(Placeholders.Paragraph());
-                        });
-                        
-                        page.Footer().Text(text =>
-                        {
-                            text.Span("Page ");
-                            text.CurrentPageNumber();
-                            text.Span(" out of ");
-                            text.TotalPages();
-                        });
-                    });
-                });
-        }
-    }
-}

QuestPDF.Examples/SkipOnceExample.cs

@@ -1,47 +0,0 @@
-using NUnit.Framework;
-using QuestPDF.Examples.Engine;
-using QuestPDF.Fluent;
-using QuestPDF.Helpers;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Examples
-{
-    public class SkipOnceExample
-    {
-        [Test]
-        public void SkipOnce()
-        {
-            RenderingTest
-                .Create()
-                .ProduceImages()
-                .ShowResults()
-                .RenderDocument(container =>
-                {
-                    container.Page(page =>
-                    {
-                        page.Margin(20);
-                        page.Size(PageSizes.A7.Landscape());
-                        page.Background(Colors.White);
-        
-                        page.Header().Stack(stack =>
-                        {
-                            stack.Item().ShowOnce().Text("This header is visible on the first page.");
-                            stack.Item().SkipOnce().Text("This header is visible on the second page and all following.");
-                        });
-                        
-                        page.Content()
-                            .PaddingVertical(10)
-                            .Text(Placeholders.Paragraphs(), TextStyle.Default.Color(Colors.Grey.Medium));
-                        
-                        page.Footer().Text(text =>
-                        {
-                            text.Span("Page ");
-                            text.CurrentPageNumber();
-                            text.Span(" out of ");
-                            text.TotalPages();
-                        });
-                    });
-                });
-        }
-    }
-}

QuestPDF.Examples/TextBenchmark.cs

@@ -1,226 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using NUnit.Framework;
-using QuestPDF.Examples.Engine;
-using QuestPDF.Fluent;
-using QuestPDF.Helpers;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Examples
-{
-    public class TextBenchmark
-    {
-        [Test]
-        public void Generate()
-        {
-            var chapters = GetBookChapters().ToList();
-            
-            RenderingTest
-                .Create()
-                .PageSize(PageSizes.A4)
-                .ProducePdf()
-                .ShowResults()
-                .Render(x => ComposeBook(x, chapters));
-        }
-        
-        [Test]
-        public void Benchmark()
-        {
-            var chapters = GetBookChapters().ToList();
-  
-            var results = PerformTest(16).ToList();
- 
-            Console.WriteLine($"Min: {results.Min():F}");
-            Console.WriteLine($"Max: {results.Max():F}");
-            Console.WriteLine($"Avg: {results.Average():F}");
-            
-            void GenerateDocument()
-            {
-                RenderingTest
-                    .Create()
-                    .PageSize(PageSizes.A4)
-                        .ProducePdf()
-                    .Render(x => ComposeBook(x, chapters));
-            }
-
-            IEnumerable<float> PerformTest(int attempts)
-            {
-                foreach (var i in Enumerable.Range(0, attempts))
-                {
-                    var timer = new Stopwatch();
-                
-                    timer.Start();
-                    GenerateDocument();
-                    timer.Stop();
-
-                    Console.WriteLine($"Attempt {i}: {timer.ElapsedMilliseconds:F}");
-                    yield return timer.ElapsedMilliseconds;
-                }
-            }
-        }
-
-        class BookChapter
-        {
-            public string Title { get; set; }
-            public string Content { get; set; }
-        }
-        
-        private static IEnumerable<BookChapter> GetBookChapters()
-        {
-            var book = File.ReadAllLines("quo-vadis.txt");
-            
-            var chapterPointers = book
-                .Select((line, index) => new
-                {
-                    LineNumber = index,
-                    Text = line
-                })
-                .Where(x => x.Text.Length < 50 && x.Text.Contains("Rozdział") || x.Text.Contains("-----"))
-                .Select(x => x.LineNumber)
-                .ToList();
-
-            foreach (var index in Enumerable.Range(0, chapterPointers.Count - 1))
-            {
-                var chapter = chapterPointers[index];
-                    
-                var title = book[chapter];
-                    
-                var lineFrom = chapterPointers[index];
-                var lineTo = chapterPointers[index + 1] - 1;
-
-                var lines = book.Skip(lineFrom + 1).Take(lineTo - lineFrom).Where(x => !string.IsNullOrWhiteSpace(x));
-                var content = string.Join(Environment.NewLine, lines);
-
-                yield return new BookChapter
-                {
-                    Title = title,
-                    Content = content
-                };
-            }
-        }
-        
-        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);
-
-            void ComposePage(IContainer container)
-            {
-                container
-                    .Padding(50)
-                    .Decoration(decoration =>
-                    {
-                        decoration
-                            .Content()
-                            .Stack(stack =>
-                            {
-                                stack.Item().Element(Title);
-                                stack.Item().PageBreak();
-                                stack.Item().Element(TableOfContents);
-                                stack.Item().PageBreak();
-
-                                Chapters(stack);
-
-                                stack.Item().Element(Acknowledgements);
-                            });
-
-                        decoration.Footer().Element(Footer);
-                    });
-            }
-            
-            void Title(IContainer container)
-            {
-                container
-                    .Extend()
-                    .PaddingBottom(200)
-                    .AlignBottom()
-                    .Stack(stack =>
-                    {
-                        stack.Item().Text("Quo Vadis", TextStyle.Default.Size(72).Bold().Color(Colors.Blue.Darken2));
-                        stack.Item().Text("Henryk Sienkiewicz", TextStyle.Default.Size(24).Color(Colors.Grey.Darken2));
-                    });
-            }
-
-            void TableOfContents(IContainer container)
-            {
-                container.Stack(stack =>
-                {
-                    SectionTitle(stack, "Spis treści");
-                    
-                    foreach (var chapter in chapters)
-                    {
-                        stack.Item().InternalLink(chapter.Title).Row(row =>
-                        {
-                            row.RelativeColumn().Text(chapter.Title, normalStyle);
-                            row.ConstantColumn(100).AlignRight().Text(text => text.PageNumberOfLocation(chapter.Title, normalStyle));
-                        });
-                    }
-                });
-            }
-
-            void Chapters(StackDescriptor stack)
-            {
-                foreach (var chapter in chapters)
-                {
-                    stack.Item().Element(container => Chapter(container, chapter.Title, chapter.Content));
-                }
-            }
-            
-            void Chapter(IContainer container, string title, string content)
-            {
-                container.Stack(stack =>
-                {
-                    SectionTitle(stack, title);
-  
-                    stack.Item().Text(text =>
-                    {
-                        text.ParagraphSpacing(5);
-                        text.Span(content, normalStyle);
-                    });
-                    
-                    stack.Item().PageBreak();
-                });
-            }
-
-            void Acknowledgements(IContainer container)
-            {
-                container.Stack(stack =>
-                {
-                    SectionTitle(stack, "Podziękowania");
-                    
-                    stack.Item().Text(text =>
-                    {
-                        text.DefaultTextStyle(normalStyle);
-                        
-                        text.Span("Ten dokument został wygenerowany na podstawie książki w formacie TXT opublikowanej w serwisie ");
-                        text.ExternalLocation("wolnelektury.pl", "https://wolnelektury.pl/", normalStyle.Color(Colors.Blue.Medium).Underline());
-                        text.Span(". Dziękuję za wspieranie polskiego czytelnictwa!");
-                    });
-                });
-            }
-
-            void SectionTitle(StackDescriptor stack, string text)
-            {
-                stack.Item().Location(text).Text(text, subtitleStyle);
-                stack.Item().PaddingTop(10).PaddingBottom(50).BorderBottom(1).BorderColor(Colors.Grey.Lighten2).ExtendHorizontal();
-            }
-            
-            void Footer(IContainer container)
-            {
-                container
-                    .AlignCenter()
-                    .Text(text =>
-                    {
-                        text.CurrentPageNumber();
-                        text.Span(" / ");
-                        text.TotalPages();
-                    });
-            }
-        }
-    }
-}

QuestPDF.Examples/TextExample.cs

@@ -0,0 +1,212 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using QuestPDF.Elements;
+using QuestPDF.Examples.Engine;
+using QuestPDF.Fluent;
+using QuestPDF.Helpers;
+using QuestPDF.Infrastructure;
+using SkiaSharp;
+
+namespace QuestPDF.Examples
+{
+    public class TextExample : ExampleTestBase
+    {
+        [ShowResult]
+        [ImageSize(1400, 600)]
+        public void OldText(IContainer container)
+        {
+            var fonts = new[]
+            {
+                Fonts.Arial,
+                Fonts.Calibri,
+                Fonts.Cambria,
+                Fonts.Candara,
+                Fonts.ComicSans,
+                Fonts.Consolas,
+                Fonts.Corbel,
+                Fonts.Courier,
+                Fonts.CourierNew,
+                Fonts.Georgia,
+                Fonts.Impact,
+                Fonts.LucidaConsole,
+                Fonts.SegoeSD,
+                Fonts.SegoeUI,
+                Fonts.Tahoma,
+                Fonts.TimesNewRoman,
+                Fonts.TimesRoman,
+                Fonts.Trebuchet,
+                Fonts.Verdana,
+            };
+            
+            container
+                .Padding(50)
+                .Grid(stack =>
+                {
+                    stack.Spacing(10);
+                    stack.Columns(2);
+
+                    foreach (var font in fonts)
+                    {
+                        stack
+                            .Element()
+                            .Box()
+                            .Background(Placeholders.BackgroundColor())
+                            .Text($"Lorem ipsum dolor sit amet {font}", TextStyle.Default.Size(24).FontType(font));
+                    }
+                });
+        }
+        
+        //[ShowResult]
+        [ImageSize(1400, 800)]
+        public void Test(IContainer container)
+        {
+            List<TextElement> Lorem()
+            {
+                return new List<TextElement>
+                {
+                    new TextElement()
+                    {
+                        Style = TextStyle.Default.Size(32).BackgroundColor(Placeholders.BackgroundColor()),
+                        Text = "Podstawowy łaciński Tabela znaków Unicode"
+                    },
+                    new TextElement()
+                    {
+                        Style = TextStyle.Default.FontType("Segoe UI Emoji").Size(32).BackgroundColor(Placeholders.BackgroundColor()),
+                        Text = "✔"
+                    },
+                    new TextElement()
+                    {
+                        Style = TextStyle.Default.FontType("Segoe UI Emoji").Size(32).BackgroundColor(Placeholders.BackgroundColor()),
+                        Text = "🥛"
+                    },
+                    new TextElement()
+                    {
+                        Style = TextStyle.Default.FontType("Segoe UI Emoji").Size(32).BackgroundColor(Placeholders.BackgroundColor()),
+                        Text = "🧀"
+                    },
+                    new TextElement()
+                    {
+                        Style = TextStyle.Default.FontType("Segoe UI Emoji").Size(32).BackgroundColor(Placeholders.BackgroundColor()),
+                        Text = "❤🚵‍♀️"
+                    },
+                    new TextElement()
+                    {
+                        Style = TextStyle.Default.Size(32).BackgroundColor(Placeholders.BackgroundColor()),
+                        Text = "Lorem ipsum "
+                    },
+                    new TextElement()
+                    {
+                        Style = TextStyle.Default.Size(24).BackgroundColor(Placeholders.BackgroundColor()),
+                        Text = " dolor "
+                    },
+                    new TextElement()
+                    {
+                        Style = TextStyle.Default.Size(64).BackgroundColor(Placeholders.BackgroundColor()),
+                        Text = " sijt "
+                    },
+                    new TextElement()
+                    {
+                        Style = TextStyle.Default.Size(32).BackgroundColor(Placeholders.BackgroundColor()),
+                        Text = " amet"
+                    }
+                };
+            }
+
+            Func<List<TextElement>> Source = () => Split(RandomText());
+
+            container
+                .Padding(50)
+                .Box().Border(1).Stack(stack =>
+                    {
+                        stack
+                            .Element()
+                            .Box()
+                            //.Background(Placeholders.BackgroundColor())
+                            .Element(new TextRun()
+                            {
+                                Elements = Lorem()
+                            });
+
+                        stack
+                            .Element()
+                            .Box()
+                            //.Background(Placeholders.BackgroundColor())
+                            .Element(new TextRun()
+                            {
+                                Elements = Source()
+                            });
+
+                        stack
+                            .Element()
+                            .Box()
+                            //.Background(Placeholders.BackgroundColor())
+                            .Element(new TextRun()
+                            {
+                                Elements = Source()
+                            });
+
+                        stack
+                            .Element()
+                            .Box()
+                            //.Background(Placeholders.BackgroundColor())
+                            .Element(new TextRun()
+                            {
+                                Elements = Source()
+                            });
+
+                        stack
+                            .Element()
+                            .Box()
+                            //.Background(Placeholders.BackgroundColor())
+                            .Element(new TextRun()
+                            {
+                                Elements = Source()
+                            });
+
+                        stack
+                            .Element()
+                            .Box()
+                            //.Background(Placeholders.BackgroundColor())
+                            .Element(new TextRun()
+                            {
+                                Elements = Source()
+                            });
+                    });
+        }
+
+        List<TextElement> RandomText()
+        {
+            var sizes = new[] { 24, 32, 48, 64};
+            
+            return Placeholders
+                .Sentence()
+                .Split(" ")
+                .Select(x => new TextElement
+                {
+                    Text = $"{x} ",
+                    Style = TextStyle
+                        .Default
+                        //.Size(sizes[Placeholders.Random.Next(0, 3)])
+                        .Size(24)
+                        .BackgroundColor(Placeholders.BackgroundColor())
+                        //.LineHeight((float)Placeholders.Random.NextDouble() / 2 + 1f)
+                        .LineHeight(1.2f)
+                })
+                .ToList();
+        }
+        
+        List<TextElement> Split(List<TextElement> elements)
+        {
+            return elements
+                .SelectMany(x => x
+                    .Text
+                    .Select(y => new TextElement
+                    {
+                        Style = x.Style,
+                        Text = y.ToString()
+                    }))
+                .ToList();
+        }
+    }
+}

QuestPDF.Examples/TextExamples.cs

@@ -1,271 +0,0 @@
-using System;
-using System.Linq;
-using System.Text;
-using NUnit.Framework;
-using QuestPDF.Examples.Engine;
-using QuestPDF.Fluent;
-using QuestPDF.Helpers;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Examples
-{
-    public class TextExamples
-    {
-        [Test]
-        public void SimpleTextBlock()
-        {
-            RenderingTest
-                .Create()
-                .PageSize(500, 300)
-                
-                .ProduceImages()
-                .ShowResults()
-                .Render(container =>
-                {
-                    container
-                        .Padding(5)
-                        .Box()
-                        .Border(1)
-                        .Padding(10)
-                        .Text(text =>
-                        {
-                            text.DefaultTextStyle(TextStyle.Default.Size(20));
-                            text.Span("This is a normal text, followed by an ");
-                            text.Span("underlined red text.", TextStyle.Default.Size(20).Color(Colors.Red.Medium).Underline());
-                        });
-                });
-        }
-        
-        [Test]
-        public void ParagraphSpacing()
-        {
-            RenderingTest
-                .Create()
-                .PageSize(500, 300)
-                .ProduceImages()
-                .ShowResults()
-                .Render(container =>
-                {
-                    container
-                        .Padding(5)
-                        .Box()
-                        .Border(1)
-                        .Padding(10)
-                        .Text(text =>
-                        {
-                            text.ParagraphSpacing(10);
-    
-                            foreach (var i in Enumerable.Range(1, 3))
-                            {
-                                text.Span($"Paragraph {i}: ", TextStyle.Default.SemiBold());
-                                text.Line(Placeholders.Paragraph());
-                            }
-                        });
-                });
-        }
-        
-        [Test]
-        public void CustomElement()
-        {
-            RenderingTest
-                .Create()
-                .PageSize(500, 200)
-                .ProduceImages()
-                .ShowResults()
-                .Render(container =>
-                {
-                    container
-                        .Padding(5)
-                        .Box()
-                        .Border(1)
-                        .Padding(10)
-                        .Text(text =>
-                        {
-                            text.DefaultTextStyle(TextStyle.Default.Size(20));
-                            text.Span("This is a random image aligned to the baseline: ");
-                            
-                            text.Element()
-                                .PaddingBottom(-6)
-                                .Height(24)
-                                .Width(48)
-                                .Image(Placeholders.Image);
-                            
-                            text.Span(".");
-                        });
-                });
-        }
-        
-        [Test]
-        public void TextElements()
-        {
-            RenderingTest
-                .Create()
-                .PageSize(PageSizes.A4)
-                .ProducePdf()
-                .ShowResults()
-                .Render(container =>
-                {
-                    container
-                        .Padding(20)
-                        .Padding(10)
-                        .Box()
-                        .Border(1)
-                        .Padding(5)
-                        .Padding(10)
-                        .Text(text =>
-                        {
-                            text.DefaultTextStyle(TextStyle.Default);
-                            text.AlignLeft();
-                            text.ParagraphSpacing(10);
-
-                            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? <", TextStyle.Default.Underline());
-                        });
-                });
-        }
-        
-        [Test]
-        public void TextStack()
-        {
-            RenderingTest
-                .Create()
-                .PageSize(PageSizes.A4)
-                .ProducePdf()
-                .ShowResults()
-                .Render(container =>
-                {
-                    container
-                        .Padding(20)
-                        .Padding(10)
-                        .Box()
-                        .Border(1)
-                        .Padding(5)
-                        .Padding(10)
-                        .Text(text =>
-                        {
-                            text.DefaultTextStyle(TextStyle.Default);
-                            text.AlignLeft();
-                            text.ParagraphSpacing(10);
-                            
-                            foreach (var i in Enumerable.Range(1, 100))
-                                text.Line($"{i}: {Placeholders.Paragraph()}");
-                        });
-                });
-        }
-
-        [Test]
-        public void SpaceIssue()
-        {
-            RenderingTest
-                .Create()
-                .PageSize(PageSizes.A4)
-                .ProducePdf()
-                .ShowResults()
-                .Render(container =>
-                {
-                    container
-                        .Padding(20)
-                        .Padding(10)
-                        .Box()
-                        .Border(1)
-                        .Padding(5)
-                        .Padding(10)
-                        .Text(text =>
-                        {
-                            text.DefaultTextStyle(TextStyle.Default);
-                            text.AlignLeft();
-                            text.ParagraphSpacing(10);
-
-                            text.Span(Placeholders.LoremIpsum());
-
-                            text.EmptyLine();
-
-                            text.Span("This text is a normal text, ");
-                            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(-10).Height(16).Width(32).Image(Placeholders.Image);
-                            text.Span(".");
-
-                            text.EmptyLine();
-
-                            text.Span("This is page number ");
-                            text.CurrentPageNumber();
-                            text.Span(" out of ");
-                            text.TotalPages();
-
-                            text.EmptyLine();
-
-                            text.ExternalLocation("Please visit QuestPDF website", "https://www.questpdf.com");
-
-                            text.EmptyLine();
-
-                            text.Span(Placeholders.Paragraphs());
-                            
-                            
-                            text.EmptyLine();
-
-                            text.Span(Placeholders.Paragraphs(), TextStyle.Default.Italic());
-                            
-                            text.Line("This is target text that does not show up. " + Placeholders.Paragraph());
-                        });
-                });
-        }
-
-        [Test]
-        public void HugeList()
-        {
-            RenderingTest
-                .Create()
-                .PageSize(PageSizes.A4)
-                .ProducePdf()
-                .ShowResults()
-                .Render(container =>
-                {
-                    container
-                        .Padding(20)
-                        .Padding(10)
-                        .Box()
-                        .Border(1)
-                        .Padding(5)
-                        .Padding(10)
-                        .Text(text =>
-                        {
-                            text.DefaultTextStyle(TextStyle.Default);
-                            text.AlignLeft();
-                            text.ParagraphSpacing(10);
-
-                            text.Span("This text is a normal text, ");
-                            text.Span("this is a bold text, ", TextStyle.Default.Bold());
-                            text.Span("this is a red and underlined text, ", TextStyle.Default.Color(Colors.Red.Medium).Underline());
-                            text.Span("and this is slightly bigger text.", TextStyle.Default.Size(16));
-                            
-                            text.Span("The new text element also supports injecting custom content between words: ");
-                            text.Element().PaddingBottom(-10).Height(16).Width(32).Image(Placeholders.Image);
-                            text.Span(".");
-                            
-                            text.EmptyLine();
-                            
-                            foreach (var i in Enumerable.Range(1, 100))
-                            {
-                                text.Line($"{i}: {Placeholders.Paragraph()}");
-
-                                text.ExternalLocation("Please visit QuestPDF website", "https://www.questpdf.com");
-                                
-                                text.Span("This is page number ");
-                                text.CurrentPageNumber();
-                                text.Span(" out of ");
-                                text.TotalPages();
-                                
-                                text.EmptyLine();
-                            }
-                        });
-                });
-        }
-    }
-}

QuestPDF.ReportSample/DataSource.cs

@@ -7,6 +7,9 @@ namespace QuestPDF.ReportSample
 {
     public static class DataSource
     {
+        public static int SectionCounter { get; set; }
+        public static int FieldCounter { get; set; }
+        
         public static ReportModel GetReport()
         {
             return new ReportModel
@@ -15,8 +18,8 @@ namespace QuestPDF.ReportSample
                 HeaderFields = HeaderFields(),
                 
                 LogoData = Helpers.GetImage("Logo.png"),
-                Sections = Enumerable.Range(0, 40).Select(x => GenerateSection()).ToList(),
-                Photos = Enumerable.Range(0, 25).Select(x => GetReportPhotos()).ToList()
+                Sections = Enumerable.Range(0, 50).Select(x => GenerateSection()).ToList(),
+                Photos = Enumerable.Range(0, 30).Select(x => GetReportPhotos()).ToList()
             };
 
             List<ReportHeaderField> HeaderFields()
@@ -86,6 +89,7 @@ namespace QuestPDF.ReportSample
                 return new ReportSectionMap
                 {
                     Label = "Location",
+                    ImageSource = Placeholders.Image,
                     Location = Helpers.RandomLocation()
                 };
             }
@@ -95,7 +99,10 @@ namespace QuestPDF.ReportSample
                 return new ReportSectionPhotos
                 {    
                     Label = "Photos",
-                    PhotoCount = Helpers.Random.Next(1, 15)
+                    Photos = Enumerable
+                        .Range(0, Helpers.Random.Next(1, 15))
+                        .Select(x => Placeholders.Image(400, 300))
+                        .ToList()
                 };
             }
 
@@ -103,9 +110,14 @@ namespace QuestPDF.ReportSample
             {
                 return new ReportPhoto()
                 {
+                    PhotoData = Placeholders.Image(800, 600),
+
                     Comments = Placeholders.Sentence(),
                     Date = DateTime.Now - TimeSpan.FromDays(Helpers.Random.NextDouble() * 100),
-                    Location = Helpers.RandomLocation()
+                    Location = Helpers.RandomLocation(),
+
+                    MapContextSource = x => Placeholders.Image(400, 300),
+                    MapDetailsSource = x => Placeholders.Image(400, 300)
                 };
             }
         }

QuestPDF.ReportSample/Helpers.cs

@@ -6,7 +6,7 @@ namespace QuestPDF.ReportSample
 {
     public static class Helpers
     {
-        public static Random Random { get; } = new Random(1);
+        public static Random Random { get; } = new Random();
         
         public static string GetTestItem(string path) => Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Resources", path);
 

QuestPDF.ReportSample/Layouts/DifferentHeadersTemplate.cs

@@ -1,85 +0,0 @@
-using QuestPDF.Drawing;
-using QuestPDF.Fluent;
-using QuestPDF.Helpers;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.ReportSample.Layouts
-{
-    public class DifferentHeadersTemplate : IDocument
-    {
-        public DocumentMetadata GetMetadata() => DocumentMetadata.Default;
-
-        public void Compose(IDocumentContainer container)
-        {
-            container
-                .Page(page =>
-                {
-                    page.Margin(40);
-
-                    page.Size(PageSizes.A4);
-
-                    page.Header().Element(ComposeHeader);
-                    page.Content().Element(ComposeContent);
-                    page.Footer().Element(ComposeFooter);
-                });
-        }
-
-        private void ComposeHeader(IContainer container)
-        {
-            container.Background(Colors.Grey.Lighten3).Border(1).Stack(stack =>
-            {
-                stack.Item().ShowOnce().Padding(5).AlignMiddle().Row(row =>
-                {
-                    row.RelativeColumn(2).AlignMiddle().Text("PRIMARY HEADER", TextStyle.Default.Color(Colors.Grey.Darken3).Size(30).Bold());
-                    row.RelativeColumn(1).AlignRight().Box().AlignMiddle().Background(Colors.Blue.Darken2).Padding(30);
-                });
-                stack.Item().SkipOnce().Padding(5).Row(row =>
-                {
-                    row.RelativeColumn(2).Text("SECONDARY HEADER", TextStyle.Default.Color(Colors.Grey.Darken3).Size(30).Bold());
-                    row.RelativeColumn(1).AlignRight().Box().Background(Colors.Blue.Lighten4).Padding(15);
-                });
-            });
-        }
-
-        private void ComposeContent(IContainer container)
-        {
-            container.Stack(stack =>
-            {
-                stack.Item().PaddingVertical(80).Text("First");
-                stack.Item().PageBreak();
-                stack.Item().PaddingVertical(80).Text("Second");
-                stack.Item().PageBreak();
-                stack.Item().PaddingVertical(80).Text("Third");
-                stack.Item().PageBreak();
-            });
-        }
-
-        private void ComposeFooter(IContainer container)
-        {
-            container.Background(Colors.Grey.Lighten3).Stack(stack =>
-            {
-                stack.Item().ShowOnce().Background(Colors.Grey.Lighten3).Row(row =>
-                {
-                    row.RelativeColumn().Text(x =>
-                    {
-                        x.CurrentPageNumber();
-                        x.Span(" / ");
-                        x.TotalPages();
-                    });
-                    row.RelativeColumn().AlignRight().Text("Footer for header");
-                });
-
-                stack.Item().SkipOnce().Background(Colors.Grey.Lighten3).Row(row =>
-                {
-                    row.RelativeColumn().Text(x =>
-                    {
-                        x.CurrentPageNumber();
-                        x.Span(" / ");
-                        x.TotalPages();
-                    });
-                    row.RelativeColumn().AlignRight().Text("Footer for every page except header");
-                });
-            });
-        }
-    }
-}

QuestPDF.ReportSample/Layouts/ImagePlaceholder.cs

@@ -1,20 +0,0 @@
-using QuestPDF.Fluent;
-using QuestPDF.Helpers;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.ReportSample.Layouts
-{
-    public class ImagePlaceholder : IComponent
-    {
-        public static bool Solid { get; set; } = false;
-        
-        public void Compose(IContainer container)
-        {
-            if (Solid)
-                container.Background(Placeholders.Color());
-            
-            else
-                container.Image(Placeholders.Image);
-        }
-    }
-}

QuestPDF.ReportSample/Layouts/ImageTemplate.cs

@@ -0,0 +1,31 @@
+using System;
+using QuestPDF.Fluent;
+using QuestPDF.Infrastructure;
+
+namespace QuestPDF.ReportSample.Layouts
+{
+    public class ImageTemplate : IComponent
+    {
+        private Func<Size, byte[]> Source { get; }
+        private float AspectRatio { get; }
+
+        public ImageTemplate(byte[] source, float aspectRatio = 1.333333f) : this(_ => source, aspectRatio)
+        {
+            
+        }
+        
+        public ImageTemplate(Func<Size, byte[]> source, float aspectRatio = 1.333333f)
+        {
+            Source = source;
+            AspectRatio = aspectRatio;
+        }
+
+        public void Compose(IContainer container)
+        {
+            container
+                .AspectRatio(AspectRatio)
+                .Background("#EEEEEE")
+                .Image(Source(Size.Zero));
+        }
+    }
+}

QuestPDF.ReportSample/Layouts/PhotoTemplate.cs

@@ -30,14 +30,14 @@ namespace QuestPDF.ReportSample.Layouts
             container
                 .Row(row =>
                 {
-                    row.RelativeColumn(2).AspectRatio(4 / 3f).Component<ImagePlaceholder>();
+                    row.RelativeColumn(2).AspectRatio(4 / 3f).Image(Placeholders.Image);
 
                     row.RelativeColumn().PaddingLeft(5).Stack(stack =>
                     {
                         stack.Spacing(7f);
                         
-                        stack.Item().AspectRatio(4 / 3f).Component<ImagePlaceholder>();
-                        stack.Item().AspectRatio(4 / 3f).Component<ImagePlaceholder>();
+                        stack.Item().AspectRatio(4 / 3f).Image(Placeholders.Image);
+                        stack.Item().AspectRatio(4 / 3f).Image(Placeholders.Image);
                     });
                 });
         }
@@ -48,13 +48,13 @@ namespace QuestPDF.ReportSample.Layouts
             {
                 grid.Columns(6);
                 
-                grid.Item().LabelCell().Text("Date");
-                grid.Item(2).ValueCell().Text(Model.Date?.ToString("g") ?? string.Empty);
-                grid.Item().LabelCell().Text("Location");
-                grid.Item(2).ValueCell().Text(Model.Location.Format());
+                grid.Item().LabelCell().Text("Date", Typography.Normal);
+                grid.Item(2).ValueCell().Text(Model.Date?.ToString("g") ?? string.Empty, Typography.Normal);
+                grid.Item().LabelCell().Text("Location", Typography.Normal);
+                grid.Item(2).ValueCell().Text(Model.Location.Format(), Typography.Normal);
                 
-                grid.Item().LabelCell().Text("Comments");
-                grid.Item(5).ValueCell().Text(Model.Comments);
+                grid.Item().LabelCell().Text("Comments", Typography.Normal);
+                grid.Item(5).ValueCell().Text(Model.Comments, Typography.Normal);
             });
         }
     }

QuestPDF.ReportSample/Layouts/SectionTemplate.cs

@@ -1,4 +1,3 @@
-using System.Linq;
 using QuestPDF.Fluent;
 using QuestPDF.Helpers;
 using QuestPDF.Infrastructure;
@@ -29,13 +28,13 @@ namespace QuestPDF.ReportSample.Layouts
                     {
                         foreach (var part in Model.Parts)
                         {
-                            stack.Item().EnsureSpace(25).Row(row =>
+                            stack.Item().Row(row =>
                             {
-                                row.ConstantColumn(150).LabelCell().Text(part.Label);
+                                row.ConstantColumn(150).LabelCell().Text(part.Label, Typography.Normal);
                                 var frame = row.RelativeColumn().ValueCell();
                             
                                 if (part is ReportSectionText text)
-                                    frame.ShowEntire().Text(text.Text);
+                                    frame.Text(text.Text, Typography.Normal);
                         
                                 if (part is ReportSectionMap map)
                                     frame.Element(x => MapElement(x, map));
@@ -50,9 +49,9 @@ namespace QuestPDF.ReportSample.Layouts
         
         void MapElement(IContainer container, ReportSectionMap model)
         {
-            if (model.Location == null)
+            if (model.ImageSource == null || model.Location == null)
             {
-                container.Text("No location provided");
+                container.Text("No location provided", Typography.Normal);
                 return;
             }
 
@@ -60,28 +59,25 @@ namespace QuestPDF.ReportSample.Layouts
             {
                 stack.Spacing(5);
                 
-                stack.Item().MaxWidth(250).AspectRatio(4 / 3f).Component<ImagePlaceholder>();
-                stack.Item().Text(model.Location.Format());
+                stack.Item().MaxWidth(250).AspectRatio(4 / 3f).Image(Placeholders.Image);
+                stack.Item().Text(model.Location.Format(), Typography.Normal);
             });
         }
         
         void PhotosElement(IContainer container, ReportSectionPhotos model)
         {
-            if (model.PhotoCount == 0)
+            if (model.Photos.Count == 0)
             {
                 container.Text("No photos", Typography.Normal);
                 return;
             }
 
-            container.DebugArea("Photos").Grid(grid =>
+            container.Debug("Photos").Grid(grid =>
             {
                 grid.Spacing(5);
                 grid.Columns(3);
                 
-                Enumerable
-                    .Range(0, model.PhotoCount)
-                    .ToList()
-                    .ForEach(x => grid.Item().AspectRatio(4 / 3f).Component<ImagePlaceholder>());
+                model.Photos.ForEach(x => grid.Item().AspectRatio(4 / 3f).Image(Placeholders.Image));
             });
         }
     }

QuestPDF.ReportSample/Layouts/StandardReport.cs

@@ -18,31 +18,21 @@ namespace QuestPDF.ReportSample.Layouts
         {
             return new DocumentMetadata()
             {
-                Title = Model.Title
+                Title = Model.Title,
+                Size = PageSizes.A4
             };
         }
 
-        public void Compose(IDocumentContainer container)
+        public void Compose(IContainer container)
         {
             container
+                .PaddingVertical(40)
+                .PaddingHorizontal(50)
                 .Page(page =>
                 {
-                    page.DefaultTextStyle(Typography.Normal);
-                    
-                    page.MarginVertical(40);
-                    page.MarginHorizontal(50);
-                    
-                    page.Size(PageSizes.A4);
-                        
                     page.Header().Element(ComposeHeader);
                     page.Content().Element(ComposeContent);
-                    
-                    page.Footer().AlignCenter().Text(text =>
-                    {
-                        text.CurrentPageNumber();
-                        text.Span(" / ");
-                        text.TotalPages();
-                    });
+                    page.Footer().AlignCenter().PageNumber("Page {number}");
                 });
         }
 
@@ -55,7 +45,7 @@ namespace QuestPDF.ReportSample.Layouts
                     row.Spacing(50);
                     
                     row.RelativeColumn().PaddingTop(-10).Text(Model.Title, Typography.Title);
-                    row.ConstantColumn(90).ExternalLink("https://www.questpdf.com").MaxHeight(30).Component<ImagePlaceholder>();
+                    row.ConstantColumn(150).ExternalLink("https://www.questpdf.com").Image(Model.LogoData);
                 });
 
                 stack.Item().ShowOnce().PaddingVertical(15).Border(1f).BorderColor(Colors.Grey.Lighten1).ExtendHorizontal();
@@ -67,10 +57,10 @@ namespace QuestPDF.ReportSample.Layouts
                         
                     foreach (var field in Model.HeaderFields)
                     {
-                        grid.Item().Text(text =>
-                        {
-                            text.Span($"{field.Label}: ", TextStyle.Default.SemiBold());
-                            text.Span(field.Value);
+                        grid.Item().Stack(row =>
+                        {   
+                            row.Item().AlignLeft().Text(field.Label, Typography.Normal.SemiBold());
+                            row.Item().Text(field.Value, Typography.Normal);
                         });
                     }
                 });
@@ -85,8 +75,6 @@ namespace QuestPDF.ReportSample.Layouts
 
                 stack.Item().Component(new TableOfContentsTemplate(Model.Sections));
                 
-                stack.Item().PageBreak();
-                
                 foreach (var section in Model.Sections)
                     stack.Item().Location(section.Title).Component(new SectionTemplate(section));
 

QuestPDF.ReportSample/Layouts/TableOfContentsTemplate.cs

@@ -41,9 +41,8 @@ namespace QuestPDF.ReportSample.Layouts
                 .InternalLink(locationName)
                 .Row(row =>
                 {
-                    row.ConstantColumn(25).Text($"{number}.");
-                    row.RelativeColumn().Text(locationName);
-                    row.ConstantColumn(150).AlignRight().Text(text => text.PageNumberOfLocation(locationName));
+                    row.ConstantColumn(25).Text($"{number}.", Typography.Normal);
+                    row.RelativeColumn().Text(locationName, Typography.Normal);
                 });
         }
     }

QuestPDF.ReportSample/Models.cs

@@ -44,16 +44,22 @@ namespace QuestPDF.ReportSample
     
     public class ReportSectionMap : ReportSectionElement
     {
+        public Func<Size, byte[]> ImageSource { get; set; }
         public Location Location { get; set; }
     }
 
     public class ReportSectionPhotos : ReportSectionElement
     {
-        public int PhotoCount { get; set; }
+        public List<byte[]> Photos { get; set; }
     }
 
     public class ReportPhoto
-    {
+    { 
+        public byte[] PhotoData { get; set; }
+        
+        public Func<Size, byte[]> MapDetailsSource { get; set; }
+        public Func<Size, byte[]> MapContextSource { get; set; }
+        
         public Location Location { get; set; }
         
         public DateTime? Date { get; set; }

QuestPDF.ReportSample/PerformanceTests.cs

@@ -1,74 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using BenchmarkDotNet.Attributes;
-using BenchmarkDotNet.Configs;
-using BenchmarkDotNet.Engines;
-using BenchmarkDotNet.Running;
-using Microsoft.VisualStudio.TestPlatform.TestHost;
-using NUnit.Framework;
-using QuestPDF.Drawing;
-using QuestPDF.Drawing.Proxy;
-using QuestPDF.Elements;
-using QuestPDF.Infrastructure;
-using QuestPDF.ReportSample.Layouts;
-
-namespace QuestPDF.ReportSample
-{
-    [SimpleJob(RunStrategy.Monitoring, launchCount: 0, warmupCount: 1, targetCount: 256)]
-    [MinColumn, MaxColumn, MeanColumn, MedianColumn]
-    public class PerformanceTests
-    {
-        private PageContext PageContext { get; set; }
-        private DocumentMetadata Metadata { get; set; }
-        private Container Content { get; set; }
-
-        [Test]
-        public void Run()
-        {
-            ImagePlaceholder.Solid = true;
-            
-            var configuration = ManualConfig
-                .Create(DefaultConfig.Instance)
-                .WithOptions(ConfigOptions.DisableOptimizationsValidator);
-            
-            BenchmarkRunner.Run<PerformanceTests>(configuration);
-        }
-        
-        [IterationSetup]
-        public void GenerateReportData()
-        {
-            ImagePlaceholder.Solid = true;
-            
-            var model = DataSource.GetReport();
-            var report = new StandardReport(model);
-            Metadata = report.GetMetadata();
-            
-            var documentContainer = new DocumentContainer();
-            report.Compose(documentContainer);
-            Content = documentContainer.Compose();
-
-            PageContext = new PageContext();
-            DocumentGenerator.RenderPass(PageContext, new FreeCanvas(), Content, Metadata, null);
-
-            var sw = new Stopwatch();
-            sw.Start();
-
-            Content.HandleVisitor(x =>
-            {
-                if (x is ICacheable)
-                    x.CreateProxy(y => new CacheProxy(y));
-            });
-            
-            sw.Stop();
-            Console.WriteLine($"Creating cache took: {sw.ElapsedMilliseconds}");
-        }
-
-        [Benchmark]
-        public void GenerationTest()
-        {
-            DocumentGenerator.RenderPass(PageContext, new FreeCanvas(), Content, Metadata, null);
-        }
-    }
-}

QuestPDF.ReportSample/QuestPDF.ReportSample.csproj

@@ -8,11 +8,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
-        <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.3" />
+        <PackageReference Include="DeepCloner" Version="0.10.2" />
+        <PackageReference Include="nunit" Version="3.12.0" />
+        <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+        <PackageReference Include="SkiaSharp" Version="2.80.2" />
     </ItemGroup>
 
     <ItemGroup>

QuestPDF.ReportSample/Tests.cs

@@ -3,54 +3,62 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using NUnit.Framework;
-using QuestPDF.Drawing;
 using QuestPDF.Fluent;
-using QuestPDF.Infrastructure;
 using QuestPDF.ReportSample.Layouts;
 
 namespace QuestPDF.ReportSample
 {
     public class ReportGeneration
     {
-        private StandardReport Report { get; set; }
-        
-        [SetUp]
-        public void SetUp()
-        {
-            var model = DataSource.GetReport();
-            Report = new StandardReport(model);
-        }
-        
         [Test] 
-        public void GenerateAndShowPdf()
+        public void GenerateAndShow()
         {
+            var reportModel = DataSource.GetReport();
+            var report = new StandardReport(reportModel);
+            
             var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"test_result.pdf");
-            Report.GeneratePdf(path);
+            report.GeneratePdf(path);
+            
             Process.Start("explorer.exe", path);
         }
-        
-        [Test] 
-        public void GenerateAndShowXps()
-        {
-            var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"test_result.xps");
-            Report.GenerateXps(path);
-            Process.Start("explorer.exe", path);
-        }
-        
-        [Test] 
-        public void Profile()
-        {
-            ImagePlaceholder.Solid = true;
-            
-            var container = new DocumentContainer();
-            Report.Compose(container);
-            var content = container.Compose();
-            
-            var metadata = Report.GetMetadata();
-            var pageContext = new PageContext();
 
-            DocumentGenerator.RenderPass(pageContext, new FreeCanvas(), content, metadata, null);
-            DocumentGenerator.RenderPass(pageContext, new FreeCanvas(), content, metadata, null);
+        [Test] 
+        public void PerformanceBenchmark()
+        {
+            // target document length should be around 100 pages
+            
+            // test size
+            const int testSize = 100;
+            const decimal performanceTarget = 1; // documents per second
+
+            // create report models
+            var reports = Enumerable
+                .Range(0, testSize)
+                .Select(x =>
+                {
+                    var reportModel = DataSource.GetReport();
+                    return new StandardReport(reportModel);
+                })
+                .ToList();
+
+            // generate documents
+            var sw = new Stopwatch();
+            
+            sw.Start();
+            var totalSize = reports.Select(x => x.GeneratePdf()).Sum(x => (long)x.Length);
+            sw.Stop();
+
+            // show summary
+            Console.WriteLine($"Total size: {totalSize:N0} bytes");
+            
+            var performance = sw.ElapsedMilliseconds / (decimal)testSize;
+            var speed = 1000M / performance;
+            Console.WriteLine($"Test time: {sw.ElapsedMilliseconds} ms");
+            Console.WriteLine($"Time per document: {performance:N} ms");
+            Console.WriteLine($"Documents per second: {speed:N} d/s");
+
+            if (speed < performanceTarget)
+                throw new Exception("Rendering algorithm is too slow.");
         }
     }
 }

QuestPDF.ReportSample/Typography.cs

@@ -8,6 +8,6 @@ namespace QuestPDF.ReportSample
     {
         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);
+        public static TextStyle Normal => TextStyle.Default.FontType(Fonts.Calibri).Color(Colors.Black).Size(11).LineHeight(1.25f).AlignLeft();
     }
 }

QuestPDF.UnitTests/AlignmentTests.cs

@@ -1,5 +1,5 @@
 using NUnit.Framework;
-using QuestPDF.Drawing;
+using QuestPDF.Drawing.SpacePlan;
 using QuestPDF.Elements;
 using QuestPDF.Infrastructure;
 using QuestPDF.UnitTests.TestEngine;
@@ -10,7 +10,11 @@ namespace QuestPDF.UnitTests
     public class AlignmentTests
     {
         [Test]
-        public void Measure() => SimpleContainerTests.Measure<Alignment>();
+        public void Measure_ShouldHandleNullChild() => new Alignment().MeasureWithoutChild();
+        
+        [Test]
+        public void Draw_ShouldHandleNullChild() => new Alignment().DrawWithoutChild();
+
         [Test]
         public void Draw_HorizontalCenter_VerticalCenter()
         {
@@ -23,7 +27,7 @@ namespace QuestPDF.UnitTests
                     Child = x.CreateChild()
                 })
                 .DrawElement(new Size(1000, 500))
-                .ExpectChildMeasure(expectedInput: new Size(1000, 500), returns: SpacePlan.PartialRender(new Size(400, 200)))
+                .ExpectChildMeasure(expectedInput: new Size(1000, 500), returns: new PartialRender(new Size(400, 200)))
                 .ExpectCanvasTranslate(new Position(300, 150))
                 .ExpectChildDraw(new Size(400, 200))
                 .ExpectCanvasTranslate(new Position(-300, -150))
@@ -42,7 +46,7 @@ namespace QuestPDF.UnitTests
                     Child = x.CreateChild()
                 })
                 .DrawElement(new Size(400, 300))
-                .ExpectChildMeasure(expectedInput: new Size(400, 300), returns: SpacePlan.FullRender(new Size(100, 50)))
+                .ExpectChildMeasure(expectedInput: new Size(400, 300), returns: new FullRender(new Size(100, 50)))
                 .ExpectCanvasTranslate(new Position(0, 125))
                 .ExpectChildDraw(new Size(100, 50))
                 .ExpectCanvasTranslate(new Position(0, -125))
@@ -61,7 +65,7 @@ namespace QuestPDF.UnitTests
                     Child = x.CreateChild()
                 })
                 .DrawElement(new Size(400, 300))
-                .ExpectChildMeasure(expectedInput: new Size(400, 300), returns: SpacePlan.FullRender(new Size(100, 50)))
+                .ExpectChildMeasure(expectedInput: new Size(400, 300), returns: new FullRender(new Size(100, 50)))
                 .ExpectCanvasTranslate(new Position(150, 250))
                 .ExpectChildDraw(new Size(100, 50))
                 .ExpectCanvasTranslate(new Position(-150, -250))
@@ -80,7 +84,7 @@ namespace QuestPDF.UnitTests
                     Child = x.CreateChild()
                 })
                 .DrawElement(new Size(400, 300))
-                .ExpectChildMeasure(expectedInput: new Size(400, 300), returns: SpacePlan.FullRender(new Size(100, 50)))
+                .ExpectChildMeasure(expectedInput: new Size(400, 300), returns: new FullRender(new Size(100, 50)))
                 .ExpectCanvasTranslate(new Position(300, 0))
                 .ExpectChildDraw(new Size(100, 50))
                 .ExpectCanvasTranslate(new Position(-300, 0))

QuestPDF.UnitTests/AspectRatioTests.cs

@@ -1,5 +1,5 @@
 using NUnit.Framework;
-using QuestPDF.Drawing;
+using QuestPDF.Drawing.SpacePlan;
 using QuestPDF.Elements;
 using QuestPDF.Infrastructure;
 using QuestPDF.UnitTests.TestEngine;
@@ -9,6 +9,12 @@ namespace QuestPDF.UnitTests
     [TestFixture]
     public class AspectRatioTests
     {
+        [Test]
+        public void Measure_ShouldHandleNullChild() => new AspectRatio().MeasureWithoutChild();
+        
+        [Test]
+        public void Draw_ShouldHandleNullChild() => new AspectRatio().DrawWithoutChild();
+        
         [Test]
         public void Measure_FitWidth_EnoughSpace_FullRender()
         {
@@ -20,8 +26,8 @@ namespace QuestPDF.UnitTests
                     Ratio = 2f
                 })
                 .MeasureElement(new Size(400, 201))
-                .ExpectChildMeasure(new Size(400, 200), SpacePlan.FullRender(100, 50))
-                .CheckMeasureResult(SpacePlan.FullRender(400, 200));
+                .ExpectChildMeasure(new Size(400, 200), new FullRender(100, 50))
+                .CheckMeasureResult(new FullRender(400, 200));
         }
         
         [Test]
@@ -35,8 +41,8 @@ namespace QuestPDF.UnitTests
                     Ratio = 2f
                 })
                 .MeasureElement(new Size(400, 201))
-                .ExpectChildMeasure(new Size(400, 200), SpacePlan.PartialRender(100, 50))
-                .CheckMeasureResult(SpacePlan.PartialRender(400, 200));
+                .ExpectChildMeasure(new Size(400, 200), new PartialRender(100, 50))
+                .CheckMeasureResult(new PartialRender(400, 200));
         }
         
         [Test]
@@ -50,8 +56,8 @@ namespace QuestPDF.UnitTests
                     Ratio = 2f
                 })
                 .MeasureElement(new Size(400, 201))
-                .ExpectChildMeasure(new Size(400, 200), SpacePlan.Wrap())
-                .CheckMeasureResult(SpacePlan.Wrap());
+                .ExpectChildMeasure(new Size(400, 200), new Wrap())
+                .CheckMeasureResult(new Wrap());
         }
         
         [Test]
@@ -65,8 +71,8 @@ namespace QuestPDF.UnitTests
                     Ratio = 2f
                 })
                 .MeasureElement(new Size(400, 201))
-                .ExpectChildMeasure(new Size(400, 200), SpacePlan.FullRender(100, 50))
-                .CheckMeasureResult(SpacePlan.FullRender(400, 200));
+                .ExpectChildMeasure(new Size(400, 200), new FullRender(100, 50))
+                .CheckMeasureResult(new FullRender(400, 200));
         }
 
         [Test]
@@ -80,7 +86,7 @@ namespace QuestPDF.UnitTests
                     Ratio = 2f
                 })
                 .MeasureElement(new Size(400, 199))
-                .CheckMeasureResult(SpacePlan.Wrap());
+                .CheckMeasureResult(new Wrap());
         }
         
         [Test]
@@ -94,8 +100,8 @@ namespace QuestPDF.UnitTests
                     Ratio = 2f
                 })
                 .MeasureElement(new Size(401, 200))
-                .ExpectChildMeasure(new Size(400, 200), SpacePlan.FullRender(100, 50))
-                .CheckMeasureResult(SpacePlan.FullRender(400, 200));
+                .ExpectChildMeasure(new Size(400, 200), new FullRender(100, 50))
+                .CheckMeasureResult(new FullRender(400, 200));
         }
         
         [Test]
@@ -109,7 +115,7 @@ namespace QuestPDF.UnitTests
                     Ratio = 2f
                 })
                 .MeasureElement(new Size(399, 200))
-                .CheckMeasureResult(SpacePlan.Wrap());
+                .CheckMeasureResult(new Wrap());
         }
         
         [Test]
@@ -123,8 +129,8 @@ namespace QuestPDF.UnitTests
                     Ratio = 2f
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure(new Size(400, 200), SpacePlan.FullRender(100, 50))
-                .CheckMeasureResult(SpacePlan.FullRender(400, 200));
+                .ExpectChildMeasure(new Size(400, 200), new FullRender(100, 50))
+                .CheckMeasureResult(new FullRender(400, 200));
         }
         
         [Test]
@@ -138,8 +144,8 @@ namespace QuestPDF.UnitTests
                     Ratio = 2f
                 })
                 .MeasureElement(new Size(500, 200))
-                .ExpectChildMeasure(new Size(400, 200), SpacePlan.FullRender(100, 50))
-                .CheckMeasureResult(SpacePlan.FullRender(400, 200));
+                .ExpectChildMeasure(new Size(400, 200), new FullRender(100, 50))
+                .CheckMeasureResult(new FullRender(400, 200));
         }
         
         [Test]

QuestPDF.UnitTests/BackgroundTests.cs

@@ -10,8 +10,8 @@ namespace QuestPDF.UnitTests
     public class BackgroundTests
     {
         [Test]
-        public void Measure() => SimpleContainerTests.Measure<Background>();
-        
+        public void Measure_ShouldHandleNullChild() => new Background().MeasureWithoutChild();
+
         [Test]
         public void Draw_ShouldHandleNullChild()
         {

QuestPDF.UnitTests/BorderTests.cs

@@ -1,5 +1,5 @@
 using NUnit.Framework;
-using QuestPDF.Drawing;
+using QuestPDF.Drawing.SpacePlan;
 using QuestPDF.Elements;
 using QuestPDF.Helpers;
 using QuestPDF.Infrastructure;
@@ -11,8 +11,8 @@ namespace QuestPDF.UnitTests
     public class BorderTests
     {
         [Test]
-        public void Measure() => SimpleContainerTests.Measure<Border>();
-        
+        public void Measure_ShouldHandleNullChild() => new Border().MeasureWithoutChild();
+
         [Test]
         public void ComponentShouldNotAffectLayout()
         {
@@ -27,8 +27,8 @@ namespace QuestPDF.UnitTests
                     Child = x.CreateChild()
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure(expectedInput: new Size(400, 300), returns: SpacePlan.FullRender(new Size(100, 50)))
-                .CheckMeasureResult( SpacePlan.FullRender(new Size(100, 50)));
+                .ExpectChildMeasure(expectedInput: new Size(400, 300), returns: new FullRender(new Size(100, 50)))
+                .CheckMeasureResult( new FullRender(new Size(100, 50)));
         }
         
         [Test]

QuestPDF.UnitTests/BoxTests.cs

@@ -1,56 +0,0 @@
-using NUnit.Framework;
-using QuestPDF.Drawing;
-using QuestPDF.Elements;
-using QuestPDF.Infrastructure;
-using QuestPDF.UnitTests.TestEngine;
-
-namespace QuestPDF.UnitTests
-{
-    [TestFixture]
-    public class BoxTests
-    {
-        [Test]
-        public void Measure() => SimpleContainerTests.Measure<Box>();
-        
-        [Test]
-        public void Draw_Wrap()
-        {
-            TestPlan
-                .For(x => new Box
-                {
-                    Child = x.CreateChild()
-                })
-                .DrawElement(new Size(400, 300))
-                .ExpectChildMeasure(expectedInput: new Size(400, 300), returns: SpacePlan.Wrap())
-                .CheckDrawResult();
-        }
-        
-        [Test]
-        public void Measure_PartialRender()
-        {
-            TestPlan
-                .For(x => new Box
-                {
-                    Child = x.CreateChild()
-                })
-                .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure(expectedInput: new Size(400, 300), returns: SpacePlan.PartialRender(200, 100))
-                .ExpectChildDraw(new Size(200, 100))
-                .CheckDrawResult();
-        }
-        
-        [Test]
-        public void Measure_FullRender()
-        {
-            TestPlan
-                .For(x => new Box
-                {
-                    Child = x.CreateChild()
-                })
-                .MeasureElement(new Size(500, 400))
-                .ExpectChildMeasure(expectedInput: new Size(500, 400), returns: SpacePlan.FullRender(300, 200))
-                .ExpectChildDraw(new Size(300, 200))
-                .CheckDrawResult();
-        }
-    }
-}

QuestPDF.UnitTests/ConstrainedTests.cs

@@ -1,5 +1,5 @@
 using NUnit.Framework;
-using QuestPDF.Drawing;
+using QuestPDF.Drawing.SpacePlan;
 using QuestPDF.Elements;
 using QuestPDF.Infrastructure;
 using QuestPDF.UnitTests.TestEngine;
@@ -9,8 +9,12 @@ namespace QuestPDF.UnitTests
     [TestFixture]
     public class ConstrainedTests
     {
-        #region Height
+        [Test]
+        public void Measure_ShouldHandleNullChild() => new Constrained().MeasureWithoutChild();
         
+        [Test]
+        public void Draw_ShouldHandleNullChild() => new Constrained().DrawWithoutChild();
+
         [Test]
         public void Measure_MinHeight_ExpectWrap()
         {
@@ -20,7 +24,7 @@ namespace QuestPDF.UnitTests
                     MinHeight = 100
                 })
                 .MeasureElement(new Size(400, 50))
-                .CheckMeasureResult(SpacePlan.Wrap());
+                .CheckMeasureResult(new Wrap());
         }
         
         [Test]
@@ -33,8 +37,8 @@ namespace QuestPDF.UnitTests
                     Child = x.CreateChild()
                 })
                 .MeasureElement(new Size(400, 200))
-                .ExpectChildMeasure(new Size(400, 200), SpacePlan.FullRender(400, 50))
-                .CheckMeasureResult(SpacePlan.FullRender(400, 100));
+                .ExpectChildMeasure(new Size(400, 200), new FullRender(400, 50))
+                .CheckMeasureResult(new FullRender(400, 100));
         }
         
         [Test]
@@ -47,8 +51,8 @@ namespace QuestPDF.UnitTests
                     Child = x.CreateChild()
                 })
                 .MeasureElement(new Size(400, 200))
-                .ExpectChildMeasure(new Size(400, 200), SpacePlan.FullRender(400, 150))
-                .CheckMeasureResult(SpacePlan.FullRender(400, 150));
+                .ExpectChildMeasure(new Size(400, 200), new FullRender(400, 150))
+                .CheckMeasureResult(new FullRender(400, 150));
         }
         
         [Test]
@@ -60,7 +64,7 @@ namespace QuestPDF.UnitTests
                     MaxHeight = 100
                 })
                 .MeasureElement(new Size(400, 150))
-                .CheckMeasureResult(SpacePlan.FullRender(0, 0));
+                .CheckMeasureResult(new FullRender(0, 0));
         }
         
         [Test]
@@ -73,8 +77,8 @@ namespace QuestPDF.UnitTests
                     Child = x.CreateChild()
                 })
                 .MeasureElement(new Size(400, 200))
-                .ExpectChildMeasure(new Size(400, 100), SpacePlan.PartialRender(400, 75))
-                .CheckMeasureResult(SpacePlan.PartialRender(400, 75));
+                .ExpectChildMeasure(new Size(400, 100), new PartialRender(400, 75))
+                .CheckMeasureResult(new PartialRender(400, 75));
         }
         
         [Test]
@@ -87,94 +91,8 @@ namespace QuestPDF.UnitTests
                     Child = x.CreateChild()
                 })
                 .MeasureElement(new Size(400, 200))
-                .ExpectChildMeasure(new Size(400, 100), SpacePlan.Wrap())
-                .CheckMeasureResult(SpacePlan.Wrap());
+                .ExpectChildMeasure(new Size(400, 100), new Wrap())
+                .CheckMeasureResult(new Wrap());
         }
-        
-        #endregion
-        
-        #region Width
-        
-        [Test]
-        public void Measure_MinWidth_ExpectWrap()
-        {
-            TestPlan
-                .For(x => new Constrained
-                {
-                    MinWidth = 100
-                })
-                .MeasureElement(new Size(50, 400))
-                .CheckMeasureResult(SpacePlan.Wrap());
-        }
-        
-        [Test]
-        public void Measure_MinWidth_ExtendHeight()
-        {
-            TestPlan
-                .For(x => new Constrained
-                {
-                    MinWidth = 100,
-                    Child = x.CreateChild()
-                })
-                .MeasureElement(new Size(200, 400))
-                .ExpectChildMeasure(new Size(200, 400), SpacePlan.FullRender(50, 400))
-                .CheckMeasureResult(SpacePlan.FullRender(100, 400));
-        }
-        
-        [Test]
-        public void Measure_MinWidth_PassHeight()
-        {
-            TestPlan
-                .For(x => new Constrained
-                {
-                    MinWidth = 100,
-                    Child = x.CreateChild()
-                })
-                .MeasureElement(new Size(200, 400))
-                .ExpectChildMeasure(new Size(200, 400), SpacePlan.FullRender(150, 400))
-                .CheckMeasureResult(SpacePlan.FullRender(150, 400));
-        }
-        
-        [Test]
-        public void Measure_MaxWidth_Empty()
-        {
-            TestPlan
-                .For(x => new Constrained
-                {
-                    MaxWidth = 100
-                })
-                .MeasureElement(new Size(150, 400))
-                .CheckMeasureResult(SpacePlan.FullRender(0, 0));
-        }
-        
-        [Test]
-        public void Measure_MaxWidth_PartialRender()
-        {
-            TestPlan
-                .For(x => new Constrained
-                {
-                    MaxWidth = 100,
-                    Child = x.CreateChild()
-                })
-                .MeasureElement(new Size(200, 400))
-                .ExpectChildMeasure(new Size(100, 400), SpacePlan.PartialRender(75, 400))
-                .CheckMeasureResult(SpacePlan.PartialRender(75, 400));
-        }
-        
-        [Test]
-        public void Measure_MaxWidth_ExpectWrap()
-        {
-            TestPlan
-                .For(x => new Constrained
-                {
-                    MaxWidth = 100,
-                    Child = x.CreateChild()
-                })
-                .MeasureElement(new Size(200, 400))
-                .ExpectChildMeasure(new Size(100, 400), SpacePlan.Wrap())
-                .CheckMeasureResult(SpacePlan.Wrap());
-        }
-        
-        #endregion
     }
 }

QuestPDF.UnitTests/DebugTests.cs

@@ -0,0 +1,10 @@
+using NUnit.Framework;
+
+namespace QuestPDF.UnitTests
+{
+    [TestFixture]
+    public class DebugTests
+    {
+        
+    }
+}

QuestPDF.UnitTests/DecorationTests.cs

@@ -1,5 +1,5 @@
 using NUnit.Framework;
-using QuestPDF.Drawing;
+using QuestPDF.Drawing.SpacePlan;
 using QuestPDF.Elements;
 using QuestPDF.Infrastructure;
 using QuestPDF.UnitTests.TestEngine;
@@ -15,78 +15,78 @@ namespace QuestPDF.UnitTests
         public void Measure_ReturnsWrap_WhenDecorationReturnsWrap()
         {
             TestPlan
-                .For(x => new BinaryDecoration
+                .For(x => new SimpleDecoration
                 {
                     Type = DecorationType.Append,
                     DecorationElement = x.CreateChild("decoration"),
                     ContentElement = x.CreateChild("content")
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure("decoration", new Size(400, 300), SpacePlan.Wrap())
-                .CheckMeasureResult(SpacePlan.Wrap());
+                .ExpectChildMeasure("decoration", new Size(400, 300), new Wrap())
+                .CheckMeasureResult(new Wrap());
         }
         
         [Test]
         public void Measure_ReturnsWrap_WhenDecorationReturnsPartialRender()
         {
             TestPlan
-                .For(x => new BinaryDecoration
+                .For(x => new SimpleDecoration
                 {
                     Type = DecorationType.Append,
                     DecorationElement = x.CreateChild("decoration"),
                     ContentElement = x.CreateChild("content")
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure("decoration", new Size(400, 300), SpacePlan.PartialRender(300, 200))
-                .CheckMeasureResult(SpacePlan.Wrap());
+                .ExpectChildMeasure("decoration", new Size(400, 300), new PartialRender(300, 200))
+                .CheckMeasureResult(new Wrap());
         }
         
         [Test]
         public void Measure_ReturnsWrap_WhenContentReturnsWrap()
         {
             TestPlan
-                .For(x => new BinaryDecoration
+                .For(x => new SimpleDecoration
                 {
                     Type = DecorationType.Append,
                     DecorationElement = x.CreateChild("decoration"),
                     ContentElement = x.CreateChild("content")
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure("decoration", new Size(400, 300), SpacePlan.FullRender(300, 100))
-                .ExpectChildMeasure("content", new Size(400, 200), SpacePlan.Wrap())
-                .CheckMeasureResult(SpacePlan.Wrap());
+                .ExpectChildMeasure("decoration", new Size(400, 300), new FullRender(300, 100))
+                .ExpectChildMeasure("content", new Size(400, 200), new Wrap())
+                .CheckMeasureResult(new Wrap());
         }
         
         [Test]
         public void Measure_ReturnsPartialRender_WhenContentReturnsPartialRender()
         {
             TestPlan
-                .For(x => new BinaryDecoration
+                .For(x => new SimpleDecoration
                 {
                     Type = DecorationType.Append,
                     DecorationElement = x.CreateChild("decoration"),
                     ContentElement = x.CreateChild("content")
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure("decoration", new Size(400, 300), SpacePlan.FullRender(300, 100))
-                .ExpectChildMeasure("content", new Size(400, 200), SpacePlan.PartialRender(200, 150))
-                .CheckMeasureResult(SpacePlan.PartialRender(400, 250));
+                .ExpectChildMeasure("decoration", new Size(400, 300), new FullRender(300, 100))
+                .ExpectChildMeasure("content", new Size(400, 200), new PartialRender(200, 150))
+                .CheckMeasureResult(new PartialRender(400, 250));
         }
         
         [Test]
         public void Measure_ReturnsFullRender_WhenContentReturnsFullRender()
         {
             TestPlan
-                .For(x => new BinaryDecoration
+                .For(x => new SimpleDecoration
                 {
                     Type = DecorationType.Append,
                     DecorationElement = x.CreateChild("decoration"),
                     ContentElement = x.CreateChild("content")
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure("decoration", new Size(400, 300), SpacePlan.FullRender(300, 100))
-                .ExpectChildMeasure("content", new Size(400, 200), SpacePlan.FullRender(200, 150))
-                .CheckMeasureResult(SpacePlan.FullRender(400, 250));
+                .ExpectChildMeasure("decoration", new Size(400, 300), new FullRender(300, 100))
+                .ExpectChildMeasure("content", new Size(400, 200), new FullRender(200, 150))
+                .CheckMeasureResult(new FullRender(400, 250));
         }
         
         #endregion
@@ -97,14 +97,14 @@ namespace QuestPDF.UnitTests
         public void Draw_Prepend()
         {
             TestPlan
-                .For(x => new BinaryDecoration
+                .For(x => new SimpleDecoration
                 {
                     Type = DecorationType.Prepend,
                     DecorationElement = x.CreateChild("decoration"),
                     ContentElement = x.CreateChild("content")
                 })
                 .DrawElement(new Size(400, 300))
-                .ExpectChildMeasure("decoration", new Size(400, 300), SpacePlan.FullRender(300, 100))
+                .ExpectChildMeasure("decoration", new Size(400, 300), new FullRender(300, 100))
                 .ExpectChildDraw("decoration", new Size(400, 100))
                 .ExpectCanvasTranslate(0, 100)
                 .ExpectChildDraw("content", new Size(400, 200))
@@ -116,14 +116,14 @@ namespace QuestPDF.UnitTests
         public void Draw_Append()
         {
             TestPlan
-                .For(x => new BinaryDecoration
+                .For(x => new SimpleDecoration
                 {
                     Type = DecorationType.Append,
                     DecorationElement = x.CreateChild("decoration"),
                     ContentElement = x.CreateChild("content")
                 })
                 .DrawElement(new Size(400, 300))
-                .ExpectChildMeasure("decoration", new Size(400, 300), SpacePlan.FullRender(300, 100))
+                .ExpectChildMeasure("decoration", new Size(400, 300), new FullRender(300, 100))
                 .ExpectChildDraw("content", new Size(400, 200))
                 .ExpectCanvasTranslate(0, 200)
                 .ExpectChildDraw("decoration", new Size(400, 100))

QuestPDF.UnitTests/DynamicImageTests.cs

@@ -1,6 +1,6 @@
 using FluentAssertions;
 using NUnit.Framework;
-using QuestPDF.Drawing;
+using QuestPDF.Drawing.SpacePlan;
 using QuestPDF.Elements;
 using QuestPDF.Infrastructure;
 using QuestPDF.UnitTests.TestEngine;
@@ -20,7 +20,7 @@ namespace QuestPDF.UnitTests
                     Source = GenerateImage
                 })
                 .MeasureElement(new Size(300, 200))
-                .CheckMeasureResult(SpacePlan.FullRender(300, 200));
+                .CheckMeasureResult(new FullRender(300, 200));
         }
         
         [Test]
@@ -51,7 +51,7 @@ namespace QuestPDF.UnitTests
         [Test]
         public void Draw_PassesCorrectSizeToSource()
         {
-            Size passedSize = default;
+            Size passedSize = null;
 
             TestPlan
                 .For(x => new DynamicImage
@@ -66,7 +66,7 @@ namespace QuestPDF.UnitTests
                 .ExpectCanvasDrawImage(Position.Zero, new Size(400, 300))
                 .CheckDrawResult();
             
-            passedSize.Should().BeEquivalentTo(new Size(400, 300));
+            passedSize.Should().Be(new Size(400, 300));
         }
         
         byte[] GenerateImage(Size size)

QuestPDF.UnitTests/EnsureSpaceTests.cs

@@ -1,5 +1,5 @@
 using NUnit.Framework;
-using QuestPDF.Drawing;
+using QuestPDF.Drawing.SpacePlan;
 using QuestPDF.Elements;
 using QuestPDF.Infrastructure;
 using QuestPDF.UnitTests.TestEngine;
@@ -19,8 +19,8 @@ namespace QuestPDF.UnitTests
                     MinHeight = 200
                 })
                 .MeasureElement(new Size(400, 100))
-                .ExpectChildMeasure(new Size(400, 100), SpacePlan.Wrap())
-                .CheckMeasureResult(SpacePlan.Wrap());
+                .ExpectChildMeasure(new Size(400, 100), new Wrap())
+                .CheckMeasureResult(new Wrap());
         }
         
         [Test]
@@ -33,8 +33,8 @@ namespace QuestPDF.UnitTests
                     MinHeight = 200
                 })
                 .MeasureElement(new Size(400, 100))
-                .ExpectChildMeasure(new Size(400, 100), SpacePlan.PartialRender(300, 50))
-                .CheckMeasureResult(SpacePlan.Wrap());
+                .ExpectChildMeasure(new Size(400, 100), new PartialRender(300, 50))
+                .CheckMeasureResult(new Wrap());
         }
         
         [Test]
@@ -47,8 +47,8 @@ namespace QuestPDF.UnitTests
                     MinHeight = 200
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure(new Size(400, 300), SpacePlan.PartialRender(300, 250))
-                .CheckMeasureResult(SpacePlan.PartialRender(300, 250));
+                .ExpectChildMeasure(new Size(400, 300), new PartialRender(300, 250))
+                .CheckMeasureResult(new PartialRender(300, 250));
         }
         
         [Test]
@@ -61,8 +61,8 @@ namespace QuestPDF.UnitTests
                     MinHeight = 200
                 })
                 .MeasureElement(new Size(400, 100))
-                .ExpectChildMeasure(new Size(400, 100), SpacePlan.FullRender(300, 50))
-                .CheckMeasureResult(SpacePlan.FullRender(300, 50));
+                .ExpectChildMeasure(new Size(400, 100), new FullRender(300, 50))
+                .CheckMeasureResult(new FullRender(300, 50));
         }
         
         [Test]
@@ -75,11 +75,8 @@ namespace QuestPDF.UnitTests
                     MinHeight = 200
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure(new Size(400, 300), SpacePlan.FullRender(300, 250))
-                .CheckMeasureResult(SpacePlan.FullRender(300, 250));
+                .ExpectChildMeasure(new Size(400, 300), new FullRender(300, 250))
+                .CheckMeasureResult(new FullRender(300, 250));
         }
-        
-        [Test]
-        public void Draw() => SimpleContainerTests.Draw<EnsureSpace>();
     }
 }

QuestPDF.UnitTests/ExtendTests.cs

@@ -1,5 +1,5 @@
 using NUnit.Framework;
-using QuestPDF.Drawing;
+using QuestPDF.Drawing.SpacePlan;
 using QuestPDF.Elements;
 using QuestPDF.Infrastructure;
 using QuestPDF.UnitTests.TestEngine;
@@ -9,6 +9,12 @@ namespace QuestPDF.UnitTests
     [TestFixture]
     public class ExtendTests
     {
+        [Test]
+        public void Measure_ShouldHandleNullChild() => new Extend().MeasureWithoutChild();
+        
+        [Test]
+        public void Draw_ShouldHandleNullChild() => new Extend().DrawWithoutChild();
+        
         [Test]
         public void Measure_ReturnsWrap_WhenChildReturnsWrap()
         {
@@ -18,8 +24,8 @@ namespace QuestPDF.UnitTests
                     Child = x.CreateChild()
                 })
                 .MeasureElement(new Size(400, 200))
-                .ExpectChildMeasure(new Size(400, 200), SpacePlan.Wrap())
-                .CheckMeasureResult(SpacePlan.Wrap());
+                .ExpectChildMeasure(new Size(400, 200), new Wrap())
+                .CheckMeasureResult(new Wrap());
         }
         
         [Test]
@@ -33,8 +39,8 @@ namespace QuestPDF.UnitTests
                     ExtendVertical = true
                 })
                 .MeasureElement(new Size(400, 200))
-                .ExpectChildMeasure(new Size(400, 200), SpacePlan.PartialRender(300, 100))
-                .CheckMeasureResult(SpacePlan.PartialRender(400, 200));
+                .ExpectChildMeasure(new Size(400, 200), new PartialRender(300, 100))
+                .CheckMeasureResult(new PartialRender(400, 200));
         }
         
         [Test]
@@ -48,8 +54,8 @@ namespace QuestPDF.UnitTests
                     ExtendVertical = true
                 })
                 .MeasureElement(new Size(400, 200))
-                .ExpectChildMeasure(new Size(400, 200), SpacePlan.FullRender(300, 100))
-                .CheckMeasureResult(SpacePlan.FullRender(400, 200));
+                .ExpectChildMeasure(new Size(400, 200), new FullRender(300, 100))
+                .CheckMeasureResult(new FullRender(400, 200));
         }
         
         [Test]
@@ -63,8 +69,8 @@ namespace QuestPDF.UnitTests
                     ExtendVertical = false
                 })
                 .MeasureElement(new Size(400, 200))
-                .ExpectChildMeasure(new Size(400, 200), SpacePlan.FullRender(100, 100))
-                .CheckMeasureResult(SpacePlan.FullRender(400, 100));
+                .ExpectChildMeasure(new Size(400, 200), new FullRender(100, 100))
+                .CheckMeasureResult(new FullRender(400, 100));
         }
         
         [Test]
@@ -78,11 +84,8 @@ namespace QuestPDF.UnitTests
                     ExtendVertical = true
                 })
                 .MeasureElement(new Size(400, 200))
-                .ExpectChildMeasure(new Size(400, 200), SpacePlan.FullRender(100, 100))
-                .CheckMeasureResult(SpacePlan.FullRender(100, 200));
+                .ExpectChildMeasure(new Size(400, 200), new FullRender(100, 100))
+                .CheckMeasureResult(new FullRender(100, 200));
         }
-
-        [Test]
-        public void Draw() => SimpleContainerTests.Draw<Extend>();
     }
 }

QuestPDF.UnitTests/ExternalLinkTests.cs

@@ -1,15 +0,0 @@
-using NUnit.Framework;
-using QuestPDF.Elements;
-using QuestPDF.UnitTests.TestEngine;
-
-namespace QuestPDF.UnitTests
-{
-    [TestFixture]
-    public class ExternalLinkTests
-    {
-        [Test]
-        public void Measure() => SimpleContainerTests.Measure<ExternalLink>();
-        
-        // TODO: consider tests for the Draw method
-    }
-}

QuestPDF.UnitTests/GridTests.cs

@@ -1,4 +1,5 @@
 using FluentAssertions;
+using FluentAssertions.Equivalency;
 using NUnit.Framework;
 using QuestPDF.Elements;
 using QuestPDF.Fluent;
@@ -39,30 +40,30 @@ namespace QuestPDF.UnitTests
             // assert
             var expected = new Container();
             
-            expected.Stack(stack =>
+            expected.Container().Stack(stack =>
             {
                 stack.Item().Row(row =>
                 {
-                    row.RelativeColumn(6).Element(childA);
-                    row.RelativeColumn(4).Element(childB);
+                    row.RelativeColumn(6).Container().Element(childA);
+                    row.RelativeColumn(4).Container().Element(childB);
                     row.RelativeColumn(2);
                 });
                 
                 stack.Item().Row(row =>
                 {
-                    row.RelativeColumn(4).Element(childC);
-                    row.RelativeColumn(2).Element(childD);
+                    row.RelativeColumn(4).Container().Element(childC);
+                    row.RelativeColumn(2).Container().Element(childD);
                     row.RelativeColumn(6);
                 });
                 
                 stack.Item().Row(row =>
                 {
-                    row.RelativeColumn(8).Element(childE);
+                    row.RelativeColumn(8).Container().Element(childE);
                     row.RelativeColumn(4);
                 });
             });
             
-            TestPlan.CompareOperations(structure, expected);
+            structure.Should().BeEquivalentTo(expected, o => o.WithTracing().WithAutoConversion().WithStrictOrdering().IncludingAllRuntimeProperties());
         }
         
         [Test]
@@ -93,33 +94,33 @@ namespace QuestPDF.UnitTests
             // assert
             var expected = new Container();
             
-            expected.Stack(stack =>
+            expected.Container().Stack(stack =>
             {
                 stack.Item().Row(row =>
                 {
                     row.RelativeColumn(1);
-                    row.RelativeColumn(6).Element(childA);
-                    row.RelativeColumn(4).Element(childB);
+                    row.RelativeColumn(6).Container().Element(childA);
+                    row.RelativeColumn(4).Container().Element(childB);
                     row.RelativeColumn(1);
                 });
                 
                 stack.Item().Row(row =>
                 {
                     row.RelativeColumn(3);
-                    row.RelativeColumn(4).Element(childC);
-                    row.RelativeColumn(2).Element(childD);
+                    row.RelativeColumn(4).Container().Element(childC);
+                    row.RelativeColumn(2).Container().Element(childD);
                     row.RelativeColumn(3);
                 });
                 
                 stack.Item().Row(row =>
                 {
                     row.RelativeColumn(2);
-                    row.RelativeColumn(8).Element(childE);
+                    row.RelativeColumn(8).Container().Element(childE);
                     row.RelativeColumn(2);
                 });
             });
 
-            TestPlan.CompareOperations(structure, expected);
+            structure.Should().BeEquivalentTo(expected, o => o.WithTracing().WithAutoConversion().WithStrictOrdering().IncludingAllRuntimeProperties());
         }
         
         [Test]
@@ -150,30 +151,30 @@ namespace QuestPDF.UnitTests
             // assert
             var expected = new Container();
             
-            expected.Stack(stack =>
+            expected.Container().Stack(stack =>
             {
                 stack.Item().Row(row =>
                 {
                     row.RelativeColumn(2);
-                    row.RelativeColumn(6).Element(childA);
-                    row.RelativeColumn(4).Element(childB);
+                    row.RelativeColumn(6).Container().Element(childA);
+                    row.RelativeColumn(4).Container().Element(childB);
                 });
                 
                 stack.Item().Row(row =>
                 {
                     row.RelativeColumn(6);
-                    row.RelativeColumn(4).Element(childC);
-                    row.RelativeColumn(2).Element(childD);
+                    row.RelativeColumn(4).Container().Element(childC);
+                    row.RelativeColumn(2).Container().Element(childD);
                 });
                 
                 stack.Item().Row(row =>
                 {
                     row.RelativeColumn(4);
-                    row.RelativeColumn(8).Element(childE);
+                    row.RelativeColumn(8).Container().Element(childE);
                 });
             });
             
-            TestPlan.CompareOperations(structure, expected);
+            structure.Should().BeEquivalentTo(expected, o => o.WithTracing().WithAutoConversion().WithStrictOrdering().IncludingAllRuntimeProperties());
         }
         
         #endregion
@@ -210,7 +211,7 @@ namespace QuestPDF.UnitTests
             // assert
             var expected = new Container();
             
-            expected.Stack(stack =>
+            expected.Container().Stack(stack =>
             {
                 stack.Spacing(20);
                 
@@ -219,8 +220,8 @@ namespace QuestPDF.UnitTests
                     row.Spacing(30);
                     
                     row.RelativeColumn(3);
-                    row.RelativeColumn(5).Element(childA);
-                    row.RelativeColumn(5).Element(childB);
+                    row.RelativeColumn(5).Container().Element(childA);
+                    row.RelativeColumn(5).Container().Element(childB);
                     row.RelativeColumn(3);
                 });
                 
@@ -229,7 +230,7 @@ namespace QuestPDF.UnitTests
                     row.Spacing(30);
                     
                     row.RelativeColumn(3);
-                    row.RelativeColumn(10).Element(childC);
+                    row.RelativeColumn(10).Container().Element(childC);
                     row.RelativeColumn(3);
                 });
                 
@@ -238,12 +239,12 @@ namespace QuestPDF.UnitTests
                     row.Spacing(30);
                     
                     row.RelativeColumn(2);
-                    row.RelativeColumn(12).Element(childD);
+                    row.RelativeColumn(12).Container().Element(childD);
                     row.RelativeColumn(2);
                 });
             });
             
-            TestPlan.CompareOperations(structure, expected);
+            structure.Should().BeEquivalentTo(expected, o => o.WithTracing().WithAutoConversion().WithStrictOrdering().IncludingAllRuntimeProperties().AllowingInfiniteRecursion());
         }
         
         #endregion

QuestPDF.UnitTests/Helpers.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using FluentAssertions;
+using QuestPDF.Infrastructure;
+using QuestPDF.UnitTests.TestEngine;
+
+namespace QuestPDF.UnitTests
+{
+    public static class Helpers
+    {
+        public static Random Random = new Random();
+        
+        public static Size RandomSize => new Size(Random.Next(200, 400), Random.Next(100, 200));
+
+        public static void ShouldEqual(this IEnumerable<OperationBase> commands, IEnumerable<OperationBase> expected)
+        {
+            commands.Should().HaveSameCount(expected);
+            
+            commands
+                .Zip(expected)
+                .ToList()
+                .ForEach(x =>
+                {
+                    x.First.Should().BeOfType(x.Second.GetType());
+                    x.First.Should().BeEquivalentTo(x.Second, y => y.RespectingRuntimeTypes());
+                });
+        }
+    }
+}

QuestPDF.UnitTests/ImageTests.cs

@@ -1,5 +1,5 @@
 using NUnit.Framework;
-using QuestPDF.Drawing;
+using QuestPDF.Drawing.SpacePlan;
 using QuestPDF.Elements;
 using QuestPDF.Fluent;
 using QuestPDF.Infrastructure;
@@ -11,6 +11,12 @@ namespace QuestPDF.UnitTests
     [TestFixture]
     public class ImageTests
     {
+        [Test]
+        public void Measure_ShouldHandleNullChild() => new AspectRatio().MeasureWithoutChild();
+        
+        [Test]
+        public void Draw_ShouldHandleNullChild() => new AspectRatio().DrawWithoutChild();
+        
         [Test]
         public void Measure_TakesAvailableSpaceRegardlessOfSize()
         {
@@ -20,7 +26,7 @@ namespace QuestPDF.UnitTests
                     InternalImage = GenerateImage(400, 300)
                 })
                 .MeasureElement(new Size(300, 200))
-                .CheckMeasureResult(SpacePlan.FullRender(300, 200));
+                .CheckMeasureResult(new FullRender(300, 200));
         }
         
         [Test]
@@ -49,7 +55,7 @@ namespace QuestPDF.UnitTests
                     return container;
                 })
                 .MeasureElement(new Size(300, 200))
-                .CheckMeasureResult(SpacePlan.FullRender(300, 100));;
+                .CheckMeasureResult(new FullRender(300, 100));;
         }
         
         SKImage GenerateImage(int width, int height)

QuestPDF.UnitTests/InternalLinkTests.cs

@@ -1,15 +0,0 @@
-using NUnit.Framework;
-using QuestPDF.Elements;
-using QuestPDF.UnitTests.TestEngine;
-
-namespace QuestPDF.UnitTests
-{
-    [TestFixture]
-    public class InternalLinkTests
-    {
-        [Test]
-        public void Measure() => SimpleContainerTests.Measure<InternalLink>();
-        
-        // TODO: consider tests for the Draw method
-    }
-}

QuestPDF.UnitTests/InternalLocationTests.cs

@@ -1,15 +0,0 @@
-using NUnit.Framework;
-using QuestPDF.Elements;
-using QuestPDF.UnitTests.TestEngine;
-
-namespace QuestPDF.UnitTests
-{
-    [TestFixture]
-    public class InternalLocationTests
-    {
-        [Test]
-        public void Measure() => SimpleContainerTests.Measure<InternalLink>();
-        
-        // TODO: consider tests for the Draw method
-    }
-}

QuestPDF.UnitTests/LayersTests.cs

@@ -1,131 +0,0 @@
-using System.Collections.Generic;
-using NUnit.Framework;
-using QuestPDF.Drawing;
-using QuestPDF.Elements;
-using QuestPDF.Infrastructure;
-using QuestPDF.UnitTests.TestEngine;
-
-namespace QuestPDF.UnitTests
-{
-    [TestFixture]
-    public class LayersTests
-    {
-        private const string BackgroundLayer = "background";
-        private const string MainLayer = "main";
-        private const string ForegroundLayer = "foreground";
-        
-        private static Layers GetLayers(TestPlan x)
-        {
-            return new Layers
-            {
-                Children = new List<Layer>
-                {
-                    new Layer
-                    {
-                        Child = x.CreateChild(BackgroundLayer)
-                    },
-                    new Layer
-                    {
-                        Child = x.CreateChild(MainLayer),
-                        IsPrimary = true
-                    },
-                    new Layer
-                    {
-                        Child = x.CreateChild(ForegroundLayer)
-                    }
-                }
-            };
-        }
-        
-        #region measure
-        
-        [Test]
-        public void Measure_Wrap()
-        {
-            TestPlan
-                .For(GetLayers)
-                .MeasureElement(new Size(800, 600))
-                .ExpectChildMeasure(MainLayer, new Size(800, 600), SpacePlan.Wrap())
-                .CheckMeasureResult(SpacePlan.Wrap());
-        }
-
-        [Test]
-        public void Measure_PartialRender()
-        {
-            TestPlan
-                .For(GetLayers)
-                .MeasureElement(new Size(800, 600))
-                .ExpectChildMeasure(MainLayer, new Size(800, 600), SpacePlan.PartialRender(700, 500))
-                .CheckMeasureResult(SpacePlan.PartialRender(700, 500));
-        }
-        
-        [Test]
-        public void Measure_FullRender()
-        {
-            TestPlan
-                .For(GetLayers)
-                .MeasureElement(new Size(800, 600))
-                .ExpectChildMeasure(MainLayer, new Size(800, 600), SpacePlan.FullRender(500, 400))
-                .CheckMeasureResult(SpacePlan.FullRender(500, 400));
-        }
-        
-        #endregion
-        
-        #region draw
-        
-        [Test]
-        public void Draw_Simple()
-        {
-            TestPlan
-                .For(GetLayers)
-                .MeasureElement(new Size(800, 600))
-                
-                .ExpectChildMeasure(BackgroundLayer, new Size(800, 600), SpacePlan.FullRender(100, 200))
-                .ExpectChildMeasure(MainLayer, new Size(800, 600), SpacePlan.PartialRender(200, 300))
-                .ExpectChildMeasure(ForegroundLayer, new Size(800, 600), SpacePlan.FullRender(300, 400))
-                
-                
-                .ExpectChildDraw(BackgroundLayer, new Size(800, 600))
-                .ExpectChildDraw(MainLayer, new Size(800, 600))
-                .ExpectChildDraw(ForegroundLayer, new Size(800, 600))
-                
-                .CheckDrawResult();
-        }
-        
-        [Test]
-        public void Draw_WhenSecondaryLayerReturnsWrap_SkipThatLayer_1()
-        {
-            TestPlan
-                .For(GetLayers)
-                .MeasureElement(new Size(800, 600))
-                
-                .ExpectChildMeasure(BackgroundLayer, new Size(800, 600), SpacePlan.PartialRender(100, 200))
-                .ExpectChildMeasure(MainLayer, new Size(800, 600), SpacePlan.PartialRender(200, 300))
-                .ExpectChildMeasure(ForegroundLayer, new Size(800, 600), SpacePlan.Wrap())
-                
-                .ExpectChildDraw(BackgroundLayer, new Size(800, 600))
-                .ExpectChildDraw(MainLayer, new Size(800, 600))
-                
-                .CheckDrawResult();
-        }
-        
-        [Test]
-        public void Draw_WhenSecondaryLayerReturnsWrap_SkipThatLayer_2()
-        {
-            TestPlan
-                .For(GetLayers)
-                .MeasureElement(new Size(800, 600))
-                
-                .ExpectChildMeasure(BackgroundLayer, new Size(800, 600), SpacePlan.Wrap())
-                .ExpectChildMeasure(MainLayer, new Size(800, 600), SpacePlan.PartialRender(200, 300))
-                .ExpectChildMeasure(ForegroundLayer, new Size(800, 600), SpacePlan.PartialRender(300, 400))
-                
-                .ExpectChildDraw(MainLayer, new Size(800, 600))
-                .ExpectChildDraw(ForegroundLayer, new Size(800, 600))
-                
-                .CheckDrawResult();
-        }
-        
-        #endregion
-    }
-}

QuestPDF.UnitTests/PaddingTests.cs

@@ -1,5 +1,5 @@
 using NUnit.Framework;
-using QuestPDF.Drawing;
+using QuestPDF.Drawing.SpacePlan;
 using QuestPDF.Elements;
 using QuestPDF.Infrastructure;
 using QuestPDF.UnitTests.TestEngine;
@@ -9,6 +9,12 @@ namespace QuestPDF.UnitTests
     [TestFixture]
     public class PaddingTests
     {
+        [Test]
+        public void Measure_ShouldHandleNullChild() => new Padding().MeasureWithoutChild();
+        
+        [Test]
+        public void Draw_ShouldHandleNullChild() => new Padding().DrawWithoutChild();
+        
         private Padding GetPadding(TestPlan plan)
         {
             return new Padding()
@@ -28,8 +34,8 @@ namespace QuestPDF.UnitTests
             TestPlan
                 .For(GetPadding)
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure(new Size(340, 260), SpacePlan.FullRender(140, 60))
-                .CheckMeasureResult(SpacePlan.FullRender(200, 100));
+                .ExpectChildMeasure(new Size(340, 260), new FullRender(140, 60))
+                .CheckMeasureResult(new FullRender(200, 100));
         } 
         
         [Test]
@@ -38,7 +44,7 @@ namespace QuestPDF.UnitTests
             TestPlan
                 .For(GetPadding)
                 .MeasureElement(new Size(50, 300))
-                .CheckMeasureResult(SpacePlan.Wrap());
+                .CheckMeasureResult(new Wrap());
         }
         
         [Test]
@@ -47,7 +53,7 @@ namespace QuestPDF.UnitTests
             TestPlan
                 .For(GetPadding)
                 .MeasureElement(new Size(20, 300))
-                .CheckMeasureResult(SpacePlan.Wrap());
+                .CheckMeasureResult(new Wrap());
         }
         
         [Test]
@@ -56,8 +62,8 @@ namespace QuestPDF.UnitTests
             TestPlan
                 .For(GetPadding)
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure(new Size(340, 260), SpacePlan.PartialRender(40, 160))
-                .CheckMeasureResult(SpacePlan.PartialRender(100, 200));
+                .ExpectChildMeasure(new Size(340, 260), new PartialRender(40, 160))
+                .CheckMeasureResult(new PartialRender(100, 200));
         }
         
         [Test]
@@ -66,8 +72,8 @@ namespace QuestPDF.UnitTests
             TestPlan
                 .For(GetPadding)
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure(new Size(340, 260), SpacePlan.Wrap())
-                .CheckMeasureResult(SpacePlan.Wrap());
+                .ExpectChildMeasure(new Size(340, 260), new Wrap())
+                .CheckMeasureResult(new Wrap());
         }
         
         [Test]

QuestPDF.UnitTests/PageBreakTests.cs

@@ -1,5 +1,5 @@
 using NUnit.Framework;
-using QuestPDF.Drawing;
+using QuestPDF.Drawing.SpacePlan;
 using QuestPDF.Elements;
 using QuestPDF.Infrastructure;
 using QuestPDF.UnitTests.TestEngine;
@@ -16,13 +16,13 @@ namespace QuestPDF.UnitTests
                 .For(x => new PageBreak())
                 
                 .MeasureElement(new Size(400, 300))
-                .CheckMeasureResult(SpacePlan.PartialRender(Size.Zero))
+                .CheckMeasureResult(new PartialRender(400, 300))
                 
                 .DrawElement(new Size(400, 300))
                 .CheckDrawResult()
                 
                 .MeasureElement(new Size(500, 400))
-                .CheckMeasureResult(SpacePlan.FullRender(0, 0));
+                .CheckMeasureResult(new FullRender(Size.Zero));
         }
     }
 }

QuestPDF.UnitTests/PageNumberTests.cs

@@ -0,0 +1,10 @@
+using NUnit.Framework;
+
+namespace QuestPDF.UnitTests
+{
+    [TestFixture]
+    public class PageNumberTests
+    {
+
+    }
+}

QuestPDF.UnitTests/QuestPDF.UnitTests.csproj

@@ -6,11 +6,12 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="FluentAssertions" Version="6.1.0" />
-        <PackageReference Include="nunit" Version="3.13.2" />
-        <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
+        <PackageReference Include="FluentAssertions" Version="5.10.3" />
+        <PackageReference Include="Moq" Version="4.13.1" />
+        <PackageReference Include="nunit" Version="3.13.1" />
+        <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
-        <PackageReference Include="SkiaSharp" Version="2.80.3" />
+        <PackageReference Include="SkiaSharp" Version="2.80.2" />
     </ItemGroup>
 
     <ItemGroup>

QuestPDF.UnitTests/RotateTests.cs

@@ -1,30 +0,0 @@
-using NUnit.Framework;
-using QuestPDF.Elements;
-using QuestPDF.Infrastructure;
-using QuestPDF.UnitTests.TestEngine;
-
-namespace QuestPDF.UnitTests
-{
-    [TestFixture]
-    public class RotateTests
-    {
-        [Test]
-        public void Measure() => SimpleContainerTests.Measure<Rotate>();
-
-        [Test]
-        public void Draw()
-        {
-            TestPlan
-                .For(x => new Rotate
-                {
-                    Child = x.CreateChild(),
-                    Angle = 123
-                })
-                .DrawElement(new Size(400, 300))
-                .ExpectCanvasRotate(123)
-                .ExpectChildDraw(new Size(400, 300))
-                .ExpectCanvasRotate(-123)
-                .CheckDrawResult();
-        } 
-    }
-}

QuestPDF.UnitTests/RowTests.cs

@@ -1,7 +1,6 @@
 using NUnit.Framework;
-using QuestPDF.Drawing;
+using QuestPDF.Drawing.SpacePlan;
 using QuestPDF.Elements;
-using QuestPDF.Fluent;
 using QuestPDF.Infrastructure;
 using QuestPDF.UnitTests.TestEngine;
 
@@ -16,74 +15,74 @@ namespace QuestPDF.UnitTests
         public void Measure_ReturnsWrap_WhenLeftChildReturnsWrap()
         {
             TestPlan
-                .For(x => new BinaryRow
+                .For(x => new SimpleRow
                 {
                     Left = x.CreateChild("left"),
                     Right = x.CreateChild("right")
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure("left", new Size(400, 300), SpacePlan.Wrap())
-                .CheckMeasureResult(SpacePlan.Wrap());
+                .ExpectChildMeasure("left", new Size(400, 300), new Wrap())
+                .CheckMeasureResult(new Wrap());
         }
         
         [Test]
         public void Measure_ReturnsWrap_WhenRightChildReturnsWrap()
         {
             TestPlan
-                .For(x => new BinaryRow
+                .For(x => new SimpleRow
                 {
                     Left = x.CreateChild("left"),
                     Right = x.CreateChild("right")
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure("left", new Size(400, 300), SpacePlan.FullRender(250, 150))
-                .ExpectChildMeasure("right", new Size(150, 300), SpacePlan.Wrap())
-                .CheckMeasureResult(SpacePlan.Wrap());
+                .ExpectChildMeasure("left", new Size(400, 300), new FullRender(250, 150))
+                .ExpectChildMeasure("right", new Size(150, 300), new Wrap())
+                .CheckMeasureResult(new Wrap());
         }
         
         [Test]
         public void Measure_ReturnsPartialRender_WhenLeftChildReturnsPartialRender()
         {
             TestPlan
-                .For(x => new BinaryRow
+                .For(x => new SimpleRow
                 {
                     Left = x.CreateChild("left"),
                     Right = x.CreateChild("right")
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure("left", new Size(400, 300), SpacePlan.PartialRender(250, 150))
-                .ExpectChildMeasure("right", new Size(150, 300), SpacePlan.FullRender(100, 100))
-                .CheckMeasureResult(SpacePlan.PartialRender(350, 150));
+                .ExpectChildMeasure("left", new Size(400, 300), new PartialRender(250, 150))
+                .ExpectChildMeasure("right", new Size(150, 300), new FullRender(100, 100))
+                .CheckMeasureResult(new PartialRender(350, 150));
         }
         
         [Test]
         public void Measure_ReturnsPartialRender_WhenRightChildReturnsPartialRender()
         {
             TestPlan
-                .For(x => new BinaryRow
+                .For(x => new SimpleRow
                 {
                     Left = x.CreateChild("left"),
                     Right = x.CreateChild("right")
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure("left", new Size(400, 300), SpacePlan.FullRender(250, 150))
-                .ExpectChildMeasure("right", new Size(150, 300), SpacePlan.PartialRender(100, 100))
-                .CheckMeasureResult(SpacePlan.PartialRender(350, 150));
+                .ExpectChildMeasure("left", new Size(400, 300), new FullRender(250, 150))
+                .ExpectChildMeasure("right", new Size(150, 300), new PartialRender(100, 100))
+                .CheckMeasureResult(new PartialRender(350, 150));
         }
         
         [Test]
         public void Measure_ReturnsFullRender_WhenBothChildrenReturnFullRender()
         {
             TestPlan
-                .For(x => new BinaryRow
+                .For(x => new SimpleRow
                 {
                     Left = x.CreateChild("left"),
                     Right = x.CreateChild("right")
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure("left", new Size(400, 300), SpacePlan.FullRender(200, 150))
-                .ExpectChildMeasure("right", new Size(200, 300), SpacePlan.FullRender(100, 100))
-                .CheckMeasureResult(SpacePlan.FullRender(300, 150));
+                .ExpectChildMeasure("left", new Size(400, 300), new FullRender(200, 150))
+                .ExpectChildMeasure("right", new Size(200, 300), new FullRender(100, 100))
+                .CheckMeasureResult(new FullRender(300, 150));
         }
         
         #endregion
@@ -94,13 +93,13 @@ namespace QuestPDF.UnitTests
         public void Draw()
         {
             TestPlan
-                .For(x => new BinaryRow
+                .For(x => new SimpleRow
                 {
                     Left = x.CreateChild("left"),
                     Right = x.CreateChild("right")
                 })
                 .DrawElement(new Size(400, 300))
-                .ExpectChildMeasure("left", new Size(400, 300), SpacePlan.FullRender(250, 150))
+                .ExpectChildMeasure("left", new Size(400, 300), new FullRender(250, 150))
                 .ExpectChildDraw("left", new Size(250, 300))
                 .ExpectCanvasTranslate(250, 0)
                 .ExpectChildDraw("right", new Size(150, 300))
@@ -110,158 +109,8 @@ namespace QuestPDF.UnitTests
 
         #endregion
         
-        #region Structure
-        
-        [Test]
-        public void Structure_RelativeColumnsHandling()
-        { 
-            // arrange
-            var childA = TestPlan.CreateUniqueElement();
-            var childB = TestPlan.CreateUniqueElement();
-            var childC = TestPlan.CreateUniqueElement();
-            var childD = TestPlan.CreateUniqueElement();
-            var childE = TestPlan.CreateUniqueElement();
-
-            const int spacing = 25;
-            var availableSpace = new Size(1100, 400);
-            
-            // act
-            var value = new Container();
-
-            value.Row(row =>
-            {
-                row.Spacing(spacing);
-                
-                row.ConstantColumn(150).Element(childA);
-                row.ConstantColumn(250).Element(childB);
-                row.RelativeColumn(1).Element(childC);
-                row.RelativeColumn(2).Element(childD);
-                row.RelativeColumn(3).Element(childE);
-            });
-            
-            // assert
-            var expected = new Container();
-
-            expected.Row(row =>
-            {
-                row.Spacing(spacing);
-                
-                row.ConstantColumn(150).Element(childA);
-                row.ConstantColumn(250).Element(childB);
-                row.ConstantColumn(100).Element(childC);
-                row.ConstantColumn(200).Element(childD);
-                row.ConstantColumn(300).Element(childE);
-            });
-            
-            TestPlan.CompareOperations(value, expected, availableSpace);
-        }
-        
-        [Test]
-        public void Structure_Tree()
-        { 
-            // arrange
-            var childA = TestPlan.CreateUniqueElement();
-            var childB = TestPlan.CreateUniqueElement();
-            var childC = TestPlan.CreateUniqueElement();
-            var childD = TestPlan.CreateUniqueElement();
-            var childE = TestPlan.CreateUniqueElement();
-
-            const int spacing = 25;
-            var availableSpace = new Size(1200, 400);
-            
-            // act
-            var value = new Container();
-
-            value.Row(row =>
-            {
-                row.Spacing(spacing);
-                
-                row.ConstantColumn(150).Element(childA);
-                row.ConstantColumn(200).Element(childB);
-                row.ConstantColumn(250).Element(childC);
-                row.RelativeColumn(2).Element(childD);
-                row.RelativeColumn(3).Element(childE);
-            });
-            
-            // assert
-            var expected = new BinaryRow
-            {
-                Left = new BinaryRow
-                {
-                    Left = new BinaryRow
-                    {
-                        Left = new Constrained
-                        {
-                            MinWidth = 150,
-                            MaxWidth = 150,
-                            Child = childA
-                        },
-                        Right = new Constrained
-                        {
-                            MinWidth = 25,
-                            MaxWidth = 25
-                        }
-                    },
-                    Right = new BinaryRow
-                    {
-                        Left = new Constrained
-                        {
-                            MinWidth = 200,
-                            MaxWidth = 200,
-                            Child = childB
-                        },
-                        Right = new Constrained
-                        {
-                            MinWidth = 25,
-                            MaxWidth = 25
-                        }
-                    }
-                },
-                Right = new BinaryRow
-                {
-                    Left = new BinaryRow
-                    {
-                        Left = new Constrained
-                        {
-                            MinWidth = 250,
-                            MaxWidth = 250,
-                            Child = childC
-                        },
-                        Right = new Constrained
-                        {
-                            MinWidth = 25,
-                            MaxWidth = 25
-                        }
-                    },
-                    Right = new BinaryRow
-                    {
-                        Left = new Constrained
-                        {
-                            MinWidth = 200,
-                            MaxWidth = 200,
-                            Child = childD
-                        },
-                        Right = new BinaryRow
-                        {
-                            Left = new Constrained
-                            {
-                                MinWidth = 25,
-                                MaxWidth = 25
-                            },
-                            Right = new Constrained
-                            {
-                                MinWidth = 300,
-                                MaxWidth = 300,
-                                Child = childE
-                            }
-                        }
-                    }
-                }
-            };
-            
-            TestPlan.CompareOperations(value, expected, availableSpace);
-        }
-        
-        #endregion
+        // TODO: add tests for the spacing property
+        // TODO: add tests for the tree builder method
+        // TODO: add tests for relative column
     }
 }

QuestPDF.UnitTests/ScaleTests.cs

@@ -1,152 +0,0 @@
-using NUnit.Framework;
-using QuestPDF.Drawing;
-using QuestPDF.Elements;
-using QuestPDF.Infrastructure;
-using QuestPDF.UnitTests.TestEngine;
-
-namespace QuestPDF.UnitTests
-{
-    [TestFixture]
-    public class ScaleTests
-    {
-        #region measure
-        
-        [Test]
-        public void Measure_Wrap()
-        {
-            TestPlan
-                .For(x => new Scale
-                {
-                    Child = x.CreateChild(),
-                    ScaleX = 3,
-                    ScaleY = 2
-                })
-                .MeasureElement(new Size(900, 800))
-                .ExpectChildMeasure(new Size(300, 400), SpacePlan.Wrap())
-                .CheckMeasureResult(SpacePlan.Wrap());
-        }
-        
-        [Test]
-        public void Measure_PartialRender()
-        {
-            TestPlan
-                .For(x => new Scale
-                {
-                    Child = x.CreateChild(),
-                    ScaleX = 3,
-                    ScaleY = 2
-                })
-                .MeasureElement(new Size(900, 800))
-                .ExpectChildMeasure(new Size(300, 400), SpacePlan.PartialRender(200, 350))
-                .CheckMeasureResult(SpacePlan.PartialRender(600, 700));
-        }
-        
-        [Test]
-        public void Measure_FullRender()
-        {
-            TestPlan
-                .For(x => new Scale
-                {
-                    Child = x.CreateChild(),
-                    ScaleX = 3,
-                    ScaleY = 2
-                })
-                .MeasureElement(new Size(900, 800))
-                .ExpectChildMeasure(new Size(300, 400), SpacePlan.FullRender(250, 300))
-                .CheckMeasureResult(SpacePlan.FullRender(750, 600));
-        }
-        
-        [Test]
-        public void Measure_NegativeScaleX()
-        {
-            TestPlan
-                .For(x => new Scale
-                {
-                    Child = x.CreateChild(),
-                    ScaleX = -2,
-                    ScaleY = 1
-                })
-                .MeasureElement(new Size(800, 600))
-                .ExpectChildMeasure(new Size(400, 600), SpacePlan.FullRender(300, 500))
-                .CheckMeasureResult(SpacePlan.FullRender(600, 500));
-        }
-        
-        [Test]
-        public void Measure_NegativeScaleY()
-        {
-            TestPlan
-                .For(x => new Scale
-                {
-                    Child = x.CreateChild(),
-                    ScaleX = 1,
-                    ScaleY = -3
-                })
-                .MeasureElement(new Size(800, 600))
-                .ExpectChildMeasure(new Size(800, 200), SpacePlan.FullRender(800, 100))
-                .CheckMeasureResult(SpacePlan.FullRender(800, 300));
-        }
-        
-        #endregion
-        
-        #region draw
-        
-        [Test]
-        public void Draw_Simple()
-        {
-            TestPlan
-                .For(x => new Scale
-                {
-                    Child = x.CreateChild(),
-                    ScaleX = 3,
-                    ScaleY = 2
-                })
-                .DrawElement(new Size(900, 800))
-                .ExpectCanvasTranslate(0, 0)
-                .ExpectCanvasScale(3, 2)
-                .ExpectChildDraw(new Size(300, 400))
-                .ExpectCanvasScale(1/3f, 1/2f)
-                .ExpectCanvasTranslate(0, 0)
-                .CheckDrawResult();
-        }
-        
-        [Test]
-        public void Draw_NegativeScaleX()
-        {
-            TestPlan
-                .For(x => new Scale
-                {
-                    Child = x.CreateChild(),
-                    ScaleX = -3,
-                    ScaleY = 2
-                })
-                .DrawElement(new Size(900, 800))
-                .ExpectCanvasTranslate(900, 0)
-                .ExpectCanvasScale(-3, 2)
-                .ExpectChildDraw(new Size(300, 400))
-                .ExpectCanvasScale(-1/3f, 1/2f)
-                .ExpectCanvasTranslate(-900, 0)
-                .CheckDrawResult();
-        }
-        
-        [Test]
-        public void Draw_NegativeScaleY()
-        {
-            TestPlan
-                .For(x => new Scale
-                {
-                    Child = x.CreateChild(),
-                    ScaleX = 3,
-                    ScaleY = -2
-                })
-                .DrawElement(new Size(900, 800))
-                .ExpectCanvasTranslate(0, 800)
-                .ExpectCanvasScale(3, -2)
-                .ExpectChildDraw(new Size(300, 400))
-                .ExpectCanvasScale(1/3f, -1/2f)
-                .ExpectCanvasTranslate(0, -800)
-                .CheckDrawResult();
-        }
-        
-        #endregion
-    }
-}

QuestPDF.UnitTests/ShowEntireTests.cs

@@ -1,5 +1,5 @@
 using NUnit.Framework;
-using QuestPDF.Drawing;
+using QuestPDF.Drawing.SpacePlan;
 using QuestPDF.Elements;
 using QuestPDF.Infrastructure;
 using QuestPDF.UnitTests.TestEngine;
@@ -18,8 +18,8 @@ namespace QuestPDF.UnitTests
                     Child = x.CreateChild()
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure(new Size(400, 300), SpacePlan.Wrap())
-                .CheckMeasureResult(SpacePlan.Wrap());
+                .ExpectChildMeasure(new Size(400, 300), new Wrap())
+                .CheckMeasureResult(new Wrap());
         }
         
         [Test]
@@ -31,8 +31,8 @@ namespace QuestPDF.UnitTests
                     Child = x.CreateChild()
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure(new Size(400, 300), SpacePlan.PartialRender(300, 200))
-                .CheckMeasureResult(SpacePlan.Wrap());
+                .ExpectChildMeasure(new Size(400, 300), new PartialRender(300, 200))
+                .CheckMeasureResult(new Wrap());
         }
         
         [Test]
@@ -44,11 +44,8 @@ namespace QuestPDF.UnitTests
                     Child = x.CreateChild()
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure(new Size(400, 300), SpacePlan.FullRender(300, 200))
-                .CheckMeasureResult(SpacePlan.FullRender(300, 200));
+                .ExpectChildMeasure(new Size(400, 300), new FullRender(300, 200))
+                .CheckMeasureResult(new FullRender(300, 200));
         }
-        
-        [Test]
-        public void Draw() => SimpleContainerTests.Draw<ShowEntire>();
     }
 }

QuestPDF.UnitTests/ShowOnceTest.cs

@@ -1,5 +1,6 @@
-using NUnit.Framework;
-using QuestPDF.Drawing;
+using Moq;
+using NUnit.Framework;
+using QuestPDF.Drawing.SpacePlan;
 using QuestPDF.Elements;
 using QuestPDF.Infrastructure;
 using QuestPDF.UnitTests.TestEngine;
@@ -10,7 +11,33 @@ namespace QuestPDF.UnitTests
     public class ShowOnceTest
     {
         [Test]
-        public void Draw()
+        public void Measure_ShouldHandleNullChild() => new ShowOnce().MeasureWithoutChild();
+        
+        [Test]
+        public void Draw_ShouldHandleNullChild() => new ShowOnce().DrawWithoutChild();
+
+        [Test]
+        public void ShouldRenderOnce_WhenRenderingCalledMultipleTimes()
+        {
+            var child = new Mock<Element>();
+            
+            child
+                .Setup(x => x.Measure(It.IsAny<Size>()))
+                .Returns(() => new FullRender(Size.Zero));
+
+            var element = new ShowOnce()
+            {
+                Child = child.Object
+            };
+
+            element.Draw(null, Size.Zero);
+            element.Draw(null, Size.Zero);
+            
+            child.Verify(x => x.Draw(It.IsAny<ICanvas>(), It.IsAny<Size>()), Times.Once);
+        }
+        
+        [Test]
+        public void Draw_HorizontalRight_VerticalTop()
         {
             TestPlan
                 .For(x => new ShowOnce()
@@ -20,31 +47,31 @@ namespace QuestPDF.UnitTests
                 
                 // Measure the element and return result
                 .MeasureElement(new Size(300, 200))
-                .ExpectChildMeasure("child", new Size(300, 200), SpacePlan.PartialRender(new Size(200, 200)))
-                .CheckMeasureResult(SpacePlan.PartialRender(new Size(200, 200)))
+                .ExpectChildMeasure("child", new Size(300, 200), new PartialRender(new Size(200, 200)))
+                .CheckMeasureResult(new PartialRender(new Size(200, 200)))
                 
                 // Draw element partially
                 .DrawElement(new Size(200, 200))
-                .ExpectChildMeasure(new Size(200, 200), SpacePlan.PartialRender(new Size(200, 200)))
+                .ExpectChildMeasure(new Size(200, 200), new PartialRender(new Size(200, 200)))
                 .ExpectChildDraw(new Size(200, 200))
                 .CheckDrawResult()
                 
                 // Element was not fully drawn
                 // It should be measured again for rendering on next page
                 .MeasureElement(new Size(800, 200))
-                .ExpectChildMeasure(new Size(800, 200), SpacePlan.FullRender(new Size(400, 200)))
-                .CheckMeasureResult(SpacePlan.FullRender(new Size(400, 200)))
+                .ExpectChildMeasure(new Size(800, 200), new FullRender(new Size(400, 200)))
+                .CheckMeasureResult(new FullRender(new Size(400, 200)))
 
                 // Draw element on next page
                 // Element was fully drawn at this point
                 .DrawElement(new Size(400, 200))
-                .ExpectChildMeasure(new Size(400, 200), SpacePlan.FullRender(new Size(400, 200)))
+                .ExpectChildMeasure(new Size(400, 200), new FullRender(new Size(400, 200)))
                 .ExpectChildDraw(new Size(400, 200))
                 .CheckDrawResult()
                 
                 // In the next attempt of measuring element, it should behave like empty parent.
                 .MeasureElement(new Size(600, 200))
-                .CheckMeasureResult(SpacePlan.FullRender(0, 0))
+                .CheckMeasureResult(new FullRender(Size.Zero))
                 
                 // In the next attempt of measuring element, it should not draw its child
                 .DrawElement(new Size(600, 200))

QuestPDF.UnitTests/SimpleRotateTests.cs

@@ -1,162 +0,0 @@
-using NUnit.Framework;
-using QuestPDF.Drawing;
-using QuestPDF.Elements;
-using QuestPDF.Infrastructure;
-using QuestPDF.UnitTests.TestEngine;
-
-namespace QuestPDF.UnitTests
-{
-    [TestFixture]
-    public class SimpleRotateTests
-    {
-        #region measure
-        
-        [Test]
-        public void Measure_Wrap()
-        {
-            TestPlan
-                .For(x => new SimpleRotate
-                {
-                    Child = x.CreateChild(),
-                    TurnCount = 0
-                })
-                .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure(new Size(400, 300), SpacePlan.Wrap())
-                .CheckMeasureResult(SpacePlan.Wrap());
-        }
-        
-        [Test]
-        public void Measure_PartialRender()
-        {
-            TestPlan
-                .For(x => new SimpleRotate
-                {
-                    Child = x.CreateChild(),
-                    TurnCount = 0
-                })
-                .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure(new Size(400, 300), SpacePlan.PartialRender(300, 200))
-                .CheckMeasureResult(SpacePlan.PartialRender(300, 200));
-        }
-        
-        [Test]
-        public void Measure_RotateRight()
-        {
-            TestPlan
-                .For(x => new SimpleRotate
-                {
-                    Child = x.CreateChild(),
-                    TurnCount = 1
-                })
-                .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure(new Size(300, 400), SpacePlan.FullRender(200, 300))
-                .CheckMeasureResult(SpacePlan.FullRender(300, 200));
-        }
-        
-        [Test]
-        public void Measure_RotateFlip()
-        {
-            TestPlan
-                .For(x => new SimpleRotate
-                {
-                    Child = x.CreateChild(),
-                    TurnCount = 2
-                })
-                .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure(new Size(400, 300), SpacePlan.FullRender(200, 100))
-                .CheckMeasureResult(SpacePlan.FullRender(200, 100));
-        }
-        
-        [Test]
-        public void Measure_RotateLeft()
-        {
-            TestPlan
-                .For(x => new SimpleRotate
-                {
-                    Child = x.CreateChild(),
-                    TurnCount = 3 // or -1
-                })
-                .MeasureElement(new Size(500, 400))
-                .ExpectChildMeasure(new Size(400, 500), SpacePlan.FullRender(300, 350))
-                .CheckMeasureResult(SpacePlan.FullRender(350, 300));
-        }
-        
-        #endregion
-        
-        #region draw
-        
-        [Test]
-        public void Draw_Simple()
-        {
-            TestPlan
-                .For(x => new SimpleRotate
-                {
-                    Child = x.CreateChild(),
-                    TurnCount = 0
-                })
-                .DrawElement(new Size(640, 480))
-                .ExpectCanvasTranslate(0, 0)
-                .ExpectCanvasRotate(0)
-                .ExpectChildDraw(new Size(640, 480))
-                .ExpectCanvasRotate(0)
-                .ExpectCanvasTranslate(0, 0)
-                .CheckDrawResult();
-        }
-        
-        [Test]
-        public void Draw_RotateRight()
-        {
-            TestPlan 
-                .For(x => new SimpleRotate
-                {
-                    Child = x.CreateChild(),
-                    TurnCount = 1
-                })
-                .DrawElement(new Size(640, 480))
-                .ExpectCanvasTranslate(640, 0)
-                .ExpectCanvasRotate(90)
-                .ExpectChildDraw(new Size(480, 640))
-                .ExpectCanvasRotate(-90)
-                .ExpectCanvasTranslate(-640, 0)
-                .CheckDrawResult();
-        }
-        
-        [Test]
-        public void Draw_RotateFlip()
-        {
-            TestPlan 
-                .For(x => new SimpleRotate
-                {
-                    Child = x.CreateChild(),
-                    TurnCount = 2
-                })
-                .DrawElement(new Size(640, 480))
-                .ExpectCanvasTranslate(640, 480)
-                .ExpectCanvasRotate(180)
-                .ExpectChildDraw(new Size(640, 480))
-                .ExpectCanvasRotate(-180)
-                .ExpectCanvasTranslate(-640, -480)
-                .CheckDrawResult();
-        }
-        
-        [Test]
-        public void Draw_RotateLeft()
-        {
-            TestPlan 
-                .For(x => new SimpleRotate
-                {
-                    Child = x.CreateChild(),
-                    TurnCount = 3 // or -1
-                })
-                .DrawElement(new Size(640, 480))
-                .ExpectCanvasTranslate(0, 480)
-                .ExpectCanvasRotate(270)
-                .ExpectChildDraw(new Size(480, 640))
-                .ExpectCanvasRotate(-270)
-                .ExpectCanvasTranslate(0, -480)
-                .CheckDrawResult();
-        }
-        
-        #endregion
-    }
-}

QuestPDF.UnitTests/StackTests.cs

@@ -1,7 +1,6 @@
 using NUnit.Framework;
-using QuestPDF.Drawing;
+using QuestPDF.Drawing.SpacePlan;
 using QuestPDF.Elements;
-using QuestPDF.Fluent;
 using QuestPDF.Infrastructure;
 using QuestPDF.UnitTests.TestEngine;
 
@@ -16,80 +15,80 @@ namespace QuestPDF.UnitTests
         public void Measure_ReturnsWrap_WhenFirstChildWraps()
         {
             TestPlan
-                .For(x => new BinaryStack
+                .For(x => new SimpleStack
                 {
                     First = x.CreateChild("first"),
                     Second = x.CreateChild("second")
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure("first", new Size(400, 300), SpacePlan.Wrap())
-                .CheckMeasureResult(SpacePlan.Wrap());
+                .ExpectChildMeasure("first", new Size(400, 300), new Wrap())
+                .CheckMeasureResult(new Wrap());
         }
         
         [Test]
         public void Measure_ReturnsPartialRender_WhenFirstChildReturnsPartialRender()
         {
             TestPlan
-                .For(x => new BinaryStack
+                .For(x => new SimpleStack
                 {
                     First = x.CreateChild("first"),
                     Second = x.CreateChild("second")
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure("first", new Size(400, 300), SpacePlan.PartialRender(300, 200))
-                .CheckMeasureResult(SpacePlan.PartialRender(300, 200));
+                .ExpectChildMeasure("first", new Size(400, 300), new PartialRender(300, 200))
+                .CheckMeasureResult(new PartialRender(300, 200));
         }
         
         [Test]
         public void Measure_ReturnsPartialRender_WhenSecondChildWraps()
         {
             TestPlan
-                .For(x => new BinaryStack
+                .For(x => new SimpleStack
                 {
                     First = x.CreateChild("first"),
                     Second = x.CreateChild("second")
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure("first", new Size(400, 300), SpacePlan.FullRender(200, 100))
-                .ExpectChildMeasure("second", new Size(400, 200), SpacePlan.Wrap())
-                .CheckMeasureResult(SpacePlan.PartialRender(200, 100));
+                .ExpectChildMeasure("first", new Size(400, 300), new FullRender(200, 100))
+                .ExpectChildMeasure("second", new Size(400, 200), new Wrap())
+                .CheckMeasureResult(new PartialRender(200, 100));
         }
         
         [Test]
         public void Measure_ReturnsPartialRender_WhenSecondChildReturnsPartialRender()
         {
             TestPlan
-                .For(x => new BinaryStack
+                .For(x => new SimpleStack
                 {
                     First = x.CreateChild("first"),
                     Second = x.CreateChild("second")
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure("first", new Size(400, 300), SpacePlan.FullRender(200, 100))
-                .ExpectChildMeasure("second", new Size(400, 200), SpacePlan.PartialRender(300, 150))
-                .CheckMeasureResult(SpacePlan.PartialRender(300, 250));
+                .ExpectChildMeasure("first", new Size(400, 300), new FullRender(200, 100))
+                .ExpectChildMeasure("second", new Size(400, 200), new PartialRender(300, 150))
+                .CheckMeasureResult(new PartialRender(300, 250));
         }
         
         [Test]
         public void Measure_ReturnsFullRender_WhenSecondChildReturnsFullRender()
         {
             TestPlan
-                .For(x => new BinaryStack
+                .For(x => new SimpleStack
                 {
                     First = x.CreateChild("first"),
                     Second = x.CreateChild("second")
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure("first", new Size(400, 300), SpacePlan.FullRender(200, 100))
-                .ExpectChildMeasure("second", new Size(400, 200), SpacePlan.FullRender(100, 50))
-                .CheckMeasureResult(SpacePlan.FullRender(200, 150));
+                .ExpectChildMeasure("first", new Size(400, 300), new FullRender(200, 100))
+                .ExpectChildMeasure("second", new Size(400, 200), new FullRender(100, 50))
+                .CheckMeasureResult(new FullRender(200, 150));
         }
         
         [Test]
         public void Measure_UsesEmpty_WhenFirstChildIsRendered()
         {
             TestPlan
-                .For(x => new BinaryStack
+                .For(x => new SimpleStack
                 {
                     First = x.CreateChild("first"),
                     Second = x.CreateChild("second"),
@@ -97,8 +96,8 @@ namespace QuestPDF.UnitTests
                     IsFirstRendered = true
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure("second", new Size(400, 300), SpacePlan.FullRender(200, 300))
-                .CheckMeasureResult(SpacePlan.FullRender(200, 300));
+                .ExpectChildMeasure("second", new Size(400, 300), new FullRender(200, 300))
+                .CheckMeasureResult(new FullRender(200, 300));
         }
         
         #endregion
@@ -109,13 +108,13 @@ namespace QuestPDF.UnitTests
         public void Draw_WhenFirstChildWraps()
         {
             TestPlan
-                .For(x => new BinaryStack
+                .For(x => new SimpleStack
                 {
                     First = x.CreateChild("first"),
                     Second = x.CreateChild("second")
                 })
                 .DrawElement(new Size(400, 300))
-                .ExpectChildMeasure("first", new Size(400, 300), SpacePlan.Wrap())
+                .ExpectChildMeasure("first", new Size(400, 300), new Wrap())
                 .CheckDrawResult();
         }
         
@@ -123,13 +122,13 @@ namespace QuestPDF.UnitTests
         public void Draw_WhenFirstChildPartiallyRenders()
         {
             TestPlan
-                .For(x => new BinaryStack
+                .For(x => new SimpleStack
                 {
                     First = x.CreateChild("first"),
                     Second = x.CreateChild("second")
                 })
                 .DrawElement(new Size(400, 300))
-                .ExpectChildMeasure("first", new Size(400, 300), SpacePlan.PartialRender(200, 100))
+                .ExpectChildMeasure("first", new Size(400, 300), new PartialRender(200, 100))
                 .ExpectChildDraw("first", new Size(400, 100))
                 .CheckDrawResult();
         }
@@ -138,15 +137,15 @@ namespace QuestPDF.UnitTests
         public void Draw_WhenFirstChildFullyRenders_AndSecondChildWraps()
         {
             TestPlan
-                .For(x => new BinaryStack
+                .For(x => new SimpleStack
                 {
                     First = x.CreateChild("first"),
                     Second = x.CreateChild("second")
                 })
                 .DrawElement(new Size(400, 300))
-                .ExpectChildMeasure("first", new Size(400, 300), SpacePlan.FullRender(200, 100))
+                .ExpectChildMeasure("first", new Size(400, 300), new FullRender(200, 100))
                 .ExpectChildDraw("first", new Size(400, 100))
-                .ExpectChildMeasure("second", new Size(400, 200), SpacePlan.Wrap())
+                .ExpectChildMeasure("second", new Size(400, 200), new Wrap())
                 .CheckDrawResult();
         }
         
@@ -154,15 +153,15 @@ namespace QuestPDF.UnitTests
         public void Draw_WhenFirstChildFullyRenders_AndSecondChildPartiallyRenders()
         {
             TestPlan
-                .For(x => new BinaryStack
+                .For(x => new SimpleStack
                 {
                     First = x.CreateChild("first"),
                     Second = x.CreateChild("second")
                 })
                 .DrawElement(new Size(400, 300))
-                .ExpectChildMeasure("first", new Size(400, 300), SpacePlan.FullRender(200, 100))
+                .ExpectChildMeasure("first", new Size(400, 300), new FullRender(200, 100))
                 .ExpectChildDraw("first", new Size(400, 100))
-                .ExpectChildMeasure("second", new Size(400, 200), SpacePlan.PartialRender(250, 150))
+                .ExpectChildMeasure("second", new Size(400, 200), new PartialRender(250, 150))
                 .ExpectCanvasTranslate(0, 100)
                 .ExpectChildDraw("second", new Size(400, 150))
                 .ExpectCanvasTranslate(0, -100)
@@ -173,15 +172,15 @@ namespace QuestPDF.UnitTests
         public void Draw_WhenFirstChildFullyRenders_AndSecondChildFullyRenders()
         {
             TestPlan
-                .For(x => new BinaryStack
+                .For(x => new SimpleStack
                 {
                     First = x.CreateChild("first"),
                     Second = x.CreateChild("second")
                 })
                 .DrawElement(new Size(400, 300))
-                .ExpectChildMeasure("first", new Size(400, 300), SpacePlan.FullRender(200, 100))
+                .ExpectChildMeasure("first", new Size(400, 300), new FullRender(200, 100))
                 .ExpectChildDraw("first", new Size(400, 100))
-                .ExpectChildMeasure("second", new Size(400, 200), SpacePlan.FullRender(250, 150))
+                .ExpectChildMeasure("second", new Size(400, 200), new FullRender(250, 150))
                 .ExpectCanvasTranslate(0, 100)
                 .ExpectChildDraw("second", new Size(400, 150))
                 .ExpectCanvasTranslate(0, -100)
@@ -192,7 +191,7 @@ namespace QuestPDF.UnitTests
         public void Draw_UsesEmpty_WhenFirstChildIsRendered()
         {
             TestPlan
-                .For(x => new BinaryStack
+                .For(x => new SimpleStack
                 {
                     First = x.CreateChild("first"),
                     Second = x.CreateChild("second"),
@@ -200,11 +199,11 @@ namespace QuestPDF.UnitTests
                     IsFirstRendered = true
                 })
                 .DrawElement(new Size(400, 300))
-                .ExpectChildMeasure("second", new Size(400, 300), SpacePlan.PartialRender(200, 300))
+                .ExpectChildMeasure("second", new Size(400, 300), new PartialRender(200, 300))
                 .ExpectCanvasTranslate(0, 0)
                 .ExpectChildDraw("second", new Size(400, 300))
                 .ExpectCanvasTranslate(0, 0)
-                .CheckState<BinaryStack>(x => x.IsFirstRendered)
+                .CheckState<SimpleStack>(x => x.IsFirstRendered)
                 .CheckDrawResult();
         }
         
@@ -212,7 +211,7 @@ namespace QuestPDF.UnitTests
         public void Draw_TogglesFirstRenderedFlag_WhenSecondFullyRenders()
         {
             TestPlan
-                .For(x => new BinaryStack
+                .For(x => new SimpleStack
                 {
                     First = x.CreateChild("first"),
                     Second = x.CreateChild("second"),
@@ -220,91 +219,17 @@ namespace QuestPDF.UnitTests
                     IsFirstRendered = true
                 })
                 .DrawElement(new Size(400, 300))
-                .ExpectChildMeasure("second", new Size(400, 300), SpacePlan.FullRender(200, 300))
+                .ExpectChildMeasure("second", new Size(400, 300), new FullRender(200, 300))
                 .ExpectCanvasTranslate(0, 0)
                 .ExpectChildDraw("second", new Size(400, 300))
                 .ExpectCanvasTranslate(0, 0)
                 .CheckDrawResult()
-                .CheckState<BinaryStack>(x => !x.IsFirstRendered);
+                .CheckState<SimpleStack>(x => !x.IsFirstRendered);
         }
         
         #endregion
         
-        #region Structure
-        
-        [Test]
-        public void Structure_Simple()
-        { 
-            // arrange
-            var childA = TestPlan.CreateUniqueElement();
-            var childB = TestPlan.CreateUniqueElement();
-            var childC = TestPlan.CreateUniqueElement();
-            var childD = TestPlan.CreateUniqueElement();
-            var childE = TestPlan.CreateUniqueElement();
-
-            const int spacing = 20;
-            
-            // act
-            var structure = new Container();
-            
-            structure.Stack(stack =>
-            {
-                stack.Spacing(spacing);
-                
-                stack.Item().Element(childA);
-                stack.Item().Element(childB);
-                stack.Item().Element(childC);
-                stack.Item().Element(childD);
-                stack.Item().Element(childE);
-            });
-            
-            // assert
-            var expected = new Padding
-            {
-                Bottom = -spacing,
-
-                Child = new BinaryStack
-                {
-                    First = new BinaryStack
-                    {
-                        First = new Padding
-                        {
-                            Bottom = spacing,
-                            Child = childA
-                        },
-                        Second = new Padding
-                        {
-                            Bottom = spacing,
-                            Child = childB
-                        }
-                    },
-                    Second = new BinaryStack
-                    {
-                        First = new Padding
-                        {
-                            Bottom = spacing,
-                            Child = childC
-                        },
-                        Second = new BinaryStack
-                        {
-                            First = new Padding
-                            {
-                                Bottom = spacing,
-                                Child = childD
-                            },
-                            Second = new Padding
-                            {
-                                Bottom = spacing,
-                                Child = childE
-                            }
-                        }
-                    }
-                }
-            };
-
-            TestPlan.CompareOperations(structure, expected);
-        }
-        
-        #endregion
+        // TODO: add tests for the spacing property
+        // TODO: add tests for the tree builder method
     }
 }

QuestPDF.UnitTests/TestEngine/CanvasMock.cs

@@ -4,25 +4,40 @@ using SkiaSharp;
 
 namespace QuestPDF.UnitTests.TestEngine
 {
-    internal class MockCanvas : ICanvas
+    internal class CanvasMock : ICanvas
     {
         public Action<Position> TranslateFunc { get; set; }
-        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);
-        public void Rotate(float angle) => RotateFunc(angle);
-        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(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 DrawExternalLink(string url, Size size) => throw new NotImplementedException();
-        public void DrawLocationLink(string locationName, Size size) => throw new NotImplementedException();
-        public void DrawLocation(string locationName) => throw new NotImplementedException();
+        public void DrawExternalLink(string url, Size size)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void DrawLocationLink(string locationName, Size size)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void DrawLocation(string locationName)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void DrawLink(string url, Size size)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Size MeasureText(string text, TextStyle style)
+        {
+            return new Size(text.Length * style.Size, style.Size);
+        }
     }
 }

QuestPDF.UnitTests/TestEngine/ElementMock.cs

@@ -1,5 +1,5 @@
 using System;
-using QuestPDF.Drawing;
+using QuestPDF.Drawing.SpacePlan;
 using QuestPDF.Infrastructure;
 
 namespace QuestPDF.UnitTests.TestEngine
@@ -7,10 +7,10 @@ namespace QuestPDF.UnitTests.TestEngine
     internal class ElementMock : Element
     {
         public string Id { get; set; }
-        public Func<Size, SpacePlan> MeasureFunc { get; set; }
+        public Func<Size, ISpacePlan> MeasureFunc { get; set; }
         public Action<Size> DrawFunc { get; set; }
 
-        internal override SpacePlan Measure(Size availableSpace) => MeasureFunc(availableSpace);
-        internal override void Draw(Size availableSpace) => DrawFunc(availableSpace);
+        internal override ISpacePlan Measure(Size availableSpace) => MeasureFunc(availableSpace);
+        internal override void Draw(ICanvas canvas, Size availableSpace) => DrawFunc(availableSpace);
     }
 }

QuestPDF.UnitTests/TestEngine/OperationRecordingCanvas.cs

@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using QuestPDF.Infrastructure;
-using QuestPDF.UnitTests.TestEngine.Operations;
-using SkiaSharp;
-
-namespace QuestPDF.UnitTests.TestEngine
-{
-    internal class OperationRecordingCanvas : ICanvas
-    {
-        public ICollection<OperationBase> Operations { get; } = new List<OperationBase>();
-
-        public void Translate(Position vector) => Operations.Add(new CanvasTranslateOperation(vector));
-        public void Rotate(float angle) => Operations.Add(new CanvasRotateOperation(angle));
-        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(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 DrawExternalLink(string url, Size size) => throw new NotImplementedException();
-        public void DrawLocationLink(string locationName, Size size) => throw new NotImplementedException();
-        public void DrawLocation(string locationName) => throw new NotImplementedException();
-    }
-}

QuestPDF.UnitTests/TestEngine/Operations/CanvasDrawImageOperation.cs

@@ -2,12 +2,12 @@
 
 namespace QuestPDF.UnitTests.TestEngine.Operations
 {
-    internal class CanvasDrawImageOperation : OperationBase
+    internal class CanvasDrawImageOperationBase : OperationBase
     {
         public Position Position { get; }
         public Size Size { get; }
 
-        public CanvasDrawImageOperation(Position position, Size size)
+        public CanvasDrawImageOperationBase(Position position, Size size)
         {
             Position = position;
             Size = size;

QuestPDF.UnitTests/TestEngine/Operations/CanvasDrawRectangleOperation.cs

@@ -2,13 +2,13 @@
 
 namespace QuestPDF.UnitTests.TestEngine.Operations
 {
-    internal class CanvasDrawRectangleOperation : OperationBase
+    internal class CanvasDrawRectangleOperationBase : OperationBase
     {
         public Position Position { get; } 
         public Size Size { get; }
         public string Color { get; }
 
-        public CanvasDrawRectangleOperation(Position position, Size size, string color)
+        public CanvasDrawRectangleOperationBase(Position position, Size size, string color)
         {
             Position = position;
             Size = size;

QuestPDF.UnitTests/TestEngine/Operations/CanvasDrawTextOperation.cs

@@ -2,13 +2,13 @@
 
 namespace QuestPDF.UnitTests.TestEngine.Operations
 {
-    internal class CanvasDrawTextOperation : OperationBase
+    internal class CanvasDrawTextOperationBase : OperationBase
     {
         public string Text { get; }
         public Position Position { get; }
         public TextStyle Style { get; }
 
-        public CanvasDrawTextOperation(string text, Position position, TextStyle style)
+        public CanvasDrawTextOperationBase(string text, Position position, TextStyle style)
         {
             Text = text;
             Position = position;

QuestPDF.UnitTests/TestEngine/Operations/CanvasRotateOperation.cs

@@ -1,12 +0,0 @@
-namespace QuestPDF.UnitTests.TestEngine.Operations
-{
-    public class CanvasRotateOperation : OperationBase
-    {
-        public float Angle { get; }
-
-        public CanvasRotateOperation(float angle)
-        {
-            Angle = angle;
-        }
-    }
-}

QuestPDF.UnitTests/TestEngine/Operations/CanvasScaleOperation.cs

@@ -1,14 +0,0 @@
-namespace QuestPDF.UnitTests.TestEngine.Operations
-{
-    public class CanvasScaleOperation : OperationBase
-    {
-        public float ScaleX { get; }
-        public float ScaleY { get; }
-
-        public CanvasScaleOperation(float scaleX, float scaleY)
-        {
-            ScaleX = scaleX;
-            ScaleY = scaleY;
-        }
-    }
-}

QuestPDF.UnitTests/TestEngine/Operations/CanvasTranslateOperation.cs

@@ -2,11 +2,11 @@
 
 namespace QuestPDF.UnitTests.TestEngine.Operations
 {
-    internal class CanvasTranslateOperation : OperationBase
+    internal class CanvasTranslateOperationBase : OperationBase
     {
         public Position Position { get; }
 
-        public CanvasTranslateOperation(Position position)
+        public CanvasTranslateOperationBase(Position position)
         {
             Position = position;
         }

QuestPDF.UnitTests/TestEngine/Operations/ChildDrawOperation.cs

@@ -2,12 +2,12 @@
 
 namespace QuestPDF.UnitTests.TestEngine.Operations
 {
-    public class ChildDrawOperation : OperationBase
+    public class ChildDrawOperationBase : OperationBase
     {
         public string ChildId { get; }
         public Size Input { get; }
 
-        public ChildDrawOperation(string childId, Size input)
+        public ChildDrawOperationBase(string childId, Size input)
         {
             ChildId = childId;
             Input = input;

QuestPDF.UnitTests/TestEngine/Operations/ChildMeasureOperation.cs

@@ -1,15 +1,15 @@
-using QuestPDF.Drawing;
+using QuestPDF.Drawing.SpacePlan;
 using QuestPDF.Infrastructure;
 
 namespace QuestPDF.UnitTests.TestEngine.Operations
 {
-    internal class ChildMeasureOperation : OperationBase
+    internal class ChildMeasureOperationBase : OperationBase
     {
         public string ChildId { get; }
         public Size Input { get; }
-        public SpacePlan Output { get; }
+        public ISpacePlan Output { get; }
 
-        public ChildMeasureOperation(string childId, Size input, SpacePlan output)
+        public ChildMeasureOperationBase(string childId, Size input, ISpacePlan output)
         {
             ChildId = childId;
             Input = input;

QuestPDF.UnitTests/TestEngine/Operations/ElementMeasureOperation.cs

@@ -2,9 +2,9 @@
 
 namespace QuestPDF.UnitTests.TestEngine.Operations
 {
-    public class ElementMeasureOperation : OperationBase
+    public class ElementMeasureOperationBase : OperationBase
     {
-        public ElementMeasureOperation(Size input)
+        public ElementMeasureOperationBase(Size input)
         {
             
         }

QuestPDF.UnitTests/TestEngine/SimpleContainerTests.cs

@@ -1,67 +0,0 @@
-using QuestPDF.Drawing;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.UnitTests.TestEngine
-{
-    internal static class SimpleContainerTests
-    {
-        #region measure
-        
-        public static void Measure<TElement>() where TElement : Element, IContainer, new()
-        {
-            Measure_Wrap<TElement>();
-            Measure_PartialRender<TElement>();
-            Measure_FullRender<TElement>();
-        }
-        
-        private static void Measure_Wrap<TElement>() where TElement : Element, IContainer, new()
-        {
-            TestPlan
-                .For(x => new TElement
-                {
-                    Child = x.CreateChild()
-                })
-                .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure(new Size(400, 300), SpacePlan.Wrap())
-                .CheckMeasureResult(SpacePlan.Wrap());
-        }
-        
-        private static void Measure_PartialRender<TElement>() where TElement : Element, IContainer, new()
-        {
-            TestPlan
-                .For(x => new TElement
-                {
-                    Child = x.CreateChild()
-                })
-                .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure(new Size(400, 300), SpacePlan.PartialRender(200, 100))
-                .CheckMeasureResult(SpacePlan.PartialRender(200, 100));
-        }
-        
-        private static void Measure_FullRender<TElement>() where TElement : Element, IContainer, new()
-        {
-            TestPlan
-                .For(x => new TElement
-                {
-                    Child = x.CreateChild()
-                })
-                .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure(new Size(400, 300), SpacePlan.FullRender(250, 150))
-                .CheckMeasureResult(SpacePlan.FullRender(250, 150));
-        }
-        
-        #endregion
-        
-        public static void Draw<TElement>() where TElement : Element, IContainer, new()
-        {
-            TestPlan
-                .For(x => new TElement
-                {
-                    Child = x.CreateChild()
-                })
-                .DrawElement(new Size(1200, 900))
-                .ExpectChildDraw(new Size(1200, 900))
-                .CheckDrawResult();
-        }
-    }
-}

QuestPDF.UnitTests/TestEngine/SingleChildTests.cs

@@ -0,0 +1,31 @@
+using FluentAssertions;
+using NUnit.Framework;
+using QuestPDF.Drawing.SpacePlan;
+using QuestPDF.Infrastructure;
+
+namespace QuestPDF.UnitTests.TestEngine
+{
+    public static class SingleChildTests
+    {
+        internal static void MeasureWithoutChild<T>(this T element) where T : ContainerElement
+        {
+            element.Child = null;
+            element.Measure(Size.Zero).Should().BeEquivalentTo(new FullRender(Size.Zero));
+        }
+        
+        internal static void DrawWithoutChild<T>(this T element) where T : ContainerElement
+        {
+            // component does not throw an exception when called with null child
+            Assert.DoesNotThrow(() =>
+            {
+                element.Child = null;
+                
+                // component does not perform any canvas operation when called with null child
+                TestPlan
+                    .For(x => element)
+                    .DrawElement(new Size(200, 100))
+                    .CheckDrawResult();
+            });
+        }
+    }
+}

QuestPDF.UnitTests/TestEngine/TestPlan.cs

@@ -1,11 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Text.Json;
-using FluentAssertions;
 using NUnit.Framework;
-using QuestPDF.Drawing;
+using QuestPDF.Drawing.SpacePlan;
 using QuestPDF.Elements;
-using QuestPDF.Helpers;
 using QuestPDF.Infrastructure;
 using QuestPDF.UnitTests.TestEngine.Operations;
 
@@ -14,8 +12,6 @@ namespace QuestPDF.UnitTests.TestEngine
     internal class TestPlan
     {
         private const string DefaultChildName = "child";
-
-        private static Random Random { get; } = new Random();
         
         private Element Element { get; set; }
         private ICanvas Canvas { get; }
@@ -48,31 +44,20 @@ namespace QuestPDF.UnitTests.TestEngine
         
         private ICanvas CreateCanvas()
         {
-            return new MockCanvas
+            return new CanvasMock
             {
                 TranslateFunc = position =>
                 {
-                    var expected = GetExpected<CanvasTranslateOperation>();
+                    var expected = GetExpected<CanvasTranslateOperationBase>();
 
                     Assert.AreEqual(expected.Position.X, position.X, "Translate X");
                     Assert.AreEqual(expected.Position.Y, position.Y, "Translate Y");
-                },
-                RotateFunc = angle =>
-                {
-                    var expected = GetExpected<CanvasRotateOperation>();
-
-                    Assert.AreEqual(expected.Angle, angle, "Rotate angle");
-                },
-                ScaleFunc = (scaleX, scaleY) =>
-                {
-                    var expected = GetExpected<CanvasScaleOperation>();
-
-                    Assert.AreEqual(expected.ScaleX, scaleX, "Scale X");
-                    Assert.AreEqual(expected.ScaleY, scaleY, "Scale Y");
+                    
+                    //position.Should().BeEquivalentTo(expected.Position);
                 },
                 DrawRectFunc = (position, size, color) =>
                 {
-                    var expected = GetExpected<CanvasDrawRectangleOperation>();
+                    var expected = GetExpected<CanvasDrawRectangleOperationBase>();
                     
                     Assert.AreEqual(expected.Position.X, position.X, "Draw rectangle: X");
                     Assert.AreEqual(expected.Position.Y, position.Y, "Draw rectangle: Y");
@@ -81,10 +66,14 @@ namespace QuestPDF.UnitTests.TestEngine
                     Assert.AreEqual(expected.Size.Height, size.Height, "Draw rectangle: height");
                     
                     Assert.AreEqual(expected.Color, color, "Draw rectangle: color");
+                    
+                    /*position.Should().BeEquivalentTo(expected.Position);
+                    size.Should().BeEquivalentTo(expected.Size);
+                    color.Should().Be(expected.Color);*/
                 },
                 DrawTextFunc = (text, position, style) => 
                 {
-                    var expected = GetExpected<CanvasDrawTextOperation>();
+                    var expected = GetExpected<CanvasDrawTextOperationBase>();
                     
                     Assert.AreEqual(expected.Text, text);
                     
@@ -94,16 +83,23 @@ namespace QuestPDF.UnitTests.TestEngine
                     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");
+
+                    /*text.Should().Be(expected.Text);
+                    position.Should().BeEquivalentTo(expected.Position);
+                    style.Should().BeEquivalentTo(expected.Style);*/
                 },
                 DrawImageFunc = (image, position, size) =>
                 {
-                    var expected = GetExpected<CanvasDrawImageOperation>();
+                    var expected = GetExpected<CanvasDrawImageOperationBase>();
                     
                     Assert.AreEqual(expected.Position.X, position.X, "Draw image: X");
                     Assert.AreEqual(expected.Position.Y, position.Y, "Draw image: Y");
                     
                     Assert.AreEqual(expected.Size.Width, size.Width, "Draw image: width");
                     Assert.AreEqual(expected.Size.Height, size.Height, "Draw image: height");
+                    
+                    /*position.Should().BeEquivalentTo(expected.Position);
+                    size.Should().BeEquivalentTo(expected.Size);*/
                 }
             };
         }
@@ -117,23 +113,29 @@ namespace QuestPDF.UnitTests.TestEngine
                 Id = id,
                 MeasureFunc = availableSpace =>
                 {
-                    var expected = GetExpected<ChildMeasureOperation>();
+                    var expected = GetExpected<ChildMeasureOperationBase>();
 
                     Assert.AreEqual(expected.ChildId, id);
                     
                     Assert.AreEqual(expected.Input.Width, availableSpace.Width, $"Measure: width of child '{expected.ChildId}'");
                     Assert.AreEqual(expected.Input.Height, availableSpace.Height, $"Measure: height of child '{expected.ChildId}'");
 
+                    // id.Should().Be(expected.ChildId);
+                    // availableSpace.Should().Be(expected.Input);
+
                     return expected.Output;
                 },
                 DrawFunc = availableSpace =>
                 {
-                    var expected = GetExpected<ChildDrawOperation>();
+                    var expected = GetExpected<ChildDrawOperationBase>();
 
                     Assert.AreEqual(expected.ChildId, id);
                     
                     Assert.AreEqual(expected.Input.Width, availableSpace.Width, $"Draw: width of child '{expected.ChildId}'");
                     Assert.AreEqual(expected.Input.Height, availableSpace.Height, $"Draw: width of child '{expected.ChildId}'");
+                    
+                    /*id.Should().Be(expected.ChildId);
+                    availableSpace.Should().Be(expected.Input);*/
                 }
             };
         }
@@ -156,14 +158,14 @@ namespace QuestPDF.UnitTests.TestEngine
             return this;
         }
         
-        public TestPlan ExpectChildMeasure(Size expectedInput, SpacePlan returns)
+        public TestPlan ExpectChildMeasure(Size expectedInput, ISpacePlan returns)
         {
             return ExpectChildMeasure(DefaultChildName, expectedInput, returns);
         }
         
-        public TestPlan ExpectChildMeasure(string child, Size expectedInput, SpacePlan returns)
+        public TestPlan ExpectChildMeasure(string child, Size expectedInput, ISpacePlan returns)
         {
-            return AddOperation(new ChildMeasureOperation(child, expectedInput, returns));
+            return AddOperation(new ChildMeasureOperationBase(child, expectedInput, returns));
         }
         
         public TestPlan ExpectChildDraw(Size expectedInput)
@@ -173,63 +175,55 @@ namespace QuestPDF.UnitTests.TestEngine
         
         public TestPlan ExpectChildDraw(string child, Size expectedInput)
         {
-            return AddOperation(new ChildDrawOperation(child, expectedInput));
+            return AddOperation(new ChildDrawOperationBase(child, expectedInput));
         }
 
         public TestPlan ExpectCanvasTranslate(Position position)
         {
-            return AddOperation(new CanvasTranslateOperation(position));
+            return AddOperation(new CanvasTranslateOperationBase(position));
         }
         
         public TestPlan ExpectCanvasTranslate(float left, float top)
         {
-            return AddOperation(new CanvasTranslateOperation(new Position(left, top)));
+            return AddOperation(new CanvasTranslateOperationBase(new Position(left, top)));
         }
 
-        public TestPlan ExpectCanvasScale(float scaleX, float scaleY)
-        {
-            return AddOperation(new CanvasScaleOperation(scaleX, scaleY));
-        }
-        
-        public TestPlan ExpectCanvasRotate(float angle)
-        {
-            return AddOperation(new CanvasRotateOperation(angle));
-        }
-        
         public TestPlan ExpectCanvasDrawRectangle(Position position, Size size, string color)
         {
-            return AddOperation(new CanvasDrawRectangleOperation(position, size, color));
+            return AddOperation(new CanvasDrawRectangleOperationBase(position, size, color));
         }
         
         public TestPlan ExpectCanvasDrawText(string text, Position position, TextStyle style)
         {
-            return AddOperation(new CanvasDrawTextOperation(text, position, style));
+            return AddOperation(new CanvasDrawTextOperationBase(text, position, style));
         }
         
         public TestPlan ExpectCanvasDrawImage(Position position, Size size)
         {
-            return AddOperation(new CanvasDrawImageOperation(position, size));
+            return AddOperation(new CanvasDrawImageOperationBase(position, size));
         }
         
-        public TestPlan CheckMeasureResult(SpacePlan expected)
+        public TestPlan CheckMeasureResult(ISpacePlan expected)
         {
-            Element.HandleVisitor(x => x?.Initialize(null, Canvas));
-            
             var actual = Element.Measure(OperationInput);
             
             Assert.AreEqual(expected.GetType(), actual.GetType());
-            
-            Assert.AreEqual(expected.Width, actual.Width, "Measure: width");
-            Assert.AreEqual(expected.Height, actual.Height, "Measure: height");
-            Assert.AreEqual(expected.Type, actual.Type, "Measure: height");
+
+            var expectedSize = expected as Size;
+            var actualSize = actual as Size;
+
+            if (expectedSize != null)
+            {
+                Assert.AreEqual(expectedSize.Width, actualSize.Width, "Measure: width");
+                Assert.AreEqual(expectedSize.Height, actualSize.Height, "Measure: height");
+            }
             
             return this;
         }
         
         public TestPlan CheckDrawResult()
         {
-            Element.HandleVisitor(x => x?.Initialize(null, Canvas));
-            Element.Draw(OperationInput);
+            Element.Draw(Canvas, OperationInput);
             return this;
         }
 
@@ -248,51 +242,10 @@ namespace QuestPDF.UnitTests.TestEngine
         
         public static Element CreateUniqueElement()
         {
-            return new Constrained
+            return new Text
             {
-                MinWidth = 90,
-                MinHeight = 60,
-                
-                Child = new DynamicImage
-                {
-                    Source = Placeholders.Image
-                }
+                Value = Guid.NewGuid().ToString("N")
             };
         }
-
-        public static void CompareOperations(Element value, Element expected, Size? availableSpace = null)
-        {
-            CompareMeasureOperations(value, expected, availableSpace);
-            CompareDrawOperations(value, expected, availableSpace);
-        }
-        
-        private static void CompareMeasureOperations(Element value, Element expected, Size? availableSpace = null)
-        {
-            availableSpace ??= new Size(400, 300);
-            
-            var canvas = new FreeCanvas();
-            value.HandleVisitor(x => x.Initialize(null, canvas));
-            var valueMeasure = value.Measure(availableSpace.Value);
-            
-            expected.HandleVisitor(x => x.Initialize(null, canvas));
-            var expectedMeasure = expected.Measure(availableSpace.Value);
-            
-            valueMeasure.Should().BeEquivalentTo(expectedMeasure);
-        }
-        
-        private static void CompareDrawOperations(Element value, Element expected, Size? availableSpace = null)
-        {
-            availableSpace ??= new Size(400, 300);
-            
-            var valueCanvas = new OperationRecordingCanvas();
-            value.HandleVisitor(x => x.Initialize(null, valueCanvas));
-            value.Draw(availableSpace.Value);
-            
-            var expectedCanvas = new OperationRecordingCanvas();
-            expected.HandleVisitor(x => x.Initialize(null, expectedCanvas));
-            expected.Draw(availableSpace.Value);
-            
-            valueCanvas.Operations.Should().BeEquivalentTo(expectedCanvas.Operations);
-        }
     }
 }

QuestPDF.UnitTests/TestsBase.cs

@@ -1,22 +0,0 @@
-using FluentAssertions;
-using NUnit.Framework;
-
-namespace QuestPDF.UnitTests
-{
-    [SetUpFixture]
-    public class TestsBase
-    {
-        [OneTimeSetUp]
-        public void RunBeforeAnyTests()
-        {
-            AssertionOptions.AssertEquivalencyUsing(options => options
-                .IncludingNestedObjects()
-                .IncludingInternalProperties()
-                .IncludingInternalFields()
-                .AllowingInfiniteRecursion()
-                .RespectingRuntimeTypes()
-                .WithTracing()
-                .WithStrictOrdering());
-        }
-    }
-}

QuestPDF.UnitTests/TextTests.cs

@@ -0,0 +1,10 @@
+using NUnit.Framework;
+
+namespace QuestPDF.UnitTests
+{
+    [TestFixture]
+    public class TextTests
+    {
+        
+    }
+}

QuestPDF.UnitTests/TranslateTests.cs

@@ -1,31 +0,0 @@
-using NUnit.Framework;
-using QuestPDF.Elements;
-using QuestPDF.Infrastructure;
-using QuestPDF.UnitTests.TestEngine;
-
-namespace QuestPDF.UnitTests
-{
-    [TestFixture]
-    public class TranslateTests
-    {
-        [Test]
-        public void Measure() => SimpleContainerTests.Measure<Translate>();
-        
-        [Test]
-        public void Draw()
-        {
-            TestPlan
-                .For(x => new Translate
-                {
-                    Child = x.CreateChild(),
-                    TranslateX = 50,
-                    TranslateY = 75
-                })
-                .DrawElement(new Size(400, 300))
-                .ExpectCanvasTranslate(50, 75)
-                .ExpectChildDraw(new Size(400, 300))
-                .ExpectCanvasTranslate(-50, -75)
-                .CheckDrawResult();
-        }
-    }
-}

QuestPDF.UnitTests/UnconstrainedTests.cs

@@ -1,100 +0,0 @@
-using NUnit.Framework;
-using QuestPDF.Drawing;
-using QuestPDF.Elements;
-using QuestPDF.Infrastructure;
-using QuestPDF.UnitTests.TestEngine;
-
-namespace QuestPDF.UnitTests
-{
-    [TestFixture]
-    public class UnconstrainedTests
-    {
-        #region measure
-        
-        [Test]
-        public void Measure_Wrap()
-        {
-            TestPlan
-                .For(x => new Unconstrained
-                {
-                    Child = x.CreateChild()
-                })
-                .MeasureElement(new Size(900, 800))
-                .ExpectChildMeasure(Size.Max, SpacePlan.Wrap())
-                .CheckMeasureResult(SpacePlan.Wrap());
-        }
-        
-        [Test]
-        public void Measure_PartialRender()
-        {
-            TestPlan
-                .For(x => new Unconstrained
-                {
-                    Child = x.CreateChild()
-                })
-                .MeasureElement(new Size(900, 800))
-                .ExpectChildMeasure(Size.Max, SpacePlan.PartialRender(1200, 1600))
-                .CheckMeasureResult(SpacePlan.PartialRender(Size.Zero));
-        }
-        
-        [Test]
-        public void Measure_FullRender()
-        {
-            TestPlan
-                .For(x => new Unconstrained
-                {
-                    Child = x.CreateChild()
-                })
-                .MeasureElement(new Size(900, 800))
-                .ExpectChildMeasure(Size.Max, SpacePlan.FullRender(1200, 1600))
-                .CheckMeasureResult(SpacePlan.FullRender(Size.Zero));
-        }
-        
-        #endregion
-        
-        #region draw
-        
-        [Test]
-        public void Draw_SkipWhenChildWraps()
-        {
-            TestPlan
-                .For(x => new Unconstrained
-                {
-                    Child = x.CreateChild()
-                })
-                .DrawElement(new Size(900, 800))
-                .ExpectChildMeasure(Size.Max, SpacePlan.Wrap())
-                .CheckDrawResult();
-        }
-        
-        [Test]
-        public void Draw_WhenChildPartiallyRenders()
-        {
-            TestPlan
-                .For(x => new Unconstrained
-                {
-                    Child = x.CreateChild()
-                })
-                .DrawElement(new Size(900, 800))
-                .ExpectChildMeasure(Size.Max, SpacePlan.PartialRender(1200, 1600))
-                .ExpectChildDraw(new Size(1200, 1600))
-                .CheckDrawResult();
-        }
-        
-        [Test]
-        public void Draw_WhenChildFullyRenders()
-        {
-            TestPlan
-                .For(x => new Unconstrained
-                {
-                    Child = x.CreateChild()
-                })
-                .DrawElement(new Size(900, 800))
-                .ExpectChildMeasure(Size.Max, SpacePlan.FullRender(1600, 1000))
-                .ExpectChildDraw(new Size(1600, 1000))
-                .CheckDrawResult();
-        }
-        
-        #endregion
-    }
-}

QuestPDF/Assembly.cs

@@ -2,5 +2,4 @@
 
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
 [assembly: InternalsVisibleTo("QuestPDF.UnitTests")]
-[assembly: InternalsVisibleTo("QuestPDF.Examples")]
-[assembly: InternalsVisibleTo("QuestPDF.ReportSample")]
+[assembly: InternalsVisibleTo("QuestPDF.Examples")]

QuestPDF/Drawing/Canvas.cs

@@ -0,0 +1,59 @@
+using QuestPDF.Infrastructure;
+using SkiaSharp;
+
+namespace QuestPDF.Drawing
+{
+    internal class Canvas : ICanvas
+    {
+        internal SKCanvas SkiaCanvas { get; }
+        
+        public Canvas(SKCanvas skiaCanvas)
+        {
+            SkiaCanvas = skiaCanvas;
+        }
+        
+        ~Canvas()
+        {
+            SkiaCanvas.Dispose();
+        }
+
+        public void Translate(Position vector)
+        {
+            SkiaCanvas.Translate(vector.X, vector.Y);
+        }
+
+        public void DrawRectangle(Position vector, Size size, string color)
+        {
+            if (size.Width < Size.Epsilon || size.Height < Size.Epsilon)
+                return;
+
+            var paint = color.ColorToPaint();
+            SkiaCanvas.DrawRect(vector.X, vector.Y, size.Width, size.Height, paint);
+        }
+
+        public void DrawText(string text, Position vector, TextStyle style)
+        {
+            SkiaCanvas.DrawText(text, vector.X, vector.Y, style.ToPaint());
+        }
+
+        public void DrawImage(SKImage image, Position vector, Size size)
+        {
+            SkiaCanvas.DrawImage(image, new SKRect(vector.X, vector.Y, size.Width, size.Height));
+        }
+
+        public void DrawExternalLink(string url, Size size)
+        {
+            SkiaCanvas.DrawUrlAnnotation(new SKRect(0, 0, size.Width, size.Height), url);
+        }
+        
+        public void DrawLocationLink(string locationName, Size size)
+        {
+            SkiaCanvas.DrawLinkDestinationAnnotation(new SKRect(0, 0, size.Width, size.Height), locationName);
+        }
+
+        public void DrawLocation(string locationName)
+        {
+            SkiaCanvas.DrawNamedDestinationAnnotation(new SKPoint(0, 0), locationName);
+        }
+    }
+}

QuestPDF/Drawing/CanvasCache.cs

@@ -0,0 +1,63 @@
+using System.Collections.Concurrent;
+using QuestPDF.Drawing.SpacePlan;
+using QuestPDF.Infrastructure;
+using SkiaSharp;
+
+namespace QuestPDF.Drawing
+{
+    internal static class CanvasCache
+    {
+        private static ConcurrentDictionary<string, SKPaint> Paints = new ConcurrentDictionary<string, SKPaint>();
+        private static ConcurrentDictionary<string, SKPaint> ColorPaint = new ConcurrentDictionary<string, SKPaint>();
+
+        internal static SKPaint ColorToPaint(this string color)
+        {
+            return ColorPaint.GetOrAdd(color, Convert);
+
+            static SKPaint Convert(string color)
+            {
+                return new SKPaint
+                {
+                    Color = SKColor.Parse(color)
+                };
+            }
+        }
+        
+        internal static SKPaint ToPaint(this TextStyle style)
+        {
+            return Paints.GetOrAdd(style.ToString(), key => Convert(style));
+            
+            static SKPaint Convert(TextStyle style)
+            {
+                var slant = style.IsItalic ? SKFontStyleSlant.Italic : SKFontStyleSlant.Upright;
+                
+                return new SKPaint
+                {
+                    Color = SKColor.Parse(style.Color),
+                    Typeface = SKTypeface.FromFamilyName(style.FontType, (int)style.FontWeight, (int)SKFontStyleWidth.Normal, slant),
+                    TextSize = style.Size,
+                    TextEncoding = SKTextEncoding.Utf32,
+
+                    TextAlign = style.Alignment switch
+                    {
+                        HorizontalAlignment.Left => SKTextAlign.Left,
+                        HorizontalAlignment.Center => SKTextAlign.Center,
+                        HorizontalAlignment.Right => SKTextAlign.Right,
+                        _ => SKTextAlign.Left
+                    }
+                };
+            }
+        }
+
+        internal static TextMeasurement BreakText(this TextStyle style, string text, float availableWidth)
+        {
+            var index = (int)style.ToPaint().BreakText(text, availableWidth, out var width);
+            
+            return new TextMeasurement()
+            {
+                LineIndex = index,
+                FragmentWidth = width
+            };
+        }
+    }
+}

QuestPDF/Drawing/DocumentContainer.cs

@@ -1,35 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using QuestPDF.Elements;
-using QuestPDF.Fluent;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Drawing
-{
-    internal class DocumentContainer : IDocumentContainer
-    {
-        internal List<IComponent> Pages { get; set; } = new List<IComponent>();
-        
-        internal Container Compose()
-        {
-            var container = new Container();
-            
-            container
-                .Stack(stack =>
-                {
-                    Pages
-                        .SelectMany(x => new List<Action>()
-                        {
-                            () => stack.Item().PageBreak(),
-                            () => stack.Item().Component(x)
-                        })
-                        .Skip(1)
-                        .ToList()
-                        .ForEach(x => x());
-                });
-
-            return container;
-        }
-    }
-}

QuestPDF/Drawing/DocumentGenerator.cs

@@ -1,13 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using QuestPDF.Drawing.Exceptions;
-using QuestPDF.Drawing.Proxy;
-using QuestPDF.Elements;
-using QuestPDF.Elements.Text;
-using QuestPDF.Elements.Text.Items;
+using QuestPDF.Drawing.SpacePlan;
+using QuestPDF.Fluent;
+using QuestPDF.Helpers;
 using QuestPDF.Infrastructure;
+using SkiaSharp;
 
 namespace QuestPDF.Drawing
 {
@@ -15,152 +14,115 @@ namespace QuestPDF.Drawing
     {
         internal static void GeneratePdf(Stream stream, IDocument document)
         {
+            var content = ElementExtensions.Create(document.Compose);
             var metadata = document.GetMetadata();
-            var canvas = new PdfCanvas(stream, metadata);
-            RenderDocument(canvas, document);
-        }
-        
-        internal static void GenerateXps(Stream stream, IDocument document)
-        {
-            var metadata = document.GetMetadata();
-            var canvas = new XpsCanvas(stream, metadata);
-            RenderDocument(canvas, document);
-        }
-        
-        internal static ICollection<byte[]> GenerateImages(IDocument document)
-        {
-            var metadata = document.GetMetadata();
-            var canvas = new ImageCanvas(metadata);
-            RenderDocument(canvas, document);
-
-            return canvas.Images;
-        }
-
-        private static void RenderDocument<TCanvas>(TCanvas canvas, IDocument document)
-            where TCanvas : ICanvas, IRenderingCanvas
-        {
-            var container = new DocumentContainer();
-            document.Compose(container);
-            var content = container.Compose();
             
-            var metadata = document.GetMetadata();
-            var pageContext = new PageContext();
-
-            var debuggingState = metadata.ApplyDebugging ? ApplyDebugging(content) : null;
-            
-            if (metadata.ApplyCaching)
-                ApplyCaching(content);
-
-            RenderPass(pageContext, new FreeCanvas(), content, metadata, debuggingState);
-            RenderPass(pageContext, canvas, content, metadata, debuggingState);
-        }
-        
-        internal static void RenderPass<TCanvas>(PageContext pageContext, TCanvas canvas, Container content, DocumentMetadata documentMetadata, DebuggingState? debuggingState)
-            where TCanvas : ICanvas, IRenderingCanvas
-        {
-            content.HandleVisitor(x => x?.Initialize(pageContext, canvas));
-            content.HandleVisitor(x => (x as IStateResettable)?.ResetState());
-            
-            canvas.BeginDocument();
-
-            var currentPage = 1;
+            using var pdf = SKDocument.CreatePdf(stream, MapMetadata(metadata));
+            var totalPages = 1;
             
             while(true)
             {
-                pageContext.SetPageNumber(currentPage);
-                debuggingState?.Reset();
-                
-                var spacePlan = content.Measure(Size.Max);
+                var spacePlan = content.Measure(metadata.Size);
 
-                if (spacePlan.Type == SpacePlanType.Wrap)
-                {
-                    canvas.EndDocument();
-                    ThrowLayoutException();
-                }
+                using var skiaCanvas = pdf.BeginPage(metadata.Size.Width, metadata.Size.Height);
+                var canvas = new Canvas(skiaCanvas);
 
                 try
                 {
-                    canvas.BeginPage(spacePlan);
-                    content.Draw(spacePlan);
+                    content.Draw(canvas, metadata.Size);
                 }
                 catch (Exception exception)
                 {
-                    canvas.EndDocument();
+                    pdf.Close();
                     throw new DocumentDrawingException("An exception occured during document drawing.", exception);
                 }
 
-                canvas.EndPage();
+                pdf.EndPage();
 
-                if (currentPage >= documentMetadata.DocumentLayoutExceptionThreshold)
+                if (totalPages >= metadata.DocumentLayoutExceptionThreshold)
                 {
-                    canvas.EndDocument();
-                    ThrowLayoutException();
+                    pdf.Close();
+                    throw new DocumentLayoutException("Composed layout generates infinite document.");
                 }
                 
-                if (spacePlan.Type == SpacePlanType.FullRender)
+                if (spacePlan is FullRender)
                     break;
 
-                currentPage++;
+                totalPages++;
             }
             
-            canvas.EndDocument();
+            pdf.Close();
+        }
 
-            void ThrowLayoutException()
+        internal static IEnumerable<byte[]> GenerateImages(IDocument document)
+        {
+            var content = ElementExtensions.Create(document.Compose);
+            var metadata = document.GetMetadata();
+
+            var totalPages = 1;
+
+            while (true)
             {
-                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 {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.";
-                
-                throw new DocumentLayoutException(message)
+                var spacePlan = content.Measure(metadata.Size);
+                byte[] result;
+
+                try
                 {
-                    ElementTrace = debuggingState?.BuildTrace() ?? "Debug trace is available only in the DEBUG mode."
-                };
-            }
-        }
-
-        private static void ApplyCaching(Container content)
-        {
-            content.HandleVisitor(x =>
-            {
-                if (x is ICacheable)
-                    x.CreateProxy(y => new CacheProxy(y));
-            });
-        }
-
-        private static DebuggingState ApplyDebugging(Container content)
-        {
-            var debuggingState = new DebuggingState();
-
-            content.HandleVisitor(x =>
-            {
-                x.CreateProxy(y => new DebuggingProxy(debuggingState, y));
-            });
-
-            return debuggingState;
-        }
-
-        internal static void ApplyDefaultTextStyle(this Element content, TextStyle documentDefaultTextStyle)
-        {
-            documentDefaultTextStyle.ApplyGlobalStyle(TextStyle.LibraryDefault);
-            
-            content.HandleVisitor(element =>
-            {
-                var text = element as TextBlock;
-                
-                if (text == null)
-                    return;
-
-                foreach (var child in text.Children)
-                {
-                    if (child is TextBlockSpan textSpan)
-                        textSpan.Style.ApplyGlobalStyle(documentDefaultTextStyle);
-
-                    if (child is TextBlockElement textElement)
-                        ApplyDefaultTextStyle(textElement.Element, documentDefaultTextStyle);
+                    result = RenderPage(content);
                 }
-            });
+                catch (Exception exception)
+                {
+                    throw new DocumentDrawingException("An exception occured during document drawing.", exception);
+                }
+
+                yield return result;
+
+                if (totalPages >= metadata.DocumentLayoutExceptionThreshold)
+                {
+                    throw new DocumentLayoutException("Composed layout generates infinite document.");
+                }
+
+                if (spacePlan is FullRender)
+                    break;
+
+                totalPages++;
+            }
+
+            byte[] RenderPage(Element element)
+            {
+                // scale the result so it is more readable
+                var scalingFactor = metadata.RasterDpi / (float) PageSizes.PointsPerInch;
+                
+                var imageInfo = new SKImageInfo((int) (metadata.Size.Width * scalingFactor), (int) (metadata.Size.Height * scalingFactor));
+                using var surface = SKSurface.Create(imageInfo);
+                surface.Canvas.Scale(scalingFactor);
+
+                var canvas = new Canvas(surface.Canvas);
+                element?.Draw(canvas, metadata.Size);
+
+                surface.Canvas.Save();
+                return surface.Snapshot().Encode(SKEncodedImageFormat.Png, 100).ToArray();
+            }
+        }
+        
+        private static SKDocumentPdfMetadata MapMetadata(DocumentMetadata metadata)
+        {
+            return new SKDocumentPdfMetadata
+            {
+                Title = metadata.Title,
+                Author = metadata.Author,
+                Subject = metadata.Subject,
+                Keywords = metadata.Keywords,
+                Creator = metadata.Creator,
+                Producer = metadata.Producer,
+                
+                Creation = metadata.CreationDate,
+                Modified = metadata.ModifiedDate,
+                
+                RasterDpi = metadata.RasterDpi,
+                EncodingQuality = metadata.ImageQuality,
+                PdfA = metadata.PdfA
+            };
         }
     }
 }

QuestPDF/Drawing/DocumentMetadata.cs

@@ -1,9 +1,12 @@
 using System;
+using QuestPDF.Helpers;
+using QuestPDF.Infrastructure;
 
 namespace QuestPDF.Drawing
 {
     public class DocumentMetadata
     {
+        public Size Size { get; set; } = PageSizes.A4;
         public int ImageQuality { get; set; } = 101;
         public int RasterDpi { get; set; } = 72;
         public bool PdfA { get; set; }
@@ -23,10 +26,7 @@ namespace QuestPDF.Drawing
         /// (likely due to infinite layout), the exception is thrown.
         /// </summary>
         public int DocumentLayoutExceptionThreshold { get; set; } = 250;
-
-        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/DocumentLayoutException.cs

@@ -4,8 +4,6 @@ namespace QuestPDF.Drawing.Exceptions
 {
     public class DocumentLayoutException : Exception
     {
-        public string ElementTrace { get; set; }
-        
         public DocumentLayoutException()
         {
             

QuestPDF/Drawing/FontManager.cs

@@ -1,66 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.IO;
-using QuestPDF.Infrastructure;
-using SkiaSharp;
-
-namespace QuestPDF.Drawing
-{
-    public static class FontManager
-    {
-        private static ConcurrentDictionary<string, SKTypeface> Typefaces = new ConcurrentDictionary<string, SKTypeface>();
-        private static ConcurrentDictionary<string, SKFontMetrics> FontMetrics = new ConcurrentDictionary<string, SKFontMetrics>();
-        private static ConcurrentDictionary<string, SKPaint> Paints = new ConcurrentDictionary<string, SKPaint>();
-        private static ConcurrentDictionary<string, SKPaint> ColorPaint = new ConcurrentDictionary<string, SKPaint>();
-
-        public static void RegisterFontType(string fontName, Stream stream)
-        {
-            Typefaces.TryAdd(fontName, SKTypeface.FromStream(stream));
-        }
-        
-        internal static SKPaint ColorToPaint(this string color)
-        {
-            return ColorPaint.GetOrAdd(color, Convert);
-
-            static SKPaint Convert(string color)
-            {
-                return new SKPaint
-                {
-                    Color = SKColor.Parse(color)
-                };
-            }
-        }
-        
-        internal static SKPaint ToPaint(this TextStyle style)
-        {
-            return Paints.GetOrAdd(style.Key, key => Convert(style));
-            
-            static SKPaint Convert(TextStyle style)
-            {
-                return new SKPaint
-                {
-                    Color = SKColor.Parse(style.Color),
-                    Typeface = GetTypeface(style),
-                    TextSize = (style.Size ?? 12),
-                    TextEncoding = SKTextEncoding.Utf32
-                };
-            }
-
-            static SKTypeface GetTypeface(TextStyle style)
-            {
-                if (Typefaces.TryGetValue(style.FontType, out var result))
-                    return result;
-                
-                var slant = (style.IsItalic ?? false) ? SKFontStyleSlant.Italic : SKFontStyleSlant.Upright;
-                
-                return SKTypeface.FromFamilyName(style.FontType, (int)(style.FontWeight ?? FontWeight.Normal), (int)SKFontStyleWidth.Normal, slant) 
-                       ?? throw new ArgumentException($"The typeface {style.FontType} could not be found.");
-            }
-        }
-
-        internal static SKFontMetrics ToFontMetrics(this TextStyle style)
-        {
-            return FontMetrics.GetOrAdd(style.Key, key => style.ToPaint().FontMetrics);
-        }
-    }
-}