Added shrink to fit, better clipping for spilling text and fixed fill selection for total row in tables.

src/EPPlus.Export.Pdf.Tests/PdfTests.cs

@@ -1307,12 +1307,23 @@ public void MultiSheet_PerSheetScaling_IsIsolated()
                 $"combined ({combined}) should equal plain ({plainAlone}) + scaled ({scaledAlone}) - " +
                 "per-sheet scaling must stay isolated");
         }
-        public void TableDxfStyleTest()
+
+        [TestMethod]
+        public void TableDxfStyleTest1()
         {
             using var p = OpenTemplatePackage("TableDxfStylePdf1.xlsx");
             var ws = p.Workbook.Worksheets[0];
             string path = _pdfPath + "TableDxfStylePdf1.pdf";
             ws.SaveAsPdf(path);
         }
+
+        [TestMethod]
+        public void TableDxfStyleTest2()
+        {
+            using var p = OpenTemplatePackage("TableDxfStylePdf2.xlsx");
+            var ws = p.Workbook.Worksheets[0];
+            string path = _pdfPath + "TableDxfStylePdf2.pdf";
+            ws.SaveAsPdf(path);
+        }
     }
 }

src/EPPlus.Export.Pdf/ExcelPdf.cs

@@ -186,7 +186,7 @@ private void AddContent(PdfPageLayout pageLayout, PdfPage page)
                                                     !(t is PdfCellLayout cc && (cc.IsHeading || cc.IsPrintTitle)) &&
                                                     !(t is PdfCellContentLayout ccl && (ccl.IsHeaderFooter || ccl.IsHeading || ccl.IsPrintTitle || ccl.IsAddedContent)) &&
                                                     !(t is PdfCellBorderLayout cbl && cbl.IsPrintTitle)).ToList();
-            var headerFooterLayouts = pageLayout.ChildObjects.OfType<PdfCellContentLayout>().Where(t => t.IsHeaderFooter);
+            //var headerFooterLayouts = pageLayout.ChildObjects.OfType<PdfCellContentLayout>().Where(t => t.IsHeaderFooter);
             var AdditionalContent = pageLayout.ChildObjects.OfType<PdfCellContentLayout>().Where(t => t.IsAddedContent && !(pageSettings.AdditionalContent != "null"));
             var headingLayouts = pageLayout.ChildObjects.Where(t => (t is PdfCellLayout cl && cl.IsHeading) || (t is PdfCellContentLayout ccl && ccl.IsHeading));
             var printTitleLayouts = pageLayout.ChildObjects.Where(t => (t is PdfCellLayout pl && pl.IsPrintTitle) || (t is PdfCellContentLayout pcl && pcl.IsPrintTitle) || (t is PdfCellBorderLayout pbl && pbl.IsPrintTitle));
@@ -246,17 +246,32 @@ private void AddContent(PdfPageLayout pageLayout, PdfPage page)
                 contentStream.AddCommand("Q");
             }
             //Add header and footer.
-            foreach (var hf in headerFooterLayouts)
+            foreach (var part in pageLayout.HeaderFooterParts)
             {
-                contentStream.AddCellContentLayout(hf, _dictionaries, pageSettings);
-            }
-            //Add images
-            foreach (PdfImageLayout image in pageLayout.ChildObjects.OfType<PdfImageLayout>())
-            {
-                if (!image.IsHeaderFooter) continue;
-                var imageResource = _dictionaries.AddImage(image.ImageBytes);
-                contentStream.AddImage(imageResource.Label, image.LocalPosition.X, image.LocalPosition.Y, image.Size.X, image.Size.Y);
-                if (PdfImageXObject.ProducesSoftMask(image.ImageBytes)) page.HasTransparency = true;
+                bool scaleHf = pageLayout.ScaleHeaderFooterWithDocument;
+                if (scaleHf)
+                {
+                    contentStream.AddCommand("q");
+                    contentStream.AddContentScale(contentScale, part.ScalePivot.X, part.ScalePivot.Y);
+                }
+
+                foreach (var item in part.Items)
+                {
+                    switch (item)
+                    {
+                        case PdfCellContentLayout text:
+                            contentStream.AddCellContentLayout(text, _dictionaries, pageSettings);
+                            break;
+                        case PdfImageLayout image:
+                            var imageResource = _dictionaries.AddImage(image.ImageBytes);
+                            contentStream.AddImage(imageResource.Label, image.LocalPosition.X, image.LocalPosition.Y, image.Size.X, image.Size.Y);
+                            if (PdfImageXObject.ProducesSoftMask(image.ImageBytes)) page.HasTransparency = true;
+                            break;
+                    }
+                }
+
+                if (scaleHf)
+                    contentStream.AddCommand("Q");
             }
             //Add print titles
             contentStream.AddCommand("q");

