Create codeql-analysis.yml

Tweak US Letter and Legal page sizes

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,70 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ main ]
+  schedule:
+    - cron: '22 16 * * 5'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'csharp' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

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,4 +1,6 @@
-using NUnit.Framework;
+using System.IO;
+using NUnit.Framework;
+using QuestPDF.Drawing;
 using QuestPDF.Examples.Engine;
 using QuestPDF.Fluent;
 using QuestPDF.Helpers;
@@ -6,26 +8,25 @@ using QuestPDF.Infrastructure;
 
 namespace QuestPDF.Examples
 {
-    [TestFixture]
     public class BarcodeExamples
     {
         [Test]
-        public void Barcode()
+        public void Example()
         {
+            FontManager.RegisterFontType("LibreBarcode39", File.OpenRead("LibreBarcode39-Regular.ttf"));
+            
             RenderingTest
                 .Create()
-                .PageSize(300, 300)
+                .PageSize(400, 100)
+                .ShowResults()
                 .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));
-                        });
+                        .Background(Colors.White)
+                        .AlignCenter()
+                        .AlignMiddle()
+                        .Text("*QuestPDF*", TextStyle.Default.FontType("LibreBarcode39").Size(64));
                 });
         }
     }
-}
+}

QuestPDF.Examples/CanvasExamples.cs

@@ -0,0 +1,57 @@
+using Microcharts;
+using NUnit.Framework;
+using QuestPDF.Examples.Engine;
+using QuestPDF.Fluent;
+using QuestPDF.Helpers;
+using QuestPDF.Infrastructure;
+using SkiaSharp;
+
+namespace QuestPDF.Examples
+{
+    public class CanvasExamples
+    {
+        [Test]
+        public void BorderRadius()
+        {
+            RenderingTest
+                .Create()
+                .PageSize(175, 100)
+                .ProduceImages()
+                .ShowResults()
+                .Render(container =>
+                {
+                    container
+                        .Background(Colors.Grey.Lighten2)
+                        .Padding(25)
+                        .MinimalBox()
+                        .Layers(layers =>
+                        {
+                            layers.Layer().Canvas((canvas, size) =>
+                            {
+                                DrawRoundedRectangle(Colors.White, false);
+                                DrawRoundedRectangle(Colors.Blue.Darken2, true);
+
+                                void DrawRoundedRectangle(string color, bool isStroke)
+                                {
+                                    using var paint = new SKPaint
+                                    {
+                                        Color = SKColor.Parse(color),
+                                        IsStroke = isStroke,
+                                        StrokeWidth = 2,
+                                        IsAntialias = true
+                                    };
+                                
+                                    canvas.DrawRoundRect(0, 0, size.Width, size.Height, 20, 20, paint);
+                                }
+                            });
+                            
+                            layers
+                                .PrimaryLayer()
+                                .PaddingVertical(10)
+                                .PaddingHorizontal(20)
+                                .Text("Sample text", TextStyle.Default.Size(16).Color(Colors.Blue.Darken2).SemiBold());
+                        });
+                });
+        }
+    }
+}

QuestPDF.Examples/ChartExamples.cs

@@ -0,0 +1,85 @@
+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

@@ -0,0 +1,56 @@
+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/DebuggingTesting.cs

