From 7a672fdb59b2d697cab3f80a1ac96b6e5b2117c7 Mon Sep 17 00:00:00 2001
From: "Aleksey.Rodchenkov" <Aleksey.Rodchenkov@renhealth.com>
Date: Thu, 18 Mar 2021 19:40:57 +0300
Subject: [PATCH 1/2] fix \r\n

---
 ...entWithSingleFieldFilledWithLinebreaks.xml | 20 ++++++++++++++++++-
 .../OpenXMLHelpers/XElementExtensions.cs      | 18 ++++++++++-------
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/sources/TemplateEngine.Docx.Tests/Resources/DocumentWithSingleFieldFilledWithLinebreaks.xml b/sources/TemplateEngine.Docx.Tests/Resources/DocumentWithSingleFieldFilledWithLinebreaks.xml
index d3236a5..be3da22 100644
--- a/sources/TemplateEngine.Docx.Tests/Resources/DocumentWithSingleFieldFilledWithLinebreaks.xml
+++ b/sources/TemplateEngine.Docx.Tests/Resources/DocumentWithSingleFieldFilledWithLinebreaks.xml
@@ -1,2 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<w:document xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:wp14="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:wpg="http://schemas.microsoft.com/office/word/2010/wordprocessingGroup" xmlns:wpi="http://schemas.microsoft.com/office/word/2010/wordprocessingInk" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape" mc:Ignorable="w14 wp14"><w:body><w:p w:rsidR="00EC1D4D" w:rsidRDefault="00ED7DA0" w:rsidP="00ED7DA0"><w:r w:rsidR="00EC1D4D"><w:t><w:t>09/06/2013</w:t><w:br /><w:t>Friday, 06 September 2013</w:t><w:br /><w:t>2013 September</w:t></w:t></w:r></w:p><w:sectPr w:rsidR="00EC1D4D" w:rsidSect="006E2549"><w:pgSz w:w="12240" w:h="15840" /><w:pgMar w:top="1440" w:right="1440" w:bottom="1440" w:left="1440" w:header="720" w:footer="720" w:gutter="0" /><w:cols w:space="720" /><w:docGrid w:linePitch="360" /></w:sectPr></w:body></w:document>
\ No newline at end of file
+<w:document xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:wp14="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:wpg="http://schemas.microsoft.com/office/word/2010/wordprocessingGroup" xmlns:wpi="http://schemas.microsoft.com/office/word/2010/wordprocessingInk" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape" mc:Ignorable="w14 wp14">
+  <w:body>
+    <w:p w:rsidR="00EC1D4D" w:rsidRDefault="00ED7DA0" w:rsidP="00ED7DA0">
+      <w:r w:rsidR="00EC1D4D">
+        <w:t>09/06/2013</w:t>
+        <w:br />
+        <w:t>Friday, 06 September 2013</w:t>
+        <w:br />
+        <w:t>2013 September</w:t>
+      </w:r>
+    </w:p>
+    <w:sectPr w:rsidR="00EC1D4D" w:rsidSect="006E2549">
+      <w:pgSz w:w="12240" w:h="15840" />
+      <w:pgMar w:top="1440" w:right="1440" w:bottom="1440" w:left="1440" w:header="720" w:footer="720" w:gutter="0" />
+      <w:cols w:space="720" />
+      <w:docGrid w:linePitch="360" />
+    </w:sectPr>
+  </w:body>
+</w:document>
\ No newline at end of file
diff --git a/sources/TemplateEngine.Docx/OpenXMLHelpers/XElementExtensions.cs b/sources/TemplateEngine.Docx/OpenXMLHelpers/XElementExtensions.cs
index ae83812..ce98e08 100644
--- a/sources/TemplateEngine.Docx/OpenXMLHelpers/XElementExtensions.cs
+++ b/sources/TemplateEngine.Docx/OpenXMLHelpers/XElementExtensions.cs
@@ -143,18 +143,22 @@ public static void ReplaceNewLinesWithBreaks(XElement xElem)
 		{
 			if (xElem == null) return;
 
-			var textWithBreaks = xElem.Descendants(W.t).Where(t => t.Value.Contains("\r\n"));
-			foreach (var textWithBreak in textWithBreaks)
-			{
+			var textWithBreaks = xElem.Descendants(W.t).Where(t => t.Value.Contains("\r\n")).ToList();
+            for (var i = textWithBreaks.Count - 1; i >= 0; i--)
+            {
+				var textWithBreak = textWithBreaks[i];
 				var text = textWithBreak.Value;
 				var split = text.Replace("\r\n", "\n").Split(new[] { "\n" }, StringSplitOptions.None);
-				textWithBreak.Value = string.Empty;
+
+				var parent = textWithBreak.Parent;
+				textWithBreak.Remove();
+
 				foreach (var s in split)
 				{
-					textWithBreak.Add(new XElement(W.t, s));
-					textWithBreak.Add(new XElement(W.br));
+					parent.Add(new XElement(W.t, s));
+					parent.Add(new XElement(W.br));
 				}
-				textWithBreak.Descendants(W.br).Last().Remove();
+				parent.Descendants(W.br).Last().Remove();
 			}
 		}
 	}

From 58e391d7684333039a93b2adb4fef0b30d8493c8 Mon Sep 17 00:00:00 2001
From: "Aleksey.Rodchenkov" <Aleksey.Rodchenkov@renhealth.com>
Date: Fri, 19 Mar 2021 10:08:31 +0300
Subject: [PATCH 2/2] \n insted of \r\n

---
 .../TemplateEngine.Docx/OpenXMLHelpers/XElementExtensions.cs    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources/TemplateEngine.Docx/OpenXMLHelpers/XElementExtensions.cs b/sources/TemplateEngine.Docx/OpenXMLHelpers/XElementExtensions.cs
index ce98e08..abda7e9 100644
--- a/sources/TemplateEngine.Docx/OpenXMLHelpers/XElementExtensions.cs
+++ b/sources/TemplateEngine.Docx/OpenXMLHelpers/XElementExtensions.cs
@@ -143,7 +143,7 @@ public static void ReplaceNewLinesWithBreaks(XElement xElem)
 		{
 			if (xElem == null) return;
 
-			var textWithBreaks = xElem.Descendants(W.t).Where(t => t.Value.Contains("\r\n")).ToList();
+			var textWithBreaks = xElem.Descendants(W.t).Where(t => t.Value.Contains("\n")).ToList();
             for (var i = textWithBreaks.Count - 1; i >= 0; i--)
             {
 				var textWithBreak = textWithBreaks[i];