anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

somewhat clearer logic

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8314 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2004-01-07 14:07:46 +00:00
parent bb5291a013
commit 8af1fa7aeb
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/lyxfind.C
View File

@ -27,8 +27,6 @@
#include "frontends/Alert.h" #include "frontends/Alert.h"
#include "insets/insettext.h"
#include "support/textutils.h" #include "support/textutils.h"
using lyx::support::lowercase; using lyx::support::lowercase;
@ -47,7 +45,9 @@ class MatchString
{ {
public: public:
MatchString(string const & str, bool cs, bool mw) MatchString(string const & str, bool cs, bool mw)
: str(str), cs(cs), mw(mw) {}; : str(str), cs(cs), mw(mw)
{}
// returns true if the specified string is at the specified position // returns true if the specified string is at the specified position
bool operator()(Paragraph const & par, pos_type pos) const bool operator()(Paragraph const & par, pos_type pos) const
{ {
@ -60,22 +60,28 @@ public:
: (uppercase(str[i]) == uppercase(par.getChar(pos + i))))) { : (uppercase(str[i]) == uppercase(par.getChar(pos + i))))) {
++i; ++i;
} }
if (size == string::size_type(i)) {
if (size != string::size_type(i))
return false;
// if necessary, check whether string matches word // if necessary, check whether string matches word
if (!mw) if (mw) {
return true; if (pos > 0 && IsLetterCharOrDigit(par.getChar(pos - 1)))
if ((pos <= 0 || !IsLetterCharOrDigit(par.getChar(pos - 1))) return false;
&& (pos + pos_type(size) >= parsize if (pos + pos_type(size) < parsize
|| !IsLetterCharOrDigit(par.getChar(pos + size)))) { && IsLetterCharOrDigit(par.getChar(pos + size)));
return true;
}
}
return false; return false;
} }
return true;
}
private: private:
// search string
string str; string str;
// case sensitive
bool cs; bool cs;
// match whole words only
bool mw; bool mw;
}; };
@ -127,8 +133,7 @@ bool searchAllowed(BufferView * bv, string const & str)
bool find(BufferView * bv, string const & searchstr, bool find(BufferView * bv, string const & searchstr, bool cs, bool mw, bool fw)
bool cs, bool mw, bool fw)
{ {
if (!searchAllowed(bv, searchstr)) if (!searchAllowed(bv, searchstr))
return false; return false;