Fixed newline issues with the RTF builder

scottrippey · scottrippey · commit d53002e310f3 · 2011-11-06T16:33:31.000-08:00
diff --git a/src/SmartFormat.Demo/ThirdParty/RTFLib/RTFBuilder.cs b/src/SmartFormat.Demo/ThirdParty/RTFLib/RTFBuilder.cs
@@ -71,13 +71,13 @@ protected override void AppendInternal(string value)
                 using (new RTFFormatWrap(this))
                 {
                     value = this.CheckChar(value);
-                    if (value.IndexOf(Environment.NewLine) >= 0)
+                    if (value.Contains("\n"))
                     {
-                        string[] lines = value.Split(new[] {Environment.NewLine}, StringSplitOptions.None);
-                        foreach (string line in lines)
+                        string[] lines = value.Split(new[] {"\r\n","\n"}, StringSplitOptions.None);
+                        for (int i = 0; i < lines.Length; i++)
                         {
-                            this._sb.Append(line);
-                            this._sb.Append("\\line ");
+                            if (i > 0) this._sb.Append("\\line ");
+                            this._sb.Append(lines[i]);
                         }
                     }
                     else

Original file line number	Diff line number	Diff line change
`@@ -71,13 +71,13 @@ protected override void AppendInternal(string value)`
`71`	`71`	`using (new RTFFormatWrap(this))`
`72`	`72`	`{`
`73`	`73`	`value = this.CheckChar(value);`
`74`		`- if (value.IndexOf(Environment.NewLine) >= 0)`
	`74`	`+ if (value.Contains("\n"))`
`75`	`75`	`{`
`76`		`- string[] lines = value.Split(new[] {Environment.NewLine}, StringSplitOptions.None);`
`77`		`- foreach (string line in lines)`
	`76`	`+ string[] lines = value.Split(new[] {"\r\n","\n"}, StringSplitOptions.None);`
	`77`	`+ for (int i = 0; i < lines.Length; i++)`
`78`	`78`	`{`
`79`		`- this._sb.Append(line);`
`80`		`- this._sb.Append("\\line ");`
	`79`	`+ if (i > 0) this._sb.Append("\\line ");`
	`80`	`+ this._sb.Append(lines[i]);`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`	`else`