anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 05:25:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug 3160 and 3812:

Browse Source 
* src/lyxfind.cpp:
	- MatchString(), operator():
	- findForward:
	- findBackwards:
	- find: pass bool find_del

	- replace:
	- replaceAll: do not replace or find (after replace) deleted text

* src/BufferView.cpp:
	- getStatus: disable LFUN_WORD_REPLACE for deleted text.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18732 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2007-06-10 15:07:21 +00:00
parent d43c859cd4
commit db1d5b38dc
2 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/BufferView.cpp
View File

@ -665,6 +665,8 @@ FuncStatus BufferView::getStatus(FuncRequest const & cmd)
{
FuncStatus flag;
Cursor & cur = cursor_;
switch (cmd.action) {
case LFUN_UNDO:
@ -678,7 +680,7 @@ FuncStatus BufferView::getStatus(FuncRequest const & cmd)
case LFUN_FILE_INSERT_PLAINTEXT:
case LFUN_BOOKMARK_SAVE:
// FIXME: Actually, these LFUNS should be moved to Text
flag.enabled(cursor_.inTexted());
flag.enabled(cur.inTexted());
break;
case LFUN_FONT_STATE:
case LFUN_LABEL_INSERT:
@ -691,7 +693,6 @@ FuncStatus BufferView::getStatus(FuncRequest const & cmd)
case LFUN_NOTE_NEXT:
case LFUN_REFERENCE_NEXT:
case LFUN_WORD_FIND:
case LFUN_WORD_REPLACE:
case LFUN_MARK_OFF:
case LFUN_MARK_ON:
case LFUN_MARK_TOGGLE:
@ -703,9 +704,13 @@ FuncStatus BufferView::getStatus(FuncRequest const & cmd)
flag.enabled(true);
break;
case LFUN_WORD_REPLACE:
flag.enabled(!cur.paragraph().isDeleted(cur.pos()));
break;
case LFUN_LABEL_GOTO: {
flag.enabled(!cmd.argument().empty()
|| getInsetByCode<InsetRef>(cursor_, Inset::REF_CODE));
|| getInsetByCode<InsetRef>(cur, Inset::REF_CODE));
break;
}
@ -1617,7 +1622,9 @@ void BufferView::menuInsertLyXFile(string const & filenm)
FileDialog fileDlg(_("Select LyX document to insert"),
LFUN_FILE_INSERT,
make_pair(_("Documents|#o#O"), from_utf8(lyxrc.document_path)),
make_pair(_("Examples|#E#e"), from_utf8(addPath(package().system_support().absFilename(), "examples"))));
make_pair(_("Examples|#E#e"),
from_utf8(addPath(package().system_support().absFilename(),
"examples"))));
FileDialog::Result result =
fileDlg.open(from_utf8(initpath),

27
src/lyxfind.cpp
View File

@ -62,7 +62,8 @@ public:
{}
// returns true if the specified string is at the specified position
bool operator()(Paragraph const & par, pos_type pos) const
// del specifies whether deleted strings in ct mode will be considered
bool operator()(Paragraph const & par, pos_type pos, bool del = true) const
{
docstring::size_type const size = str.length();
pos_type i = 0;
@ -74,6 +75,8 @@ public:
break;
if (!cs && uppercase(str[i]) != uppercase(par.getChar(pos + i)))
break;
if (!del && par.isDeleted(pos + i))
break;
}
if (size != docstring::size_type(i))
@ -101,20 +104,24 @@ private:
};
bool findForward(DocIterator & cur, MatchString const & match)
bool findForward(DocIterator & cur, MatchString const & match,
bool find_del = true)
{
for (; cur; cur.forwardChar())
if (cur.inTexted() && match(cur.paragraph(), cur.pos()))
if (cur.inTexted() &&
match(cur.paragraph(), cur.pos(), find_del))
return true;
return false;
}
bool findBackwards(DocIterator & cur, MatchString const & match)
bool findBackwards(DocIterator & cur, MatchString const & match,
bool find_del = true)
{
while (cur) {
cur.backwardChar();
if (cur.inTexted() && match(cur.paragraph(), cur.pos()))
if (cur.inTexted() &&
match(cur.paragraph(), cur.pos(), find_del))
return true;
}
return false;
@ -141,7 +148,8 @@ bool searchAllowed(BufferView * bv, docstring const & str)
}
bool find(BufferView * bv, docstring const & searchstr, bool cs, bool mw, bool fw)
bool find(BufferView * bv, docstring const & searchstr, bool cs, bool mw, bool fw,
bool find_del = true)
{
if (!searchAllowed(bv, searchstr))
return false;
@ -150,7 +158,8 @@ bool find(BufferView * bv, docstring const & searchstr, bool cs, bool mw, bool f
MatchString const match(searchstr, cs, mw);
bool found = fw ? findForward(cur, match) : findBackwards(cur, match);
bool found = fw ? findForward(cur, match, find_del) :
findBackwards(cur, match, find_del);
if (found)
bv->putSelectionAt(cur, searchstr.length(), !fw);
@ -177,7 +186,7 @@ int replaceAll(BufferView * bv,
int const ssize = searchstr.size();
DocIterator cur = doc_iterator_begin(buf.inset());
while (findForward(cur, match)) {
while (findForward(cur, match, false)) {
pos_type pos = cur.pos();
Font const font
= cur.paragraph().getFontSettings(buf.params(), pos);
@ -227,7 +236,7 @@ int replace(BufferView * bv, docstring const & searchstr,
Cursor & cur = bv->cursor();
cap::replaceSelectionWithString(cur, replacestr, fw);
bv->buffer()->markDirty();
find(bv, searchstr, cs, mw, fw);
find(bv, searchstr, cs, mw, fw, false);
bv->update();
return 1;