From 02c7dbb824b8b1b61e0472336cb94c9be4aa674d Mon Sep 17 00:00:00 2001
From: Kornel Benko <kornel@lyx.org>
Date: Tue, 3 May 2022 16:31:52 +0200
Subject: [PATCH] FindAdv: Better handling of lists

Still not optimal if searching different languages inside a list.
---
 src/lyxfind.cpp | 33 ++++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index de512b8939..2c14cbd821 100644
--- a/src/lyxfind.cpp
+++ b/src/lyxfind.cpp
@@ -2736,9 +2736,14 @@ void LatexInfo::buildKeys(bool isPatternString)
 	// handle like standard keys with 1 parameter.
 	makeKey("url|href|vref|thanks", KeyInfo(KeyInfo::isStandard, 1, false), isPatternString);
 
-	// Ignore deleted text
-	makeKey("lyxdeleted", KeyInfo(KeyInfo::doRemove, 3, false), isPatternString);
-	// but preserve added text
+	if (ignoreFormats.getDeleted()) {
+		// Ignore deleted text
+		makeKey("lyxdeleted", KeyInfo(KeyInfo::doRemove, 3, false), isPatternString);
+	}
+	else {
+		// but preserve added text
+		makeKey("lyxdeleted", KeyInfo(KeyInfo::doRemove, 2, false), isPatternString);
+	}
 	makeKey("lyxadded", KeyInfo(KeyInfo::doRemove, 2, false), isPatternString);
 
 	// Macros to remove, but let the parameter survive
@@ -3133,6 +3138,28 @@ int LatexInfo::dispatch(ostringstream &os, int previousStart, KeyInfo &actual)
 				if (count > 0)
 					interval_.addIntervall(blk, blk+count);
 			}
+			bool blank_found = false;
+			// Removing invalid space between
+			// "item{description}[{...}]"
+			// and
+			// "\foreignlanguage{..}"
+			if (interval_.par[posdown+1] == ' ') {
+				if (posdown == interval_.par.size() -2)
+					blank_found = true;
+				else if (nextKeyIdx > 0) {
+					for (int i = nextKeyIdx; i < int(entries_.size()); i++) {
+						if (entries_[i]._tokenstart <= posdown)
+							continue;
+						if ((entries_[i].keytype == KeyInfo::isMain)
+							&& (entries_[i]._tokenstart == posdown +2)) {
+							blank_found = true;
+						}
+						break;
+					}
+				}
+			}
+			if (blank_found)
+				interval_.addIntervall(posdown+1, posdown+2);
 		}
 		break;
 	}