@@ -0,0 +1,76 @@
+using NUnit.Framework;
+using QuestPDF.Drawing.Exceptions;
+using QuestPDF.Examples.Engine;
+using QuestPDF.Fluent;
+using QuestPDF.Helpers;
+
+namespace QuestPDF.Examples
+{
+    public class DebuggingTesting
+    {
+        [Test]
+        public void Stack()
+        {
+            Assert.Throws<DocumentLayoutException>(() =>
+            {
+                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()
+        {
+            Assert.Throws<DocumentLayoutException>(() =>
+            {
+                RenderingTest
+                    .Create()
+                    .PageSize(500, 360)
+                    .Render(container =>
+                    {
+                        container
+                            .Padding(10)
+                            .Width(100)
+                            .Background(Colors.Grey.Lighten3)
+                            .Width(150)
+                            .Text("Test");
+                    });
+            });
+        }
+
+        [Test]
+        public void DebugPointer()
+        {
+            Assert.Throws<DocumentLayoutException>(() =>
+            {
+                RenderingTest
+                    .Create()
+                    .PageSize(500, 360)
+                    .Render(container =>
+                    {
+                        container
+                            .Background(Colors.Grey.Lighten3)
+                            .Padding(10)
+                            .Width(100)
+                            .DebugPointer("Example debug pointer")
+                            .Width(150)
+                            .Text("Example");
+                    });
+            });
+        }
+    }
+}

QuestPDF.Examples/DefaultTextStyleExamples.cs

@@ -0,0 +1,53 @@
+using System.Drawing;
+using System.Linq;
+using NUnit.Framework;
+using QuestPDF.Examples.Engine;
+using QuestPDF.Fluent;
+using QuestPDF.Helpers;
+using QuestPDF.Infrastructure;
+
+namespace QuestPDF.Examples
+{
+    public class DefaultTextStyleExamples
+    {
+        [Test]
+        public void Placeholder()
+        {
+            RenderingTest
+                .Create()
+                .PageSize(220, 270)
+                .ProduceImages()
+                .ShowResults()
+                .EnableDebugging()
+                .Render(container =>
+                {
+                    container
+                        .Padding(10)
+                        .DefaultTextStyle(TextStyle.Default.Bold().Underline())
+                        .Stack(stack =>
+                        { 
+                            stack.Item().Text("Default style applies to all children", TextStyle.Default);
+                            stack.Item().Text("You can override certain styles", TextStyle.Default.Underline(false).Color(Colors.Green.Darken2));
+                            
+                            stack.Item().PaddingTop(10).Border(1).Grid(grid =>
+                            {
+                                grid.Columns(4);
+
+                                foreach (var i in Enumerable.Range(1, 16))
+                                {
+                                    grid.Item()
+                                        .Border(1)
+                                        .BorderColor(Colors.Grey.Lighten1)
+                                        .Background(Colors.Grey.Lighten3)
+                                        .Width(50)
+                                        .Height(50)
+                                        .AlignCenter()
+                                        .AlignMiddle()
+                                        .Text(i, TextStyle.Default.Size(16 + i / 4));   
+                                }
+                            });
+                        });
+                });
+        }
+    }
+}

QuestPDF.Examples/DifferentHeaderOnFirstPageExample.cs

@@ -0,0 +1,55 @@
+using System.Linq;
+using NUnit.Framework;
+using QuestPDF.Examples.Engine;
+using QuestPDF.Fluent;
+using QuestPDF.Helpers;
+using QuestPDF.Infrastructure;
+
+namespace QuestPDF.Examples
+{
+    public class DifferentHeaderOnFirstPageExample
+    {
+        [Test]
+        public void Placeholder()
+        {
+            RenderingTest
+                .Create()
+                .PageSize(PageSizes.A6)
+                .ProduceImages()
+                .ShowResults()
+                .EnableDebugging()
+                .RenderDocument(container =>
+                {
+                    container.Page(page =>
+                    {
+                        page.Size(PageSizes.A6);
+                        page.Margin(30);
+                        page.Background(Colors.White);
+                        
+                        page.Header().Stack(stack =>
+                        {
+                            stack.Item().ShowOnce().Background(Colors.Blue.Lighten2).Height(60);
+                            stack.Item().SkipOnce().Background(Colors.Green.Lighten2).Height(40);
+                        });
+                        
+                        page.Content().PaddingVertical(10).Stack(stack =>
+                        {
+                            stack.Spacing(10);
+
+                            foreach (var _ in Enumerable.Range(0, 13))
+                                stack.Item().Background(Colors.Grey.Lighten2).Height(40);
+                        });
+                        
+                        page.Footer().AlignCenter().Text(text =>
+                        {
+                            text.DefaultTextStyle(TextStyle.Default.Size(16));
+                            
+                            text.CurrentPageNumber();
+                            text.Span(" / ");
+                            text.TotalPages();
+                        });
+                    });
+                });
+        }
+    }
+}

QuestPDF.Examples/ElementExamples.cs

@@ -148,7 +148,7 @@ namespace QuestPDF.Examples
                 {
                     container
                         .Padding(25)
-                        .Debug("Grid example", Colors.Blue.Medium)
+                        .DebugArea("Grid example", Colors.Blue.Medium)
                         .Grid(grid =>
                         {
                             grid.Columns(3);
@@ -474,7 +474,7 @@ namespace QuestPDF.Examples
                         .Padding(15)
                         .Border(4)
                         .BorderColor(Colors.Blue.Medium)
-                        //.Box()
+                        //.MinimalBox()
                         .Background(Colors.Grey.Lighten2)
                         .Padding(15)
                         .Text("Test of the \n box element", TextStyle.Default.Size(20));
@@ -542,7 +542,7 @@ namespace QuestPDF.Examples
                 {
                     container
                         .Background("#FFF")
-                        .Box()
+                        .MinimalBox()
                         
                         .Padding(25)
                         
@@ -588,7 +588,7 @@ namespace QuestPDF.Examples
 
                                         return element;
                                     })
-                                    .Box()
+                                    .MinimalBox()
                                     .Background(Colors.White)
                                     .Padding(10)
                                     .Text($"Rotated {turns * 90}°", TextStyle.Default.Size(16));
@@ -686,7 +686,7 @@ namespace QuestPDF.Examples
                                         
                                         return element;
                                     })
-                                    .Box()
+                                    .MinimalBox()
                                     .Background(Colors.White)
                                     .Padding(10)
                                     .Text($"Flipped {turns}", TextStyle.Default.Size(16));

QuestPDF.Examples/Engine/RenderingTest.cs

@@ -18,7 +18,10 @@ namespace QuestPDF.Examples.Engine
     {
         private string FileNamePrefix = "test";
         private Size Size { get; set; }
+        private int? MaxPagesThreshold { get; set; }
         private bool ShowResult { get; set; }
+        private bool ApplyCaching { get; set; }
+        private bool ApplyDebugging { get; set; }
         private RenderingTestResult ResultType { get; set; } = RenderingTestResult.Images;
         
         private RenderingTest()
@@ -66,6 +69,24 @@ namespace QuestPDF.Examples.Engine
             return this;
         }
         
+        public RenderingTest MaxPages(int value)
+        {
+            MaxPagesThreshold = value;
+            return this;
+        }
+        
+        public RenderingTest EnableCaching(bool value = true)
+        {
+            ApplyCaching = value;
+            return this;
+        }
+        
+        public RenderingTest EnableDebugging(bool value = true)
+        {
+            ApplyDebugging = value;
+            return this;
+        }
+        
         public void Render(Action<IContainer> content)
         {
             RenderDocument(container =>
@@ -80,8 +101,8 @@ namespace QuestPDF.Examples.Engine
 
         public void RenderDocument(Action<IDocumentContainer> content)
         {
-            var maxPages = ResultType == RenderingTestResult.Pdf ? 1000 : 10;
-            var document = new SimpleDocument(content, maxPages);
+            MaxPagesThreshold ??= ResultType == RenderingTestResult.Pdf ? 1000 : 10;
+            var document = new SimpleDocument(content, MaxPagesThreshold.Value, ApplyCaching, ApplyDebugging);
 
             Render(document);
         }

QuestPDF.Examples/Engine/SimpleDocument.cs

@@ -13,11 +13,15 @@ namespace QuestPDF.Examples.Engine
         
         private Action<IDocumentContainer> Content { get; }
         private int MaxPages { get; }
+        private bool ApplyCaching { get; }
+        private bool ApplyDebugging { get; }
 
-        public SimpleDocument(Action<IDocumentContainer> content, int maxPages)
+        public SimpleDocument(Action<IDocumentContainer> content, int maxPages, bool applyCaching, bool applyDebugging)
         {
             Content = content;
             MaxPages = maxPages;
+            ApplyCaching = applyCaching;
+            ApplyDebugging = applyDebugging;
         }
         
         public DocumentMetadata GetMetadata()
@@ -25,7 +29,9 @@ namespace QuestPDF.Examples.Engine
             return new DocumentMetadata()
             {
                 RasterDpi = PageSizes.PointsPerInch * ImageScalingFactor,
-                DocumentLayoutExceptionThreshold = MaxPages
+                DocumentLayoutExceptionThreshold = MaxPages,
+                ApplyCaching = ApplyCaching,
+                ApplyDebugging = ApplyDebugging
             };
         }
         

QuestPDF.Examples/FrameExample.cs

@@ -12,12 +12,14 @@ namespace QuestPDF.Examples
         {
             return container
                 .Border(1)
-                .Background(dark ? Colors.Grey.Lighten2 : Colors.White)
-                .Padding(10);
+                .BorderColor(Colors.Grey.Medium)
+                .Background(dark ? Colors.Grey.Lighten3 : Colors.White)
+                .Padding(5);
         }
         
-        public static void LabelCell(this IContainer container, string text) => container.Cell(true).Text(text, TextStyle.Default.Medium());
+        public static void LabelCell(this IContainer container, string text) => container.Cell(true).Text(text, TextStyle.Default.SemiBold());
         public static IContainer ValueCell(this IContainer container) => container.Cell(false);
+        public static void ValueCell(this IContainer container, string text) => container.ValueCell().Text(text, TextStyle.Default);
     }
     
     public class FrameExample
@@ -36,7 +38,7 @@ namespace QuestPDF.Examples
                         .Padding(25)
                         .Stack(stack =>
                         {
-                            for(var i=1; i<=4; i++)
+                            for(var i = 1; i <= 4; i++)
                             {
                                 stack.Item().Row(row =>
                                 {

QuestPDF.Examples/ImageExamples.cs

@@ -0,0 +1,51 @@
+using System.IO;
+using NUnit.Framework;
+using QuestPDF.Drawing.Exceptions;
+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()
+        {
+            Assert.Throws<DocumentComposeException>(() =>
+            {
+                RenderingTest
+                    .Create()
+                    .PageSize(PageSizes.A2)
+                    .ProducePdf()
+                    .ShowResults()
+                    .Render(page => page.Image("non_existent.png"));
+            });
+        }
+    }
+}

QuestPDF.Examples/InlinedExamples.cs

@@ -37,7 +37,7 @@ namespace QuestPDF.Examples
                             decoration
                                 .Content()
                                 .PaddingTop(25)
-                                //.Box()
+                                //.MinimalBox()
                                 .Border(1)
                                 .Background(Colors.Grey.Lighten2)
                                 .Inlined(inlined =>
@@ -87,23 +87,24 @@ namespace QuestPDF.Examples
         {
             RenderingTest
                 .Create()
-                .PageSize(400, 250)
+                .PageSize(800, 600)
                 .ProduceImages()
                 .ShowResults()
                 .Render(container =>
                 {
                     container
                         .Padding(20)
+                        .MinimalBox()
                         .Border(1)
-                        .Background(Colors.Grey.Lighten3)
+                        .Background(Colors.Grey.Lighten4)
                         .Inlined(inlined =>
                         {
                             inlined.VerticalSpacing(50);
-                            inlined.HorizontalSpacing(20);
-                            inlined.AlignSpaceAround();
-                            inlined.BaselineTop();
+                            inlined.HorizontalSpacing(25);
+                            inlined.AlignRight();
+                            inlined.BaselineMiddle();
 
-                            foreach (var _ in Enumerable.Range(0, 20))
+                            foreach (var _ in Enumerable.Range(0, 100))
                                 inlined.Item().Element(RandomBlock);
                         });
                 });

QuestPDF.Examples/LoremPicsumExample.cs

@@ -36,6 +36,8 @@ namespace QuestPDF.Examples
             RenderingTest
                 .Create()
                 .PageSize(350, 280)
+                .ProducePdf()
+                .ShowResults()
                 .Render(container =>
                 {
                     container

QuestPDF.Examples/QuestPDF.Examples.csproj

@@ -6,10 +6,13 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
+        <PackageReference Include="microcharts" Version="0.9.5.9" />
         <PackageReference Include="nunit" Version="3.13.2" />
         <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
         <PackageReference Include="SkiaSharp" Version="2.80.3" />
+        <PackageReference Include="Svg.Skia" Version="0.5.10" />
     </ItemGroup>
 
     <ItemGroup>
@@ -23,6 +26,12 @@
       <None Update="LibreBarcode39-Regular.ttf">
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       </None>
+      <None Update="logo.png">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="pdf-icon.svg">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
     </ItemGroup>
 
 </Project>

QuestPDF.Examples/RowExamples.cs

@@ -0,0 +1,94 @@
+using NUnit.Framework;
+using QuestPDF.Examples.Engine;
+using QuestPDF.Fluent;
+using QuestPDF.Helpers;
+using QuestPDF.Infrastructure;
+
+namespace QuestPDF.Examples
+{
+    public class RowExamples
+    {
+        [Test]
+        public void ColumnTypes()
+        {
+            RenderingTest
+                .Create()
+                .ProducePdf()
+                .PageSize(650, 300)
+                .ShowResults()
+                .Render(container =>
+                {
+                    container
+                        .Padding(25)
+                        .MinimalBox()
+                        .Border(1)
+                        .Stack(stack =>
+                        {
+                            stack.Item().LabelCell("Total width: 600px");
+                            
+                            stack.Item().Row(row =>
+                            {
+                                row.ConstantColumn(150).ValueCell("150px");
+                                row.ConstantColumn(100).ValueCell("100px");
+                                row.RelativeColumn(4).ValueCell("200px");
+                                row.RelativeColumn(3).ValueCell("150px");
+                            });
+                            
+                            stack.Item().Row(row =>
+                            {
+                                row.ConstantColumn(100).ValueCell("100px");
+                                row.ConstantColumn(50).ValueCell("50px");
+                                row.RelativeColumn(3).ValueCell("300px");
+                                row.RelativeColumn(1).ValueCell("100px");
+                                row.ConstantColumn(50).ValueCell("50px");
+                            });
+                        });
+                });
+        }
+        
+        [Test]
+        public void Stability()
+        {
+            // up to version 2021.12, this code would always result with the infinite layout exception
+            
+            RenderingTest
+                .Create()
+                .ProducePdf()
+                .MaxPages(100)
+                .PageSize(250, 150)
+                .ShowResults()
+                .Render(container =>
+                {
+                    container
+                        .Padding(25)
+                        .Row(row =>
+                        {
+                            row.RelativeColumn().Stack(stack =>
+                            {
+                                stack.Item().ShowOnce().Element(CreateBox).Text("X");
+                                stack.Item().Element(CreateBox).Text("1");
+                                stack.Item().Element(CreateBox).Text("2");
+                            });
+                                
+                            row.RelativeColumn().Stack(stack =>
+                            {
+                                stack.Item().Element(CreateBox).Text("1");
+                                stack.Item().Element(CreateBox).Text("2");
+                            });
+                        });
+                });
+
+            static IContainer CreateBox(IContainer container)
+            {
+                return container
+                    .ExtendHorizontal()
+                    .ExtendVertical()
+                    .Background(Colors.Grey.Lighten4)
+                    .Border(1)
+                    .AlignCenter()
+                    .AlignMiddle()
+                    .ShowOnce();
+            }
+        }
+    }
+}

QuestPDF.Examples/SvgImageExample.cs

@@ -0,0 +1,36 @@
+using NUnit.Framework;
+using QuestPDF.Examples.Engine;
+using QuestPDF.Fluent;
+using QuestPDF.Helpers;
+using QuestPDF.Infrastructure;
+using SkiaSharp;
+using Svg.Skia;
+
+namespace QuestPDF.Examples
+{
+    public class SvgImageExample
+    {
+        [Test]
+        public void BorderRadius()
+        {
+            RenderingTest
+                .Create()
+                .PageSize(175, 100)
+                .ProduceImages()
+                .ShowResults()
+                .Render(container =>
+                {
+                    container
+                        .Background(Colors.Grey.Lighten2)
+                        .Padding(25)
+                        .Canvas((canvas, space) =>
+                        {
+                            using var svg = new SKSvg();
+                            svg.Load("pdf-icon.svg");
+                            
+                            canvas.DrawPicture(svg.Picture);
+                        });
+                });
+        }
+    }
+}

QuestPDF.Examples/TableExamples.cs

@@ -0,0 +1,500 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Drawing;
+using System.Linq;
+using NUnit.Framework;
+using QuestPDF.Drawing;
+using QuestPDF.Examples.Engine;
+using QuestPDF.Fluent;
+using QuestPDF.Helpers;
+using QuestPDF.Infrastructure;
+using IContainer = QuestPDF.Infrastructure.IContainer;
+
+namespace QuestPDF.Examples
+{
+    public class TableExamples
+    {
+        [Test]
+        public void BasicPlacement()
+        {
+            RenderingTest
+                .Create()
+                .ProduceImages()
+                .PageSize(220, 220)
+                .ShowResults()
+                .Render(container =>
+                {
+                    container
+                        .Padding(10)
+                        .MinimalBox()
+                        .Border(1)
+                        .Table(table =>
+                        {
+                            table.ColumnsDefinition(columns =>
+                            {
+                                columns.RelativeColumn();
+                                columns.RelativeColumn();
+                                columns.RelativeColumn();
+                                columns.RelativeColumn();
+                            });
+
+                            // by using custom 'Element' method, we can reuse visual configuration
+                            table.Cell().Row(1).Column(4).Element(Block).Text("A");
+                            table.Cell().Row(2).Column(2).Element(Block).Text("B");
+                            table.Cell().Row(3).Column(3).Element(Block).Text("C");
+                            table.Cell().Row(4).Column(1).Element(Block).Text("D");
+                        });
+                });
+        }
+        
+        [Test]
+        public void PagingSupport()
+        {
+            RenderingTest
+                .Create()
+                .ProducePdf()
+                .PageSize(420, 220)
+                .ShowResults()
+                .Render(container =>
+                {
+                    container
+                        .Padding(10)
+                        .MinimalBox()
+                        .Border(1)
+                        .Table(table =>
+                        {
+                            table.ColumnsDefinition(columns =>
+                            {
+                                columns.RelativeColumn();
+                                columns.RelativeColumn();
+                                columns.RelativeColumn();
+                                columns.RelativeColumn();
+                            });
+
+                            // by using custom 'Element' method, we can reuse visual configuration
+                            table.Cell().Element(Block).Text(Placeholders.Label());
+                            table.Cell().Element(Block).Text(Placeholders.Label());
+                            table.Cell().Element(Block).Text(Placeholders.Paragraph());
+                            table.Cell().Element(Block).Text(Placeholders.Label());
+                        });
+                });
+        }
+        
+        [Test]
+        public void DefaultCellStyle()
+        {
+            RenderingTest
+                .Create()
+                .ProduceImages()
+                .PageSize(220, 120)
+                .ShowResults()
+                .Render(container =>
+                {
+                    container
+                        .Padding(10)
+                        .MinimalBox()
+                        .Border(1)
+                        .DefaultTextStyle(TextStyle.Default.Size(16))
+                        .Table(table =>
+                        {
+                            table.ColumnsDefinition(columns =>
+                            {
+                                columns.RelativeColumn();
+                                columns.RelativeColumn();
+                                columns.RelativeColumn();
+                                columns.RelativeColumn();
+                            });
+
+                            table.Cell().Row(1).Column(1).Element(Block).Text("A");
+                            table.Cell().Row(2).Column(2).Element(Block).Text("B");
+                            table.Cell().Row(1).Column(3).Element(Block).Text("C");
+                            table.Cell().Row(2).Column(4).Element(Block).Text("D");
+                        });
+                });
+        }
+        
+        [Test]
+        public void ColumnsDefinition()
+        {
+            RenderingTest
+                .Create()
+                .ProduceImages()
+                .PageSize(320, 80)
+                .ShowResults()
+                .Render(container =>
+                {
+                    container
+                        .Padding(10)
+                        .Table(table =>
+                        {
+                            table.ColumnsDefinition(columns =>
+                            {
+                                columns.ConstantColumn(50);
+                                columns.ConstantColumn(100);
+                                columns.RelativeColumn(2);
+                                columns.RelativeColumn(3);
+                            });
+
+                            table.Cell().ColumnSpan(4).LabelCell("Total width: 300px");
+                            table.Cell().ValueCell("50px");
+                            table.Cell().ValueCell("100px");
+                            table.Cell().ValueCell("100px");
+                            table.Cell().ValueCell("150px");
+                        });
+                });
+        }
+
+        [Test]
+        public void PartialAutoPlacement()
+        {
+            RenderingTest
+                .Create()
+                .ProduceImages()
+                .PageSize(220, 220)
+                .ShowResults()
+                .Render(container =>
+                {
+                    container
+                        .Padding(10)
+                        .MinimalBox()
+                        .Border(1)
+                        .Table(table =>
+                        {
+                            table.ColumnsDefinition(columns =>
+                            {
+                                columns.RelativeColumn();
+                                columns.RelativeColumn();
+                                columns.RelativeColumn();
+                                columns.RelativeColumn();
+                            });
+
+                            table.Cell().Element(Block).Text("A");
+                            table.Cell().Row(2).Column(2).Element(Block).Text("B");
+                            table.Cell().Element(Block).Text("C");
+                            table.Cell().Row(3).Column(3).Element(Block).Text("D");
+                            table.Cell().ColumnSpan(2).Element(Block).Text("E");
+                        });
+                });
+        }
+        
+        [Test]
+        public void ExtendLastCellsToTableBottom()
+        {
+            RenderingTest
+                .Create()
+                .ProduceImages()
+                .PageSize(220, 170)
+                .ShowResults()
+                .Render(container =>
+                {
+                    container
+                        .Padding(10)
+                        .MinimalBox()
+                        .Border(1)
+                        .Table(table =>
+                        {
+                            table.ColumnsDefinition(columns =>
+                            {
+                                columns.RelativeColumn();
+                                columns.RelativeColumn();
+                                columns.RelativeColumn();
+                                columns.RelativeColumn();
+                            });
+                            
+                            table.ExtendLastCellsToTableBottom();
+
+                            table.Cell().Row(1).Column(1).Element(Block).Text("A");
+                            table.Cell().Row(3).Column(1).Element(Block).Text("B");
+                            table.Cell().Row(2).Column(2).Element(Block).Text("C");
+                            table.Cell().Row(3).Column(3).Element(Block).Text("D");
+                            table.Cell().Row(2).RowSpan(2).Column(4).Element(Block).Text("E");
+                        });
+                });
+        }
+        
+        [Test]
+        public void Overlapping()
+        {
+            RenderingTest
+                .Create()
+                .ProduceImages()
+                .PageSize(170, 170)
+                .ShowResults()
+                .Render(container =>
+                {
+                    container
+                        .Padding(10)
+                        .MinimalBox()
+                        .Border(1)
+                        .Table(table =>
+                        {
+                            table.ColumnsDefinition(columns =>
+                            {
+                                columns.RelativeColumn();
+                                columns.RelativeColumn();
+                                columns.RelativeColumn();
+                            });
+
+                            table.Cell().Row(1).RowSpan(3).Column(1).ColumnSpan(3).Background(Colors.Grey.Lighten3).MinHeight(150);
+                            table.Cell().Row(1).RowSpan(2).Column(1).ColumnSpan(2).Background(Colors.Grey.Lighten1).MinHeight(100);
+                            table.Cell().Row(3).Column(3).Background(Colors.Grey.Darken1).MinHeight(50);
+                        });
+                });
+        }
+        
+        [Test]
+        public void Spans()
+        {
+            RenderingTest
+                .Create()
+                .ProduceImages()
+                .PageSize(220, 170)
+                .ShowResults()
+                .Render(container =>
+                {
+                    container
+                        .Padding(10)
+                        .Table(table =>
+                        {
+                            table.ColumnsDefinition(columns =>
+                            {
+                                columns.RelativeColumn();
+                                columns.RelativeColumn();
+                                columns.RelativeColumn();
+                                columns.RelativeColumn();
+                            });
+
+                            table.Cell().RowSpan(2).ColumnSpan(2).Element(Block).Text("1");
+                            table.Cell().ColumnSpan(2).Element(Block).Text("2");
+                            table.Cell().Element(Block).Text("3");
+                            table.Cell().Element(Block).Text("4");
+                            table.Cell().RowSpan(2).Element(Block).Text("5");
+                            table.Cell().ColumnSpan(2).Element(Block).Text("6");
+                            table.Cell().RowSpan(2).Element(Block).Text("7");
+                            table.Cell().Element(Block).Text("8");
+                            table.Cell().Element(Block).Text("9");
+                        });
+                });
+        }
+
+        [Test]
+        public void Stability()
+        {
+            RenderingTest
+                .Create()
+                .ProduceImages()
+                .PageSize(300, 300)
+                .ShowResults()
+                .Render(container =>
+                {
+                    container
+                        .Padding(10)
+                        .Table(table =>
+                        {
+                            table.ColumnsDefinition(columns =>
+                            {
+                                columns.RelativeColumn();
+                                columns.RelativeColumn();
+                                columns.RelativeColumn();
+                                columns.RelativeColumn();
+                            });
+
+                            table.Cell().RowSpan(4).Element(Block).Text("1");
+                            
+                            table.Cell().RowSpan(2).Element(Block).Text("2");
+                            table.Cell().RowSpan(1).Element(Block).Text("3");
+                            table.Cell().RowSpan(1).Element(Block).Text("4");
+                            
+                            table.Cell().RowSpan(2).Element(Block).Text("5");
+                            table.Cell().RowSpan(1).Element(Block).Text("6");
+                            table.Cell().RowSpan(1).Element(Block).Text("7");
+                        });
+                });
+        }
+        
+        [Test]
+        public void TableHeader()
+        {
+            RenderingTest
+                .Create()
+                .ProduceImages()
+                .PageSize(500, 200)
+                .ShowResults()
+                .EnableDebugging()
+                .Render(container =>
+                {
+                    var pageSizes = new List<(string name, double width, double height)>()
+                    {
+                        ("Letter (ANSI A)", 8.5f, 11),
+                        ("Legal", 8.5f, 14),
+                        ("Ledger (ANSI B)", 11, 17),
+                        ("Tabloid (ANSI B)", 17, 11),
+                        ("ANSI C", 22, 17),
+                        ("ANSI D", 34, 22),
+                        ("ANSI E", 44, 34)
+                    };
+
+                    const int inchesToPoints = 72;
+                    
+                    container
+                        .Padding(10)
+                        .MinimalBox()
+                        .Border(1)
+                        .Table(table =>
+                        {
+                            IContainer DefaultCellStyle(IContainer container, string backgroundColor)
+                            {
+                                return container
+                                    .Border(1)
+                                    .BorderColor(Colors.Grey.Lighten1)
+                                    .Background(backgroundColor)
+                                    .PaddingVertical(5)
+                                    .PaddingHorizontal(10)
+                                    .AlignCenter()
+                                    .AlignMiddle();
+                            }
+                            
+                            table.ColumnsDefinition(columns =>
+                            {
+                                columns.RelativeColumn();
+                                
+                                columns.ConstantColumn(75);
+                                columns.ConstantColumn(75);
+                                
+                                columns.ConstantColumn(75);
+                                columns.ConstantColumn(75);
+                            });
+                            
+                            table.Header(header =>
+                            {
+                                header.Cell().RowSpan(2).Element(CellStyle).ExtendHorizontal().AlignLeft().Text("Document type");
+                                    
+                                header.Cell().ColumnSpan(2).Element(CellStyle).Text("Inches");
+                                header.Cell().ColumnSpan(2).Element(CellStyle).Text("Points");
+                                    
+                                header.Cell().Element(CellStyle).Text("Width");
+                                header.Cell().Element(CellStyle).Text("Height");
+                                    
+                                header.Cell().Element(CellStyle).Text("Width");
+                                header.Cell().Element(CellStyle).Text("Height");
+
+                                // you can extend already existing styles by creating additional methods
+                                IContainer CellStyle(IContainer container) => DefaultCellStyle(container, Colors.Grey.Lighten3); 
+                            });
+        
+                            foreach (var page in pageSizes)
+                            {
+                                table.Cell().Element(CellStyle).ExtendHorizontal().AlignLeft().Text(page.name);
+                                        
+                                // inches
+                                table.Cell().Element(CellStyle).Text(page.width);
+                                table.Cell().Element(CellStyle).Text(page.height);
+                                        
+                                // points
+                                table.Cell().Element(CellStyle).Text(page.width * inchesToPoints);
+                                table.Cell().Element(CellStyle).Text(page.height * inchesToPoints);
+                                        
+                                IContainer CellStyle(IContainer container) => DefaultCellStyle(container, Colors.White); 
+                            }
+                        });
+                });
+        }
+        
+        [Test]
+        public void PerformanceText_TemperatureReport()
+        {
+            RenderingTest
+                .Create()
+                .ProducePdf()
+                .PageSize(PageSizes.A4)
+                .MaxPages(10_000)
+                .EnableCaching()
+                .EnableDebugging(false)
+                .ShowResults()
+                .Render(container => GeneratePerformanceStructure(container, 250));
+        }
+        
+        public static void GeneratePerformanceStructure(IContainer container, int repeats)
+        {
+            container
+                .Padding(25)
+                //.Background(Colors.Blue.Lighten2)
+                .MinimalBox()
+                .Border(1)
+                //.Background(Colors.Red.Lighten2)
+                .Table(table =>
+                {
+                    table.ColumnsDefinition(columns =>
+                    {
+                        columns.ConstantColumn(100);
+                        columns.RelativeColumn();
+                        columns.ConstantColumn(100);
+                        columns.RelativeColumn();
+                    });
+                    
+                    table.ExtendLastCellsToTableBottom();
+
+                    foreach (var i in Enumerable.Range(0, repeats))
+                    {
+                        table.Cell().RowSpan(3).LabelCell("Project");
+                        table.Cell().RowSpan(3).ShowEntire().ValueCell(Placeholders.Sentence());
+                
+                        table.Cell().LabelCell("Report number");
+                        table.Cell().ValueCell(i.ToString());
+                        
+                        table.Cell().LabelCell("Date");
+                        table.Cell().ValueCell(Placeholders.ShortDate());
+
+                        table.Cell().LabelCell("Inspector");
+                        table.Cell().ValueCell("Marcin Ziąbek");
+                
+                        table.Cell().ColumnSpan(2).LabelCell("Morning weather");
+                        table.Cell().ColumnSpan(2).LabelCell("Evening weather");
+                
+                        table.Cell().ValueCell("Time");
+                        table.Cell().ValueCell("7:13");
+                
+                        table.Cell().ValueCell("Time");
+                        table.Cell().ValueCell("18:25");
+                
+                        table.Cell().ValueCell("Description");
+                        table.Cell().ValueCell("Sunny");
+                
+                        table.Cell().ValueCell("Description");
+                        table.Cell().ValueCell("Windy");
+                
+                        table.Cell().ValueCell("Wind");
+                        table.Cell().ValueCell("Mild");
+                
+                        table.Cell().ValueCell("Wind");
+                        table.Cell().ValueCell("Strong");
+                
+                        table.Cell().ValueCell("Temperature");
+                        table.Cell().ValueCell("17°C");
+                
+                        table.Cell().ValueCell("Temperature");
+                        table.Cell().ValueCell("32°C");
+                
+                        table.Cell().LabelCell("Remarks");
+                        table.Cell().ColumnSpan(3).ValueCell(Placeholders.Paragraph());
+                    }
+                });
+        }
+        
+        // this method uses a higher order function to define a custom and dynamic style
+        static IContainer Block(IContainer container)
+        {
+            return container
+                .Border(1)
+                .Background(Colors.Grey.Lighten3)
+                .ShowOnce()
+                .MinWidth(50)
+                .MinHeight(50)
+                .Padding(10)
+                .AlignCenter()
+                .AlignMiddle();
+        }
+    }
+}

QuestPDF.Examples/TextExamples.cs

@@ -24,7 +24,7 @@ namespace QuestPDF.Examples
                 {
                     container
                         .Padding(5)
-                        .Box()
+                        .MinimalBox()
                         .Border(1)
                         .Padding(10)
                         .Text(text =>
@@ -48,7 +48,7 @@ namespace QuestPDF.Examples
                 {
                     container
                         .Padding(5)
-                        .Box()
+                        .MinimalBox()
                         .Border(1)
                         .Padding(10)
                         .Text(text =>
@@ -76,7 +76,7 @@ namespace QuestPDF.Examples
                 {
                     container
                         .Padding(5)
-                        .Box()
+                        .MinimalBox()
                         .Border(1)
                         .Padding(10)
                         .Text(text =>
@@ -108,7 +108,7 @@ namespace QuestPDF.Examples
                     container
                         .Padding(20)
                         .Padding(10)
-                        .Box()
+                        .MinimalBox()
                         .Border(1)
                         .Padding(5)
                         .Padding(10)
@@ -138,7 +138,7 @@ namespace QuestPDF.Examples
                     container
                         .Padding(20)
                         .Padding(10)
-                        .Box()
+                        .MinimalBox()
                         .Border(1)
                         .Padding(5)
                         .Padding(10)
@@ -167,7 +167,7 @@ namespace QuestPDF.Examples
                     container
                         .Padding(20)
                         .Padding(10)
-                        .Box()
+                        .MinimalBox()
                         .Border(1)
                         .Padding(5)
                         .Padding(10)
@@ -230,7 +230,7 @@ namespace QuestPDF.Examples
                     container
                         .Padding(20)
                         .Padding(10)
-                        .Box()
+                        .MinimalBox()
                         .Border(1)
                         .Padding(5)
                         .Padding(10)

QuestPDF.Examples/pdf-icon.svg

@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="75.320129mm"
+   height="92.604164mm"
+   viewBox="0 0 75.320129 92.604164"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="PDF file icon.svg">
+  <title
+     id="title2682">PDF file icon</title>
+  <defs
+     id="defs2">
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath839">
+      <rect
+         style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke"
+         id="rect841"
+         width="68.688263"
+         height="67.886459"
+         x="-74.033661"
+         y="141.44913" />
+    </clipPath>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="122.12727"
+     inkscape:cy="167.02823"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g899"
+     showgrid="false"
+     inkscape:object-nodes="false"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-page="false"
+     inkscape:snap-others="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>PDF file icon</dc:title>
+        <dc:date>08/10/2018</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Adobe Systems</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title>CMetalCore</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:description>Fuente del texto &quot;PDF&quot;:
+Franklin Gothic Medium Cond</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(36.076172,-93.731774)">
+    <g
+       id="g899"
+       transform="matrix(1.4843054,0,0,1.4843054,17.471885,-90.243502)">
+      <g
+         id="g876">
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ff2116;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.11666656;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+           d="m -29.632812,123.94727 c -3.551967,0 -6.44336,2.89347 -6.44336,6.44531 v 49.49804 c 0,3.55185 2.891393,6.44532 6.44336,6.44532 H 8.2167969 c 3.5519661,0 6.4433591,-2.89335 6.4433591,-6.44532 v -40.70117 c 0,0 0.101353,-1.19181 -0.416015,-2.35156 -0.484969,-1.08711 -1.275391,-1.84375 -1.275391,-1.84375 a 1.0584391,1.0584391 0 0 0 -0.0059,-0.008 L 3.5722246,125.7752 a 1.0584391,1.0584391 0 0 0 -0.015625,-0.0156 c 0,0 -0.8017392,-0.76344 -1.9902344,-1.27344 -1.39939552,-0.6005 -2.8417968,-0.53711 -2.8417968,-0.53711 l 0.021484,-0.002 z"
+           id="path890" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.11666656;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+           d="m -29.632812,126.06445 h 28.3789058 a 1.0584391,1.0584391 0 0 0 0.021484,0 c 0,0 1.13480448,0.011 1.96484378,0.36719 0.79889772,0.34282 1.36536982,0.86176 1.36914062,0.86524 1.25e-5,1e-5 0.00391,0.004 0.00391,0.004 l 9.3671868,9.18945 c 0,0 0.564354,0.59582 0.837891,1.20899 0.220779,0.49491 0.234375,1.40039 0.234375,1.40039 a 1.0584391,1.0584391 0 0 0 -0.002,0.0449 v 40.74609 c 0,2.41592 -1.910258,4.32813 -4.3261717,4.32813 H -29.632812 c -2.415914,0 -4.326172,-1.91209 -4.326172,-4.32813 v -49.49804 c 0,-2.41603 1.910258,-4.32813 4.326172,-4.32813 z"
+           id="rect2684" />
+        <path
+           sodipodi:nodetypes="scccscccscccccssscacccsccccccccccccccccccccaccccccccc"
+           inkscape:connector-curvature="0"
+           d="m -23.40766,161.09299 c -1.45669,-1.45669 0.11934,-3.45839 4.39648,-5.58397 l 2.69124,-1.33743 1.04845,-2.29399 c 0.57665,-1.26169 1.43729,-3.32036 1.91254,-4.5748 l 0.8641,-2.28082 -0.59546,-1.68793 c -0.73217,-2.07547 -0.99326,-5.19438 -0.52872,-6.31588 0.62923,-1.51909 2.69029,-1.36323 3.50626,0.26515 0.63727,1.27176 0.57212,3.57488 -0.18329,6.47946 l -0.6193,2.38125 0.5455,0.92604 c 0.30003,0.50932 1.1764,1.71867 1.9475,2.68743 l 1.44924,1.80272 1.8033728,-0.23533 c 5.72900399,-0.74758 7.6912472,0.523 7.6912472,2.34476 0,2.29921 -4.4984914,2.48899 -8.2760865,-0.16423 -0.8499666,-0.59698 -1.4336605,-1.19001 -1.4336605,-1.19001 0,0 -2.3665326,0.48178 -3.531704,0.79583 -1.202707,0.32417 -1.80274,0.52719 -3.564509,1.12186 0,0 -0.61814,0.89767 -1.02094,1.55026 -1.49858,2.4279 -3.24833,4.43998 -4.49793,5.1723 -1.3991,0.81993 -2.86584,0.87582 -3.60433,0.13733 z m 2.28605,-0.81668 c 0.81883,-0.50607 2.47616,-2.46625 3.62341,-4.28553 l 0.46449,-0.73658 -2.11497,1.06339 c -3.26655,1.64239 -4.76093,3.19033 -3.98386,4.12664 0.43653,0.52598 0.95874,0.48237 2.01093,-0.16792 z m 21.21809,-5.95578 c 0.80089,-0.56097 0.68463,-1.69142 -0.22082,-2.1472 -0.70466,-0.35471 -1.2726074,-0.42759 -3.1031574,-0.40057 -1.1249,0.0767 -2.9337647,0.3034 -3.2403347,0.37237 0,0 0.993716,0.68678 1.434896,0.93922 0.58731,0.33544 2.0145161,0.95811 3.0565161,1.27706 1.02785,0.31461 1.6224,0.28144 2.0729,-0.0409 z m -8.53152,-3.54594 c -0.4847,-0.50952 -1.30889,-1.57296 -1.83152,-2.3632 -0.68353,-0.89643 -1.02629,-1.52887 -1.02629,-1.52887 0,0 -0.4996,1.60694 -0.90948,2.57394 l -1.27876,3.16076 -0.37075,0.71695 c 0,0 1.971043,-0.64627 2.97389,-0.90822 1.0621668,-0.27744 3.21787,-0.70134 3.21787,-0.70134 z m -2.74938,-11.02573 c 0.12363,-1.0375 0.1761,-2.07346 -0.15724,-2.59587 -0.9246,-1.01077 -2.04057,-0.16787 -1.85154,2.23517 0.0636,0.8084 0.26443,2.19033 0.53292,3.04209 l 0.48817,1.54863 0.34358,-1.16638 c 0.18897,-0.64151 0.47882,-2.02015 0.64411,-3.06364 z"
+           style="fill:#ff2116;fill-opacity:1;stroke-width:0.26458335"
+           id="path2697" />
+        <g
+           id="g858">
+          <path
+             inkscape:connector-curvature="0"
+             id="path845"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:'Franklin Gothic Medium Cond';-inkscape-font-specification:'Franklin Gothic Medium Cond';letter-spacing:0px;word-spacing:4.26000023px;fill:#2c2c2c;fill-opacity:1;stroke:none;stroke-width:0.35824656px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             d="m -20.930423,167.83862 h 2.364986 q 1.133514,0 1.840213,0.2169 0.706698,0.20991 1.189489,0.9446 0.482795,0.72769 0.482795,1.75625 0,0.94459 -0.391832,1.6233 -0.391833,0.67871 -1.056548,0.97958 -0.65772,0.30087 -2.02913,0.30087 h -0.818651 v 3.72941 h -1.581322 z m 1.581322,1.22447 v 3.33058 h 0.783664 q 1.049552,0 1.44838,-0.39184 0.405826,-0.39183 0.405826,-1.27345 0,-0.65772 -0.265887,-1.06355 -0.265884,-0.41282 -0.587747,-0.50378 -0.314866,-0.098 -1.000572,-0.098 z" />
+          <path
+             inkscape:connector-curvature="0"
+             id="path847"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:'Franklin Gothic Medium Cond';-inkscape-font-specification:'Franklin Gothic Medium Cond';letter-spacing:0px;word-spacing:4.26000023px;fill:#2c2c2c;fill-opacity:1;stroke:none;stroke-width:0.35824656px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             d="m -13.842461,167.83862 h 2.148082 q 1.560333,0 2.4909318,0.55276 0.9375993,0.55276 1.4133973,1.6443 0.482791,1.09153 0.482791,2.42096 0,1.3994 -0.4338151,2.49793 -0.4268149,1.09153 -1.3154348,1.76324 -0.8816233,0.67172 -2.5189212,0.67172 h -2.267031 z m 1.581326,1.26645 v 7.018 h 0.657715 q 1.378411,0 2.001144,-0.9516 0.6227329,-0.95858 0.6227329,-2.5539 0,-3.5125 -2.6238769,-3.5125 z" />
+          <path
+             inkscape:connector-curvature="0"
+             id="path849"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:'Franklin Gothic Medium Cond';-inkscape-font-specification:'Franklin Gothic Medium Cond';letter-spacing:0px;word-spacing:4.26000023px;fill:#2c2c2c;fill-opacity:1;stroke:none;stroke-width:0.35824656px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             d="m -5.7889096,167.83862 h 5.30372941 v 1.26645 H -4.2075842 v 2.85478 h 2.9807225 v 1.26646 h -2.9807225 v 4.16322 h -1.5813254 z" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>

QuestPDF.ReportSample/DataSource.cs

@@ -86,7 +86,6 @@ namespace QuestPDF.ReportSample
                 return new ReportSectionMap
                 {
                     Label = "Location",
-                    ImageSource = Placeholders.Image,
                     Location = Helpers.RandomLocation()
                 };
             }
@@ -96,10 +95,7 @@ namespace QuestPDF.ReportSample
                 return new ReportSectionPhotos
                 {    
                     Label = "Photos",
-                    Photos = Enumerable
-                        .Range(0, Helpers.Random.Next(1, 15))
-                        .Select(x => Placeholders.Image(400, 300))
-                        .ToList()
+                    PhotoCount = Helpers.Random.Next(1, 15)
                 };
             }
 
@@ -107,14 +103,9 @@ 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(),
-
-                    MapContextSource = x => Placeholders.Image(400, 300),
-                    MapDetailsSource = x => Placeholders.Image(400, 300)
+                    Location = Helpers.RandomLocation()
                 };
             }
         }

QuestPDF.ReportSample/Helpers.cs

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

QuestPDF.ReportSample/Layouts/DifferentHeadersTemplate.cs

@@ -31,12 +31,12 @@ namespace QuestPDF.ReportSample.Layouts
                 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);
+                    row.RelativeColumn(1).AlignRight().MinimalBox().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);
+                    row.RelativeColumn(1).AlignRight().MinimalBox().Background(Colors.Blue.Lighten4).Padding(15);
                 });
             });
         }

QuestPDF.ReportSample/Layouts/ImagePlaceholder.cs

@@ -0,0 +1,20 @@
+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

@@ -1,32 +0,0 @@
-using System;
-using QuestPDF.Fluent;
-using QuestPDF.Helpers;
-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(Colors.Grey.Lighten3)
-                .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).Image(Placeholders.Image);
+                    row.RelativeColumn(2).AspectRatio(4 / 3f).Component<ImagePlaceholder>();
 
                     row.RelativeColumn().PaddingLeft(5).Stack(stack =>
                     {
                         stack.Spacing(7f);
                         
-                        stack.Item().AspectRatio(4 / 3f).Image(Placeholders.Image);
-                        stack.Item().AspectRatio(4 / 3f).Image(Placeholders.Image);
+                        stack.Item().AspectRatio(4 / 3f).Component<ImagePlaceholder>();
+                        stack.Item().AspectRatio(4 / 3f).Component<ImagePlaceholder>();
                     });
                 });
         }

