Implemented experiment

QuestPDF.Examples/ImageExamples.cs

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

QuestPDF.Examples/RepeatContentExamples.cs

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

QuestPDF.Examples/RowExamples.cs

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

QuestPDF.Examples/TableBenchmark.cs

@@ -17,7 +17,7 @@ namespace QuestPDF.Examples
                 .PageSize(PageSizes.A4)
                 .ShowResults()
                 .MaxPages(10_000)
-                .EnableCaching(true)
+                //.EnableCaching(true)
                 .EnableDebugging(false)
                 .Render(container =>
                 {

QuestPDF.Examples/TextExamples.cs

@@ -657,37 +657,5 @@ namespace QuestPDF.Examples
                     });
                 });
         }
-        
-        [Test]
-        public void WordWrappingStability()
-        {
-            // instruction: check if any characters repeat when performing the word-wrapping algorithm
-            
-            RenderingTest
-                .Create()
-                .PageSize(PageSizes.A4)
-                .ProducePdf()
-                .ShowResults()
-                .Render(container =>
-                {
-                    var text = "Lorem ipsum dolor sit amet consectetuer";
-                    
-                    container
-                        .Padding(20)
-                        .Column(column =>
-                        {
-                            column.Spacing(10);
-
-                            foreach (var width in Enumerable.Range(25, 200))
-                            {
-                                column
-                                    .Item()
-                                    .MaxWidth(width)
-                                    .Background(Colors.Grey.Lighten3)
-                                    .Text(text);
-                            }
-                        });
-                });
-        }
     }
 }

QuestPDF.ReportSample/DataSource.cs

@@ -15,8 +15,8 @@ namespace QuestPDF.ReportSample
                 HeaderFields = HeaderFields(),
                 
                 LogoData = Helpers.GetImage("Logo.png"),
-                Sections = Enumerable.Range(0, 40).Select(x => GenerateSection()).ToList(),
-                Photos = Enumerable.Range(0, 25).Select(x => GetReportPhotos()).ToList()
+                Sections = Enumerable.Range(0, 2000).Select(x => GenerateSection()).ToList(),
+                Photos = Enumerable.Range(0, 200).Select(x => GetReportPhotos()).ToList()
             };
 
             List<ReportHeaderField> HeaderFields()

QuestPDF.ReportSample/Tests.cs

@@ -24,7 +24,10 @@ namespace QuestPDF.ReportSample
         [Test] 
         public void GenerateAndShowPdf()
         {
-            //ImagePlaceholder.Solid = true;
+            Settings.DocumentLayoutExceptionThreshold = 10_000;
+            Settings.EnableCaching = true;
+            Settings.EnableDebugging = false;
+            ImagePlaceholder.Solid = true;
         
             var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"test_result.pdf");
             Report.GeneratePdf(path);

QuestPDF.UnitTests/TestEngine/MockCanvas.cs

@@ -20,6 +20,7 @@ namespace QuestPDF.UnitTests.TestEngine
         public void DrawRectangle(Position vector, Size size, string color) => DrawRectFunc(vector, size, color);
         public void DrawText(SKTextBlob skTextBlob, Position position, TextStyle style) => throw new NotImplementedException();
         public void DrawImage(SKImage image, Position position, Size size) => DrawImageFunc(image, position, size);
+        public void DrawPicture(SKPicture picture) => throw new NotImplementedException();
 
         public void DrawHyperlink(string url, Size size) => throw new NotImplementedException();
         public void DrawSectionLink(string sectionName, Size size) => throw new NotImplementedException();

QuestPDF.UnitTests/TestEngine/OperationRecordingCanvas.cs

@@ -18,7 +18,8 @@ namespace QuestPDF.UnitTests.TestEngine
         public void DrawRectangle(Position vector, Size size, string color) => Operations.Add(new CanvasDrawRectangleOperation(vector, size, color));
         public void DrawText(SKTextBlob skTextBlob, Position position, TextStyle style) => throw new NotImplementedException();
         public void DrawImage(SKImage image, Position position, Size size) => Operations.Add(new CanvasDrawImageOperation(position, size));
-        
+        public void DrawPicture(SKPicture picture) => throw new NotImplementedException();
+
         public void DrawHyperlink(string url, Size size) => throw new NotImplementedException();
         public void DrawSectionLink(string sectionName, Size size) => throw new NotImplementedException();
         public void DrawSection(string sectionName) => throw new NotImplementedException();

