From 25be5d696fe6297907acd1c6e6e392e2dadd6fd7 Mon Sep 17 00:00:00 2001
From: John Maxwell <maxwellparc@gmail.com>
Date: Fri, 27 Feb 2026 10:13:45 -0800
Subject: [PATCH 1/2] Fix LT-22428: Add More than one line and Exactly one line
 filters

---
 Src/Common/Controls/XMLViews/FilterBar.cs     |  2 +
 .../XMLViews/XMLViewsStrings.Designer.cs      | 54 ++++++++++++-----
 .../Controls/XMLViews/XMLViewsStrings.resx    |  8 ++-
 Src/Common/Filters/RecordFilter.cs            | 60 +++++++++++++++++++
 Src/Common/RootSite/CollectorEnv.cs           | 10 ++++
 5 files changed, 118 insertions(+), 16 deletions(-)

diff --git a/Src/Common/Controls/XMLViews/FilterBar.cs b/Src/Common/Controls/XMLViews/FilterBar.cs
index be7c24fc6d..27aa1f4fbd 100644
--- a/Src/Common/Controls/XMLViews/FilterBar.cs
+++ b/Src/Common/Controls/XMLViews/FilterBar.cs
@@ -967,6 +967,8 @@ protected void MakeCombo(FilterSortItem item)
 				case "true":
 					combo.Items.Add(new FilterComboItem(MakeLabel(XMLViewsStrings.ksBlanks), new BlankMatcher(), item));
 					combo.Items.Add(new FilterComboItem(MakeLabel(XMLViewsStrings.ksNonBlanks), new NonBlankMatcher(), item));
+					combo.Items.Add(new FilterComboItem(MakeLabel(XMLViewsStrings.ksMoreThanOneLine), new MoreThanOneLineMatcher(), item));
+					combo.Items.Add(new FilterComboItem(MakeLabel(XMLViewsStrings.ksExactlyOneLine), new ExactlyOneLineMatcher(), item));
 					break;
 			}
 
diff --git a/Src/Common/Controls/XMLViews/XMLViewsStrings.Designer.cs b/Src/Common/Controls/XMLViews/XMLViewsStrings.Designer.cs
index e6fb69808e..57d5f1ba44 100644
--- a/Src/Common/Controls/XMLViews/XMLViewsStrings.Designer.cs
+++ b/Src/Common/Controls/XMLViews/XMLViewsStrings.Designer.cs
@@ -1,4 +1,4 @@
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //     Runtime Version:4.0.30319.18444
@@ -780,20 +780,44 @@ internal static string ksNoDesc {
                 return ResourceManager.GetString("ksNoDesc", resourceCulture);
             }
         }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Non-blanks.
