X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfind.cpp;h=0ec9fcb7a039208226b4b3d0858dbd4ab1d48666;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=1b32ae37c780b558778f7443bcbbb726641296ac;hpb=13cb7da11d04bba9fb4af5e538ca2332a5341b71;p=lyx.git diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp index 1b32ae37c7..0ec9fcb7a0 100644 --- a/src/lyxfind.cpp +++ b/src/lyxfind.cpp @@ -39,6 +39,7 @@ #include "mathed/InsetMath.h" #include "mathed/InsetMathGrid.h" #include "mathed/InsetMathHull.h" +#include "mathed/MathData.h" #include "mathed/MathStream.h" #include "mathed/MathSupport.h" @@ -51,7 +52,6 @@ #include "support/lstrings.h" #include "support/regex.h" -#include using namespace std; using namespace lyx::support; @@ -133,13 +133,14 @@ bool searchAllowed(docstring const & str) bool findOne(BufferView * bv, docstring const & searchstr, - bool case_sens, bool whole, bool forward, bool find_del = true) + bool case_sens, bool whole, bool forward, + bool find_del = true, bool check_wrap = false) { 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); @@ -150,6 +151,32 @@ bool findOne(BufferView * bv, docstring const & searchstr, if (match_len > 0) bv->putSelectionAt(cur, match_len, !forward); + else if (check_wrap) { + DocIterator cur_orig(bv->cursor()); + docstring q; + if (forward) + q = _("End of file reached while searching forward.\n" + "Continue searching from the beginning?"); + else + q = _("Beginning of file reached while searching backward.\n" + "Continue searching from the end?"); + int wrap_answer = frontend::Alert::prompt(_("Wrap search?"), + q, 0, 1, _("&Yes"), _("&No")); + if (wrap_answer == 0) { + if (forward) { + bv->cursor().clear(); + bv->cursor().push_back(CursorSlice(bv->buffer().inset())); + } else { + bv->cursor().setCursor(doc_iterator_end(&bv->buffer())); + bv->cursor().backwardPos(); + } + bv->clearSelection(); + if (findOne(bv, searchstr, case_sens, whole, forward, find_del, false)) + return true; + } + bv->cursor().setCursor(cur_orig); + return false; + } return match_len > 0; } @@ -203,30 +230,31 @@ 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 replaceOne(BufferView * bv, docstring searchstr, docstring const & replacestr, bool case_sens, bool whole, bool forward, bool findnext) { Cursor & cur = bv->cursor(); + bool found = false; if (!cur.selection()) { // no selection, non-empty search string: find it if (!searchstr.empty()) { - findOne(bv, searchstr, case_sens, whole, forward); - return make_pair(true, 0); + found = findOne(bv, searchstr, case_sens, whole, forward, true, findnext); + return make_pair(found, 0); } // empty search string if (!cur.inTexted()) @@ -238,15 +266,15 @@ pair replaceOne(BufferView * bv, docstring searchstr, 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; @@ -254,8 +282,8 @@ pair replaceOne(BufferView * bv, docstring searchstr, // no selection or current selection is not search word: // just find the search word if (!have_selection || !match) { - findOne(bv, searchstr, case_sens, whole, forward); - return make_pair(true, 0); + found = findOne(bv, searchstr, case_sens, whole, forward, true, findnext); + return make_pair(found, 0); } // we're now actually ready to replace. if the buffer is @@ -270,7 +298,7 @@ pair replaceOne(BufferView * bv, docstring searchstr, cur.pos() = cur.lastpos()); } if (findnext) - findOne(bv, searchstr, case_sens, whole, forward, false); + findOne(bv, searchstr, case_sens, whole, forward, false, findnext); return make_pair(true, 1); } @@ -324,11 +352,11 @@ bool lyxfind(BufferView * bv, FuncRequest const & ev) bool matchword = parse_bool(howto); bool forward = parse_bool(howto); - return findOne(bv, search, casesensitive, matchword, forward); + return findOne(bv, search, casesensitive, matchword, forward, true, true); } -bool lyxreplace(BufferView * bv, +bool lyxreplace(BufferView * bv, FuncRequest const & ev, bool has_deleted) { if (!bv || ev.action() != LFUN_WORD_REPLACE) @@ -349,10 +377,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; @@ -373,7 +401,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); } @@ -381,7 +409,7 @@ bool lyxreplace(BufferView * bv, } else if (findnext) { // if we have deleted characters, we do not replace at all, but // rather search for the next occurence - if (findOne(bv, search, casesensitive, matchword, forward)) + if (findOne(bv, search, casesensitive, matchword, forward, true, findnext)) update = true; else bv->message(_("String not found.")); @@ -390,96 +418,106 @@ bool lyxreplace(BufferView * bv, } -namespace { -bool findChange(DocIterator & cur, bool next) +bool findNextChange(BufferView * bv, Cursor & cur, bool const check_wrap) { - 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; + + if (check_wrap) { + DocIterator cur_orig(bv->cursor()); + docstring q = _("End of file reached while searching forward.\n" + "Continue searching from the beginning?"); + int wrap_answer = frontend::Alert::prompt(_("Wrap search?"), + q, 0, 1, _("&Yes"), _("&No")); + if (wrap_answer == 0) { + bv->cursor().clear(); + bv->cursor().push_back(CursorSlice(bv->buffer().inset())); + bv->clearSelection(); + cur.setCursor(bv->cursor().selectionBegin()); + if (findNextChange(bv, cur, false)) + return true; } + bv->cursor().setCursor(cur_orig); + } return false; } -bool findChange(BufferView * bv, bool next) +bool findPreviousChange(BufferView * bv, Cursor & cur, bool const check_wrap) { - Cursor cur(*bv); - cur.setCursor(next ? bv->cursor().selectionEnd() - : bv->cursor().selectionBegin()); + for (cur.backwardPos(); cur; cur.backwardPos()) { + if (cur.inTexted() && cur.paragraph().isChanged(cur.pos())) + return true; + } - // 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; - // Find enclosing text cursor - while (tmpcur.inMathed()) - tmpcur.pop_back(); - Change change_next_pos - = tmpcur.paragraph().lookupChange(tmpcur.pos()); - if (change_next_pos.changed()) { - if (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; + if (check_wrap) { + DocIterator cur_orig(bv->cursor()); + docstring q = _("Beginning of file reached while searching backward.\n" + "Continue searching from the end?"); + int wrap_answer = frontend::Alert::prompt(_("Wrap search?"), + q, 0, 1, _("&Yes"), _("&No")); + if (wrap_answer == 0) { + bv->cursor().setCursor(doc_iterator_end(&bv->buffer())); + bv->cursor().backwardPos(); + bv->clearSelection(); + cur.setCursor(bv->cursor().selectionBegin()); + if (findPreviousChange(bv, cur, false)) + return true; } + bv->cursor().setCursor(cur_orig); } - // find the next change - if (!findChange(cur, next)) - return false; - - bv->mouseSetCursor(cur, false); - - CursorSlice & tip = cur.top(); + return false; +} - if (!next && tip.pos() > 0) - // 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(bv, cur, true) : findPreviousChange(bv, cur, true); + return selectChange(cur, forward); } +} bool findNextChange(BufferView * bv) { @@ -493,6 +531,7 @@ bool findPreviousChange(BufferView * bv) } + namespace { typedef vector > Escapes; @@ -517,7 +556,7 @@ Escapes const & get_regexp_escapes() escape_map.push_back(P(".", "_x_.")); escape_map.push_back(P("\\", "(?:\\\\|\\\\backslash)")); escape_map.push_back(P("~", "(?:\\\\textasciitilde|\\\\sim)")); - escape_map.push_back(P("^", "(?:\\^|\\\\textasciicircum\\{\\}|\\\\mathcircumflex)")); + escape_map.push_back(P("^", "(?:\\^|\\\\textasciicircum\\{\\}|\\\\textasciicircum|\\\\mathcircumflex)")); escape_map.push_back(P("_x_", "\\")); } return escape_map; @@ -550,12 +589,12 @@ Escapes const & get_regexp_latex_escapes() static Escapes escape_map; if (escape_map.empty()) { - escape_map.push_back(P("\\\\", "(?:\\\\\\\\|\\\\backslash|\\\\textbackslash\\{\\})")); + escape_map.push_back(P("\\\\", "(?:\\\\\\\\|\\\\backslash|\\\\textbackslash\\{\\}|\\\\textbackslash)")); escape_map.push_back(P("( it(oss); lyx::regex_replace(it, s.begin(), s.end(), e, replacestr); @@ -677,8 +715,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; } @@ -751,12 +789,11 @@ private: }; -static docstring buffer_to_latex(Buffer & buffer) +static docstring buffer_to_latex(Buffer & buffer) { OutputParams runparams(&buffer.params().encoding()); - TexRow texrow; odocstringstream ods; - otexstream os(ods, texrow); + otexstream os(ods); runparams.nice = true; runparams.flavor = OutputParams::LATEX; runparams.linelen = 80; //lyxrc.plaintext_linelen; @@ -787,11 +824,11 @@ static docstring stringifySearchBuffer(Buffer & buffer, FindAndReplaceOptions co Paragraph const & par = buffer.paragraphs().at(pit); LYXERR(Debug::FIND, "Adding to search string: '" << par.asString(pos_type(0), par.size(), - AS_STR_INSETS | AS_STR_PLAINTEXT, + AS_STR_INSETS | AS_STR_SKIPDELETE | AS_STR_PLAINTEXT, &runparams) << "'"); str += par.asString(pos_type(0), par.size(), - AS_STR_INSETS | AS_STR_PLAINTEXT, + AS_STR_INSETS | AS_STR_SKIPDELETE | AS_STR_PLAINTEXT, &runparams); } } @@ -804,11 +841,11 @@ static size_t identifyLeading(string const & s) { string t = s; // @TODO Support \item[text] - while (regex_replace(t, t, "^\\\\(emph|textbf|subsubsection|subsection|section|subparagraph|paragraph|part)\\*?\\{", "") - || regex_replace(t, t, "^\\$", "") - || regex_replace(t, t, "^\\\\\\[ ", "") - || regex_replace(t, t, "^\\\\item ", "") - || regex_replace(t, t, "^\\\\begin\\{[a-zA-Z_]*\\*?\\} ", "")) + while (regex_replace(t, t, REGEX_BOS "\\\\(emph|textbf|subsubsection|subsection|section|subparagraph|paragraph|part)\\*?\\{", "") + || regex_replace(t, t, REGEX_BOS "\\$", "") + || regex_replace(t, t, REGEX_BOS "\\\\\\[ ", "") + || regex_replace(t, t, REGEX_BOS "\\\\item ", "") + || regex_replace(t, t, REGEX_BOS "\\\\begin\\{[a-zA-Z_]*\\*?\\} ", "")) LYXERR(Debug::FIND, " after removing leading $, \\[ , \\emph{, \\textbf{, etc.: '" << t << "'"); return s.find(t); } @@ -820,13 +857,13 @@ static int identifyClosing(string & t) int open_braces = 0; do { LYXERR(Debug::FIND, "identifyClosing(): t now is '" << t << "'"); - if (regex_replace(t, t, "(.*[^\\\\])\\$\\'", "$1")) + if (regex_replace(t, t, "(.*[^\\\\])\\$" REGEX_EOS, "$1")) continue; - if (regex_replace(t, t, "(.*[^\\\\]) \\\\\\]\\'", "$1")) + if (regex_replace(t, t, "(.*[^\\\\]) \\\\\\]" REGEX_EOS, "$1")) continue; - if (regex_replace(t, t, "(.*[^\\\\]) \\\\end\\{[a-zA-Z_]*\\*?\\}\\'", "$1")) + if (regex_replace(t, t, "(.*[^\\\\]) \\\\end\\{[a-zA-Z_]*\\*?\\}" REGEX_EOS, "$1")) continue; - if (regex_replace(t, t, "(.*[^\\\\])\\}\\'", "$1")) { + if (regex_replace(t, t, "(.*[^\\\\])\\}" REGEX_EOS, "$1")) { ++open_braces; continue; } @@ -849,15 +886,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); @@ -897,13 +933,14 @@ MatchStringAdv::MatchStringAdv(lyx::Buffer & buf, FindAndReplaceOptions const & LYXERR(Debug::FIND, "Open braces: " << open_braces); LYXERR(Debug::FIND, "Close .*? : " << close_wildcards); LYXERR(Debug::FIND, "Replaced text (to be used as regex): " << par_as_string); + // If entered regexp must match at begin of searched string buffer - string regexp_str = string("\\`") + lead_as_regexp + par_as_string; + string regexp_str = lead_as_regexp + par_as_string; LYXERR(Debug::FIND, "Setting regexp to : '" << regexp_str << "'"); regexp = lyx::regex(regexp_str); // If entered regexp may match wherever in searched string buffer - string regexp2_str = string("\\`.*") + lead_as_regexp + ".*" + par_as_string; + string regexp2_str = lead_as_regexp + ".*" + par_as_string; LYXERR(Debug::FIND, "Setting regexp2 to: '" << regexp2_str << "'"); regexp2 = lyx::regex(regexp2_str); } @@ -915,47 +952,63 @@ int MatchStringAdv::findAux(DocIterator const & cur, int len, bool at_begin) con 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); + LYXERR(Debug::FIND, "Matching against '" << lyx::to_utf8(docstr) << "'"); LYXERR(Debug::FIND, "After normalization: '" << str << "'"); - if (! use_regexp) { - LYXERR(Debug::FIND, "Searching in normal mode: par_as_string='" << par_as_string << "', str='" << str << "'"); - LYXERR(Debug::FIND, "Searching in normal mode: lead_as_string='" << lead_as_string << "', par_as_string_nolead='" << par_as_string_nolead << "'"); + + if (use_regexp) { + LYXERR(Debug::FIND, "Searching in regexp mode: at_begin=" << at_begin); + regex const *p_regexp; + regex_constants::match_flag_type flags; if (at_begin) { - LYXERR(Debug::FIND, "size=" << par_as_string.size() << ", substr='" << str.substr(0, par_as_string.size()) << "'"); - if (str.substr(0, par_as_string.size()) == par_as_string) - return par_as_string.size(); + flags = regex_constants::match_continuous; + p_regexp = ®exp; } else { - size_t pos = str.find(par_as_string_nolead); - if (pos != string::npos) - return par_as_string.size(); + flags = regex_constants::match_default; + p_regexp = ®exp2; } + sregex_iterator re_it(str.begin(), str.end(), *p_regexp, flags); + if (re_it == sregex_iterator()) + return 0; + match_results const & m = *re_it; + + // Check braces on the segment that matched the entire regexp expression, + // plus the last subexpression, if a (.*?) was inserted in the constructor. + if (!braces_match(m[0].first, m[0].second, open_braces)) + return 0; + + // Check braces on segments that matched all (.*?) subexpressions, + // except the last "padding" one inserted by lyx. + 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 + // due to close wildcards added at end of regexp + if (close_wildcards == 0) + return m[0].second - m[0].first; + + return m[m.size() - close_wildcards].first - m[0].first; + } + + // else !use_regexp: but all code paths above return + LYXERR(Debug::FIND, "Searching in normal mode: par_as_string='" + << par_as_string << "', str='" << str << "'"); + LYXERR(Debug::FIND, "Searching in normal mode: lead_as_string='" + << lead_as_string << "', par_as_string_nolead='" + << par_as_string_nolead << "'"); + + if (at_begin) { + LYXERR(Debug::FIND, "size=" << par_as_string.size() + << ", substr='" << str.substr(0, par_as_string.size()) << "'"); + if (str.substr(0, par_as_string.size()) == par_as_string) + return par_as_string.size(); } else { - LYXERR(Debug::FIND, "Searching in regexp mode: at_begin=" << at_begin); - // Try all possible regexp matches, - //until one that verifies the braces match test is found - regex const *p_regexp = at_begin ? ®exp : ®exp2; - sregex_iterator re_it(str.begin(), str.end(), *p_regexp); - sregex_iterator re_it_end; - for (; re_it != re_it_end; ++re_it) { - match_results const & m = *re_it; - // Check braces on the segment that matched the entire regexp expression, - // plus the last subexpression, if a (.*?) was inserted in the constructor. - if (!braces_match(m[0].first, m[0].second, open_braces)) - return 0; - // Check braces on segments that matched all (.*?) subexpressions, - // except the last "padding" one inserted by lyx. - 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 - // due to close wildcards added at end of regexp - if (close_wildcards == 0) - return m[0].second - m[0].first; - else - return m[m.size() - close_wildcards].first - m[0].first; - } + size_t pos = str.find(par_as_string_nolead); + if (pos != string::npos) + return par_as_string.size(); } return 0; } @@ -1035,7 +1088,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; @@ -1044,7 +1096,7 @@ docstring stringifyFromCursor(DocIterator const & cur, int len) LYXERR(Debug::FIND, "Stringifying with cur: " << cur << ", from pos: " << cur.pos() << ", end: " << end); return par.asString(cur.pos(), end, - AS_STR_INSETS | AS_STR_PLAINTEXT, + AS_STR_INSETS | AS_STR_SKIPDELETE | AS_STR_PLAINTEXT, &runparams); } else if (cur.inMathed()) { docstring s; @@ -1075,11 +1127,9 @@ docstring latexifyFromCursor(DocIterator const & cur, int len) LYXERR(Debug::FIND, " with cur.lastpost=" << cur.lastpos() << ", cur.lastrow=" << cur.lastrow() << ", cur.lastcol=" << cur.lastcol()); Buffer const & buf = *cur.buffer(); - LBUFERR(buf.params().isLatex()); - TexRow texrow; odocstringstream ods; - otexstream os(ods, texrow); + otexstream os(ods); OutputParams runparams(&buf.params().encoding()); runparams.nice = false; runparams.flavor = OutputParams::LATEX; @@ -1099,8 +1149,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; } @@ -1122,7 +1172,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; } @@ -1250,12 +1300,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) @@ -1266,7 +1314,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); @@ -1328,6 +1376,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))) @@ -1349,7 +1398,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; @@ -1376,7 +1425,9 @@ static void changeFirstCase(Buffer & buffer, TextCase first_case, TextCase other static void findAdvReplace(BufferView * bv, FindAndReplaceOptions const & opt, MatchStringAdv & matchAdv) { Cursor & cur = bv->cursor(); - if (opt.repl_buf_name == docstring()) + if (opt.repl_buf_name == docstring() + || theBufferList().getBuffer(FileName(to_utf8(opt.repl_buf_name)), true) == 0 + || theBufferList().getBuffer(FileName(to_utf8(opt.find_buf_name)), true) == 0) return; DocIterator sel_beg = cur.selectionBegin(); @@ -1425,9 +1476,8 @@ 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; odocstringstream ods; - otexstream os(ods, texrow); + otexstream os(ods); OutputParams runparams(&repl_buffer.params().encoding()); runparams.nice = false; runparams.flavor = OutputParams::LATEX; @@ -1438,8 +1488,8 @@ static void findAdvReplace(BufferView * bv, FindAndReplaceOptions const & opt, M docstring repl_latex = ods.str(); LYXERR(Debug::FIND, "Latexified replace_buffer: '" << repl_latex << "'"); string s; - regex_replace(to_utf8(repl_latex), s, "\\$(.*)\\$", "$1"); - regex_replace(s, s, "\\\\\\[(.*)\\\\\\]", "$1"); + (void)regex_replace(to_utf8(repl_latex), s, "\\$(.*)\\$", "$1"); + (void)regex_replace(s, s, "\\\\\\[(.*)\\\\\\]", "$1"); repl_latex = from_utf8(s); LYXERR(Debug::FIND, "Replacing by insert()ing latex: '" << repl_latex << "' cur=" << cur << " with depth=" << cur.depth()); MathData ar(cur.buffer()); @@ -1455,7 +1505,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(); } @@ -1465,6 +1514,11 @@ bool findAdv(BufferView * bv, FindAndReplaceOptions const & opt) DocIterator cur; int match_len = 0; + // e.g., when invoking word-findadv from mini-buffer wither with + // wrong options syntax or before ever opening advanced F&R pane + if (theBufferList().getBuffer(FileName(to_utf8(opt.find_buf_name)), true) == 0) + return false; + try { MatchStringAdv matchAdv(bv->buffer(), opt); int length = bv->cursor().selectionEnd().pos() - bv->cursor().selectionBegin().pos();