diff --git a/src/MiniWord/MiniWord.Implment.cs b/src/MiniWord/MiniWord.Implment.cs index 2a08cd1..93e2309 100644 --- a/src/MiniWord/MiniWord.Implment.cs +++ b/src/MiniWord/MiniWord.Implment.cs @@ -473,16 +473,16 @@ private static void ReplaceText(OpenXmlElement xmlElement, WordprocessingDocumen } } } - + t.Text = EvaluateIfStatement(t.Text); - + // add breakline { var newText = t.Text; - var splits = Regex.Split(newText, "(<[a-zA-Z/].*?>|\n)"); + var splits = Regex.Split(newText, "(<[a-zA-Z/].*?>|\n|\r\n)").Where(o => o != "\n" && o != "\r\n"); var currentT = t; var isFirst = true; - if (splits.Length > 1) + if (splits.Count() > 1) { foreach (var v in splits) { diff --git a/src/MiniWord/MiniWord.csproj b/src/MiniWord/MiniWord.csproj index 6dbf54a..2c54a73 100644 --- a/src/MiniWord/MiniWord.csproj +++ b/src/MiniWord/MiniWord.csproj @@ -1,6 +1,6 @@  - net45;netstandard2.0;net5.0 + net45;netstandard2.0; 0.7.1 @@ -32,6 +32,6 @@ - + diff --git a/src/MiniWord/MiniWordPicture.cs b/src/MiniWord/MiniWordPicture.cs index 38f8b94..8dab97c 100644 --- a/src/MiniWord/MiniWordPicture.cs +++ b/src/MiniWord/MiniWordPicture.cs @@ -24,7 +24,7 @@ public string Extension } set { _extension = value; } } - internal ImagePartType GetImagePartType + internal PartTypeInfo GetImagePartType { get {