QuestPDF/Drawing/DocumentGenerator.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using QuestPDF.Drawing.Exceptions;
@@ -65,16 +66,26 @@ namespace QuestPDF.Drawing
             document.Compose(container);
             var content = container.Compose();
             ApplyDefaultTextStyle(content, TextStyle.LibraryDefault);
-            ApplyContentRepeatState(content, false);
-
-            var debuggingState = Settings.EnableDebugging ? ApplyDebugging(content) : null;
             
-            if (Settings.EnableCaching)
-                ApplyCaching(content);
+            var debuggingState = Settings.EnableDebugging ? ApplyDebugging(content) : null;
+            debuggingState = null;
+            
+            //if (Settings.EnableCaching)
+                //ApplyCaching(content);
 
-            var pageContext = new PageContext(); 
+            var pageContext = new PageContext();
+
+            var stopwatch = new Stopwatch();
+            
+            stopwatch.Restart(); 
             RenderPass(pageContext, new FreeCanvas(), content, debuggingState);
+            stopwatch.Stop();
+            Console.WriteLine($"Cold free: {stopwatch.Elapsed}");
+
+            stopwatch.Restart();
             RenderPass(pageContext, canvas, content, debuggingState);
+            stopwatch.Stop();
+            Console.WriteLine($"Canvas: {stopwatch.Elapsed}");
         }
         
         internal static void RenderPass<TCanvas>(PageContext pageContext, TCanvas canvas, Container content, DebuggingState? debuggingState)
@@ -82,8 +93,6 @@ namespace QuestPDF.Drawing
         {
             content.VisitChildren(x => x?.Initialize(pageContext, canvas));
             content.VisitChildren(x => (x as IStateResettable)?.ResetState());
-
-            ResetIsRenderedState(content);
             
             canvas.BeginDocument();
 
@@ -163,50 +172,6 @@ namespace QuestPDF.Drawing
 
             return debuggingState;
         }
-        
-        private static void ApplyContentRepeatState(Element? content, bool repeatContent)
-        {
-            if (content == null)
-                return;
-            
-            if (content is IVisual visual)
-                visual.RepeatContent = repeatContent;
-            
-            if (content is TextBlock textBlock)
-            {
-                foreach (var textBlockItem in textBlock.Items)
-                {
-                    if (textBlockItem is TextBlockElement textElement)
-                    {
-                        ApplyContentRepeatState(textElement.Element, true);
-                    }
-                }
-                
-                return;
-            }
-
-            // TODO: apply RepeatState in dynamic content
-            //if (content is DynamicHost dynamicHost)
-            //  dynamicHost.TextStyle = dynamicHost.TextStyle.ApplyGlobalStyle(documentDefaultTextStyle);
-
-            if (content is RepeatContentSetter repeatContentSetter)
-                repeatContent = repeatContentSetter.RepeatContent;
-            
-            foreach (var child in content.GetChildren())
-                ApplyContentRepeatState(child, repeatContent);
-        }
-        
-        private static void ResetIsRenderedState(Element? content)
-        {
-            if (content == null)
-                return;
-            
-            if (content is IVisual visual)
-                visual.IsRendered = false;
-
-            foreach (var child in content.GetChildren())
-                ResetIsRenderedState(child);
-        }
 
         internal static void ApplyDefaultTextStyle(this Element? content, TextStyle documentDefaultTextStyle)
         {

QuestPDF/Drawing/FreeCanvas.cs

@@ -51,6 +51,11 @@ namespace QuestPDF.Drawing
             
         }
 
+        public void DrawPicture(SKPicture picture)
+        {
+            
+        }
+
         public void DrawHyperlink(string url, Size size)
         {
            

QuestPDF/Drawing/SkiaCanvasBase.cs

@@ -38,6 +38,11 @@ namespace QuestPDF.Drawing
             Canvas.DrawImage(image, new SKRect(vector.X, vector.Y, size.Width, size.Height));
         }
 
