X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfind.cpp;h=f3b3eef4846bf7c7a2778cdcc07636a6c9ed23ff;hb=0bdfca2c6edbcfc87c648fdfd3de46f2662561fa;hp=59dcb8ff48287a26fb4720b2fe67d9a562e550ec;hpb=7081fed380caa153fa78a458c78800090607c0e0;p=lyx.git

diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index 59dcb8ff48..f3b3eef484 100644
--- a/src/lyxfind.cpp
+++ b/src/lyxfind.cpp
@@ -182,9 +182,9 @@ int replaceAll(BufferView * bv,
 		cur.recordUndo();
 		int striked = ssize -
 			cur.paragraph().eraseChars(pos, pos + match_len,
-						   buf.params().trackChanges);
+						   buf.params().track_changes);
 		cur.paragraph().insert(pos, replacestr, font,
-				       Change(buf.params().trackChanges
+				       Change(buf.params().track_changes
 					      ? Change::INSERTED
 					      : Change::UNCHANGED));
 		for (int i = 0; i < rsize + striked; ++i)
@@ -232,7 +232,9 @@ pair<bool, int> replaceOne(BufferView * bv, docstring searchstr,
 		if (!cur.inTexted())
 			// bail in math
 			return make_pair(false, 0);
-		// select current word and treat it as the search string
+		// select current word and treat it as the search string.
+		// This causes a minor bug as undo will restore this selection,
+		// which the user did not create (#8986).
 		cur.innerText()->selectWord(cur, WHOLE_WORD);
 		searchstr = cur.selectionAsString(false);
 	}
@@ -388,93 +390,70 @@ bool lyxreplace(BufferView * bv,
 }
 
 
-namespace {
-bool findChange(DocIterator & cur, bool next)
+bool findNextChange(DocIterator & cur)
 {
-	if (!next)
-		cur.backwardPos();
-	for (; cur; next ? cur.forwardPos() : cur.backwardPos())
-		if (cur.inTexted() && cur.paragraph().isChanged(cur.pos())) {
-			if (!next)
-				// if we search backwards, take a step forward
-				// to correctly set the anchor
-				cur.forwardPos();
+	for (; cur; cur.forwardPos())
+		if (cur.inTexted() && cur.paragraph().isChanged(cur.pos()))
 			return true;
-		}
-
 	return false;
 }
 
 
-bool findChange(BufferView * bv, bool next)
+bool findPreviousChange(DocIterator & cur)
 {
-	Cursor cur(*bv);
-	cur.setCursor(next ? bv->cursor().selectionEnd()
-		      : bv->cursor().selectionBegin());
-
-	// Are we within a change ? Then first search forward (backward),
-	// clear the selection and search the other way around (see the end
-	// of this function). This will avoid changes to be selected half.
-	bool search_both_sides = false;
-	Cursor tmpcur = cur;
-	// Leave math first
-	while (tmpcur.inMathed())
-		tmpcur.pop_back();
-	Change change_next_pos
-		= tmpcur.paragraph().lookupChange(tmpcur.pos());
-	if (change_next_pos.changed() && cur.inMathed()) {
-		cur = tmpcur;
-		search_both_sides = true;
-	} else if (tmpcur.pos() > 0 && tmpcur.inTexted()) {
-		Change change_prev_pos
-			= tmpcur.paragraph().lookupChange(tmpcur.pos() - 1);
-		if (change_next_pos.isSimilarTo(change_prev_pos))
-			search_both_sides = true;
+	for (cur.backwardPos(); cur; cur.backwardPos()) {
+		if (cur.inTexted() && cur.paragraph().isChanged(cur.pos()))
+			return true;
 	}
+	return false;
+}
 
-	if (!findChange(cur, next))
-		return false;
-
-	bv->mouseSetCursor(cur, false);
-
-	CursorSlice & tip = cur.top();
-
-	if (!next)
-		// take a step into the change
-		tip.backwardPos();
 
-	Change orig_change = tip.paragraph().lookupChange(tip.pos());
+bool selectChange(Cursor & cur, bool forward)
+{
+	if (!cur.inTexted() || !cur.paragraph().isChanged(cur.pos()))
+		return false;
+	Change ch = cur.paragraph().lookupChange(cur.pos());
 
-	if (next) {
-		for (; tip.pit() < tip.lastpit() || tip.pos() < tip.lastpos(); tip.forwardPos()) {
-			Change change = tip.paragraph().lookupChange(tip.pos());
-			if (!change.isSimilarTo(orig_change))
-				break;
-		}
-	} else {
-		for (; tip.pit() > 0 || tip.pos() > 0;) {
-			tip.backwardPos();
-			Change change = tip.paragraph().lookupChange(tip.pos());
-			if (!change.isSimilarTo(orig_change)) {
-				// take a step forward to correctly set the selection
-				tip.forwardPos();
-				break;
-			}
-		}
+	CursorSlice tip1 = cur.top();
+	for (; tip1.pit() < tip1.lastpit() || tip1.pos() < tip1.lastpos(); tip1.forwardPos()) {
+		Change ch2 = tip1.paragraph().lookupChange(tip1.pos());
+		if (!ch2.isSimilarTo(ch))
+			break;
 	}
-
-	if (!search_both_sides) {
-		// Now set the selection.
-		bv->mouseSetCursor(cur, true);
-	} else {
-		bv->mouseSetCursor(cur, false);
-		findChange(bv, !next);
+	CursorSlice tip2 = cur.top();
+	for (; tip2.pit() > 0 || tip2.pos() > 0;) {
+		tip2.backwardPos();
+		Change ch2 = tip2.paragraph().lookupChange(tip2.pos());
+		if (!ch2.isSimilarTo(ch)) {
+			// take a step forward to correctly set the selection
+			tip2.forwardPos();
+			break;
+		}
 	}
-
+	if (forward)
+		swap(tip1, tip2);
+	cur.top() = tip1;
+	cur.bv().mouseSetCursor(cur, false);
+	cur.top() = tip2;
+	cur.bv().mouseSetCursor(cur, true);
 	return true;
 }
+
+
+namespace {
+
+
+bool findChange(BufferView * bv, bool forward)
+{
+	Cursor cur(*bv);
+	cur.setCursor(forward ? bv->cursor().selectionEnd()
+		      : bv->cursor().selectionBegin());
+	forward ? findNextChange(cur) : findPreviousChange(cur);
+	return selectChange(cur, forward);
 }
 
+}
 
 bool findNextChange(BufferView * bv)
 {
@@ -488,6 +467,7 @@ bool findPreviousChange(BufferView * bv)
 }
 
 
+
 namespace {
 
 typedef vector<pair<string, string> > Escapes;
@@ -777,14 +757,17 @@ static docstring stringifySearchBuffer(Buffer & buffer, FindAndReplaceOptions co
 		runparams.flavor = OutputParams::LATEX;
 		runparams.linelen = 100000; //lyxrc.plaintext_linelen;
 		runparams.dryrun = true;
+		runparams.for_search = true;
 		for (pos_type pit = pos_type(0); pit < (pos_type)buffer.paragraphs().size(); ++pit) {
 			Paragraph const & par = buffer.paragraphs().at(pit);
 			LYXERR(Debug::FIND, "Adding to search string: '"
-			       << par.stringify(pos_type(0), par.size(),
-						AS_STR_INSETS, runparams)
+			       << par.asString(pos_type(0), par.size(),
+					       AS_STR_INSETS | AS_STR_SKIPDELETE | AS_STR_PLAINTEXT,
+					       &runparams)
 			       << "'");
-			str += par.stringify(pos_type(0), par.size(),
-					     AS_STR_INSETS, runparams);
+			str += par.asString(pos_type(0), par.size(),
+					    AS_STR_INSETS | AS_STR_SKIPDELETE | AS_STR_PLAINTEXT,
+					    &runparams);
 		}
 	}
 	return str;
@@ -904,6 +887,9 @@ MatchStringAdv::MatchStringAdv(lyx::Buffer & buf, FindAndReplaceOptions const &
 
 int MatchStringAdv::findAux(DocIterator const & cur, int len, bool at_begin) const
 {
+	if (at_begin &&
+		(opt.restr == FindAndReplaceOptions::R_ONLY_MATHS && !cur.inMathed()) )
+		return 0;
 	docstring docstr = stringifyFromForSearch(opt, cur, len);
 	LYXERR(Debug::FIND, "Matching against     '" << lyx::to_utf8(docstr) << "'");
 	string str = normalize(docstr, true);
@@ -1032,7 +1018,9 @@ docstring stringifyFromCursor(DocIterator const & cur, int len)
 		runparams.dryrun = true;
 		LYXERR(Debug::FIND, "Stringifying with cur: "
 		       << cur << ", from pos: " << cur.pos() << ", end: " << end);
-		return par.stringify(cur.pos(), end, AS_STR_INSETS, runparams);
+		return par.asString(cur.pos(), end,
+			AS_STR_INSETS | AS_STR_SKIPDELETE | AS_STR_PLAINTEXT,
+			&runparams);
 	} else if (cur.inMathed()) {
 		docstring s;
 		CursorSlice cs = cur.top();
@@ -1296,10 +1284,10 @@ FindAndReplaceOptions::FindAndReplaceOptions(
 	docstring const & find_buf_name, bool casesensitive,
 	bool matchword, bool forward, bool expandmacros, bool ignoreformat,
 	docstring const & repl_buf_name, bool keep_case,
-	SearchScope scope)
+	SearchScope scope, SearchRestriction restr)
 	: find_buf_name(find_buf_name), casesensitive(casesensitive), matchword(matchword),
 	  forward(forward), expandmacros(expandmacros), ignoreformat(ignoreformat),
-	  repl_buf_name(repl_buf_name), keep_case(keep_case), scope(scope)
+	  repl_buf_name(repl_buf_name), keep_case(keep_case), scope(scope), restr(restr)
 {
 }
 
@@ -1369,7 +1357,8 @@ static void findAdvReplace(BufferView * bv, FindAndReplaceOptions const & opt, M
 	DocIterator sel_beg = cur.selectionBegin();
 	DocIterator sel_end = cur.selectionEnd();
 	if (&sel_beg.inset() != &sel_end.inset()
-	    || sel_beg.pit() != sel_end.pit())
+	    || sel_beg.pit() != sel_end.pit()
+	    || sel_beg.idx() != sel_end.idx())
 		return;
 	int sel_len = sel_end.pos() - sel_beg.pos();
 	LYXERR(Debug::FIND, "sel_beg: " << sel_beg << ", sel_end: " << sel_end
@@ -1492,7 +1481,8 @@ ostringstream & operator<<(ostringstream & os, FindAndReplaceOptions const & opt
 	   << opt.ignoreformat << ' '
 	   << to_utf8(opt.repl_buf_name) << "\nEOSS\n"
 	   << opt.keep_case << ' '
-	   << int(opt.scope);
+	   << int(opt.scope) << ' '
+	   << int(opt.restr);
 
 	LYXERR(Debug::FIND, "built: " << os.str());
 
@@ -1534,8 +1524,12 @@ istringstream & operator>>(istringstream & is, FindAndReplaceOptions & opt)
 	int i;
 	is >> i;
 	opt.scope = FindAndReplaceOptions::SearchScope(i);
+	is >> i;
+	opt.restr = FindAndReplaceOptions::SearchRestriction(i);
+
 	LYXERR(Debug::FIND, "parsed: " << opt.casesensitive << ' ' << opt.matchword << ' ' << opt.forward << ' '
-	       << opt.expandmacros << ' ' << opt.ignoreformat << ' ' << opt.keep_case);
+	       << opt.expandmacros << ' ' << opt.ignoreformat << ' ' << opt.keep_case << ' '
+	       << opt.scope << ' ' << opt.restr);
 	return is;
 }