QuestPDF.ReportSample/Layouts/SectionTemplate.cs

@@ -1,3 +1,4 @@
+using System.Linq;
 using QuestPDF.Fluent;
 using QuestPDF.Helpers;
 using QuestPDF.Infrastructure;
@@ -49,7 +50,7 @@ namespace QuestPDF.ReportSample.Layouts
         
         void MapElement(IContainer container, ReportSectionMap model)
         {
-            if (model.ImageSource == null || model.Location == null)
+            if (model.Location == null)
             {
                 container.Text("No location provided");
                 return;
@@ -59,25 +60,28 @@ namespace QuestPDF.ReportSample.Layouts
             {
                 stack.Spacing(5);
                 
-                stack.Item().MaxWidth(250).AspectRatio(4 / 3f).Image(Placeholders.Image);
+                stack.Item().MaxWidth(250).AspectRatio(4 / 3f).Component<ImagePlaceholder>();
                 stack.Item().Text(model.Location.Format());
             });
         }
         
         void PhotosElement(IContainer container, ReportSectionPhotos model)
         {
-            if (model.Photos.Count == 0)
+            if (model.PhotoCount == 0)
             {
-                container.Text("No photos");
+                container.Text("No photos", Typography.Normal);
                 return;
             }
 
-            container.Debug("Photos").Grid(grid =>
+            container.DebugArea("Photos").Grid(grid =>
             {
                 grid.Spacing(5);
                 grid.Columns(3);
                 
-                model.Photos.ForEach(x => grid.Item().AspectRatio(4 / 3f).Image(Placeholders.Image));
+                Enumerable
+                    .Range(0, model.PhotoCount)
+                    .ToList()
+                    .ForEach(x => grid.Item().AspectRatio(4 / 3f).Component<ImagePlaceholder>());
             });
         }
     }

QuestPDF.ReportSample/Layouts/StandardReport.cs

@@ -55,7 +55,7 @@ namespace QuestPDF.ReportSample.Layouts
                     row.Spacing(50);
                     
                     row.RelativeColumn().PaddingTop(-10).Text(Model.Title, Typography.Title);
-                    row.ConstantColumn(150).ExternalLink("https://www.questpdf.com").Image(Model.LogoData);
+                    row.ConstantColumn(90).ExternalLink("https://www.questpdf.com").MaxHeight(30).Component<ImagePlaceholder>();
                 });
 
                 stack.Item().ShowOnce().PaddingVertical(15).Border(1f).BorderColor(Colors.Grey.Lighten1).ExtendHorizontal();

QuestPDF.ReportSample/Models.cs

@@ -44,22 +44,16 @@ namespace QuestPDF.ReportSample
     
     public class ReportSectionMap : ReportSectionElement
     {
-        public Func<Size, byte[]> ImageSource { get; set; }
         public Location Location { get; set; }
     }
 
     public class ReportSectionPhotos : ReportSectionElement
     {
-        public List<byte[]> Photos { get; set; }
+        public int PhotoCount { 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

@@ -0,0 +1,75 @@
+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.Helpers;
+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.VisitChildren(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,9 +8,10 @@
     </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.5.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
         <PackageReference Include="SkiaSharp" Version="2.80.3" />
     </ItemGroup>
 

QuestPDF.ReportSample/Tests.cs

@@ -3,62 +3,56 @@ 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
     {
-        [Test] 
-        public void GenerateAndShow()
+        private StandardReport Report { get; set; }
+        
+        [SetUp]
+        public void SetUp()
         {
-            var reportModel = DataSource.GetReport();
-            var report = new StandardReport(reportModel);
-            
+            var model = DataSource.GetReport();
+            Report = new StandardReport(model);
+        }
+        
+        [Test] 
+        public void GenerateAndShowPdf()
+        {
+            ImagePlaceholder.Solid = true;
+        
             var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"test_result.pdf");
-            report.GeneratePdf(path);
-            
+            Report.GeneratePdf(path);
             Process.Start("explorer.exe", path);
         }
-
+        
         [Test] 
-        public void PerformanceBenchmark()
+        public void GenerateAndShowXps()
         {
-            // target document length should be around 100 pages
+            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;
             
-            // test size
-            const int testSize = 10;
-            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();
+            var container = new DocumentContainer();
+            Report.Compose(container);
+            var content = container.Compose();
             
-            sw.Start();
-            var totalSize = reports.Select(x => x.GeneratePdf()).Sum(x => (long)x.Length);
-            sw.Stop();
+            var metadata = Report.GetMetadata();
+            var pageContext = new PageContext();
 
-            // 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.");
+            DocumentGenerator.RenderPass(pageContext, new FreeCanvas(), content, metadata, null);
+            DocumentGenerator.RenderPass(pageContext, new FreeCanvas(), content, metadata, null);
         }
     }
 }

QuestPDF.UnitTests/AlignmentTests.cs

@@ -1,5 +1,5 @@
 using NUnit.Framework;
-using QuestPDF.Drawing.SpacePlan;
+using QuestPDF.Drawing;
 using QuestPDF.Elements;
 using QuestPDF.Infrastructure;
 using QuestPDF.UnitTests.TestEngine;
@@ -23,7 +23,7 @@ namespace QuestPDF.UnitTests
                     Child = x.CreateChild()
                 })
                 .DrawElement(new Size(1000, 500))
-                .ExpectChildMeasure(expectedInput: new Size(1000, 500), returns: new PartialRender(new Size(400, 200)))
+                .ExpectChildMeasure(expectedInput: new Size(1000, 500), returns: SpacePlan.PartialRender(new Size(400, 200)))
                 .ExpectCanvasTranslate(new Position(300, 150))
                 .ExpectChildDraw(new Size(400, 200))
                 .ExpectCanvasTranslate(new Position(-300, -150))
@@ -42,7 +42,7 @@ namespace QuestPDF.UnitTests
                     Child = x.CreateChild()
                 })
                 .DrawElement(new Size(400, 300))
-                .ExpectChildMeasure(expectedInput: new Size(400, 300), returns: new FullRender(new Size(100, 50)))
+                .ExpectChildMeasure(expectedInput: new Size(400, 300), returns: SpacePlan.FullRender(new Size(100, 50)))
                 .ExpectCanvasTranslate(new Position(0, 125))
                 .ExpectChildDraw(new Size(100, 50))
                 .ExpectCanvasTranslate(new Position(0, -125))
@@ -61,7 +61,7 @@ namespace QuestPDF.UnitTests
                     Child = x.CreateChild()
                 })
                 .DrawElement(new Size(400, 300))
-                .ExpectChildMeasure(expectedInput: new Size(400, 300), returns: new FullRender(new Size(100, 50)))
+                .ExpectChildMeasure(expectedInput: new Size(400, 300), returns: SpacePlan.FullRender(new Size(100, 50)))
                 .ExpectCanvasTranslate(new Position(150, 250))
                 .ExpectChildDraw(new Size(100, 50))
                 .ExpectCanvasTranslate(new Position(-150, -250))
@@ -80,7 +80,7 @@ namespace QuestPDF.UnitTests
                     Child = x.CreateChild()
                 })
                 .DrawElement(new Size(400, 300))
-                .ExpectChildMeasure(expectedInput: new Size(400, 300), returns: new FullRender(new Size(100, 50)))
+                .ExpectChildMeasure(expectedInput: new Size(400, 300), returns: SpacePlan.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.SpacePlan;
+using QuestPDF.Drawing;
 using QuestPDF.Elements;
 using QuestPDF.Infrastructure;
 using QuestPDF.UnitTests.TestEngine;
@@ -20,8 +20,8 @@ namespace QuestPDF.UnitTests
                     Ratio = 2f
                 })
                 .MeasureElement(new Size(400, 201))
-                .ExpectChildMeasure(new Size(400, 200), new FullRender(100, 50))
-                .CheckMeasureResult(new FullRender(400, 200));
+                .ExpectChildMeasure(new Size(400, 200), SpacePlan.FullRender(100, 50))
+                .CheckMeasureResult(SpacePlan.FullRender(400, 200));
         }
         
         [Test]
@@ -35,8 +35,8 @@ namespace QuestPDF.UnitTests
                     Ratio = 2f
                 })
                 .MeasureElement(new Size(400, 201))
-                .ExpectChildMeasure(new Size(400, 200), new PartialRender(100, 50))
-                .CheckMeasureResult(new PartialRender(400, 200));
+                .ExpectChildMeasure(new Size(400, 200), SpacePlan.PartialRender(100, 50))
+                .CheckMeasureResult(SpacePlan.PartialRender(400, 200));
         }
         
         [Test]
@@ -50,8 +50,8 @@ namespace QuestPDF.UnitTests
                     Ratio = 2f
                 })
                 .MeasureElement(new Size(400, 201))
-                .ExpectChildMeasure(new Size(400, 200), new Wrap())
-                .CheckMeasureResult(new Wrap());
+                .ExpectChildMeasure(new Size(400, 200), SpacePlan.Wrap())
+                .CheckMeasureResult(SpacePlan.Wrap());
         }
         
         [Test]
@@ -65,8 +65,8 @@ namespace QuestPDF.UnitTests
                     Ratio = 2f
                 })
                 .MeasureElement(new Size(400, 201))
-                .ExpectChildMeasure(new Size(400, 200), new FullRender(100, 50))
-                .CheckMeasureResult(new FullRender(400, 200));
+                .ExpectChildMeasure(new Size(400, 200), SpacePlan.FullRender(100, 50))
+                .CheckMeasureResult(SpacePlan.FullRender(400, 200));
         }
 
         [Test]
@@ -80,7 +80,7 @@ namespace QuestPDF.UnitTests
                     Ratio = 2f
                 })
                 .MeasureElement(new Size(400, 199))
-                .CheckMeasureResult(new Wrap());
+                .CheckMeasureResult(SpacePlan.Wrap());
         }
         
         [Test]
@@ -94,8 +94,8 @@ namespace QuestPDF.UnitTests
                     Ratio = 2f
                 })
                 .MeasureElement(new Size(401, 200))
-                .ExpectChildMeasure(new Size(400, 200), new FullRender(100, 50))
-                .CheckMeasureResult(new FullRender(400, 200));
+                .ExpectChildMeasure(new Size(400, 200), SpacePlan.FullRender(100, 50))
+                .CheckMeasureResult(SpacePlan.FullRender(400, 200));
         }
         
         [Test]
@@ -109,7 +109,7 @@ namespace QuestPDF.UnitTests
                     Ratio = 2f
                 })
                 .MeasureElement(new Size(399, 200))
-                .CheckMeasureResult(new Wrap());
+                .CheckMeasureResult(SpacePlan.Wrap());
         }
         
         [Test]
@@ -123,8 +123,8 @@ namespace QuestPDF.UnitTests
                     Ratio = 2f
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure(new Size(400, 200), new FullRender(100, 50))
-                .CheckMeasureResult(new FullRender(400, 200));
+                .ExpectChildMeasure(new Size(400, 200), SpacePlan.FullRender(100, 50))
+                .CheckMeasureResult(SpacePlan.FullRender(400, 200));
         }
         
         [Test]
@@ -138,8 +138,8 @@ namespace QuestPDF.UnitTests
                     Ratio = 2f
                 })
                 .MeasureElement(new Size(500, 200))
-                .ExpectChildMeasure(new Size(400, 200), new FullRender(100, 50))
-                .CheckMeasureResult(new FullRender(400, 200));
+                .ExpectChildMeasure(new Size(400, 200), SpacePlan.FullRender(100, 50))
+                .CheckMeasureResult(SpacePlan.FullRender(400, 200));
         }
         
         [Test]

QuestPDF.UnitTests/BorderTests.cs

@@ -1,5 +1,5 @@
 using NUnit.Framework;
-using QuestPDF.Drawing.SpacePlan;
+using QuestPDF.Drawing;
 using QuestPDF.Elements;
 using QuestPDF.Helpers;
 using QuestPDF.Infrastructure;
