Feature/drawing renderer refactor

src/EPPlus.Export.ImageRenderer.Test/Chart/LineChartToSvgTests.cs → src/EPPlus.DrawingRenderer.Tests/Chart/LineChartToSvgTests.cs

@@ -78,16 +78,16 @@ public void GenerateSvgForComboCharts_sheet4()
             using (var p = OpenTemplatePackage("ChartForSvg.xlsx"))
             {
                 var ws = p.Workbook.Worksheets[3];
-                //var ix = 1;
-                //var c = ws.Drawings[ix];
-                //var svg = renderer.RenderDrawingToSvg(c);
-                //SaveTextFileToWorkbook($"svg\\ChartForSvg_sheet2_{ix++}.svg", svg);
                 var ix = 1;
-                foreach (ExcelChart c in ws.Drawings)
-                {
-                    var svg = c.ToSvg();
-                    SaveTextFileToWorkbook($"svg\\ChartForSvg_Combo_Sheet4{ix++}.svg", svg);
-                }
+                var c = ws.Drawings[ix];
+                var svg = c.ToSvg();
+                SaveTextFileToWorkbook($"svg\\ChartForSvg_sheet2_{ix++}.svg", svg);
+                //var ix = 1;
+                //foreach (ExcelChart c in ws.Drawings)
+                //{
+                //    var svg = c.ToSvg();
+                //    SaveTextFileToWorkbook($"svg\\ChartForSvg_Combo_Sheet4{ix++}.svg", svg);
+                //}
             }
         }
         [TestMethod]

src/EPPlus.Export.ImageRenderer.Test/DrawingShapeRenderer/SvgStandAloneTests.cs → src/EPPlus.DrawingRenderer.Tests/DrawingShapeRenderer/SvgStandAloneTests.cs

@@ -10,6 +10,9 @@
 using System.Text;
 using System.Threading.Tasks;
 using EPPlus.DrawingRenderer.RenderItems.SvgItem;
+using EPPlus.Fonts.OpenType.Integration.RichText;
+using EPPlus.Fonts.OpenType.Integration.DataHolders;
+using System.Drawing;
 
 namespace EPPlus.Export.ImageRenderer.Tests.DrawingShapeRenderer
 {
@@ -52,12 +55,12 @@ public void SvgRectTest()
         }
 
         [TestMethod]
-        public void SvgTextBoxTest()
+        public void SvgTextRun()
         {
             BoundingBox bounds = new BoundingBox(0, 0, 500, 500);
             StringBuilder sb = new StringBuilder();
             var svgShapeRenderer = new SvgShapeRenderer(bounds, sb);
-            
+
 
             var baseGroup = new GroupRenderItem(bounds);
 
@@ -67,31 +70,72 @@ public void SvgTextBoxTest()
             background.Height = bounds.Height;
             background.FillColor = "aliceBlue";
 
-            //var textBody = new RenderTextBody(baseGroup.Bounds, true);
+            baseGroup.AddChildItem(background);
+
+            var rt = new RichTextFormatSimple();
+            rt.Text = "My text";
+            rt.UnderlineType = 1;
+            rt.FontColor = System.Drawing.Color.Black;
+            rt.Family = "Archivo Narrow";
+            rt.SubFamily = OfficeOpenXml.Interfaces.Fonts.FontSubFamily.Regular;
+            rt.Size = 12f;
+
+            //var paragraph = new SvgParagraphRenderItem()
+
+            var textRun = new SvgTextRunRenderItem(baseGroup.Bounds, rt, rt.Text);
+            baseGroup.AddChildItem(textRun);
+
+
+            List<RenderItem> items = new List<RenderItem>() { baseGroup };
 
+            svgShapeRenderer.Render(items);
+
+            var svg = sb.ToString();
+
+
+            SaveTextFileToWorkbook("svg\\textRunStandAlone.svg", svg);
+        }
+
+        [TestMethod]
+        public void SvgTextBodyTest()
+        {
+            BoundingBox bounds = new BoundingBox(0, 0, 500, 500);
+            StringBuilder sb = new StringBuilder();
+            var svgShapeRenderer = new SvgShapeRenderer(bounds, sb);
 
-            //textBody.
-            //textBody.Text = "Hello";
-            //var para = new SvgParagraphRenderItem(textBody, textBody.Bounds);
 
-
-            //var para2 = new DrawingParagraphRenderItem(textBody, textBody.Bounds);
-            //textBody.Paragraphs.Add
+            var baseGroup = new GroupRenderItem(bounds);
 
+            var background = new RectRenderItem(baseGroup.Bounds);
 
-            //para.Runs.Add()
+            background.Width = bounds.Width;
+            background.Height = bounds.Height;
+            background.FillColor = "aliceBlue";
 
-            //baseGroup.AddChildItem(background);
-            //baseGroup.AddChildItem(textBody);
+            baseGroup.Bounds.Width = bounds.Width;
+            baseGroup.Bounds.Height = bounds.Height;
+
+            var textBody = new SvgTextBodyRenderItem(baseGroup.Bounds, true);
+            var paragraph = textBody.AddParagraph("Hello");
+
+            paragraph.AddText(" There");
+
+            var rtItem = new RichTextFormatSimple("Second paragraph", "Archivo Narrow", 16f, true);
+            rtItem.FontColor = Color.DarkGreen;
+            var para2 = textBody.AddParagraph(rtItem);
+
+            baseGroup.AddChildItem(textBody);
+            baseGroup.AddChildItem(background);
 
             List<RenderItem> items = new List<RenderItem>() { baseGroup };
+            textBody.AppendRenderItems(items);
 
             svgShapeRenderer.Render(items);
 
             var svg = sb.ToString();
 
 
-            SaveTextFileToWorkbook("svg\\textBoxStandAlone.svg", svg);
+            SaveTextFileToWorkbook("svg\\textBodyStandAlone.svg", svg);
         }
     }
 }

