From 160986eb95105afee1211a0e1a3dc2d29d5e6e05 Mon Sep 17 00:00:00 2001
From: Michael Smith <mike@mikelikescoding.com>
Date: Wed, 17 Feb 2016 22:31:51 -0800
Subject: [PATCH] + Fix for a missing newline occurring for some solids in
 block statemants.

---
 OSCADSharp/OSCADSharp.UnitTests/CubeTests.cs   | 2 +-
 OSCADSharp/OSCADSharp.UnitTests/SphereTests.cs | 2 +-
 OSCADSharp/OSCADSharp/Solids/Cube.cs           | 5 +++--
 OSCADSharp/OSCADSharp/Solids/Cylinder.cs       | 4 ++--
 OSCADSharp/OSCADSharp/Solids/Sphere.cs         | 4 ++--
 OSCADSharp/OSCADSharp/Solids/Text3D.cs         | 1 +
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/OSCADSharp/OSCADSharp.UnitTests/CubeTests.cs b/OSCADSharp/OSCADSharp.UnitTests/CubeTests.cs
index 2968f8a..06c768d 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/CubeTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/CubeTests.cs
@@ -51,7 +51,7 @@ namespace OSCADSharp.UnitTests
             string script = cube.ToString();
 
             Assert.IsTrue(script.StartsWith("cube("));
-            Assert.IsTrue(script.EndsWith(");"));
+            Assert.IsTrue(script.TrimEnd().EndsWith(");"));
         }
 
         [TestMethod]
diff --git a/OSCADSharp/OSCADSharp.UnitTests/SphereTests.cs b/OSCADSharp/OSCADSharp.UnitTests/SphereTests.cs
index 1e87047..f49acc8 100644
--- a/OSCADSharp/OSCADSharp.UnitTests/SphereTests.cs
+++ b/OSCADSharp/OSCADSharp.UnitTests/SphereTests.cs
@@ -51,7 +51,7 @@ namespace OSCADSharp.UnitTests
             string script = basicSphere.ToString();
 
             Assert.IsTrue(script.StartsWith("sphere("));
-            Assert.IsTrue(script.EndsWith(");"));
+            Assert.IsTrue(script.TrimEnd().EndsWith(");"));
         }
 
         [TestMethod]
diff --git a/OSCADSharp/OSCADSharp/Solids/Cube.cs b/OSCADSharp/OSCADSharp/Solids/Cube.cs
index 4649756..1b764f2 100644
--- a/OSCADSharp/OSCADSharp/Solids/Cube.cs
+++ b/OSCADSharp/OSCADSharp/Solids/Cube.cs
@@ -68,8 +68,9 @@ namespace OSCADSharp.Solids
         /// <returns>Script for this object</returns>
         public override string ToString()
         {
-            return String.Format("cube(size = [{0}, {1}, {2}], center = {3});", 
-                this.Size.X.ToString(), this.Size.Y.ToString(), this.Size.Z.ToString(), this.Center.ToString().ToLower()); ;
+            return String.Format("cube(size = [{0}, {1}, {2}], center = {3}); {4}", 
+                this.Size.X.ToString(), this.Size.Y.ToString(), this.Size.Z.ToString(), 
+                this.Center.ToString().ToLower(), Environment.NewLine); ;
         }
 
         /// <summary>
diff --git a/OSCADSharp/OSCADSharp/Solids/Cylinder.cs b/OSCADSharp/OSCADSharp/Solids/Cylinder.cs
index 44439e2..14f0a7c 100644
--- a/OSCADSharp/OSCADSharp/Solids/Cylinder.cs
+++ b/OSCADSharp/OSCADSharp/Solids/Cylinder.cs
@@ -125,9 +125,9 @@ namespace OSCADSharp.Solids
         /// <returns>Script for this object</returns>
         public override string ToString()
         {
-            return String.Format("cylinder($fn = {0}, $fa = {1}, $fs = {2}, h = {3}, r1 = {4}, r2 = {5}, center = {6});", 
+            return String.Format("cylinder($fn = {0}, $fa = {1}, $fs = {2}, h = {3}, r1 = {4}, r2 = {5}, center = {6}); {7}", 
                 Resolution.ToString(), MinimumAngle.ToString(),  MinimumCircumferentialLength.ToString(),
-                Height.ToString(), Radius1.ToString(), Radius2.ToString(), Center.ToString().ToLower());
+                Height.ToString(), Radius1.ToString(), Radius2.ToString(), Center.ToString().ToLower(), Environment.NewLine);
         }
 
         /// <summary>
diff --git a/OSCADSharp/OSCADSharp/Solids/Sphere.cs b/OSCADSharp/OSCADSharp/Solids/Sphere.cs
index 6c42670..6f32c4b 100644
--- a/OSCADSharp/OSCADSharp/Solids/Sphere.cs
+++ b/OSCADSharp/OSCADSharp/Solids/Sphere.cs
@@ -69,9 +69,9 @@ namespace OSCADSharp.Solids
         /// <returns>Script for this object</returns>
         public override string ToString()
         {
-            return String.Format("sphere($fn = {0}, $fa = {1}, $fs = {2}, r = {3});", 
+            return String.Format("sphere($fn = {0}, $fa = {1}, $fs = {2}, r = {3});{4}", 
                 this.Resolution.ToString(), this.MinimumAngle.ToString(), 
-                this.MinimumFragmentSize.ToString(), this.Radius.ToString());
+                this.MinimumFragmentSize.ToString(), this.Radius.ToString(), Environment.NewLine);
         }
 
         /// <summary>
diff --git a/OSCADSharp/OSCADSharp/Solids/Text3D.cs b/OSCADSharp/OSCADSharp/Solids/Text3D.cs
index 7bbe4dd..f71cfa8 100644
--- a/OSCADSharp/OSCADSharp/Solids/Text3D.cs
+++ b/OSCADSharp/OSCADSharp/Solids/Text3D.cs
@@ -123,6 +123,7 @@ namespace OSCADSharp.Solids
             appendIfValueNotNullOrEmpty("language", this.Language?.ToString(), sb);            
 
             sb.Append(");");
+            sb.Append(Environment.NewLine);
             
             var formatter = new SingleBlockFormatter(String.Format("linear_extrude(height = {0})", 1), sb.ToString());
             return formatter.ToString();