-        /// </summary>
-        internal static string ksNonBlanks {
-            get {
-                return ResourceManager.GetString("ksNonBlanks", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to (none).
-        /// </summary>
-        internal static string ksNone {
+
+		/// <summary>
+		///   Looks up a localized string similar to Non-blanks.
+		/// </summary>
+		internal static string ksNonBlanks
+		{
+			get
+			{
+				return ResourceManager.GetString("ksNonBlanks", resourceCulture);
+			}
+		}
+
+		/// <summary>
+		///   Looks up a localized string similar to Exactly one line.
+		/// </summary>
+		internal static string ksExactlyOneLine
+		{
+			get
+			{
+				return ResourceManager.GetString("ksExactlyOneLine", resourceCulture);
+			}
+		}
+
+		/// <summary>
+		///   Looks up a localized string similar to More than one line.
+		/// </summary>
+		internal static string ksMoreThanOneLine
+		{
+			get
+			{
+				return ResourceManager.GetString("ksMoreThanOneLine", resourceCulture);
+			}
+		}
+
+		/// <summary>
+		///   Looks up a localized string similar to (none).
+		/// </summary>
+		internal static string ksNone {
             get {
                 return ResourceManager.GetString("ksNone", resourceCulture);
             }
diff --git a/Src/Common/Controls/XMLViews/XMLViewsStrings.resx b/Src/Common/Controls/XMLViews/XMLViewsStrings.resx
index 2f84f238a0..078ac29439 100644
--- a/Src/Common/Controls/XMLViews/XMLViewsStrings.resx
+++ b/Src/Common/Controls/XMLViews/XMLViewsStrings.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -330,6 +330,12 @@ Change the writing system of one of these columns or remove the duplicated colum
   <data name="ksNonBlanks" xml:space="preserve">
     <value>Non-blanks</value>
   </data>
+  <data name="ksMoreThanOneLine" xml:space="preserve">
+    <value>More than one line</value>
+  </data>
+  <data name="ksExactlyOneLine" xml:space="preserve">
+    <value>Exactly one line</value>
+  </data>
   <data name="ksNone" xml:space="preserve">
     <value>(none)</value>
   </data>
diff --git a/Src/Common/Filters/RecordFilter.cs b/Src/Common/Filters/RecordFilter.cs
index 40830e6ab4..5d7da342a9 100644
--- a/Src/Common/Filters/RecordFilter.cs
+++ b/Src/Common/Filters/RecordFilter.cs
@@ -1341,6 +1341,7 @@ public override bool Matches(ITsString arg)
 			}
 			return false;
 		}
+
 		/// <summary>
 		/// True if it is the same class and member vars match.
 		/// </summary>
@@ -1352,6 +1353,65 @@ public override bool SameMatcher(IMatcher other)
 		}
 	}
 
+	/// <summary>
+	/// Matches entries with more than one line.
+	/// </summary>
+	public class MoreThanOneLineMatcher : BaseMatcher
+	{
+		/// ------------------------------------------------------------------------------------
+		/// <summary>
+		/// Contains a new line.
+		/// </summary>
+		/// <param name="arg"></param>
+		/// <returns></returns>
+		/// ------------------------------------------------------------------------------------
+		public override bool Matches(ITsString arg)
+		{
+			if (arg == null || arg.Length == 0)
+				return false;
+			return arg.Text.Contains("\r");
+		}
+
+		/// <summary>
+		/// True if it is the same class and member vars match.
+		/// </summary>
+		/// <param name="other"></param>
+		/// <returns></returns>
+		public override bool SameMatcher(IMatcher other)
+		{
+			return other is MoreThanOneLineMatcher;
+		}
+	}
+
+	/// <summary>
+	/// Matches entries with exactly one line.
+	/// </summary>
+	public class ExactlyOneLineMatcher : BaseMatcher
+	{
+		/// ------------------------------------------------------------------------------------
+		/// <summary>
+		/// Does not contain a new line and is not empty.
+		/// </summary>
+		/// <param name="arg"></param>
+		/// <returns></returns>
+		/// ------------------------------------------------------------------------------------
+		public override bool Matches(ITsString arg)
+		{
+			if (arg == null || arg.Length == 0)
+				return false;
+			return !arg.Text.Contains("\r");
+		}
+		/// <summary>
+		/// True if it is the same class and member vars match.
+		/// </summary>
+		/// <param name="other"></param>
+		/// <returns></returns>
+		public override bool SameMatcher(IMatcher other)
+		{
+			return other is ExactlyOneLineMatcher;
+		}
+	}
+
 	/// <summary>
 	/// Matches if the embedded matcher fails.
 	/// </summary>
diff --git a/Src/Common/RootSite/CollectorEnv.cs b/Src/Common/RootSite/CollectorEnv.cs
index 3a719844a7..8183933479 100644
--- a/Src/Common/RootSite/CollectorEnv.cs
+++ b/Src/Common/RootSite/CollectorEnv.cs
@@ -2921,6 +2921,11 @@ public TsStringCollectorEnv(IVwEnv baseEnv, ISilDataAccess sda, int hvoRoot):
 		/// ------------------------------------------------------------------------------------
 		public override void AddTsString(ITsString tss)
 		{
+			if (m_builder.Text != null)
+			{
+				// Allow MoreThanOneLineMatcher and ExactlyOneLineMatcher to distinguish lines.
+				m_builder.Append("\r");
+			}
 			AppendSpaceForFirstWordInNewParagraph(tss.Text);
 			m_builder.AppendTsString(tss);
 		}
@@ -2933,6 +2938,11 @@ public override void AddTsString(ITsString tss)
 		/// ------------------------------------------------------------------------------------
 		internal protected override void AddResultString(string s)
 		{
+			if (m_builder.Text != null)
+			{
+				// Allow MoreThanOneLineMatcher and ExactlyOneLineMatcher to distinguish lines.
+				m_builder.Append("\r");
+			}
 			AppendSpaceForFirstWordInNewParagraph(s);
 			m_builder.Append(s);
 		}

From 9d3dce2c2b0a3f305e6bf714915eafb5e732b5c4 Mon Sep 17 00:00:00 2001
From: John Maxwell <maxwellparc@gmail.com>
Date: Fri, 27 Feb 2026 14:30:10 -0800
Subject: [PATCH 2/2] Fix unit tests to include \r

---
 Src/LexText/Interlinear/ITextDllTests/SandboxBaseTests.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Src/LexText/Interlinear/ITextDllTests/SandboxBaseTests.cs b/Src/LexText/Interlinear/ITextDllTests/SandboxBaseTests.cs
index 7daf650258..dab560d90e 100644
--- a/Src/LexText/Interlinear/ITextDllTests/SandboxBaseTests.cs
+++ b/Src/LexText/Interlinear/ITextDllTests/SandboxBaseTests.cs
@@ -427,8 +427,8 @@ public void LexEntriesComboHandler_ItemsInComboForInflVariant()
 
 					var handlerList =  handler.ComboList.Items;
 
-					Assert.That(handlerList[0].ToString(), Is.EqualTo("Add New Sense for blondeEntry ..."));
-					Assert.That(handlerList[1].ToString(), Is.EqualTo("  fair haired, ???, blondEntry+dial.var."));
+					Assert.That(handlerList[0].ToString(), Is.EqualTo("Add New Sense for blondeEntry\r ..."));
+					Assert.That(handlerList[1].ToString(), Is.EqualTo("  fair haired, ???, blondEntry\r\r+\rdial.var."));
 					Assert.That(handlerList[2].ToString(), Is.EqualTo("    Add New Sense..."));
 				}
 			}