X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfind.C;h=932cbec30e0a31df48b9cd37ab980a076802070f;hb=8765ab59cdddad67284007813ef25934ea0042ce;hp=87225f67ed3e6bc8bb2de0e96c19a774eb9c2e34;hpb=6238e20d09ad90b340148d3d04e16adc7833891b;p=lyx.git diff --git a/src/lyxfind.C b/src/lyxfind.C index 87225f67ed..932cbec30e 100644 --- a/src/lyxfind.C +++ b/src/lyxfind.C @@ -16,240 +16,84 @@ #include "lyxfind.h" #include "buffer.h" +#include "cursor.h" +#include "CutAndPaste.h" +#include "buffer_funcs.h" #include "BufferView.h" #include "debug.h" -#include "iterators.h" #include "funcrequest.h" #include "gettext.h" #include "lyxtext.h" #include "paragraph.h" -#include "PosIterator.h" +#include "pariterator.h" #include "undo.h" #include "frontends/Alert.h" -#include "frontends/LyXView.h" -#include "support/textutils.h" -#include "support/tostr.h" +#include "support/convert.h" +#include "support/docstream.h" -#include "support/std_sstream.h" - -using lyx::support::lowercase; -using lyx::support::uppercase; -using lyx::support::split; +namespace lyx { -using bv_funcs::put_selection_at; +using support::lowercase; +using support::uppercase; +using support::split; -using std::ostringstream; -using std::string; +using std::advance; namespace { -bool parse_bool(string & howto) +bool parse_bool(docstring & howto) { if (howto.empty()) return false; - string var; + docstring var; howto = split(howto, var, ' '); return (var == "1"); } -bool find(BufferView * bv, - string const & searchstr, bool cs, bool mw, bool fw); - - -int replace(BufferView * bv, - string const & searchstr, string const & replacestr, - bool cs, bool mw, bool fw); - - -int replaceAll(BufferView * bv, - string const & searchstr, string const & replacestr, - bool cs, bool mw); - - -bool findChange(PosIterator & cur, PosIterator const & end); - -} // namespace anon - - -namespace lyx { -namespace find { - -string const find2string(string const & search, - bool casesensitive, bool matchword, bool forward) -{ - ostringstream ss; - ss << search << '\n' - << int(casesensitive) << ' ' - << int(matchword) << ' ' - << int(forward); - - return ss.str(); -} - - -string const replace2string(string const & search, string const & replace, - bool casesensitive, bool matchword, - bool all, bool forward) -{ - ostringstream ss; - ss << search << '\n' - << replace << '\n' - << int(casesensitive) << ' ' - << int(matchword) << ' ' - << int(all) << ' ' - << int(forward); - - return ss.str(); -} - - -void find(FuncRequest const & ev) -{ - if (!ev.view() || ev.action != LFUN_WORD_FIND) - return; - - // data is of the form - // " - // " - string search; - string howto = split(ev.argument, search, '\n'); - - bool casesensitive = parse_bool(howto); - bool matchword = parse_bool(howto); - bool forward = parse_bool(howto); - - BufferView * bv = ev.view(); - bool const found = ::find(bv, search, - forward, casesensitive, matchword); - - if (!found) - bv->owner()->message(_("String not found!")); -} - - -void replace(FuncRequest const & ev) -{ - if (!ev.view() || ev.action != LFUN_WORD_REPLACE) - return; - - // data is of the form - // " - // - // " - string search; - string replace; - string howto = split(ev.argument, search, '\n'); - howto = split(howto, replace, '\n'); - - bool casesensitive = parse_bool(howto); - bool matchword = parse_bool(howto); - bool all = parse_bool(howto); - bool forward = parse_bool(howto); - - BufferView * bv = ev.view(); - LyXView * lv = bv->owner(); - - int const replace_count = all ? - ::replaceAll(bv, search, replace, - casesensitive, matchword) : - ::replace(bv, search, replace, - casesensitive, matchword, forward); - - if (replace_count == 0) { - lv->message(_("String not found!")); - } else { - if (replace_count == 1) { - lv->message(_("String has been replaced.")); - } else { - string str = tostr(replace_count); - str += _(" strings have been replaced."); - lv->message(str); - } - } -} - - -bool findNextChange(BufferView * bv) -{ - if (!bv->available()) - return false; - - PosIterator cur = PosIterator(*bv); - PosIterator const endit = bv->buffer()->pos_iterator_end(); - - if (!findChange(cur, endit)) - return false; - - ParagraphList::iterator pit = cur.pit(); - pos_type pos = cur.pos(); - - Change orig_change = pit->lookupChangeFull(pos); - pos_type parsize = pit->size(); - pos_type end = pos; - - for (; end != parsize; ++end) { - Change change = pit->lookupChangeFull(end); - if (change != orig_change) { - // slight UI optimisation: for replacements, we get - // text like : _old_new. Consider that as one change. - if (!(orig_change.type == Change::DELETED && - change.type == Change::INSERTED)) - break; - } - } - pos_type length = end - pos; - put_selection_at(bv, cur, length, true); - return true; -} - -} // find namespace -} // lyx namespace - - -namespace { - -class MatchString +class MatchString : public std::binary_function { public: - MatchString(string const & str, bool cs, bool mw) + MatchString(docstring const & str, bool cs, bool mw) : str(str), cs(cs), mw(mw) {} // returns true if the specified string is at the specified position - bool operator()(Paragraph const & par, lyx::pos_type pos) const + bool operator()(Paragraph const & par, pos_type pos) const { - string::size_type const size = str.length(); - lyx::pos_type i = 0; - lyx::pos_type const parsize = par.size(); - while ((pos + i < parsize) - && (string::size_type(i) < size) - && (cs ? (str[i] == par.getChar(pos + i)) - : (uppercase(str[i]) == uppercase(par.getChar(pos + i))))) { - ++i; + docstring::size_type const size = str.length(); + pos_type i = 0; + pos_type const parsize = par.size(); + for (i = 0; pos + i < parsize; ++i) { + if (docstring::size_type(i) >= size) + break; + if (cs && str[i] != par.getChar(pos + i)) + break; + if (!cs && uppercase(str[i]) != uppercase(par.getChar(pos + i))) + break; } - if (size != string::size_type(i)) + if (size != docstring::size_type(i)) return false; // if necessary, check whether string matches word if (mw) { - if (pos > 0 && IsLetterCharOrDigit(par.getChar(pos - 1))) + if (pos > 0 && par.isLetter(pos - 1)) return false; - if (pos + lyx::pos_type(size) < parsize - && IsLetterCharOrDigit(par.getChar(pos + size))); + if (pos + pos_type(size) < parsize + && par.isLetter(pos + size)) return false; } return true; } - + private: // search string - string str; + docstring str; // case sensitive bool cs; // match whole words only @@ -257,120 +101,111 @@ private: }; -bool findForward(PosIterator & cur, PosIterator const & end, - MatchString const & match) +bool findForward(DocIterator & cur, MatchString const & match) { - for (; cur != end; ++cur) { - if (match(*cur.pit(), cur.pos())) + for (; cur; cur.forwardChar()) + if (cur.inTexted() && match(cur.paragraph(), cur.pos())) return true; - } return false; } -bool findBackwards(PosIterator & cur, PosIterator const & beg, - MatchString const & match) +bool findBackwards(DocIterator & cur, MatchString const & match) { - while (beg != cur) { - --cur; - if (match(*cur.pit(), cur.pos())) + while (cur) { + cur.backwardChar(); + if (cur.inTexted() && match(cur.paragraph(), cur.pos())) return true; } return false; } -bool findChange(PosIterator & cur, PosIterator const & end) +bool findChange(DocIterator & cur) { - for (; cur != end; ++cur) { - if ((!cur.pit()->size() || !cur.at_end()) - && cur.pit()->lookupChange(cur.pos()) != Change::UNCHANGED) + for (; cur; cur.forwardPos()) + if (cur.inTexted() && !cur.paragraph().isUnchanged(cur.pos())) return true; - } return false; } -bool searchAllowed(BufferView * bv, string const & str) +bool searchAllowed(BufferView * bv, docstring const & str) { if (str.empty()) { - Alert::error(_("Search error"), _("Search string is empty")); + frontend::Alert::error(_("Search error"), + _("Search string is empty")); return false; } - return bv->available(); + return bv->buffer(); } -bool find(BufferView * bv, string const & searchstr, bool cs, bool mw, bool fw) +bool find(BufferView * bv, docstring const & searchstr, bool cs, bool mw, bool fw) { if (!searchAllowed(bv, searchstr)) return false; - PosIterator cur = PosIterator(*bv); + DocIterator cur = bv->cursor(); MatchString const match(searchstr, cs, mw); - PosIterator const end = bv->buffer()->pos_iterator_end(); - PosIterator const beg = bv->buffer()->pos_iterator_begin(); - - bool found = fw ? findForward(cur, end, match) - : findBackwards(cur, beg, match); + bool found = fw ? findForward(cur, match) : findBackwards(cur, match); if (found) - put_selection_at(bv, cur, searchstr.length(), !fw); + bv->putSelectionAt(cur, searchstr.length(), !fw); return found; } int replaceAll(BufferView * bv, - string const & searchstr, string const & replacestr, + docstring const & searchstr, docstring const & replacestr, bool cs, bool mw) { Buffer & buf = *bv->buffer(); if (!searchAllowed(bv, searchstr) || buf.isReadonly()) return 0; - - recordUndo(Undo::ATOMIC, bv->text(), 0, buf.paragraphs().size() - 1); - - PosIterator cur = buf.pos_iterator_begin(); - PosIterator const end = buf.pos_iterator_end(); + + recordUndoFullDocument(bv); + MatchString const match(searchstr, cs, mw); int num = 0; int const rsize = replacestr.size(); int const ssize = searchstr.size(); - while (findForward(cur, end, match)) { - lyx::pos_type pos = cur.pos(); + DocIterator cur = doc_iterator_begin(buf.inset()); + while (findForward(cur, match)) { + pos_type pos = cur.pos(); LyXFont const font - = cur.pit()->getFontSettings(buf.params(), pos); - int striked = ssize - cur.pit()->erase(pos, pos + ssize); - cur.pit()->insert(pos, replacestr, font); - advance(cur, rsize + striked); + = cur.paragraph().getFontSettings(buf.params(), pos); + int striked = ssize - cur.paragraph().eraseChars(pos, pos + ssize, + buf.params().trackChanges); + cur.paragraph().insert(pos, replacestr, font, + Change(buf.params().trackChanges ? + Change::INSERTED : Change::UNCHANGED)); + for (int i = 0; i < rsize + striked; ++i) + cur.forwardChar(); ++num; } - PosIterator beg = buf.pos_iterator_begin(); - bv->text()->init(bv); - put_selection_at(bv, beg, 0, false); + updateLabels(buf); + bv->putSelectionAt(doc_iterator_begin(buf.inset()), 0, false); if (num) buf.markDirty(); return num; } -bool stringSelected(BufferView * bv, - string const & searchstr, +bool stringSelected(BufferView * bv, docstring const & searchstr, bool cs, bool mw, bool fw) { - LyXText * text = bv->getLyXText(); // if nothing selected or selection does not equal search // string search and select next occurance and return - string const & str1 = searchstr; - string const str2 = text->selectionAsString(*bv->buffer(), - false); + docstring const & str1 = searchstr; + docstring const str2 = bv->cursor().selectionAsString(false); if ((cs && str1 != str2) || lowercase(str1) != lowercase(str2)) { find(bv, searchstr, cs, mw, fw); return false; @@ -380,9 +215,8 @@ bool stringSelected(BufferView * bv, } -int replace(BufferView * bv, - string const & searchstr, string const & replacestr, - bool cs, bool mw, bool fw) +int replace(BufferView * bv, docstring const & searchstr, + docstring const & replacestr, bool cs, bool mw, bool fw) { if (!searchAllowed(bv, searchstr) || bv->buffer()->isReadonly()) return 0; @@ -390,16 +224,149 @@ int replace(BufferView * bv, if (!stringSelected(bv, searchstr, cs, mw, fw)) return 0; - LyXText * text = bv->getLyXText(); - - text->replaceSelectionWithString(replacestr); - text->setSelectionRange(replacestr.length()); - bv->cursor() = fw ? bv->selEnd() : bv->selStart(); + LCursor & cur = bv->cursor(); + cap::replaceSelectionWithString(cur, replacestr, fw); bv->buffer()->markDirty(); find(bv, searchstr, cs, mw, fw); bv->update(); - + return 1; } -} //namespace anon +} // namespace anon + + +docstring const find2string(docstring const & search, + bool casesensitive, bool matchword, bool forward) +{ + odocstringstream ss; + ss << search << '\n' + << int(casesensitive) << ' ' + << int(matchword) << ' ' + << int(forward); + return ss.str(); +} + + +docstring const replace2string(docstring const & search, docstring const & replace, + bool casesensitive, bool matchword, + bool all, bool forward) +{ + odocstringstream ss; + ss << search << '\n' + << replace << '\n' + << int(casesensitive) << ' ' + << int(matchword) << ' ' + << int(all) << ' ' + << int(forward); + return ss.str(); +} + + +void find(BufferView * bv, FuncRequest const & ev) +{ + if (!bv || ev.action != LFUN_WORD_FIND) + return; + + //lyxerr << "find called, cmd: " << ev << std::endl; + + // data is of the form + // " + // " + docstring search; + docstring howto = split(ev.argument(), search, '\n'); + + bool casesensitive = parse_bool(howto); + bool matchword = parse_bool(howto); + bool forward = parse_bool(howto); + + bool const found = find(bv, search, + casesensitive, matchword, forward); + + if (!found) + // emit message signal. + bv->message(_("String not found!")); +} + + +void replace(BufferView * bv, FuncRequest const & ev) +{ + if (!bv || ev.action != LFUN_WORD_REPLACE) + return; + + // data is of the form + // " + // + // " + docstring search; + docstring rplc; + docstring howto = split(ev.argument(), search, '\n'); + howto = split(howto, rplc, '\n'); + + bool casesensitive = parse_bool(howto); + bool matchword = parse_bool(howto); + bool all = parse_bool(howto); + bool forward = parse_bool(howto); + + Buffer * buf = bv->buffer(); + + int const replace_count = all + ? replaceAll(bv, search, rplc, casesensitive, matchword) + : replace(bv, search, rplc, casesensitive, matchword, forward); + + if (replace_count == 0) { + // emit message signal. + buf->message(_("String not found!")); + } else { + if (replace_count == 1) { + // emit message signal. + buf->message(_("String has been replaced.")); + } else { + docstring str = convert(replace_count); + str += _(" strings have been replaced."); + // emit message signal. + buf->message(str); + } + } +} + + +bool findNextChange(BufferView * bv) +{ + if (!bv->buffer()) + return false; + + DocIterator cur = bv->cursor(); + + if (!findChange(cur)) + return false; + + bv->cursor().setCursor(cur); + bv->cursor().resetAnchor(); + + Change orig_change = cur.paragraph().lookupChange(cur.pos()); + + DocIterator et = doc_iterator_end(cur.inset()); + DocIterator ok = cur; // see below + for (; cur != et; cur.forwardPosNoDescend()) { + ok = cur; + Change change = cur.paragraph().lookupChange(cur.pos()); + if (change != orig_change) { + break; + } + } + + // avoid crash (assertion violation) if the imaginary end-of-par + // character of the last paragraph of the document is marked as changed + if (cur == et) { + cur = ok; + } + + // Now put cursor to end of selection: + bv->cursor().setCursor(cur); + bv->cursor().setSelection(); + + return true; +} + +} // lyx namespace