X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfind.cpp;h=d7038dedcb1e66d4bc96bb8e328e81dd26f295c1;hb=cf6b30ae76ebab5dfc1e2d70d5320abc060aa95f;hp=99e361ea47c6b7fb59d37441ddcd484fcd0a3f16;hpb=b93f2c20d34b713e0b47cd573f2699e50e797d83;p=lyx.git

diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index 99e361ea47..d7038dedcb 100644
--- a/src/lyxfind.cpp
+++ b/src/lyxfind.cpp
@@ -51,7 +51,6 @@
 #include "support/lstrings.h"
 
 #include "support/regex.h"
-#include <boost/next_prior.hpp>
 
 using namespace std;
 using namespace lyx::support;
@@ -138,8 +137,8 @@ bool findOne(BufferView * bv, docstring const & searchstr,
 	if (!searchAllowed(searchstr))
 		return false;
 
-	DocIterator cur = forward 
-		? bv->cursor().selectionEnd() 
+	DocIterator cur = forward
+		? bv->cursor().selectionEnd()
 		: bv->cursor().selectionBegin();
 
 	MatchString const match(searchstr, case_sens, whole);
@@ -182,9 +181,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)
@@ -203,19 +202,19 @@ int replaceAll(BufferView * bv,
 
 
 // the idea here is that we are going to replace the string that
-// is selected IF it is the search string. 
+// is selected IF it is the search string.
 // if there is a selection, but it is not the search string, then
 // we basically ignore it. (FIXME We ought to replace only within
 // the selection.)
 // if there is no selection, then:
 //  (i) if some search string has been provided, then we find it.
 //      (think of how the dialog works when you hit "replace" the
-//      first time.) 
+//      first time.)
 // (ii) if no search string has been provided, then we treat the
 //      word the cursor is in as the search string. (why? i have no
 //      idea.) but this only works in text?
 //
-// returns the number of replacements made (one, if any) and 
+// returns the number of replacements made (one, if any) and
 // whether anything at all was done.
 pair<bool, int> replaceOne(BufferView * bv, docstring searchstr,
 			   docstring const & replacestr, bool case_sens,
@@ -232,19 +231,21 @@ 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);
 	}
-	
+
 	// if we still don't have a search string, report the error
 	// and abort.
 	if (!searchAllowed(searchstr))
 		return make_pair(false, 0);
-	
+
 	bool have_selection = cur.selection();
 	docstring const selected = cur.selectionAsString(false);
-	bool match = 
+	bool match =
 		case_sens
 		? searchstr == selected
 		: compare_no_case(searchstr, selected) == 0;
@@ -326,7 +327,7 @@ bool lyxfind(BufferView * bv, FuncRequest const & ev)
 }
 
 
