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

Follow-up to r37932: We do not need a skipOnSearch variable, since we know the conditions anyway.

Browse Source 
Thanks, JMarc,

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37934 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2011-03-15 13:19:55 +00:00
parent ee6e5b784d
commit ff829bd92b
4 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Paragraph.cpp
View File

@ -3343,10 +3343,13 @@ int Paragraph::find(docstring const & str, bool cs, bool mw,
int const strsize = str.length();
int i = 0;
pos_type const parsize = d->text_.size();
odocstringstream os;
for (i = 0; i < strsize && pos < parsize; ++i, ++pos) {
// Ignore ligature break and hyphenation chars while searching
// Ignore "invisible" letters such as ligature breaks
// and hyphenation chars while searching
while (pos < parsize - 1 && isInset(pos)) {
if (!getInset(pos)->skipOnSearch())
getInset(pos)->toString(os);
if (!getInset(pos)->isLetter() || !os.str().empty())
break;
pos++;
}

3
src/insets/Inset.h
View File

@ -402,9 +402,6 @@ public:
/// Is the content of this inset part of the output document?
virtual bool producesOutput() const { return true; }
/// Skip this inset while searching?
virtual bool skipOnSearch() const { return false; }
/// \return Tool tip for this inset.
/// This default implementation returns an empty string.
virtual docstring toolTip(BufferView const & bv, int x, int y) const;

6
src/insets/InsetSpecialChar.cpp
View File

@ -346,12 +346,6 @@ bool InsetSpecialChar::isLetter() const
}
bool InsetSpecialChar::skipOnSearch() const
{
return kind_ == HYPHENATION || kind_ == LIGATURE_BREAK;
}
bool InsetSpecialChar::isLineSeparator() const
{
#if 0

6
src/insets/InsetSpecialChar.h
View File

@ -77,13 +77,11 @@ public:
///
void validate(LaTeXFeatures &) const;
// should this inset be handled like a normal charater
/// should this inset be handled like a normal charater
bool isChar() const { return true; }
/// is this equivalent to a letter?
bool isLetter() const;
/// Skip this inset while searching?
bool skipOnSearch() const;
// should we break lines after this inset?
/// should we break lines after this inset?
bool isLineSeparator() const;
private:
Inset * clone() const { return new InsetSpecialChar(*this); };