Merge pull request #110 from mwagnerEE/master

Text System Overhaul Fixes

Author: jogibear9988

Samples/Example/Example.csproj

@@ -43,9 +43,11 @@
     <ProjectReference Include="..\..\Source\SVGImage\DotNetProjects.SVGImage.csproj" />
   </ItemGroup>
   <ItemGroup>
+    <Resource Include="Images\acid1_TextOnly.svg" />
     <Resource Include="Images\brush.svg" />
     <Resource Include="Images\error.svg" />
     <Resource Include="Images\example radgrad01.svg" />
+    <Resource Include="Images\boldgreen.svg" />
     <Resource Include="Images\rect.svg" />
     <Resource Include="Images\test_3.svg" />
     <Resource Include="Images\tombigel_green_router.svg" />

Samples/Example/Images/acid1_TextOnly.svg

@@ -29,7 +29,7 @@
 		<PackageIcon>images\dotnetprojects.png</PackageIcon>
 		<PackageTags>svg wpf svg-icons svg-to-png svg-to-xaml svgimage svgimage-control</PackageTags>
 		<PackageReadmeFile>Readme.md</PackageReadmeFile>
-		<EnablePackageValidation>true</EnablePackageValidation>
+		<!--<EnablePackageValidation>false</EnablePackageValidation>-->
 		<!-- NOTE: Detect breaking changes from a previous version -->
 		<PackageValidationBaselineVersion>5.1.0</PackageValidationBaselineVersion>
 	</PropertyGroup>

Samples/Example/Images/boldgreen.svg

@@ -160,10 +160,11 @@ public static Color ParseHexColor(string value)
                 newval |= (@int & 0x00000f);
                 u = newval;
             }
-            else {
-                u = Convert.ToUInt64(value.Substring(start), 16);
-            }
-
+            else
+            {
+                u = Convert.ToUInt64(value.Substring(start), 16);
+            }
+
             byte a = (byte)((u & 0xff000000) >> 24);
             byte r = (byte)((u & 0x00ff0000) >> 16);
             byte g = (byte)((u & 0x0000ff00) >> 8);
@@ -223,10 +224,12 @@ private int ParseColorNumber(string value)
         {
             if (value.EndsWith("%"))
             {
-                var nr = int.Parse(value.Substring(0, value.Length - 1));
+                var nr = double.Parse(value.Substring(0, value.Length - 1));
                 if (nr < 0)
-                    nr = 255 - nr;
-                return nr * 255 / 100;
+                    nr = 255 - nr; //TODO: what is this trying to do?
+                var result = (int)Math.Round((nr * 255) / 100);
+
+                return MathUtil.Clamp(result, 0, 255);
             }
 
             return int.Parse(value);

Source/SVGImage/DotNetProjects.SVGImage.csproj

@@ -3,6 +3,7 @@
 using System.Xml;
 using System.Linq;
 using System.Collections.Generic;
+using SVGImage.SVG.Utils;
 
 using System.Windows;
 using System.Windows.Media;
@@ -115,7 +116,8 @@ public DrawingGroup LoadDrawing(Stream stream)
 
         public DrawingGroup CreateDrawing(SVG svg)
         {
-            return this.LoadGroup(svg.Elements, svg.ViewBox, false);
+            var drawingGroup = this.LoadGroup(svg.Elements, svg.ViewBox, false);
+            return drawingGroup;
         }
 
         public DrawingGroup CreateDrawing(Shape shape)
@@ -443,9 +445,9 @@ internal DrawingGroup LoadGroup(IList<Shape> elements, Rect? viewBox, bool isSwi
                     GeometryGroup gp = textRender2.BuildTextGeometry(textShape);
                     if (gp != null)
                     {
-                        foreach (Geometry gm in gp.Children)
+                        foreach (Geometry gm in GetStyledSpans(gp))
                         {
-                            if (TextRenderBase.GetElement(gm) is TextShapeBase tspan)
+                            if (TextRender.GetElement(gm) is TextShapeBase tspan)
                             {
                                 var di = this.NewDrawingItem(tspan, gm);
                                 AddDrawingToGroup(grp, shape, di);
@@ -480,6 +482,31 @@ internal DrawingGroup LoadGroup(IList<Shape> elements, Rect? viewBox, bool isSwi
             return grp;
         }
 
+        private static IEnumerable<Geometry> GetStyledSpans(Geometry geometry)
+        {
+            if (geometry is GeometryGroup gg)
+            {
+                if (!(TextRender.GetElement(gg) is null))
+                {
+                    yield return geometry;
+                }
+                else
+                {
+                    foreach (var g in gg.Children)
+                    {
+                        foreach (var subg in GetStyledSpans(g))
+                        {
+                            yield return subg;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                yield return geometry;
+            }
+        }
+
         private void AddDrawingToGroup(DrawingGroup grp, Shape shape, Drawing drawing)
         {
             if (shape.Clip != null || shape.Transform != null || shape.Filter != null)

Source/SVGImage/SVG/PaintServers/PaintServerManager.cs

@@ -6,7 +6,7 @@ namespace SVGImage.SVG.Shapes
 
     public struct LengthPercentageOrNumber
     {
-        private static readonly Regex _lengthRegex = new Regex(@"(?<Value>\d+(?:\.\d+)?)\s*(?<Unit>%|\w+)?", RegexOptions.Compiled | RegexOptions.Singleline);
+        private static readonly Regex _lengthRegex = new Regex(@"(?<Value>-?\d+(?:\.\d+)?)\s*(?<Unit>%|\w+)?", RegexOptions.Compiled | RegexOptions.Singleline);
         private readonly LengthContext _context;
         private readonly double _value;
         /// <summary>
@@ -180,12 +180,12 @@ public static LengthPercentageOrNumber Parse(Shape owner, string value, LengthOr
             }
             else
             {
-                // Default to pixels if no unit is specified
-                context = new LengthContext(owner, LengthUnit.px);
+                // Default to Number if no unit is specified
+                context = new LengthContext(owner, LengthUnit.Number);
             }
             return new LengthPercentageOrNumber(d, context);
         }
-        
+
     }
 
 

Source/SVGImage/SVG/SVGRender.cs

@@ -125,6 +125,11 @@ public Stroke Stroke
         }
 
         protected virtual Fill DefaultFill()
+        {
+            return null;
+        }
+
+        protected virtual Fill GetParentFill()
         {
             var parent = this.Parent;
             while (parent != null)
@@ -141,7 +146,7 @@ protected virtual Fill DefaultFill()
 
         public Fill Fill
         {
-            get => m_fill ?? DefaultFill();
+            get => m_fill ?? GetParentFill() ?? DefaultFill();
             set => m_fill = value;
         }