Attempting to fix merge conflicts

Source/Document Structure/SvgDescription.cs

@@ -15,16 +15,17 @@ namespace Svg
         }
 
 
-		public override SvgElement DeepCopy()
-		{
-			return DeepCopy<SvgDescription>();
-		}
+	public override SvgElement DeepCopy()
+        {
+            return DeepCopy<SvgDescription>();
+        }
 
-		public override SvgElement DeepCopy<T>()
-		{
-			var newObj = base.DeepCopy<T>() as SvgDescription;
-			return newObj;
-		}
+        public override SvgElement DeepCopy<T>()
+        {
+            var newObj = base.DeepCopy<T>() as SvgDescription;
+            newObj.Text = this.Text;
+            return newObj;
+        }
 
     }
 }
\ No newline at end of file

Source/Document Structure/SvgTitle.cs

@@ -13,16 +13,16 @@ namespace Svg
             return this.Content;
         }
 
-		public override SvgElement DeepCopy()
-		{
+        public override SvgElement DeepCopy()
+        {
             return DeepCopy<SvgTitle>();
-		}
+        }
 
-		public override SvgElement DeepCopy<T>()
-		{
+        public override SvgElement DeepCopy<T>()
+        {
             var newObj = base.DeepCopy<T>() as SvgTitle;
-			return newObj;
-		}
+            return newObj;
+        }
 
     }
 }
\ No newline at end of file

Source/Painting/SvgColourConverter.cs

@@ -57,9 +57,9 @@ namespace Svg
 							{
 								alphastring = "0" + alphastring;
 							}
-							
+
 							var alphaDecimal = decimal.Parse(alphastring);
-							
+
 							if(alphaDecimal <= 1)
 							{
 								alphaValue = (int)(alphaDecimal * 255);

Source/Painting/SvgPaintServerFactory.cs

@@ -116,4 +116,4 @@ namespace Svg
             return base.ConvertTo(context, culture, value, destinationType);
         }
     }
-}
+}
\ No newline at end of file

Source/Paths/SvgClosePathSegment.cs

@@ -8,7 +8,7 @@ namespace Svg.Pathing
     {
         public override void AddToPath(System.Drawing.Drawing2D.GraphicsPath graphicsPath)
         {
-
+
             // Important for custom line caps.  Force the path the close with an explicit line, not just an implicit close of the figure.
             if (graphicsPath.PointCount > 0 && !graphicsPath.PathPoints[0].Equals(graphicsPath.PathPoints[graphicsPath.PathPoints.Length - 1]))
             {
@@ -26,4 +26,4 @@ namespace Svg.Pathing
 		}
 
     }
-}
+}
\ No newline at end of file

Source/Paths/SvgPathBuilder.cs

@@ -222,9 +222,9 @@ namespace Svg
             {
                 var lastSegment = segments.Last;
 
-                // if the last element is a SvgClosePathSegment the position of the previous move to should be used because the position of SvgClosePathSegment is 0,0
+                // if the last element is a SvgClosePathSegment the position of the previous element should be used because the position of SvgClosePathSegment is 0,0
                 if (lastSegment is SvgClosePathSegment)
-                    lastSegment = segments.OfType<SvgMoveToSegment>().Last();
+                    lastSegment = segments[segments.Count - 2];
 
                 if (isRelativeX)
                 {
@@ -290,7 +290,6 @@ namespace Svg
         {
             if (value is string)
             {
-                if (string.IsNullOrEmpty((string)value)) return new SvgPathSegmentList();
                 return Parse((string)value);
             }
 

Source/Svg.csproj

@@ -16,7 +16,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <SccProjectName>
     </SccProjectName>
@@ -121,6 +121,7 @@
     <Compile Include="Extensions.cs" />
     <Compile Include="Painting\ISvgBoundable.cs" />
     <Compile Include="Painting\SvgDeferredPaintServer.cs" />
+    <Compile Include="Painting\ISvgBoundable.cs" />
     <Compile Include="Painting\SvgMarker.cs" />
     <Compile Include="Document Structure\SvgDefinitionList.cs" />
     <Compile Include="Document Structure\SvgDescription.cs" />

Source/SvgDocument.cs

@@ -401,4 +401,4 @@ namespace Svg
             }
         }
     }
-}
+}
\ No newline at end of file

Source/SvgElement.cs

@@ -527,7 +527,7 @@ namespace Svg
 	            foreach (var attr in _svgEventAttributes)
 	            {
 	                var evt = attr.Event.GetValue(this);
-	                
+
 	                //if someone has registered publish the attribute
 	                if (evt != null && !string.IsNullOrEmpty(this.ID))
 	                {
@@ -711,7 +711,7 @@ namespace Svg
 			newObj.ID = this.ID;
 			newObj.Content = this.Content;
 			newObj.ElementName = this.ElementName;
-			
+
 //			if (this.Parent != null)
 	//			this.Parent.Children.Add(newObj);
 
@@ -724,11 +724,11 @@ namespace Svg
 			{
 				newObj.Children.Add(child.DeepCopy());
 			}
-			
+
 			foreach (var attr in this._svgEventAttributes)
 			{
 				var evt = attr.Event.GetValue(this);
-				
+
 				//if someone has registered also register here
 				if (evt != null)
 				{
@@ -750,7 +750,7 @@ namespace Svg
 						(newObj as SvgText).Change += delegate {  };
 				}
 			}
-			
+
 			if(this._customAttributes.Count > 0)
 			{
 				foreach (var element in _customAttributes) 
@@ -758,15 +758,15 @@ namespace Svg
 					newObj.CustomAttributes.Add(element.Key, element.Value);
 				}
 			}
-				
+
 			return newObj;
         }
-		
+
 		/// <summary>
         /// Fired when an Atrribute of this Element has changed
         /// </summary>
 		public event EventHandler<AttributeEventArgs> AttributeChanged;
-		
+
 		protected void OnAttributeChanged(AttributeEventArgs args)
 		{
 			var handler = AttributeChanged;
@@ -775,12 +775,12 @@ namespace Svg
 				handler(this, args);
 			}
 		}
-		
+
 		/// <summary>
         /// Fired when an Atrribute of this Element has changed
         /// </summary>
 		public event EventHandler<ContentEventArgs> ContentChanged;
-		
+
 		protected void OnContentChanged(ContentEventArgs args)
 		{
 			var handler = ContentChanged;

Source/Text/SvgText.cs

@@ -48,4 +48,4 @@ namespace Svg
             return newObj;
         }
     }
-}
+}
\ No newline at end of file