@@ -27,8 +27,8 @@ namespace QuestPDF.UnitTests
                     Child = x.CreateChild()
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure(expectedInput: new Size(400, 300), returns: new FullRender(new Size(100, 50)))
-                .CheckMeasureResult( new FullRender(new Size(100, 50)));
+                .ExpectChildMeasure(expectedInput: new Size(400, 300), returns: SpacePlan.FullRender(new Size(100, 50)))
+                .CheckMeasureResult( SpacePlan.FullRender(new Size(100, 50)));
         }
         
         [Test]

QuestPDF.UnitTests/BoxTests.cs

@@ -1,5 +1,5 @@
 using NUnit.Framework;
-using QuestPDF.Drawing.SpacePlan;
+using QuestPDF.Drawing;
 using QuestPDF.Elements;
 using QuestPDF.Infrastructure;
 using QuestPDF.UnitTests.TestEngine;
@@ -10,18 +10,18 @@ namespace QuestPDF.UnitTests
     public class BoxTests
     {
         [Test]
-        public void Measure() => SimpleContainerTests.Measure<Box>();
+        public void Measure() => SimpleContainerTests.Measure<MinimalBox>();
         
         [Test]
         public void Draw_Wrap()
         {
             TestPlan
-                .For(x => new Box
+                .For(x => new MinimalBox
                 {
                     Child = x.CreateChild()
                 })
                 .DrawElement(new Size(400, 300))
-                .ExpectChildMeasure(expectedInput: new Size(400, 300), returns: new Wrap())
+                .ExpectChildMeasure(expectedInput: new Size(400, 300), returns: SpacePlan.Wrap())
                 .CheckDrawResult();
         }
         
@@ -29,12 +29,12 @@ namespace QuestPDF.UnitTests
         public void Measure_PartialRender()
         {
             TestPlan
-                .For(x => new Box
+                .For(x => new MinimalBox
                 {
                     Child = x.CreateChild()
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure(expectedInput: new Size(400, 300), returns: new PartialRender(200, 100))
+                .ExpectChildMeasure(expectedInput: new Size(400, 300), returns: SpacePlan.PartialRender(200, 100))
                 .ExpectChildDraw(new Size(200, 100))
                 .CheckDrawResult();
         }
@@ -43,12 +43,12 @@ namespace QuestPDF.UnitTests
         public void Measure_FullRender()
         {
             TestPlan
-                .For(x => new Box
+                .For(x => new MinimalBox
                 {
                     Child = x.CreateChild()
                 })
                 .MeasureElement(new Size(500, 400))
-                .ExpectChildMeasure(expectedInput: new Size(500, 400), returns: new FullRender(300, 200))
+                .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.SpacePlan;
+using QuestPDF.Drawing;
 using QuestPDF.Elements;
 using QuestPDF.Infrastructure;
 using QuestPDF.UnitTests.TestEngine;
@@ -20,7 +20,7 @@ namespace QuestPDF.UnitTests
                     MinHeight = 100
                 })
                 .MeasureElement(new Size(400, 50))
-                .CheckMeasureResult(new Wrap());
+                .CheckMeasureResult(SpacePlan.Wrap());
         }
         
         [Test]
@@ -33,8 +33,8 @@ namespace QuestPDF.UnitTests
                     Child = x.CreateChild()
                 })
                 .MeasureElement(new Size(400, 200))
-                .ExpectChildMeasure(new Size(400, 200), new FullRender(400, 50))
-                .CheckMeasureResult(new FullRender(400, 100));
+                .ExpectChildMeasure(new Size(400, 200), SpacePlan.FullRender(400, 50))
+                .CheckMeasureResult(SpacePlan.FullRender(400, 100));
         }
         
         [Test]
@@ -47,8 +47,8 @@ namespace QuestPDF.UnitTests
                     Child = x.CreateChild()
                 })
                 .MeasureElement(new Size(400, 200))
-                .ExpectChildMeasure(new Size(400, 200), new FullRender(400, 150))
-                .CheckMeasureResult(new FullRender(400, 150));
+                .ExpectChildMeasure(new Size(400, 200), SpacePlan.FullRender(400, 150))
+                .CheckMeasureResult(SpacePlan.FullRender(400, 150));
         }
         
         [Test]
@@ -60,7 +60,7 @@ namespace QuestPDF.UnitTests
                     MaxHeight = 100
                 })
                 .MeasureElement(new Size(400, 150))
-                .CheckMeasureResult(new FullRender(0, 0));
+                .CheckMeasureResult(SpacePlan.FullRender(0, 0));
         }
         
         [Test]
@@ -73,8 +73,8 @@ namespace QuestPDF.UnitTests
                     Child = x.CreateChild()
                 })
                 .MeasureElement(new Size(400, 200))
-                .ExpectChildMeasure(new Size(400, 100), new PartialRender(400, 75))
-                .CheckMeasureResult(new PartialRender(400, 75));
+                .ExpectChildMeasure(new Size(400, 100), SpacePlan.PartialRender(400, 75))
+                .CheckMeasureResult(SpacePlan.PartialRender(400, 75));
         }
         
         [Test]
@@ -87,8 +87,8 @@ namespace QuestPDF.UnitTests
                     Child = x.CreateChild()
                 })
                 .MeasureElement(new Size(400, 200))
-                .ExpectChildMeasure(new Size(400, 100), new Wrap())
-                .CheckMeasureResult(new Wrap());
+                .ExpectChildMeasure(new Size(400, 100), SpacePlan.Wrap())
+                .CheckMeasureResult(SpacePlan.Wrap());
         }
         
         #endregion
@@ -104,7 +104,7 @@ namespace QuestPDF.UnitTests
                     MinWidth = 100
                 })
                 .MeasureElement(new Size(50, 400))
-                .CheckMeasureResult(new Wrap());
+                .CheckMeasureResult(SpacePlan.Wrap());
         }
         
         [Test]
@@ -117,8 +117,8 @@ namespace QuestPDF.UnitTests
                     Child = x.CreateChild()
                 })
                 .MeasureElement(new Size(200, 400))
-                .ExpectChildMeasure(new Size(200, 400), new FullRender(50, 400))
-                .CheckMeasureResult(new FullRender(100, 400));
+                .ExpectChildMeasure(new Size(200, 400), SpacePlan.FullRender(50, 400))
+                .CheckMeasureResult(SpacePlan.FullRender(100, 400));
         }
         
         [Test]
@@ -131,8 +131,8 @@ namespace QuestPDF.UnitTests
                     Child = x.CreateChild()
                 })
                 .MeasureElement(new Size(200, 400))
-                .ExpectChildMeasure(new Size(200, 400), new FullRender(150, 400))
-                .CheckMeasureResult(new FullRender(150, 400));
+                .ExpectChildMeasure(new Size(200, 400), SpacePlan.FullRender(150, 400))
+                .CheckMeasureResult(SpacePlan.FullRender(150, 400));
         }
         
         [Test]
@@ -144,7 +144,7 @@ namespace QuestPDF.UnitTests
                     MaxWidth = 100
                 })
                 .MeasureElement(new Size(150, 400))
-                .CheckMeasureResult(new FullRender(0, 0));
+                .CheckMeasureResult(SpacePlan.FullRender(0, 0));
         }
         
         [Test]
@@ -157,8 +157,8 @@ namespace QuestPDF.UnitTests
                     Child = x.CreateChild()
                 })
                 .MeasureElement(new Size(200, 400))
-                .ExpectChildMeasure(new Size(100, 400), new PartialRender(75, 400))
-                .CheckMeasureResult(new PartialRender(75, 400));
+                .ExpectChildMeasure(new Size(100, 400), SpacePlan.PartialRender(75, 400))
+                .CheckMeasureResult(SpacePlan.PartialRender(75, 400));
         }
         
         [Test]
@@ -171,8 +171,8 @@ namespace QuestPDF.UnitTests
                     Child = x.CreateChild()
                 })
                 .MeasureElement(new Size(200, 400))
-                .ExpectChildMeasure(new Size(100, 400), new Wrap())
-                .CheckMeasureResult(new Wrap());
+                .ExpectChildMeasure(new Size(100, 400), SpacePlan.Wrap())
+                .CheckMeasureResult(SpacePlan.Wrap());
         }
         
         #endregion

QuestPDF.UnitTests/DecorationTests.cs

@@ -1,5 +1,5 @@
 using NUnit.Framework;
-using QuestPDF.Drawing.SpacePlan;
+using QuestPDF.Drawing;
 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 SimpleDecoration
+                .For(x => new BinaryDecoration
                 {
                     Type = DecorationType.Append,
                     DecorationElement = x.CreateChild("decoration"),
                     ContentElement = x.CreateChild("content")
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure("decoration", new Size(400, 300), new Wrap())
-                .CheckMeasureResult(new Wrap());
+                .ExpectChildMeasure("decoration", new Size(400, 300), SpacePlan.Wrap())
+                .CheckMeasureResult(SpacePlan.Wrap());
         }
         
         [Test]
         public void Measure_ReturnsWrap_WhenDecorationReturnsPartialRender()
         {
             TestPlan
-                .For(x => new SimpleDecoration
+                .For(x => new BinaryDecoration
                 {
                     Type = DecorationType.Append,
                     DecorationElement = x.CreateChild("decoration"),
                     ContentElement = x.CreateChild("content")
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure("decoration", new Size(400, 300), new PartialRender(300, 200))
-                .CheckMeasureResult(new Wrap());
+                .ExpectChildMeasure("decoration", new Size(400, 300), SpacePlan.PartialRender(300, 200))
+                .CheckMeasureResult(SpacePlan.Wrap());
         }
         
         [Test]
         public void Measure_ReturnsWrap_WhenContentReturnsWrap()
         {
             TestPlan
-                .For(x => new SimpleDecoration
+                .For(x => new BinaryDecoration
                 {
                     Type = DecorationType.Append,
                     DecorationElement = x.CreateChild("decoration"),
                     ContentElement = x.CreateChild("content")
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure("decoration", new Size(400, 300), new FullRender(300, 100))
-                .ExpectChildMeasure("content", new Size(400, 200), new Wrap())
-                .CheckMeasureResult(new Wrap());
+                .ExpectChildMeasure("decoration", new Size(400, 300), SpacePlan.FullRender(300, 100))
+                .ExpectChildMeasure("content", new Size(400, 200), SpacePlan.Wrap())
+                .CheckMeasureResult(SpacePlan.Wrap());
         }
         
         [Test]
         public void Measure_ReturnsPartialRender_WhenContentReturnsPartialRender()
         {
             TestPlan
-                .For(x => new SimpleDecoration
+                .For(x => new BinaryDecoration
                 {
                     Type = DecorationType.Append,
                     DecorationElement = x.CreateChild("decoration"),
                     ContentElement = x.CreateChild("content")
                 })
                 .MeasureElement(new Size(400, 300))
-                .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));
+                .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));
         }
         
         [Test]
         public void Measure_ReturnsFullRender_WhenContentReturnsFullRender()
         {
             TestPlan
-                .For(x => new SimpleDecoration
+                .For(x => new BinaryDecoration
                 {
                     Type = DecorationType.Append,
                     DecorationElement = x.CreateChild("decoration"),
                     ContentElement = x.CreateChild("content")
                 })
                 .MeasureElement(new Size(400, 300))
-                .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));
+                .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));
         }
         
         #endregion
@@ -97,14 +97,14 @@ namespace QuestPDF.UnitTests
         public void Draw_Prepend()
         {
             TestPlan
-                .For(x => new SimpleDecoration
+                .For(x => new BinaryDecoration
                 {
                     Type = DecorationType.Prepend,
                     DecorationElement = x.CreateChild("decoration"),
                     ContentElement = x.CreateChild("content")
                 })
                 .DrawElement(new Size(400, 300))
-                .ExpectChildMeasure("decoration", new Size(400, 300), new FullRender(300, 100))
+                .ExpectChildMeasure("decoration", new Size(400, 300), SpacePlan.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 SimpleDecoration
+                .For(x => new BinaryDecoration
                 {
                     Type = DecorationType.Append,
                     DecorationElement = x.CreateChild("decoration"),
                     ContentElement = x.CreateChild("content")
                 })
                 .DrawElement(new Size(400, 300))
-                .ExpectChildMeasure("decoration", new Size(400, 300), new FullRender(300, 100))
+                .ExpectChildMeasure("decoration", new Size(400, 300), SpacePlan.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.SpacePlan;
+using QuestPDF.Drawing;
 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(new FullRender(300, 200));
+                .CheckMeasureResult(SpacePlan.FullRender(300, 200));
         }
         
         [Test]
@@ -51,7 +51,7 @@ namespace QuestPDF.UnitTests
         [Test]
         public void Draw_PassesCorrectSizeToSource()
         {
-            Size passedSize = null;
+            Size passedSize = default;
 
             TestPlan
                 .For(x => new DynamicImage

QuestPDF.UnitTests/EnsureSpaceTests.cs

@@ -1,5 +1,5 @@
 using NUnit.Framework;
-using QuestPDF.Drawing.SpacePlan;
+using QuestPDF.Drawing;
 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), new Wrap())
-                .CheckMeasureResult(new Wrap());
+                .ExpectChildMeasure(new Size(400, 100), SpacePlan.Wrap())
+                .CheckMeasureResult(SpacePlan.Wrap());
         }
         
         [Test]
@@ -33,8 +33,8 @@ namespace QuestPDF.UnitTests
                     MinHeight = 200
                 })
                 .MeasureElement(new Size(400, 100))
-                .ExpectChildMeasure(new Size(400, 100), new PartialRender(300, 50))
-                .CheckMeasureResult(new Wrap());
+                .ExpectChildMeasure(new Size(400, 100), SpacePlan.PartialRender(300, 50))
+                .CheckMeasureResult(SpacePlan.Wrap());
         }
         
         [Test]
@@ -47,8 +47,8 @@ namespace QuestPDF.UnitTests
                     MinHeight = 200
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure(new Size(400, 300), new PartialRender(300, 250))
-                .CheckMeasureResult(new PartialRender(300, 250));
+                .ExpectChildMeasure(new Size(400, 300), SpacePlan.PartialRender(300, 250))
+                .CheckMeasureResult(SpacePlan.PartialRender(300, 250));
         }
         
         [Test]
@@ -61,8 +61,8 @@ namespace QuestPDF.UnitTests
                     MinHeight = 200
                 })
                 .MeasureElement(new Size(400, 100))
-                .ExpectChildMeasure(new Size(400, 100), new FullRender(300, 50))
-                .CheckMeasureResult(new FullRender(300, 50));
+                .ExpectChildMeasure(new Size(400, 100), SpacePlan.FullRender(300, 50))
+                .CheckMeasureResult(SpacePlan.FullRender(300, 50));
         }
         
         [Test]
@@ -75,8 +75,8 @@ namespace QuestPDF.UnitTests
                     MinHeight = 200
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure(new Size(400, 300), new FullRender(300, 250))
-                .CheckMeasureResult(new FullRender(300, 250));
+                .ExpectChildMeasure(new Size(400, 300), SpacePlan.FullRender(300, 250))
+                .CheckMeasureResult(SpacePlan.FullRender(300, 250));
         }
         
         [Test]

QuestPDF.UnitTests/ExtendTests.cs

@@ -1,5 +1,5 @@
 using NUnit.Framework;
-using QuestPDF.Drawing.SpacePlan;
+using QuestPDF.Drawing;
 using QuestPDF.Elements;
 using QuestPDF.Infrastructure;
 using QuestPDF.UnitTests.TestEngine;
@@ -18,8 +18,8 @@ namespace QuestPDF.UnitTests
                     Child = x.CreateChild()
                 })
                 .MeasureElement(new Size(400, 200))
-                .ExpectChildMeasure(new Size(400, 200), new Wrap())
-                .CheckMeasureResult(new Wrap());
+                .ExpectChildMeasure(new Size(400, 200), SpacePlan.Wrap())
+                .CheckMeasureResult(SpacePlan.Wrap());
         }
         
         [Test]
@@ -33,8 +33,8 @@ namespace QuestPDF.UnitTests
                     ExtendVertical = true
                 })
                 .MeasureElement(new Size(400, 200))
-                .ExpectChildMeasure(new Size(400, 200), new PartialRender(300, 100))
-                .CheckMeasureResult(new PartialRender(400, 200));
+                .ExpectChildMeasure(new Size(400, 200), SpacePlan.PartialRender(300, 100))
+                .CheckMeasureResult(SpacePlan.PartialRender(400, 200));
         }
         
         [Test]
@@ -48,8 +48,8 @@ namespace QuestPDF.UnitTests
                     ExtendVertical = true
                 })
                 .MeasureElement(new Size(400, 200))
-                .ExpectChildMeasure(new Size(400, 200), new FullRender(300, 100))
-                .CheckMeasureResult(new FullRender(400, 200));
+                .ExpectChildMeasure(new Size(400, 200), SpacePlan.FullRender(300, 100))
+                .CheckMeasureResult(SpacePlan.FullRender(400, 200));
         }
         
         [Test]
@@ -63,8 +63,8 @@ namespace QuestPDF.UnitTests
                     ExtendVertical = false
                 })
                 .MeasureElement(new Size(400, 200))
-                .ExpectChildMeasure(new Size(400, 200), new FullRender(100, 100))
-                .CheckMeasureResult(new FullRender(400, 100));
+                .ExpectChildMeasure(new Size(400, 200), SpacePlan.FullRender(100, 100))
+                .CheckMeasureResult(SpacePlan.FullRender(400, 100));
         }
         
         [Test]
@@ -78,8 +78,8 @@ namespace QuestPDF.UnitTests
                     ExtendVertical = true
                 })
                 .MeasureElement(new Size(400, 200))
-                .ExpectChildMeasure(new Size(400, 200), new FullRender(100, 100))
-                .CheckMeasureResult(new FullRender(100, 200));
+                .ExpectChildMeasure(new Size(400, 200), SpacePlan.FullRender(100, 100))
+                .CheckMeasureResult(SpacePlan.FullRender(100, 200));
         }
 
         [Test]

QuestPDF.UnitTests/ImageTests.cs

@@ -1,5 +1,5 @@
 using NUnit.Framework;
-using QuestPDF.Drawing.SpacePlan;
+using QuestPDF.Drawing;
 using QuestPDF.Elements;
 using QuestPDF.Fluent;
 using QuestPDF.Infrastructure;
@@ -20,7 +20,7 @@ namespace QuestPDF.UnitTests
                     InternalImage = GenerateImage(400, 300)
                 })
                 .MeasureElement(new Size(300, 200))
-                .CheckMeasureResult(new FullRender(300, 200));
+                .CheckMeasureResult(SpacePlan.FullRender(300, 200));
         }
         
         [Test]
@@ -49,7 +49,7 @@ namespace QuestPDF.UnitTests
                     return container;
                 })
                 .MeasureElement(new Size(300, 200))
-                .CheckMeasureResult(new FullRender(300, 100));;
+                .CheckMeasureResult(SpacePlan.FullRender(300, 100));;
         }
         
         SKImage GenerateImage(int width, int height)

QuestPDF.UnitTests/LayersTests.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using NUnit.Framework;
-using QuestPDF.Drawing.SpacePlan;
+using QuestPDF.Drawing;
 using QuestPDF.Elements;
 using QuestPDF.Infrastructure;
 using QuestPDF.UnitTests.TestEngine;
@@ -45,8 +45,8 @@ namespace QuestPDF.UnitTests
             TestPlan
                 .For(GetLayers)
                 .MeasureElement(new Size(800, 600))
-                .ExpectChildMeasure(MainLayer, new Size(800, 600), new Wrap())
-                .CheckMeasureResult(new Wrap());
+                .ExpectChildMeasure(MainLayer, new Size(800, 600), SpacePlan.Wrap())
+                .CheckMeasureResult(SpacePlan.Wrap());
         }
 
         [Test]
@@ -55,8 +55,8 @@ namespace QuestPDF.UnitTests
             TestPlan
                 .For(GetLayers)
                 .MeasureElement(new Size(800, 600))
-                .ExpectChildMeasure(MainLayer, new Size(800, 600), new PartialRender(700, 500))
-                .CheckMeasureResult(new PartialRender(700, 500));
+                .ExpectChildMeasure(MainLayer, new Size(800, 600), SpacePlan.PartialRender(700, 500))
+                .CheckMeasureResult(SpacePlan.PartialRender(700, 500));
         }
         
         [Test]
