Add per-workbook RenderContext on ExcelWorkbook and thread it through the SVG export pipeline for charts and shapes, replacing the global OpenTypeFonts singleton; split FontAvailability into a result enum plus RequireExactFont policy

Author: swmal

src/EPPlus.DrawingRenderer.Tests/Chart/LineChartToSvgTests.cs

@@ -130,7 +130,7 @@ public void GenerateSvgForLineCharts()
         }
 
         [TestMethod]
-        public void GenerateSvgForCharts_SecondaryAxis()
+        public void GenerateSuperScript()
         {
             ExcelPackage.License.SetNonCommercialOrganization("EPPlus Project");
             using (var p = OpenTemplatePackage("ChartForSvg_SecondaryAxis.xlsx"))

src/EPPlus.DrawingRenderer.Tests/TestFontMeasurer.cs

@@ -4,12 +4,30 @@
 using EPPlus.Fonts.OpenType.Utils;
 using OfficeOpenXml.Interfaces.Drawing.Text;
 using OfficeOpenXml.Interfaces.Fonts;
+using System.Drawing;
 
 namespace TestProject1
 {
     [TestClass]
     public class TestFontMeasurer
     {
+        [TestInitialize]
+        public void Setup()
+        {
+            _systemFolderEngine = new OpenTypeFontEngine(x => x.SearchSystemDirectories = true);
+        }
+
+        [TestCleanup]
+        public void Cleanup()
+        {
+            SystemFolderEngine.Dispose();
+            _systemFolderEngine = null;
+        }
+
+        private OpenTypeFontEngine? _systemFolderEngine;
+
+        private OpenTypeFontEngine SystemFolderEngine => _systemFolderEngine ?? new OpenTypeFontEngine(x => x.SearchSystemDirectories = true);
+
         [TestMethod]
         public void CompareFontMeasurer3()
         {
@@ -20,7 +38,7 @@ public void CompareFontMeasurer3()
                 Size = 72.0f,
             };
 
-            var handler = new TextHandler(mf);
+            var handler = new TextHandler(SystemFolderEngine, mf);
 
             var testStr = "Hello there⁴₂";
 
@@ -56,7 +74,7 @@ public void TestWrapText()
                 Style = MeasurementFontStyles.Regular
             };
 
-            var handler = new TextHandler(mf);
+            var handler = new TextHandler(SystemFolderEngine, mf);
 
             var strings = handler.WrapText(testStr, MaxPixelWidth.PixelToPoint());
 
@@ -86,7 +104,7 @@ public void TestWrapTextLongContinous()
                 Size = (float)fontSize,
                 Style = MeasurementFontStyles.Regular
             };
-            var handler = new TextHandler(mf);
+            var handler = new TextHandler(SystemFolderEngine, mf);
 
             var strings = handler.WrapText(testString, MaxPixelWidth.PixelToPoint());
 
@@ -139,7 +157,7 @@ public void SpaceCase()
                 Style = MeasurementFontStyles.Regular,
                 Size = 11.0f,
             };
-            var layout = OpenTypeFonts.GetTextLayoutEngineForFont(mf);
+            var layout = SystemFolderEngine.GetTextLayoutEngineForFont(mf);
             var output = layout.WrapText(text, 11f, 39.4);
 
             var shaper = OpenTypeFonts.GetShaperForFont(mf);
@@ -169,7 +187,7 @@ public void LoremIpsumTesting()
                 Size = 11.0f,
             };
 
-            var handler = new TextHandler(mf);
+            var handler = new TextHandler(SystemFolderEngine, mf);
             //float ptMax = 39.68503937007874015748031496063f;
             //float ptMax = 36.840393700787401574803149606299f - 1.5f;
             //float pixels = 53f;
@@ -232,7 +250,7 @@ public void WrapDifficultSpotSpace()
                 Size = 11.0f,
             };
 
-            var handler = new TextHandler(mf);
+            var handler = new TextHandler(SystemFolderEngine, mf);
 
             var wrappedStrings = handler.WrapText(text, pointWidth);
 
