PeachPDF 0.7.23

Implement support for break-inside: avoid
Alias page-break-* to break-*
Update SixLabors.ImageSharp to 3.1.10

Author: jhaygood86

src/PdfSharpCore/PeachPDF.PdfSharpCore.csproj

@@ -14,7 +14,7 @@ PeachPDF.PdfSharpCore is a partial port of PdfSharp.Xamarin for .NET Core Additi
     <PackageProjectUrl>https://github.com/jhaygood86/PeachPDF</PackageProjectUrl>
     <RepositoryUrl>https://github.com/jhaygood86/PeachPDF</RepositoryUrl>
     <PackageReleaseNotes>PeachPDF.PdfSharpCore is a partial port of PdfSharp.Xamarin for .NET Core Additionally MigraDoc has been ported as well (from version 1.32)</PackageReleaseNotes>
-    <PackageVersion>0.7.18</PackageVersion>
+    <PackageVersion>0.7.23</PackageVersion>
     <summary>PdfSharp for .NET Core</summary>
     <IsTrimmable>true</IsTrimmable>
     <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
@@ -48,7 +48,7 @@ PeachPDF.PdfSharpCore is a partial port of PdfSharp.Xamarin for .NET Core Additi
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="SharpZipLib" Version="1.4.2" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.8" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.10" />
     <PackageReference Include="SixLabors.Fonts" Version="2.1.3" />
   </ItemGroup>
 

src/PeachPDF/Html/Core/Dom/CssBox.cs

@@ -607,15 +607,12 @@ protected virtual async ValueTask PerformLayoutImp(RGraphics g)
                 await MeasureWordsSize(g);
             }
 
-
-
-            if (PageBreakBefore is CssConstants.Always)
+            if (BreakBefore is CssConstants.Page)
             {
                 var previousSibling = DomUtils.GetPreviousSibling(this);
 
                 if (previousSibling is not null)
                 {
-
                     var bottomRelativeToCurrentPage = previousSibling.ActualBottom;
                     var pageHeight = HtmlContainer!.PageSize.Height;
 
@@ -763,6 +760,26 @@ protected virtual async ValueTask PerformLayoutImp(RGraphics g)
 
             await CreateListItemBox(g);
 
+            if (BreakInside is CssConstants.Avoid)
+            {
+                var pageHeight = HtmlContainer!.PageSize.Height;
+
+                var topRelativeToCurrentPage = Location.Y;
+
+                while (topRelativeToCurrentPage > pageHeight)
+                {
+                    topRelativeToCurrentPage -= pageHeight;
+                }
+
+                var bottomRelativeToCurrentPage = topRelativeToCurrentPage + ActualBottom - Location.Y;
+
+                if (bottomRelativeToCurrentPage > pageHeight)
+                {
+                    var offset = pageHeight - topRelativeToCurrentPage + HtmlContainer.MarginBottom;
+                    OffsetTop(offset);
+                }
+            }
+
             if (Position is CssConstants.Absolute)
             {
                 if (Left is CssConstants.Auto && Right is not CssConstants.Auto)

src/PeachPDF/Html/Core/Dom/CssBoxProperties.cs

@@ -282,8 +282,9 @@ public string PaddingTop
             }
         }
 
-        public string PageBreakBefore { get; set; } = CssConstants.Auto;
-        public string PageBreakInside { get; set; } = CssConstants.Auto;
+        public string BreakBefore { get; set; } = CssConstants.Auto;
+        public string BreakInside { get; set; } = CssConstants.Auto;
+        public string BreakAfter { get; set; } = CssConstants.Auto;
 
         public string Left { get; set; } = CssConstants.Auto;
 

src/PeachPDF/Html/Core/Dom/CssLayoutEngineTable.cs

@@ -693,7 +693,7 @@ private async ValueTask LayoutCells(RGraphics g)
                     }
 
                     // If one cell crosses page borders then don't need to check other cells in the row
-                    if (_tableBox.PageBreakInside is CssConstants.Avoid) continue;
+                    if (_tableBox.BreakInside is CssConstants.Avoid) continue;
 
                     breakPage = cell.BreakPage();
                     if (!breakPage) continue;

src/PeachPDF/Html/Core/Utils/CssConstants.cs

@@ -84,6 +84,7 @@ internal static class CssConstants
         public const string Outside = "outside";
         public const string Overline = "overline";
         public const string PaddingBox = "padding-box";
+        public const string Page = "page";
         public const string Percent = "%";
         public const string Pre = "pre";
         public const string PreWrap = "pre-wrap";

src/PeachPDF/Html/Core/Utils/CssUtils.cs

@@ -67,6 +67,9 @@ public static double WhiteSpace(RGraphics g, CssBoxProperties box)
                 "border-top-color" => cssBox.BorderTopColor,
                 "border-spacing" => cssBox.BorderSpacing,
                 "border-collapse" => cssBox.BorderCollapse,
+                "break-after" => cssBox.BreakAfter,
+                "break-before" => cssBox.BreakBefore,
+                "break-inside" => cssBox.BreakInside,
                 "corner-radius" => cssBox.CornerRadius,
                 "corner-nw-radius" => cssBox.CornerNwRadius,
                 "corner-ne-radius" => cssBox.CornerNeRadius,
@@ -83,8 +86,9 @@ public static double WhiteSpace(RGraphics g, CssBoxProperties box)
                 "padding-left" => cssBox.PaddingLeft,
                 "padding-right" => cssBox.PaddingRight,
                 "padding-top" => cssBox.PaddingTop,
-                "page-break-before" => cssBox.PageBreakBefore,
-                "page-break-inside" => cssBox.PageBreakInside,
+                "page-break-after" => cssBox.BreakAfter,
+                "page-break-before" => cssBox.BreakBefore,
+                "page-break-inside" => cssBox.BreakInside,
                 "left" => cssBox.Left,
                 "top" => cssBox.Top,
                 "right" => cssBox.Right,
@@ -320,11 +324,27 @@ public static void SetPropertyValue(CssValueParser valueParser, CssBox cssBox, s
                 case "padding-top":
                     cssBox.PaddingTop = value;
                     break;
+                case "break-after":
+                case "page-break-after":
+                    if (value is CssConstants.Always && propName is "page-break-after")
+                    {
+                        value = CssConstants.Page;
+                    }
+
+                    cssBox.BreakAfter = value;
+                    break;
                 case "page-break-before":
-                    cssBox.PageBreakBefore = value;
+                case "break-before":
+                    if (value is CssConstants.Always && propName is "page-break-before")
+                    {
+                        value = CssConstants.Page;
+                    }
+
+                    cssBox.BreakBefore = value;
                     break;
                 case "page-break-inside":
-                    cssBox.PageBreakInside = value;
+                case "break-inside":
+                    cssBox.BreakInside = value;
                     break;
                 case "left":
                     cssBox.Left = value;

src/PeachPDF/PeachPDF.csproj

@@ -3,7 +3,7 @@
 		<TargetFrameworks>net8.0</TargetFrameworks>
 		<AssemblyName>PeachPDF</AssemblyName>
 		<PackageId>PeachPDF</PackageId>
-		<PackageVersion>0.7.22</PackageVersion>
+		<PackageVersion>0.7.23</PackageVersion>
 		<IncludeSymbols>true</IncludeSymbols>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 		<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>