@@ -65,8 +65,8 @@ namespace QuestPDF.UnitTests
             TestPlan
                 .For(GetLayers)
                 .MeasureElement(new Size(800, 600))
-                .ExpectChildMeasure(MainLayer, new Size(800, 600), new FullRender(500, 400))
-                .CheckMeasureResult(new FullRender(500, 400));
+                .ExpectChildMeasure(MainLayer, new Size(800, 600), SpacePlan.FullRender(500, 400))
+                .CheckMeasureResult(SpacePlan.FullRender(500, 400));
         }
         
         #endregion
@@ -80,9 +80,9 @@ namespace QuestPDF.UnitTests
                 .For(GetLayers)
                 .MeasureElement(new Size(800, 600))
                 
-                .ExpectChildMeasure(BackgroundLayer, new Size(800, 600), new FullRender(100, 200))
-                .ExpectChildMeasure(MainLayer, new Size(800, 600), new PartialRender(200, 300))
-                .ExpectChildMeasure(ForegroundLayer, new Size(800, 600), new FullRender(300, 400))
+                .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))
@@ -99,9 +99,9 @@ namespace QuestPDF.UnitTests
                 .For(GetLayers)
                 .MeasureElement(new Size(800, 600))
                 
-                .ExpectChildMeasure(BackgroundLayer, new Size(800, 600), new PartialRender(100, 200))
-                .ExpectChildMeasure(MainLayer, new Size(800, 600), new PartialRender(200, 300))
-                .ExpectChildMeasure(ForegroundLayer, new Size(800, 600), new Wrap())
+                .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))
@@ -116,9 +116,9 @@ namespace QuestPDF.UnitTests
                 .For(GetLayers)
                 .MeasureElement(new Size(800, 600))
                 
-                .ExpectChildMeasure(BackgroundLayer, new Size(800, 600), new Wrap())
-                .ExpectChildMeasure(MainLayer, new Size(800, 600), new PartialRender(200, 300))
-                .ExpectChildMeasure(ForegroundLayer, new Size(800, 600), new PartialRender(300, 400))
+                .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))

QuestPDF.UnitTests/PaddingTests.cs

@@ -1,5 +1,5 @@
 using NUnit.Framework;
-using QuestPDF.Drawing.SpacePlan;
+using QuestPDF.Drawing;
 using QuestPDF.Elements;
 using QuestPDF.Infrastructure;
 using QuestPDF.UnitTests.TestEngine;
@@ -28,8 +28,8 @@ namespace QuestPDF.UnitTests
             TestPlan
                 .For(GetPadding)
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure(new Size(340, 260), new FullRender(140, 60))
-                .CheckMeasureResult(new FullRender(200, 100));
+                .ExpectChildMeasure(new Size(340, 260), SpacePlan.FullRender(140, 60))
+                .CheckMeasureResult(SpacePlan.FullRender(200, 100));
         } 
         
         [Test]
@@ -38,7 +38,7 @@ namespace QuestPDF.UnitTests
             TestPlan
                 .For(GetPadding)
                 .MeasureElement(new Size(50, 300))
-                .CheckMeasureResult(new Wrap());
+                .CheckMeasureResult(SpacePlan.Wrap());
         }
         
         [Test]
@@ -47,7 +47,7 @@ namespace QuestPDF.UnitTests
             TestPlan
                 .For(GetPadding)
                 .MeasureElement(new Size(20, 300))
-                .CheckMeasureResult(new Wrap());
+                .CheckMeasureResult(SpacePlan.Wrap());
         }
         
         [Test]
@@ -56,8 +56,8 @@ namespace QuestPDF.UnitTests
             TestPlan
                 .For(GetPadding)
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure(new Size(340, 260), new PartialRender(40, 160))
-                .CheckMeasureResult(new PartialRender(100, 200));
+                .ExpectChildMeasure(new Size(340, 260), SpacePlan.PartialRender(40, 160))
+                .CheckMeasureResult(SpacePlan.PartialRender(100, 200));
         }
         
         [Test]
@@ -66,8 +66,8 @@ namespace QuestPDF.UnitTests
             TestPlan
                 .For(GetPadding)
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure(new Size(340, 260), new Wrap())
-                .CheckMeasureResult(new Wrap());
+                .ExpectChildMeasure(new Size(340, 260), SpacePlan.Wrap())
+                .CheckMeasureResult(SpacePlan.Wrap());
         }
         
         [Test]

QuestPDF.UnitTests/PageBreakTests.cs

@@ -1,5 +1,5 @@
 using NUnit.Framework;
-using QuestPDF.Drawing.SpacePlan;
+using QuestPDF.Drawing;
 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(new PartialRender(Size.Zero))
+                .CheckMeasureResult(SpacePlan.PartialRender(Size.Zero))
                 
                 .DrawElement(new Size(400, 300))
                 .CheckDrawResult()
                 
                 .MeasureElement(new Size(500, 400))
-                .CheckMeasureResult(new FullRender(Size.Zero));
+                .CheckMeasureResult(SpacePlan.FullRender(0, 0));
         }
     }
 }

QuestPDF.UnitTests/RotateTests.cs

@@ -1,5 +1,4 @@
 using NUnit.Framework;
-using QuestPDF.Drawing.SpacePlan;
 using QuestPDF.Elements;
 using QuestPDF.Infrastructure;
 using QuestPDF.UnitTests.TestEngine;

QuestPDF.UnitTests/RowTests.cs

@@ -1,5 +1,5 @@
 using NUnit.Framework;
-using QuestPDF.Drawing.SpacePlan;
+using QuestPDF.Drawing;
 using QuestPDF.Elements;
 using QuestPDF.Fluent;
 using QuestPDF.Infrastructure;
@@ -16,74 +16,74 @@ namespace QuestPDF.UnitTests
         public void Measure_ReturnsWrap_WhenLeftChildReturnsWrap()
         {
             TestPlan
-                .For(x => new SimpleRow
+                .For(x => new BinaryRow
                 {
                     Left = x.CreateChild("left"),
                     Right = x.CreateChild("right")
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure("left", new Size(400, 300), new Wrap())
-                .CheckMeasureResult(new Wrap());
+                .ExpectChildMeasure("left", new Size(400, 300), SpacePlan.Wrap())
+                .CheckMeasureResult(SpacePlan.Wrap());
         }
         
         [Test]
         public void Measure_ReturnsWrap_WhenRightChildReturnsWrap()
         {
             TestPlan
-                .For(x => new SimpleRow
+                .For(x => new BinaryRow
                 {
                     Left = x.CreateChild("left"),
                     Right = x.CreateChild("right")
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure("left", new Size(400, 300), new FullRender(250, 150))
-                .ExpectChildMeasure("right", new Size(150, 300), new Wrap())
-                .CheckMeasureResult(new Wrap());
+                .ExpectChildMeasure("left", new Size(400, 300), SpacePlan.FullRender(250, 150))
+                .ExpectChildMeasure("right", new Size(150, 300), SpacePlan.Wrap())
+                .CheckMeasureResult(SpacePlan.Wrap());
         }
         
         [Test]
         public void Measure_ReturnsPartialRender_WhenLeftChildReturnsPartialRender()
         {
             TestPlan
-                .For(x => new SimpleRow
+                .For(x => new BinaryRow
                 {
                     Left = x.CreateChild("left"),
                     Right = x.CreateChild("right")
                 })
                 .MeasureElement(new Size(400, 300))
-                .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));
+                .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));
         }
         
         [Test]
         public void Measure_ReturnsPartialRender_WhenRightChildReturnsPartialRender()
         {
             TestPlan
-                .For(x => new SimpleRow
+                .For(x => new BinaryRow
                 {
                     Left = x.CreateChild("left"),
                     Right = x.CreateChild("right")
                 })
                 .MeasureElement(new Size(400, 300))
-                .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));
+                .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));
         }
         
         [Test]
         public void Measure_ReturnsFullRender_WhenBothChildrenReturnFullRender()
         {
             TestPlan
-                .For(x => new SimpleRow
+                .For(x => new BinaryRow
                 {
                     Left = x.CreateChild("left"),
                     Right = x.CreateChild("right")
                 })
                 .MeasureElement(new Size(400, 300))
-                .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));
+                .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));
         }
         
         #endregion
@@ -94,14 +94,15 @@ namespace QuestPDF.UnitTests
         public void Draw()
         {
             TestPlan
-                .For(x => new SimpleRow
+                .For(x => new BinaryRow
                 {
                     Left = x.CreateChild("left"),
                     Right = x.CreateChild("right")
                 })
                 .DrawElement(new Size(400, 300))
-                .ExpectChildMeasure("left", new Size(400, 300), new FullRender(250, 150))
+                .ExpectChildMeasure("left", new Size(400, 300), SpacePlan.FullRender(250, 150))
                 .ExpectChildDraw("left", new Size(250, 300))
+                .ExpectChildMeasure("right", new Size(150, 300), SpacePlan.FullRender(150, 200))
                 .ExpectCanvasTranslate(250, 0)
                 .ExpectChildDraw("right", new Size(150, 300))
                 .ExpectCanvasTranslate(-250, 0)
@@ -184,11 +185,11 @@ namespace QuestPDF.UnitTests
             });
             
             // assert
-            var expected = new SimpleRow
+            var expected = new BinaryRow
             {
-                Left = new SimpleRow
+                Left = new BinaryRow
                 {
-                    Left = new SimpleRow
+                    Left = new BinaryRow
                     {
                         Left = new Constrained
                         {
@@ -202,7 +203,7 @@ namespace QuestPDF.UnitTests
                             MaxWidth = 25
                         }
                     },
-                    Right = new SimpleRow
+                    Right = new BinaryRow
                     {
                         Left = new Constrained
                         {
@@ -217,9 +218,9 @@ namespace QuestPDF.UnitTests
                         }
                     }
                 },
-                Right = new SimpleRow
+                Right = new BinaryRow
                 {
-                    Left = new SimpleRow
+                    Left = new BinaryRow
                     {
                         Left = new Constrained
                         {
@@ -233,7 +234,7 @@ namespace QuestPDF.UnitTests
                             MaxWidth = 25
                         }
                     },
-                    Right = new SimpleRow
+                    Right = new BinaryRow
                     {
                         Left = new Constrained
                         {
@@ -241,7 +242,7 @@ namespace QuestPDF.UnitTests
                             MaxWidth = 200,
                             Child = childD
                         },
-                        Right = new SimpleRow
+                        Right = new BinaryRow
                         {
                             Left = new Constrained
                             {

QuestPDF.UnitTests/ScaleTests.cs

@@ -1,5 +1,5 @@
 using NUnit.Framework;
-using QuestPDF.Drawing.SpacePlan;
+using QuestPDF.Drawing;
 using QuestPDF.Elements;
 using QuestPDF.Infrastructure;
 using QuestPDF.UnitTests.TestEngine;
@@ -22,8 +22,8 @@ namespace QuestPDF.UnitTests
                     ScaleY = 2
                 })
                 .MeasureElement(new Size(900, 800))
-                .ExpectChildMeasure(new Size(300, 400), new Wrap())
-                .CheckMeasureResult(new Wrap());
+                .ExpectChildMeasure(new Size(300, 400), SpacePlan.Wrap())
+                .CheckMeasureResult(SpacePlan.Wrap());
         }
         
         [Test]
@@ -37,8 +37,8 @@ namespace QuestPDF.UnitTests
                     ScaleY = 2
                 })
                 .MeasureElement(new Size(900, 800))
-                .ExpectChildMeasure(new Size(300, 400), new PartialRender(200, 350))
-                .CheckMeasureResult(new PartialRender(600, 700));
+                .ExpectChildMeasure(new Size(300, 400), SpacePlan.PartialRender(200, 350))
+                .CheckMeasureResult(SpacePlan.PartialRender(600, 700));
         }
         
         [Test]
@@ -52,8 +52,8 @@ namespace QuestPDF.UnitTests
                     ScaleY = 2
                 })
                 .MeasureElement(new Size(900, 800))
-                .ExpectChildMeasure(new Size(300, 400), new FullRender(250, 300))
-                .CheckMeasureResult(new FullRender(750, 600));
+                .ExpectChildMeasure(new Size(300, 400), SpacePlan.FullRender(250, 300))
+                .CheckMeasureResult(SpacePlan.FullRender(750, 600));
         }
         
         [Test]
@@ -67,8 +67,8 @@ namespace QuestPDF.UnitTests
                     ScaleY = 1
                 })
                 .MeasureElement(new Size(800, 600))
-                .ExpectChildMeasure(new Size(400, 600), new FullRender(300, 500))
-                .CheckMeasureResult(new FullRender(600, 500));
+                .ExpectChildMeasure(new Size(400, 600), SpacePlan.FullRender(300, 500))
+                .CheckMeasureResult(SpacePlan.FullRender(600, 500));
         }
         
         [Test]
@@ -82,8 +82,8 @@ namespace QuestPDF.UnitTests
                     ScaleY = -3
                 })
                 .MeasureElement(new Size(800, 600))
-                .ExpectChildMeasure(new Size(800, 200), new FullRender(800, 100))
-                .CheckMeasureResult(new FullRender(800, 300));
+                .ExpectChildMeasure(new Size(800, 200), SpacePlan.FullRender(800, 100))
+                .CheckMeasureResult(SpacePlan.FullRender(800, 300));
         }
         
         #endregion

QuestPDF.UnitTests/ShowEntireTests.cs

@@ -1,5 +1,5 @@
 using NUnit.Framework;
-using QuestPDF.Drawing.SpacePlan;
+using QuestPDF.Drawing;
 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), new Wrap())
-                .CheckMeasureResult(new Wrap());
+                .ExpectChildMeasure(new Size(400, 300), SpacePlan.Wrap())
+                .CheckMeasureResult(SpacePlan.Wrap());
         }
         
         [Test]
@@ -31,8 +31,8 @@ namespace QuestPDF.UnitTests
                     Child = x.CreateChild()
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure(new Size(400, 300), new PartialRender(300, 200))
-                .CheckMeasureResult(new Wrap());
+                .ExpectChildMeasure(new Size(400, 300), SpacePlan.PartialRender(300, 200))
+                .CheckMeasureResult(SpacePlan.Wrap());
         }
         
         [Test]
@@ -44,8 +44,8 @@ namespace QuestPDF.UnitTests
                     Child = x.CreateChild()
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure(new Size(400, 300), new FullRender(300, 200))
-                .CheckMeasureResult(new FullRender(300, 200));
+                .ExpectChildMeasure(new Size(400, 300), SpacePlan.FullRender(300, 200))
+                .CheckMeasureResult(SpacePlan.FullRender(300, 200));
         }
         
         [Test]

QuestPDF.UnitTests/ShowOnceTest.cs

@@ -1,5 +1,5 @@
 using NUnit.Framework;
-using QuestPDF.Drawing.SpacePlan;
+using QuestPDF.Drawing;
 using QuestPDF.Elements;
 using QuestPDF.Infrastructure;
 using QuestPDF.UnitTests.TestEngine;
@@ -20,31 +20,31 @@ namespace QuestPDF.UnitTests
                 
                 // Measure the element and return result
                 .MeasureElement(new Size(300, 200))
-                .ExpectChildMeasure("child", new Size(300, 200), new PartialRender(new Size(200, 200)))
-                .CheckMeasureResult(new PartialRender(new Size(200, 200)))
+                .ExpectChildMeasure("child", new Size(300, 200), SpacePlan.PartialRender(new Size(200, 200)))
+                .CheckMeasureResult(SpacePlan.PartialRender(new Size(200, 200)))
                 
                 // Draw element partially
                 .DrawElement(new Size(200, 200))
-                .ExpectChildMeasure(new Size(200, 200), new PartialRender(new Size(200, 200)))
+                .ExpectChildMeasure(new Size(200, 200), SpacePlan.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), new FullRender(new Size(400, 200)))
-                .CheckMeasureResult(new FullRender(new Size(400, 200)))
+                .ExpectChildMeasure(new Size(800, 200), SpacePlan.FullRender(new Size(400, 200)))
+                .CheckMeasureResult(SpacePlan.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), new FullRender(new Size(400, 200)))
+                .ExpectChildMeasure(new Size(400, 200), SpacePlan.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(new FullRender(Size.Zero))
+                .CheckMeasureResult(SpacePlan.FullRender(0, 0))
                 
                 // In the next attempt of measuring element, it should not draw its child
                 .DrawElement(new Size(600, 200))

QuestPDF.UnitTests/SimpleRotateTests.cs

@@ -1,5 +1,5 @@
 using NUnit.Framework;
-using QuestPDF.Drawing.SpacePlan;
+using QuestPDF.Drawing;
 using QuestPDF.Elements;
 using QuestPDF.Infrastructure;
 using QuestPDF.UnitTests.TestEngine;
@@ -21,8 +21,8 @@ namespace QuestPDF.UnitTests
                     TurnCount = 0
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure(new Size(400, 300), new Wrap())
-                .CheckMeasureResult(new Wrap());
+                .ExpectChildMeasure(new Size(400, 300), SpacePlan.Wrap())
+                .CheckMeasureResult(SpacePlan.Wrap());
         }
         
         [Test]
@@ -35,8 +35,8 @@ namespace QuestPDF.UnitTests
                     TurnCount = 0
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure(new Size(400, 300), new PartialRender(300, 200))
-                .CheckMeasureResult(new PartialRender(300, 200));
+                .ExpectChildMeasure(new Size(400, 300), SpacePlan.PartialRender(300, 200))
+                .CheckMeasureResult(SpacePlan.PartialRender(300, 200));
         }
         
         [Test]
@@ -49,8 +49,8 @@ namespace QuestPDF.UnitTests
                     TurnCount = 1
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure(new Size(300, 400), new FullRender(200, 300))
-                .CheckMeasureResult(new FullRender(300, 200));
+                .ExpectChildMeasure(new Size(300, 400), SpacePlan.FullRender(200, 300))
+                .CheckMeasureResult(SpacePlan.FullRender(300, 200));
         }
         
         [Test]
@@ -63,8 +63,8 @@ namespace QuestPDF.UnitTests
                     TurnCount = 2
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure(new Size(400, 300), new FullRender(200, 100))
-                .CheckMeasureResult(new FullRender(200, 100));
+                .ExpectChildMeasure(new Size(400, 300), SpacePlan.FullRender(200, 100))
+                .CheckMeasureResult(SpacePlan.FullRender(200, 100));
         }
         
         [Test]
@@ -77,8 +77,8 @@ namespace QuestPDF.UnitTests
                     TurnCount = 3 // or -1
                 })
                 .MeasureElement(new Size(500, 400))
-                .ExpectChildMeasure(new Size(400, 500), new FullRender(300, 350))
-                .CheckMeasureResult(new FullRender(350, 300));
+                .ExpectChildMeasure(new Size(400, 500), SpacePlan.FullRender(300, 350))
+                .CheckMeasureResult(SpacePlan.FullRender(350, 300));
         }
         
         #endregion

QuestPDF.UnitTests/StackTests.cs

@@ -1,6 +1,5 @@
-using FluentAssertions;
-using NUnit.Framework;
-using QuestPDF.Drawing.SpacePlan;
+using NUnit.Framework;
+using QuestPDF.Drawing;
 using QuestPDF.Elements;
 using QuestPDF.Fluent;
 using QuestPDF.Infrastructure;
