Got colored text working

Author: mwagnerEE

Samples/Example/Example.csproj

@@ -47,6 +47,7 @@
     <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/boldgreen.svg

@@ -224,10 +224,12 @@ private int ParseColorNumber(string value)
         {
             if (value.EndsWith("%"))
             {
-                var nr = int.Parse(value.Substring(0, value.Length - 1)); //TODO: should this be double?
+                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/SVG/PaintServers/PaintServerManager.cs

@@ -116,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)
@@ -444,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);
@@ -481,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/SVGRender.cs

@@ -29,12 +29,27 @@ public override GeometryGroup BuildTextGeometry(TextShape text)
             }
         }
 
+
+
+        public static readonly DependencyProperty TextSpanTextStyleProperty = DependencyProperty.RegisterAttached(
+            "TextSpanTextStyle", typeof(TextStyle), typeof(DependencyObject));
+        private static void SetTextSpanTextStyle(DependencyObject obj, TextStyle value)
+        {
+            obj.SetValue(TextSpanTextStyleProperty, value);
+        }
+        public static TextStyle GetTextSpanTextStyle(DependencyObject obj)
+        {
+            return (TextStyle)obj.GetValue(TextSpanTextStyleProperty);
+        }
+
         private sealed class TextChunk
         {
             public List<GlyphRun> GlyphRuns { get; set; } = new List<GlyphRun>();
             public Dictionary<GlyphRun, List<Rect>> BackgroundDecorations { get; set; } = new Dictionary<GlyphRun, List<Rect>>();
             public Dictionary<GlyphRun, List<Rect>> ForegroundDecorations { get; set; } = new Dictionary<GlyphRun, List<Rect>>();
             public Dictionary<GlyphRun, Rect> GlyphRunBounds { get; set; } = new Dictionary<GlyphRun, Rect>();
+            public Dictionary<GlyphRun, TextStyle> TextStyles { get; set; } = new Dictionary<GlyphRun, TextStyle>();
+            public Dictionary<GlyphRun, TextShapeBase> TextContainers { get; set; } = new Dictionary<GlyphRun, TextShapeBase>();
             public TextAlignment TextAlignment { get; set; }
 
             public GeometryGroup BuildGeometry()
@@ -46,6 +61,14 @@ public GeometryGroup BuildGeometry()
                 {
                     var runGeometry = !nonZeroAlignmentOffset ? glyphRun.BuildGeometry() : glyphRun.CreateOffsetRun(alignmentOffset, 0).BuildGeometry();
                     geometryGroup.Children.Add(runGeometry);
+                    if (TextStyles.TryGetValue(glyphRun, out TextStyle textStyle))
+                    {
+                        TextRender.SetTextSpanTextStyle(runGeometry, textStyle);
+                    }
+                    if (TextContainers.TryGetValue(glyphRun, out TextShapeBase textContainer))
+                    {
+                        TextRender.SetElement(runGeometry, textContainer);
+                    }
                     if (BackgroundDecorations.TryGetValue(glyphRun, out List<Rect> backgroundDecorations))
                     {
                         foreach (var decoration in backgroundDecorations)
@@ -148,7 +171,9 @@ private static GeometryGroup CreateGeometry(TextShape root, TextRenderState stat
                     }
                     var runGeometry = run.BuildGeometry();
                     currentTextChunk.GlyphRuns.Add(run);
+                    currentTextChunk.TextStyles[run] = textStyle;
                     currentTextChunk.GlyphRunBounds[run] = runGeometry.Bounds;
+                    currentTextChunk.TextContainers[run] = (TextShapeBase)textString.Parent;
                     if (textStyle.TextDecoration != null && textStyle.TextDecoration.Count > 0)
                     {
                         GetTextDecorations(runGeometry, textStyle, font, baselineOrigin, out List<Rect> backgroundDecorations, out List<Rect> foregroundDecorations);

Source/SVGImage/SVG/Shapes/TextRender.cs

@@ -7,14 +7,14 @@ public abstract class TextRenderBase
     {
         public abstract GeometryGroup BuildTextGeometry(TextShape text);
         public static DependencyProperty TSpanElementProperty = DependencyProperty.RegisterAttached(
-            "TSpanElement", typeof(ITextNode), typeof(DependencyObject));
-        public static void SetElement(DependencyObject obj, ITextNode value)
+            "TSpanElement", typeof(TextShapeBase), typeof(DependencyObject));
+        public static void SetElement(DependencyObject obj, TextShapeBase value)
         {
             obj.SetValue(TSpanElementProperty, value);
         }
-        public static ITextNode GetElement(DependencyObject obj)
+        public static TextShapeBase GetElement(DependencyObject obj)
         {
-            return (ITextNode)obj.GetValue(TSpanElementProperty);
+            return (TextShapeBase)obj.GetValue(TSpanElementProperty);
         }
     }
 

Source/SVGImage/SVG/Shapes/TextRenderBase.cs

@@ -40,7 +40,15 @@ private string GetDebugDisplayText(StringBuilder sb)
             return sb.ToString();
         }
 
-        
+
+        protected override Fill DefaultFill()
+        {
+            return Fill.CreateDefault(Svg, "black");
+        }
+        protected override Stroke DefaultStroke()
+        {
+            return Stroke.CreateDefault(Svg, 0.1);
+        }
 
         public LengthPercentageOrNumberList X { get; protected set; }
         public LengthPercentageOrNumberList Y { get; protected set; } 

Source/SVGImage/SVG/Shapes/TextShapeBase.cs

@@ -51,7 +51,7 @@ static void BuildTextSpan(GeometryGroup gp, TextStyle textStyle,
                         baseline -= tspan.TextStyle.FontSize + (textString.TextStyle.FontSize * 0.25)/*font.CapsHeight * fontSize*/;
 
                     Geometry gm = BuildGlyphRun(textString.TextStyle, txt, x, baseline, ref totalwidth);
-                    TextRender2.SetElement(gm, textString);
+                    TextRender2.SetElement(gm, (TextShapeBase)textString.Parent);
                     gp.Children.Add(gm);
                     x += totalwidth;
                 }

Source/SVGImage/SVG/TextRender2.cs

@@ -0,0 +1,66 @@
+using SVGImage.SVG.Shapes;
+using System;
+
+namespace SVGImage.SVG.Utils
+{
+    internal static class BaselineHelper
+    {
+        public static LengthPercentageOrNumber EstimateBaselineShift(Shape shape)
+        {
+            return EstimateBaselineShift(shape.TextStyle, shape);
+        }
+        /// <summary>
+        /// The purpose of this method is to allow TextStrings which are not shapes themselves to use the same logic as TextShapes to estimate the baseline shift.
+        /// They can use this method to estimate the baseline shift based on the TextStyle of the TextString's parent Shape.
+        /// </summary>
+        /// <param name="textStyle"></param>
+        /// <param name="shape"></param>
+        /// <returns></returns>
+        public static LengthPercentageOrNumber EstimateBaselineShift(TextStyle textStyle, Shape shape)
+        {
+            if (String.IsNullOrEmpty( textStyle.BaseLineShift) || textStyle.BaseLineShift == "baseline")
+            {
+                return new LengthPercentageOrNumber(0d, new LengthContext(shape, LengthUnit.Number));
+            }
+            else if (textStyle.BaseLineShift == "sub")
+            {
+                //Based on previous estimation
+                return new LengthPercentageOrNumber( textStyle.FontSize * 0.5, new LengthContext(shape, LengthUnit.Number));
+            }
+            else if (textStyle.BaseLineShift == "super")
+            {
+                //Based on previous estimation
+                return new LengthPercentageOrNumber((-1) * (textStyle.FontSize + (textStyle.FontSize * 0.25)), new LengthContext(shape, LengthUnit.Number));
+            }
+            else if(textStyle.BaseLineShift.EndsWith("%") && Double.TryParse(textStyle.BaseLineShift.Substring(0, textStyle.BaseLineShift.Length - 1), out double d))
+            {
+                try
+                {
+                    //The computed value of the property is this percentage multiplied by the computed "line-height" of the ‘text’ element.
+                    //for the purposes of processing the ‘font’ property in SVG, 'line-height' is assumed to be equal the value for property ‘font-size’
+                    return new LengthPercentageOrNumber(d, new LengthContext(shape, LengthUnit.rem));
+                }
+                catch
+                {
+                    //Continue
+                }
+            }
+            try
+            {
+                return LengthPercentageOrNumber.Parse(shape, textStyle.BaseLineShift, LengthOrientation.Vertical);
+            }
+            catch
+            {
+                return new LengthPercentageOrNumber(0d, new LengthContext(shape, LengthUnit.Number));
+            }
+        }
+        public static double EstimateBaselineShiftValue(Shape shape)
+        {
+            return EstimateBaselineShift(shape).Value;
+        }
+        public static double EstimateBaselineShiftValue(TextStyle textStyle, Shape shape)
+        {
+            return EstimateBaselineShift(textStyle, shape).Value;
+        }
+    }
+}

Source/SVGImage/SVG/Utils/BaselineHelper.cs

@@ -18,65 +18,23 @@ public static bool IsNearlyEqual(this double a, double b, double epsilon = Doubl
         {
             return Math.Abs(a - b) < epsilon;
         }
-    }
-    internal static class BaselineHelper
-    {
-        public static LengthPercentageOrNumber EstimateBaselineShift(Shape shape)
-        {
-            return EstimateBaselineShift(shape.TextStyle, shape);
-        }
-        /// <summary>
-        /// The purpose of this method is to allow TextStrings which are not shapes themselves to use the same logic as TextShapes to estimate the baseline shift.
-        /// They can use this method to estimate the baseline shift based on the TextStyle of the TextString's parent Shape.
-        /// </summary>
-        /// <param name="textStyle"></param>
-        /// <param name="shape"></param>
-        /// <returns></returns>
-        public static LengthPercentageOrNumber EstimateBaselineShift(TextStyle textStyle, Shape shape)
+        public static int Clamp(int value, int min, int max)
         {
-            if (String.IsNullOrEmpty( textStyle.BaseLineShift) || textStyle.BaseLineShift == "baseline")
-            {
-                return new LengthPercentageOrNumber(0d, new LengthContext(shape, LengthUnit.Number));
-            }
-            else if (textStyle.BaseLineShift == "sub")
-            {
-                //Based on previous estimation
-                return new LengthPercentageOrNumber( textStyle.FontSize * 0.5, new LengthContext(shape, LengthUnit.Number));
-            }
-            else if (textStyle.BaseLineShift == "super")
+            if (min > max)
             {
-                //Based on previous estimation
-                return new LengthPercentageOrNumber((-1) * (textStyle.FontSize + (textStyle.FontSize * 0.25)), new LengthContext(shape, LengthUnit.Number));
+                throw new ArgumentException("min must be less than or equal to max", nameof(min));
             }
-            else if(textStyle.BaseLineShift.EndsWith("%") && Double.TryParse(textStyle.BaseLineShift.Substring(0, textStyle.BaseLineShift.Length - 1), out double d))
-            {
-                try
-                {
-                    //The computed value of the property is this percentage multiplied by the computed "line-height" of the ‘text’ element.
-                    //for the purposes of processing the ‘font’ property in SVG, 'line-height' is assumed to be equal the value for property ‘font-size’
-                    return new LengthPercentageOrNumber(d, new LengthContext(shape, LengthUnit.rem));
-                }
-                catch
-                {
-                    //Continue
-                }
-            }
-            try
+
+            if (value < min)
             {
-                return LengthPercentageOrNumber.Parse(shape, textStyle.BaseLineShift, LengthOrientation.Vertical);
+                return min;
             }
-            catch
+            else if (value > max)
             {
-                return new LengthPercentageOrNumber(0d, new LengthContext(shape, LengthUnit.Number));
+                return max;
             }
-        }
-        public static double EstimateBaselineShiftValue(Shape shape)
-        {
-            return EstimateBaselineShift(shape).Value;
-        }
-        public static double EstimateBaselineShiftValue(TextStyle textStyle, Shape shape)
-        {
-            return EstimateBaselineShift(textStyle, shape).Value;
+
+            return value;
         }
     }
 }