+        public void DrawPicture(SKPicture picture)
+        {
+            Canvas.DrawPicture(picture);
+        }
+
         public void DrawHyperlink(string url, Size size)
         {
             Canvas.DrawUrlAnnotation(new SKRect(0, 0, size.Width, size.Height), url);

QuestPDF/Drawing/SkiaCaptureCanvas.cs

@@ -0,0 +1,39 @@
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using QuestPDF.Helpers;
+using QuestPDF.Infrastructure;
+using SkiaSharp;
+
+namespace QuestPDF.Drawing
+{
+    internal class SkiaCaptureCanvas : SkiaCanvasBase
+    {
+        private SKPictureRecorder? PictureRecorder { get; set; }
+        private Size? CurrentPageSize { get; set; }
+        public SKPicture? CurrentPicture { get; set; }
+        
+        public override void BeginDocument()
+        {
+            
+        }
+
+        public override void BeginPage(Size size)
+        {
+            CurrentPageSize = size;
+            PictureRecorder = new SKPictureRecorder();
+
+            Canvas = PictureRecorder.BeginRecording(new SKRect(0, 0, size.Width, size.Height));
+        }
+
+        public override void EndPage()
+        {
+            CurrentPicture = PictureRecorder?.EndRecording();
+            
+            PictureRecorder?.Dispose();
+            PictureRecorder = null;
+        }
+
+        public override void EndDocument() { }
+    }
+}

QuestPDF/Elements/Canvas.cs

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

QuestPDF/Elements/DrawingCache.cs

@@ -0,0 +1,59 @@
+using System.Collections.Generic;
+using QuestPDF.Drawing;
+using QuestPDF.Helpers;
+using QuestPDF.Infrastructure;
+using SkiaSharp;
+
+namespace QuestPDF.Elements
+{
+    internal class DrawingCache : ContainerElement
+    {
+        private SkiaCaptureCanvas CaptureCanvas { get; } = new();
+        private Dictionary<int, SpacePlan> MeasureCache { get; } = new();
+        private Dictionary<int, SKPicture> DrawCache { get; } = new();
+        
+        ~DrawingCache()
+        {
+            foreach (var picture in DrawCache.Values)
+                picture.Dispose();
+
+            DrawCache.Clear();
+        }
+        
+        internal override void Initialize(IPageContext pageContext, ICanvas canvas)
+        {
+            Child.VisitChildren(x => x.Canvas = CaptureCanvas);
+            base.Initialize(pageContext, canvas);
+        }
+        
+        internal override SpacePlan Measure(Size availableSpace)
+        {
+            var cacheKey = PageContext.CurrentPage;
+
+            if (MeasureCache.TryGetValue(cacheKey, out var result))
+                return result;
+
+            var childSize = Child?.Measure(availableSpace) ?? SpacePlan.FullRender(Size.Zero);
+            MeasureCache.Add(cacheKey, childSize);
+            return childSize;
+        }
+        
+        internal override void Draw(Size availableSpace)
+        {
+            var cacheKey = PageContext.CurrentPage;
+
+            if (DrawCache.TryGetValue(cacheKey, out var result))
+            {
+                Canvas.DrawPicture(result);
+                return;
+            }
+            
+            CaptureCanvas.BeginPage(availableSpace);
+            Child?.Draw(availableSpace);
+            CaptureCanvas.EndPage();
+
+            var picture = CaptureCanvas.CurrentPicture;
+            DrawCache.Add(cacheKey, picture);
+        }
+    }
+}

QuestPDF/Elements/DynamicImage.cs

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

QuestPDF/Elements/Image.cs

@@ -5,11 +5,8 @@ using SkiaSharp;
 
 namespace QuestPDF.Elements
 {
-    internal class Image : Element, IVisual, ICacheable
+    internal class Image : Element, ICacheable
     {
-        public bool IsRendered { get; set; }
-        public bool RepeatContent { get; set; }
-        
         public SKImage? InternalImage { get; set; }
 
         ~Image()
@@ -19,13 +16,9 @@ namespace QuestPDF.Elements
         
         internal override SpacePlan Measure(Size availableSpace)
         {
-            if (availableSpace.IsNegative())
-                return SpacePlan.Wrap();
-            
-            if (IsRendered && !RepeatContent)
-                return SpacePlan.FullRender(Size.Zero);
-            
-            return SpacePlan.FullRender(availableSpace);
+            return availableSpace.IsNegative() 
+                ? SpacePlan.Wrap() 
+                : SpacePlan.FullRender(availableSpace);
         }
 
         internal override void Draw(Size availableSpace)
@@ -33,7 +26,6 @@ namespace QuestPDF.Elements
             if (InternalImage == null)
                 return;
 
-            IsRendered = true;
             Canvas.DrawImage(InternalImage, Position.Zero, availableSpace);
         }
     }

QuestPDF/Elements/Inlined.cs

@@ -212,7 +212,7 @@ namespace QuestPDF.Elements
                         break;
                     
                     var element = queue.Peek();
-                    var size = element.Measure(new Size(availableSize.Width, Size.Max.Height));
+                    var size = element.Measure(Size.Max);
                     
                     if (size.Type == SpacePlanType.Wrap)
                         break;

QuestPDF/Elements/Line.cs

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

QuestPDF/Elements/Page.cs

@@ -30,6 +30,7 @@ namespace QuestPDF.Elements
         public void Compose(IContainer container)
         {
             container
+                //.Element(new DrawingCache())
                 .Background(BackgroundColor)
                 .Layers(layers =>
                 {

QuestPDF/Elements/RepeatContentSetter.cs

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

QuestPDF/Elements/Table/Table.cs

@@ -24,7 +24,6 @@ namespace QuestPDF.Elements.Table
         // inner table: list of all cells that ends at the corresponding row
         private TableCell[][] CellsCache { get; set; }
         private int MaxRow { get; set; }
-        private int MaxRowSpan { get; set; }
         
         internal override void Initialize(IPageContext pageContext, ICanvas canvas)
         {
@@ -57,7 +56,6 @@ namespace QuestPDF.Elements.Table
             if (Cells.Count == 0)
             {
                 MaxRow = 0;
-                MaxRowSpan = 1;
                 CellsCache = Array.Empty<TableCell[]>();
                 
                 return;
@@ -68,7 +66,6 @@ namespace QuestPDF.Elements.Table
                 .ToDictionary(x => x.Key, x => x.OrderBy(x => x.Column).ToArray());
 
             MaxRow = groups.Max(x => x.Key);
-            MaxRowSpan = Cells.Max(x => x.RowSpan);
 
             CellsCache = Enumerable
                 .Range(0, MaxRow + 1)
@@ -202,9 +199,9 @@ namespace QuestPDF.Elements.Table
                         
                         currentRow = cell.Row;
                     }
-                    
+
                     // cell visibility optimizations
-                    if (cell.Row > maxRenderingRow + MaxRowSpan)
+                    if (cell.Row > maxRenderingRow)
                         break;
 
                     // calculate cell position / size
@@ -221,14 +218,14 @@ namespace QuestPDF.Elements.Table
                     {
                         maxRenderingRow = Math.Min(maxRenderingRow, cell.Row + cell.RowSpan - 1);
                     }
-
+                    
                     // corner case: if cell within the row want to wrap to the next page, do not attempt to render this row
                     if (cellSize.Type == SpacePlanType.Wrap)
                     {
                         maxRenderingRow = Math.Min(maxRenderingRow, cell.Row - 1);
                         continue;
                     }
-
+                    
                     // update position of the last row that cell occupies
                     var bottomRow = cell.Row + cell.RowSpan - 1;
                     rowBottomOffsets[bottomRow] = Math.Max(rowBottomOffsets[bottomRow], topOffset + cellSize.Height);

QuestPDF/Elements/Text/FontFallback.cs

@@ -121,11 +121,7 @@ namespace QuestPDF.Elements.Text
         {
             foreach (var textBlockItem in textBlockItems)
             {
-                if (textBlockItem is TextBlockPageNumber or TextBlockElement)
-                {
-                    yield return textBlockItem;
-                }
-                else if (textBlockItem is TextBlockSpan textBlockSpan)
+                if (textBlockItem is TextBlockSpan textBlockSpan and not TextBlockPageNumber)
                 {
                     if (!Settings.CheckIfAllTextGlyphsAreAvailable && textBlockSpan.Style.Fallback == null)
                     {
@@ -134,25 +130,19 @@ namespace QuestPDF.Elements.Text
                     }
                     
                     var textRuns = textBlockSpan.Text.SplitWithFontFallback(textBlockSpan.Style);
-                    
+
                     foreach (var textRun in textRuns)
                     {
-                        var newElement = textBlockSpan switch
+                        yield return new TextBlockSpan
                         {
-                            TextBlockHyperlink hyperlink => new TextBlockHyperlink { Url = hyperlink.Url },
-                            TextBlockSectionLink sectionLink => new TextBlockSectionLink { SectionName = sectionLink.SectionName },
-                            TextBlockSpan => new TextBlockSpan()
+                            Text = textRun.Content,
+                            Style = textRun.Style
                         };
-
-                        newElement.Text = textRun.Content;
-                        newElement.Style = textRun.Style;
-
-                        yield return newElement;
                     }
                 }
                 else
                 {
-                    throw new NotSupportedException();
+                    yield return textBlockItem;
                 }
             }
         }

QuestPDF/Elements/Text/Items/TextBlockSpan.cs

@@ -15,7 +15,7 @@ namespace QuestPDF.Elements.Text.Items
     {
         public string Text { get; set; }
         public TextStyle Style { get; set; } = TextStyle.Default;
-        private TextShapingResult? TextShapingResult { get; set; }
+        public TextShapingResult? TextShapingResult { get; set; }
 
         private Dictionary<(int startIndex, float availableWidth), TextMeasurementResult?> MeasureCache = new ();
         protected virtual bool EnableTextCache => true; 

QuestPDF/Elements/Text/TextBlock.cs

@@ -4,16 +4,12 @@ using System.Linq;
 using QuestPDF.Drawing;
 using QuestPDF.Elements.Text.Calculation;
 using QuestPDF.Elements.Text.Items;
-using QuestPDF.Helpers;
 using QuestPDF.Infrastructure;
 
 namespace QuestPDF.Elements.Text
 {
-    internal class TextBlock : Element, IVisual, IStateResettable
+    internal class TextBlock : Element, IStateResettable
     {
-        public bool IsRendered { get; set; }
-        public bool RepeatContent { get; set; }
-        
         public HorizontalAlignment Alignment { get; set; } = HorizontalAlignment.Left;
         public List<ITextBlockItem> Items { get; set; } = new List<ITextBlockItem>();
 
@@ -23,7 +19,7 @@ namespace QuestPDF.Elements.Text
         private int CurrentElementIndex { get; set; }
 
         private bool FontFallbackApplied { get; set; } = false;
-
+        
         public void ResetState()
         {
             ApplyFontFallback();
@@ -57,12 +53,6 @@ namespace QuestPDF.Elements.Text
 
         internal override SpacePlan Measure(Size availableSpace)
         {
-            if (availableSpace.IsNegative())
-                return SpacePlan.Wrap();
-            
-            if (IsRendered && !RepeatContent)
-                return SpacePlan.FullRender(Size.Zero);
-
             if (!RenderingQueue.Any())
                 return SpacePlan.FullRender(Size.Zero);
             
@@ -90,9 +80,6 @@ namespace QuestPDF.Elements.Text
 
         internal override void Draw(Size availableSpace)
         {
-            if (IsRendered && !RepeatContent)
-                return;
-
             var lines = DivideTextItemsIntoLines(availableSpace.Width, availableSpace.Height).ToList();
             
             if (!lines.Any())
@@ -149,13 +136,10 @@ namespace QuestPDF.Elements.Text
 
             var lastElementMeasurement = lines.Last().Elements.Last().Measurement;
             CurrentElementIndex = lastElementMeasurement.IsLast ? 0 : lastElementMeasurement.NextIndex;
-
+            
             if (!RenderingQueue.Any())
-            {
                 ResetState();
-                IsRendered = true;
-            }
-
+            
             float GetAlignmentOffset(float lineWidth)
             {
                 if (Alignment == HorizontalAlignment.Left)

QuestPDF/Fluent/DecorationExtensions.cs

@@ -12,7 +12,7 @@ namespace QuestPDF.Fluent
         {
             var container = new Container();
             Decoration.Before = container;
-            return container.RepeatContentWhenPaging();
+            return container;
         }
         
         public void Before(Action<IContainer> handler)
@@ -36,7 +36,7 @@ namespace QuestPDF.Fluent
         {
             var container = new Container();
             Decoration.After = container;
-            return container.RepeatContentWhenPaging();
+            return container;
         }
         
         public void After(Action<IContainer> handler)
@@ -49,7 +49,9 @@ namespace QuestPDF.Fluent
         [Obsolete("This element has been renamed since version 2022.2. Please use the 'Before' method.")]
         public IContainer Header()
         {
-            return Before();
+            var container = new Container();
+            Decoration.Before = container;
+            return container;
         }
         
         [Obsolete("This element has been renamed since version 2022.2. Please use the 'Before' method.")]
@@ -61,7 +63,9 @@ namespace QuestPDF.Fluent
         [Obsolete("This element has been renamed since version 2022.2. Please use the 'After' method.")]
         public IContainer Footer()
         {
-            return After();
+            var container = new Container();
+            Decoration.After = container;
+            return container;
         }
         
         [Obsolete("This element has been renamed since version 2022.2. Please use the 'After' method.")]

QuestPDF/Fluent/LayerExtensions.cs

@@ -24,7 +24,7 @@ namespace QuestPDF.Fluent
             return container;
         }
 
-        public IContainer Layer() => Layer(false).RepeatContentWhenPaging();
+        public IContainer Layer() => Layer(false);
         public IContainer PrimaryLayer() => Layer(true);
 
         internal void Validate()

QuestPDF/Fluent/LineExtensions.cs

@@ -6,11 +6,11 @@ namespace QuestPDF.Fluent
 {
     public static class LineExtensions
     {
-        private static ILine Line(this IContainer element, LineType type, float thickness)
+        private static ILine Line(this IContainer element, LineType type, float size)
         {
             var line = new Line
             {
-                Thickness = thickness,
+                Size = size,
                 Type = type
             };
 
@@ -18,14 +18,14 @@ namespace QuestPDF.Fluent
             return line;
         }
         
-        public static ILine LineVertical(this IContainer element, float thickness, Unit unit = Unit.Point)
+        public static ILine LineVertical(this IContainer element, float size, Unit unit = Unit.Point)
         {
-            return element.Line(LineType.Vertical, thickness.ToPoints(unit));
+            return element.Line(LineType.Vertical, size.ToPoints(unit));
         }
         
-        public static ILine LineHorizontal(this IContainer element, float thickness, Unit unit = Unit.Point)
+        public static ILine LineHorizontal(this IContainer element, float size, Unit unit = Unit.Point)
         {
-            return element.Line(LineType.Horizontal, thickness.ToPoints(unit));
+            return element.Line(LineType.Horizontal, size.ToPoints(unit));
         }
         
         public static void LineColor(this ILine descriptor, string value)

QuestPDF/Fluent/RepeatContentExtensions.cs

@@ -1,27 +0,0 @@
-using System;
-using QuestPDF.Elements;
-using QuestPDF.Infrastructure;
-
-namespace QuestPDF.Fluent
-{
-    public static class RepeatContentExtensions
-    {
-        private static IContainer RepeatContent(this IContainer element, Action<RepeatContentSetter> handler)
-        {
-            var repeatContentSetter = element as RepeatContentSetter ?? new RepeatContentSetter();
-            handler(repeatContentSetter);
-            
-            return element.Element(repeatContentSetter);
-        }
-
-        public static IContainer RepeatContentWhenPaging(this IContainer element)
-        {
-            return element.RepeatContent(x => x.RepeatContent = true);
-        }
-        
-        public static IContainer DoNotRepeatContentWhenPaging(this IContainer element)
-        {
-            return element.RepeatContent(x => x.RepeatContent = false);
-        }
-    }
-}

QuestPDF/Fluent/TextSpanDescriptorExtensions.cs

@@ -15,17 +15,6 @@ namespace QuestPDF.Fluent
             return descriptor;
         }
         
-        public static T Fallback<T>(this T descriptor, TextStyle? value = null) where T : TextSpanDescriptor
-        {
-            descriptor.TextStyle.Fallback = value;
-            return descriptor;
-        }
-        
-        public static T Fallback<T>(this T descriptor, Func<TextStyle, TextStyle> handler) where T : TextSpanDescriptor
-        {
-            return descriptor.Fallback(handler(TextStyle.Default));
-        }
-        
         public static T FontColor<T>(this T descriptor, string value) where T : TextSpanDescriptor
         {
             descriptor.MutateTextStyle(x => x.FontColor(value));

QuestPDF/Infrastructure/ICanvas.cs

@@ -10,6 +10,7 @@ namespace QuestPDF.Infrastructure
         void DrawRectangle(Position vector, Size size, string color);
         void DrawText(SKTextBlob skTextBlob, Position position, TextStyle style);
         void DrawImage(SKImage image, Position position, Size size);
+        void DrawPicture(SKPicture picture);
 
         void DrawHyperlink(string url, Size size);
         void DrawSectionLink(string sectionName, Size size);

QuestPDF/Infrastructure/IVisual.cs

@@ -1,8 +0,0 @@
-namespace QuestPDF.Infrastructure
-{
-    internal interface IVisual
-    {
-        public bool IsRendered { get; set; }
-        public bool RepeatContent { get; set; }
-    }
-}

QuestPDF/QuestPDF.csproj

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

QuestPDF/Resources/ReleaseNotes.txt

@@ -4,8 +4,3 @@
 - Significantly reduced memory allocation cost for TextStyle objects,
 - Implemented optional checking if all font glyphs are available,
 - Minor text-rendering optimizations.
-
-2022.9.1
-- Fixed: text hyperlinks do not work when the CheckIfAllTextGlyphsAreAvailable option or text fallback are used,
-- Fixed: cells with RowSpan (greater than 1) are not always displayed properly,
-- Improved predictability of the Inlined element when measuring its children.

readme.md

@@ -17,7 +17,7 @@ It offers a layouting engine designed with a full paging support in mind. The do
 
 Unlike other libraries, it does not rely on the HTML-to-PDF conversion which in many cases is not reliable. Instead, it implements its own layouting engine that is optimized to cover all paging-related requirements.
 
-## Please help by giving a star
+## Please show the value
 
 Choosing a project dependency could be difficult. We need to ensure stability and maintainability of our projects. Surveys show that GitHub stars count play an important factor when assessing library quality. 
 
@@ -47,7 +47,6 @@ Special thanks to all companies that decided to sponsor QuestPDF development. Th
 | Company                                                                              | Description                                                                                                                     |
 |--------------------------------------------------------------------------------------|:--------------------------------------------------------------------------------------------------------------------------------|
 | <img src="Resources/jetbrains-logo.svg" width="100px"> | [JetBrains](https://www.jetbrains.com/) supports this project as part of the OSS Power-Ups program. Thank you!<br/>100$ / month |
-| <img src="https://avatars.githubusercontent.com/u/2712328?v=4" width="100px"> | [Mark Gould](https://github.com/markgould) supports this project. Thank you!<br/>100$ / month |
 
 [![Sponsor project](https://img.shields.io/badge/%E2%9D%A4%EF%B8%8F%20sponsor-QuestPDF-red)](https://github.com/sponsors/QuestPDF)
 
@@ -63,14 +62,14 @@ Install-Package QuestPDF
 dotnet add package QuestPDF
 
 // Package reference in .csproj file
-<PackageReference Include="QuestPDF" Version="2022.9.0" />
+<PackageReference Include="QuestPDF" Version="2022.6.0" />
 ```
 
 [![Nuget version](https://img.shields.io/badge/package%20details-QuestPDF-blue?logo=nuget)](https://www.nuget.org/packages/QuestPDF/)
 
 ## Documentation
 
-[![Getting started tutorial]( https://img.shields.io/badge/%F0%9F%9A%80%20read-getting%20started-blue)](https://www.questpdf.com/getting-started)
+[![Getting started tutorial]( https://img.shields.io/badge/%F0%9F%9A%80%20read-getting%20started-blue)](https://www.questpdf.com/getting-started.html)
 A short and easy to follow tutorial showing how to design an invoice document under 200 lines of code.
 
 
@@ -78,14 +77,14 @@ A short and easy to follow tutorial showing how to design an invoice document un
 A detailed description of behavior of all available components and how to use them with C# Fluent API.
 
 
-[![Patterns and Practices](https://img.shields.io/badge/%E2%9C%A8%20read-patterns%20and%20practices-blue)](https://www.questpdf.com/design-patterns)
+[![Patterns and Practices](https://img.shields.io/badge/%E2%9C%A8%20read-patterns%20and%20practices-blue)](https://www.questpdf.com/design-patterns.html)
 Everything that may help you designing great reports and create reusable code that is easy to maintain.
 
 ## QuestPDF Previewer
 
 The QuestPDF Previewer is a tool designed to simplify and speed up your development lifecycle. First, it shows a preview of your document. But the real magic starts with the hot-reload capability! It observes your code and updates the preview every time you change the implementation. Get real-time results without the need of code recompilation. Save time and enjoy the task!
 
-[![Learn more](https://img.shields.io/badge/%F0%9F%93%96%20Previewer-learn%20more-blue)](https://www.questpdf.com/document-previewer)
+[![Learn more](https://img.shields.io/badge/%F0%9F%93%96%20Previewer-learn%20more-blue)](https://www.questpdf.com/document-previewer.html)
 
 
 <img src="https://github.com/QuestPDF/QuestPDF-Documentation/blob/main/docs/public/previewer/animation.gif?raw=true" width="100%">