@@ -17,80 +16,80 @@ namespace QuestPDF.UnitTests
         public void Measure_ReturnsWrap_WhenFirstChildWraps()
         {
             TestPlan
-                .For(x => new SimpleStack
+                .For(x => new BinaryStack
                 {
                     First = x.CreateChild("first"),
                     Second = x.CreateChild("second")
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure("first", new Size(400, 300), new Wrap())
-                .CheckMeasureResult(new Wrap());
+                .ExpectChildMeasure("first", new Size(400, 300), SpacePlan.Wrap())
+                .CheckMeasureResult(SpacePlan.Wrap());
         }
         
         [Test]
         public void Measure_ReturnsPartialRender_WhenFirstChildReturnsPartialRender()
         {
             TestPlan
-                .For(x => new SimpleStack
+                .For(x => new BinaryStack
                 {
                     First = x.CreateChild("first"),
                     Second = x.CreateChild("second")
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure("first", new Size(400, 300), new PartialRender(300, 200))
-                .CheckMeasureResult(new PartialRender(300, 200));
+                .ExpectChildMeasure("first", new Size(400, 300), SpacePlan.PartialRender(300, 200))
+                .CheckMeasureResult(SpacePlan.PartialRender(300, 200));
         }
         
         [Test]
         public void Measure_ReturnsPartialRender_WhenSecondChildWraps()
         {
             TestPlan
-                .For(x => new SimpleStack
+                .For(x => new BinaryStack
                 {
                     First = x.CreateChild("first"),
                     Second = x.CreateChild("second")
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure("first", new Size(400, 300), new FullRender(200, 100))
-                .ExpectChildMeasure("second", new Size(400, 200), new Wrap())
-                .CheckMeasureResult(new PartialRender(200, 100));
+                .ExpectChildMeasure("first", new Size(400, 300), SpacePlan.FullRender(200, 100))
+                .ExpectChildMeasure("second", new Size(400, 200), SpacePlan.Wrap())
+                .CheckMeasureResult(SpacePlan.PartialRender(200, 100));
         }
         
         [Test]
         public void Measure_ReturnsPartialRender_WhenSecondChildReturnsPartialRender()
         {
             TestPlan
-                .For(x => new SimpleStack
+                .For(x => new BinaryStack
                 {
                     First = x.CreateChild("first"),
                     Second = x.CreateChild("second")
                 })
                 .MeasureElement(new Size(400, 300))
-                .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));
+                .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));
         }
         
         [Test]
         public void Measure_ReturnsFullRender_WhenSecondChildReturnsFullRender()
         {
             TestPlan
-                .For(x => new SimpleStack
+                .For(x => new BinaryStack
                 {
                     First = x.CreateChild("first"),
                     Second = x.CreateChild("second")
                 })
                 .MeasureElement(new Size(400, 300))
-                .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));
+                .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));
         }
         
         [Test]
         public void Measure_UsesEmpty_WhenFirstChildIsRendered()
         {
             TestPlan
-                .For(x => new SimpleStack
+                .For(x => new BinaryStack
                 {
                     First = x.CreateChild("first"),
                     Second = x.CreateChild("second"),
@@ -98,8 +97,8 @@ namespace QuestPDF.UnitTests
                     IsFirstRendered = true
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure("second", new Size(400, 300), new FullRender(200, 300))
-                .CheckMeasureResult(new FullRender(200, 300));
+                .ExpectChildMeasure("second", new Size(400, 300), SpacePlan.FullRender(200, 300))
+                .CheckMeasureResult(SpacePlan.FullRender(200, 300));
         }
         
         #endregion
@@ -110,13 +109,13 @@ namespace QuestPDF.UnitTests
         public void Draw_WhenFirstChildWraps()
         {
             TestPlan
-                .For(x => new SimpleStack
+                .For(x => new BinaryStack
                 {
                     First = x.CreateChild("first"),
                     Second = x.CreateChild("second")
                 })
                 .DrawElement(new Size(400, 300))
-                .ExpectChildMeasure("first", new Size(400, 300), new Wrap())
+                .ExpectChildMeasure("first", new Size(400, 300), SpacePlan.Wrap())
                 .CheckDrawResult();
         }
         
@@ -124,13 +123,13 @@ namespace QuestPDF.UnitTests
         public void Draw_WhenFirstChildPartiallyRenders()
         {
             TestPlan
-                .For(x => new SimpleStack
+                .For(x => new BinaryStack
                 {
                     First = x.CreateChild("first"),
                     Second = x.CreateChild("second")
                 })
                 .DrawElement(new Size(400, 300))
-                .ExpectChildMeasure("first", new Size(400, 300), new PartialRender(200, 100))
+                .ExpectChildMeasure("first", new Size(400, 300), SpacePlan.PartialRender(200, 100))
                 .ExpectChildDraw("first", new Size(400, 100))
                 .CheckDrawResult();
         }
@@ -139,15 +138,15 @@ namespace QuestPDF.UnitTests
         public void Draw_WhenFirstChildFullyRenders_AndSecondChildWraps()
         {
             TestPlan
-                .For(x => new SimpleStack
+                .For(x => new BinaryStack
                 {
                     First = x.CreateChild("first"),
                     Second = x.CreateChild("second")
                 })
                 .DrawElement(new Size(400, 300))
-                .ExpectChildMeasure("first", new Size(400, 300), new FullRender(200, 100))
+                .ExpectChildMeasure("first", new Size(400, 300), SpacePlan.FullRender(200, 100))
                 .ExpectChildDraw("first", new Size(400, 100))
-                .ExpectChildMeasure("second", new Size(400, 200), new Wrap())
+                .ExpectChildMeasure("second", new Size(400, 200), SpacePlan.Wrap())
                 .CheckDrawResult();
         }
         
@@ -155,15 +154,15 @@ namespace QuestPDF.UnitTests
         public void Draw_WhenFirstChildFullyRenders_AndSecondChildPartiallyRenders()
         {
             TestPlan
-                .For(x => new SimpleStack
+                .For(x => new BinaryStack
                 {
                     First = x.CreateChild("first"),
                     Second = x.CreateChild("second")
                 })
                 .DrawElement(new Size(400, 300))
-                .ExpectChildMeasure("first", new Size(400, 300), new FullRender(200, 100))
+                .ExpectChildMeasure("first", new Size(400, 300), SpacePlan.FullRender(200, 100))
                 .ExpectChildDraw("first", new Size(400, 100))
-                .ExpectChildMeasure("second", new Size(400, 200), new PartialRender(250, 150))
+                .ExpectChildMeasure("second", new Size(400, 200), SpacePlan.PartialRender(250, 150))
                 .ExpectCanvasTranslate(0, 100)
                 .ExpectChildDraw("second", new Size(400, 150))
                 .ExpectCanvasTranslate(0, -100)
@@ -174,15 +173,15 @@ namespace QuestPDF.UnitTests
         public void Draw_WhenFirstChildFullyRenders_AndSecondChildFullyRenders()
         {
             TestPlan
-                .For(x => new SimpleStack
+                .For(x => new BinaryStack
                 {
                     First = x.CreateChild("first"),
                     Second = x.CreateChild("second")
                 })
                 .DrawElement(new Size(400, 300))
-                .ExpectChildMeasure("first", new Size(400, 300), new FullRender(200, 100))
+                .ExpectChildMeasure("first", new Size(400, 300), SpacePlan.FullRender(200, 100))
                 .ExpectChildDraw("first", new Size(400, 100))
-                .ExpectChildMeasure("second", new Size(400, 200), new FullRender(250, 150))
+                .ExpectChildMeasure("second", new Size(400, 200), SpacePlan.FullRender(250, 150))
                 .ExpectCanvasTranslate(0, 100)
                 .ExpectChildDraw("second", new Size(400, 150))
                 .ExpectCanvasTranslate(0, -100)
@@ -193,7 +192,7 @@ namespace QuestPDF.UnitTests
         public void Draw_UsesEmpty_WhenFirstChildIsRendered()
         {
             TestPlan
-                .For(x => new SimpleStack
+                .For(x => new BinaryStack
                 {
                     First = x.CreateChild("first"),
                     Second = x.CreateChild("second"),
@@ -201,11 +200,11 @@ namespace QuestPDF.UnitTests
                     IsFirstRendered = true
                 })
                 .DrawElement(new Size(400, 300))
-                .ExpectChildMeasure("second", new Size(400, 300), new PartialRender(200, 300))
+                .ExpectChildMeasure("second", new Size(400, 300), SpacePlan.PartialRender(200, 300))
                 .ExpectCanvasTranslate(0, 0)
                 .ExpectChildDraw("second", new Size(400, 300))
                 .ExpectCanvasTranslate(0, 0)
-                .CheckState<SimpleStack>(x => x.IsFirstRendered)
+                .CheckState<BinaryStack>(x => x.IsFirstRendered)
                 .CheckDrawResult();
         }
         
@@ -213,7 +212,7 @@ namespace QuestPDF.UnitTests
         public void Draw_TogglesFirstRenderedFlag_WhenSecondFullyRenders()
         {
             TestPlan
-                .For(x => new SimpleStack
+                .For(x => new BinaryStack
                 {
                     First = x.CreateChild("first"),
                     Second = x.CreateChild("second"),
@@ -221,12 +220,12 @@ namespace QuestPDF.UnitTests
                     IsFirstRendered = true
                 })
                 .DrawElement(new Size(400, 300))
-                .ExpectChildMeasure("second", new Size(400, 300), new FullRender(200, 300))
+                .ExpectChildMeasure("second", new Size(400, 300), SpacePlan.FullRender(200, 300))
                 .ExpectCanvasTranslate(0, 0)
                 .ExpectChildDraw("second", new Size(400, 300))
                 .ExpectCanvasTranslate(0, 0)
                 .CheckDrawResult()
-                .CheckState<SimpleStack>(x => !x.IsFirstRendered);
+                .CheckState<BinaryStack>(x => !x.IsFirstRendered);
         }
         
         #endregion
@@ -264,9 +263,9 @@ namespace QuestPDF.UnitTests
             {
                 Bottom = -spacing,
 
-                Child = new SimpleStack
+                Child = new BinaryStack
                 {
-                    First = new SimpleStack
+                    First = new BinaryStack
                     {
                         First = new Padding
                         {
@@ -279,14 +278,14 @@ namespace QuestPDF.UnitTests
                             Child = childB
                         }
                     },
-                    Second = new SimpleStack
+                    Second = new BinaryStack
                     {
                         First = new Padding
                         {
                             Bottom = spacing,
                             Child = childC
                         },
-                        Second = new SimpleStack
+                        Second = new BinaryStack
                         {
                             First = new Padding
                             {

QuestPDF.UnitTests/TestEngine/ElementMock.cs

@@ -1,5 +1,5 @@
 using System;
-using QuestPDF.Drawing.SpacePlan;
+using QuestPDF.Drawing;
 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, ISpacePlan> MeasureFunc { get; set; }
+        public Func<Size, SpacePlan> MeasureFunc { get; set; }
         public Action<Size> DrawFunc { get; set; }
 
-        internal override ISpacePlan Measure(Size availableSpace) => MeasureFunc(availableSpace);
+        internal override SpacePlan Measure(Size availableSpace) => MeasureFunc(availableSpace);
         internal override void Draw(Size availableSpace) => DrawFunc(availableSpace);
     }
 }

QuestPDF.UnitTests/TestEngine/Operations/ChildMeasureOperation.cs

@@ -1,4 +1,4 @@
-using QuestPDF.Drawing.SpacePlan;
+using QuestPDF.Drawing;
 using QuestPDF.Infrastructure;
 
 namespace QuestPDF.UnitTests.TestEngine.Operations
@@ -7,9 +7,9 @@ namespace QuestPDF.UnitTests.TestEngine.Operations
     {
         public string ChildId { get; }
         public Size Input { get; }
-        public ISpacePlan Output { get; }
+        public SpacePlan Output { get; }
 
-        public ChildMeasureOperation(string childId, Size input, ISpacePlan output)
+        public ChildMeasureOperation(string childId, Size input, SpacePlan output)
         {
             ChildId = childId;
             Input = input;

QuestPDF.UnitTests/TestEngine/SimpleContainerTests.cs

@@ -1,5 +1,4 @@
-using QuestPDF.Drawing.SpacePlan;
-using QuestPDF.Elements;
+using QuestPDF.Drawing;
 using QuestPDF.Infrastructure;
 
 namespace QuestPDF.UnitTests.TestEngine
@@ -23,8 +22,8 @@ namespace QuestPDF.UnitTests.TestEngine
                     Child = x.CreateChild()
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure(new Size(400, 300), new Wrap())
-                .CheckMeasureResult(new Wrap());
+                .ExpectChildMeasure(new Size(400, 300), SpacePlan.Wrap())
+                .CheckMeasureResult(SpacePlan.Wrap());
         }
         
         private static void Measure_PartialRender<TElement>() where TElement : Element, IContainer, new()
@@ -35,8 +34,8 @@ namespace QuestPDF.UnitTests.TestEngine
                     Child = x.CreateChild()
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure(new Size(400, 300), new PartialRender(200, 100))
-                .CheckMeasureResult(new PartialRender(200, 100));
+                .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()
@@ -47,8 +46,8 @@ namespace QuestPDF.UnitTests.TestEngine
                     Child = x.CreateChild()
                 })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure(new Size(400, 300), new FullRender(250, 150))
-                .CheckMeasureResult(new FullRender(250, 150));
+                .ExpectChildMeasure(new Size(400, 300), SpacePlan.FullRender(250, 150))
+                .CheckMeasureResult(SpacePlan.FullRender(250, 150));
         }
         
         #endregion

QuestPDF.UnitTests/TestEngine/TestPlan.cs

@@ -4,7 +4,6 @@ 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;
@@ -157,12 +156,12 @@ namespace QuestPDF.UnitTests.TestEngine
             return this;
         }
         
-        public TestPlan ExpectChildMeasure(Size expectedInput, ISpacePlan returns)
+        public TestPlan ExpectChildMeasure(Size expectedInput, SpacePlan returns)
         {
             return ExpectChildMeasure(DefaultChildName, expectedInput, returns);
         }
         
-        public TestPlan ExpectChildMeasure(string child, Size expectedInput, ISpacePlan returns)
+        public TestPlan ExpectChildMeasure(string child, Size expectedInput, SpacePlan returns)
         {
             return AddOperation(new ChildMeasureOperation(child, expectedInput, returns));
         }
@@ -212,29 +211,24 @@ namespace QuestPDF.UnitTests.TestEngine
             return AddOperation(new CanvasDrawImageOperation(position, size));
         }
         
-        public TestPlan CheckMeasureResult(ISpacePlan expected)
+        public TestPlan CheckMeasureResult(SpacePlan expected)
         {
-            Element.HandleVisitor(x => x?.Initialize(null, Canvas));
+            Element.VisitChildren(x => x?.Initialize(null, Canvas));
             
             var actual = Element.Measure(OperationInput);
             
             Assert.AreEqual(expected.GetType(), actual.GetType());
-
-            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");
-            }
+            
+            Assert.AreEqual(expected.Width, actual.Width, "Measure: width");
+            Assert.AreEqual(expected.Height, actual.Height, "Measure: height");
+            Assert.AreEqual(expected.Type, actual.Type, "Measure: height");
             
             return this;
         }
         
         public TestPlan CheckDrawResult()
         {
-            Element.HandleVisitor(x => x?.Initialize(null, Canvas));
+            Element.VisitChildren(x => x?.Initialize(null, Canvas));
             Element.Draw(OperationInput);
             return this;
         }
@@ -277,11 +271,11 @@ namespace QuestPDF.UnitTests.TestEngine
             availableSpace ??= new Size(400, 300);
             
             var canvas = new FreeCanvas();
-            value.HandleVisitor(x => x.Initialize(null, canvas));
-            var valueMeasure = value.Measure(availableSpace);
+            value.VisitChildren(x => x.Initialize(null, canvas));
+            var valueMeasure = value.Measure(availableSpace.Value);
             
-            expected.HandleVisitor(x => x.Initialize(null, canvas));
-            var expectedMeasure = expected.Measure(availableSpace);
+            expected.VisitChildren(x => x.Initialize(null, canvas));
+            var expectedMeasure = expected.Measure(availableSpace.Value);
             
             valueMeasure.Should().BeEquivalentTo(expectedMeasure);
         }
@@ -291,12 +285,12 @@ namespace QuestPDF.UnitTests.TestEngine
             availableSpace ??= new Size(400, 300);
             
             var valueCanvas = new OperationRecordingCanvas();
-            value.HandleVisitor(x => x.Initialize(null, valueCanvas));
-            value.Draw(availableSpace);
+            value.VisitChildren(x => x.Initialize(null, valueCanvas));
+            value.Draw(availableSpace.Value);
             
             var expectedCanvas = new OperationRecordingCanvas();
-            expected.HandleVisitor(x => x.Initialize(null, expectedCanvas));
-            expected.Draw(availableSpace);
+            expected.VisitChildren(x => x.Initialize(null, expectedCanvas));
+            expected.Draw(availableSpace.Value);
             
             valueCanvas.Operations.Should().BeEquivalentTo(expectedCanvas.Operations);
         }

QuestPDF.UnitTests/TranslateTests.cs

@@ -1,5 +1,4 @@
 using NUnit.Framework;
-using QuestPDF.Drawing.SpacePlan;
 using QuestPDF.Elements;
 using QuestPDF.Infrastructure;
 using QuestPDF.UnitTests.TestEngine;

QuestPDF.UnitTests/UnconstrainedTests.cs

@@ -1,5 +1,5 @@
 using NUnit.Framework;
-using QuestPDF.Drawing.SpacePlan;
+using QuestPDF.Drawing;
 using QuestPDF.Elements;
 using QuestPDF.Infrastructure;
 using QuestPDF.UnitTests.TestEngine;
@@ -20,8 +20,8 @@ namespace QuestPDF.UnitTests
                     Child = x.CreateChild()
                 })
                 .MeasureElement(new Size(900, 800))
-                .ExpectChildMeasure(Size.Max, new Wrap())
-                .CheckMeasureResult(new Wrap());
+                .ExpectChildMeasure(Size.Max, SpacePlan.Wrap())
+                .CheckMeasureResult(SpacePlan.Wrap());
         }
         
         [Test]
@@ -33,8 +33,8 @@ namespace QuestPDF.UnitTests
                     Child = x.CreateChild()
                 })
                 .MeasureElement(new Size(900, 800))
-                .ExpectChildMeasure(Size.Max, new PartialRender(1200, 1600))
-                .CheckMeasureResult(new PartialRender(Size.Zero));
+                .ExpectChildMeasure(Size.Max, SpacePlan.PartialRender(1200, 1600))
+                .CheckMeasureResult(SpacePlan.PartialRender(Size.Zero));
         }
         
         [Test]
@@ -46,8 +46,8 @@ namespace QuestPDF.UnitTests
                     Child = x.CreateChild()
                 })
                 .MeasureElement(new Size(900, 800))
-                .ExpectChildMeasure(Size.Max, new FullRender(1200, 1600))
-                .CheckMeasureResult(new FullRender(Size.Zero));
+                .ExpectChildMeasure(Size.Max, SpacePlan.FullRender(1200, 1600))
+                .CheckMeasureResult(SpacePlan.FullRender(Size.Zero));
         }
         
         #endregion
@@ -63,7 +63,7 @@ namespace QuestPDF.UnitTests
                     Child = x.CreateChild()
                 })
                 .DrawElement(new Size(900, 800))
-                .ExpectChildMeasure(Size.Max, new Wrap())
+                .ExpectChildMeasure(Size.Max, SpacePlan.Wrap())
                 .CheckDrawResult();
         }
         
@@ -76,7 +76,7 @@ namespace QuestPDF.UnitTests
                     Child = x.CreateChild()
                 })
                 .DrawElement(new Size(900, 800))
-                .ExpectChildMeasure(Size.Max, new PartialRender(1200, 1600))
+                .ExpectChildMeasure(Size.Max, SpacePlan.PartialRender(1200, 1600))
                 .ExpectChildDraw(new Size(1200, 1600))
                 .CheckDrawResult();
         }
@@ -90,7 +90,7 @@ namespace QuestPDF.UnitTests
                     Child = x.CreateChild()
                 })
                 .DrawElement(new Size(900, 800))
-                .ExpectChildMeasure(Size.Max, new FullRender(1600, 1000))
+                .ExpectChildMeasure(Size.Max, SpacePlan.FullRender(1600, 1000))
                 .ExpectChildDraw(new Size(1600, 1000))
                 .CheckDrawResult();
         }

QuestPDF/Assembly.cs

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

QuestPDF/Drawing/DocumentGenerator.cs

@@ -3,10 +3,12 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using QuestPDF.Drawing.Exceptions;
-using QuestPDF.Drawing.SpacePlan;
+using QuestPDF.Drawing.Proxy;
 using QuestPDF.Elements;
 using QuestPDF.Elements.Text;
 using QuestPDF.Elements.Text.Items;
+using QuestPDF.Fluent;
+using QuestPDF.Helpers;
 using QuestPDF.Infrastructure;
 
 namespace QuestPDF.Drawing
@@ -20,6 +22,13 @@ namespace QuestPDF.Drawing
             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();
