#include "frontends/Alert.h"
#include "frontends/LyXView.h"
-#include "support/textutils.h"
-#include "support/tostr.h"
+#include "support/convert.h"
-#include "support/std_sstream.h"
+#include <sstream>
using lyx::support::lowercase;
using lyx::support::uppercase;
using lyx::support::split;
-using lyx::par_type;
+using lyx::pit_type;
using lyx::pos_type;
using std::advance;
for (i = 0; pos + i < parsize; ++i) {
if (string::size_type(i) >= size)
break;
- if (cs && str[i] != par.getChar(pos + i))
+ if (cs && str[i] != par.getChar(pos + i))
break;
if (!cs && uppercase(str[i]) != uppercase(par.getChar(pos + i)))
break;
// 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)));
+ && par.isLetter(pos + size))
return false;
}
};
-bool findForward(DocumentIterator & cur, MatchString const & match)
+bool findForward(DocIterator & cur, MatchString const & match)
{
- for (; cur.size(); cur.forwardChar())
- if (match(cur.paragraph(), cur.pos()))
+ for (; cur; cur.forwardChar())
+ if (cur.inTexted() && match(cur.paragraph(), cur.pos()))
return true;
return false;
}
-bool findBackwards(DocumentIterator & cur, MatchString const & match)
+bool findBackwards(DocIterator & cur, MatchString const & match)
{
- for (; cur.size(); cur.backwardChar())
- if (match(cur.paragraph(), cur.pos()))
+ while (cur) {
+ cur.backwardChar();
+ if (cur.inTexted() && match(cur.paragraph(), cur.pos()))
return true;
+ }
return false;
}
-bool findChange(DocumentIterator & cur)
+bool findChange(DocIterator & cur)
{
- for (; cur.size(); cur.forwardChar())
- if ((cur.paragraph().empty() || !cur.empty())
- && cur.paragraph().lookupChange(cur.pos()) != Change::UNCHANGED)
+ for (; cur; cur.forwardPos())
+ if (cur.inTexted() && cur.paragraph().lookupChange(cur.pos()).type
+ != Change::UNCHANGED)
return true;
return false;
}
Alert::error(_("Search error"), _("Search string is empty"));
return false;
}
- return bv->available();
+ return bv->buffer();
}
if (!searchAllowed(bv, searchstr))
return false;
- DocumentIterator cur = bv->cursor();
+ DocIterator cur = bv->cursor();
MatchString const match(searchstr, cs, mw);
if (!searchAllowed(bv, searchstr) || buf.isReadonly())
return 0;
- recordUndoFullDocument(bv->cursor());
+ recordUndoFullDocument(bv);
MatchString const match(searchstr, cs, mw);
int num = 0;
int const rsize = replacestr.size();
int const ssize = searchstr.size();
- DocumentIterator cur = DocumentIterator(buf.inset());
+ DocIterator cur = doc_iterator_begin(buf.inset());
while (findForward(cur, match)) {
lyx::pos_type pos = cur.pos();
LyXFont const font
++num;
}
- bv->text()->init(bv);
- bv->putSelectionAt(DocumentIterator(buf.inset()), 0, false);
+ bv->buffer()->text().init(bv);
+ bv->putSelectionAt(doc_iterator_begin(buf.inset()), 0, false);
if (num)
buf.markDirty();
return num;
// if nothing selected or selection does not equal search
// string search and select next occurance and return
string const & str1 = searchstr;
- string const str2 = bv->cursor().selectionAsString(false);
+ string const str2 = lyx::to_utf8(bv->cursor().selectionAsString(false));
if ((cs && str1 != str2) || lowercase(str1) != lowercase(str2)) {
find(bv, searchstr, cs, mw, fw);
return false;
int replace(BufferView * bv, string const & searchstr,
- string const & replacestr, bool cs, bool mw, bool fw)
+ string const & replacestr, bool cs, bool mw, bool fw)
{
if (!searchAllowed(bv, searchstr) || bv->buffer()->isReadonly())
return 0;
return 0;
LCursor & cur = bv->cursor();
- lyx::cap::replaceSelectionWithString(cur, replacestr);
- lyx::cap::setSelectionRange(cur, replacestr.length());
- cur.top() = fw ? cur.selEnd() : cur.selBegin();
+ lyx::cap::replaceSelectionWithString(cur, replacestr, fw);
bv->buffer()->markDirty();
find(bv, searchstr, cs, mw, fw);
bv->update();
if (!bv || ev.action != LFUN_WORD_FIND)
return;
- lyxerr << "find called, cmd: " << ev << std::endl;
+ //lyxerr << "find called, cmd: " << ev << std::endl;
// data is of the form
// "<search>
// <casesensitive> <matchword> <forward>"
string search;
- string howto = split(ev.argument, search, '\n');
+ string howto = split(lyx::to_utf8(ev.argument()), search, '\n');
bool casesensitive = parse_bool(howto);
bool matchword = parse_bool(howto);
casesensitive, matchword, forward);
if (!found)
- bv->owner()->message(_("String not found!"));
+ // emit message signal.
+ bv->message(_("String not found!"));
}
// <casesensitive> <matchword> <all> <forward>"
string search;
string replace;
- string howto = split(ev.argument, search, '\n');
+ string howto = split(lyx::to_utf8(ev.argument()), search, '\n');
howto = split(howto, replace, '\n');
bool casesensitive = parse_bool(howto);
bool all = parse_bool(howto);
bool forward = parse_bool(howto);
- LyXView * lv = bv->owner();
+ Buffer * buf = bv->buffer();
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!"));
+ // emit message signal.
+ buf->message(_("String not found!"));
} else {
if (replace_count == 1) {
- lv->message(_("String has been replaced."));
+ // emit message signal.
+ buf->message(_("String has been replaced."));
} else {
- string str = tostr(replace_count);
+ docstring str = convert<docstring>(replace_count);
str += _(" strings have been replaced.");
- lv->message(str);
+ // emit message signal.
+ buf->message(str);
}
}
}
bool findNextChange(BufferView * bv)
{
- if (!bv->available())
+ if (!bv->buffer())
return false;
- DocumentIterator cur = DocumentIterator(bv->buffer()->inset());
+ DocIterator cur = bv->cursor();
if (!findChange(cur))
return false;
- Paragraph const & par = cur.paragraph();
- pos_type pos = cur.pos();
+ bv->cursor().setCursor(cur);
+ bv->cursor().resetAnchor();
- Change orig_change = par.lookupChangeFull(pos);
- pos_type parsize = par.size();
- pos_type end = pos;
+ Change orig_change = cur.paragraph().lookupChange(cur.pos());
- for (; end != parsize; ++end) {
- Change change = par.lookupChangeFull(end);
+ DocIterator et = doc_iterator_end(cur.inset());
+ for (; cur != et; cur.forwardPosNoDescend()) {
+ Change change = cur.paragraph().lookupChange(cur.pos());
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;
+ break;
}
}
- pos_type length = end - pos;
- bv->putSelectionAt(cur, length, true);
+ // Now put cursor to end of selection:
+ bv->cursor().setCursor(cur);
+ bv->cursor().setSelection();
+ // if we used a lfun like in find/replace, dispatch would do
+ // that for us
+ bv->update();
+
return true;
}
} // find namespace
} // lyx namespace
-
-
projects / lyx.git / blobdiff