X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfind.cpp;h=12d30e08ed14f0eeff45fe0f54c63d276e954376;hb=cb351665f432671eb263eec76164aa546abd7151;hp=62255c4ba91065625bb50d911b333a2e6bebae82;hpb=5e5115c3767a91d0fad68619e54cb0272ef8dd57;p=lyx.git diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp index 62255c4ba9..12d30e08ed 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()) { @@ -248,7 +232,9 @@ pair 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); } @@ -280,7 +266,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); @@ -403,70 +390,74 @@ bool lyxreplace(BufferView * bv, } -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; - // Leave math first + 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() && 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)) + 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; + } } + // find the next change if (!findChange(cur, next)) return false; - bv->cursor().setCursor(cur); - bv->cursor().resetAnchor(); + bv->mouseSetCursor(cur, false); - if (!next) + CursorSlice & tip = cur.top(); + + if (!next && tip.pos() > 0) // 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)) { @@ -477,17 +468,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 { @@ -778,14 +782,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; @@ -905,6 +912,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); @@ -1033,7 +1043,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(); @@ -1063,7 +1075,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; @@ -1140,7 +1152,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 @@ -1284,7 +1296,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 @@ -1296,10 +1309,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) { } @@ -1308,10 +1321,15 @@ namespace { /** Check if 'len' letters following cursor are all non-lowercase */ -static bool allNonLowercase(DocIterator const & cur, int len) +static bool allNonLowercase(Cursor const & cur, int len) { - pos_type end_pos = cur.pos() + len; - for (pos_type pos = cur.pos(); pos != end_pos; ++pos) + pos_type beg_pos = cur.selectionBegin().pos(); + pos_type end_pos = cur.selectionBegin().pos() + len; + if (len > cur.lastpos() + 1 - beg_pos) { + LYXERR(Debug::FIND, "This should not happen, more debug needed"); + len = cur.lastpos() + 1 - beg_pos; + } + for (pos_type pos = beg_pos; pos != end_pos; ++pos) if (isLowerCase(cur.paragraph().getChar(pos))) return false; return true; @@ -1319,15 +1337,16 @@ 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(Cursor const & cur) { char_type ch1, ch2; - if (cur.pos() >= cur.lastpos() - 1) { + pos_type pos = cur.selectionBegin().pos(); + if (pos >= cur.lastpos() - 1) { LYXERR(Debug::FIND, "No upper-case at cur: " << cur); return false; } - ch1 = cur.paragraph().getChar(cur.pos()); - ch2 = cur.paragraph().getChar(cur.pos()+1); + ch1 = cur.paragraph().getChar(pos); + ch2 = cur.paragraph().getChar(pos + 1); bool result = isUpperCase(ch1) && isLowerCase(ch2); LYXERR(Debug::FIND, "firstUppercase(): " << "ch1=" << ch1 << "(" << char(ch1) << "), ch2=" @@ -1344,10 +1363,11 @@ static bool firstUppercase(DocIterator const & cur) static void changeFirstCase(Buffer & buffer, TextCase first_case, TextCase others_case) { ParagraphList::iterator pit = buffer.paragraphs().begin(); + LASSERT(pit->size() >= 1, /**/); 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); + right = pit->size(); + pit->changeCase(buffer.params(), pos_type(1), right, others_case); } } // anon namespace @@ -1369,7 +1389,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; @@ -1381,8 +1401,9 @@ 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) { + LYXERR(Debug::FIND, "keep_case true: cur.pos()=" << cur.pos() << ", sel_len=" << sel_len); if (cur.inTexted()) { if (firstUppercase(cur)) changeFirstCase(repl_buffer, text_uppercase, text_lowercase); @@ -1446,13 +1467,8 @@ 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) { - LYXERR(Debug::FIND, "Putting selection at cur=" << cur << " with length: " << length << " and direction: " << !opt.forward); - if (opt.forward) - bv->putSelectionAt(bv->cursor().selectionBegin(), length, false); - else - bv->putSelectionAt(bv->cursor().selectionBegin(), length, true); - } + if (length > 0) + bv->putSelectionAt(bv->cursor().selectionBegin(), length, !opt.forward); findAdvReplace(bv, opt, matchAdv); cur = bv->cursor(); if (opt.forward) @@ -1489,7 +1505,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()); @@ -1531,8 +1548,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; }