From 9e80dfc7e939d2e1410ef43c620b32003d568b21 Mon Sep 17 00:00:00 2001
From: "Sergey V. Zhdanovskih" <serg.zhdanovskih@yandex.ru>
Date: Tue, 23 Jan 2024 19:47:52 +0300
Subject: [PATCH] Fixed missing empty lines in notes (fix #522)

---
 locales/help_enu/gkhHistory.html          |  1 +
 locales/help_rus/gkhHistory.html          |  1 +
 projects/GKCore/GDModel/GDMLines.cs       | 11 +++++-
 projects/GKTests/GDModel/GDMLinesTests.cs | 48 +++++++++++++++++------
 4 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/locales/help_enu/gkhHistory.html b/locales/help_enu/gkhHistory.html
index 2ff60bcd9..67ba985c1 100644
--- a/locales/help_enu/gkhHistory.html
+++ b/locales/help_enu/gkhHistory.html
@@ -12,6 +12,7 @@ <h1>Change log</h1>
 
     <p>
         <b>??.??.2024 [v2.29.0 &amp; v3.5.0]</b><ul>
+            <li>Fixed missing empty lines in notes.
             <li>Fixed an error in attaching unknown (and webp) multimedia files.
             <li>Added columns for signs of the presence of multimedia, notes and sources to the lists of events/facts.
             <li>Added a call to quickly view information in the record selection dialog (list pop-up menu).
diff --git a/locales/help_rus/gkhHistory.html b/locales/help_rus/gkhHistory.html
index 7f25d4070..b3aced509 100644
--- a/locales/help_rus/gkhHistory.html
+++ b/locales/help_rus/gkhHistory.html
@@ -12,6 +12,7 @@ <h1>История версий</h1>
 
     <p>
         <b>??.??.2024 [v2.29.0 &amp; v3.5.0]</b><ul>
+		    <li>Исправлены отсутствующие пустые строки в заметках.
             <li>Исправлена ошибка присоединения неизвестных (и webp) мультимедиа файлов.
             <li>Добавлены столбцы признаков наличия мультимедиа, заметок и источников в списки событий/фактов.
             <li>Добавлен вызов быстрого просмотра информации в диалог выбора записей (всплывающее меню списка).
diff --git a/projects/GKCore/GDModel/GDMLines.cs b/projects/GKCore/GDModel/GDMLines.cs
index 62fe99736..e8b50759d 100644
--- a/projects/GKCore/GDModel/GDMLines.cs
+++ b/projects/GKCore/GDModel/GDMLines.cs
@@ -84,6 +84,8 @@ public void Assign(GDMLines source)
         /// <summary>
         /// A function for safely platform-independent string splitting by newlines.
         /// Because in some UI (Eto.Forms) string on Windows may come with '\n' delimiter instead of '\r\n'.
+        ///
+        /// Variants: \n - Unix & Unix-like (including MacOSX aka macOS?), \r\n - Windows, \r - classic MacOS before 2001.
         /// </summary>
         private void ParseLine(string line)
         {
@@ -97,19 +99,24 @@ private void ParseLine(string line)
 
             int inPos = 0, inLen = line.Length;
             int outPos = 0, outLen = 0;
+            bool wasLF = false;
             while (true) {
                 char ch = (inPos >= inLen) ? '\0' : line[inPos];
                 inPos += 1;
 
-                if (ch == '\r' || ch == '\n' || ch == '\0') {
-                    if (outLen > 0) {
+                if (ch == '\n' || ch == '\0') {
+                    if (outLen > 0 || wasLF) {
                         string piece = line.Substring(outPos, outLen);
                         Add(piece);
                     }
                     outPos = inPos;
                     outLen = 0;
+                    wasLF = true;
+                } else if (ch == '\r') {
+                    // skipped
                 } else {
                     outLen += 1;
+                    wasLF = false;
                 }
 
                 if (ch == '\0') break;
diff --git a/projects/GKTests/GDModel/GDMLinesTests.cs b/projects/GKTests/GDModel/GDMLinesTests.cs
index 046056d67..a60afba50 100644
--- a/projects/GKTests/GDModel/GDMLinesTests.cs
+++ b/projects/GKTests/GDModel/GDMLinesTests.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2021 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2023 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -49,18 +49,6 @@ public void Test_Common()
 
             Assert.AreEqual("The\r\nstring\r\nlist\r\ntest", strList.Text);
 
-            var strList1 = new GDMLines("The\r\nstring\r\nlist\r\ntest");
-            Assert.AreEqual("The", strList1[0]);
-            Assert.AreEqual("string", strList1[1]);
-            Assert.AreEqual("list", strList1[2]);
-            Assert.AreEqual("test", strList1[3]);
-
-            strList1 = new GDMLines("The1\nstring1\nlist1\ntest1");
-            Assert.AreEqual("The1", strList1[0]);
-            Assert.AreEqual("string1", strList1[1]);
-            Assert.AreEqual("list1", strList1[2]);
-            Assert.AreEqual("test1", strList1[3]);
-
             GDMLines strList2 = new GDMLines();
             strList2.Assign(null);
             strList2.Assign(strList);
@@ -102,5 +90,39 @@ public void Test_Common()
             string[] strArr = null;
             Assert.Throws(typeof(ArgumentNullException), () => { strList.AddRange(strArr); });
         }
+
+        [Test]
+        public void Test_CRLF()
+        {
+            var strList1 = new GDMLines("The\r\nstring\r\n\r\nlist\r\ntest");
+            Assert.AreEqual("The", strList1[0]);
+            Assert.AreEqual("string", strList1[1]);
+            Assert.AreEqual("", strList1[2]);
+            Assert.AreEqual("list", strList1[3]);
+            Assert.AreEqual("test", strList1[4]);
+        }
+
+        [Test]
+        public void Test_LFOnly()
+        {
+            var strList1 = new GDMLines("The1\nstring1\n\nlist1\ntest1");
+            Assert.AreEqual("The1", strList1[0]);
+            Assert.AreEqual("string1", strList1[1]);
+            Assert.AreEqual("", strList1[2]);
+            Assert.AreEqual("list1", strList1[3]);
+            Assert.AreEqual("test1", strList1[4]);
+        }
+
+        [Test]
+        public void Test_EmptyLines()
+        {
+            var strList = new GDMLines();
+            strList.Text = "The string\r\n\r\n list test";
+            Assert.AreEqual("The string\r\n\r\n list test", strList.Text);
+
+            Assert.AreEqual("The string", strList[0]);
+            Assert.AreEqual("", strList[1]);
+            Assert.AreEqual(" list test", strList[2]);
+        }
     }
 }