X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfind.cpp;h=609f38c7815fce43eed133435c94a27cde1ee14b;hb=d12bf6f9792a73ef6b8714747c67a70b7b23a116;hp=480d4d18bab54e8248d2faca06952f0128a83cb0;hpb=cd6d21ebb3c66a60a38b371e66179bac6e8044ed;p=features.git

diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index 480d4d18ba..609f38c781 100644
--- a/src/lyxfind.cpp
+++ b/src/lyxfind.cpp
@@ -1428,8 +1428,8 @@ public:
 	string par;
 	int ignoreidx;
 	static vector<Border> borders;
-	int depts[MAXOPENED];
-	int closes[MAXOPENED];
+	static vector<int> depts;
+	static vector<int> closes;
 	int actualdeptindex;
 	int previousNotIgnored(int) const;
 	int nextNotIgnored(int) const;
@@ -1454,6 +1454,8 @@ public:
 };
 
 vector<Border> Intervall::borders = vector<Border>(30);
+vector<int> Intervall::depts = vector<int>(30);
+vector<int> Intervall::closes = vector<int>(30);
 
 int Intervall::isOpeningPar(int pos) const
 {
@@ -1487,6 +1489,8 @@ void Intervall::setForDefaultLang(KeyInfo const & defLang) const
 	}
 }
 
+#if 0
+// Not needed, because dpts and closes are now dynamically expanded
 static void checkDepthIndex(int val)
 {
 	static int maxdepthidx = MAXOPENED-2;
@@ -1500,6 +1504,7 @@ static void checkDepthIndex(int val)
 		LYXERR(Debug::INFO, "maxdepthidx now " << val);
 	}
 }
+#endif
 
 #if 0
 // Not needed, because borders are now dynamically expanded
@@ -2049,7 +2054,8 @@ void Intervall::removeAccents()
 	if (accents.empty())
 		buildAccentsMap();
 	static regex const accre("\\\\("
-				 "([\\S]|[A-Za-z]+)\\{[^\\{\\}]+\\}"
+				 "([\\S]|[A-Za-z]+)\\{[^\\\\\\{\\}]+\\}"
+				 "|([\\S]|[A-Za-z]+)\\{\\\\[ij](math)?\\}"
 				 "|("
 				 "(backslash ([lL]y[xX]|[tT]e[xX]|[lL]a[tT]e[xX]e?|lyxarrow))"
 				 "|[A-Za-z]+"
@@ -2085,9 +2091,13 @@ void Intervall::removeAccents()
 void Intervall::handleOpenP(int i)
 {
 	actualdeptindex++;
+	if ((size_t) actualdeptindex >= depts.size()) {
+		depts.resize(actualdeptindex + 30);
+		closes.resize(actualdeptindex + 30);
+	}
 	depts[actualdeptindex] = i+1;
 	closes[actualdeptindex] = -1;
-	checkDepthIndex(actualdeptindex);
+	// checkDepthIndex(actualdeptindex);
 }
 
 void Intervall::handleCloseP(int i, bool closingAllowed)
@@ -2763,7 +2773,8 @@ void LatexInfo::buildKeys(bool isPatternString)
 	if (keysBuilt && !isPatternString) return;
 
 	// Keys to ignore in any case
-	makeKey("text|textcyrillic|lyxmathsym|ensuremath", KeyInfo(KeyInfo::headRemove, 1, true), true);
+	makeKey("text|lyxmathsym|ensuremath", KeyInfo(KeyInfo::headRemove, 1, true), true);
+	makeKey("nonumber|notag", KeyInfo(KeyInfo::headRemove, 0, true), true);
 	// Known standard keys with 1 parameter.
 	// Split is done, if not at start of region
 	makeKey("textsf|textss|texttt", KeyInfo(KeyInfo::isStandard, 1, ignoreFormats.getFamily()), isPatternString);
@@ -3641,7 +3652,7 @@ MatchStringAdv::MatchStringAdv(lyx::Buffer & buf, FindAndReplaceOptions & opt)
 		CreateRegexp(opt, "", "", "");
 		return;
 	}
-	use_regexp = lyx::to_utf8(ds).find("\\regexp{") != std::string::npos;
+	use_regexp = ds.find(from_utf8("\\regexp{")) != std::string::npos;
 	if (opt.replace_all && previous_single_replace) {
 		previous_single_replace = false;
 		num_replaced = 0;
@@ -3730,7 +3741,7 @@ MatchStringAdv::MatchStringAdv(lyx::Buffer & buf, FindAndReplaceOptions & opt)
 					break;
 			}
 			if (lng < par_as_string.size())
-				par_as_string = par_as_string.substr(0,lng);
+				par_as_string.resize(lng);
 		}
 		LYXERR(Debug::FINDVERBOSE, "par_as_string after correctRegex is '" << par_as_string << "'");
 		if ((lng > 0) && (par_as_string[0] == '^')) {
@@ -3773,9 +3784,6 @@ MatchResult MatchStringAdv::findAux(DocIterator const & cur, int len, bool at_be
 	MatchResult mres;
 
 	mres.searched_size = len;
-	if (at_begin &&
-			(opt.restr == FindAndReplaceOptions::R_ONLY_MATHS && !cur.inMathed()) )
-		return mres;
 
 	docstring docstr = stringifyFromForSearch(opt, cur, len);
 	string str;
@@ -4010,20 +4018,25 @@ static string convertLF2Space(docstring const &s, bool ignore_format)
 				if ((pos > start + 2) &&
 				    (s[pos+1] == '~' || isSpace(s[pos+1]) ||
 				     s[pos-3] == '~' || isSpace(s[pos-3]))) {
-					// discard '\n'
+					// discard "\\\\\n", do not replace with space
 					dospace = false;
 				}
 			}
-			else if ((pos > start) &&
-			     s[pos-1] == '%') {
-				skip = 1;
-				while ((pos > start+skip) && (s[pos-1-skip] == '%'))
-					skip++;
-				if ((pos > start+skip) &&
-				    (s[pos+1] == '~' || isSpace(s[pos+1]) ||
-				     s[pos-1-skip] == '~' || isSpace(s[pos-1-skip]))) {
-					// discard '%%%%%\n'
+			else if (pos > start) {
+				if (s[pos-1] == '%') {
+					skip = 1;
+					while ((pos > start+skip) && (s[pos-1-skip] == '%'))
+						skip++;
+					if ((pos > start+skip) &&
+					    (s[pos+1] == '~' || isSpace(s[pos+1]) ||
+					     s[pos-1-skip] == '~' || isSpace(s[pos-1-skip]))) {
+						// discard '%%%%%\n'
+						dospace = false;
+					}
+				}
+				else if (!isAlnumASCII(s[pos+1]) || !isAlnumASCII(s[pos-1])) {
 					dospace = false;
+					skip = 0;	// remove the '\n' only
 				}
 			}
 		}
@@ -4332,7 +4345,10 @@ MatchResult findAdvFinalize(DocIterator & cur, MatchStringAdv const & match, Mat
 		displayMres(mres, "Start with negative match", cur);
 		max_match = mres;
 	}
-	if (max_match.match_len <= 0) return fail;
+	// Only now we are really at_begin
+	if ((max_match.match_len <= 0) ||
+	    (match.opt.restr == FindAndReplaceOptions::R_ONLY_MATHS && !cur.inMathed()))
+		return fail;
 	LYXERR(Debug::FINDVERBOSE, "Ok");
 
 	// Compute the match length