src/EPPlus.Export.ImageRenderer.Test/EPPlus.Export.ImageRenderer.Tests.csproj → src/EPPlus.DrawingRenderer.Tests/EPPlus.DrawingRenderer.Tests.csproj

@@ -6,7 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <SignAssembly>True</SignAssembly>
-    <AssemblyOriginatorKeyFile>EPPlus.Export.ImageRenderer.Tests.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>EPPlus.DrawingRenderer.Tests.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <ItemGroup>

src/EPPlus.Export.ImageRenderer.Test/Shape/ShapeToSvgTests.cs → src/EPPlus.DrawingRenderer.Tests/Shape/ShapeToSvgTests.cs

@@ -637,5 +637,20 @@ public void CreateChartsWithDifferentSize()
                 SaveAndCleanup(p);
             }
         }
+
+        [TestMethod]
+        public void SuperAndSubScript()
+        {
+            ExcelPackage.License.SetNonCommercialOrganization("EPPlus Project");
+            using (var p = OpenTemplatePackage("SuperAndSubScript.xlsx"))
+            {
+                var ws = p.Workbook.Worksheets[0];
+
+                var currShape = ws.Drawings[0];
+
+                var svg = currShape.ToSvg();
+                SaveTextFileToWorkbook("svg\\SuperAndSubScript.svg", svg);
+            }
+        }
     }
 }

src/EPPlus.DrawingRenderer/RenderItems/SvgItem/SvgParagraphRenderItem.cs

@@ -1,17 +1,38 @@
 using EPPlus.Export.ImageRenderer.RenderItems.Shared;
+using EPPlus.Fonts.OpenType.Integration.DataHolders;
 using EPPlus.Graphics;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+
 
 namespace EPPlus.DrawingRenderer.RenderItems.SvgItem
 {
     public class SvgParagraphRenderItem : ParagraphRenderItem
     {
-        public SvgParagraphRenderItem(RenderTextBody body, BoundingBox parent) : base(parent)
+        public SvgParagraphRenderItem(RenderTextBody body, BoundingBox parent, string text, bool setDefaultFont = true) : base(parent, body, text, setDefaultFont)
+        {
+            ImportStyles();
+        }
+        public SvgParagraphRenderItem(RenderTextBody textBody, BoundingBox parent, IRichTextFormatSimple rtFormat): base(parent, textBody, rtFormat)
         {
+            ImportStyles();
+        }
 
+        private void ImportStyles()
+        {
+            //Import RichText data to each run
+            foreach (var run in Runs)
+            {
+                var textRun = (SvgTextRunRenderItem)run;
+                var rtOptions = _layoutSystem.InputFragments[run.OriginalRtIdx].RichTextOptions;
+                if (_layoutSystem.InputFragments.Count != 0 && run.OriginalRtIdx != -1 && rtOptions is IRichTextFormatSimple)
+                {
+                    textRun.ImportRichTextData((IRichTextFormatSimple)rtOptions);
+                }
+                else
+                {
+                    //If not use the default for the whole paragraph (potentially user specified)
+                    run.ImportFontData(DefaultParagraphFont);
+                }
+            }
         }
 
         public override RenderItemType Type => RenderItemType.Paragraph;

src/EPPlus.DrawingRenderer/RenderItems/SvgItem/SvgTextBodyRenderItem.cs

@@ -0,0 +1,29 @@
+using EPPlus.Export.ImageRenderer.RenderItems.Shared;
+using EPPlus.Fonts.OpenType.Integration.DataHolders;
+using EPPlus.Graphics;
+
+
+namespace EPPlus.DrawingRenderer.RenderItems.SvgItem
+{
+    public class SvgTextBodyRenderItem : RenderTextBody
+    {
+        public SvgTextBodyRenderItem(BoundingBox parent, bool autoSize) : base(parent, autoSize)
+        {
+        }
+
+        public SvgTextBodyRenderItem(BoundingBox parent, double left, double top, double maxWidth, double maxHeight, bool clampedToParent = false, bool autoSize = false) : base(parent, left, top, maxWidth, maxHeight, clampedToParent, autoSize)
+        {
+
+        }
+
+        protected override ParagraphRenderItem CreateParagraph(BoundingBox parent, string textIfEmpty = "")
+        {
+            return new SvgParagraphRenderItem(this, parent, textIfEmpty);
+        }
+
+        protected override ParagraphRenderItem CreateParagraph(BoundingBox parent, IRichTextFormatSimple richText)
+        {
+            return new SvgParagraphRenderItem(this, parent, richText);
+        }
+    }
+}

src/EPPlus.DrawingRenderer/RenderItems/SvgItem/SvgTextRunRenderItem.cs

@@ -9,7 +9,7 @@
 
 namespace EPPlus.DrawingRenderer.RenderItems.SvgItem
 {
-    internal class SvgTextRunRenderItem : TextRunRenderItem
+    public class SvgTextRunRenderItem : TextRunRenderItem
     {
         public SvgTextRunRenderItem(BoundingBox parent) : base(parent)
         {