@@ -253,7 +271,7 @@ public void LoremIpsum20Paragraphs()
                 Size = 11.0f,
             };
 
-            var handler = new TextHandler(mf);
+            var handler = new TextHandler(SystemFolderEngine, mf);
 
             double maxPixelWidth = 72d;
 
@@ -300,7 +318,7 @@ public void LoremIpsum20ParagraphsMultipleFragments()
                 Size = 11.0f,
             };
 
-            var handler = new TextHandler(mf);
+            var handler = new TextHandler(SystemFolderEngine, mf);
 
             double maxPixelWidth = 72d;
 

src/EPPlus.DrawingRenderer/RenderItems/Textbox/ParagraphRenderItem.cs

@@ -134,26 +134,30 @@ protected ParagraphRenderItem(RenderContext renderContext, BoundingBox parent, b
             }
         }
 
-        protected ParagraphRenderItem(RenderContext renderContext, BoundingBox parent, RenderTextBody textBody, bool setFallbackDefaultFont = true) : this(renderContext, parent, setFallbackDefaultFont)
+        protected ParagraphRenderItem(RenderContext renderContext, BoundingBox parent, RenderTextBody textBody, bool setFallbackDefaultFont = true)
+            : this(renderContext, parent, setFallbackDefaultFont)
         {
             InitBasedOnParent(textBody);
             Bounds.Name = "Paragraph";
         }
 
-        protected ParagraphRenderItem(RenderContext renderContext, BoundingBox parent, RenderTextBody textBody, string text, bool setFallbackDefaultFont = true) : this(renderContext, parent, textBody, setFallbackDefaultFont)
+        protected ParagraphRenderItem(RenderContext renderContext, BoundingBox parent, RenderTextBody textBody, string text, bool setFallbackDefaultFont = true)
+            : this(renderContext, parent, textBody, setFallbackDefaultFont)
         {
             _lsMultiplier = 1d;
             ImportLinesAndTextRunsBase(text);
         }
 
-        protected ParagraphRenderItem(RenderContext renderContext, BoundingBox parent, RenderTextBody textBody, IRichTextFormatSimple rtFormat) : this(renderContext, parent, textBody, false)
+        protected ParagraphRenderItem(RenderContext renderContext, BoundingBox parent, RenderTextBody textBody, IRichTextFormatSimple rtFormat)
+            : this(renderContext, parent, textBody, false)
         {
             _lsMultiplier = 1d;
             DefaultParagraphFont = new FontFormatBase(rtFormat.Family, rtFormat.SubFamily, rtFormat.Size);
             AddRichText(rtFormat);
         }
 
-        protected ParagraphRenderItem(RenderContext renderContext, BoundingBox parent, RenderTextBody textBody, IRichTextFormatDrawing rtFormat) : this(renderContext, parent, textBody, false)
+        protected ParagraphRenderItem(RenderContext renderContext, BoundingBox parent, RenderTextBody textBody, IRichTextFormatDrawing rtFormat)
+            : this(renderContext, parent, textBody, false)
         {
             AddRichText(rtFormat);
         }
@@ -203,7 +207,7 @@ TextLineCollection WrapFragmentsToLines(List<ITextFragmentBase>? fragments = nul
         {
             //This is highly innefficent. Really, LayoutSystem should be 
             //Holding the fragments from the start/wrapping should only be done when textFragments are fully complete
-            _layoutSystem = new LayoutSystem(OpenTypeFonts.GetDefaultEngine(), _textFragments);
+            _layoutSystem = new LayoutSystem(RenderContext.FontEngine, _textFragments);
 
             //if (fragments == null && _layoutSystem == null)
             //{

src/EPPlus.Export.Pdf.Tests/EPPlus.Export.Pdf.Tests.csproj

@@ -18,6 +18,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\EPPlus\src\EPPlusTest\EPPlus.Test.csproj" />
     <ProjectReference Include="..\EPPlus.Export.Pdf\EPPlus.Export.Pdf.csproj" />
+    <ProjectReference Include="..\EPPlus\EPPlus.csproj" />
   </ItemGroup>
 
   <ItemGroup>