@@ -35,19 +44,25 @@ namespace QuestPDF.Drawing
             var container = new DocumentContainer();
             document.Compose(container);
             var content = container.Compose();
+            ApplyDefaultTextStyle(content, TextStyle.LibraryDefault);
             
             var metadata = document.GetMetadata();
             var pageContext = new PageContext();
 
-            RenderPass(pageContext, new FreeCanvas(), content, metadata);
-            RenderPass(pageContext, canvas, content, metadata);
+            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);
         }
         
-        private static void RenderPass<TCanvas>(PageContext pageContext, TCanvas canvas, Container content, DocumentMetadata documentMetadata)
+        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());
+            content.VisitChildren(x => x?.Initialize(pageContext, canvas));
+            content.VisitChildren(x => (x as IStateResettable)?.ResetState());
             
             canvas.BeginDocument();
 
@@ -56,9 +71,11 @@ namespace QuestPDF.Drawing
             while(true)
             {
                 pageContext.SetPageNumber(currentPage);
-                var spacePlan = content.Measure(Size.Max) as Size;
+                debuggingState?.Reset();
+                
+                var spacePlan = content.Measure(Size.Max);
 
-                if (spacePlan == null)
+                if (spacePlan.Type == SpacePlanType.Wrap)
                 {
                     canvas.EndDocument();
                     ThrowLayoutException();
@@ -83,45 +100,82 @@ namespace QuestPDF.Drawing
                     ThrowLayoutException();
                 }
                 
-                if (spacePlan is FullRender)
+                if (spacePlan.Type == SpacePlanType.FullRender)
                     break;
 
                 currentPage++;
             }
             
             canvas.EndDocument();
-            
+
             void ThrowLayoutException()
             {
-                throw new DocumentLayoutException(
-                    $"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.");
+                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)
+                {
+                    ElementTrace = debuggingState?.BuildTrace() ?? "Debug trace is available only in the DEBUG mode."
+                };
             }
         }
 
-        internal static void ApplyDefaultTextStyle(this Element content, TextStyle documentDefaultTextStyle)
+        private static void ApplyCaching(Container content)
         {
-            documentDefaultTextStyle.ApplyGlobalStyle(TextStyle.LibraryDefault);
-            
-            content.HandleVisitor(element =>
+            content.VisitChildren(x =>
             {
-                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);
-                }
+                if (x is ICacheable)
+                    x.CreateProxy(y => new CacheProxy(y));
             });
         }
+
+        private static DebuggingState ApplyDebugging(Container content)
+        {
+            var debuggingState = new DebuggingState();
+
+            content.VisitChildren(x =>
+            {
+                x.CreateProxy(y => new DebuggingProxy(debuggingState, y));
+            });
+
+            return debuggingState;
+        }
+
+        private static void ApplyDefaultTextStyle(this Element? content, TextStyle documentDefaultTextStyle)
+        {
+            if (content == null)
+                return;
+            
+            if (content is TextBlock textBlock)
+            {
+                foreach (var textBlockItem in textBlock.Items)
+                {
+                    if (textBlockItem is TextBlockSpan textSpan)
+                    {
+                        textSpan.Style.ApplyGlobalStyle(documentDefaultTextStyle);
+                    }
+                    else if (textBlockItem is TextBlockElement textElement)
+                    {
+                        ApplyDefaultTextStyle(textElement.Element, documentDefaultTextStyle);
+                    }
+                }
+                
+                return;
+            }
+
+            var targetTextStyle = documentDefaultTextStyle;
+            
+            if (content is DefaultTextStyle defaultTextStyleElement)
+            {
+                defaultTextStyleElement.TextStyle.ApplyParentStyle(documentDefaultTextStyle);
+                targetTextStyle = defaultTextStyleElement.TextStyle;
+            }
+            
+            foreach (var child in content.GetChildren())
+                ApplyDefaultTextStyle(child, targetTextStyle);
+        }
     }
 }

QuestPDF/Drawing/DocumentMetadata.cs

