X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfind.cpp;h=269b2123707207bbdb095a0db123ff1fdd87ef0f;hb=952853eb2358472644e45f3fe3a6f3a68fac3556;hp=74b045c4bba0cb2729916a640d5a1d7b2857da63;hpb=43f6b1672b5ef442b4e9b7e4f7ea76dc14ac4fc8;p=lyx.git diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp index 74b045c4bb..269b212370 100644 --- a/src/lyxfind.cpp +++ b/src/lyxfind.cpp @@ -45,6 +45,7 @@ #include "support/convert.h" #include "support/debug.h" #include "support/docstream.h" +#include "support/FileName.h" #include "support/gettext.h" #include "support/lassert.h" #include "support/lstrings.h" @@ -121,23 +122,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()) { @@ -154,7 +138,9 @@ bool findOne(BufferView * bv, docstring const & searchstr, 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); @@ -278,7 +264,8 @@ pair replaceOne(BufferView * bv, docstring searchstr, cap::replaceSelectionWithString(cur, replacestr); if (forward) { cur.pos() += replacestr.length(); - LASSERT(cur.pos() <= cur.lastpos(), /* */); + LASSERT(cur.pos() <= cur.lastpos(), + cur.pos() = cur.lastpos()); } if (findnext) findOne(bv, searchstr, case_sens, whole, forward, false); @@ -377,7 +364,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.")); @@ -395,40 +382,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(); @@ -447,24 +435,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)) { @@ -475,17 +463,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 { @@ -623,6 +624,7 @@ string escape_for_regex(string s, bool match_latex) return s; } + /// Wrapper for lyx::regex_replace with simpler interface bool regex_replace(string const & s, string & t, string const & searchstr, string const & replacestr) @@ -637,6 +639,7 @@ bool regex_replace(string const & s, string & t, string const & searchstr, return rv; } + /** Checks if supplied string segment is well-formed from the standpoint of matching open-closed braces. ** ** Verify that closed braces exactly match open braces. This avoids that, for example, @@ -678,6 +681,7 @@ bool braces_match(string::const_iterator const & beg, return true; } + /** The class performing a match between a position in the document and the FindAdvOptions. **/ class MatchStringAdv { @@ -762,7 +766,8 @@ static docstring buffer_to_latex(Buffer & buffer) } -static docstring stringifySearchBuffer(Buffer & buffer, FindAndReplaceOptions const & opt) { +static docstring stringifySearchBuffer(Buffer & buffer, FindAndReplaceOptions const & opt) +{ docstring str; if (!opt.ignoreformat) { str = buffer_to_latex(buffer); @@ -787,7 +792,8 @@ static docstring stringifySearchBuffer(Buffer & buffer, FindAndReplaceOptions co /// Return separation pos between the leading material and the rest -static size_t identifyLeading(string const & s) { +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)\\*?\\{", "") @@ -801,7 +807,8 @@ static size_t identifyLeading(string const & s) { // Remove trailing closure of math, macros and environments, so to catch parts of them. -static int identifyClosing(string & t) { +static int identifyClosing(string & t) +{ int open_braces = 0; do { LYXERR(Debug::FIND, "identifyClosing(): t now is '" << t << "'"); @@ -833,7 +840,16 @@ MatchStringAdv::MatchStringAdv(lyx::Buffer & buf, FindAndReplaceOptions const & close_wildcards = 0; size_t lead_size = 0; - if (!opt.ignoreformat) { + 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 { 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); @@ -1046,7 +1062,7 @@ 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(); - LASSERT(buf.params().isLatex(), /* */); + LBUFERR(buf.params().isLatex()); TexRow texrow; odocstringstream ods; @@ -1123,7 +1139,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 @@ -1211,7 +1227,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 @@ -1266,7 +1283,8 @@ int findBackwardsAdv(DocIterator & cur, MatchStringAdv & match) { docstring stringifyFromForSearch(FindAndReplaceOptions const & opt, 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 @@ -1290,7 +1308,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))) @@ -1300,7 +1319,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); @@ -1321,13 +1341,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 /// @@ -1347,7 +1369,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; @@ -1359,7 +1381,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)) @@ -1423,6 +1445,9 @@ 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)