-bool lyxreplace(BufferView * bv, 
+bool lyxreplace(BufferView * bv,
 		FuncRequest const & ev, bool has_deleted)
 {
 	if (!bv || ev.action() != LFUN_WORD_REPLACE)
@@ -347,10 +348,10 @@ bool lyxreplace(BufferView * bv,
 	bool forward       = parse_bool(howto);
 	bool findnext      = howto.empty() ? true : parse_bool(howto);
 
-	int replace_count = 0;
 	bool update = false;
 
 	if (!has_deleted) {
+		int replace_count = 0;
 		if (all) {
 			replace_count = replaceAll(bv, search, rplc, casesensitive, matchword);
 			update = replace_count > 0;
@@ -371,7 +372,7 @@ bool lyxreplace(BufferView * bv,
 			} else if (replace_count == 1) {
 				buf.message(_("String has been replaced."));
 			} else {
-				docstring const str = 
+				docstring const str =
 					bformat(_("%1$d strings have been replaced."), replace_count);
 				buf.message(str);
 			}
@@ -388,93 +389,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 +466,7 @@ bool findPreviousChange(BufferView * bv)
 }
 
 
+
 namespace {
 
 typedef vector<pair<string, string> > Escapes;
@@ -612,7 +591,6 @@ string escape_for_regex(string s, bool match_latex)
 		}
 		if (end_pos == s.size()) {
 			s.replace(new_pos, end_pos - new_pos, t);
-			pos = s.size();
 			LYXERR(Debug::FIND, "Regexp after \\regexp{} removal: " << s);
 			break;
 		}
@@ -672,8 +650,8 @@ bool braces_match(string::const_iterator const & beg,
 		}
 	}
 	if (open_pars != unmatched) {
-		LYXERR(Debug::FIND, "Found " << open_pars 
-		       << " instead of " << unmatched 
+		LYXERR(Debug::FIND, "Found " << open_pars
+		       << " instead of " << unmatched
 		       << " unmatched open braces at the end of count");
 		return false;
 	}
@@ -746,10 +724,10 @@ private:
 };
 
 
-static docstring buffer_to_latex(Buffer & buffer) 
+static docstring buffer_to_latex(Buffer & buffer)
 {
 	OutputParams runparams(&buffer.params().encoding());
-	TexRow texrow;
+	TexRow texrow(false);
 	odocstringstream ods;
 	otexstream os(ods, texrow);
 	runparams.nice = true;
@@ -777,14 +755,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;
@@ -841,15 +822,14 @@ MatchStringAdv::MatchStringAdv(lyx::Buffer & buf, FindAndReplaceOptions const &
 
 	size_t lead_size = 0;
 	if (opt.ignoreformat) {
-                if (!use_regexp) {
-                        // if par_as_string_nolead were emty, 
-                        // the following call to findAux will always *find* the string
-                        // in the checked data, and thus always using the slow
-                        // examining of the current text part.
-                        par_as_string_nolead = par_as_string;
-                }
-        }
-        else {
+		if (!use_regexp) {
+			// if par_as_string_nolead were emty,
+			// the following call to findAux will always *find* the string
+			// in the checked data, and thus always using the slow
+			// examining of the current text part.
+			par_as_string_nolead = par_as_string;
+		}
+	} else {
 		lead_size = identifyLeading(par_as_string);
 		lead_as_string = par_as_string.substr(0, lead_size);
 		par_as_string_nolead = par_as_string.substr(lead_size, par_as_string.size() - lead_size);
@@ -925,7 +905,7 @@ int MatchStringAdv::findAux(DocIterator const & cur, int len, bool at_begin) con
 		}
 	} else {
 		LYXERR(Debug::FIND, "Searching in regexp mode: at_begin=" << at_begin);
-		// Try all possible regexp matches, 
+		// Try all possible regexp matches,
 		//until one that verifies the braces match test is found
 		regex const *p_regexp = at_begin ? &regexp : &regexp2;
 		sregex_iterator re_it(str.begin(), str.end(), *p_regexp);
@@ -941,7 +921,7 @@ int MatchStringAdv::findAux(DocIterator const & cur, int len, bool at_begin) con
 			for (size_t i = 1; i < m.size() - 1; ++i)
 				if (!braces_match(m[i].first, m[i].second))
 					return false;
-			// Exclude from the returned match length any length 
+			// Exclude from the returned match length any length
 			// due to close wildcards added at end of regexp
 			if (close_wildcards == 0)
 				return m[0].second - m[0].first;
@@ -1027,7 +1007,6 @@ docstring stringifyFromCursor(DocIterator const & cur, int len)
 		pos_type end = ( len == -1 || cur.pos() + len > int(par.size()) ) ?
 			int(par.size()) : cur.pos() + len;
 		OutputParams runparams(&cur.buffer()->params().encoding());
-		odocstringstream os;
 		runparams.nice = true;
 		runparams.flavor = OutputParams::LATEX;
 		runparams.linelen = 100000; //lyxrc.plaintext_linelen;
@@ -1035,7 +1014,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();
@@ -1067,7 +1048,7 @@ docstring latexifyFromCursor(DocIterator const & cur, int len)
 	Buffer const & buf = *cur.buffer();
 	LBUFERR(buf.params().isLatex());
 
-	TexRow texrow;
+	TexRow texrow(false);
 	odocstringstream ods;
 	otexstream os(ods, texrow);
 	OutputParams runparams(&buf.params().encoding());
@@ -1089,8 +1070,8 @@ docstring latexifyFromCursor(DocIterator const & cur, int len)
 		// Retrieve the math environment type, and add '$' or '$[' or others (\begin{equation}) accordingly
 		for (int s = cur.depth() - 1; s >= 0; --s) {
 			CursorSlice const & cs = cur[s];
-			if (cs.asInsetMath() && cs.asInsetMath() && cs.asInsetMath()->asHullInset()) {
-				WriteStream ws(ods);
+			if (cs.asInsetMath() && cs.asInsetMath()->asHullInset()) {
+				WriteStream ws(os);
 				cs.asInsetMath()->asHullInset()->header_write(ws);
 				break;
 			}
@@ -1112,7 +1093,7 @@ docstring latexifyFromCursor(DocIterator const & cur, int len)
 			CursorSlice const & cs = cur[s];
 			InsetMath * inset = cs.asInsetMath();
 			if (inset && inset->asHullInset()) {
-				WriteStream ws(ods);
+				WriteStream ws(os);
 				inset->asHullInset()->footer_write(ws);
 				break;
 			}
@@ -1240,12 +1221,10 @@ int findBackwardsAdv(DocIterator & cur, MatchStringAdv & match)
 		return 0;
 	cur.backwardPos();
 	DocIterator cur_orig(cur);
-	bool found_match;
 	bool pit_changed = false;
-	found_match = false;
 	do {
 		cur.pos() = 0;
-		found_match = match(cur, -1, false);
+		bool found_match = match(cur, -1, false);
 
 		if (found_match) {
 			if (pit_changed)
@@ -1256,7 +1235,7 @@ int findBackwardsAdv(DocIterator & cur, MatchStringAdv & match)
 			DocIterator cur_prev_iter;
 			do {
 				found_match = match(cur);
-				LYXERR(Debug::FIND, "findBackAdv3: found_match=" 
+				LYXERR(Debug::FIND, "findBackAdv3: found_match="
 				       << found_match << ", cur: " << cur);
 				if (found_match)
 					return findMostBackwards(cur, match);
@@ -1318,6 +1297,7 @@ static bool allNonLowercase(Cursor const & cur, int len)
 	if (len > cur.lastpos() + 1 - beg_pos) {
 		LYXERR(Debug::FIND, "This should not happen, more debug needed");
 		len = cur.lastpos() + 1 - beg_pos;
+		end_pos = beg_pos + len;
 	}
 	for (pos_type pos = beg_pos; pos != end_pos; ++pos)
 		if (isLowerCase(cur.paragraph().getChar(pos)))
@@ -1339,7 +1319,7 @@ static bool firstUppercase(Cursor const & cur)
 	ch2 = cur.paragraph().getChar(pos + 1);
 	bool result = isUpperCase(ch1) && isLowerCase(ch2);
 	LYXERR(Debug::FIND, "firstUppercase(): "
-	       << "ch1=" << ch1 << "(" << char(ch1) << "), ch2=" 
+	       << "ch1=" << ch1 << "(" << char(ch1) << "), ch2="
 	       << ch2 << "(" << char(ch2) << ")"
 	       << ", result=" << result << ", cur=" << cur);
 	return result;
@@ -1372,7 +1352,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
@@ -1414,7 +1395,7 @@ static void findAdvReplace(BufferView * bv, FindAndReplaceOptions const & opt, M
 		LYXERR(Debug::FIND, "After pasteParagraphList() cur=" << cur << endl);
 		sel_len = repl_buffer.paragraphs().begin()->size();
 	} else if (cur.inMathed()) {
-		TexRow texrow;
+		TexRow texrow(false);
 		odocstringstream ods;
 		otexstream os(ods, texrow);
 		OutputParams runparams(&repl_buffer.params().encoding());
@@ -1444,7 +1425,6 @@ static void findAdvReplace(BufferView * bv, FindAndReplaceOptions const & opt, M
 	LYXERR(Debug::FIND, "After pos adj cur=" << cur << " with depth: " << cur.depth() << " and len: " << sel_len);
 	bv->putSelectionAt(DocIterator(cur), sel_len, !opt.forward);
 	bv->processUpdateFlags(Update::Force);
-	bv->buffer().updatePreviews();
 }