src/EPPlus.Export.Pdf/Layout/PdfCellContentLayout.cs

@@ -36,6 +36,8 @@ internal class PdfCellContentLayout : Transform
         public TextLineCollection TextLines;
         public double LeftTextSpillLength = 0d;
         public double RightTextSpillLength = 0d;
+        public double ScaleAnchorX;
+        public double ScaleAnchorY;
         private double bottomMargin = 3.5d; //Guessed number
         private double rightMargin = 1.4d; //I guessed this one too..
 
@@ -203,14 +205,16 @@ private Vector2 CalculateRotatedAlignment(double textLength, double textHeight,
             return new Vector2(bx - minX, by - minY);
         }
 
-        internal void SetupClipping(double cellX, double cellY, double cellWidth, double cellHeight)
+        internal void SetupClipping(double cellX, double cellY, double cellWidth, double cellHeight, bool spillLeft = false, bool spillRight = false)
         {
+            double li = spillLeft ? 0d : rightMargin;
+            double ri = spillRight ? 0d : rightMargin;
             Clip = true;
             Clipping = new Rect()
             {
-                X = cellX + rightMargin,
+                X = cellX + li,
                 Y = cellY - cellHeight,
-                Width = cellWidth - rightMargin * 2,
+                Width = cellWidth - li - ri,
                 Height = cellHeight
             };
         }

src/EPPlus.Export.Pdf/Layout/PdfHeaderFooterPart.cs

@@ -0,0 +1,24 @@
+/*************************************************************************************************
+  Required Notice: Copyright (C) EPPlus Software AB. 
+  This software is licensed under PolyForm Noncommercial License 1.0.0 
+  and may only be used for noncommercial purposes 
+  https://polyformproject.org/licenses/noncommercial/1.0.0/
+
+  A commercial license to use this software can be purchased at https://epplussoftware.com
+ *************************************************************************************************
+  Date               Author                       Change
+ *************************************************************************************************
+  27/11/2025         EPPlus Software AB           EPPlus 9
+ *************************************************************************************************/
+using EPPlus.Graphics;
+using EPPlus.Graphics.Geometry;
+using System.Collections.Generic;
+
+namespace EPPlus.Export.Pdf.Layout
+{
+    internal sealed class PdfHeaderFooterPart
+    {
+        public Vector2 ScalePivot;
+        public readonly List<Transform> Items = new List<Transform>();
+    }
+}

src/EPPlus.Export.Pdf/Layout/PdfPageLayout.cs

@@ -28,6 +28,8 @@ internal class PdfPageLayout : Transform
         public double PrintTitleWidth;
         public double PrintTitleHeight;
         public bool isCommentsPage = false;
+        public bool ScaleHeaderFooterWithDocument;
+        internal List<PdfHeaderFooterPart> HeaderFooterParts = new List<PdfHeaderFooterPart>();
         internal PdfPageSettings Settings;
         public PdfPageLayout(double x, double y, double width, double height)
             : base(x, y, width, height)

src/EPPlus.Export.Pdf/Settings/PdfPageSettings.cs

@@ -203,6 +203,8 @@ public PdfScaling Scaling
         private double _resolvedFitScale = 1d;
         internal void SetResolvedFitScale(double s) { _resolvedFitScale = s; }
 
+        internal bool ScaleHeaderWithDocument { get; set; }
+
         internal double ContentScale
         {
             get

src/EPPlus/ExcelHeaderFooter.cs

@@ -381,7 +381,7 @@ public bool AlignWithMargins
         {
             get
             {
-                return GetXmlNodeBool(alignWithMarginsPath);
+                return GetXmlNodeBool(alignWithMarginsPath, true);
             }
             set
             {