X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flyxfind.cpp;h=36b663e5e372536b6e8bf7a2d40c40ac6a674836;hb=3d4076b598deb18660e50ec9c327efc3b15f15d0;hp=b67f915d7c815d75f6fed65f7861d9f68f0e7437;hpb=a74153da0b736c2f6506b87d61c06213becb8036;p=lyx.git diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp index b67f915d7c..36b663e5e3 100644 --- a/src/lyxfind.cpp +++ b/src/lyxfind.cpp @@ -94,7 +94,7 @@ private: int findForward(DocIterator & cur, MatchString const & match, - bool find_del = true) + bool find_del = true) { for (; cur; cur.forwardChar()) if (cur.inTexted()) { @@ -107,7 +107,7 @@ int findForward(DocIterator & cur, MatchString const & match, int findBackwards(DocIterator & cur, MatchString const & match, - bool find_del = true) + bool find_del = true) { while (cur) { cur.backwardChar(); @@ -121,23 +121,6 @@ int findBackwards(DocIterator & cur, MatchString const & match, } -bool findChange(DocIterator & cur, bool next) -{ - 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(); - return true; - } - - return false; -} - - bool searchAllowed(docstring const & str) { if (str.empty()) { @@ -149,17 +132,20 @@ 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) { if (!searchAllowed(searchstr)) return false; - DocIterator cur = bv->cursor(); + DocIterator cur = forward + ? bv->cursor().selectionEnd() + : bv->cursor().selectionBegin(); MatchString const match(searchstr, case_sens, whole); - int match_len = forward ? findForward(cur, match, find_del) : - findBackwards(cur, match, find_del); + int match_len = forward + ? findForward(cur, match, find_del) + : findBackwards(cur, match, find_del); if (match_len > 0) bv->putSelectionAt(cur, match_len, !forward); @@ -193,11 +179,13 @@ int replaceAll(BufferView * bv, pos_type const pos = cur.pos(); Font const font = cur.paragraph().getFontSettings(buf.params(), pos); cur.recordUndo(); - int striked = ssize - cur.paragraph().eraseChars(pos, pos + match_len, - buf.params().trackChanges); + int striked = ssize - + cur.paragraph().eraseChars(pos, pos + match_len, + buf.params().trackChanges); cur.paragraph().insert(pos, replacestr, font, - Change(buf.params().trackChanges ? - Change::INSERTED : Change::UNCHANGED)); + Change(buf.params().trackChanges + ? Change::INSERTED + : Change::UNCHANGED)); for (int i = 0; i < rsize + striked; ++i) cur.forwardChar(); ++num; @@ -229,20 +217,20 @@ int replaceAll(BufferView * bv, // 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) + docstring const & replacestr, bool case_sens, + bool whole, bool forward, bool findnext) { Cursor & cur = bv->cursor(); if (!cur.selection()) { // no selection, non-empty search string: find it if (!searchstr.empty()) { findOne(bv, searchstr, case_sens, whole, forward); - return pair(true, 0); + return make_pair(true, 0); } // empty search string if (!cur.inTexted()) // bail in math - return pair(false, 0); + return make_pair(false, 0); // select current word and treat it as the search string cur.innerText()->selectWord(cur, WHOLE_WORD); searchstr = cur.selectionAsString(false); @@ -251,45 +239,44 @@ pair replaceOne(BufferView * bv, docstring searchstr, // if we still don't have a search string, report the error // and abort. if (!searchAllowed(searchstr)) - return pair(false, 0); + return make_pair(false, 0); bool have_selection = cur.selection(); docstring const selected = cur.selectionAsString(false); bool match = - case_sens ? searchstr == selected - : compare_no_case(searchstr, selected) == 0; + case_sens + ? searchstr == selected + : compare_no_case(searchstr, selected) == 0; // 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 pair(true, 0); + return make_pair(true, 0); } // we're now actually ready to replace. if the buffer is // read-only, we can't, though. if (bv->buffer().isReadonly()) - return pair(false, 0); + return make_pair(false, 0); - cap::replaceSelectionWithString(cur, replacestr, forward); + cap::replaceSelectionWithString(cur, replacestr); if (forward) { cur.pos() += replacestr.length(); - LASSERT(cur.pos() <= cur.lastpos(), /* */); - } else { - cur.pos() -= replacestr.length(); - LASSERT(cur.pos() >= 0, /* */); + LASSERT(cur.pos() <= cur.lastpos(), + cur.pos() = cur.lastpos()); } if (findnext) findOne(bv, searchstr, case_sens, whole, forward, false); - return pair(true, 1); + return make_pair(true, 1); } } // namespace anon docstring const find2string(docstring const & search, - bool casesensitive, bool matchword, bool forward) + bool casesensitive, bool matchword, bool forward) { odocstringstream ss; ss << search << '\n' @@ -301,8 +288,9 @@ docstring const find2string(docstring const & search, docstring const replace2string(docstring const & replace, - docstring const & search, bool casesensitive, bool matchword, - bool all, bool forward, bool findnext) + docstring const & search, + bool casesensitive, bool matchword, + bool all, bool forward, bool findnext) { odocstringstream ss; ss << replace << '\n' @@ -366,7 +354,7 @@ bool lyxreplace(BufferView * bv, replace_count = replaceAll(bv, search, rplc, casesensitive, matchword); update = replace_count > 0; } else { - pair rv = + pair rv = replaceOne(bv, search, rplc, casesensitive, matchword, forward, findnext); update = rv.first; replace_count = rv.second; @@ -375,7 +363,7 @@ bool lyxreplace(BufferView * bv, Buffer const & buf = bv->buffer(); if (!update) { // emit message signal. - buf.message(_("String not found!")); + buf.message(_("String not found.")); } else { if (replace_count == 0) { buf.message(_("String found.")); @@ -393,40 +381,41 @@ bool lyxreplace(BufferView * bv, if (findOne(bv, search, casesensitive, matchword, forward)) update = true; else - bv->message(_("String not found!")); + bv->message(_("String not found.")); } return update; } -bool findNextChange(BufferView * bv) +namespace { +bool findChange(DocIterator & cur, bool next) { - return findChange(bv, true); -} - + 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(); + return true; + } -bool findPreviousChange(BufferView * bv) -{ - return findChange(bv, false); + return false; } bool findChange(BufferView * bv, bool next) { - if (bv->cursor().selection()) { - // set the cursor at the beginning or at the end of the selection - // before searching. Otherwise, the current change will be found. - if (next != (bv->cursor().top() > bv->cursor().normalAnchor())) - bv->cursor().setCursorToAnchor(); - } - - DocIterator cur = bv->cursor(); + 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; - DocIterator tmpcur = cur; + Cursor tmpcur = cur; // Leave math first while (tmpcur.inMathed()) tmpcur.pop_back(); @@ -445,24 +434,24 @@ bool findChange(BufferView * bv, bool next) if (!findChange(cur, next)) return false; - bv->cursor().setCursor(cur); - bv->cursor().resetAnchor(); + bv->mouseSetCursor(cur, false); + + CursorSlice & tip = cur.top(); if (!next) // take a step into the change - cur.backwardPos(); + tip.backwardPos(); - Change orig_change = cur.paragraph().lookupChange(cur.pos()); + Change orig_change = tip.paragraph().lookupChange(tip.pos()); - CursorSlice & tip = cur.top(); if (next) { - for (; !tip.at_end(); tip.forwardPos()) { + 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.at_begin();) { + for (; tip.pit() > 0 || tip.pos() > 0;) { tip.backwardPos(); Change change = tip.paragraph().lookupChange(tip.pos()); if (!change.isSimilarTo(orig_change)) { @@ -473,17 +462,30 @@ bool findChange(BufferView * bv, bool next) } } - // Now put cursor to end of selection: - bv->cursor().setCursor(cur); - bv->cursor().setSelection(); - - if (search_both_sides) { - bv->cursor().setSelection(false); + if (!search_both_sides) { + // Now set the selection. + bv->mouseSetCursor(cur, true); + } else { + bv->mouseSetCursor(cur, false); findChange(bv, !next); } return true; } +} + + +bool findNextChange(BufferView * bv) +{ + return findChange(bv, true); +} + + +bool findPreviousChange(BufferView * bv) +{ + return findChange(bv, false); +} + namespace { @@ -493,53 +495,62 @@ typedef vector > Escapes; /// @note Beware of order Escapes const & get_regexp_escapes() { + typedef std::pair P; + static Escapes escape_map; if (escape_map.empty()) { - escape_map.push_back(pair("$", "\\$")); - escape_map.push_back(pair("{", "\\{")); - escape_map.push_back(pair("}", "\\}")); - escape_map.push_back(pair("[", "\\[")); - escape_map.push_back(pair("]", "\\]")); - escape_map.push_back(pair("(", "\\(")); - escape_map.push_back(pair(")", "\\)")); - escape_map.push_back(pair("+", "\\+")); - escape_map.push_back(pair("*", "\\*")); - escape_map.push_back(pair(".", "\\.")); - escape_map.push_back(pair("\\", "(?:\\\\|\\\\backslash)")); - escape_map.push_back(pair("~", "(?:\\\\textasciitilde|\\\\sim)")); - escape_map.push_back(pair("^", "(?:\\^|\\\\textasciicircum\\{\\}|\\\\mathcircumflex)")); + escape_map.push_back(P("$", "_x_$")); + escape_map.push_back(P("{", "_x_{")); + escape_map.push_back(P("}", "_x_}")); + escape_map.push_back(P("[", "_x_[")); + escape_map.push_back(P("]", "_x_]")); + escape_map.push_back(P("(", "_x_(")); + escape_map.push_back(P(")", "_x_)")); + escape_map.push_back(P("+", "_x_+")); + escape_map.push_back(P("*", "_x_*")); + 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("_x_", "\\")); } return escape_map; } /// A map of lyx escaped strings and their unescaped equivalent. -Escapes const & get_lyx_unescapes() { +Escapes const & get_lyx_unescapes() +{ + typedef std::pair P; + static Escapes escape_map; if (escape_map.empty()) { - escape_map.push_back(pair("\\%", "%")); - escape_map.push_back(pair("\\mathcircumflex ", "^")); - escape_map.push_back(pair("\\mathcircumflex", "^")); - escape_map.push_back(pair("\\backslash ", "\\")); - escape_map.push_back(pair("\\backslash", "\\")); - escape_map.push_back(pair("\\\\{", "_x_<")); - escape_map.push_back(pair("\\\\}", "_x_>")); - escape_map.push_back(pair("\\sim ", "~")); - escape_map.push_back(pair("\\sim", "~")); + escape_map.push_back(P("\\%", "%")); + escape_map.push_back(P("\\mathcircumflex ", "^")); + escape_map.push_back(P("\\mathcircumflex", "^")); + escape_map.push_back(P("\\backslash ", "\\")); + escape_map.push_back(P("\\backslash", "\\")); + escape_map.push_back(P("\\\\{", "_x_<")); + escape_map.push_back(P("\\\\}", "_x_>")); + escape_map.push_back(P("\\sim ", "~")); + escape_map.push_back(P("\\sim", "~")); } return escape_map; } /// A map of escapes turning a regexp matching text to one matching latex. -Escapes const & get_regexp_latex_escapes() { +Escapes const & get_regexp_latex_escapes() +{ + typedef std::pair P; + static Escapes escape_map; if (escape_map.empty()) { - escape_map.push_back(pair("\\\\", "(?:\\\\\\\\|\\\\backslash|\\\\textbackslash\\{\\})")); - escape_map.push_back(pair("(("(("\\[", "\\{\\[\\}")); - escape_map.push_back(pair("\\]", "\\{\\]\\}")); - escape_map.push_back(pair("\\^", "(?:\\^|\\\\textasciicircum\\{\\}|\\\\mathcircumflex)")); - escape_map.push_back(pair("%", "\\\\\\%")); + escape_map.push_back(P("\\\\", "(?:\\\\\\\\|\\\\backslash|\\\\textbackslash\\{\\})")); + escape_map.push_back(P("( 0 ? - par.isWordSeparator(cur.pos() - 1) : true; - bool ws_right = cur.pos() + res < par.size() ? - par.isWordSeparator(cur.pos() + res) : true; + bool ws_left = (cur.pos() > 0) + ? par.isWordSeparator(cur.pos() - 1) + : true; + bool ws_right = (cur.pos() + res < par.size()) + ? par.isWordSeparator(cur.pos() + res) + : true; LYXERR(Debug::FIND, "cur.pos()=" << cur.pos() << ", res=" << res << ", separ: " << ws_left << ", " << ws_right @@ -953,10 +983,10 @@ string MatchStringAdv::normalize(docstring const & s, bool hack_braces) const else t = lyx::to_utf8(s); // Remove \n at begin - while (t.size() > 0 && t[0] == '\n') + while (!t.empty() && t[0] == '\n') t = t.substr(1); // Remove \n at end - while (t.size() > 0 && t[t.size() - 1] == '\n') + while (!t.empty() && t[t.size() - 1] == '\n') t = t.substr(0, t.size() - 1); size_t pos; // Replace all other \n with spaces @@ -987,32 +1017,34 @@ docstring stringifyFromCursor(DocIterator const & cur, int len) { LYXERR(Debug::FIND, "Stringifying with len=" << len << " from cursor at pos: " << cur); if (cur.inTexted()) { - Paragraph const & par = cur.paragraph(); - // TODO what about searching beyond/across paragraph breaks ? - // TODO Try adding a AS_STR_INSERTS as last arg - 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; - // No side effect of file copying and image conversion - 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); + Paragraph const & par = cur.paragraph(); + // TODO what about searching beyond/across paragraph breaks ? + // TODO Try adding a AS_STR_INSERTS as last arg + 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; + // No side effect of file copying and image conversion + 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); } else if (cur.inMathed()) { - docstring s; - CursorSlice cs = cur.top(); - MathData md = cs.cell(); - MathData::const_iterator it_end = - ( ( len == -1 || cs.pos() + len > int(md.size()) ) - ? md.end() : md.begin() + cs.pos() + len ); - for (MathData::const_iterator it = md.begin() + cs.pos(); it != it_end; ++it) - s = s + asString(*it); - LYXERR(Debug::FIND, "Stringified math: '" << s << "'"); - return s; + docstring s; + CursorSlice cs = cur.top(); + MathData md = cs.cell(); + MathData::const_iterator it_end = + (( len == -1 || cs.pos() + len > int(md.size())) + ? md.end() + : md.begin() + cs.pos() + len ); + for (MathData::const_iterator it = md.begin() + cs.pos(); + it != it_end; ++it) + s = s + asString(*it); + LYXERR(Debug::FIND, "Stringified math: '" << s << "'"); + return s; } LYXERR(Debug::FIND, "Don't know how to stringify from here: " << cur); return docstring(); @@ -1027,9 +1059,9 @@ docstring latexifyFromCursor(DocIterator const & cur, int len) { LYXERR(Debug::FIND, "Latexifying with len=" << len << " from cursor at pos: " << cur); LYXERR(Debug::FIND, " with cur.lastpost=" << cur.lastpos() << ", cur.lastrow=" - << cur.lastrow() << ", cur.lastcol=" << cur.lastcol()); + << cur.lastrow() << ", cur.lastcol=" << cur.lastcol()); Buffer const & buf = *cur.buffer(); - LASSERT(buf.params().isLatex(), /* */); + LBUFERR(buf.params().isLatex()); TexRow texrow; odocstringstream ods; @@ -1047,24 +1079,27 @@ docstring latexifyFromCursor(DocIterator const & cur, int len) if (len != -1 && endpos > cur.pos() + len) endpos = cur.pos() + len; TeXOnePar(buf, *cur.innerText(), cur.pit(), os, runparams, - string(), cur.pos(), endpos); + string(), cur.pos(), endpos); LYXERR(Debug::FIND, "Latexified text: '" << lyx::to_utf8(ods.str()) << "'"); } else if (cur.inMathed()) { // 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); - cs.asInsetMath()->asHullInset()->header_write(ws); - break; - } + CursorSlice const & cs = cur[s]; + if (cs.asInsetMath() && cs.asInsetMath() && cs.asInsetMath()->asHullInset()) { + WriteStream ws(ods); + cs.asInsetMath()->asHullInset()->header_write(ws); + break; + } } CursorSlice const & cs = cur.top(); MathData md = cs.cell(); - MathData::const_iterator it_end = ( ( len == -1 || cs.pos() + len > int(md.size()) ) - ? md.end() : md.begin() + cs.pos() + len ); - for (MathData::const_iterator it = md.begin() + cs.pos(); it != it_end; ++it) + MathData::const_iterator it_end = + ((len == -1 || cs.pos() + len > int(md.size())) + ? md.end() + : md.begin() + cs.pos() + len); + for (MathData::const_iterator it = md.begin() + cs.pos(); + it != it_end; ++it) ods << asString(*it); // Retrieve the math environment type, and add '$' or '$]' @@ -1103,7 +1138,7 @@ int findAdvFinalize(DocIterator & cur, MatchStringAdv const & match) cur.forwardPos(); } while (cur && cur.depth() > d && match(cur) > 0); cur = old_cur; - LASSERT(match(cur) > 0, /* */); + LASSERT(match(cur) > 0, return 0); LYXERR(Debug::FIND, "Ok"); // Compute the match length @@ -1133,12 +1168,12 @@ int findForwardAdv(DocIterator & cur, MatchStringAdv & match) { if (!cur) return 0; - while (cur) { + while (!theApp()->longOperationCancelled() && cur) { LYXERR(Debug::FIND, "findForwardAdv() cur: " << cur); int match_len = match(cur, -1, false); LYXERR(Debug::FIND, "match_len: " << match_len); if (match_len) { - for (; cur; cur.forwardPos()) { + for (; !theApp()->longOperationCancelled() && cur; cur.forwardPos()) { LYXERR(Debug::FIND, "Advancing cur: " << cur); int match_len = match(cur); LYXERR(Debug::FIND, "match_len: " << match_len); @@ -1191,7 +1226,8 @@ int findMostBackwards(DocIterator & cur, MatchStringAdv const & match) /// Finds backwards -int findBackwardsAdv(DocIterator & cur, MatchStringAdv & match) { +int findBackwardsAdv(DocIterator & cur, MatchStringAdv & match) +{ if (! cur) return 0; // Backup of original position @@ -1235,7 +1271,7 @@ int findBackwardsAdv(DocIterator & cur, MatchStringAdv & match) { else cur.backwardPos(); pit_changed = true; - } while (true); + } while (!theApp()->longOperationCancelled()); return 0; } @@ -1244,9 +1280,10 @@ int findBackwardsAdv(DocIterator & cur, MatchStringAdv & match) { docstring stringifyFromForSearch(FindAndReplaceOptions const & opt, - DocIterator const & cur, int len) + DocIterator const & cur, int len) { - LASSERT(cur.pos() >= 0 && cur.pos() <= cur.lastpos(), /* */); + LASSERT(cur.pos() >= 0 && cur.pos() <= cur.lastpos(), + return docstring()); if (!opt.ignoreformat) return latexifyFromCursor(cur, len); else @@ -1254,13 +1291,14 @@ docstring stringifyFromForSearch(FindAndReplaceOptions const & opt, } -FindAndReplaceOptions::FindAndReplaceOptions(docstring const & find_buf_name, bool casesensitive, +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) : 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) + forward(forward), expandmacros(expandmacros), ignoreformat(ignoreformat), + repl_buf_name(repl_buf_name), keep_case(keep_case), scope(scope) { } @@ -1269,7 +1307,8 @@ namespace { /** Check if 'len' letters following cursor are all non-lowercase */ -static bool allNonLowercase(DocIterator const & cur, int len) { +static bool allNonLowercase(DocIterator const & cur, int len) +{ pos_type end_pos = cur.pos() + len; for (pos_type pos = cur.pos(); pos != end_pos; ++pos) if (isLowerCase(cur.paragraph().getChar(pos))) @@ -1279,7 +1318,8 @@ static bool allNonLowercase(DocIterator const & cur, int len) { /** Check if first letter is upper case and second one is lower case */ -static bool firstUppercase(DocIterator const & cur) { +static bool firstUppercase(DocIterator const & cur) +{ char_type ch1, ch2; if (cur.pos() >= cur.lastpos() - 1) { LYXERR(Debug::FIND, "No upper-case at cur: " << cur); @@ -1300,13 +1340,15 @@ static bool firstUppercase(DocIterator const & cur) { ** ** \fixme What to do with possible further paragraphs in replace buffer ? **/ -static void changeFirstCase(Buffer & buffer, TextCase first_case, TextCase others_case) { +static void changeFirstCase(Buffer & buffer, TextCase first_case, TextCase others_case) +{ ParagraphList::iterator pit = buffer.paragraphs().begin(); pos_type right = pos_type(1); pit->changeCase(buffer.params(), pos_type(0), right, first_case); right = pit->size() + 1; pit->changeCase(buffer.params(), right, right, others_case); } + } // anon namespace /// @@ -1326,7 +1368,7 @@ static void findAdvReplace(BufferView * bv, FindAndReplaceOptions const & opt, M << ", sel_len: " << sel_len << endl); if (sel_len == 0) return; - LASSERT(sel_len > 0, /**/); + LASSERT(sel_len > 0, return); if (!matchAdv(sel_beg, sel_len)) return; @@ -1338,7 +1380,7 @@ static void findAdvReplace(BufferView * bv, FindAndReplaceOptions const & opt, M string lyx = oss.str(); Buffer repl_buffer("", false); repl_buffer.setUnnamed(true); - LASSERT(repl_buffer.readString(lyx), /**/); + LASSERT(repl_buffer.readString(lyx), return); if (opt.keep_case && sel_len >= 2) { if (cur.inTexted()) { if (firstUppercase(cur)) @@ -1402,12 +1444,15 @@ bool findAdv(BufferView * bv, FindAndReplaceOptions const & opt) try { MatchStringAdv matchAdv(bv->buffer(), opt); + int length = bv->cursor().selectionEnd().pos() - bv->cursor().selectionBegin().pos(); + if (length > 0) + bv->putSelectionAt(bv->cursor().selectionBegin(), length, !opt.forward); findAdvReplace(bv, opt, matchAdv); cur = bv->cursor(); if (opt.forward) - match_len = findForwardAdv(cur, matchAdv); + match_len = findForwardAdv(cur, matchAdv); else - match_len = findBackwardsAdv(cur, matchAdv); + match_len = findBackwardsAdv(cur, matchAdv); } catch (...) { // This may only be raised by lyx::regex() bv->message(_("Invalid regular expression!")); @@ -1454,10 +1499,10 @@ istringstream & operator>>(istringstream & is, FindAndReplaceOptions & opt) getline(is, line); while (line != "EOSS") { if (! s.empty()) - s = s + "\n"; + s = s + "\n"; s = s + line; if (is.eof()) // Tolerate malformed request - break; + break; getline(is, line); } LYXERR(Debug::FIND, "file_buf_name: '" << s << "'"); @@ -1468,10 +1513,10 @@ istringstream & operator>>(istringstream & is, FindAndReplaceOptions & opt) getline(is, line); while (line != "EOSS") { if (! s.empty()) - s = s + "\n"; + s = s + "\n"; s = s + line; if (is.eof()) // Tolerate malformed request - break; + break; getline(is, line); } LYXERR(Debug::FIND, "repl_buf_name: '" << s << "'"); @@ -1481,7 +1526,7 @@ istringstream & operator>>(istringstream & is, FindAndReplaceOptions & opt) is >> i; opt.scope = FindAndReplaceOptions::SearchScope(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); return is; }