@@ -23,7 +23,10 @@ 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,6 +4,8 @@ namespace QuestPDF.Drawing.Exceptions
 {
     public class DocumentLayoutException : Exception
     {
+        public string ElementTrace { get; set; }
+        
         public DocumentLayoutException()
         {
             

QuestPDF/Drawing/FontManager.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Concurrent;
 using System.IO;
-using QuestPDF.Drawing.SpacePlan;
 using QuestPDF.Infrastructure;
 using SkiaSharp;
 

QuestPDF/Drawing/PdfCanvas.cs

@@ -4,43 +4,13 @@ using SkiaSharp;
 
 namespace QuestPDF.Drawing
 {
-    internal class PdfCanvas : SkiaCanvasBase
+    internal class PdfCanvas : SkiaDocumentCanvasBase
     {
-        private SKDocument Document { get; }
-
-        public PdfCanvas(Stream stream, DocumentMetadata documentMetadata)
-        {
-            Document = SKDocument.CreatePdf(stream, MapMetadata(documentMetadata));
-        }
-
-        ~PdfCanvas()
-        {
-            Document.Dispose();
-        }
-        
-        public override void BeginDocument()
+        public PdfCanvas(Stream stream, DocumentMetadata documentMetadata) 
+            : base(SKDocument.CreatePdf(stream, MapMetadata(documentMetadata)))
         {
             
         }
-
-        public override void EndDocument()
-        {
-            Canvas.Dispose();
-            
-            Document.Close();
-            Document.Dispose();
-        }
-
-        public override void BeginPage(Size size)
-        {
-            Canvas = Document.BeginPage(size.Width, size.Height);
-        }
-
-        public override void EndPage()
-        {
-            Document.EndPage();
-            Canvas.Dispose();
-        }
         
         private static SKDocumentPdfMetadata MapMetadata(DocumentMetadata metadata)
         {

QuestPDF/Drawing/Proxy/CacheProxy.cs

@@ -0,0 +1,45 @@
+using System;
+using QuestPDF.Infrastructure;
+
+namespace QuestPDF.Drawing.Proxy
+{
+    internal class CacheProxy : ElementProxy
+    {
+        public Size? AvailableSpace { get; set; }
+        public SpacePlan? MeasurementResult { get; set; }
+
+        public CacheProxy(Element child)
+        {
+            Child = child;
+        }
+        
+        internal override SpacePlan Measure(Size availableSpace)
+        {
+            if (MeasurementResult != null &&
+                AvailableSpace != null &&
+                IsClose(AvailableSpace.Value.Width, availableSpace.Width) &&
+                IsClose(AvailableSpace.Value.Height, availableSpace.Height))
+            {
+                return MeasurementResult.Value;
+            }
+
+            AvailableSpace = availableSpace;
+            MeasurementResult = base.Measure(availableSpace);
+
+            return MeasurementResult.Value;
+        }
+
+        internal override void Draw(Size availableSpace)
+        { 
+            AvailableSpace = null;
+            MeasurementResult = null;
+            
+            base.Draw(availableSpace);
+        }
+
+        private bool IsClose(float x, float y)
+        {
+            return Math.Abs(x - y) < Size.Epsilon;
+        }
+    }
+}

QuestPDF/Drawing/Proxy/DebugStackItem.cs

@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+using QuestPDF.Infrastructure;
+
+namespace QuestPDF.Drawing.Proxy
+{
+    public class DebugStackItem
+    {
+        public IElement Element { get; internal set; }
+        public Size AvailableSpace { get; internal set; }
+        public SpacePlan SpacePlan { get; internal set; }
+
+        public ICollection<DebugStackItem> Stack { get; internal set; } = new List<DebugStackItem>();
+    }
+}

QuestPDF/Drawing/Proxy/DebuggingProxy.cs

@@ -0,0 +1,24 @@
+using QuestPDF.Infrastructure;
+
+namespace QuestPDF.Drawing.Proxy
+{
+    internal class DebuggingProxy : ElementProxy
+    {
+        private DebuggingState DebuggingState { get; }
+
+        public DebuggingProxy(DebuggingState debuggingState, Element child)
+        {
+            DebuggingState = debuggingState;
+            Child = child;
+        }
+        
+        internal override SpacePlan Measure(Size availableSpace)
+        {
+            DebuggingState.RegisterMeasure(Child, availableSpace);
+            var spacePlan = base.Measure(availableSpace);
+            DebuggingState.RegisterMeasureResult(Child, spacePlan);
+
+            return spacePlan;
+        }
+    }
+}

QuestPDF/Drawing/Proxy/DebuggingState.cs

@@ -0,0 +1,130 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using QuestPDF.Elements;
+using QuestPDF.Helpers;
+using QuestPDF.Infrastructure;
+
+namespace QuestPDF.Drawing.Proxy
+{
+    internal class DebuggingState
+    {
+        private DebugStackItem Root { get; set; }
+        private Stack<DebugStackItem> Stack { get; set; }
+
+        public DebuggingState()
+        {
+            Reset();
+        }
+        
+        public void Reset()
+        {
+            Root = null;
+            Stack = new Stack<DebugStackItem>();
+        }
+        
+        public void RegisterMeasure(IElement element, Size availableSpace)
+        {
+            if (element.GetType() == typeof(Container))
+                return;
+            
+            var item = new DebugStackItem
+            {
+                Element = element,
+                AvailableSpace = availableSpace
+            };
+
+            Root ??= item;
+            
+            if (Stack.Any())
+                Stack.Peek().Stack.Add(item);
+
+            Stack.Push(item);
+        }
+
+        public void RegisterMeasureResult(IElement element, SpacePlan spacePlan)
+        {
+            if (element.GetType() == typeof(Container))
+                return;
+            
+            var item = Stack.Pop();
+
+            if (item.Element != element)
+                throw new Exception();
+            
+            item.SpacePlan = spacePlan;
+        }
+        
+        public string BuildTrace()
+        {
+            var builder = new StringBuilder();
+            var nestingLevel = 0;
+
+            Traverse(Root);
+            return builder.ToString();
+
+            void Traverse(DebugStackItem item)
+            {
+                var indent = new string(' ', nestingLevel * 4);
+                var title = item.Element.GetType().Name;
+
+                if (item.Element is DebugPointer debugPointer)
+                {
+                    title = debugPointer.Target;
+                    title += debugPointer.Highlight ? " 🌟" : string.Empty;
+                }
+                
+                if (item.SpacePlan.Type != SpacePlanType.FullRender)
+                    title = "🔥 " + title;
+
+                builder.AppendLine(indent + title);
+                builder.AppendLine(indent + new string('-', title.Length));
+                
+                builder.AppendLine(indent + "Available space: " + item.AvailableSpace);
+                builder.AppendLine(indent + "Requested space: " + item.SpacePlan);
+                
+                foreach (var configuration in GetElementConfiguration(item.Element))
+                    builder.AppendLine(indent + configuration);
+
+                builder.AppendLine();
+                
+                nestingLevel++;
+                item.Stack.ToList().ForEach(Traverse);
+                nestingLevel--;
+            }
+
+            static IEnumerable<string> GetElementConfiguration(IElement element)
+            {
+                if (element is DebugPointer)
+                    return Enumerable.Empty<string>();
+                
+                return element
+                    .GetType()
+                    .GetProperties()
+                    .Select(x => new
+                    {
+                        Property = x.Name.PrettifyName(),
+                        Value = x.GetValue(element)
+                    })
+                    .Where(x => !(x.Value is IElement))
+                    .Where(x => x.Value is string || !(x.Value is IEnumerable))
+                    .Where(x => !(x.Value is TextStyle))
+                    .Select(x => $"{x.Property}: {FormatValue(x.Value)}");
+
+                string FormatValue(object value)
+                {
+                    const int maxLength = 100;
+                    
+                    var text = value?.ToString() ?? "-";
+
+                    if (text.Length < maxLength)
+                        return text;
+
+                    return text.AsSpan(0, maxLength).ToString() + "...";
+                }
+            }
+        }
+    }
+}

QuestPDF/Drawing/Proxy/ElementProxy.cs

@@ -0,0 +1,9 @@
+using QuestPDF.Infrastructure;
+
+namespace QuestPDF.Drawing.Proxy
+{
+    internal class ElementProxy : ContainerElement
+    {
+        
+    }
+}

QuestPDF/Drawing/SkiaDocumentCanvasBase.cs

@@ -0,0 +1,45 @@
+using System.IO;
+using QuestPDF.Infrastructure;
+using SkiaSharp;
+
+namespace QuestPDF.Drawing
+{
+    internal class SkiaDocumentCanvasBase : SkiaCanvasBase
+    {
+        private SKDocument Document { get; }
+
+        public SkiaDocumentCanvasBase(SKDocument document)
+        {
+            Document = document;
+        }
+
+        ~SkiaDocumentCanvasBase()
+        {
+            Document.Dispose();
+        }
+        
+        public override void BeginDocument()
+        {
+            
+        }
+
+        public override void EndDocument()
+        {
+            Canvas.Dispose();
+            
+            Document.Close();
+            Document.Dispose();
+        }
+
+        public override void BeginPage(Size size)
+        {
+            Canvas = Document.BeginPage(size.Width, size.Height);
+        }
+
+        public override void EndPage()
+        {
+            Document.EndPage();
+            Canvas.Dispose();
+        }
+    }
+}

QuestPDF/Drawing/SpacePlan.cs

@@ -0,0 +1,42 @@
+using System.Collections.Generic;
+using QuestPDF.Infrastructure;
+
+namespace QuestPDF.Drawing
+{
+    public readonly struct SpacePlan
+    {
+        public readonly SpacePlanType Type;
+        public readonly float Width;
+        public readonly float Height;
+
+        internal SpacePlan(SpacePlanType type, float width, float height)
+        {
+            Type = type;
+            Width = width;
+            Height = height;
+        }
+
+        internal static SpacePlan Wrap() => new SpacePlan(SpacePlanType.Wrap, 0, 0);
+        
+        internal static SpacePlan PartialRender(float width, float height) => new SpacePlan(SpacePlanType.PartialRender, width, height);
+
+        internal static SpacePlan PartialRender(Size size) => PartialRender(size.Width, size.Height);
+        
+        internal static SpacePlan FullRender(float width, float height) => new SpacePlan(SpacePlanType.FullRender, width, height);
+
+        internal static SpacePlan FullRender(Size size) => FullRender(size.Width, size.Height);
+
+        public override string ToString()
+        {
+            if (Type == SpacePlanType.Wrap)
+                return Type.ToString();
+            
+            return $"{Type} (Width: {Width:N3}, Height: {Height:N3})";
+        }
+
+        public static implicit operator Size(SpacePlan spacePlan)
+        {
+            return new Size(spacePlan.Width, spacePlan.Height);
+        }
+    }
+}

QuestPDF/Drawing/SpacePlan/FullRender.cs

@@ -1,19 +0,0 @@
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Drawing.SpacePlan
-{
-    internal class FullRender : Size, ISpacePlan
-    {
-        public FullRender(Size size) : this(size.Width, size.Height)
-        {
-            
-        }
-        
-        public FullRender(float width, float height) : base(width, height)
-        {
-            
-        }
-        
-        public override string ToString() => $"FullRender {base.ToString()}";
-    }
-}

QuestPDF/Drawing/SpacePlan/ISpacePlan.cs

@@ -1,7 +0,0 @@
-namespace QuestPDF.Drawing.SpacePlan
-{
-    internal interface ISpacePlan
-    {
-        
-    }
-}

QuestPDF/Drawing/SpacePlan/PartialRender.cs

@@ -1,19 +0,0 @@
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Drawing.SpacePlan
-{
-    internal class PartialRender : Size, ISpacePlan
-    {
-        public PartialRender(Size size) : this(size.Width, size.Height)
-        {
-            
-        }
-        
-        public PartialRender(float width, float height) : base(width, height)
-        {
-            
-        }
-        
-        public override string ToString() => $"PartialRender {base.ToString()}";
-    }
-}

QuestPDF/Drawing/SpacePlan/TextRender.cs

@@ -1,13 +0,0 @@
-namespace QuestPDF.Drawing.SpacePlan
-{
-    internal class TextRender : FullRender
-    {
-        public float Ascent { get; set; }
-        public float Descent { get; set; }
-        
-        public TextRender(float width, float height) : base(width, height)
-        {
-            
-        }
-    }
-}

QuestPDF/Drawing/SpacePlan/Wrap.cs

@@ -1,7 +0,0 @@
-namespace QuestPDF.Drawing.SpacePlan
-{
-    internal class Wrap : ISpacePlan
-    {
-        public override string ToString() => "Wrap";
-    }
-}

QuestPDF/Drawing/SpacePlanType.cs

@@ -0,0 +1,9 @@
+namespace QuestPDF.Drawing
+{
+    public enum SpacePlanType
+    {
+        Wrap,
+        PartialRender,
+        FullRender
+    }
+}

QuestPDF/Drawing/TextMeasurement.cs

@@ -1,4 +1,4 @@
-namespace QuestPDF.Drawing.SpacePlan
+namespace QuestPDF.Drawing
 {
     internal struct TextMeasurement
     {

QuestPDF/Drawing/XpsCanvas.cs

@@ -0,0 +1,15 @@
+using System.IO;
+using QuestPDF.Infrastructure;
+using SkiaSharp;
+
+namespace QuestPDF.Drawing
+{
+    internal class XpsCanvas : SkiaDocumentCanvasBase
+    {
+        public XpsCanvas(Stream stream, DocumentMetadata documentMetadata) 
+            : base(SKDocument.CreateXps(stream, documentMetadata.RasterDpi))
+        {
+            
+        }
+    }
+}

QuestPDF/Elements/Alignment.cs

@@ -1,4 +1,5 @@
 using System;
+using QuestPDF.Drawing;
 using QuestPDF.Infrastructure;
 
 namespace QuestPDF.Elements
@@ -13,16 +14,16 @@ namespace QuestPDF.Elements
             if (Child == null)
                 return;
             
-            var childSize = Child.Measure(availableSpace) as Size;
+            var childSize = base.Measure(availableSpace);
             
-            if (childSize == null)
+            if (childSize.Type == SpacePlanType.Wrap)
                 return;
             
             var top = GetTopOffset(availableSpace, childSize);
             var left = GetLeftOffset(availableSpace, childSize);
             
             Canvas.Translate(new Position(left, top));
-            Child.Draw(childSize);
+            base.Draw(childSize);
             Canvas.Translate(new Position(-left, -top));
         }
         

QuestPDF/Elements/AspectRatio.cs

@@ -1,37 +1,37 @@
 using System;
-using QuestPDF.Drawing.SpacePlan;
+using QuestPDF.Drawing;
 using QuestPDF.Infrastructure;
 
 namespace QuestPDF.Elements
 {
-    internal class AspectRatio : ContainerElement
+    internal class AspectRatio : ContainerElement, ICacheable
     {
         public float Ratio { get; set; } = 1;
         public AspectRatioOption Option { get; set; } = AspectRatioOption.FitWidth;
         
-        internal override ISpacePlan Measure(Size availableSpace)
+        internal override SpacePlan Measure(Size availableSpace)
         {
             if(Child == null)
-                return new FullRender(Size.Zero);
+                return SpacePlan.FullRender(0, 0);
             
             var targetSize = GetTargetSize(availableSpace);
             
             if (targetSize.Height > availableSpace.Height + Size.Epsilon)
-                return new Wrap();
+                return SpacePlan.Wrap();
             
             if (targetSize.Width > availableSpace.Width + Size.Epsilon)
-                return new Wrap();
+                return SpacePlan.Wrap();
 
-            var childSize = Child.Measure(targetSize);
+            var childSize = base.Measure(targetSize);
 
-            if (childSize is Wrap)
-                return new Wrap();
+            if (childSize.Type == SpacePlanType.Wrap)
+                return SpacePlan.Wrap();
 
-            if (childSize is PartialRender)
-                return new PartialRender(targetSize);
+            if (childSize.Type == SpacePlanType.PartialRender)
+                return SpacePlan.PartialRender(targetSize);
 
-            if (childSize is FullRender)
-                return new FullRender(targetSize);
+            if (childSize.Type == SpacePlanType.FullRender)
+                return SpacePlan.FullRender(targetSize);
             
             throw new NotSupportedException();
         }
@@ -42,7 +42,7 @@ namespace QuestPDF.Elements
                 return;
             
             var size = GetTargetSize(availableSpace);
-            Child?.Draw(size);
+            base.Draw(size);
         }
         
         private Size GetTargetSize(Size availableSpace)

QuestPDF/Elements/Background.cs

@@ -10,7 +10,7 @@ namespace QuestPDF.Elements
         internal override void Draw(Size availableSpace)
         {
             Canvas.DrawRectangle(Position.Zero, availableSpace, Color);
-            Child?.Draw(availableSpace);
+            base.Draw(availableSpace);
         }
     }
 }

QuestPDF/Elements/Border.cs

@@ -14,7 +14,7 @@ namespace QuestPDF.Elements
 
         internal override void Draw(Size availableSpace)
         {
-            Child?.Draw(availableSpace);
+            base.Draw(availableSpace);
             
             Canvas.DrawRectangle(
                 new Position(-Left/2, -Top/2), 
@@ -36,5 +36,10 @@ namespace QuestPDF.Elements
                 new Size(Right, availableSpace.Height + Top/2 + Bottom/2), 
                 Color);
         }
+
+        public override string ToString()
+        {
+            return $"Border: Top({Top}) Right({Right}) Bottom({Bottom}) Left({Left}) Color({Color})";
+        }
     }
 }

QuestPDF/Elements/Box.cs

@@ -1,17 +0,0 @@
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Elements
-{
-    internal class Box : ContainerElement
-    {
-        internal override void Draw(Size availableSpace)
-        {
-            var targetSize = Child?.Measure(availableSpace) as Size;
-            
-            if (targetSize == null)
-                return;
-            
-            Child?.Draw(targetSize);
-        }
-    }
-}

QuestPDF/Elements/Canvas.cs

@@ -1,4 +1,4 @@
-using QuestPDF.Drawing.SpacePlan;
+using QuestPDF.Drawing;
 using QuestPDF.Infrastructure;
 using SkiaSharp;
 
@@ -6,13 +6,13 @@ namespace QuestPDF.Elements
 {
     public delegate void DrawOnCanvas(SKCanvas canvas, Size availableSpace);
     
-    internal class Canvas : Element
+    internal class Canvas : Element, ICacheable
     {
         public DrawOnCanvas Handler { get; set; }
         
-        internal override ISpacePlan Measure(Size availableSpace)
+        internal override SpacePlan Measure(Size availableSpace)
         {
-            return new FullRender(availableSpace);
+            return SpacePlan.FullRender(availableSpace);
         }
 
         internal override void Draw(Size availableSpace)
@@ -22,9 +22,9 @@ namespace QuestPDF.Elements
             if (Handler == null || skiaCanvas == null)
                 return;
 
-            var currentMatrix = skiaCanvas.TotalMatrix;
+            var originalMatrix = skiaCanvas.TotalMatrix;
             Handler.Invoke(skiaCanvas, availableSpace);
-            skiaCanvas.SetMatrix(currentMatrix);
+            skiaCanvas.SetMatrix(originalMatrix);
         }
     }
 }

QuestPDF/Elements/Constrained.cs

@@ -1,45 +1,44 @@
 using System;
 using System.Linq;
-using QuestPDF.Drawing.SpacePlan;
+using QuestPDF.Drawing;
 using QuestPDF.Infrastructure;
 
 namespace QuestPDF.Elements
 {
-    internal class Constrained : ContainerElement
+    internal class Constrained : ContainerElement, ICacheable
     {
         public float? MinWidth { get; set; }
         public float? MaxWidth { get; set; }
-        
+
         public float? MinHeight { get; set; }
         public float? MaxHeight { get; set; }
 
-        internal override ISpacePlan Measure(Size availableSpace)
+        internal override SpacePlan Measure(Size availableSpace)
         {
             if (MinWidth > availableSpace.Width + Size.Epsilon)
-                return new Wrap();
+                return SpacePlan.Wrap();
             
             if (MinHeight > availableSpace.Height + Size.Epsilon)
-                return new Wrap();
+                return SpacePlan.Wrap();
             
             var available = new Size(
                 Min(MaxWidth, availableSpace.Width),
                 Min(MaxHeight, availableSpace.Height));
 
-            var measurement = Child?.Measure(available) ?? new FullRender(Size.Zero);
-            var size = measurement as Size;
+            var measurement = base.Measure(available);
 
-            if (measurement is Wrap)
-                return new Wrap();
+            if (measurement.Type == SpacePlanType.Wrap)
+                return SpacePlan.Wrap();
             
             var actualSize = new Size(
-                Max(MinWidth, size.Width),
-                Max(MinHeight, size.Height));
+                Max(MinWidth, measurement.Width),
+                Max(MinHeight, measurement.Height));
             
-            if (size is FullRender)
-                return new FullRender(actualSize);
+            if (measurement.Type == SpacePlanType.FullRender)
+                return SpacePlan.FullRender(actualSize);
             
-            if (size is PartialRender)
-                return new PartialRender(actualSize);
+            if (measurement.Type == SpacePlanType.PartialRender)
+                return SpacePlan.PartialRender(actualSize);
             
             throw new NotSupportedException();
         }

QuestPDF/Elements/DebugArea.cs

@@ -5,7 +5,7 @@ using SkiaSharp;
 
 namespace QuestPDF.Elements
 {
-    internal class Debug : IComponent
+    internal class DebugArea : IComponent
     {
         public IElement? Child { get; set; }
         
@@ -27,10 +27,10 @@ namespace QuestPDF.Elements
                         .Layer()
                         .ShowIf(!string.IsNullOrWhiteSpace(Text))
                         .AlignCenter()
-                        .Box()
+                        .MinimalBox()
                         .Background(Colors.White)
                         .Padding(2)
-                        .Text(Text, TextStyle.Default.Color(Color).FontType("Consolas").Size(8));
+                        .Text(Text, TextStyle.Default.Color(Color).FontType(Fonts.Consolas).Size(8));
                 });
         }
     }

QuestPDF/Elements/DebugPointer.cs

@@ -0,0 +1,10 @@
+using System.ComponentModel;
+
+namespace QuestPDF.Elements
+{
+    internal class DebugPointer : Container
+    {
+        public string Target { get; set; }
+        public bool Highlight { get; set; }
+    }
+}

QuestPDF/Elements/Decoration.cs

@@ -1,5 +1,6 @@
 using System;
-using QuestPDF.Drawing.SpacePlan;
+using System.Collections.Generic;
+using QuestPDF.Drawing;
 using QuestPDF.Fluent;
 using QuestPDF.Infrastructure;
 
@@ -11,48 +12,52 @@ namespace QuestPDF.Elements
         Append
     }
     
-    internal class SimpleDecoration : Element
+    internal class BinaryDecoration : Element, ICacheable
     {
         public Element DecorationElement { get; set; } = Empty.Instance;
         public Element ContentElement { get; set; } = Empty.Instance;
         public DecorationType Type { get; set; }
 
-        internal override void HandleVisitor(Action<Element?> visit)
+        internal override IEnumerable<Element?> GetChildren()
         {
-            DecorationElement?.HandleVisitor(visit);
-            ContentElement?.HandleVisitor(visit);
-            
-            base.HandleVisitor(visit);
+            yield return DecorationElement;
+            yield return ContentElement;
         }
 
-        internal override ISpacePlan Measure(Size availableSpace)
+        internal override void CreateProxy(Func<Element, Element> create)
         {
-            var decorationMeasure = DecorationElement?.Measure(availableSpace);
-            
-            if (decorationMeasure is Wrap || decorationMeasure is PartialRender)
-                return new Wrap();
+            DecorationElement = create(DecorationElement);
+            ContentElement = create(ContentElement);
+        }
 
-            var decorationSize = decorationMeasure as Size ?? Size.Zero;
-            var contentMeasure = ContentElement?.Measure(new Size(availableSpace.Width, availableSpace.Height - decorationSize.Height)) ?? new FullRender(Size.Zero);
+        internal override SpacePlan Measure(Size availableSpace)
+        {
+            var decorationMeasure = DecorationElement.Measure(availableSpace);
             
-            if (contentMeasure is Wrap)
-                return new Wrap();
+            if (decorationMeasure.Type == SpacePlanType.Wrap || decorationMeasure.Type == SpacePlanType.PartialRender)
+                return SpacePlan.Wrap();
 
-            var contentSize = contentMeasure as Size ?? Size.Zero;
+            var decorationSize = decorationMeasure;
+            var contentMeasure = ContentElement.Measure(new Size(availableSpace.Width, availableSpace.Height - decorationSize.Height));
+            
+            if (contentMeasure.Type == SpacePlanType.Wrap)
+                return SpacePlan.Wrap();
+
+            var contentSize = contentMeasure;
             var resultSize = new Size(availableSpace.Width, decorationSize.Height + contentSize.Height);
             
-            if (contentSize is PartialRender)
-                return new PartialRender(resultSize);
+            if (contentSize.Type == SpacePlanType.PartialRender)
+                return SpacePlan.PartialRender(resultSize);
             
-            if (contentSize is FullRender)
-                return new FullRender(resultSize);
+            if (contentSize.Type == SpacePlanType.FullRender)
+                return SpacePlan.FullRender(resultSize);
             
             throw new NotSupportedException();
         }
 
         internal override void Draw(Size availableSpace)
         {
-            var decorationSize = DecorationElement?.Measure(availableSpace) as Size ?? Size.Zero;
+            var decorationSize = DecorationElement.Measure(availableSpace);
             var contentSize = new Size(availableSpace.Width, availableSpace.Height - decorationSize.Height);
 
             var translateHeight = Type == DecorationType.Prepend ? decorationSize.Height : contentSize.Height;
@@ -77,11 +82,11 @@ namespace QuestPDF.Elements
 
         public void Compose(IContainer container)
         {
-            container.Element(new SimpleDecoration
+            container.Element(new BinaryDecoration
             {
                 Type = DecorationType.Prepend,
                 DecorationElement = Header,
-                ContentElement = new SimpleDecoration
+                ContentElement = new BinaryDecoration
                 {
                     Type = DecorationType.Append,
                     ContentElement = Content,

QuestPDF/Elements/DefaultTextStyle.cs

@@ -0,0 +1,10 @@
+using QuestPDF.Drawing;
+using QuestPDF.Infrastructure;
+
+namespace QuestPDF.Elements
+{
+    internal class DefaultTextStyle : ContainerElement
+    {
+        public TextStyle TextStyle { get; set; } = TextStyle.Default;
+    }
+}

QuestPDF/Elements/DynamicImage.cs

@@ -1,5 +1,5 @@
 using System;
-using QuestPDF.Drawing.SpacePlan;
+using QuestPDF.Drawing;
 using QuestPDF.Infrastructure;
 using SkiaSharp;
 
@@ -9,9 +9,9 @@ namespace QuestPDF.Elements
     {
         public Func<Size, byte[]>? Source { get; set; }
         
-        internal override ISpacePlan Measure(Size availableSpace)
+        internal override SpacePlan Measure(Size availableSpace)
         {
-            return new FullRender(availableSpace.Width, availableSpace.Height);
+            return SpacePlan.FullRender(availableSpace.Width, availableSpace.Height);
         }
 
         internal override void Draw(Size availableSpace)

QuestPDF/Elements/Empty.cs

@@ -1,4 +1,4 @@
-using QuestPDF.Drawing.SpacePlan;
+using QuestPDF.Drawing;
 using QuestPDF.Infrastructure;
 
 namespace QuestPDF.Elements
@@ -7,9 +7,9 @@ namespace QuestPDF.Elements
     {
         internal static Empty Instance { get; } = new Empty();
         
-        internal override ISpacePlan Measure(Size availableSpace)
+        internal override SpacePlan Measure(Size availableSpace)
         {
-            return new FullRender(Size.Zero);
+            return SpacePlan.FullRender(0, 0);
         }
 
         internal override void Draw(Size availableSpace)

QuestPDF/Elements/EnsureSpace.cs

@@ -1,19 +1,19 @@
-using QuestPDF.Drawing.SpacePlan;
+using QuestPDF.Drawing;
 using QuestPDF.Infrastructure;
 
 namespace QuestPDF.Elements
 {
-    internal class EnsureSpace : ContainerElement
+    internal class EnsureSpace : ContainerElement, ICacheable
     {
         public const float DefaultMinHeight = 150;
         public float MinHeight { get; set; } = DefaultMinHeight;
 
-        internal override ISpacePlan Measure(Size availableSpace)
+        internal override SpacePlan Measure(Size availableSpace)
         {
             var measurement = base.Measure(availableSpace);
 
-            if (measurement is PartialRender && availableSpace.Height < MinHeight)
-                return new Wrap();
+            if (measurement.Type == SpacePlanType.PartialRender && availableSpace.Height < MinHeight)
+                return SpacePlan.Wrap();
 
             return measurement;
         }

QuestPDF/Elements/Extend.cs

@@ -1,28 +1,28 @@
 using System;
-using QuestPDF.Drawing.SpacePlan;
+using QuestPDF.Drawing;
 using QuestPDF.Infrastructure;
 
 namespace QuestPDF.Elements
 {
-    internal class Extend : ContainerElement
+    internal class Extend : ContainerElement, ICacheable
     {
         public bool ExtendVertical { get; set; }
         public bool ExtendHorizontal { get; set; }
         
-        internal override ISpacePlan Measure(Size availableSpace)
+        internal override SpacePlan Measure(Size availableSpace)
         {
-            var childSize = Child?.Measure(availableSpace) ?? new FullRender(Size.Zero);
+            var childSize = base.Measure(availableSpace);
 
-            if (childSize is Wrap)
+            if (childSize.Type == SpacePlanType.Wrap)
                 return childSize;
             
-            var targetSize = GetTargetSize(availableSpace, childSize as Size);
+            var targetSize = GetTargetSize(availableSpace, childSize);
             
-            if (childSize is PartialRender)
-                return new PartialRender(targetSize);
+            if (childSize.Type == SpacePlanType.PartialRender)
+                return SpacePlan.PartialRender(targetSize);
             
-            if (childSize is FullRender)
-                return new FullRender(targetSize);
+            if (childSize.Type == SpacePlanType.FullRender)
+                return SpacePlan.FullRender(targetSize);
             
             throw new NotSupportedException();
         }

QuestPDF/Elements/ExternalLink.cs

@@ -1,4 +1,5 @@
-using QuestPDF.Infrastructure;
+using QuestPDF.Drawing;
+using QuestPDF.Infrastructure;
 
 namespace QuestPDF.Elements
 {
@@ -8,13 +9,13 @@ namespace QuestPDF.Elements
         
         internal override void Draw(Size availableSpace)
         {
-            var targetSize = Child?.Measure(availableSpace) as Size;
+            var targetSize = base.Measure(availableSpace);
 
-            if (targetSize == null)
+            if (targetSize.Type == SpacePlanType.Wrap)
                 return;
 
             Canvas.DrawExternalLink(Url, targetSize);
-            Child?.Draw(availableSpace);
+            base.Draw(availableSpace);
         }
     }
 }

QuestPDF/Elements/Image.cs

@@ -1,10 +1,10 @@
-using QuestPDF.Drawing.SpacePlan;
+using QuestPDF.Drawing;
 using QuestPDF.Infrastructure;
 using SkiaSharp;
 
 namespace QuestPDF.Elements
 {
-    internal class Image : Element
+    internal class Image : Element, ICacheable
     {
         public SKImage? InternalImage { get; set; }
 
@@ -13,9 +13,9 @@ namespace QuestPDF.Elements
             InternalImage?.Dispose();
         }
         
-        internal override ISpacePlan Measure(Size availableSpace)
+        internal override SpacePlan Measure(Size availableSpace)
         {
-            return new FullRender(availableSpace);
+            return SpacePlan.FullRender(availableSpace);
         }
 
         internal override void Draw(Size availableSpace)

QuestPDF/Elements/Inlined.cs

@@ -1,21 +1,21 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using QuestPDF.Drawing.SpacePlan;
+using QuestPDF.Drawing;
 using QuestPDF.Infrastructure;
 
 namespace QuestPDF.Elements
 {
     internal class InlinedElement : Container
     {
-        public ISpacePlan? MeasureCache { get; set; }
+        public SpacePlan? MeasureCache { get; set; }
 
-        internal override ISpacePlan Measure(Size availableSpace)
+        internal override SpacePlan Measure(Size availableSpace)
         {
             // TODO: once element caching proxy is introduces, this can be removed
             
             MeasureCache ??= Child.Measure(Size.Max);
-            return MeasureCache;
+            return MeasureCache.Value;
         }
     }
 
@@ -44,28 +44,28 @@ namespace QuestPDF.Elements
             ChildrenQueue = new Queue<InlinedElement>(Elements);
         }
         
-        internal override void HandleVisitor(Action<Element?> visit)
+        internal override IEnumerable<Element?> GetChildren()
         {
-            Elements.ForEach(x => x.HandleVisitor(visit));
-            base.HandleVisitor(visit);
+            return Elements;
         }
-
-        internal override ISpacePlan Measure(Size availableSpace)
+        
+        internal override SpacePlan Measure(Size availableSpace)
         {
             if (!ChildrenQueue.Any())
-                return new FullRender(Size.Zero);
+                return SpacePlan.FullRender(Size.Zero);
             
             var lines = Compose(availableSpace);
 
             if (!lines.Any())
-                return new Wrap();
+                return SpacePlan.Wrap();
 
             var lineSizes = lines
                 .Select(line =>
                 {
                     var size = GetLineSize(line);
-                    var heightWithSpacing = size.Height + (line.Count - 1) * HorizontalSpacing;
-                    return new Size(size.Width, heightWithSpacing);
+
+                    var widthWithSpacing = size.Width + (line.Count - 1) * HorizontalSpacing;
+                    return new Size(widthWithSpacing, size.Height);
                 })
                 .ToList();
             
@@ -76,9 +76,9 @@ namespace QuestPDF.Elements
             var isPartiallyRendered = lines.Sum(x => x.Count) != ChildrenQueue.Count;
 
             if (isPartiallyRendered)
-                return new PartialRender(targetSize);
+                return SpacePlan.PartialRender(targetSize);
             
-            return new FullRender(targetSize);
+            return SpacePlan.FullRender(targetSize);
         }
 
         internal override void Draw(Size availableSpace)
@@ -88,7 +88,11 @@ namespace QuestPDF.Elements
             
             foreach (var line in lines)
             {
-                var height = line.Select(x => x.Measure(Size.Max) as Size).Where(x => x != null).Max(x => x.Height);
+                var height = line
+                    .Select(x => x.Measure(Size.Max))
+                    .Where(x => x.Type != SpacePlanType.Wrap)
+                    .Max(x => x.Height);
+                
                 DrawLine(line);
 
                 topOffset += height + VerticalSpacing;
@@ -108,7 +112,7 @@ namespace QuestPDF.Elements
                 
                 foreach (var element in elements)
                 {
-                    var size = element.Measure(Size.Max) as Size;
+                    var size = element.Measure(Size.Max);
                     var baselineOffset = BaselineOffset(size, lineSize.Height);
                     
                     Canvas.Translate(new Position(0, baselineOffset));
@@ -177,8 +181,8 @@ namespace QuestPDF.Elements
         Size GetLineSize(ICollection<InlinedElement> elements)
         {
             var sizes = elements
-                .Select(x => x.Measure(Size.Max) as Size)
-                .Where(x => x != null)
+                .Select(x => x.Measure(Size.Max))
+                .Where(x => x.Type != SpacePlanType.Wrap)
                 .ToList();
             
             var width = sizes.Sum(x => x.Width);
@@ -203,8 +207,8 @@ namespace QuestPDF.Elements
                     break;
 
                 var height = line
-                    .Select(x => x.Measure(availableSize) as Size)
-                    .Where(x => x != null)
+                    .Select(x => x.Measure(availableSize))
+                    .Where(x => x.Type != SpacePlanType.Wrap)
                     .Max(x => x.Height);
                 
                 if (topOffset + height > availableSize.Height + Size.Epsilon)
@@ -227,9 +231,9 @@ namespace QuestPDF.Elements
                         break;
                     
                     var element = queue.Peek();
-                    var size = element.Measure(Size.Max) as Size;
+                    var size = element.Measure(Size.Max);
                     
-                    if (size == null)
+                    if (size.Type == SpacePlanType.Wrap)
                         break;
                     
                     if (leftOffset + size.Width > availableSize.Width + Size.Epsilon)