more meaningful names are generated for a use and text tags. Empty text nodes are removed from an output.

Author: ievgennaida

SvgFileType/SvgFileType.cs

@@ -23,7 +23,7 @@ public SvgFileType()
         {
         }
 
-        // Dont change this text! It's used by a PSD import plugin to keep photoshop folder strure.
+        // Dont change this text! It's used by a PSD import plugin to keep photoshop folder structure.
         public const string LayerGroupBegin = "Layer Group: {0}";
         public const string LayerGroupEnd = "End Layer Group: {0}";
 
@@ -248,7 +248,7 @@ private static void RenderElements( List<SvgVisualElement> elements, Document ou
             {
                 if (element is PaintGroupBoundaries)
                 {
-                    // Render empty boundary and continue
+                    // Render empty group boundary and continue
                     var pdnLayer = new BitmapLayer(outputDocument.Width, outputDocument.Height);
                     pdnLayer.Name = ((PaintGroupBoundaries)element).ID;
                     outputDocument.Layers.Add(pdnLayer);
@@ -262,6 +262,7 @@ private static void RenderElements( List<SvgVisualElement> elements, Document ou
                 }
 
                 bool itemShouldBeIgnored = false;
+
                 // Turn on visibility from node to parent
                 var toCheck = (SvgElement)element;
                 while (toCheck != null)
@@ -413,10 +414,31 @@ private static string GetLayerTitle(SvgElement element)
                     layerName = getter.Invoke(element, null) as string;
                 }
 
-                if(string.IsNullOrEmpty(layerName))
+                if (string.IsNullOrEmpty(layerName))
                 {
                     layerName = element.GetType().Name;
                 }
+
+                // Generate more meanfull name for a svg use node. Add reference element name in a case if it's local document.
+                var useElement = element as SvgUse;
+                if (useElement != null && useElement.ReferencedElement != null && !string.IsNullOrEmpty(useElement.ReferencedElement.OriginalString))
+                {
+                    var str = useElement.ReferencedElement.OriginalString.Trim();
+                    if(str.StartsWith("#"))
+                    {
+                        layerName += str.Replace('#', ' ');
+                    }
+                }
+
+                // Genearte more meanfull name for a svg text.
+                var text = element as SvgTextBase;
+                if (text != null && !string.IsNullOrEmpty(text.Text))
+                {
+                    var textToUse = text.Text;
+                    if (text.Text.Length > 35)
+                        textToUse = text.Text.Substring(0, 35);
+                    layerName += " " + textToUse;
+                }
             }
 
             return layerName;
@@ -435,12 +457,6 @@ private static IEnumerable<SvgElement> PrepareFlatElements(SvgElementCollection
                         continue;
                     }
 
-                    // Dont prepare def lists for a separate rendering.
-                    if (toRender is SvgDefinitionList)
-                    {
-                        continue;
-                    }
-
                     var isGroup = toRender is SvgGroup;
                     if (isGroup)
                     {
@@ -489,6 +505,11 @@ private static IEnumerable<SvgElement> PrepareFlatElements(SvgElementCollection
                         yield return new PaintGroupBoundaries() { ID = string.Format(LayerGroupBegin, groupName), IsStart = true };
                     }
 
+                    // Skip text with empty content. But keep all children nodes.
+                    var textNode = toRender as SvgTextBase;
+                    if (textNode != null && string.IsNullOrEmpty(textNode.Text))
+                        continue;
+
                     yield return toRender;
                 }
             }