Optimized drawing border

QuestPDF.Examples/BarCode.cs

@@ -0,0 +1,32 @@
+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,6 +1,4 @@
-using System.IO;
+using NUnit.Framework;
-using NUnit.Framework;
-using QuestPDF.Drawing;
 using QuestPDF.Examples.Engine;
 using QuestPDF.Fluent;
 using QuestPDF.Helpers;
@@ -8,24 +6,25 @@ using QuestPDF.Infrastructure;
 
 namespace QuestPDF.Examples
 {
+    [TestFixture]
     public class BarcodeExamples
     {
         [Test]
-        public void Example()
+        public void Barcode()
         {
-            FontManager.RegisterFontType("LibreBarcode39", File.OpenRead("LibreBarcode39-Regular.ttf"));
-            
             RenderingTest
                 .Create()
-                .PageSize(400, 100)
+                .PageSize(300, 300)
-                .ShowResults()
                 .Render(container =>
                 {
                     container
-                        .Background(Colors.White)
+                        .Background("#FFF")
-                        .AlignCenter()
+                        .Padding(25)
-                        .AlignMiddle()
+                        .Stack(stack =>
-                        .Text("*QuestPDF*", TextStyle.Default.FontType("LibreBarcode39").Size(64));
+                        {
+                            stack.Item().Border(1).Background(Colors.Grey.Lighten3).Padding(5).Text("Barcode Example");
+                            stack.Item().Border(1).Padding(5).AlignCenter().Text("*123456789*", TextStyle.Default.FontType("CarolinaBar-Demo-25E2").Size(20));
+                        });
                 });
         }
     }

QuestPDF.Examples/CanvasExamples.cs

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

@@ -52,14 +52,14 @@ namespace QuestPDF.Examples
                     container
                         .Background(Colors.White)
                         .Padding(25)
-                        .Column(column =>
+                        .Stack(stack =>
                         {
-                            column
+                            stack
                                 .Item()
                                 .PaddingBottom(10)
                                 .Text("Chart example", TextStyle.Default.Size(20).SemiBold().Color(Colors.Blue.Medium));
                             
-                            column
+                            stack
                                 .Item()
                                 .Border(1)
                                 .ExtendHorizontal()

QuestPDF.Examples/ColumnExamples.cs

@@ -1,37 +0,0 @@
-using NUnit.Framework;
-using QuestPDF.Examples.Engine;
-using QuestPDF.Fluent;
-using QuestPDF.Helpers;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Examples
-{
-    public class ColumnExamples
-    {
-        [Test]
-        public void Column()
-        {
-            RenderingTest
-                .Create()
-                .PageSize(PageSizes.A4)
-                .ShowResults()
-                .ProducePdf()
-                .Render(container =>
-                {
-                    container.Column(column =>
-                    {
-                        column.Item().Element(Block);
-
-                        static void Block(IContainer container)
-                        {
-                            container
-                                .Width(72)
-                                .Height(3.5f)
-                                .Height(1.5f)
-                                .Background(Placeholders.BackgroundColor());
-                        }
-                    });
-                });
-        }
-    }
-}

QuestPDF.Examples/ComplexLayoutBenchmark.cs

@@ -36,8 +36,8 @@ namespace QuestPDF.Examples
                     .BorderColor(Colors.Black)
                     .Row(row =>
                     {
-                        row.RelativeItem().Element(x => GenerateStructure(x, level));
+                        row.RelativeColumn().Element(x => GenerateStructure(x, level));
-                        row.RelativeItem().Element(x => GenerateStructure(x, level));
+                        row.RelativeColumn().Element(x => GenerateStructure(x, level));
                     });
             }
             else
@@ -45,10 +45,10 @@ namespace QuestPDF.Examples
                 container
                     .Border(level / 4f)
                     .BorderColor(Colors.Black)
-                    .Column(column =>
+                    .Stack(stack =>
                     {
-                        column.Item().Element(x => GenerateStructure(x, level));
+                        stack.Item().Element(x => GenerateStructure(x, level));
-                        column.Item().Element(x => GenerateStructure(x, level));
+                        stack.Item().Element(x => GenerateStructure(x, level));
                     });
             }
         }

QuestPDF.Examples/ComponentExamples.cs

@@ -1,61 +0,0 @@
-using System.Linq;
-using NUnit.Framework;
-using QuestPDF.Examples.Engine;
-using QuestPDF.Fluent;
-using QuestPDF.Helpers;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Examples
-{
-    internal class MyComponent : IComponent
-    {
-        public ISlot Header { get; set; }
-        public ISlot<string> Content { get; set; }
-
-        public void Compose(IContainer container)
-        {
-            container
-                .Column(column =>
-                {
-                    column.Item().Slot(Header);
-
-                    foreach (var i in Enumerable.Range(1, 10))
-                        column.Item().Slot(Content, i.ToString());
-                });
-        }
-    }
-    
-    public class ComponentExamples
-    {
-        [Test]
-        public void ComplexLayout()
-        {
-            RenderingTest
-                .Create()
-                .PageSize(PageSizes.A4)
-                .ProducePdf()
-                .ShowResults()
-                .Render(content =>
-                {
-                    content
-                        .Padding(10)
-                        .Border(1)
-                        .BorderColor(Colors.Grey.Medium)
-                        .Component<MyComponent>(component =>
-                        {
-                            component
-                                .Slot(x => x.Header)
-                                .Text("This is my text");
-
-                            component.Slot(x => x.Content, (input, container) =>
-                            {
-                                container
-                                    .Background(Placeholders.BackgroundColor())
-                                    .Padding(5)
-                                    .Text(input);
-                            });
-                        });
-                });
-        }
-    }
-}

QuestPDF.Examples/ContinousPage.cs

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

QuestPDF.Examples/DebuggingTesting.cs

@@ -9,7 +9,7 @@ namespace QuestPDF.Examples
     public class DebuggingTesting
     {
         [Test]
-        public void Column()
+        public void Stack()
         {
             Assert.Throws<DocumentLayoutException>(() =>
             {
@@ -23,7 +23,7 @@ namespace QuestPDF.Examples
                             .Width(100)
                             .Background(Colors.Grey.Lighten3)
                             .DebugPointer("Example debug pointer")
-                            .Column(x =>
+                            .Stack(x =>
                             {
                                 x.Item().Text("Test");
                                 x.Item().Width(150);

QuestPDF.Examples/DefaultTextStyleExample.cs

@@ -13,7 +13,7 @@ namespace QuestPDF.Examples
         {
             RenderingTest
                 .Create()
-                .ProducePdf()
+                .ProduceImages()
                 .ShowResults()
                 .RenderDocument(container =>
                 {
@@ -26,11 +26,11 @@ namespace QuestPDF.Examples
                         page.Size(PageSizes.A4);
                         page.Background(Colors.White);
         
-                        page.Content().Column(column =>
+                        page.Content().Stack(stack =>
                         {
-                            column.Item().Text(Placeholders.Sentence());
+                            stack.Item().Text(Placeholders.Sentence());
                         
-                            column.Item().Text(text =>
+                            stack.Item().Text(text =>
                             {
                                 // text in this block is additionally semibold
                                 text.DefaultTextStyle(TextStyle.Default.SemiBold());

QuestPDF.Examples/DefaultTextStyleExamples.cs

@@ -1,53 +0,0 @@
-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())
-                        .Column(column =>
-                        { 
-                            column.Item().Text("Default style applies to all children", TextStyle.Default);
-                            column.Item().Text("You can override certain styles", TextStyle.Default.Underline(false).Color(Colors.Green.Darken2));
-                            
-                            column.Item().PaddingTop(10).Border(1).Grid(grid =>
-                            {
-                                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

@@ -1,55 +0,0 @@
-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(5);
-                        page.Background(Colors.White);
-                        
-                        page.Header().Column(column =>
-                        {
-                            column.Item().ShowOnce().Background(Colors.Blue.Lighten2).Height(60);
-                            column.Item().SkipOnce().Background(Colors.Green.Lighten2).Height(40);
-                        });
-                        
-                        page.Content().PaddingVertical(10).Column(column =>
-                        {
-                            column.Spacing(10);
-
-                            foreach (var _ in Enumerable.Range(0, 13))
-                                column.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

@@ -40,7 +40,7 @@ namespace QuestPDF.Examples
                         .Decoration(decoration =>
                         {
                             decoration
-                                .Before()
+                                .Header()
                                 .Background(Colors.Grey.Medium)
                                 .Padding(10)
                                 .Text("Notes", TextStyle.Default.Size(16).Color("#FFF"));
@@ -66,27 +66,27 @@ namespace QuestPDF.Examples
                     container
                         .Background("#FFF")
                         .Padding(20)
-                        .Column(column =>
+                        .Stack(stack =>
                         {
-                            column.Item()
+                            stack.Item()
                                 .PaddingBottom(10)
                                 .AlignCenter()
                                 .Text("This Row element is 700pt wide");
 
-                            column.Item().Row(row =>
+                            stack.Item().Row(row =>
                             {
-                                row.ConstantItem(100)
+                                row.ConstantColumn(100)
                                     .Background(Colors.Grey.Lighten1)
                                     .Padding(10)
                                     .ExtendVertical()
                                     .Text("This column is 100 pt wide");
 
-                                row.RelativeItem()
+                                row.RelativeColumn()
                                     .Background(Colors.Grey.Lighten2)
                                     .Padding(10)
                                     .Text("This column takes 1/3 of the available space (200pt)");
 
-                                row.RelativeItem(2)
+                                row.RelativeColumn(2)
                                     .Background(Colors.Grey.Lighten3)
                                     .Padding(10)
                                     .Text("This column takes 2/3 of the available space (400pt)");
@@ -109,15 +109,15 @@ namespace QuestPDF.Examples
                         .Row(row =>
                         {
                             row.Spacing(20);
-                            row.RelativeItem(2).Border(1).Background(Colors.Grey.Lighten1);
+                            row.RelativeColumn(2).Border(1).Background(Colors.Grey.Lighten1);
-                            row.RelativeItem(3).Border(1).Background(Colors.Grey.Lighten2);
+                            row.RelativeColumn(3).Border(1).Background(Colors.Grey.Lighten2);
-                            row.RelativeItem(4).Border(1).Background(Colors.Grey.Lighten3);
+                            row.RelativeColumn(4).Border(1).Background(Colors.Grey.Lighten3);
                         });
                 });
         }
     
         [Test]
-        public void column()
+        public void Stack()
         {
             RenderingTest
                 .Create()
@@ -127,13 +127,13 @@ namespace QuestPDF.Examples
                     container
                         .Background("#FFF")
                         .Padding(15)
-                        .Column(column =>
+                        .Stack(stack =>
                         {
-                            column.Spacing(15);
+                            stack.Spacing(15);
                     
-                            column.Item().Background(Colors.Grey.Medium).Height(50);
+                            stack.Item().Background(Colors.Grey.Medium).Height(50);
-                            column.Item().Background(Colors.Grey.Lighten1).Height(100);
+                            stack.Item().Background(Colors.Grey.Lighten1).Height(100);
-                            column.Item().Background(Colors.Grey.Lighten2).Height(150);
+                            stack.Item().Background(Colors.Grey.Lighten2).Height(150);
                         });
                 });
         }
@@ -267,12 +267,12 @@ namespace QuestPDF.Examples
                             layers
                                 .PrimaryLayer()
                                 .Padding(25)
-                                .Column(column =>
+                                .Stack(stack =>
                                 {
-                                    column.Spacing(5);
+                                    stack.Spacing(5);
                             
                                     foreach (var _ in Enumerable.Range(0, 7))
-                                        column.Item().Text(Placeholders.Sentence());
+                                        stack.Item().Text(Placeholders.Sentence());
                                 });
                         
                             // layer above the main content    
@@ -304,16 +304,16 @@ namespace QuestPDF.Examples
         //                 {
         //                     page.Header().PageNumber("Page {pdf:currentPage}");
         //             
-        //                     page.Content().Height(300).column(content =>
+        //                     page.Content().Height(300).Stack(content =>
         //                     {
         //                         content.Item().Height(200).Background(Colors.Grey.Lighten2);
         //                 
-        //                         content.Item().EnsureSpace(100).column(column =>
+        //                         content.Item().EnsureSpace(100).Stack(stack =>
         //                         {
-        //                             column.Spacing(10);
+        //                             stack.Spacing(10);
         //                     
         //                             foreach (var _ in Enumerable.Range(0, 4))
-        //                                 column.Item().Height(50).Background(Colors.Green.Lighten1);
+        //                                 stack.Item().Height(50).Background(Colors.Green.Lighten1);
         //                         }); 
         //                     });
         //                 });
@@ -378,7 +378,7 @@ namespace QuestPDF.Examples
                         .Row(row =>
                         {
                             foreach (var color in colors)
-                                row.RelativeItem().Background(color);
+                                row.RelativeColumn().Background(color);
                         });
                 });
         }
@@ -437,10 +437,10 @@ namespace QuestPDF.Examples
                         {
                             layers.Layer().Text("Something else");
                     
-                            layers.PrimaryLayer().Column(column =>
+                            layers.PrimaryLayer().Stack(stack =>
                             {
-                                column.Item().PaddingTop(20).Text("Text 1");
+                                stack.Item().PaddingTop(20).Text("Text 1");
-                                column.Item().PaddingTop(40).Text("Text 2");
+                                stack.Item().PaddingTop(40).Text("Text 2");
                             });
                     
                             layers.Layer().Canvas((canvas, size) =>
@@ -474,7 +474,7 @@ namespace QuestPDF.Examples
                         .Padding(15)
                         .Border(4)
                         .BorderColor(Colors.Blue.Medium)
-                        //.MinimalBox()
+                        //.Box()
                         .Background(Colors.Grey.Lighten2)
                         .Padding(15)
                         .Text("Test of the \n box element", TextStyle.Default.Size(20));
@@ -501,13 +501,13 @@ namespace QuestPDF.Examples
                                 .SemiBold();
     
                             decoration
-                                .Before()
+                                .Header()
                                 .PaddingBottom(10)
                                 .Text("Example: scale component", headerFontStyle);
     
                             decoration
                                 .Content()
-                                .Column(column =>
+                                .Stack(stack =>
                                 {
                                     var scales = new[] { 0.8f, 0.9f, 1.1f, 1.2f };
 
@@ -519,7 +519,7 @@ namespace QuestPDF.Examples
 
                                         var fontStyle = TextStyle.Default.Size(16);
                 
-                                        column
+                                        stack
                                             .Item()
                                             .Border(1)
                                             .Background(fontColor)
@@ -542,7 +542,7 @@ namespace QuestPDF.Examples
                 {
                     container
                         .Background("#FFF")
-                        .MinimalBox()
+                        .Box()
                         
                         .Padding(25)
                         
@@ -588,7 +588,7 @@ namespace QuestPDF.Examples
 
                                         return element;
                                     })
-                                    .MinimalBox()
+                                    .Box()
                                     .Background(Colors.White)
                                     .Padding(10)
                                     .Text($"Rotated {turns * 90}°", TextStyle.Default.Size(16));
@@ -686,7 +686,7 @@ namespace QuestPDF.Examples
                                         
                                         return element;
                                     })
-                                    .MinimalBox()
+                                    .Box()
                                     .Background(Colors.White)
                                     .Padding(10)
                                     .Text($"Flipped {turns}", TextStyle.Default.Size(16));
@@ -708,14 +708,14 @@ namespace QuestPDF.Examples
                         .Border(2)
                         .Row(row =>
                         {
-                            row.ConstantItem(25)
+                            row.ConstantColumn(25)
                                 .Border(1)
                                 .RotateLeft()
                                 .AlignCenter()
                                 .AlignMiddle()
                                 .Text("Sample text");
                             
-                            row.RelativeItem().Border(1).Padding(5).Text(Placeholders.Paragraph());
+                            row.RelativeColumn().Border(1).Padding(5).Text(Placeholders.Paragraph());
                         });
                 });
         }
@@ -731,11 +731,11 @@ namespace QuestPDF.Examples
                     container
                         .Padding(25)
                         .PaddingLeft(75)
-                        .Column(column =>
+                        .Stack(stack =>
                         {
-                            column.Item().Width(300).Height(150).Background(Colors.Blue.Lighten4);
+                            stack.Item().Width(300).Height(150).Background(Colors.Blue.Lighten4);
                             
-                            column
+                            stack
                                 .Item()
                                 
                                 // creates an infinite space for its child
@@ -751,7 +751,7 @@ namespace QuestPDF.Examples
                                 
                                 .Background(Colors.Blue.Darken1);
                             
-                            column.Item().Width(300).Height(150).Background(Colors.Blue.Lighten3);
+                            stack.Item().Width(300).Height(150).Background(Colors.Blue.Lighten3);
                         });
                 });
         }
@@ -766,13 +766,13 @@ namespace QuestPDF.Examples
                 {
                     container
                         .Padding(25)
-                        .Column(column =>
+                        .Stack(stack =>
                         {
-                            column.Item().Row(row =>
+                            stack.Item().Row(row =>
                             {
-                                row.RelativeItem().LabelCell("Label 1");
+                                row.RelativeColumn().LabelCell("Label 1");
                                 
-                                row.RelativeItem(3).Grid(grid =>
+                                row.RelativeColumn(3).Grid(grid =>
                                 {
                                     grid.Columns(3);
                                     
@@ -784,11 +784,11 @@ namespace QuestPDF.Examples
                                 });
                             });
                             
-                            column.Item().Row(row =>
+                            stack.Item().Row(row =>
                             {
-                                row.RelativeItem().ValueCell().Text("Value 1");
+                                row.RelativeColumn().ValueCell().Text("Value 1");
                                 
-                                row.RelativeItem(3).Grid(grid =>
+                                row.RelativeColumn(3).Grid(grid =>
                                 {
                                     grid.Columns(3);
                                     
@@ -800,10 +800,10 @@ namespace QuestPDF.Examples
                                 });
                             });
                             
-                            column.Item().Row(row =>
+                            stack.Item().Row(row =>
                             {
-                                row.RelativeItem().LabelCell("Label 6");
+                                row.RelativeColumn().LabelCell("Label 6");
-                                row.RelativeItem().ValueCell().Text("Value 6");
+                                row.RelativeColumn().ValueCell().Text("Value 6");
                             });
                         });
                 });

QuestPDF.Examples/Engine/RenderingTest.cs

@@ -20,8 +20,6 @@ namespace QuestPDF.Examples.Engine
         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()
@@ -69,24 +67,6 @@ 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 =>
@@ -99,10 +79,15 @@ namespace QuestPDF.Examples.Engine
             });
         }
         
+        public void MaxPages(int value)
+        {
+            MaxPagesThreshold = value;
+        }
+
         public void RenderDocument(Action<IDocumentContainer> content)
         {
             MaxPagesThreshold ??= ResultType == RenderingTestResult.Pdf ? 1000 : 10;
-            var document = new SimpleDocument(content, MaxPagesThreshold.Value, ApplyCaching, ApplyDebugging);
+            var document = new SimpleDocument(content, MaxPagesThreshold.Value);
 
             Render(document);
         }

QuestPDF.Examples/Engine/SimpleDocument.cs

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

QuestPDF.Examples/EnsureSpaceExample.cs

@@ -25,15 +25,15 @@ namespace QuestPDF.Examples
                         
                         page.Header().Text("With ensure space", TextStyle.Default.SemiBold());
                         
-                        page.Content().Column(column =>
+                        page.Content().Stack(stack =>
                         {
-                            column
+                            stack
                                 .Item()
                                 .ExtendHorizontal()
                                 .Height(75)
                                 .Background(Colors.Grey.Lighten2);
                             
-                            column
+                            stack
                                 .Item()
                                 .EnsureSpace(100)
                                 .Text(Placeholders.LoremIpsum());

QuestPDF.Examples/FrameExample.cs

@@ -12,14 +12,12 @@ namespace QuestPDF.Examples
         {
             return container
                 .Border(1)
-                .BorderColor(Colors.Grey.Medium)
+                .Background(dark ? Colors.Grey.Lighten2 : Colors.White)
-                .Background(dark ? Colors.Grey.Lighten3 : Colors.White)
+                .Padding(10);
-                .Padding(5);
         }
         
-        public static void LabelCell(this IContainer container, string text) => container.Cell(true).Text(text, TextStyle.Default.SemiBold());
+        public static void LabelCell(this IContainer container, string text) => container.Cell(true).Text(text, TextStyle.Default.Medium());
         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,14 +34,14 @@ namespace QuestPDF.Examples
                     container
                         .Background("#FFF")
                         .Padding(25)
-                        .Column(column =>
+                        .Stack(stack =>
                         {
-                            for(var i = 1; i <= 4; i++)
+                            for(var i=1; i<=4; i++)
                             {
-                                column.Item().Row(row =>
+                                stack.Item().Row(row =>
                                 {
-                                    row.RelativeItem(2).LabelCell(Placeholders.Label());
+                                    row.RelativeColumn(2).LabelCell(Placeholders.Label());
-                                    row.RelativeItem(3).ValueCell().Text(Placeholders.Paragraph());
+                                    row.RelativeColumn(3).ValueCell().Text(Placeholders.Paragraph());
                                 });
                             }
                         });

QuestPDF.Examples/ImageExamples.cs

@@ -19,17 +19,17 @@ namespace QuestPDF.Examples
                 .ShowResults()
                 .Render(page =>
                 {
-                    page.Padding(25).Column(column =>
+                    page.Padding(25).Stack(stack =>
                     {
-                        column.Spacing(25);
+                        stack.Spacing(25);
                         
-                        column.Item().Image("logo.png");
+                        stack.Item().Image("logo.png");
 
                         var binaryData = File.ReadAllBytes("logo.png");
-                        column.Item().Image(binaryData);
+                        stack.Item().Image(binaryData);
                         
                         using var stream = new FileStream("logo.png", FileMode.Open);
-                        column.Item().Image(stream);
+                        stack.Item().Image(stream);
                     });
                 });
         }

QuestPDF.Examples/InlinedExamples.cs

@@ -25,7 +25,7 @@ namespace QuestPDF.Examples
                         .Padding(25)
                         .Decoration(decoration =>
                         {
-                            decoration.Before().Text(text =>
+                            decoration.Header().Text(text =>
                             {
                                 text.DefaultTextStyle(TextStyle.Default.Size(20));
                                 
@@ -37,7 +37,7 @@ namespace QuestPDF.Examples
                             decoration
                                 .Content()
                                 .PaddingTop(25)
-                                //.MinimalBox()
+                                //.Box()
                                 .Border(1)
                                 .Background(Colors.Grey.Lighten2)
                                 .Inlined(inlined =>
@@ -94,7 +94,7 @@ namespace QuestPDF.Examples
                 {
                     container
                         .Padding(20)
-                        .MinimalBox()
+                        .Box()
                         .Border(1)
                         .Background(Colors.Grey.Lighten4)
                         .Inlined(inlined =>

QuestPDF.Examples/LineExamples.cs

@@ -1,50 +0,0 @@
-using System.IO;
-using NUnit.Framework;
-using QuestPDF.Examples.Engine;
-using QuestPDF.Fluent;
-using QuestPDF.Helpers;
-
-namespace QuestPDF.Examples
-{
-    public class LineExamples
-    {
-        [Test]
-        public void LineHorizontal()
-        {
-            RenderingTest
-                .Create()
-                .PageSize(PageSizes.A5)
-                .ProducePdf()
-                .ShowResults()
-                .Render(container => 
-                {
-                    container.Padding(25).Column(column =>
-                    {
-                        column.Item().Text("Above text");
-                        column.Item().PaddingVertical(10).LineHorizontal(1).LineColor(Colors.Blue.Accent1);
-                        column.Item().Text("Below text");
-                    });
-                });
-        }
-        
-        [Test]
-        public void LineVertical()
-        {
-            RenderingTest
-                .Create()
-                .PageSize(PageSizes.A5)
-                .ProducePdf()
-                .ShowResults()
-                .Render(container => 
-                {
-                    container.Padding(25).Inlined(inlined =>
-                    {
-                        inlined.Spacing(5);
-                        inlined.Item().Text("Above text");
-                        inlined.Item().LineVertical(1).LineColor(Colors.Blue.Accent1);
-                        inlined.Item().Text("Below text");
-                    });
-                });
-        }
-    }
-}

QuestPDF.Examples/LoremPicsumExample.cs

@@ -43,7 +43,7 @@ namespace QuestPDF.Examples
                     container
                         .Background("#FFF")
                         .Padding(25)
-                        .Column(column =>
+                        .Stack(column =>
                         {
                             column.Spacing(10);
 

QuestPDF.Examples/Padding.cs

@@ -63,7 +63,7 @@ namespace QuestPDF.Examples
                 .Render(container =>
                 {
                     container
-                        .Column(column =>
+                        .Stack(column =>
                         {
                             column
                                 .Item()
@@ -113,14 +113,14 @@ namespace QuestPDF.Examples
                 .Render(container =>
                 {
                     container
-                        .Column(column =>
+                        .Stack(column =>
                         {
                             column
                                 .Item()
                                 .Height(150)
                                 .Row(row =>
                                 {
-                                    row.RelativeItem()
+                                    row.RelativeColumn()
                                         .Extend()
                                         .Background("FFF")
 
@@ -128,7 +128,7 @@ namespace QuestPDF.Examples
                                         .Width(50)
                                         .Background("444");
                             
-                                    row.RelativeItem()
+                                    row.RelativeColumn()
                                         .Extend()
                                         .Background("BBB")
 
@@ -142,7 +142,7 @@ namespace QuestPDF.Examples
                                 .Height(150)
                                 .Row(row =>
                                 {
-                                    row.RelativeItem()
+                                    row.RelativeColumn()
                                         .Extend()
                                         .Background("BBB")
 
@@ -150,7 +150,7 @@ namespace QuestPDF.Examples
                                         .Width(50)
                                         .Background("444");
                             
-                                    row.RelativeItem()
+                                    row.RelativeColumn()
                                         .Extend()
                                         .Background("BBB")
 

QuestPDF.Examples/QuestPDF.Examples.csproj

@@ -6,7 +6,6 @@
     </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" />

QuestPDF.Examples/RowExamples.cs

@@ -1,93 +0,0 @@
-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 ItemTypes()
-        {
-            RenderingTest
-                .Create()
-                .ProducePdf()
-                .PageSize(650, 300)
-                .ShowResults()
-                .Render(container =>
-                {
-                    container
-                        .Padding(25)
-                        .MinimalBox()
-                        .Border(1)
-                        .Column(column =>
-                        {
-                            column.Item().LabelCell("Total width: 600px");
-                            
-                            column.Item().Row(row =>
-                            {
-                                row.ConstantItem(150).ValueCell("150px");
-                                row.ConstantItem(100).ValueCell("100px");
-                                row.RelativeItem(4).ValueCell("200px");
-                                row.RelativeItem(3).ValueCell("150px");
-                            });
-                            
-                            column.Item().Row(row =>
-                            {
-                                row.ConstantItem(100).ValueCell("100px");
-                                row.ConstantItem(50).ValueCell("50px");
-                                row.RelativeItem(2).ValueCell("100px");
-                                row.RelativeItem(1).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.RelativeItem().Column(column =>
-                            {
-                                column.Item().ShowOnce().Element(CreateBox).Text("X");
-                                column.Item().Element(CreateBox).Text("1");
-                                column.Item().Element(CreateBox).Text("2");
-                            });
-                                
-                            row.RelativeItem().Column(column =>
-                            {
-                                column.Item().Element(CreateBox).Text("1");
-                                column.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/ScaleToFitExamples.cs

@@ -1,42 +0,0 @@
-using System.Linq;
-using NUnit.Framework;
-using QuestPDF.Examples.Engine;
-using QuestPDF.Fluent;
-using QuestPDF.Helpers;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Examples
-{
-    public class ScaleToFitExamples
-    {
-        [Test]
-        public void ScaleToFit()
-        {
-            RenderingTest
-                .Create()
-                .PageSize(PageSizes.A4)
-                .ProducePdf()
-                .ShowResults()
-                .Render(container =>
-                {
-                    container.Padding(25).Column(column =>
-                    {
-                        var text = Placeholders.Paragraph();
-
-                        foreach (var i in Enumerable.Range(0, 16))
-                        {
-                            column
-                                .Item()
-                                .MinimalBox()
-                                .Border(1)
-                                .Padding(5)
-                                .Width(50 + i * 25)
-                                .Height(25 + i * 5)
-                                .ScaleToFit()
-                                .Text(text);
-                        }
-                    });
-                });
-        }
-    }
-}

QuestPDF.Examples/ShowOnceExample.cs

@@ -27,14 +27,14 @@ namespace QuestPDF.Examples
                         
                         page.Content().PaddingVertical(5).Row(row =>
                         {
-                            row.RelativeItem()
+                            row.RelativeColumn()
                                 .Background(Colors.Grey.Lighten2)
                                 .Border(1)
                                 .Padding(5)
                                 .ShowOnce()
                                 .Text(Placeholders.Label());
                             
-                            row.RelativeItem(2)
+                            row.RelativeColumn(2)
                                 .Border(1)
                                 .Padding(5)
                                 .Text(Placeholders.Paragraph());

QuestPDF.Examples/SkipOnceExample.cs

@@ -23,10 +23,10 @@ namespace QuestPDF.Examples
                         page.Size(PageSizes.A7.Landscape());
                         page.Background(Colors.White);
         
-                        page.Header().Column(column =>
+                        page.Header().Stack(stack =>
                         {
-                            column.Item().ShowOnce().Text("This header is visible on the first page.");
+                            stack.Item().ShowOnce().Text("This header is visible on the first page.");
-                            column.Item().SkipOnce().Text("This header is visible on the second page and all following.");
+                            stack.Item().SkipOnce().Text("This header is visible on the second page and all following.");
                         });
                         
                         page.Content()

QuestPDF.Examples/TableExamples.cs

@@ -1,465 +0,0 @@
-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 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, 220)
-                .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, 1000));
-        }
-        
-        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)
-                .MinWidth(50)
-                .MinHeight(50)
-                .AlignCenter()
-                .AlignMiddle();
-        }
-    }
-}

QuestPDF.Examples/TextBenchmark.cs

@@ -117,19 +117,19 @@ namespace QuestPDF.Examples
                     {
                         decoration
                             .Content()
-                            .Column(column =>
+                            .Stack(stack =>
                             {
-                                column.Item().Element(Title);
+                                stack.Item().Element(Title);
-                                column.Item().PageBreak();
+                                stack.Item().PageBreak();
-                                column.Item().Element(TableOfContents);
+                                stack.Item().Element(TableOfContents);
-                                column.Item().PageBreak();
+                                stack.Item().PageBreak();
 
-                                Chapters(column);
+                                Chapters(stack);
 
-                                column.Item().Element(Acknowledgements);
+                                stack.Item().Element(Acknowledgements);
                             });
 
-                        decoration.After().Element(Footer);
+                        decoration.Footer().Element(Footer);
                     });
             }
             
@@ -139,61 +139,61 @@ namespace QuestPDF.Examples
                     .Extend()
                     .PaddingBottom(200)
                     .AlignBottom()
-                    .Column(column =>
+                    .Stack(stack =>
                     {
-                        column.Item().Text("Quo Vadis", TextStyle.Default.Size(72).Bold().Color(Colors.Blue.Darken2));
+                        stack.Item().Text("Quo Vadis", TextStyle.Default.Size(72).Bold().Color(Colors.Blue.Darken2));
-                        column.Item().Text("Henryk Sienkiewicz", TextStyle.Default.Size(24).Color(Colors.Grey.Darken2));
+                        stack.Item().Text("Henryk Sienkiewicz", TextStyle.Default.Size(24).Color(Colors.Grey.Darken2));
                     });
             }
 
             void TableOfContents(IContainer container)
             {
-                container.Column(column =>
+                container.Stack(stack =>
                 {
-                    SectionTitle(column, "Spis treści");
+                    SectionTitle(stack, "Spis treści");
                     
                     foreach (var chapter in chapters)
                     {
-                        column.Item().InternalLink(chapter.Title).Row(row =>
+                        stack.Item().InternalLink(chapter.Title).Row(row =>
                         {
-                            row.RelativeItem().Text(chapter.Title, normalStyle);
+                            row.RelativeColumn().Text(chapter.Title, normalStyle);
-                            row.ConstantItem(100).AlignRight().Text(text => text.PageNumberOfLocation(chapter.Title, normalStyle));
+                            row.ConstantColumn(100).AlignRight().Text(text => text.PageNumberOfLocation(chapter.Title, normalStyle));
                         });
                     }
                 });
             }
 
-            void Chapters(ColumnDescriptor column)
+            void Chapters(StackDescriptor stack)
             {
                 foreach (var chapter in chapters)
                 {
-                    column.Item().Element(container => Chapter(container, chapter.Title, chapter.Content));
+                    stack.Item().Element(container => Chapter(container, chapter.Title, chapter.Content));
                 }
             }
             
             void Chapter(IContainer container, string title, string content)
             {
-                container.Column(column =>
+                container.Stack(stack =>
                 {
-                    SectionTitle(column, title);
+                    SectionTitle(stack, title);
   
-                    column.Item().Text(text =>
+                    stack.Item().Text(text =>
                     {
                         text.ParagraphSpacing(5);
                         text.Span(content, normalStyle);
                     });
                     
-                    column.Item().PageBreak();
+                    stack.Item().PageBreak();
                 });
             }
 
             void Acknowledgements(IContainer container)
             {
-                container.Column(column =>
+                container.Stack(stack =>
                 {
-                    SectionTitle(column, "Podziękowania");
+                    SectionTitle(stack, "Podziękowania");
                     
-                    column.Item().Text(text =>
+                    stack.Item().Text(text =>
                     {
                         text.DefaultTextStyle(normalStyle);
                         
@@ -204,10 +204,10 @@ namespace QuestPDF.Examples
                 });
             }
 
-            void SectionTitle(ColumnDescriptor column, string text)
+            void SectionTitle(StackDescriptor stack, string text)
             {
-                column.Item().Location(text).Text(text, subtitleStyle);
+                stack.Item().Location(text).Text(text, subtitleStyle);
-                column.Item().PaddingTop(10).PaddingBottom(50).BorderBottom(1).BorderColor(Colors.Grey.Lighten2).ExtendHorizontal();
+                stack.Item().PaddingTop(10).PaddingBottom(50).BorderBottom(1).BorderColor(Colors.Grey.Lighten2).ExtendHorizontal();
             }
             
             void Footer(IContainer container)

QuestPDF.Examples/TextExamples.cs

@@ -24,7 +24,7 @@ namespace QuestPDF.Examples
                 {
                     container
                         .Padding(5)
-                        .MinimalBox()
+                        .Box()
                         .Border(1)
                         .Padding(10)
                         .Text(text =>
@@ -48,7 +48,7 @@ namespace QuestPDF.Examples
                 {
                     container
                         .Padding(5)
-                        .MinimalBox()
+                        .Box()
                         .Border(1)
                         .Padding(10)
                         .Text(text =>
@@ -76,7 +76,7 @@ namespace QuestPDF.Examples
                 {
                     container
                         .Padding(5)
-                        .MinimalBox()
+                        .Box()
                         .Border(1)
                         .Padding(10)
                         .Text(text =>
@@ -108,7 +108,7 @@ namespace QuestPDF.Examples
                     container
                         .Padding(20)
                         .Padding(10)
-                        .MinimalBox()
+                        .Box()
                         .Border(1)
                         .Padding(5)
                         .Padding(10)
@@ -126,7 +126,7 @@ namespace QuestPDF.Examples
         }
         
         [Test]
-        public void Textcolumn()
+        public void TextStack()
         {
             RenderingTest
                 .Create()
@@ -138,7 +138,7 @@ namespace QuestPDF.Examples
                     container
                         .Padding(20)
                         .Padding(10)
-                        .MinimalBox()
+                        .Box()
                         .Border(1)
                         .Padding(5)
                         .Padding(10)
@@ -167,7 +167,7 @@ namespace QuestPDF.Examples
                     container
                         .Padding(20)
                         .Padding(10)
-                        .MinimalBox()
+                        .Box()
                         .Border(1)
                         .Padding(5)
                         .Padding(10)
@@ -230,7 +230,7 @@ namespace QuestPDF.Examples
                     container
                         .Padding(20)
                         .Padding(10)
-                        .MinimalBox()
+                        .Box()
                         .Border(1)
                         .Padding(5)
                         .Padding(10)

QuestPDF.ReportSample/Layouts/DifferentHeadersTemplate.cs

@@ -26,58 +26,58 @@ namespace QuestPDF.ReportSample.Layouts
 
         private void ComposeHeader(IContainer container)
         {
-            container.Background(Colors.Grey.Lighten3).Border(1).Column(column =>
+            container.Background(Colors.Grey.Lighten3).Border(1).Stack(stack =>
             {
-                column.Item().ShowOnce().Padding(5).AlignMiddle().Row(row =>
+                stack.Item().ShowOnce().Padding(5).AlignMiddle().Row(row =>
                 {
-                    row.RelativeItem(2).AlignMiddle().Text("PRIMARY HEADER", TextStyle.Default.Color(Colors.Grey.Darken3).Size(30).Bold());
+                    row.RelativeColumn(2).AlignMiddle().Text("PRIMARY HEADER", TextStyle.Default.Color(Colors.Grey.Darken3).Size(30).Bold());
-                    row.RelativeItem(1).AlignRight().MinimalBox().AlignMiddle().Background(Colors.Blue.Darken2).Padding(30);
+                    row.RelativeColumn(1).AlignRight().Box().AlignMiddle().Background(Colors.Blue.Darken2).Padding(30);
                 });
-                column.Item().SkipOnce().Padding(5).Row(row =>
+                stack.Item().SkipOnce().Padding(5).Row(row =>
                 {
-                    row.RelativeItem(2).Text("SECONDARY HEADER", TextStyle.Default.Color(Colors.Grey.Darken3).Size(30).Bold());
+                    row.RelativeColumn(2).Text("SECONDARY HEADER", TextStyle.Default.Color(Colors.Grey.Darken3).Size(30).Bold());
-                    row.RelativeItem(1).AlignRight().MinimalBox().Background(Colors.Blue.Lighten4).Padding(15);
+                    row.RelativeColumn(1).AlignRight().Box().Background(Colors.Blue.Lighten4).Padding(15);
                 });
             });
         }
 
         private void ComposeContent(IContainer container)
         {
-            container.Column(column =>
+            container.Stack(stack =>
             {
-                column.Item().PaddingVertical(80).Text("First");
+                stack.Item().PaddingVertical(80).Text("First");
-                column.Item().PageBreak();
+                stack.Item().PageBreak();
-                column.Item().PaddingVertical(80).Text("Second");
+                stack.Item().PaddingVertical(80).Text("Second");
-                column.Item().PageBreak();
+                stack.Item().PageBreak();
-                column.Item().PaddingVertical(80).Text("Third");
+                stack.Item().PaddingVertical(80).Text("Third");
-                column.Item().PageBreak();
+                stack.Item().PageBreak();
             });
         }
 
         private void ComposeFooter(IContainer container)
         {
-            container.Background(Colors.Grey.Lighten3).Column(column =>
+            container.Background(Colors.Grey.Lighten3).Stack(stack =>
             {
-                column.Item().ShowOnce().Background(Colors.Grey.Lighten3).Row(row =>
+                stack.Item().ShowOnce().Background(Colors.Grey.Lighten3).Row(row =>
                 {
-                    row.RelativeItem().Text(x =>
+                    row.RelativeColumn().Text(x =>
                     {
                         x.CurrentPageNumber();
                         x.Span(" / ");
                         x.TotalPages();
                     });
-                    row.RelativeItem().AlignRight().Text("Footer for header");
+                    row.RelativeColumn().AlignRight().Text("Footer for header");
                 });
 
-                column.Item().SkipOnce().Background(Colors.Grey.Lighten3).Row(row =>
+                stack.Item().SkipOnce().Background(Colors.Grey.Lighten3).Row(row =>
                 {
-                    row.RelativeItem().Text(x =>
+                    row.RelativeColumn().Text(x =>
                     {
                         x.CurrentPageNumber();
                         x.Span(" / ");
                         x.TotalPages();
                     });
-                    row.RelativeItem().AlignRight().Text("Footer for every page except header");
+                    row.RelativeColumn().AlignRight().Text("Footer for every page except header");
                 });
             });
         }

QuestPDF.ReportSample/Layouts/PhotoTemplate.cs

@@ -17,11 +17,11 @@ namespace QuestPDF.ReportSample.Layouts
         {
             container
                 .ShowEntire()
-                .Column(column =>
+                .Stack(stack =>
                 {
-                    column.Spacing(5);
+                    stack.Spacing(5);
-                    column.Item().Element(PhotoWithMaps);
+                    stack.Item().Element(PhotoWithMaps);
-                    column.Item().Element(PhotoDetails);
+                    stack.Item().Element(PhotoDetails);
                 });
         }
         
@@ -30,14 +30,14 @@ namespace QuestPDF.ReportSample.Layouts
             container
                 .Row(row =>
                 {
-                    row.RelativeItem(2).AspectRatio(4 / 3f).Component<ImagePlaceholder>();
+                    row.RelativeColumn(2).AspectRatio(4 / 3f).Component<ImagePlaceholder>();
 
-                    row.RelativeItem().PaddingLeft(5).Column(column =>
+                    row.RelativeColumn().PaddingLeft(5).Stack(stack =>
                     {
-                        column.Spacing(7f);
+                        stack.Spacing(7f);
                         
-                        column.Item().AspectRatio(4 / 3f).Component<ImagePlaceholder>();
+                        stack.Item().AspectRatio(4 / 3f).Component<ImagePlaceholder>();
-                        column.Item().AspectRatio(4 / 3f).Component<ImagePlaceholder>();
+                        stack.Item().AspectRatio(4 / 3f).Component<ImagePlaceholder>();
                     });
                 });
         }

QuestPDF.ReportSample/Layouts/SectionTemplate.cs

@@ -21,18 +21,18 @@ namespace QuestPDF.ReportSample.Layouts
                 .Decoration(decoration =>
                 {
                     decoration
-                        .Before()
+                        .Header()
                         .PaddingBottom(5)
                         .Text(Model.Title, Typography.Headline);
 
-                    decoration.Content().Border(0.75f).BorderColor(Colors.Grey.Medium).Column(column =>
+                    decoration.Content().Border(0.75f).BorderColor(Colors.Grey.Medium).Stack(stack =>
                     {
                         foreach (var part in Model.Parts)
                         {
-                            column.Item().EnsureSpace(25).Row(row =>
+                            stack.Item().EnsureSpace(25).Row(row =>
                             {
-                                row.ConstantItem(150).LabelCell().Text(part.Label);
+                                row.ConstantColumn(150).LabelCell().Text(part.Label);
-                                var frame = row.RelativeItem().ValueCell();
+                                var frame = row.RelativeColumn().ValueCell();
                             
                                 if (part is ReportSectionText text)
                                     frame.ShowEntire().Text(text.Text);
@@ -56,12 +56,12 @@ namespace QuestPDF.ReportSample.Layouts
                 return;
             }
 
-            container.ShowEntire().Column(column =>
+            container.ShowEntire().Stack(stack =>
             {
-                column.Spacing(5);
+                stack.Spacing(5);
                 
-                column.Item().MaxWidth(250).AspectRatio(4 / 3f).Component<ImagePlaceholder>();
+                stack.Item().MaxWidth(250).AspectRatio(4 / 3f).Component<ImagePlaceholder>();
-                column.Item().Text(model.Location.Format());
+                stack.Item().Text(model.Location.Format());
             });
         }
         

QuestPDF.ReportSample/Layouts/StandardReport.cs

@@ -48,19 +48,19 @@ namespace QuestPDF.ReportSample.Layouts
 
         private void ComposeHeader(IContainer container)
         {
-            container.Column(column =>
+            container.Stack(stack =>
             {
-                column.Item().Row(row =>
+                stack.Item().Row(row =>
                 {
                     row.Spacing(50);
                     
-                    row.RelativeItem().PaddingTop(-10).Text(Model.Title, Typography.Title);
+                    row.RelativeColumn().PaddingTop(-10).Text(Model.Title, Typography.Title);
-                    row.ConstantItem(90).ExternalLink("https://www.questpdf.com").MaxHeight(30).Component<ImagePlaceholder>();
+                    row.ConstantColumn(90).ExternalLink("https://www.questpdf.com").MaxHeight(30).Component<ImagePlaceholder>();
                 });
 
-                column.Item().ShowOnce().PaddingVertical(15).Border(1f).BorderColor(Colors.Grey.Lighten1).ExtendHorizontal();
+                stack.Item().ShowOnce().PaddingVertical(15).Border(1f).BorderColor(Colors.Grey.Lighten1).ExtendHorizontal();
                 
-                column.Item().ShowOnce().Grid(grid =>
+                stack.Item().ShowOnce().Grid(grid =>
                 {
                     grid.Columns(2);
                     grid.Spacing(5);
@@ -79,22 +79,22 @@ namespace QuestPDF.ReportSample.Layouts
 
         void ComposeContent(IContainer container)
         {
-            container.PaddingVertical(20).Column(column =>
+            container.PaddingVertical(20).Stack(stack =>
             {
-                column.Spacing(20);
+                stack.Spacing(20);
 
-                column.Item().Component(new TableOfContentsTemplate(Model.Sections));
+                stack.Item().Component(new TableOfContentsTemplate(Model.Sections));
                 
-                column.Item().PageBreak();
+                stack.Item().PageBreak();
                 
                 foreach (var section in Model.Sections)
-                    column.Item().Location(section.Title).Component(new SectionTemplate(section));
+                    stack.Item().Location(section.Title).Component(new SectionTemplate(section));
 
-                column.Item().PageBreak();
+                stack.Item().PageBreak();
-                column.Item().Location("Photos");
+                stack.Item().Location("Photos");
                 
                 foreach (var photo in Model.Photos)
-                    column.Item().Component(new PhotoTemplate(photo));
+                    stack.Item().Component(new PhotoTemplate(photo));
             });
         }
     }

QuestPDF.ReportSample/Layouts/TableOfContentsTemplate.cs

@@ -19,18 +19,18 @@ namespace QuestPDF.ReportSample.Layouts
                 .Decoration(decoration =>
                 {
                     decoration
-                        .Before()
+                        .Header()
                         .PaddingBottom(5)
                         .Text("Table of contents", Typography.Headline);
 
-                    decoration.Content().Column(column =>
+                    decoration.Content().Stack(stack =>
                     {
-                        column.Spacing(5);
+                        stack.Spacing(5);
                         
                         for (var i = 0; i < Sections.Count; i++)
-                            column.Item().Element(c => DrawLink(c, i+1, Sections[i].Title));
+                            stack.Item().Element(c => DrawLink(c, i+1, Sections[i].Title));
 
-                        column.Item().Element(c => DrawLink(c, Sections.Count+1, "Photos"));
+                        stack.Item().Element(c => DrawLink(c, Sections.Count+1, "Photos"));
                     });
                 });
         }
@@ -41,9 +41,9 @@ namespace QuestPDF.ReportSample.Layouts
                 .InternalLink(locationName)
                 .Row(row =>
                 {
-                    row.ConstantItem(25).Text($"{number}.");
+                    row.ConstantColumn(25).Text($"{number}.");
-                    row.RelativeItem().Text(locationName);
+                    row.RelativeColumn().Text(locationName);
-                    row.ConstantItem(150).AlignRight().Text(text => text.PageNumberOfLocation(locationName));
+                    row.ConstantColumn(150).AlignRight().Text(text => text.PageNumberOfLocation(locationName));
                 });
         }
     }

QuestPDF.ReportSample/PerformanceTests.cs

@@ -11,7 +11,6 @@ using NUnit.Framework;
 using QuestPDF.Drawing;
 using QuestPDF.Drawing.Proxy;
 using QuestPDF.Elements;
-using QuestPDF.Helpers;
 using QuestPDF.Infrastructure;
 using QuestPDF.ReportSample.Layouts;
 
@@ -56,7 +55,7 @@ namespace QuestPDF.ReportSample
             var sw = new Stopwatch();
             sw.Start();
 
-            Content.VisitChildren(x =>
+            Content.HandleVisitor(x =>
             {
                 if (x is ICacheable)
                     x.CreateProxy(y => new CacheProxy(y));

QuestPDF.ReportSample/Tests.cs

@@ -24,8 +24,6 @@ namespace QuestPDF.ReportSample
         [Test] 
         public void GenerateAndShowPdf()
         {
-            //ImagePlaceholder.Solid = true;
-        
             var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"test_result.pdf");
             Report.GeneratePdf(path);
             Process.Start("explorer.exe", path);

QuestPDF.UnitTests/BackgroundTests.cs

@@ -21,7 +21,7 @@ namespace QuestPDF.UnitTests
                     Color = Colors.Red.Medium
                 })
                 .DrawElement(new Size(400, 300))
-                .ExpectCanvasDrawRectangle(new Position(0, 0), new Size(400, 300), Colors.Red.Medium)
+                .ExpectCanvasDrawFilledRectangle(new Position(0, 0), new Size(400, 300), Colors.Red.Medium)
                 .CheckDrawResult();
         }
         
@@ -35,7 +35,7 @@ namespace QuestPDF.UnitTests
                     Child = x.CreateChild()
                 })
                 .DrawElement(new Size(400, 300))
-                .ExpectCanvasDrawRectangle(new Position(0, 0), new Size(400, 300), Colors.Red.Medium)
+                .ExpectCanvasDrawFilledRectangle(new Position(0, 0), new Size(400, 300), Colors.Red.Medium)
                 .ExpectChildDraw(new Size(400, 300))
                 .CheckDrawResult();
         }

QuestPDF.UnitTests/BorderTests.cs

@@ -1,9 +1,11 @@
-using NUnit.Framework;
+using System.Drawing;
+using NUnit.Framework;
 using QuestPDF.Drawing;
 using QuestPDF.Elements;
 using QuestPDF.Helpers;
 using QuestPDF.Infrastructure;
 using QuestPDF.UnitTests.TestEngine;
+using Size = QuestPDF.Infrastructure.Size;
 
 namespace QuestPDF.UnitTests
 {
@@ -32,7 +34,29 @@ namespace QuestPDF.UnitTests
         }
         
         [Test]
-        public void Draw_HorizontalRight_VerticalTop()
+        public void Draw_SameWidths_Optimized()
+        {
+            TestPlan
+                .For(x => new Border
+                {
+                    Top = 10,
+                    Right = 10,
+                    Bottom = 10,
+                    Left = 10,
+                    
+                    Color = Colors.Red.Medium,
+                    
+                    Child = x.CreateChild()
+                })
+                .DrawElement(new Size(400, 300))
+                .ExpectChildDraw(new Size(400, 300))
+                .ExpectCanvasDrawStrokedRectangle(new Size(400, 300), Colors.Red.Medium, 10)
+                .ExpectChildDraw(new Size(400, 300))
+                .CheckDrawResult();
+        }
+        
+        [Test]
+        public void Draw_VariousWidths()
         {
             TestPlan
                 .For(x => new Border
@@ -48,10 +72,10 @@ namespace QuestPDF.UnitTests
                 })
                 .DrawElement(new Size(400, 300))
                 .ExpectChildDraw(new Size(400, 300))
-                .ExpectCanvasDrawRectangle(new Position(-20, -5), new Size(430, 10), Colors.Red.Medium) // top
+                .ExpectCanvasDrawFilledRectangle(new Position(-20, -5), new Size(430, 10), Colors.Red.Medium) // top
-                .ExpectCanvasDrawRectangle(new Position(-20, -5), new Size(40, 320), Colors.Red.Medium) // left
+                .ExpectCanvasDrawFilledRectangle(new Position(-20, -5), new Size(40, 320), Colors.Red.Medium) // left
-                .ExpectCanvasDrawRectangle(new Position(-20, 285), new Size(430, 30), Colors.Red.Medium) // bottom
+                .ExpectCanvasDrawFilledRectangle(new Position(-20, 285), new Size(430, 30), Colors.Red.Medium) // bottom
-                .ExpectCanvasDrawRectangle(new Position(390, -5), new Size(20, 320), Colors.Red.Medium) // right
+                .ExpectCanvasDrawFilledRectangle(new Position(390, -5), new Size(20, 320), Colors.Red.Medium) // right
                 .ExpectChildDraw(new Size(400, 300))
                 .CheckDrawResult();
         }

QuestPDF.UnitTests/BoxTests.cs

@@ -10,13 +10,13 @@ namespace QuestPDF.UnitTests
     public class BoxTests
     {
         [Test]
-        public void Measure() => SimpleContainerTests.Measure<MinimalBox>();
+        public void Measure() => SimpleContainerTests.Measure<Box>();
         
         [Test]
         public void Draw_Wrap()
         {
             TestPlan
-                .For(x => new MinimalBox
+                .For(x => new Box
                 {
                     Child = x.CreateChild()
                 })
@@ -29,7 +29,7 @@ namespace QuestPDF.UnitTests
         public void Measure_PartialRender()
         {
             TestPlan
-                .For(x => new MinimalBox
+                .For(x => new Box
                 {
                     Child = x.CreateChild()
                 })
@@ -43,7 +43,7 @@ namespace QuestPDF.UnitTests
         public void Measure_FullRender()
         {
             TestPlan
-                .For(x => new MinimalBox
+                .For(x => new Box
                 {
                     Child = x.CreateChild()
                 })

QuestPDF.UnitTests/DecorationTests.cs

@@ -9,27 +9,35 @@ namespace QuestPDF.UnitTests
     [TestFixture]
     public class DecorationTests
     {
-        private Decoration CreateDecoration(TestPlan testPlan)
-        {
-            return new Decoration
-            {
-                Before = testPlan.CreateChild("before"),
-                Content = testPlan.CreateChild("content"),
-                After = testPlan.CreateChild("after"),
-            };
-        }
-        
         #region Measure
 
         [Test]
-        public void Measure_ReturnsWrap_WhenBeforeReturnsWrap()
+        public void Measure_ReturnsWrap_WhenDecorationReturnsWrap()
         {
             TestPlan
-                .For(CreateDecoration)
+                .For(x => new BinaryDecoration
+                {
+                    Type = DecorationType.Append,
+                    DecorationElement = x.CreateChild("decoration"),
+                    ContentElement = x.CreateChild("content")
+                })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure("before", new Size(400, 300), SpacePlan.Wrap())
+                .ExpectChildMeasure("decoration", new Size(400, 300), SpacePlan.Wrap())
-                .ExpectChildMeasure("after", new Size(400, 300), SpacePlan.FullRender(100, 50))
+                .CheckMeasureResult(SpacePlan.Wrap());
-                .ExpectChildMeasure("content", new Size(400, 250), SpacePlan.FullRender(100, 100))
+        }
+        
+        [Test]
+        public void Measure_ReturnsWrap_WhenDecorationReturnsPartialRender()
+        {
+            TestPlan
+                .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), SpacePlan.PartialRender(300, 200))
                 .CheckMeasureResult(SpacePlan.Wrap());
         }
         
@@ -37,100 +45,89 @@ namespace QuestPDF.UnitTests
         public void Measure_ReturnsWrap_WhenContentReturnsWrap()
         {
             TestPlan
-                .For(CreateDecoration)
+                .For(x => new BinaryDecoration
+                {
+                    Type = DecorationType.Append,
+                    DecorationElement = x.CreateChild("decoration"),
+                    ContentElement = x.CreateChild("content")
+                })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure("before", new Size(400, 300), SpacePlan.FullRender(100, 50))
+                .ExpectChildMeasure("decoration", new Size(400, 300), SpacePlan.FullRender(300, 100))
-                .ExpectChildMeasure("after", new Size(400, 300), SpacePlan.FullRender(100, 50))
                 .ExpectChildMeasure("content", new Size(400, 200), SpacePlan.Wrap())
                 .CheckMeasureResult(SpacePlan.Wrap());
         }
         
         [Test]
-        public void Measure_ReturnsWrap_WhenAfterReturnsWrap()
+        public void Measure_ReturnsPartialRender_WhenContentReturnsPartialRender()
         {
             TestPlan
-                .For(CreateDecoration)
+                .For(x => new BinaryDecoration
+                {
+                    Type = DecorationType.Append,
+                    DecorationElement = x.CreateChild("decoration"),
+                    ContentElement = x.CreateChild("content")
+                })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure("before", new Size(400, 300), SpacePlan.FullRender(100, 50))
+                .ExpectChildMeasure("decoration", new Size(400, 300), SpacePlan.FullRender(300, 100))
-                .ExpectChildMeasure("after", new Size(400, 300), SpacePlan.Wrap())
+                .ExpectChildMeasure("content", new Size(400, 200), SpacePlan.PartialRender(200, 150))
-                .ExpectChildMeasure("content", new Size(400, 250), SpacePlan.FullRender(100, 100))
+                .CheckMeasureResult(SpacePlan.PartialRender(400, 250));
-                .CheckMeasureResult(SpacePlan.Wrap());
         }
         
         [Test]
-        public void Measure_ReturnsWrap_WhenBeforeReturnsPartialRender()
+        public void Measure_ReturnsFullRender_WhenContentReturnsFullRender()
         {
             TestPlan
-                .For(CreateDecoration)
+                .For(x => new BinaryDecoration
+                {
+                    Type = DecorationType.Append,
+                    DecorationElement = x.CreateChild("decoration"),
+                    ContentElement = x.CreateChild("content")
+                })
                 .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure("before", new Size(400, 300), SpacePlan.PartialRender(100, 50))
+                .ExpectChildMeasure("decoration", new Size(400, 300), SpacePlan.FullRender(300, 100))
-                .ExpectChildMeasure("after", new Size(400, 300), SpacePlan.FullRender(100, 50))
+                .ExpectChildMeasure("content", new Size(400, 200), SpacePlan.FullRender(200, 150))
-                .ExpectChildMeasure("content", new Size(400, 250), SpacePlan.FullRender(100, 100))
+                .CheckMeasureResult(SpacePlan.FullRender(400, 250));
-                .CheckMeasureResult(SpacePlan.Wrap());
-        }
-        
-        [Test]
-        public void Measure_ReturnsWrap_WhenAfterReturnsPartialRender()
-        {
-            TestPlan
-                .For(CreateDecoration)
-                .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure("before", new Size(400, 300), SpacePlan.FullRender(100, 50))
-                .ExpectChildMeasure("after", new Size(400, 300), SpacePlan.PartialRender(100, 50))
-                .ExpectChildMeasure("content", new Size(400, 250), SpacePlan.FullRender(100, 100))
-                .CheckMeasureResult(SpacePlan.Wrap());
-        }
-        
-        [Test]
-        public void Measure_ReturnsWrap_WhenContentReturnsPartialRender()
-        {
-            TestPlan
-                .For(CreateDecoration)
-                .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure("before", new Size(400, 300), SpacePlan.FullRender(100, 50))
-                .ExpectChildMeasure("after", new Size(400, 300), SpacePlan.FullRender(100, 50))
-                .ExpectChildMeasure("content", new Size(400, 200), SpacePlan.PartialRender(150, 100))
-                .CheckMeasureResult(SpacePlan.PartialRender(150, 200));
-        }
-        
-        [Test]
-        public void Measure_ReturnsWrap_WhenContentReturnsFullRender()
-        {
-            TestPlan
-                .For(CreateDecoration)
-                .MeasureElement(new Size(400, 300))
-                .ExpectChildMeasure("before", new Size(400, 300), SpacePlan.FullRender(100, 50))
-                .ExpectChildMeasure("after", new Size(400, 300), SpacePlan.FullRender(100, 50))
-                .ExpectChildMeasure("content", new Size(400, 200), SpacePlan.FullRender(150, 100))
-                .CheckMeasureResult(SpacePlan.FullRender(150, 200));
         }
         
         #endregion
         
         #region Draw
         
+        [Test]
+        public void Draw_Prepend()
+        {
+            TestPlan
+                .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), SpacePlan.FullRender(300, 100))
+                .ExpectChildDraw("decoration", new Size(400, 100))
+                .ExpectCanvasTranslate(0, 100)
+                .ExpectChildDraw("content", new Size(400, 200))
+                .ExpectCanvasTranslate(0, -100)
+                .CheckDrawResult();
+        }
+        
         [Test]
         public void Draw_Append()
         {
             TestPlan
-                .For(CreateDecoration)
+                .For(x => new BinaryDecoration
+                {
+                    Type = DecorationType.Append,
+                    DecorationElement = x.CreateChild("decoration"),
+                    ContentElement = x.CreateChild("content")
+                })
                 .DrawElement(new Size(400, 300))
-                .ExpectChildMeasure("before", new Size(400, 300), SpacePlan.FullRender(200, 40))
+                .ExpectChildMeasure("decoration", new Size(400, 300), SpacePlan.FullRender(300, 100))
-                .ExpectChildMeasure("after", new Size(400, 300), SpacePlan.FullRender(200, 60))
+                .ExpectChildDraw("content", new Size(400, 200))
-                .ExpectChildMeasure("content", new Size(400, 200), SpacePlan.FullRender(300, 100))
+                .ExpectCanvasTranslate(0, 200)
-                
+                .ExpectChildDraw("decoration", new Size(400, 100))
-                .ExpectCanvasTranslate(0, 0)
+                .ExpectCanvasTranslate(0, -200)
-                .ExpectChildDraw("before", new Size(300, 40))
-                .ExpectCanvasTranslate(0, 0)
-                
-                .ExpectCanvasTranslate(0, 40)
-                .ExpectChildDraw("content", new Size(300, 100))
-                .ExpectCanvasTranslate(0, -40)
-                
-                .ExpectCanvasTranslate(0, 140)
-                .ExpectChildDraw("after", new Size(300, 60))
-                .ExpectCanvasTranslate(0, -140)
-
                 .CheckDrawResult();
         }
 

QuestPDF.UnitTests/GridTests.cs

@@ -39,26 +39,26 @@ namespace QuestPDF.UnitTests
             // assert
             var expected = new Container();
             
-            expected.Column(column =>
+            expected.Stack(stack =>
             {
-                column.Item().Row(row =>
+                stack.Item().Row(row =>
                 {
-                    row.RelativeItem(6).Element(childA);
+                    row.RelativeColumn(6).Element(childA);
-                    row.RelativeItem(4).Element(childB);
+                    row.RelativeColumn(4).Element(childB);
-                    row.RelativeItem(2);
+                    row.RelativeColumn(2);
                 });
                 
-                column.Item().Row(row =>
+                stack.Item().Row(row =>
                 {
-                    row.RelativeItem(4).Element(childC);
+                    row.RelativeColumn(4).Element(childC);
-                    row.RelativeItem(2).Element(childD);
+                    row.RelativeColumn(2).Element(childD);
-                    row.RelativeItem(6);
+                    row.RelativeColumn(6);
                 });
                 
-                column.Item().Row(row =>
+                stack.Item().Row(row =>
                 {
-                    row.RelativeItem(8).Element(childE);
+                    row.RelativeColumn(8).Element(childE);
-                    row.RelativeItem(4);
+                    row.RelativeColumn(4);
                 });
             });
             
@@ -93,29 +93,29 @@ namespace QuestPDF.UnitTests
             // assert
             var expected = new Container();
             
-            expected.Column(column =>
+            expected.Stack(stack =>
             {
-                column.Item().Row(row =>
+                stack.Item().Row(row =>
                 {
-                    row.RelativeItem(1);
+                    row.RelativeColumn(1);
-                    row.RelativeItem(6).Element(childA);
+                    row.RelativeColumn(6).Element(childA);
-                    row.RelativeItem(4).Element(childB);
+                    row.RelativeColumn(4).Element(childB);
-                    row.RelativeItem(1);
+                    row.RelativeColumn(1);
                 });
                 
-                column.Item().Row(row =>
+                stack.Item().Row(row =>
                 {
-                    row.RelativeItem(3);
+                    row.RelativeColumn(3);
-                    row.RelativeItem(4).Element(childC);
+                    row.RelativeColumn(4).Element(childC);
-                    row.RelativeItem(2).Element(childD);
+                    row.RelativeColumn(2).Element(childD);
-                    row.RelativeItem(3);
+                    row.RelativeColumn(3);
                 });
                 
-                column.Item().Row(row =>
+                stack.Item().Row(row =>
                 {
-                    row.RelativeItem(2);
+                    row.RelativeColumn(2);
-                    row.RelativeItem(8).Element(childE);
+                    row.RelativeColumn(8).Element(childE);
-                    row.RelativeItem(2);
+                    row.RelativeColumn(2);
                 });
             });
 
@@ -150,26 +150,26 @@ namespace QuestPDF.UnitTests
             // assert
             var expected = new Container();
             
-            expected.Column(column =>
+            expected.Stack(stack =>
             {
-                column.Item().Row(row =>
+                stack.Item().Row(row =>
                 {
-                    row.RelativeItem(2);
+                    row.RelativeColumn(2);
-                    row.RelativeItem(6).Element(childA);
+                    row.RelativeColumn(6).Element(childA);
-                    row.RelativeItem(4).Element(childB);
+                    row.RelativeColumn(4).Element(childB);
                 });
                 
-                column.Item().Row(row =>
+                stack.Item().Row(row =>
                 {
-                    row.RelativeItem(6);
+                    row.RelativeColumn(6);
-                    row.RelativeItem(4).Element(childC);
+                    row.RelativeColumn(4).Element(childC);
-                    row.RelativeItem(2).Element(childD);
+                    row.RelativeColumn(2).Element(childD);
                 });
                 
-                column.Item().Row(row =>
+                stack.Item().Row(row =>
                 {
-                    row.RelativeItem(4);
+                    row.RelativeColumn(4);
-                    row.RelativeItem(8).Element(childE);
+                    row.RelativeColumn(8).Element(childE);
                 });
             });
             
@@ -210,36 +210,36 @@ namespace QuestPDF.UnitTests
             // assert
             var expected = new Container();
             
-            expected.Column(column =>
+            expected.Stack(stack =>
             {
-                column.Spacing(20);
+                stack.Spacing(20);
                 
-                column.Item().Row(row =>
+                stack.Item().Row(row =>
                 {
                     row.Spacing(30);
                     
-                    row.RelativeItem(3);
+                    row.RelativeColumn(3);
-                    row.RelativeItem(5).Element(childA);
+                    row.RelativeColumn(5).Element(childA);
-                    row.RelativeItem(5).Element(childB);
+                    row.RelativeColumn(5).Element(childB);
-                    row.RelativeItem(3);
+                    row.RelativeColumn(3);
                 });
                 
-                column.Item().Row(row =>
+                stack.Item().Row(row =>
                 {
                     row.Spacing(30);
                     
-                    row.RelativeItem(3);
+                    row.RelativeColumn(3);
-                    row.RelativeItem(10).Element(childC);
+                    row.RelativeColumn(10).Element(childC);
-                    row.RelativeItem(3);
+                    row.RelativeColumn(3);
                 });
                 
-                column.Item().Row(row =>
+                stack.Item().Row(row =>
                 {
                     row.Spacing(30);
                     
-                    row.RelativeItem(2);
+                    row.RelativeColumn(2);
-                    row.RelativeItem(12).Element(childD);
+                    row.RelativeColumn(12).Element(childD);
-                    row.RelativeItem(2);
+                    row.RelativeColumn(2);
                 });
             });
             

QuestPDF.UnitTests/RowTests.cs

@@ -0,0 +1,267 @@
+using NUnit.Framework;
+using QuestPDF.Drawing;
+using QuestPDF.Elements;
+using QuestPDF.Fluent;
+using QuestPDF.Infrastructure;
+using QuestPDF.UnitTests.TestEngine;
+
+namespace QuestPDF.UnitTests
+{
+    [TestFixture]
+    public class RowTests
+    {
+        #region Measure
+        
+        [Test]
+        public void Measure_ReturnsWrap_WhenLeftChildReturnsWrap()
+        {
+            TestPlan
+                .For(x => new BinaryRow
+                {
+                    Left = x.CreateChild("left"),
+                    Right = x.CreateChild("right")
+                })
+                .MeasureElement(new Size(400, 300))
+                .ExpectChildMeasure("left", new Size(400, 300), SpacePlan.Wrap())
+                .CheckMeasureResult(SpacePlan.Wrap());
+        }
+        
+        [Test]
+        public void Measure_ReturnsWrap_WhenRightChildReturnsWrap()
+        {
+            TestPlan
+                .For(x => new BinaryRow
+                {
+                    Left = x.CreateChild("left"),
+                    Right = x.CreateChild("right")
+                })
+                .MeasureElement(new Size(400, 300))
+                .ExpectChildMeasure("left", new Size(400, 300), SpacePlan.FullRender(250, 150))
+                .ExpectChildMeasure("right", new Size(150, 300), SpacePlan.Wrap())
+                .CheckMeasureResult(SpacePlan.Wrap());
+        }
+        
+        [Test]
+        public void Measure_ReturnsPartialRender_WhenLeftChildReturnsPartialRender()
+        {
+            TestPlan
+                .For(x => new BinaryRow
+                {
+                    Left = x.CreateChild("left"),
+                    Right = x.CreateChild("right")
+                })
+                .MeasureElement(new Size(400, 300))
+                .ExpectChildMeasure("left", new Size(400, 300), SpacePlan.PartialRender(250, 150))
+                .ExpectChildMeasure("right", new Size(150, 300), SpacePlan.FullRender(100, 100))
+                .CheckMeasureResult(SpacePlan.PartialRender(350, 150));
+        }
+        
+        [Test]
+        public void Measure_ReturnsPartialRender_WhenRightChildReturnsPartialRender()
+        {
+            TestPlan
+                .For(x => new BinaryRow
+                {
+                    Left = x.CreateChild("left"),
+                    Right = x.CreateChild("right")
+                })
+                .MeasureElement(new Size(400, 300))
+                .ExpectChildMeasure("left", new Size(400, 300), SpacePlan.FullRender(250, 150))
+                .ExpectChildMeasure("right", new Size(150, 300), SpacePlan.PartialRender(100, 100))
+                .CheckMeasureResult(SpacePlan.PartialRender(350, 150));
+        }
+        
+        [Test]
+        public void Measure_ReturnsFullRender_WhenBothChildrenReturnFullRender()
+        {
+            TestPlan
+                .For(x => new BinaryRow
+                {
+                    Left = x.CreateChild("left"),
+                    Right = x.CreateChild("right")
+                })
+                .MeasureElement(new Size(400, 300))
+                .ExpectChildMeasure("left", new Size(400, 300), SpacePlan.FullRender(200, 150))
+                .ExpectChildMeasure("right", new Size(200, 300), SpacePlan.FullRender(100, 100))
+                .CheckMeasureResult(SpacePlan.FullRender(300, 150));
+        }
+        
+        #endregion
+
+        #region Draw
+
+        [Test]
+        public void Draw()
+        {
+            TestPlan
+                .For(x => new BinaryRow
+                {
+                    Left = x.CreateChild("left"),
+                    Right = x.CreateChild("right")
+                })
+                .DrawElement(new Size(400, 300))
+                .ExpectChildMeasure("left", new Size(400, 300), SpacePlan.FullRender(250, 150))
+                .ExpectChildDraw("left", new Size(250, 300))
+                .ExpectCanvasTranslate(250, 0)
+                .ExpectChildDraw("right", new Size(150, 300))
+                .ExpectCanvasTranslate(-250, 0)
+                .CheckDrawResult();
+        }
+
+        #endregion
+        
+        #region Structure
+        
+        [Test]
+        public void Structure_RelativeColumnsHandling()
+        { 
+            // arrange
+            var childA = TestPlan.CreateUniqueElement();
+            var childB = TestPlan.CreateUniqueElement();
+            var childC = TestPlan.CreateUniqueElement();
+            var childD = TestPlan.CreateUniqueElement();
+            var childE = TestPlan.CreateUniqueElement();
+
+            const int spacing = 25;
+            var availableSpace = new Size(1100, 400);
+            
+            // act
+            var value = new Container();
+
+            value.Row(row =>
+            {
+                row.Spacing(spacing);
+                
+                row.ConstantColumn(150).Element(childA);
+                row.ConstantColumn(250).Element(childB);
+                row.RelativeColumn(1).Element(childC);
+                row.RelativeColumn(2).Element(childD);
+                row.RelativeColumn(3).Element(childE);
+            });
+            
+            // assert
+            var expected = new Container();
+
+            expected.Row(row =>
+            {
+                row.Spacing(spacing);
+                
+                row.ConstantColumn(150).Element(childA);
+                row.ConstantColumn(250).Element(childB);
+                row.ConstantColumn(100).Element(childC);
+                row.ConstantColumn(200).Element(childD);
+                row.ConstantColumn(300).Element(childE);
+            });
+            
+            TestPlan.CompareOperations(value, expected, availableSpace);
+        }
+        
+        [Test]
+        public void Structure_Tree()
+        { 
+            // arrange
+            var childA = TestPlan.CreateUniqueElement();
+            var childB = TestPlan.CreateUniqueElement();
+            var childC = TestPlan.CreateUniqueElement();
+            var childD = TestPlan.CreateUniqueElement();
+            var childE = TestPlan.CreateUniqueElement();
+
+            const int spacing = 25;
+            var availableSpace = new Size(1200, 400);
+            
+            // act
+            var value = new Container();
+
+            value.Row(row =>
+            {
+                row.Spacing(spacing);
+                
+                row.ConstantColumn(150).Element(childA);
+                row.ConstantColumn(200).Element(childB);
+                row.ConstantColumn(250).Element(childC);
+                row.RelativeColumn(2).Element(childD);
+                row.RelativeColumn(3).Element(childE);
+            });
+            
+            // assert
+            var expected = new BinaryRow
+            {
+                Left = new BinaryRow
+                {
+                    Left = new BinaryRow
+                    {
+                        Left = new Constrained
+                        {
+                            MinWidth = 150,
+                            MaxWidth = 150,
+                            Child = childA
+                        },
+                        Right = new Constrained
+                        {
+                            MinWidth = 25,
+                            MaxWidth = 25
+                        }
+                    },
+                    Right = new BinaryRow
+                    {
+                        Left = new Constrained
+                        {
+                            MinWidth = 200,
+                            MaxWidth = 200,
+                            Child = childB
+                        },
+                        Right = new Constrained
+                        {
+                            MinWidth = 25,
+                            MaxWidth = 25
+                        }
+                    }
+                },
+                Right = new BinaryRow
+                {
+                    Left = new BinaryRow
+                    {
+                        Left = new Constrained
+                        {
+                            MinWidth = 250,
+                            MaxWidth = 250,
+                            Child = childC
+                        },
+                        Right = new Constrained
+                        {
+                            MinWidth = 25,
+                            MaxWidth = 25
+                        }
+                    },
+                    Right = new BinaryRow
+                    {
+                        Left = new Constrained
+                        {
+                            MinWidth = 200,
+                            MaxWidth = 200,
+                            Child = childD
+                        },
+                        Right = new BinaryRow
+                        {
+                            Left = new Constrained
+                            {
+                                MinWidth = 25,
+                                MaxWidth = 25
+                            },
+                            Right = new Constrained
+                            {
+                                MinWidth = 300,
+                                MaxWidth = 300,
+                                Child = childE
+                            }
+                        }
+                    }
+                }
+            };
+            
+            TestPlan.CompareOperations(value, expected, availableSpace);
+        }
+        
+        #endregion
+    }
+}

QuestPDF.UnitTests/StackTests.cs

@@ -1,5 +1,4 @@
-using System.Linq;
+using NUnit.Framework;
-using NUnit.Framework;
 using QuestPDF.Drawing;
 using QuestPDF.Elements;
 using QuestPDF.Fluent;
@@ -9,40 +8,19 @@ using QuestPDF.UnitTests.TestEngine;
 namespace QuestPDF.UnitTests
 {
     [TestFixture]
-    public class ColumnTests
+    public class StackTests
     {
-        private Column CreateColumnWithTwoItems(TestPlan testPlan)
-        {
-            return new Column
-            {
-                Items =
-                {
-                    new ColumnItem
-                    {
-                        Child = testPlan.CreateChild("first")
-                    },
-                    new ColumnItem
-                    {
-                        Child = testPlan.CreateChild("second")
-                    }
-                }
-            };
-        }
-        
-        private Column CreateColumnWithTwoItemsWhereFirstIsFullyRendered(TestPlan testPlan)
-        {
-            var column = CreateColumnWithTwoItems(testPlan);
-            column.Items.First().IsRendered = true;
-            return column;
-        }
-        
         #region Measure
 
         [Test]
         public void Measure_ReturnsWrap_WhenFirstChildWraps()
         {
             TestPlan
-                .For(CreateColumnWithTwoItems)
+                .For(x => new BinaryStack
+                {
+                    First = x.CreateChild("first"),
+                    Second = x.CreateChild("second")
+                })
                 .MeasureElement(new Size(400, 300))
                 .ExpectChildMeasure("first", new Size(400, 300), SpacePlan.Wrap())
                 .CheckMeasureResult(SpacePlan.Wrap());
@@ -52,7 +30,11 @@ namespace QuestPDF.UnitTests
         public void Measure_ReturnsPartialRender_WhenFirstChildReturnsPartialRender()
         {
             TestPlan
-                .For(CreateColumnWithTwoItems)
+                .For(x => new BinaryStack
+                {
+                    First = x.CreateChild("first"),
+                    Second = x.CreateChild("second")
+                })
                 .MeasureElement(new Size(400, 300))
                 .ExpectChildMeasure("first", new Size(400, 300), SpacePlan.PartialRender(300, 200))
                 .CheckMeasureResult(SpacePlan.PartialRender(300, 200));
@@ -62,7 +44,11 @@ namespace QuestPDF.UnitTests
         public void Measure_ReturnsPartialRender_WhenSecondChildWraps()
         {
             TestPlan
-                .For(CreateColumnWithTwoItems)
+                .For(x => new BinaryStack
+                {
+                    First = x.CreateChild("first"),
+                    Second = x.CreateChild("second")
+                })
                 .MeasureElement(new Size(400, 300))
                 .ExpectChildMeasure("first", new Size(400, 300), SpacePlan.FullRender(200, 100))
                 .ExpectChildMeasure("second", new Size(400, 200), SpacePlan.Wrap())
@@ -73,7 +59,11 @@ namespace QuestPDF.UnitTests
         public void Measure_ReturnsPartialRender_WhenSecondChildReturnsPartialRender()
         {
             TestPlan
-                .For(CreateColumnWithTwoItems)
+                .For(x => new BinaryStack
+                {
+                    First = x.CreateChild("first"),
+                    Second = x.CreateChild("second")
+                })
                 .MeasureElement(new Size(400, 300))
                 .ExpectChildMeasure("first", new Size(400, 300), SpacePlan.FullRender(200, 100))
                 .ExpectChildMeasure("second", new Size(400, 200), SpacePlan.PartialRender(300, 150))
@@ -84,13 +74,33 @@ namespace QuestPDF.UnitTests
         public void Measure_ReturnsFullRender_WhenSecondChildReturnsFullRender()
         {
             TestPlan
-                .For(CreateColumnWithTwoItems)
+                .For(x => new BinaryStack
+                {
+                    First = x.CreateChild("first"),
+                    Second = x.CreateChild("second")
+                })
                 .MeasureElement(new Size(400, 300))
                 .ExpectChildMeasure("first", new Size(400, 300), SpacePlan.FullRender(200, 100))
                 .ExpectChildMeasure("second", new Size(400, 200), SpacePlan.FullRender(100, 50))
                 .CheckMeasureResult(SpacePlan.FullRender(200, 150));
         }
         
+        [Test]
+        public void Measure_UsesEmpty_WhenFirstChildIsRendered()
+        {
+            TestPlan
+                .For(x => new BinaryStack
+                {
+                    First = x.CreateChild("first"),
+                    Second = x.CreateChild("second"),
+                    
+                    IsFirstRendered = true
+                })
+                .MeasureElement(new Size(400, 300))
+                .ExpectChildMeasure("second", new Size(400, 300), SpacePlan.FullRender(200, 300))
+                .CheckMeasureResult(SpacePlan.FullRender(200, 300));
+        }
+        
         #endregion
         
         #region Draw
@@ -99,7 +109,11 @@ namespace QuestPDF.UnitTests
         public void Draw_WhenFirstChildWraps()
         {
             TestPlan
-                .For(CreateColumnWithTwoItems)
+                .For(x => new BinaryStack
+                {
+                    First = x.CreateChild("first"),
+                    Second = x.CreateChild("second")
+                })
                 .DrawElement(new Size(400, 300))
                 .ExpectChildMeasure("first", new Size(400, 300), SpacePlan.Wrap())
                 .CheckDrawResult();
@@ -109,12 +123,14 @@ namespace QuestPDF.UnitTests
         public void Draw_WhenFirstChildPartiallyRenders()
         {
             TestPlan
-                .For(CreateColumnWithTwoItems)
+                .For(x => new BinaryStack
+                {
+                    First = x.CreateChild("first"),
+                    Second = x.CreateChild("second")
+                })
                 .DrawElement(new Size(400, 300))
                 .ExpectChildMeasure("first", new Size(400, 300), SpacePlan.PartialRender(200, 100))
-                .ExpectCanvasTranslate(0, 0)
                 .ExpectChildDraw("first", new Size(400, 100))
-                .ExpectCanvasTranslate(0, 0)
                 .CheckDrawResult();
         }
         
@@ -122,13 +138,15 @@ namespace QuestPDF.UnitTests
         public void Draw_WhenFirstChildFullyRenders_AndSecondChildWraps()
         {
             TestPlan
-                .For(CreateColumnWithTwoItems)
+                .For(x => new BinaryStack
+                {
+                    First = x.CreateChild("first"),
+                    Second = x.CreateChild("second")
+                })
                 .DrawElement(new Size(400, 300))
                 .ExpectChildMeasure("first", new Size(400, 300), SpacePlan.FullRender(200, 100))
-                .ExpectChildMeasure("second", new Size(400, 200), SpacePlan.Wrap())
-                .ExpectCanvasTranslate(0, 0)
                 .ExpectChildDraw("first", new Size(400, 100))
-                .ExpectCanvasTranslate(0, 0)
+                .ExpectChildMeasure("second", new Size(400, 200), SpacePlan.Wrap())
                 .CheckDrawResult();
         }
         
@@ -136,13 +154,15 @@ namespace QuestPDF.UnitTests
         public void Draw_WhenFirstChildFullyRenders_AndSecondChildPartiallyRenders()
         {
             TestPlan
-                .For(CreateColumnWithTwoItems)
+                .For(x => new BinaryStack
+                {
+                    First = x.CreateChild("first"),
+                    Second = x.CreateChild("second")
+                })
                 .DrawElement(new Size(400, 300))
                 .ExpectChildMeasure("first", new Size(400, 300), SpacePlan.FullRender(200, 100))
-                .ExpectChildMeasure("second", new Size(400, 200), SpacePlan.PartialRender(250, 150))
-                .ExpectCanvasTranslate(0, 0)
                 .ExpectChildDraw("first", new Size(400, 100))
-                .ExpectCanvasTranslate(0, 0)
+                .ExpectChildMeasure("second", new Size(400, 200), SpacePlan.PartialRender(250, 150))
                 .ExpectCanvasTranslate(0, 100)
                 .ExpectChildDraw("second", new Size(400, 150))
                 .ExpectCanvasTranslate(0, -100)
@@ -153,13 +173,15 @@ namespace QuestPDF.UnitTests
         public void Draw_WhenFirstChildFullyRenders_AndSecondChildFullyRenders()
         {
             TestPlan
-                .For(CreateColumnWithTwoItems)
+                .For(x => new BinaryStack
+                {
+                    First = x.CreateChild("first"),
+                    Second = x.CreateChild("second")
+                })
                 .DrawElement(new Size(400, 300))
                 .ExpectChildMeasure("first", new Size(400, 300), SpacePlan.FullRender(200, 100))
-                .ExpectChildMeasure("second", new Size(400, 200), SpacePlan.FullRender(250, 150))
-                .ExpectCanvasTranslate(0, 0)
                 .ExpectChildDraw("first", new Size(400, 100))
-                .ExpectCanvasTranslate(0, 0)
+                .ExpectChildMeasure("second", new Size(400, 200), SpacePlan.FullRender(250, 150))
                 .ExpectCanvasTranslate(0, 100)
                 .ExpectChildDraw("second", new Size(400, 150))
                 .ExpectCanvasTranslate(0, -100)
@@ -170,13 +192,19 @@ namespace QuestPDF.UnitTests
         public void Draw_UsesEmpty_WhenFirstChildIsRendered()
         {
             TestPlan
-                .For(CreateColumnWithTwoItemsWhereFirstIsFullyRendered)
+                .For(x => new BinaryStack
+                {
+                    First = x.CreateChild("first"),
+                    Second = x.CreateChild("second"),
+                    
+                    IsFirstRendered = true
+                })
                 .DrawElement(new Size(400, 300))
                 .ExpectChildMeasure("second", new Size(400, 300), SpacePlan.PartialRender(200, 300))
                 .ExpectCanvasTranslate(0, 0)
                 .ExpectChildDraw("second", new Size(400, 300))
                 .ExpectCanvasTranslate(0, 0)
-                .CheckState<Column>(x => x.Items.First().IsRendered)
+                .CheckState<BinaryStack>(x => x.IsFirstRendered)
                 .CheckDrawResult();
         }
         
@@ -184,14 +212,97 @@ namespace QuestPDF.UnitTests
         public void Draw_TogglesFirstRenderedFlag_WhenSecondFullyRenders()
         {
             TestPlan
-                .For(CreateColumnWithTwoItemsWhereFirstIsFullyRendered)
+                .For(x => new BinaryStack
+                {
+                    First = x.CreateChild("first"),
+                    Second = x.CreateChild("second"),
+                    
+                    IsFirstRendered = true
+                })
                 .DrawElement(new Size(400, 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<Column>(x => !x.Items.First().IsRendered);
+                .CheckState<BinaryStack>(x => !x.IsFirstRendered);
+        }
+        
+        #endregion
+        
+        #region Structure
+        
+        [Test]
+        public void Structure_Simple()
+        { 
+            // arrange
+            var childA = TestPlan.CreateUniqueElement();
+            var childB = TestPlan.CreateUniqueElement();
+            var childC = TestPlan.CreateUniqueElement();
+            var childD = TestPlan.CreateUniqueElement();
+            var childE = TestPlan.CreateUniqueElement();
+
+            const int spacing = 20;
+            
+            // act
+            var structure = new Container();
+            
+            structure.Stack(stack =>
+            {
+                stack.Spacing(spacing);
+                
+                stack.Item().Element(childA);
+                stack.Item().Element(childB);
+                stack.Item().Element(childC);
+                stack.Item().Element(childD);
+                stack.Item().Element(childE);
+            });
+            
+            // assert
+            var expected = new Padding
+            {
+                Bottom = -spacing,
+
+                Child = new BinaryStack
+                {
+                    First = new BinaryStack
+                    {
+                        First = new Padding
+                        {
+                            Bottom = spacing,
+                            Child = childA
+                        },
+                        Second = new Padding
+                        {
+                            Bottom = spacing,
+                            Child = childB
+                        }
+                    },
+                    Second = new BinaryStack
+                    {
+                        First = new Padding
+                        {
+                            Bottom = spacing,
+                            Child = childC
+                        },
+                        Second = new BinaryStack
+                        {
+                            First = new Padding
+                            {
+                                Bottom = spacing,
+                                Child = childD
+                            },
+                            Second = new Padding
+                            {
+                                Bottom = spacing,
+                                Child = childE
+                            }
+                        }
+                    }
+                }
+            };
+
+            TestPlan.CompareOperations(structure, expected);
         }
         
         #endregion

QuestPDF.UnitTests/TestEngine/MockCanvas.cs

@@ -11,13 +11,15 @@ namespace QuestPDF.UnitTests.TestEngine
         public Action<float, float> ScaleFunc { get; set; }
         public Action<SKImage, Position, Size> DrawImageFunc { get; set; }
         public Action<string, Position, TextStyle> DrawTextFunc { get; set; }
-        public Action<Position, Size, string> DrawRectFunc { get; set; }
+        public Action<Position, Size, string> DrawFilledRectangleFunc { get; set; }
+        public Action<Size, string, float> DrawStrokedRectangleFunc { get; set; }
 
         public void Translate(Position vector) => TranslateFunc(vector);
         public void Rotate(float angle) => RotateFunc(angle);
         public void Scale(float scaleX, float scaleY) => ScaleFunc(scaleX, scaleY);
 
-        public void DrawRectangle(Position vector, Size size, string color) => DrawRectFunc(vector, size, color);
+        public void DrawFilledRectangle(Position vector, Size size, string color) => DrawFilledRectangleFunc(vector, size, color);
+        public void DrawStrokedRectangle(Size size, string color, float width) => DrawStrokedRectangleFunc(size, color, width);
         public void DrawText(string text, Position position, TextStyle style) => DrawTextFunc(text, position, style);
         public void DrawImage(SKImage image, Position position, Size size) => DrawImageFunc(image, position, size);
         

QuestPDF.UnitTests/TestEngine/OperationRecordingCanvas.cs

@@ -14,7 +14,8 @@ namespace QuestPDF.UnitTests.TestEngine
         public void Rotate(float angle) => Operations.Add(new CanvasRotateOperation(angle));
         public void Scale(float scaleX, float scaleY) => Operations.Add(new CanvasScaleOperation(scaleX, scaleY));
 
-        public void DrawRectangle(Position vector, Size size, string color) => Operations.Add(new CanvasDrawRectangleOperation(vector, size, color));
+        public void DrawFilledRectangle(Position vector, Size size, string color) => Operations.Add(new CanvasDrawFilledRectangleOperation(vector, size, color));
+        public void DrawStrokedRectangle(Size size, string color, float width) => Operations.Add(new CanvasDrawStrokedRectangleOperation(size, color, width));
         public void DrawText(string text, Position position, TextStyle style) => Operations.Add(new CanvasDrawTextOperation(text, position, style));
         public void DrawImage(SKImage image, Position position, Size size) => Operations.Add(new CanvasDrawImageOperation(position, size));
         

QuestPDF.UnitTests/TestEngine/Operations/CanvasDrawFilledRectangleOperation.cs

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

QuestPDF.UnitTests/TestEngine/Operations/CanvasDrawStrokedRectangleOperation.cs

@@ -0,0 +1,18 @@
+using QuestPDF.Infrastructure;
+
+namespace QuestPDF.UnitTests.TestEngine.Operations
+{
+    internal class CanvasDrawStrokedRectangleOperation : OperationBase
+    {
+        public Size Size { get; }
+        public string Color { get; }
+        public float Width { get; set; }
+        
+        public CanvasDrawStrokedRectangleOperation(Size size, string color, float width)
+        {
+            Size = size;
+            Color = color;
+            Width = width;
+        }
+    }
+}

QuestPDF.UnitTests/TestEngine/TestPlan.cs

@@ -70,17 +70,27 @@ namespace QuestPDF.UnitTests.TestEngine
                     Assert.AreEqual(expected.ScaleX, scaleX, "Scale X");
                     Assert.AreEqual(expected.ScaleY, scaleY, "Scale Y");
                 },
-                DrawRectFunc = (position, size, color) =>
+                DrawFilledRectangleFunc = (position, size, color) =>
                 {
-                    var expected = GetExpected<CanvasDrawRectangleOperation>();
+                    var expected = GetExpected<CanvasDrawFilledRectangleOperation>();
                     
-                    Assert.AreEqual(expected.Position.X, position.X, "Draw rectangle: X");
+                    Assert.AreEqual(expected.Position.X, position.X, "Draw filled rectangle: X");
-                    Assert.AreEqual(expected.Position.Y, position.Y, "Draw rectangle: Y");
+                    Assert.AreEqual(expected.Position.Y, position.Y, "Draw filled rectangle: Y");
                     
-                    Assert.AreEqual(expected.Size.Width, size.Width, "Draw rectangle: width");
+                    Assert.AreEqual(expected.Size.Width, size.Width, "Draw filled rectangle: width");
-                    Assert.AreEqual(expected.Size.Height, size.Height, "Draw rectangle: height");
+                    Assert.AreEqual(expected.Size.Height, size.Height, "Draw filled rectangle: height");
                     
-                    Assert.AreEqual(expected.Color, color, "Draw rectangle: color");
+                    Assert.AreEqual(expected.Color, color, "Draw filled rectangle: color");
+                },
+                DrawStrokedRectangleFunc = (size, color, width) =>
+                {
+                    var expected = GetExpected<CanvasDrawStrokedRectangleOperation>();
+
+                    Assert.AreEqual(expected.Size.Width, size.Width, "Draw stroked rectangle: width");
+                    Assert.AreEqual(expected.Size.Height, size.Height, "Draw stroked rectangle: height");
+                    
+                    Assert.AreEqual(expected.Color, color, "Draw stroked rectangle: color");
+                    Assert.AreEqual(expected.Width, width, "Draw stroked rectangle: width");
                 },
                 DrawTextFunc = (text, position, style) => 
                 {
@@ -196,9 +206,14 @@ namespace QuestPDF.UnitTests.TestEngine
             return AddOperation(new CanvasRotateOperation(angle));
         }
         
-        public TestPlan ExpectCanvasDrawRectangle(Position position, Size size, string color)
+        public TestPlan ExpectCanvasDrawFilledRectangle(Position position, Size size, string color)
         {
-            return AddOperation(new CanvasDrawRectangleOperation(position, size, color));
+            return AddOperation(new CanvasDrawFilledRectangleOperation(position, size, color));
+        }
+        
+        public TestPlan ExpectCanvasDrawStrokedRectangle(Size size, string color, float width)
+        {
+            return AddOperation(new CanvasDrawStrokedRectangleOperation(size, color, width));
         }
         
         public TestPlan ExpectCanvasDrawText(string text, Position position, TextStyle style)
@@ -213,7 +228,7 @@ namespace QuestPDF.UnitTests.TestEngine
         
         public TestPlan CheckMeasureResult(SpacePlan expected)
         {
-            Element.VisitChildren(x => x?.Initialize(null, Canvas));
+            Element.HandleVisitor(x => x?.Initialize(null, Canvas));
             
             var actual = Element.Measure(OperationInput);
             
@@ -228,7 +243,7 @@ namespace QuestPDF.UnitTests.TestEngine
         
         public TestPlan CheckDrawResult()
         {
-            Element.VisitChildren(x => x?.Initialize(null, Canvas));
+            Element.HandleVisitor(x => x?.Initialize(null, Canvas));
             Element.Draw(OperationInput);
             return this;
         }
@@ -271,10 +286,10 @@ namespace QuestPDF.UnitTests.TestEngine
             availableSpace ??= new Size(400, 300);
             
             var canvas = new FreeCanvas();
-            value.VisitChildren(x => x.Initialize(null, canvas));
+            value.HandleVisitor(x => x.Initialize(null, canvas));
             var valueMeasure = value.Measure(availableSpace.Value);
             
-            expected.VisitChildren(x => x.Initialize(null, canvas));
+            expected.HandleVisitor(x => x.Initialize(null, canvas));
             var expectedMeasure = expected.Measure(availableSpace.Value);
             
             valueMeasure.Should().BeEquivalentTo(expectedMeasure);
@@ -285,11 +300,11 @@ namespace QuestPDF.UnitTests.TestEngine
             availableSpace ??= new Size(400, 300);
             
             var valueCanvas = new OperationRecordingCanvas();
-            value.VisitChildren(x => x.Initialize(null, valueCanvas));
+            value.HandleVisitor(x => x.Initialize(null, valueCanvas));
             value.Draw(availableSpace.Value);
             
             var expectedCanvas = new OperationRecordingCanvas();
-            expected.VisitChildren(x => x.Initialize(null, expectedCanvas));
+            expected.HandleVisitor(x => x.Initialize(null, expectedCanvas));
             expected.Draw(availableSpace.Value);
             
             valueCanvas.Operations.Should().BeEquivalentTo(expectedCanvas.Operations);

QuestPDF/Drawing/DocumentContainer.cs

@@ -16,13 +16,13 @@ namespace QuestPDF.Drawing
             var container = new Container();
             
             container
-                .Column(column =>
+                .Stack(stack =>
                 {
                     Pages
                         .SelectMany(x => new List<Action>()
                         {
-                            () => column.Item().PageBreak(),
+                            () => stack.Item().PageBreak(),
-                            () => column.Item().Component(x)
+                            () => stack.Item().Component(x)
                         })
                         .Skip(1)
                         .ToList()

QuestPDF/Drawing/DocumentGenerator.cs

@@ -7,8 +7,6 @@ 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
@@ -18,16 +16,14 @@ namespace QuestPDF.Drawing
         internal static void GeneratePdf(Stream stream, IDocument document)
         {
             var metadata = document.GetMetadata();
-            var writeOnlyStream = new WriteOnlyStream(stream);
+            var canvas = new PdfCanvas(stream, metadata);
-            var canvas = new PdfCanvas(writeOnlyStream, metadata);
             RenderDocument(canvas, document);
         }
         
         internal static void GenerateXps(Stream stream, IDocument document)
         {
             var metadata = document.GetMetadata();
-            var writeOnlyStream = new WriteOnlyStream(stream);
+            var canvas = new XpsCanvas(stream, metadata);
-            var canvas = new XpsCanvas(writeOnlyStream, metadata);
             RenderDocument(canvas, document);
         }
         
@@ -46,7 +42,6 @@ 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();
@@ -63,8 +58,8 @@ namespace QuestPDF.Drawing
         internal static void RenderPass<TCanvas>(PageContext pageContext, TCanvas canvas, Container content, DocumentMetadata documentMetadata, DebuggingState? debuggingState)
             where TCanvas : ICanvas, IRenderingCanvas
         {
-            content.VisitChildren(x => x?.Initialize(pageContext, canvas));
+            content.HandleVisitor(x => x?.Initialize(pageContext, canvas));
-            content.VisitChildren(x => (x as IStateResettable)?.ResetState());
+            content.HandleVisitor(x => (x as IStateResettable)?.ResetState());
             
             canvas.BeginDocument();
 
@@ -127,7 +122,7 @@ namespace QuestPDF.Drawing
 
         private static void ApplyCaching(Container content)
         {
-            content.VisitChildren(x =>
+            content.HandleVisitor(x =>
             {
                 if (x is ICacheable)
                     x.CreateProxy(y => new CacheProxy(y));
@@ -138,7 +133,7 @@ namespace QuestPDF.Drawing
         {
             var debuggingState = new DebuggingState();
 
-            content.VisitChildren(x =>
+            content.HandleVisitor(x =>
             {
                 x.CreateProxy(y => new DebuggingProxy(debuggingState, y));
             });
@@ -146,38 +141,26 @@ namespace QuestPDF.Drawing
             return debuggingState;
         }
 
-        private static void ApplyDefaultTextStyle(this Element? content, TextStyle documentDefaultTextStyle)
+        internal static void ApplyDefaultTextStyle(this Element content, TextStyle documentDefaultTextStyle)
         {
-            if (content == null)
+            documentDefaultTextStyle.ApplyGlobalStyle(TextStyle.LibraryDefault);
-                return;
             
-            if (content is TextBlock textBlock)
+            content.HandleVisitor(element =>
             {
-                foreach (var textBlockItem in textBlock.Items)
+                var text = element as TextBlock;
+                
+                if (text == null)
+                    return;
+
+                foreach (var child in text.Children)
                 {
-                    if (textBlockItem is TextBlockSpan textSpan)
+                    if (child is TextBlockSpan textSpan)
-                    {
                         textSpan.Style.ApplyGlobalStyle(documentDefaultTextStyle);
-                    }
+
-                    else if (textBlockItem is TextBlockElement textElement)
+                    if (child 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/FreeCanvas.cs

@@ -36,7 +36,12 @@ namespace QuestPDF.Drawing
             
         }
 
-        public void DrawRectangle(Position vector, Size size, string color)
+        public void DrawFilledRectangle(Position vector, Size size, string color)
+        {
+            
+        }
+        
+        public void DrawStrokedRectangle(Size size, string color, float width)
         {
             
         }

QuestPDF/Drawing/PdfCanvas.cs

@@ -1,5 +1,5 @@
 using System.IO;
-using QuestPDF.Helpers;
+using QuestPDF.Infrastructure;
 using SkiaSharp;
 
 namespace QuestPDF.Drawing

QuestPDF/Drawing/SkiaCache.cs

@@ -0,0 +1,41 @@
+using System.Collections.Concurrent;
+using SkiaSharp;
+
+namespace QuestPDF.Drawing
+{
+    internal class SkiaCache
+    {
+        private static ConcurrentDictionary<string, SKPaint> RectangleFillPaints = new ConcurrentDictionary<string, SKPaint>();
+        private static ConcurrentDictionary<string, SKPaint> RectangleStrokePaints = new ConcurrentDictionary<string, SKPaint>();
+
+        public static SKPaint GetRectangleFillPaint(string color)
+        {
+            return RectangleFillPaints.GetOrAdd(color, _ => Convert());
+
+            SKPaint Convert()
+            {
+                return new SKPaint
+                {
+                    Color = SKColor.Parse(color),
+                    Style = SKPaintStyle.Fill
+                };
+            }
+        }
+        
+        public static SKPaint GetRectangleStrokePaint(string color, float width)
+        {
+            var key = $"{color}|{width}";
+            return RectangleStrokePaints.GetOrAdd(key, _ => Convert());
+
+            SKPaint Convert()
+            {
+                return new SKPaint
+                {
+                    Color = SKColor.Parse(color),
+                    Style = SKPaintStyle.Stroke,
+                    StrokeWidth = width
+                };
+            }
+        }
+    }
+}

QuestPDF/Drawing/SkiaCanvasBase.cs

@@ -18,15 +18,21 @@ namespace QuestPDF.Drawing
             Canvas.Translate(vector.X, vector.Y);
         }
 
-        public void DrawRectangle(Position vector, Size size, string color)
+        public void DrawFilledRectangle(Position vector, Size size, string color)
         {
             if (size.Width < Size.Epsilon || size.Height < Size.Epsilon)
                 return;
 
-            var paint = color.ColorToPaint();
+            var paint = SkiaCache.GetRectangleFillPaint(color);
             Canvas.DrawRect(vector.X, vector.Y, size.Width, size.Height, paint);
         }
         
+        public void DrawStrokedRectangle(Size size, string color, float width)
+        {
+            var paint = SkiaCache.GetRectangleStrokePaint(color, width);
+            Canvas.DrawRect(0, 0, size.Width, size.Height, paint);
+        }
+
         public void DrawText(string text, Position vector, TextStyle style)
         {
             Canvas.DrawText(text, vector.X, vector.Y, style.ToPaint());

QuestPDF/Drawing/SpacePlan.cs

@@ -31,7 +31,7 @@ namespace QuestPDF.Drawing
             if (Type == SpacePlanType.Wrap)
                 return Type.ToString();
             
-            return $"{Type} (Width: {Width:N3}, Height: {Height:N3})";
+            return $"{Type} (Width: {Width:N2}, Height: {Height:N2})";
         }
 
         public static implicit operator Size(SpacePlan spacePlan)

QuestPDF/Drawing/XpsCanvas.cs

@@ -1,5 +1,5 @@
 using System.IO;
-using QuestPDF.Helpers;
+using QuestPDF.Infrastructure;
 using SkiaSharp;
 
 namespace QuestPDF.Drawing

QuestPDF/Elements/Background.cs

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

QuestPDF/Elements/Border.cs

@@ -1,3 +1,4 @@
+using System;
 using QuestPDF.Helpers;
 using QuestPDF.Infrastructure;
 
@@ -16,30 +17,49 @@ namespace QuestPDF.Elements
         {
             base.Draw(availableSpace);
 
-            Canvas.DrawRectangle(
+            if (HasEqualWidthOnAllSides())
-                new Position(-Left/2, -Top/2), 
+            {
-                new Size(availableSpace.Width + Left/2 + Right/2, Top), 
+                Canvas.DrawStrokedRectangle(availableSpace, Color, Top);
+            }
+            else
+            {
+                DrawCustomRectangle(availableSpace);
+            }
+        }
+
+        private void DrawCustomRectangle(Size size)
+        {
+            Canvas.DrawFilledRectangle(
+                new Position(-Left / 2, -Top / 2),
+                new Size(size.Width + Left / 2 + Right / 2, Top),
                 Color);
 
-            Canvas.DrawRectangle(
+            Canvas.DrawFilledRectangle(
-                new Position(-Left/2, -Top/2), 
+                new Position(-Left / 2, -Top / 2),
-                new Size(Left, availableSpace.Height + Top/2 + Bottom/2), 
+                new Size(Left, size.Height + Top / 2 + Bottom / 2),
                 Color);
 
-            Canvas.DrawRectangle(
+            Canvas.DrawFilledRectangle(
-                new Position(-Left/2, availableSpace.Height-Bottom/2), 
+                new Position(-Left / 2, size.Height - Bottom / 2),
-                new Size(availableSpace.Width + Left/2 + Right/2, Bottom), 
+                new Size(size.Width + Left / 2 + Right / 2, Bottom),
                 Color);
 
-            Canvas.DrawRectangle(
+            Canvas.DrawFilledRectangle(
-                new Position(availableSpace.Width-Right/2, -Top/2), 
+                new Position(size.Width - Right / 2, -Top / 2),
-                new Size(Right, availableSpace.Height + Top/2 + Bottom/2), 
+                new Size(Right, size.Height + Top / 2 + Bottom / 2),
                 Color);
         }
         
-        public override string ToString()
+        private bool HasEqualWidthOnAllSides()
         {
-            return $"Border: Top({Top}) Right({Right}) Bottom({Bottom}) Left({Left}) Color({Color})";
+            return IsClose(Top, Bottom) && 
+                   IsClose(Left, Right) &&
+                   IsClose(Top, Left);
+        }
+
+        private static bool IsClose(float x, float y)
+        {
+            return Math.Abs(x - y) < Size.Epsilon;
         }
     }
 }

QuestPDF/Elements/Box.cs

@@ -3,7 +3,7 @@ using QuestPDF.Infrastructure;
 
 namespace QuestPDF.Elements
 {
-    internal class MinimalBox : ContainerElement
+    internal class Box : ContainerElement
     {
         internal override void Draw(Size availableSpace)
         {

QuestPDF/Elements/Column.cs

@@ -1,120 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using QuestPDF.Drawing;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Elements
-{
-    internal class ColumnItem : Container
-    {
-        public bool IsRendered { get; set; }
-    }
-    
-    internal class ColumnItemRenderingCommand
-    {
-        public ColumnItem ColumnItem { get; set; }
-        public SpacePlan Measurement { get; set; }
-        public Size Size { get; set; }
-        public Position Offset { get; set; }
-    }
-    
-    internal class Column : Element, ICacheable, IStateResettable
-    {
-        internal List<ColumnItem> Items { get; } = new();
-        internal float Spacing { get; set; }
-
-        public void ResetState()
-        {
-            Items.ForEach(x => x.IsRendered = false);
-        }
-        
-        internal override IEnumerable<Element?> GetChildren()
-        {
-            return Items;
-        }
-        
-        internal override void CreateProxy(Func<Element?, Element?> create)
-        {
-            Items.ForEach(x => x.Child = create(x.Child));
-        }
-
-        internal override SpacePlan Measure(Size availableSpace)
-        {
-            var renderingCommands = PlanLayout(availableSpace);
-
-            if (!renderingCommands.Any())
-                return SpacePlan.Wrap();
-
-            var width = renderingCommands.Max(x => x.Size.Width);
-            var height = renderingCommands.Last().Offset.Y + renderingCommands.Last().Size.Height;
-            var size = new Size(width, height);
-            
-            if (width > availableSpace.Width + Size.Epsilon || height > availableSpace.Height + Size.Epsilon)
-                return SpacePlan.Wrap();
-            
-            var totalRenderedItems = Items.Count(x => x.IsRendered) + renderingCommands.Count(x => x.Measurement.Type == SpacePlanType.FullRender);
-            var willBeFullyRendered = totalRenderedItems == Items.Count;
-
-            return willBeFullyRendered
-                ? SpacePlan.FullRender(size)
-                : SpacePlan.PartialRender(size);
-        }
-
-        internal override void Draw(Size availableSpace)
-        {
-            var renderingCommands = PlanLayout(availableSpace);
-
-            foreach (var command in renderingCommands)
-            {
-                if (command.Measurement.Type == SpacePlanType.FullRender)
-                    command.ColumnItem.IsRendered = true;
-
-                var targetSize = new Size(availableSpace.Width, command.Size.Height);
-                
-                Canvas.Translate(command.Offset);
-                command.ColumnItem.Draw(targetSize);
-                Canvas.Translate(command.Offset.Reverse());
-            }
-            
-            if (Items.All(x => x.IsRendered))
-                ResetState();
-        }
-
-        private ICollection<ColumnItemRenderingCommand> PlanLayout(Size availableSpace)
-        {
-            var topOffset = 0f;
-            var commands = new List<ColumnItemRenderingCommand>();
-
-            foreach (var item in Items)
-            {
-                if (item.IsRendered)
-                    continue;
-
-                var itemSpace = new Size(availableSpace.Width, availableSpace.Height - topOffset);
-                var measurement = item.Measure(itemSpace);
-                
-                if (measurement.Type == SpacePlanType.Wrap)
-                    break;
-
-                commands.Add(new ColumnItemRenderingCommand
-                {
-                    ColumnItem = item,
-                    Size = measurement,
-                    Measurement = measurement,
-                    Offset = new Position(0, topOffset)
-                });
-                
-                if (measurement.Type == SpacePlanType.PartialRender)
-                    break;
-                
-                topOffset += measurement.Height + Spacing;
-            }
-
-            var targetWidth = commands.Select(x => x.Size.Width).DefaultIfEmpty(0).Max();
-            commands.ForEach(x => x.Size = new Size(targetWidth, x.Size.Height));
-            
-            return commands;
-        }
-    }
-}

QuestPDF/Elements/DebugArea.cs

@@ -27,7 +27,7 @@ namespace QuestPDF.Elements
                         .Layer()
                         .ShowIf(!string.IsNullOrWhiteSpace(Text))
                         .AlignCenter()
-                        .MinimalBox()
+                        .Box()
                         .Background(Colors.White)
                         .Padding(2)
                         .Text(Text, TextStyle.Default.Color(Color).FontType(Fonts.Consolas).Size(8));

QuestPDF/Elements/Decoration.cs

@@ -1,112 +1,99 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using QuestPDF.Drawing;
 using QuestPDF.Fluent;
 using QuestPDF.Infrastructure;
 
 namespace QuestPDF.Elements
 {
-    internal class DecorationItemRenderingCommand
+    internal enum DecorationType
     {
-        public Element Element { get; set; }
+        Prepend,
-        public SpacePlan Measurement { get; set; }
+        Append
-        public Position Offset { get; set; }
     }
     
-    internal class Decoration : Element, ICacheable
+    internal class BinaryDecoration : Element, ICacheable
     {
-        internal Element Before { get; set; } = new Empty();
+        public Element DecorationElement { get; set; } = Empty.Instance;
-        internal Element Content { get; set; } = new Empty();
+        public Element ContentElement { get; set; } = Empty.Instance;
-        internal Element After { get; set; } = new Empty();
+        public DecorationType Type { get; set; }
 
-        internal override IEnumerable<Element?> GetChildren()
+        internal override void HandleVisitor(Action<Element?> visit)
         {
-            yield return Before;
+            DecorationElement?.HandleVisitor(visit);
-            yield return Content;
+            ContentElement?.HandleVisitor(visit);
-            yield return After;
+            
+            base.HandleVisitor(visit);
         }
 
-        internal override void CreateProxy(Func<Element?, Element?> create)
+        internal override void CreateProxy(Func<Element, Element> create)
         {
-            Before = create(Before);
+            DecorationElement = create(DecorationElement);
-            Content = create(Content);
+            ContentElement = create(ContentElement);
-            After = create(After);
         }
 
         internal override SpacePlan Measure(Size availableSpace)
         {
-            var renderingCommands = PlanLayout(availableSpace).ToList();
+            var decorationMeasure = DecorationElement.Measure(availableSpace);
             
-            if (renderingCommands.Any(x => x.Measurement.Type == SpacePlanType.Wrap))
+            if (decorationMeasure.Type == SpacePlanType.Wrap || decorationMeasure.Type == SpacePlanType.PartialRender)
                 return SpacePlan.Wrap();
 
-            var width = renderingCommands.Max(x => x.Measurement.Width);
+            var decorationSize = decorationMeasure;
-            var height = renderingCommands.Sum(x => x.Measurement.Height);
+            var contentMeasure = ContentElement.Measure(new Size(availableSpace.Width, availableSpace.Height - decorationSize.Height));
-            var size = new Size(width, height);
             
-            if (width > availableSpace.Width + Size.Epsilon || height > availableSpace.Height + Size.Epsilon)
+            if (contentMeasure.Type == SpacePlanType.Wrap)
                 return SpacePlan.Wrap();
 
-            var willBeFullyRendered = renderingCommands.All(x => x.Measurement.Type == SpacePlanType.FullRender);
+            var contentSize = contentMeasure;
+            var resultSize = new Size(availableSpace.Width, decorationSize.Height + contentSize.Height);
             
-            return willBeFullyRendered
+            if (contentSize.Type == SpacePlanType.PartialRender)
-                ? SpacePlan.FullRender(size)
+                return SpacePlan.PartialRender(resultSize);
-                : SpacePlan.PartialRender(size);
+            
+            if (contentSize.Type == SpacePlanType.FullRender)
+                return SpacePlan.FullRender(resultSize);
+            
+            throw new NotSupportedException();
         }
 
         internal override void Draw(Size availableSpace)
         {
-            var renderingCommands = PlanLayout(availableSpace).ToList();
+            var decorationSize = DecorationElement.Measure(availableSpace);
-            var width = renderingCommands.Max(x => x.Measurement.Width);
+            var contentSize = new Size(availableSpace.Width, availableSpace.Height - decorationSize.Height);
 
-            foreach (var command in renderingCommands)
+            var translateHeight = Type == DecorationType.Prepend ? decorationSize.Height : contentSize.Height;
-            {
+            Action drawDecoration = () => DecorationElement?.Draw(new Size(availableSpace.Width, decorationSize.Height));
-                var elementSize = new Size(width, command.Measurement.Height);
+            Action drawContent = () => ContentElement?.Draw(new Size (availableSpace.Width, contentSize.Height));
 
-                Canvas.Translate(command.Offset);
+            var first = Type == DecorationType.Prepend ? drawDecoration : drawContent;
-                command.Element.Draw(elementSize);
+            var second = Type == DecorationType.Prepend ? drawContent : drawDecoration;
-                Canvas.Translate(command.Offset.Reverse());
+
-            }
+            first();
+            Canvas.Translate(new Position(0, translateHeight));
+            second();
+            Canvas.Translate(new Position(0, -translateHeight));
         }
+    }
     
-        private IEnumerable<DecorationItemRenderingCommand> PlanLayout(Size availableSpace)
+    internal class Decoration : IComponent
+    {
+        public Element Header { get; set; } = Empty.Instance;
+        public Element Content { get; set; } = Empty.Instance;
+        public Element Footer { get; set; } = Empty.Instance;
+
+        public void Compose(IContainer container)
         {
-            SpacePlan GetDecorationMeasurement(Element element)
+            container.Element(new BinaryDecoration
             {
-                var measurement = element.Measure(availableSpace);
+                Type = DecorationType.Prepend,
-                
+                DecorationElement = Header,
-                return measurement.Type == SpacePlanType.FullRender 
+                ContentElement = new BinaryDecoration
-                    ? measurement 
+                {
-                    : SpacePlan.Wrap();
+                    Type = DecorationType.Append,
-            }
+                    ContentElement = Content,
-            
+                    DecorationElement = Footer
-            var beforeMeasurement = GetDecorationMeasurement(Before);
+                }
-            var afterMeasurement = GetDecorationMeasurement(After);
+            });
-            
-            var contentSpace = new Size(availableSpace.Width, availableSpace.Height - beforeMeasurement.Height - afterMeasurement.Height);
-            var contentMeasurement = Content.Measure(contentSpace);
-
-            yield return new DecorationItemRenderingCommand
-            {
-                Element = Before,
-                Measurement = beforeMeasurement,
-                Offset = Position.Zero
-            };
-            
-            yield return new DecorationItemRenderingCommand
-            {
-                Element = Content,
-                Measurement = contentMeasurement,
-                Offset = new Position(0, beforeMeasurement.Height)
-            };
-
-            yield return new DecorationItemRenderingCommand
-            {
-                Element = After,
-                Measurement = afterMeasurement,
-                Offset = new Position(0, beforeMeasurement.Height + contentMeasurement.Height)
-            };
         }
     }
 }

QuestPDF/Elements/DefaultTextStyle.cs

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

QuestPDF/Elements/Grid.cs

@@ -27,12 +27,12 @@ namespace QuestPDF.Elements
         {
             ChildrenQueue = new Queue<GridElement>(Children);
             
-            container.Column(column =>
+            container.Stack(stack =>
             {
-                column.Spacing(VerticalSpacing);
+                stack.Spacing(VerticalSpacing);
                 
                 while (ChildrenQueue.Any())
-                    column.Item().Row(BuildRow);
+                    stack.Item().Row(BuildRow);
             });
         }
         
@@ -65,12 +65,12 @@ namespace QuestPDF.Elements
                 emptySpace /= 2;
             
             if (hasEmptySpace && Alignment != HorizontalAlignment.Left)
-                row.RelativeItem(emptySpace);
+                row.RelativeColumn(emptySpace);
                 
-            elements.ForEach(x => row.RelativeItem(x.Columns).Element(x.Child));
+            elements.ForEach(x => row.RelativeColumn(x.Columns).Element(x.Child));
 
             if (hasEmptySpace && Alignment != HorizontalAlignment.Right)
-                row.RelativeItem(emptySpace);
+                row.RelativeColumn(emptySpace);
         }
     }
 }

QuestPDF/Elements/Inlined.cs

@@ -8,7 +8,15 @@ namespace QuestPDF.Elements
 {
     internal class InlinedElement : Container
     {
+        public SpacePlan? MeasureCache { get; set; }
 
+        internal override SpacePlan Measure(Size availableSpace)
+        {
+            // TODO: once element caching proxy is introduces, this can be removed
+            
+            MeasureCache ??= Child.Measure(Size.Max);
+            return MeasureCache.Value;
+        }
     }
 
     internal enum InlinedAlignment
@@ -36,9 +44,10 @@ namespace QuestPDF.Elements
             ChildrenQueue = new Queue<InlinedElement>(Elements);
         }
         
-        internal override IEnumerable<Element?> GetChildren()
+        internal override void HandleVisitor(Action<Element?> visit)
         {
-            return Elements;
+            Elements.ForEach(x => x.HandleVisitor(visit));
+            base.HandleVisitor(visit);
         }
 
         internal override SpacePlan Measure(Size availableSpace)
@@ -104,12 +113,9 @@ namespace QuestPDF.Elements
                 
                 foreach (var element in elements)
                 {
-                    var size = (Size)element.Measure(Size.Max);
+                    var size = element.Measure(Size.Max);
                     var baselineOffset = BaselineOffset(size, lineSize.Height);
                     
-                    if (size.Height == 0)
-                        size = new Size(size.Width, lineSize.Height);
-                    
                     Canvas.Translate(new Position(0, baselineOffset));
                     element.Draw(size);
                     Canvas.Translate(new Position(0, -baselineOffset));
@@ -127,39 +133,48 @@ namespace QuestPDF.Elements
                     if (elements.Count == 1)
                         return 0;
 
-                    return ElementsAlignment switch
+                    if (ElementsAlignment == InlinedAlignment.Justify)
-                    {
+                        return difference / (elements.Count - 1);
-                        InlinedAlignment.Justify => difference / (elements.Count - 1),
+                    
-                        InlinedAlignment.SpaceAround => difference / (elements.Count + 1),
+                    if (ElementsAlignment == InlinedAlignment.SpaceAround)
-                        _ => HorizontalSpacing
+                        return difference / (elements.Count + 1);
-                    };
+                    
+                    return HorizontalSpacing;
                 }
 
                 float AlignOffset()
                 {
+                    if (ElementsAlignment == InlinedAlignment.Left)
+                        return 0;
+                    
+                    if (ElementsAlignment == InlinedAlignment.Justify)
+                        return 0;
+                    
+                    if (ElementsAlignment == InlinedAlignment.SpaceAround)
+                        return elementOffset;
+
                     var difference = availableSpace.Width - lineSize.Width - (elements.Count - 1) * HorizontalSpacing;
                     
-                    return ElementsAlignment switch
+                    if (ElementsAlignment == InlinedAlignment.Center)
-                    {
+                        return difference / 2;
-                        InlinedAlignment.Left => 0,
+
-                        InlinedAlignment.Justify => 0,
+                    if (ElementsAlignment == InlinedAlignment.Right)
-                        InlinedAlignment.SpaceAround => elementOffset,
+                        return difference;
-                        InlinedAlignment.Center => difference / 2,
+
-                        InlinedAlignment.Right => difference,
+                    return 0;
-                        _ => 0
-                    };
                 }
                 
                 float BaselineOffset(Size elementSize, float lineHeight)
                 {
+                    if (BaselineAlignment == VerticalAlignment.Top)
+                        return 0;
+
                     var difference = lineHeight - elementSize.Height;
                     
-                    return BaselineAlignment switch
+                    if (BaselineAlignment == VerticalAlignment.Middle)
-                    {
+                        return difference / 2;
-                        VerticalAlignment.Top => 0,
+
-                        VerticalAlignment.Middle => difference / 2,
+                    return difference;
-                        _ => difference
-                    };
                 }
             }
         }
@@ -237,11 +252,10 @@ namespace QuestPDF.Elements
             {
                 // this method makes sure that the spacing between elements is no lesser than configured
                 
-                return ElementsAlignment switch
+                if (ElementsAlignment == InlinedAlignment.SpaceAround)
-                {
+                    return HorizontalSpacing * 2;
-                    InlinedAlignment.SpaceAround => HorizontalSpacing * 2,
+
-                    _ => 0
+                return 0;
-                };
             }
         }
     }

QuestPDF/Elements/Layers.cs

@@ -15,9 +15,10 @@ namespace QuestPDF.Elements
     {
         public List<Layer> Children { get; set; } = new List<Layer>();
         
-        internal override IEnumerable<Element?> GetChildren()
+        internal override void HandleVisitor(Action<Element?> visit)
         {
-            return Children;
+            Children.ForEach(x => x.HandleVisitor(visit));
+            base.HandleVisitor(visit);
         }
 
         internal override SpacePlan Measure(Size availableSpace)

QuestPDF/Elements/Line.cs

@@ -1,46 +0,0 @@
-using QuestPDF.Drawing;
-using QuestPDF.Helpers;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Elements
-{
-    public interface ILine
-    {
-        
-    }
-    
-    internal enum LineType
-    {
-        Vertical,
-        Horizontal
-    }
-    
-    internal class Line : Element, ILine, ICacheable
-    {
-        public LineType Type { get; set; } = LineType.Vertical;
-        public string Color { get; set; } = Colors.Black;
-        public float Size { get; set; } = 1;
-        
-        internal override SpacePlan Measure(Size availableSpace)
-        {
-            return Type switch
-            {
-                LineType.Vertical when availableSpace.Width >= Size => SpacePlan.FullRender(Size, 0),
-                LineType.Horizontal when availableSpace.Height >= Size => SpacePlan.FullRender(0, Size),
-                _ => SpacePlan.Wrap()
-            };
-        }
-
-        internal override void Draw(Size availableSpace)
-        {
-            if (Type == LineType.Vertical)
-            {
-                Canvas.DrawRectangle(new Position(-Size/2, 0), new Size(Size, availableSpace.Height), Color);
-            }
-            else if (Type == LineType.Horizontal)
-            {
-                Canvas.DrawRectangle(new Position(0, -Size/2), new Size(availableSpace.Width, Size), Color);
-            }
-        }
-    }
-}

QuestPDF/Elements/Page.cs

@@ -40,12 +40,10 @@ namespace QuestPDF.Elements
                 .PaddingTop(MarginTop)
                 .PaddingBottom(MarginBottom)
                 
-                .DefaultTextStyle(DefaultTextStyle)
-                
                 .Decoration(decoration =>
                 {
                     decoration
-                        .Before()
+                        .Header()
                         .DebugPointer("Page header")
                         .Element(Header);
                     
@@ -57,11 +55,13 @@ namespace QuestPDF.Elements
                         .Element(Content);
                     
                     decoration
-                        .After()
+                        .Footer()
                         .DebugPointer("Page footer")
                         .Element(Footer);
                 });
 
+            (container as Element).ApplyDefaultTextStyle(DefaultTextStyle);
+            
             bool IsClose(float x, float y)
             {
                 return Math.Abs(x - y) < Size.Epsilon;

QuestPDF/Elements/Row.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using QuestPDF.Drawing;
@@ -7,152 +6,176 @@ using QuestPDF.Infrastructure;
 
 namespace QuestPDF.Elements
 {
-    internal enum RowItemType
+    internal abstract class RowElement : Constrained
     {
-        Auto,
+        public float Size { get; protected set;  }
-        Constant,
-        Relative
-    }
         
-    internal class RowItem : Container
+        public void SetWidth(float width)
-    {
-        public bool IsRendered { get; set; }
-        public float Width { get; set; }
-        
-        public RowItemType Type { get; set; }
-        public float Size { get; set; }
-    }
-
-    internal class RowItemRenderingCommand
-    {
-        public RowItem RowItem { get; set; }
-        public SpacePlan Measurement { get; set; }
-        public Size Size { get; set; }
-        public Position Offset { get; set; }
-    }
-    
-    internal class Row : Element, ICacheable, IStateResettable
-    {
-        internal List<RowItem> Items { get; } = new();
-        internal float Spacing { get; set; }
-
-        public void ResetState()
         {
-            Items.ForEach(x => x.IsRendered = false);
+            MinWidth = width;
+            MaxWidth = width;
         }
+    }
     
-        internal override IEnumerable<Element?> GetChildren()
+    internal class ConstantRowElement : RowElement
+    {
+        public ConstantRowElement(float size)
         {
-            return Items;
+            Size = size;
+            SetWidth(size);
+        }
+    }
+    
+    internal class RelativeRowElement : RowElement
+    {
+        public RelativeRowElement(float size)
+        {
+            Size = size;
+        }
+    }
+    
+    internal class BinaryRow : Element, ICacheable
+    {
+        internal Element Left { get; set; }
+        internal Element Right { get; set; }
+
+        internal override void HandleVisitor(Action<Element?> visit)
+        {
+            Left.HandleVisitor(visit);
+            Right.HandleVisitor(visit);
+            
+            base.HandleVisitor(visit);
         }
 
         internal override void CreateProxy(Func<Element?, Element?> create)
         {
-            Items.ForEach(x => x.Child = create(x.Child));
+            Left = create(Left);
+            Right = create(Right);
         }
         
         internal override SpacePlan Measure(Size availableSpace)
         {
-            UpdateItemsWidth(availableSpace.Width);
+            var leftMeasurement = Left.Measure(new Size(availableSpace.Width, availableSpace.Height));
-            var renderingCommands = PlanLayout(availableSpace);
             
-            if (renderingCommands.Any(x => !x.RowItem.IsRendered && x.Measurement.Type == SpacePlanType.Wrap))
+            if (leftMeasurement.Type == SpacePlanType.Wrap)
                 return SpacePlan.Wrap();
             
-            var width = renderingCommands.Last().Offset.X + renderingCommands.Last().Size.Width;
+            var rightMeasurement = Right.Measure(new Size(availableSpace.Width - leftMeasurement.Width, availableSpace.Height));
-            var height = renderingCommands.Max(x => x.Size.Height);
-            var size = new Size(width, height);
 
-            if (width > availableSpace.Width + Size.Epsilon || height > availableSpace.Height + Size.Epsilon)
+            if (rightMeasurement.Type == SpacePlanType.Wrap)
                 return SpacePlan.Wrap();
             
-            if (renderingCommands.Any(x => !x.RowItem.IsRendered && x.Measurement.Type == SpacePlanType.PartialRender))
+            var totalWidth = leftMeasurement.Width + rightMeasurement.Width;
-                return SpacePlan.PartialRender(size);
+            var totalHeight = Math.Max(leftMeasurement.Height, rightMeasurement.Height);
 
-            return SpacePlan.FullRender(size);
+            var targetSize = new Size(totalWidth, totalHeight);
+
+            if (leftMeasurement.Type == SpacePlanType.PartialRender || rightMeasurement.Type == SpacePlanType.PartialRender)
+                return SpacePlan.PartialRender(targetSize);
+            
+            return SpacePlan.FullRender(targetSize);
         }
 
         internal override void Draw(Size availableSpace)
         {
-            UpdateItemsWidth(availableSpace.Width);
+            var leftMeasurement = Left.Measure(new Size(availableSpace.Width, availableSpace.Height));
-            var renderingCommands = PlanLayout(availableSpace);
+            var leftWidth = leftMeasurement.Width;
             
-            foreach (var command in renderingCommands)
+            Left.Draw(new Size(leftWidth, availableSpace.Height));
-            {
-                if (command.Measurement.Type == SpacePlanType.FullRender)
-                    command.RowItem.IsRendered = true;
             
-                if (command.Measurement.Type == SpacePlanType.Wrap)
+            Canvas.Translate(new Position(leftWidth, 0));
-                    continue;
+            Right.Draw(new Size(availableSpace.Width - leftWidth, availableSpace.Height));
-
+            Canvas.Translate(new Position(-leftWidth, 0));
-                Canvas.Translate(command.Offset);
-                command.RowItem.Draw(command.Size);
-                Canvas.Translate(command.Offset.Reverse());
-            }
-            
-            if (Items.All(x => x.IsRendered))
-                ResetState();
-        }
-
-        private void UpdateItemsWidth(float availableWidth)
-        {
-            HandleItemsWithAutoWidth();
-            
-            var constantWidth = Items.Where(x => x.Type == RowItemType.Constant).Sum(x => x.Size);
-            var relativeWidth = Items.Where(x => x.Type == RowItemType.Relative).Sum(x => x.Size);
-            var spacingWidth = (Items.Count - 1) * Spacing;
-
-            foreach (var item in Items.Where(x => x.Type == RowItemType.Constant))
-                item.Width = item.Size;
-            
-            if (relativeWidth <= 0)
-                return;
-
-            var widthPerRelativeUnit = (availableWidth - constantWidth - spacingWidth) / relativeWidth;
-            
-            foreach (var item in Items.Where(x => x.Type == RowItemType.Relative))
-                item.Width = item.Size * widthPerRelativeUnit;
-        }
-
-        private void HandleItemsWithAutoWidth()
-        {
-            foreach (var rowItem in Items.Where(x => x.Type == RowItemType.Auto))
-            {
-                rowItem.Size = rowItem.Measure(Size.Max).Width;
-                rowItem.Type = RowItemType.Constant;
-            }
-        }
-
-        private ICollection<RowItemRenderingCommand> PlanLayout(Size availableSpace)
-        {
-            var leftOffset = 0f;
-            var renderingCommands = new List<RowItemRenderingCommand>();
-
-            foreach (var item in Items)
-            {
-                var itemSpace = new Size(item.Width, availableSpace.Height);
-                
-                var command = new RowItemRenderingCommand
-                {
-                    RowItem = item,
-                    Size = itemSpace,
-                    Measurement = item.Measure(itemSpace),
-                    Offset = new Position(leftOffset, 0)
-                };
-                
-                renderingCommands.Add(command);
-                leftOffset += item.Width + Spacing;
-            }
-
-            var rowHeight = renderingCommands.Where(x => !x.RowItem.IsRendered).Max(x => x.Measurement.Height);
-            
-            foreach (var command in renderingCommands)
-            {
-                command.Size = new Size(command.Size.Width, rowHeight);
-                command.Measurement = command.RowItem.Measure(command.Size);
-            }
-            
-            return renderingCommands;
         }
     }
+    
+    internal class Row : Element
+    {
+        public float Spacing { get; set; } = 0;
+        
+        public ICollection<RowElement> Children { get; internal set; } = new List<RowElement>();
+        private Element? RootElement { get; set; }
+        
+        internal override void HandleVisitor(Action<Element?> visit)
+        {
+            if (RootElement == null)
+                ComposeTree();
+            
+            RootElement.HandleVisitor(visit);
+            base.HandleVisitor(visit);
+        }
+
+        internal override SpacePlan Measure(Size availableSpace)
+        {
+            UpdateElementsWidth(availableSpace.Width);
+            return RootElement.Measure(availableSpace);
+        }
+
+        internal override void Draw(Size availableSpace)
+        {
+            UpdateElementsWidth(availableSpace.Width);
+            RootElement.Draw(availableSpace);
+        }
+        
+        #region structure
+        
+        private void ComposeTree()
+        {
+            Children = AddSpacing(Children, Spacing);
+            
+            var elements = Children.Cast<Element>().ToArray();
+            RootElement = BuildTree(elements);
+        }
+
+        private void UpdateElementsWidth(float availableWidth)
+        {
+            var constantWidth = Children
+                .Where(x => x is ConstantRowElement)
+                .Cast<ConstantRowElement>()
+                .Sum(x => x.Size);
+        
+            var relativeWidth = Children
+                .Where(x => x is RelativeRowElement)
+                .Cast<RelativeRowElement>()
+                .Sum(x => x.Size);
+
+            var widthPerRelativeUnit = (availableWidth - constantWidth) / relativeWidth;
+            
+            Children
+                .Where(x => x is RelativeRowElement)
+                .Cast<RelativeRowElement>()
+                .ToList()
+                .ForEach(x => x.SetWidth(x.Size * widthPerRelativeUnit));
+        }
+        
+        private static ICollection<RowElement> AddSpacing(ICollection<RowElement> elements, float spacing)
+        {
+            if (spacing < Size.Epsilon)
+                return elements;
+            
+            return elements
+                .SelectMany(x => new[] { new ConstantRowElement(spacing), x })
+                .Skip(1)
+                .ToList();
+        }
+
+        private static Element BuildTree(Span<Element> elements)
+        {
+            if (elements.IsEmpty)
+                return Empty.Instance;
+
+            if (elements.Length == 1)
+                return elements[0];
+
+            var half = elements.Length / 2;
+            
+            return new BinaryRow
+            {
+                Left = BuildTree(elements.Slice(0, half)),
+                Right = BuildTree(elements.Slice(half))
+            };
+        }
+        
+        #endregion
+    }
 }

QuestPDF/Elements/ScaleToFit.cs

@@ -1,78 +0,0 @@
-using System;
-using System.Linq;
-using QuestPDF.Drawing;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Elements
-{
-    internal class ScaleToFit : ContainerElement
-    {
-        internal override SpacePlan Measure(Size availableSpace)
-        {
-            if (Child == null)
-                return SpacePlan.FullRender(Size.Zero);
-
-            var perfectScale = FindPerfectScale(Child, availableSpace);
-
-            if (perfectScale == null)
-                return SpacePlan.Wrap();
-
-            var targetSpace = ScaleSize(availableSpace, perfectScale.Value);
-            return SpacePlan.FullRender(targetSpace);
-        }
-        
-        internal override void Draw(Size availableSpace)
-        {
-            var perfectScale = FindPerfectScale(Child, availableSpace);
-            
-            if (!perfectScale.HasValue)
-                return;
-
-            var targetScale = perfectScale.Value;
-            var targetSpace = ScaleSize(availableSpace, 1 / targetScale);
-            
-            Canvas.Scale(targetScale, targetScale);
-            Child?.Draw(targetSpace);
-            Canvas.Scale(1 / targetScale, 1 / targetScale);
-        }
-
-        private static Size ScaleSize(Size size, float factor)
-        {
-            return new Size(size.Width * factor, size.Height * factor);
-        }
-        
-        private static float? FindPerfectScale(Element child, Size availableSpace)
-        {
-            if (ChildFits(1))
-                return 1;
-            
-            var maxScale = 1f;
-            var minScale = Size.Epsilon;
-
-            var lastWorkingScale = (float?)null;
-            
-            foreach (var _ in Enumerable.Range(0, 8))
-            {
-                var halfScale = (maxScale + minScale) / 2;
-
-                if (ChildFits(halfScale))
-                {
-                    minScale = halfScale;
-                    lastWorkingScale = halfScale;
-                }
-                else
-                {
-                    maxScale = halfScale;
-                }
-            }
-            
-            return lastWorkingScale;
-            
-            bool ChildFits(float scale)
-            {
-                var scaledSpace = ScaleSize(availableSpace, 1 / scale);
-                return child.Measure(scaledSpace).Type == SpacePlanType.FullRender;
-            }
-        }
-    }
-}

QuestPDF/Elements/Stack.cs

@@ -0,0 +1,145 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using QuestPDF.Drawing;
+using QuestPDF.Fluent;
+using QuestPDF.Infrastructure;
+using IComponent = QuestPDF.Infrastructure.IComponent;
+using IContainer = QuestPDF.Infrastructure.IContainer;
+
+namespace QuestPDF.Elements
+{
+    internal class BinaryStack : Element, IStateResettable, ICacheable
+    {
+        internal Element First { get; set; } = Empty.Instance;
+        internal Element Second { get; set; } = Empty.Instance;
+
+        internal bool IsFirstRendered { get; set; } = false;
+
+        internal override void HandleVisitor(Action<Element?> visit)
+        {
+            First?.HandleVisitor(visit);
+            Second?.HandleVisitor(visit);
+            
+            base.HandleVisitor(visit);
+        }
+        
+        public void ResetState()
+        {
+            IsFirstRendered = false;
+        }
+
+        internal override void CreateProxy(Func<Element?, Element?> create)
+        {
+            First = create(First);
+            Second = create(Second);
+        }
+        
+        internal override SpacePlan Measure(Size availableSpace)
+        {
+            var firstElement = IsFirstRendered ? Empty.Instance : First;
+            var firstSize = firstElement.Measure(availableSpace);
+
+            if (firstSize.Type == SpacePlanType.Wrap)
+                return SpacePlan.Wrap();
+            
+            if (firstSize.Type == SpacePlanType.PartialRender)
+                return firstSize;
+                
+            var spaceForSecond = new Size(availableSpace.Width, availableSpace.Height - firstSize.Height);
+            var secondSize = Second.Measure(spaceForSecond);
+
+            if (secondSize.Type == SpacePlanType.Wrap)
+                return SpacePlan.PartialRender(firstSize);
+
+            var totalWidth = Math.Max(firstSize.Width, secondSize.Width);
+            var totalHeight = firstSize.Height + secondSize.Height;
+            var targetSize = new Size(totalWidth, totalHeight);
+
+            if (secondSize.Type == SpacePlanType.PartialRender)
+                return SpacePlan.PartialRender(targetSize);
+                
+            return SpacePlan.FullRender(targetSize);
+        }
+
+        internal override void Draw(Size availableSpace)
+        {
+            var firstElement = IsFirstRendered ? Empty.Instance : First;
+
+            var firstMeasurement = firstElement.Measure(availableSpace);
+
+            if (firstMeasurement.Type == SpacePlanType.FullRender)
+                IsFirstRendered = true;
+
+            var firstSize = firstMeasurement;
+
+            if (firstSize.Type != SpacePlanType.Wrap)
+                firstElement.Draw(new Size(availableSpace.Width, firstSize.Height));
+
+            if (firstMeasurement.Type == SpacePlanType.Wrap || firstMeasurement.Type == SpacePlanType.PartialRender)
+                return;
+
+            var firstHeight = firstSize.Height;
+            var spaceForSecond = new Size(availableSpace.Width, availableSpace.Height - firstHeight);
+            var secondMeasurement = Second.Measure(spaceForSecond);
+
+            if (secondMeasurement.Type == SpacePlanType.Wrap)
+                return;
+
+            Canvas.Translate(new Position(0, firstHeight));
+            Second.Draw(new Size(availableSpace.Width, secondMeasurement.Height));
+            Canvas.Translate(new Position(0, -firstHeight));
+            
+            if (secondMeasurement.Type == SpacePlanType.FullRender)
+                IsFirstRendered = false;
+        }
+    }
+    
+    internal class Stack : IComponent
+    {
+        public ICollection<Element> Children { get; } = new List<Element>();
+        public float Spacing { get; set; } = 0;
+        
+        public void Compose(IContainer container)
+        {
+            var elements = AddSpacing(Spacing, Children);
+
+            container
+                .PaddingBottom(-Spacing)    
+                .Element(BuildTree(elements.ToArray()));
+        }
+        
+        static ICollection<Element> AddSpacing(float spacing, ICollection<Element> elements)
+        {
+            if (spacing < Size.Epsilon)
+                return elements;
+                
+            return elements
+                .Where(x => !(x is Empty))
+                .Select(x => new Padding
+                {
+                    Bottom = spacing,
+                    Child = x
+                })
+                .Cast<Element>()
+                .ToList();
+        }
+
+        static Element BuildTree(Span<Element> elements)
+        {
+            if (elements.IsEmpty)
+                return Empty.Instance;
+
+            if (elements.Length == 1)
+                return elements[0];
+
+            var half = elements.Length / 2;
+                
+            return new BinaryStack
+            {
+                First = BuildTree(elements.Slice(0, half)),
+                Second = BuildTree(elements.Slice(half))
+            };
+        }
+    }
+}

QuestPDF/Elements/StopPaging.cs

@@ -1,25 +0,0 @@
-using System;
-using QuestPDF.Drawing;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Elements
-{
-    internal class StopPaging : ContainerElement
-    {
-        internal override SpacePlan Measure(Size availableSpace)
-        {
-            if (Child == null)
-                return SpacePlan.FullRender(Size.Zero);
-
-            var measurement = Child.Measure(availableSpace);
-
-            return measurement.Type switch
-            {
-                SpacePlanType.Wrap => SpacePlan.FullRender(Size.Zero),
-                SpacePlanType.PartialRender => SpacePlan.FullRender(measurement),
-                SpacePlanType.FullRender => measurement,
-                _ => throw new ArgumentOutOfRangeException()
-            };
-        }
-    }
-}

QuestPDF/Elements/Table/DynamicDictionary.cs

@@ -1,33 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-
-namespace QuestPDF.Elements.Table
-{
-    /// <summary>
-    /// This dictionary allows to access key that does not exist.
-    /// Instead of throwing an exception, it returns a default value.
-    /// </summary>
-    internal class DynamicDictionary<TKey, TValue>
-    {
-        private TValue Default { get; }
-        private IDictionary<TKey, TValue> Dictionary { get; } = new Dictionary<TKey, TValue>();
-
-        public DynamicDictionary()
-        {
-            
-        }
-        
-        public DynamicDictionary(TValue defaultValue)
-        {
-            Default = defaultValue;
-        }
-        
-        public TValue this[TKey key]
-        {
-            get => Dictionary.TryGetValue(key, out var value) ? value : Default;
-            set => Dictionary[key] = value;
-        }
-
-        public List<KeyValuePair<TKey, TValue>> Items => Dictionary.ToList();
-    }
-}

QuestPDF/Elements/Table/ITableCellContainer.cs

@@ -1,9 +0,0 @@
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Elements.Table
-{
-    public interface ITableCellContainer : IContainer
-    {
-            
-    }
-}

QuestPDF/Elements/Table/Table.cs

@@ -1,277 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using QuestPDF.Drawing;
-using QuestPDF.Fluent;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Elements.Table
-{
-    internal class Table : Element, IStateResettable
-    {
-        public List<TableColumnDefinition> Columns { get; set; } = new List<TableColumnDefinition>();
-        public List<TableCell> Cells { get; set; } = new List<TableCell>();
-        public bool ExtendLastCellsToTableBottom { get; set; }
-        
-        // cache for efficient cell finding
-        // index of first array - number of row
-        // nested array - collection of all cells starting at given row
-        private TableCell[][] OrderedCells { get; set; }
-        
-        private int StartingRowsCount { get; set; }
-        private int RowsCount { get; set; }
-        private int CurrentRow { get; set; }
-        
-        internal override IEnumerable<Element?> GetChildren()
-        {
-            return Cells;
-        }
-
-        public void ResetState()
-        {
-            if (StartingRowsCount == default)
-                StartingRowsCount = Cells.Select(x => x.Row).DefaultIfEmpty(0).Max();
-            
-            if (RowsCount == default)
-                RowsCount = Cells.Select(x => x.Row + x.RowSpan - 1).DefaultIfEmpty(0).Max();
-
-            if (OrderedCells == default)
-            {
-                var groups = Cells
-                    .GroupBy(x => x.Row)
-                    .ToDictionary(x => x.Key, x => x.OrderBy(y => y.Column).ToArray());
-            
-                OrderedCells = Enumerable
-                    .Range(0, RowsCount + 1)
-                    .Select(x => groups.TryGetValue(x, out var output) ? output : Array.Empty<TableCell>())
-                    .ToArray();   
-            }
-
-            Cells.ForEach(x => x.IsRendered = false);
-            CurrentRow = 1;
-        }
-        
-        internal override SpacePlan Measure(Size availableSpace)
-        {
-            if (!Cells.Any())
-                return SpacePlan.FullRender(Size.Zero);
-            
-            UpdateColumnsWidth(availableSpace.Width);
-            var renderingCommands = PlanLayout(availableSpace);
-
-            if (!renderingCommands.Any())
-                return SpacePlan.Wrap();
-            
-            var width = Columns.Sum(x => x.Width);
-            var height = renderingCommands.Max(x => x.Offset.Y + x.Size.Height);
-            var tableSize = new Size(width, height);
-
-            if (tableSize.Width > availableSpace.Width + Size.Epsilon)
-                return SpacePlan.Wrap();
-
-            return FindLastRenderedRow(renderingCommands) == StartingRowsCount 
-                ? SpacePlan.FullRender(tableSize) 
-                : SpacePlan.PartialRender(tableSize);
-        }
-
-        internal override void Draw(Size availableSpace)
-        {
-            UpdateColumnsWidth(availableSpace.Width);
-            var renderingCommands = PlanLayout(availableSpace);
-
-            foreach (var command in renderingCommands)
-            {
-                if (command.Measurement.Type == SpacePlanType.FullRender)
-                    command.Cell.IsRendered = true;
-                
-                Canvas.Translate(command.Offset);
-                command.Cell.Draw(command.Size);
-                Canvas.Translate(command.Offset.Reverse());
-            }
-
-            CurrentRow = FindLastRenderedRow(renderingCommands) + 1;
-            
-            var isFullRender = FindLastRenderedRow(renderingCommands) == StartingRowsCount;
-            
-            if (isFullRender)
-                ResetState();
-        }
-
-        private int FindLastRenderedRow(ICollection<TableCellRenderingCommand> commands)
-        {
-            return commands
-                .GroupBy(x => x.Cell.Row)
-                .Where(x => x.All(y => y.Measurement.Type == SpacePlanType.FullRender))
-                .Select(x => x.Key)
-                .DefaultIfEmpty(0)
-                .Max();
-        }
-        
-        private void UpdateColumnsWidth(float availableWidth)
-        {
-            var constantWidth = Columns.Sum(x => x.ConstantSize);
-            var relativeWidth = Columns.Sum(x => x.RelativeSize);
-
-            var widthPerRelativeUnit = (relativeWidth > 0) ? (availableWidth - constantWidth) / relativeWidth : 0;
-            
-            foreach (var column in Columns)
-            {
-                column.Width = column.ConstantSize + column.RelativeSize * widthPerRelativeUnit;
-            }
-        }
-        
-        private ICollection<TableCellRenderingCommand> PlanLayout(Size availableSpace)
-        {
-            var columnOffsets = GetColumnLeftOffsets(Columns);
-            
-            var commands = GetRenderingCommands();
-
-            if (!commands.Any())
-                return commands;
-            
-            var tableHeight = commands.Max(cell => cell.Offset.Y + cell.Size.Height);
-            
-            if (ExtendLastCellsToTableBottom)
-                AdjustLastCellSizes(tableHeight, commands);
-
-            return commands;
-
-            static float[] GetColumnLeftOffsets(IList<TableColumnDefinition> columns)
-            {
-                var cellOffsets = new float[columns.Count + 1];
-                cellOffsets[0] = 0;
-
-                foreach (var column in Enumerable.Range(1, cellOffsets.Length - 1))
-                    cellOffsets[column] = columns[column - 1].Width + cellOffsets[column - 1];
-
-                return cellOffsets;
-            }
-            
-            ICollection<TableCellRenderingCommand> GetRenderingCommands()
-            {
-                var rowBottomOffsets = new DynamicDictionary<int, float>();
-                
-                var cellsToTry = Enumerable
-                    .Range(CurrentRow, RowsCount - CurrentRow + 1)
-                    .SelectMany(x => OrderedCells[x]);
-            
-                var currentRow = CurrentRow;
-                var maxRenderingRow = RowsCount;
-                
-                var commands = new List<TableCellRenderingCommand>();
-                
-                foreach (var cell in cellsToTry)
-                {
-                    // update position of previous row
-                    if (cell.Row > currentRow)
-                    {
-                        rowBottomOffsets[currentRow] = Math.Max(rowBottomOffsets[currentRow], rowBottomOffsets[currentRow - 1]);
-                            
-                        if (rowBottomOffsets[currentRow - 1] > availableSpace.Height + Size.Epsilon)
-                            break;
-
-                        foreach (var row in Enumerable.Range(cell.Row, cell.Row - currentRow))
-                            rowBottomOffsets[row] = Math.Max(rowBottomOffsets[row - 1], rowBottomOffsets[row]);
-                        
-                        currentRow = cell.Row;
-                    }
-
-                    // cell visibility optimizations
-                    if (cell.Row > maxRenderingRow)
-                        break;
-                    
-                    if (cell.IsRendered)
-                        continue;
-                    
-                    // calculate cell position / size
-                    var topOffset = rowBottomOffsets[cell.Row - 1];
-                    
-                    var availableWidth = GetCellWidth(cell);
-                    var availableHeight = availableSpace.Height - topOffset;
-                    var availableCellSize = new Size(availableWidth, availableHeight);
-
-                    var cellSize = cell.Measure(availableCellSize);
-
-                    // corner case: if cell within the row is not fully rendered, do not attempt to render next row
-                    if (cellSize.Type == SpacePlanType.PartialRender)
-                    {
-                        maxRenderingRow = Math.Min(maxRenderingRow, cell.Row + cell.RowSpan - 1);
-                    }
-                    
-                    // corner case: if cell within the row want to wrap to the next page, do not attempt to render this row
-                    if (cellSize.Type == SpacePlanType.Wrap)
-                    {
-                        maxRenderingRow = Math.Min(maxRenderingRow, cell.Row - 1);
-                        continue;
-                    }
-                    
-                    // update position of the last row that cell occupies
-                    var bottomRow = cell.Row + cell.RowSpan - 1;
-                    rowBottomOffsets[bottomRow] = Math.Max(rowBottomOffsets[bottomRow], topOffset + cellSize.Height);
-
-                    // accept cell to be rendered
-                    commands.Add(new TableCellRenderingCommand()
-                    {
-                        Cell = cell,
-                        Measurement = cellSize,
-                        Size = new Size(availableWidth, cellSize.Height),
-                        Offset = new Position(columnOffsets[cell.Column - 1], topOffset)
-                    });
-                }
-
-                if (!commands.Any())
-                    return commands;
-
-                var maxRow = commands.Select(x => x.Cell).Max(x => x.Row + x.RowSpan);
-
-                foreach (var row in Enumerable.Range(CurrentRow, maxRow - CurrentRow))
-                    rowBottomOffsets[row] = Math.Max(rowBottomOffsets[row - 1], rowBottomOffsets[row]);   
-
-                AdjustCellSizes(commands, rowBottomOffsets);
-                
-                // corner case: reject cell if other cells within the same row are rejected
-                return commands.Where(x => x.Cell.Row <= maxRenderingRow).ToList();
-            }
-            
-            // corner sase: if two cells end up on the same row (a.Row + a.RowSpan = b.Row + b.RowSpan),
-            // bottom edges of their bounding boxes should be at the same level
-            static void AdjustCellSizes(ICollection<TableCellRenderingCommand> commands, DynamicDictionary<int, float> rowBottomOffsets)
-            {
-                foreach (var command in commands)
-                {
-                    var lastRow = command.Cell.Row + command.Cell.RowSpan - 1;
-                    var height = rowBottomOffsets[lastRow] - command.Offset.Y;
-                    
-                    command.Size = new Size(command.Size.Width, height);
-                    command.Offset = new Position(command.Offset.X, rowBottomOffsets[command.Cell.Row - 1]);
-                }
-            }
-            
-            // corner sase: all cells, that are last ones in their respective columns, should take all remaining space
-            static void AdjustLastCellSizes(float tableHeight, ICollection<TableCellRenderingCommand> commands)
-            {
-                var columnsCount = commands.Select(x => x.Cell).Max(x => x.Column + x.ColumnSpan - 1);
-                
-                foreach (var column in Enumerable.Range(1, columnsCount))
-                {
-                    var lastCellInColumn = commands
-                        .Where(x => x.Cell.Column <= column && column < x.Cell.Column + x.Cell.ColumnSpan)
-                        .OrderByDescending(x => x.Cell.Row + x.Cell.RowSpan)
-                        .FirstOrDefault();
-                
-                    if (lastCellInColumn == null)
-                        continue;
-                
-                    lastCellInColumn.Size = new Size(lastCellInColumn.Size.Width, tableHeight - lastCellInColumn.Offset.Y);
-                }
-            }
-
-            float GetCellWidth(TableCell cell)
-            {
-                return columnOffsets[cell.Column + cell.ColumnSpan - 1] - columnOffsets[cell.Column - 1];
-            }
-        }
-    }
-}

QuestPDF/Elements/Table/TableCell.cs

@@ -1,13 +0,0 @@
-namespace QuestPDF.Elements.Table
-{
-    internal class TableCell : Container, ITableCellContainer
-    {
-        public int Row { get; set; } = 0;
-        public int RowSpan { get; set; } = 1;
-
-        public int Column { get; set; } = 0;
-        public int ColumnSpan { get; set; } = 1;
-        
-        public bool IsRendered { get; set; }
-    }
-}

QuestPDF/Elements/Table/TableCellRenderingCommand.cs

@@ -1,13 +0,0 @@
-using QuestPDF.Drawing;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Elements.Table
-{
-    internal class TableCellRenderingCommand
-    {
-        public TableCell Cell { get; set; }
-        public SpacePlan Measurement { get; set; }
-        public Size Size { get; set; }
-        public Position Offset { get; set; }
-    }
-}

QuestPDF/Elements/Table/TableColumnDefinition.cs

@@ -1,16 +0,0 @@
-namespace QuestPDF.Elements.Table
-{
-    internal class TableColumnDefinition
-    {
-        public float ConstantSize { get; }
-        public float RelativeSize { get; }
-
-        internal float Width { get; set; }
-
-        public TableColumnDefinition(float constantSize, float relativeSize)
-        {
-            ConstantSize = constantSize;
-            RelativeSize = relativeSize;
-        }
-    }
-}

QuestPDF/Elements/Table/TableLayoutPlanner.cs

@@ -1,99 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using QuestPDF.Fluent;
-
-namespace QuestPDF.Elements.Table
-{
-    static class TableLayoutValidator
-    {
-        public static void PlanCellPositions(this Table table)
-        {
-            PlanCellPositions(table.Columns.Count, table.Cells);
-        }
-        
-        private static void PlanCellPositions(int columnsCount, ICollection<TableCell> cells)
-        {
-            var cellsWindow = new List<TableCell>();
-            (int x, int y) currentLocation = (1, 1);
-            
-            foreach (var cell in cells)
-            {
-                if (cellsWindow.Count > Math.Max(columnsCount, 16))
-                {
-                    cellsWindow = cellsWindow
-                        .Where(x => x.Row + x.RowSpan > currentLocation.y)
-                        .ToList();
-                }
-
-                SetPartialLocation(cell);
-                
-                if (cell.HasLocation())
-                {
-                    cellsWindow.Add(cell);
-                    currentLocation = (cell.Column, cell.Row);
-                    continue;
-                }
-
-                foreach (var location in GenerateCoordinates(columnsCount, currentLocation))
-                {
-                    if (location.x + cell.ColumnSpan - 1 > columnsCount)
-                        continue;
-                    
-                    cell.Column = location.x;
-                    cell.Row = location.y;
-                    
-                    if (cell.CollidesWithAnyOf(cellsWindow))
-                        continue;
-
-                    cellsWindow.Add(cell);
-                    currentLocation = (cell.Column, cell.Row);
-                    break;
-                }
-            }
-        }
-        
-        private static IEnumerable<(int x, int y)> GenerateCoordinates(int columnsCount, (int x, int y) startPosition)
-        {
-            if (startPosition.x > columnsCount)
-                throw new ArgumentException();
-            
-            foreach (var x in Enumerable.Range(startPosition.x, columnsCount - startPosition.x + 1))
-                yield return (x, startPosition.y);
-
-            foreach (var y in Enumerable.Range(startPosition.y + 1, 1_000_000))
-            foreach (var x in Enumerable.Range(1, columnsCount))
-                yield return (x, y);
-        }
-
-        private static bool CollidesWith(this TableCell cell, TableCell neighbour)
-        {
-            return cell.Column < neighbour.Column + neighbour.ColumnSpan &&
-                   cell.Column + cell.ColumnSpan > neighbour.Column &&
-                   cell.Row < neighbour.Row + neighbour.RowSpan &&
-                   cell.RowSpan + cell.Row > neighbour.Row;
-        }
-        
-        private static bool CollidesWithAnyOf(this TableCell cell, ICollection<TableCell> neighbours)
-        {
-            return neighbours.Any(cell.CollidesWith);
-        }
-
-        private static void SetPartialLocation(this TableCell cell)
-        {
-            if (cell.Row == default && cell.Column == default)
-                return;
-
-            if (cell.Row == default)
-                cell.Row = 1;
-            
-            if (cell.Column == default)
-                cell.Column = 1;
-        }
-        
-        private static bool HasLocation(this TableCell cell)
-        {
-            return cell.Row != 0 && cell.Column != 0;
-        }
-    }
-}

QuestPDF/Elements/Table/TableLayoutValidator.cs

@@ -1,41 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using QuestPDF.Drawing.Exceptions;
-using QuestPDF.Fluent;
-
-namespace QuestPDF.Elements.Table
-{
-    static class TableLayoutPlanner
-    {
-        public static void ValidateCellPositions(this Table table)
-        {
-            ValidateCellPositions(table.Columns.Count, table.Cells);
-        }
-        
-        private static void ValidateCellPositions(int columnsCount, ICollection<TableCell> cells)
-        {
-            const string prefix = "Detected issue in table cells configuration.";
-            
-            foreach (var cell in cells)
-            {
-                if (cell.Column < 1)
-                    throw new DocumentComposeException($"{prefix} A cell column position should be greater or equal to 1. Got {cell.Column}.");
-                
-                if (cell.Row < 1)
-                    throw new DocumentComposeException($"{prefix} A cell row position should be greater or equal to 1. Got {cell.Row}.");
-                
-                if (cell.Column > columnsCount)
-                    throw new DocumentComposeException($"{prefix} Cell starts at column that does not exist. Cell details: {GetCellDetails(cell)}.");
-                
-                if (cell.Column + cell.ColumnSpan - 1 > columnsCount)
-                    throw new DocumentComposeException($"{prefix} Table cell location is incorrect. Cell spans over columns that do not exist. Cell details: {GetCellDetails(cell)}.");
-            }
-
-            string GetCellDetails(TableCell cell)
-            {
-                return $"Row {cell.Row}, Column {cell.Column}, RowSpan {cell.RowSpan}, ColumnSpan {cell.ColumnSpan}";
-            }
-        }
-    }
-}

QuestPDF/Elements/Text/Items/TextBlockElement.cs

@@ -1,6 +1,5 @@
 using QuestPDF.Drawing;
 using QuestPDF.Elements.Text.Calculation;
-using QuestPDF.Helpers;
 using QuestPDF.Infrastructure;
 
 namespace QuestPDF.Elements.Text.Items
@@ -11,8 +10,8 @@ namespace QuestPDF.Elements.Text.Items
         
         public TextMeasurementResult? Measure(TextMeasurementRequest request)
         {
-            Element.VisitChildren(x => (x as IStateResettable)?.ResetState());
+            Element.HandleVisitor(x => (x as IStateResettable)?.ResetState());
-            Element.VisitChildren(x => x.Initialize(request.PageContext, request.Canvas));
+            Element.HandleVisitor(x => x.Initialize(request.PageContext, request.Canvas));
 
             var measurement = Element.Measure(new Size(request.AvailableWidth, Size.Max.Height));
 
@@ -36,8 +35,8 @@ namespace QuestPDF.Elements.Text.Items
 
         public void Draw(TextDrawingRequest request)
         {
-            Element.VisitChildren(x => (x as IStateResettable)?.ResetState());
+            Element.HandleVisitor(x => (x as IStateResettable)?.ResetState());
-            Element.VisitChildren(x => x.Initialize(request.PageContext, request.Canvas));
+            Element.HandleVisitor(x => x.Initialize(request.PageContext, request.Canvas));
             
             request.Canvas.Translate(new Position(0, request.TotalAscent));
             Element.Draw(new Size(request.TextSize.Width, -request.TotalAscent));

QuestPDF/Elements/Text/Items/TextBlockSpan.cs

@@ -111,7 +111,7 @@ namespace QuestPDF.Elements.Text.Items
 
             var text = Text.Substring(request.StartIndex, request.EndIndex - request.StartIndex);
             
-            request.Canvas.DrawRectangle(new Position(0, request.TotalAscent), new Size(request.TextSize.Width, request.TextSize.Height), Style.BackgroundColor);
+            request.Canvas.DrawFilledRectangle(new Position(0, request.TotalAscent), new Size(request.TextSize.Width, request.TextSize.Height), Style.BackgroundColor);
             request.Canvas.DrawText(text, Position.Zero, Style);
 
             // draw underline
@@ -124,7 +124,7 @@ namespace QuestPDF.Elements.Text.Items
 
             void DrawLine(float offset, float thickness)
             {
-                request.Canvas.DrawRectangle(new Position(0, offset - thickness / 2f), new Size(request.TextSize.Width, thickness), Style.Color);
+                request.Canvas.DrawFilledRectangle(new Position(0, offset - thickness / 2f), new Size(request.TextSize.Width, thickness), Style.Color);
             }
         }
     }

QuestPDF/Elements/Text/TextBlock.cs

@@ -11,16 +11,16 @@ namespace QuestPDF.Elements.Text
     internal class TextBlock : Element, IStateResettable
     {
         public HorizontalAlignment Alignment { get; set; } = HorizontalAlignment.Left;
-        public List<ITextBlockItem> Items { get; set; } = new List<ITextBlockItem>();
+        public List<ITextBlockItem> Children { get; set; } = new List<ITextBlockItem>();
 
-        public string Text => string.Join(" ", Items.Where(x => x is TextBlockSpan).Cast<TextBlockSpan>().Select(x => x.Text));
+        public string Text => string.Join(" ", Children.Where(x => x is TextBlockSpan).Cast<TextBlockSpan>().Select(x => x.Text));
         
         private Queue<ITextBlockItem> RenderingQueue { get; set; }
         private int CurrentElementIndex { get; set; }
 
         public void ResetState()
         {
-            RenderingQueue = new Queue<ITextBlockItem>(Items);
+            RenderingQueue = new Queue<ITextBlockItem>(Children);
             CurrentElementIndex = 0;
         }
 
@@ -32,7 +32,7 @@ namespace QuestPDF.Elements.Text
             var lines = DivideTextItemsIntoLines(availableSpace.Width, availableSpace.Height).ToList();
 
             if (!lines.Any())
-                return SpacePlan.Wrap();
+                return SpacePlan.PartialRender(Size.Zero);
             
             var width = lines.Max(x => x.Width);
             var height = lines.Sum(x => x.LineHeight);

QuestPDF/Fluent/BorderExtensions.cs

@@ -14,45 +14,39 @@ namespace QuestPDF.Fluent
             return element.Element(border);
         }
         
-        public static IContainer Border(this IContainer element, float value, Unit unit = Unit.Point)
+        public static IContainer Border(this IContainer element, float value)
         {
-            return element
+            return element.BorderHorizontal(value).BorderVertical(value);
-                .BorderHorizontal(value, unit)
-                .BorderVertical(value, unit);
         }
         
-        public static IContainer BorderVertical(this IContainer element, float value, Unit unit = Unit.Point)
+        public static IContainer BorderVertical(this IContainer element, float value)
         {
-            return element
+            return element.BorderLeft(value).BorderRight(value);
-                .BorderLeft(value, unit)
-                .BorderRight(value, unit);
         }
         
-        public static IContainer BorderHorizontal(this IContainer element, float value, Unit unit = Unit.Point)
+        public static IContainer BorderHorizontal(this IContainer element, float value)
         {
-            return element
+            return element.BorderTop(value).BorderBottom(value);
-                .BorderTop(value, unit)
-                .BorderBottom(value, unit);
         }
         
-        public static IContainer BorderLeft(this IContainer element, float value, Unit unit = Unit.Point)
+        public static IContainer BorderLeft(this IContainer element, float value)
         {
-            return element.Border(x => x.Left = value.ToPoints(unit));
+            return element.Border(x => x.Left = value);
         }
         
-        public static IContainer BorderRight(this IContainer element, float value, Unit unit = Unit.Point)
+        public static IContainer BorderRight(this IContainer element, float value)
         {
-            return element.Border(x => x.Right = value.ToPoints(unit));
+            return element.Border(x => x.Right = value);
         }
         
-        public static IContainer BorderTop(this IContainer element, float value, Unit unit = Unit.Point)
+        public static IContainer BorderTop(this IContainer element, float value)
         {
-            return element.Border(x => x.Top = value.ToPoints(unit));
+            return element.Border(x => x.Top = value);
         }
         
-        public static IContainer BorderBottom(this IContainer element, float value, Unit unit = Unit.Point)
+        public static IContainer BorderBottom(this IContainer element, float value)
         {
-            return element.Border(x => x.Bottom = value.ToPoints(unit));
+            return element.Border(x => x.Bottom = value);
         }
         
         public static IContainer BorderColor(this IContainer element, string color)

QuestPDF/Fluent/ColumnExtensions.cs

@@ -1,44 +0,0 @@
-using System;
-using QuestPDF.Elements;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Fluent
-{
-    public class ColumnDescriptor
-    {
-        internal Column Column { get; } = new();
-
-        public void Spacing(float value, Unit unit = Unit.Point)
-        {
-            Column.Spacing = value.ToPoints(unit);
-        }
-        
-        public IContainer Item()
-        {
-            var container = new Container();
-            
-            Column.Items.Add(new ColumnItem
-            {
-                Child = container
-            });
-            
-            return container;
-        }
-    }
-    
-    public static class ColumnExtensions
-    {
-        [Obsolete("This element has been renamed since version 2022.2. Please use the 'Column' method.")]
-        public static void Stack(this IContainer element, Action<ColumnDescriptor> handler)
-        {
-            element.Column(handler);
-        }
-        
-        public static void Column(this IContainer element, Action<ColumnDescriptor> handler)
-        {
-            var descriptor = new ColumnDescriptor();
-            handler(descriptor);
-            element.Element(descriptor.Column);
-        }
-    }
-}

QuestPDF/Fluent/ComponentExtentions.cs

@@ -1,53 +1,41 @@
 using System;
 using System.Linq.Expressions;
 using QuestPDF.Drawing.Exceptions;
-using QuestPDF.Elements;
 using QuestPDF.Helpers;
 using QuestPDF.Infrastructure;
 
 namespace QuestPDF.Fluent
 {
-    internal class ComponentDescriptor<TComponent> where TComponent : IComponent
+    class ComponentDescriptor<T> where T : IComponent
     {
-        public TComponent Component { get; }
+        public T Component { get; }
         
-        public ComponentDescriptor(TComponent component)
+        public ComponentDescriptor(T component)
         {
             Component = component;
         }
 
-        public IContainer Slot(Expression<Func<TComponent, ISlot>> selector)
+        public IContainer Slot(Expression<Func<T, ISlot>> selector)
         {
-            AssureThatTheSlotIsNotConfiguredYet(selector);
+            try
-                
-            var slot = new Slot();
-            Component.SetPropertyValue(selector, slot);
-            return slot;
-        }
-        
-        public void Slot<TArgument>(Expression<Func<TComponent, ISlot<TArgument>>> selector, Action<TArgument, IContainer> handler)
-        {
-            AssureThatTheSlotIsNotConfiguredYet(selector);
-            
-            var slot = new Slot<TArgument>
             {
-                GetContent = argument =>
+                var existingValue = Component.GetPropertyValue(selector);
-                {
-                    var container = new Container();
-                    handler(argument, container);
-                    return container;
-                }
-            };
 
-            Component.SetPropertyValue(selector, slot);
+                if (existingValue != null)
-        }
+                    throw new DocumentComposeException($"The slot {selector.GetPropertyName()} of the component {(typeof(T).Name)} was already used.");
 
-        private void AssureThatTheSlotIsNotConfiguredYet<TSlot>(Expression<Func<TComponent, TSlot>> selector) where TSlot : class
+                var slot = new Slot();
-        {
+                Component.SetPropertyValue(selector, slot);
-            var existingValue = Component.GetPropertyValue(selector);
+                return slot;
-
+            }
-            if (existingValue != null)
+            catch (DocumentComposeException)
-                throw new DocumentComposeException($"The slot {selector.GetPropertyName()} of the component {(typeof(TComponent).Name)} was already used.");
+            {
+                throw;
+            }
+            catch
+            {
+                throw new DocumentComposeException("Every slot in a component should be a public property with getter and setter.");
+            }
         }
     }
     
@@ -63,7 +51,7 @@ namespace QuestPDF.Fluent
             element.Component(new T(), null);
         }
 
-        internal static void Component<T>(this IContainer element, T component, Action<ComponentDescriptor<T>>? handler = null) where T : IComponent
+        static void Component<T>(this IContainer element, T component, Action<ComponentDescriptor<T>>? handler = null) where T : IComponent
         {
             var descriptor = new ComponentDescriptor<T>(component);
             handler?.Invoke(descriptor);
@@ -74,21 +62,15 @@ namespace QuestPDF.Fluent
             component.Compose(element.Container());
         }
         
-        internal static void Component<T>(this IContainer element, Action<ComponentDescriptor<T>>? handler = null) where T : IComponent, new()
+        static void Component<T>(this IContainer element, Action<ComponentDescriptor<T>>? handler = null) where T : IComponent, new()
         {
             element.Component(new T(), handler);
         }
 
-        internal static void Slot(this IContainer element, ISlot slot)
+        static void Slot(this IContainer element, ISlot slot)
         {
             var child = (slot as Slot)?.Child;
             element.Element(child);
         }
-        
-        internal static void Slot<TArgument>(this IContainer element, ISlot<TArgument> slot, TArgument argument)
-        {
-            var child = (slot as Slot<TArgument>)?.GetContent(argument) ?? Empty.Instance;
-            element.Element(child);
-        }
     }
 }

QuestPDF/Fluent/ConstrainedExtensions.cs

@@ -14,38 +14,34 @@ namespace QuestPDF.Fluent
             return element.Element(constrained);
         }
         
-        public static IContainer Width(this IContainer element, float value, Unit unit = Unit.Point)
+        public static IContainer Width(this IContainer element, float value)
         {
-            return element
+            return element.MinWidth(value).MaxWidth(value);
-                .MinWidth(value, unit)
-                .MaxWidth(value, unit);
         }
         
-        public static IContainer MinWidth(this IContainer element, float value, Unit unit = Unit.Point)
+        public static IContainer MinWidth(this IContainer element, float value)
         {
-            return element.Constrained(x => x.MinWidth = value.ToPoints(unit));
+            return element.Constrained(x => x.MinWidth = value);
         }
         
-        public static IContainer MaxWidth(this IContainer element, float value, Unit unit = Unit.Point)
+        public static IContainer MaxWidth(this IContainer element, float value)
         {
-            return element.Constrained(x => x.MaxWidth = value.ToPoints(unit));
+            return element.Constrained(x => x.MaxWidth = value);
         }
         
-        public static IContainer Height(this IContainer element, float value, Unit unit = Unit.Point)
+        public static IContainer Height(this IContainer element, float value)
         {
-            return element
+            return element.MinHeight(value).MaxHeight(value);
-                .MinHeight(value, unit)
-                .MaxHeight(value, unit);
         }
         
-        public static IContainer MinHeight(this IContainer element, float value, Unit unit = Unit.Point)
+        public static IContainer MinHeight(this IContainer element, float value)
         {
-            return element.Constrained(x => x.MinHeight = value.ToPoints(unit));
+            return element.Constrained(x => x.MinHeight = value);
         }
         
-        public static IContainer MaxHeight(this IContainer element, float value, Unit unit = Unit.Point)
+        public static IContainer MaxHeight(this IContainer element, float value)
         {
-            return element.Constrained(x => x.MaxHeight = value.ToPoints(unit));
+            return element.Constrained(x => x.MaxHeight = value);
         }
     }
 }

QuestPDF/Fluent/DecorationExtensions.cs

@@ -8,16 +8,16 @@ namespace QuestPDF.Fluent
     {
         internal Decoration Decoration { get; } = new Decoration();
         
-        public IContainer Before()
+        public IContainer Header()
         {
             var container = new Container();
-            Decoration.Before = container;
+            Decoration.Header = container;
             return container;
         }
         
-        public void Before(Action<IContainer> handler)
+        public void Header(Action<IContainer> handler)
         {
-            handler?.Invoke(Before());
+            handler?.Invoke(Header());
         }
         
         public IContainer Content()
@@ -32,49 +32,17 @@ namespace QuestPDF.Fluent
             handler?.Invoke(Content());
         }
         
-        public IContainer After()
-        {
-            var container = new Container();
-            Decoration.After = container;
-            return container;
-        }
-        
-        public void After(Action<IContainer> handler)
-        {
-            handler?.Invoke(After());
-        }
-
-        #region Obsolete
-
-        [Obsolete("This element has been renamed since version 2022.2. Please use the 'Before' method.")]
-        public IContainer Header()
-        {
-            var container = new Container();
-            Decoration.Before = container;
-            return container;
-        }
-        
-        [Obsolete("This element has been renamed since version 2022.2. Please use the 'Before' method.")]
-        public void Header(Action<IContainer> handler)
-        {
-            handler?.Invoke(Header());
-        }
-        
-        [Obsolete("This element has been renamed since version 2022.2. Please use the 'After' method.")]
         public IContainer Footer()
         {
             var container = new Container();
-            Decoration.After = container;
+            Decoration.Footer = container;
             return container;
         }
         
-        [Obsolete("This element has been renamed since version 2022.2. Please use the 'After' method.")]
         public void Footer(Action<IContainer> handler)
         {
             handler?.Invoke(Footer());
         }
-
-        #endregion
     }
     
     public static class DecorationExtensions
@@ -84,7 +52,7 @@ namespace QuestPDF.Fluent
             var descriptor = new DecorationDescriptor();
             handler(descriptor);
             
-            element.Element(descriptor.Decoration);
+            element.Component(descriptor.Decoration);
         }
     }
 }

QuestPDF/Fluent/ElementExtensions.cs

@@ -136,38 +136,14 @@ namespace QuestPDF.Fluent
             });
         }
         
-        [Obsolete("This element has been renamed since version 2022.1. Please use the MinimalBox method.")]
         public static IContainer Box(this IContainer element)
         {
-            return element.Element(new MinimalBox());
+            return element.Element(new Box());
-        }
-        
-        public static IContainer MinimalBox(this IContainer element)
-        {
-            return element.Element(new MinimalBox());
         }
         
         public static IContainer Unconstrained(this IContainer element)
         {
             return element.Element(new Unconstrained());
         }
-        
-        public static IContainer DefaultTextStyle(this IContainer element, TextStyle textStyle)
-        {
-            return element.Element(new DefaultTextStyle
-            {
-                TextStyle = textStyle
-            });
-        }
-
-        public static IContainer StopPaging(this IContainer element)
-        {
-            return element.Element(new StopPaging());
-        }
-        
-        public static IContainer ScaleToFit(this IContainer element)
-        {
-            return element.Element(new ScaleToFit());
-        }
     }
 }

QuestPDF/Fluent/GridExtensions.cs

@@ -8,20 +8,20 @@ namespace QuestPDF.Fluent
     {
         internal Grid Grid { get; } = new Grid();
         
-        public void Spacing(float value, Unit unit = Unit.Point)
+        public void Spacing(float value)
         {
-            VerticalSpacing(value, unit);
+            VerticalSpacing(value);
-            HorizontalSpacing(value, unit);
+            HorizontalSpacing(value);
         }
         
-        public void VerticalSpacing(float value, Unit unit = Unit.Point)
+        public void VerticalSpacing(float value)
         {
-            Grid.VerticalSpacing = value.ToPoints(unit);
+            Grid.VerticalSpacing = value;
         }
          
-        public void HorizontalSpacing(float value, Unit unit = Unit.Point)
+        public void HorizontalSpacing(float value)
         {
-            Grid.HorizontalSpacing = value.ToPoints(unit);
+            Grid.HorizontalSpacing = value;
         }
         
         public void Columns(int value = Grid.DefaultColumnsCount)

QuestPDF/Fluent/InlinedExtensions.cs

@@ -10,21 +10,14 @@ namespace QuestPDF.Fluent
     {
         internal Inlined Inlined { get; } = new Inlined();
         
-        public void Spacing(float value, Unit unit = Unit.Point)
+        public void Spacing(float value)
         {
-            VerticalSpacing(value, unit);
+            VerticalSpacing(value);
-            HorizontalSpacing(value, unit);
+            HorizontalSpacing(value);
         }
         
-        public void VerticalSpacing(float value, Unit unit = Unit.Point)
+        public void VerticalSpacing(float value) => Inlined.VerticalSpacing = value;
-        {
+        public void HorizontalSpacing(float value) => Inlined.HorizontalSpacing = value;
-            Inlined.VerticalSpacing = value.ToPoints(unit);
-        }
-
-        public void HorizontalSpacing(float value, Unit unit = Unit.Point)
-        {
-            Inlined.HorizontalSpacing = value.ToPoints(unit);
-        }
 
         public void BaselineTop() => Inlined.BaselineAlignment = VerticalAlignment.Top;
         public void BaselineMiddle() => Inlined.BaselineAlignment = VerticalAlignment.Middle;

QuestPDF/Fluent/LineExtensions.cs

@@ -1,36 +0,0 @@
-using System;
-using QuestPDF.Elements;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Fluent
-{
-    public static class LineExtensions
-    {
-        private static ILine Line(this IContainer element, LineType type, float size)
-        {
-            var line = new Line
-            {
-                Size = size,
-                Type = type
-            };
-
-            element.Element(line);
-            return line;
-        }
-        
-        public static ILine LineVertical(this IContainer element, float size, Unit unit = Unit.Point)
-        {
-            return element.Line(LineType.Vertical, size.ToPoints(unit));
-        }
-        
-        public static ILine LineHorizontal(this IContainer element, float size, Unit unit = Unit.Point)
-        {
-            return element.Line(LineType.Horizontal, size.ToPoints(unit));
-        }
-        
-        public static void LineColor(this ILine descriptor, string value)
-        {
-            (descriptor as Line).Color = value;
-        }
-    }
-}

QuestPDF/Fluent/PaddingExtensions.cs

@@ -14,45 +14,39 @@ namespace QuestPDF.Fluent
             return element.Element(padding);
         }
         
-        public static IContainer Padding(this IContainer element, float value, Unit unit = Unit.Point)
+        public static IContainer Padding(this IContainer element, float value)
         {
-            return element
+            return element.PaddingVertical(value).PaddingHorizontal(value);
-                .PaddingVertical(value, unit)
-                .PaddingHorizontal(value, unit);
         }
         
-        public static IContainer PaddingHorizontal(this IContainer element, float value, Unit unit = Unit.Point)
+        public static IContainer PaddingHorizontal(this IContainer element, float value)
         {
-            return element
+            return element.PaddingLeft(value).PaddingRight(value);
-                .PaddingLeft(value, unit)
-                .PaddingRight(value, unit);
         }
         
-        public static IContainer PaddingVertical(this IContainer element, float value, Unit unit = Unit.Point)
+        public static IContainer PaddingVertical(this IContainer element, float value)
         {
-            return element
+            return element.PaddingTop(value).PaddingBottom(value);
-                .PaddingTop(value, unit)
-                .PaddingBottom(value, unit);
         }
         
-        public static IContainer PaddingTop(this IContainer element, float value, Unit unit = Unit.Point)
+        public static IContainer PaddingTop(this IContainer element, float value)
         {
-            return element.Padding(x => x.Top += value.ToPoints(unit));
+            return element.Padding(x => x.Top = value);
         }
         
-        public static IContainer PaddingBottom(this IContainer element, float value, Unit unit = Unit.Point)
+        public static IContainer PaddingBottom(this IContainer element, float value)
         {
-            return element.Padding(x => x.Bottom += value.ToPoints(unit));
+            return element.Padding(x => x.Bottom = value);
         }
         
-        public static IContainer PaddingLeft(this IContainer element, float value, Unit unit = Unit.Point)
+        public static IContainer PaddingLeft(this IContainer element, float value)
         {
-            return element.Padding(x => x.Left += value.ToPoints(unit));
+            return element.Padding(x => x.Left = value);
         }
         
-        public static IContainer PaddingRight(this IContainer element, float value, Unit unit = Unit.Point)
+        public static IContainer PaddingRight(this IContainer element, float value)
         {
-            return element.Padding(x => x.Right += value.ToPoints(unit));
+            return element.Padding(x => x.Right = value);
         }
     }
 }

QuestPDF/Fluent/PageExtensions.cs

@@ -10,24 +10,16 @@ namespace QuestPDF.Fluent
     {
         internal Page Page { get; } = new Page();
 
-        public void Size(float width, float height, Unit unit = Unit.Inch)
-        {
-            var pageSize = new PageSize(width, height, unit);
-            
-            MinSize(pageSize);
-            MaxSize(pageSize);
-        }
-        
         public void Size(PageSize pageSize)
         {
             MinSize(pageSize);
             MaxSize(pageSize);
         }
         
-        public void ContinuousSize(float width, Unit unit = Unit.Point)
+        public void ContinuousSize(float width)
         {
-            MinSize(new PageSize(width.ToPoints(unit), 0));
+            MinSize(new PageSize(width, 0));
-            MaxSize(new PageSize(width.ToPoints(unit), Infrastructure.Size.Max.Height));
+            MaxSize(new PageSize(width, Infrastructure.Size.Max.Height));
         }
 
         public void MinSize(PageSize pageSize)
@@ -40,42 +32,42 @@ namespace QuestPDF.Fluent
             Page.MaxSize = pageSize;
         }
 
-        public void MarginLeft(float value, Unit unit = Unit.Point)
+        public void MarginLeft(float value)
         {
-            Page.MarginLeft = value.ToPoints(unit);
+            Page.MarginLeft = value;
         }
         
-        public void MarginRight(float value, Unit unit = Unit.Point)
+        public void MarginRight(float value)
         {
-            Page.MarginRight = value.ToPoints(unit);
+            Page.MarginRight = value;
         }
         
-        public void MarginTop(float value, Unit unit = Unit.Point)
+        public void MarginTop(float value)
         {
-            Page.MarginTop = value.ToPoints(unit);
+            Page.MarginTop = value;
         }
         
-        public void MarginBottom(float value, Unit unit = Unit.Point)
+        public void MarginBottom(float value)
         {
-            Page.MarginBottom = value.ToPoints(unit);
+            Page.MarginBottom = value;
         }
         
-        public void MarginVertical(float value, Unit unit = Unit.Point)
+        public void MarginVertical(float value)
         {
-            MarginTop(value, unit);
+            MarginTop(value);
-            MarginBottom(value, unit);
+            MarginBottom(value);
         }
         
-        public void MarginHorizontal(float value, Unit unit = Unit.Point)
+        public void MarginHorizontal(float value)
         {
-            MarginLeft(value, unit);
+            MarginLeft(value);
-            MarginRight(value, unit);
+            MarginRight(value);
         }
         
-        public void Margin(float value, Unit unit = Unit.Point)
+        public void Margin(float value)
         {
-            MarginVertical(value, unit);
+            MarginVertical(value);
-            MarginHorizontal(value, unit);
+            MarginHorizontal(value);
         }
         
         public void DefaultTextStyle(TextStyle textStyle)

QuestPDF/Fluent/RowExtensions.cs

@@ -6,50 +6,27 @@ namespace QuestPDF.Fluent
 {
     public class RowDescriptor
     {
-        internal Row Row { get; } = new();
+        internal Row Row { get; } = new Row();
 
         public void Spacing(float value)
         {
             Row.Spacing = value;
         }
         
-        private IContainer Item(RowItemType type, float size = 0)
+        public IContainer ConstantColumn(float width)
         {
-            var element = new RowItem
+            var element = new ConstantRowElement(width);
-            {
-                Type = type,
-                Size = size
-            };
             
-            Row.Items.Add(element);
+            Row.Children.Add(element);
             return element;
         }
         
-        [Obsolete("This element has been renamed since version 2022.2. Please use the RelativeItem method.")]
+        public IContainer RelativeColumn(float width = 1)
-        public IContainer RelativeColumn(float size = 1)
         {
-            return Item(RowItemType.Relative, size);
+            var element = new RelativeRowElement(width);
-        }
             
-        [Obsolete("This element has been renamed since version 2022.2. Please use the ConstantItem method.")]
+            Row.Children.Add(element);
-        public IContainer ConstantColumn(float size)
+            return element;
-        {
-            return Item(RowItemType.Constant, size);
-        }
-
-        public IContainer RelativeItem(float size = 1)
-        {
-            return Item(RowItemType.Relative, size);
-        }
-        
-        public IContainer ConstantItem(float size, Unit unit = Unit.Point)
-        {
-            return Item(RowItemType.Constant, size.ToPoints(unit));
-        }
-
-        public IContainer AutoItem()
-        {
-            return Item(RowItemType.Auto);
         }
     }
     

QuestPDF/Fluent/ScaleExtensions.cs

@@ -21,7 +21,7 @@ namespace QuestPDF.Fluent
         
         public static IContainer ScaleHorizontal(this IContainer element, float value)
         {
-            return element.Scale(x => x.ScaleX *= value);
+            return element.Scale(x => x.ScaleX = value);
         }
         
         public static IContainer FlipHorizontal(this IContainer element)
@@ -31,7 +31,7 @@ namespace QuestPDF.Fluent
         
         public static IContainer ScaleVertical(this IContainer element, float value)
         {
-            return element.Scale(x => x.ScaleY *= value);
+            return element.Scale(x => x.ScaleY = value);
         }
         
         public static IContainer FlipVertical(this IContainer element)

QuestPDF/Fluent/StackExtensions.cs

@@ -0,0 +1,33 @@
+using System;
+using QuestPDF.Elements;
+using QuestPDF.Infrastructure;
+
+namespace QuestPDF.Fluent
+{
+    public class StackDescriptor
+    {
+        internal Stack Stack { get; } = new Stack();
+
+        public void Spacing(float value)
+        {
+            Stack.Spacing = value;
+        }
+        
+        public IContainer Item()
+        {
+            var container = new Container();
+            Stack.Children.Add(container);
+            return container;
+        }
+    }
+    
+    public static class StackExtensions
+    {
+        public static void Stack(this IContainer element, Action<StackDescriptor> handler)
+        {
+            var descriptor = new StackDescriptor();
+            handler(descriptor);
+            element.Component(descriptor.Stack);
+        }
+    }
+}

QuestPDF/Fluent/TableExtensions.cs

@@ -1,162 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using QuestPDF.Drawing.Exceptions;
-using QuestPDF.Elements;
-using QuestPDF.Elements.Table;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Fluent
-{
-    public class TableColumnsDefinitionDescriptor
-    {
-        internal List<TableColumnDefinition> Columns { get; } = new();
-        
-        public void ConstantColumn(float width, Unit unit = Unit.Point)
-        {
-            ComplexColumn(constantWidth: width.ToPoints(unit));
-        }
-        
-        public void RelativeColumn(float width = 1)
-        {
-            ComplexColumn(relativeWidth: width);
-        }
-        
-        private void ComplexColumn(float constantWidth = 0, float relativeWidth = 0)
-        {
-            var columnDefinition = new TableColumnDefinition(constantWidth, relativeWidth);
-            Columns.Add(columnDefinition);
-        }
-    }
-
-    public class TableCellDescriptor
-    {
-        private ICollection<TableCell> Cells { get; }
-
-        internal TableCellDescriptor(ICollection<TableCell> cells)
-        {
-            Cells = cells;
-        }
-        
-        public ITableCellContainer Cell()
-        {
-            var cell = new TableCell();
-            Cells.Add(cell);
-            return cell;
-        }
-    }
-    
-    public class TableDescriptor
-    {
-        internal List<TableColumnDefinition> Columns { get; private set; }
-
-        private Table HeaderTable { get; } = new();
-        private Table ContentTable { get; } = new();
-        private Table FooterTable { get; } = new();
-
-        public void ColumnsDefinition(Action<TableColumnsDefinitionDescriptor> handler)
-        {
-            var descriptor = new TableColumnsDefinitionDescriptor();
-            handler(descriptor);
-
-            HeaderTable.Columns = descriptor.Columns;
-            ContentTable.Columns = descriptor.Columns;
-            FooterTable.Columns = descriptor.Columns;
-        }
-        
-        public void ExtendLastCellsToTableBottom()
-        {
-            ContentTable.ExtendLastCellsToTableBottom = true;
-        }
-        
-        public void Header(Action<TableCellDescriptor> handler)
-        {
-            var descriptor = new TableCellDescriptor(HeaderTable.Cells);
-            handler(descriptor);
-        }
-        
-        public void Footer(Action<TableCellDescriptor> handler)
-        {
-            var descriptor = new TableCellDescriptor(FooterTable.Cells);
-            handler(descriptor);
-        }
-        
-        public ITableCellContainer Cell()
-        {
-            var cell = new TableCell();
-            ContentTable.Cells.Add(cell);
-            return cell;
-        }
-
-        internal IElement CreateElement()
-        {
-            var container = new Container();
-
-            ConfigureTable(HeaderTable);
-            ConfigureTable(ContentTable);
-            ConfigureTable(FooterTable);
-            
-            container
-                .Decoration(decoration =>
-                {
-                    decoration.Before().Element(HeaderTable);
-                    decoration.Content().Element(ContentTable);
-                    decoration.After().Element(FooterTable);
-                });
-
-            return container;
-        }
-
-        private static void ConfigureTable(Table table)
-        {
-            if (!table.Columns.Any())
-                throw new DocumentComposeException($"Table should have at least one column. Please call the '{nameof(ColumnsDefinition)}' method to define columns.");
-            
-            table.PlanCellPositions();
-            table.ValidateCellPositions();
-        }
-    }
-    
-    public static class TableExtensions
-    {
-        public static void Table(this IContainer element, Action<TableDescriptor> handler)
-        {
-            var descriptor = new TableDescriptor();
-            handler(descriptor);
-            element.Element(descriptor.CreateElement());
-        }
-    }
-
-    public static class TableCellExtensions
-    {
-        private static ITableCellContainer TableCell(this ITableCellContainer element, Action<TableCell> handler)
-        {
-            if (element is TableCell tableCell)
-                handler(tableCell);
-            
-            return element;
-        }
-        
-        public static ITableCellContainer Column(this ITableCellContainer tableCellContainer, uint value)
-        {
-            return tableCellContainer.TableCell(x => x.Column = (int)value);
-        }
-        
-        public static ITableCellContainer ColumnSpan(this ITableCellContainer tableCellContainer, uint value)
-        {
-            return tableCellContainer.TableCell(x => x.ColumnSpan = (int)value);
-        }
-        
-        public static ITableCellContainer Row(this ITableCellContainer tableCellContainer, uint value)
-        {
-            return tableCellContainer.TableCell(x => x.Row = (int)value);
-        }
-        
-        public static ITableCellContainer RowSpan(this ITableCellContainer tableCellContainer, uint value)
-        {
-            return tableCellContainer.TableCell(x => x.RowSpan = (int)value);
-        }
-    }
-}

QuestPDF/Fluent/TextExtensions.cs

@@ -37,9 +37,9 @@ namespace QuestPDF.Fluent
             Alignment = HorizontalAlignment.Right;
         }
 
-        public void ParagraphSpacing(float value, Unit unit = Unit.Point)
+        public void ParagraphSpacing(float value)
         {
-            Spacing = value.ToPoints(unit);
+            Spacing = value;
         }
 
         private void AddItemToLastTextBlock(ITextBlockItem item)
@@ -47,7 +47,7 @@ namespace QuestPDF.Fluent
             if (!TextBlocks.Any())
                 TextBlocks.Add(new TextBlock());
             
-            TextBlocks.Last().Items.Add(item);
+            TextBlocks.Last().Children.Add(item);
         }
         
         public void Span(string? text, TextStyle? style = null)
@@ -73,7 +73,7 @@ namespace QuestPDF.Fluent
                 .Skip(1)
                 .Select(x => new TextBlock
                 {   
-                    Items = new List<ITextBlockItem> { x }
+                    Children = new List<ITextBlockItem> { x }
                 })
                 .ToList()
                 .ForEach(TextBlocks.Add);
@@ -167,19 +167,22 @@ namespace QuestPDF.Fluent
                 Element = container
             });
             
-            return container.AlignBottom().MinimalBox();
+            return container.AlignBottom().Box();
         }
         
         internal void Compose(IContainer container)
         {
             TextBlocks.ToList().ForEach(x => x.Alignment = Alignment);
             
-            container.DefaultTextStyle(DefaultStyle).Column(column =>
+            foreach (var textBlockSpan in TextBlocks.SelectMany(x => x.Children).Where(x => x is TextBlockSpan).Cast<TextBlockSpan>())
+                textBlockSpan.Style.ApplyParentStyle(DefaultStyle);
+
+            container.Stack(stack =>
             {
-                column.Spacing(Spacing);
+                stack.Spacing(Spacing);
 
                 foreach (var textBlock in TextBlocks)
-                    column.Item().Element(textBlock);
+                    stack.Item().Element(textBlock);
             });
         }
     }