X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraph.cpp;h=d96ddaeefea3d282cfab127f0add726f1b00e116;hb=8693ae474be667e88dba1e53a5a1130ff440e756;hp=b12d7add2b53ec869737594a97b37ecf0db773f1;hpb=78ded48a224f3524903aecc922257c87be09eaeb;p=lyx.git diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp index b12d7add2b..d96ddaeefe 100644 --- a/src/Paragraph.cpp +++ b/src/Paragraph.cpp @@ -74,6 +74,53 @@ char_type const META_INSET = 0x200001; }; +///////////////////////////////////////////////////////////////////// +// +// SpellResultRange +// +///////////////////////////////////////////////////////////////////// + +class SpellResultRange { +public: + SpellResultRange(FontSpan range, SpellChecker::Result result) + : range_(range), result_(result) + {} + /// + FontSpan const & range() const { return range_; } + /// + void range(FontSpan const & r) { range_ = r; } + /// + SpellChecker::Result result() const { return result_; } + /// + void result(SpellChecker::Result r) { result_ = r; } + /// + bool inside(pos_type pos) const { return range_.inside(pos); } + /// + bool covered(FontSpan const & r) const + { + // 1. first of new range inside current range or + // 2. last of new range inside current range or + // 3. first of current range inside new range or + // 4. last of current range inside new range + return range_.inside(r.first) || range_.inside(r.last) || + r.inside(range_.first) || r.inside(range_.last); + } + /// + void shift(pos_type pos, int offset) + { + if (range_.first > pos) { + range_.first += offset; + range_.last += offset; + } else if (range_.last > pos) { + range_.last += offset; + } + } +private: + FontSpan range_ ; + SpellChecker::Result result_ ; +}; + + ///////////////////////////////////////////////////////////////////// // // SpellCheckerState @@ -91,7 +138,7 @@ public: { eraseCoveredRanges(fp); if (state != SpellChecker::WORD_OK) - ranges_[fp] = state; + ranges_.push_back(SpellResultRange(fp, state)); } void increasePosAfterPos(pos_type pos) @@ -106,16 +153,20 @@ public: needsRefresh(pos); } + void refreshLast(pos_type pos) + { + if (pos < refresh_.last) + refresh_.last = pos; + } + SpellChecker::Result getState(pos_type pos) const { SpellChecker::Result result = SpellChecker::WORD_OK; RangesIterator et = ranges_.end(); RangesIterator it = ranges_.begin(); for (; it != et; ++it) { - FontSpan fc = it->first; - if(fc.first <= pos && pos <= fc.last) { - result = it->second; - break; + if(it->inside(pos)) { + return it->result(); } } return result; @@ -155,52 +206,35 @@ public: } private: - /// store the ranges as map of FontSpan and spell result pairs - typedef map Ranges; + typedef vector Ranges; typedef Ranges::const_iterator RangesIterator; Ranges ranges_; - /// + /// the area of the paragraph with pending spell check FontSpan refresh_; bool needs_refresh_; + /// spell state cache version number SpellChecker::ChangeNumber current_change_number_; + void eraseCoveredRanges(FontSpan const fp) { Ranges result; RangesIterator et = ranges_.end(); RangesIterator it = ranges_.begin(); for (; it != et; ++it) { - FontSpan fc = it->first; - // 1. first of new range inside current range or - // 2. last of new range inside current range or - // 3. first of current range inside new range or - // 4. last of current range inside new range - if (fc.inside(fp.first) || fc.inside(fp.last) || - fp.inside(fc.first) || fp.inside(fc.last)) - { - continue; - } - result[fc] = it->second; + if (!it->covered(fp)) + result.push_back(SpellResultRange(it->range(), it->result())); } ranges_ = result; } void correctRangesAfterPos(pos_type pos, int offset) { - Ranges result; RangesIterator et = ranges_.end(); - RangesIterator it = ranges_.begin(); + Ranges::iterator it = ranges_.begin(); for (; it != et; ++it) { - FontSpan m = it->first; - if (m.first > pos) { - m.first += offset; - m.last += offset; - } else if (m.last > pos) { - m.last += offset; - } - result[m] = it->second; + it->shift(pos, offset); } - ranges_ = result; } }; @@ -305,14 +339,16 @@ public: /// match a string against a particular point in the paragraph bool isTextAt(string const & str, pos_type pos) const; - /// a vector of inset positions - typedef vector Positions; - typedef Positions::const_iterator PositionsIterator; + /// a vector of speller skip positions + typedef vector SkipPositions; + typedef SkipPositions::const_iterator SkipPositionsIterator; + void appendSkipPosition(SkipPositions & skips, pos_type const pos) const; + Language * getSpellLanguage(pos_type const from) const; Language * locateSpellRange(pos_type & from, pos_type & to, - Positions & softbreaks) const; + SkipPositions & skips) const; bool hasSpellerChange() const { SpellChecker::ChangeNumber speller_change_number = 0; @@ -363,22 +399,23 @@ public: last = endpos; } - int countSoftbreaks(PositionsIterator & it, PositionsIterator const et, + int countSkips(SkipPositionsIterator & it, SkipPositionsIterator const et, int & start) const { - int numbreaks = 0; - while (it != et && *it < start) { - ++start; - ++numbreaks; + int numskips = 0; + while (it != et && it->first < start) { + int skip = it->last - it->first + 1; + start += skip; + numskips += skip; ++it; } - return numbreaks; + return numskips; } void markMisspelledWords(pos_type const & first, pos_type const & last, SpellChecker::Result result, docstring const & word, - Positions const & softbreaks); + SkipPositions const & skips); InsetCode ownerCode() const { @@ -720,6 +757,8 @@ bool Paragraph::eraseChar(pos_type pos, bool trackChanges) if (!change.changed() || (change.inserted() && !change.currentAuthor())) { setChange(pos, Change(Change::DELETED)); + // request run of spell checker + requestSpellCheck(pos); return false; } @@ -751,6 +790,7 @@ bool Paragraph::eraseChar(pos_type pos, bool trackChanges) // Update list of misspelled positions d->speller_state_.decreasePosAfterPos(pos); + d->speller_state_.refreshLast(size()); return true; } @@ -2685,13 +2725,9 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf, Inset const * inset = getInset(i); if (inset) { - InsetCommand const * ic = inset->asInsetCommand(); - InsetLayout const & il = inset->getLayout(); - InsetMath const * im = inset->asInsetMath(); - if (!runparams.for_toc - || im || il.isInToc() || (ic && ic->isInToc())) { + if (!runparams.for_toc || inset->isInToc()) { OutputParams np = runparams; - if (!il.htmlisblock()) + if (!inset->getLayout().htmlisblock()) np.html_in_par = true; retval += inset->xhtml(xs, np); } @@ -2863,6 +2899,8 @@ docstring Paragraph::asString(pos_type beg, pos_type end, int options) const os << d->params_.labelString() << ' '; for (pos_type i = beg; i < end; ++i) { + if ((options & AS_STR_SKIPDELETE) && isDeleted(i)) + continue; char_type const c = d->text_[i]; if (isPrintable(c) || c == '\t' || (c == '\n' && (options & AS_STR_NEWLINES))) @@ -3382,9 +3420,24 @@ void Paragraph::updateWords() } +void Paragraph::Private::appendSkipPosition(SkipPositions & skips, pos_type const pos) const +{ + SkipPositionsIterator begin = skips.begin(); + SkipPositions::iterator end = skips.end(); + if (pos > 0 && begin < end) { + --end; + if (end->last == pos - 1) { + end->last = pos; + return; + } + } + skips.insert(end, FontSpan(pos, pos)); +} + + Language * Paragraph::Private::locateSpellRange( pos_type & from, pos_type & to, - Positions & softbreaks) const + SkipPositions & skips) const { // skip leading white space while (from < to && owner_->isWordSeparator(from)) @@ -3401,7 +3454,9 @@ Language * Paragraph::Private::locateSpellRange( // hop to end of word while (last < to && !owner_->isWordSeparator(last)) { if (owner_->getInset(last)) { - softbreaks.insert(softbreaks.end(), last); + appendSkipPosition(skips, last); + } else if (owner_->isDeleted(last)) { + appendSkipPosition(skips, last); } ++last; } @@ -3409,6 +3464,9 @@ Language * Paragraph::Private::locateSpellRange( while (sameinset && last < to && owner_->isWordSeparator(last)) { if (Inset const * inset = owner_->getInset(last)) sameinset = inset->isChar() && inset->isLetter(); + if (sameinset && owner_->isDeleted(last)) { + appendSkipPosition(skips, last); + } if (sameinset) last++; } @@ -3473,10 +3531,10 @@ SpellChecker::Result Paragraph::spellCheck(pos_type & from, pos_type & to, return result; locateWord(from, to, WHOLE_WORD); - if (from == to || from >= pos_type(d->text_.size())) + if (from == to || from >= size()) return result; - docstring word = asString(from, to, AS_STR_INSETS); + docstring word = asString(from, to, AS_STR_INSETS + AS_STR_SKIPDELETE); Language * lang = d->getSpellLanguage(from); wl = WordLangTuple(word, lang); @@ -3492,8 +3550,13 @@ SpellChecker::Result Paragraph::spellCheck(pos_type & from, pos_type & to, bool const trailing_dot = to < size() && d->text_[to] == '.'; result = speller->check(wl); if (SpellChecker::misspelled(result) && trailing_dot) { - word = word.append(from_ascii(".")); + wl = WordLangTuple(word.append(from_ascii(".")), lang); result = speller->check(wl); + if (!SpellChecker::misspelled(result)) { + LYXERR(Debug::GUI, "misspelled word is correct with dot: \"" << + word << "\" [" << + from << ".." << to << "]"); + } } } d->setMisspelled(from, to, result); @@ -3519,7 +3582,7 @@ void Paragraph::Private::markMisspelledWords( pos_type const & first, pos_type const & last, SpellChecker::Result result, docstring const & word, - Positions const & softbreaks) + SkipPositions const & skips) { if (!SpellChecker::misspelled(result)) { setMisspelled(first, last, SpellChecker::WORD_OK); @@ -3529,9 +3592,9 @@ void Paragraph::Private::markMisspelledWords( SpellChecker * speller = theSpellChecker(); // locate and enumerate the error positions int nerrors = speller->numMisspelledWords(); - int numbreaks = 0; - PositionsIterator it = softbreaks.begin(); - PositionsIterator et = softbreaks.end(); + int numskipped = 0; + SkipPositionsIterator it = skips.begin(); + SkipPositionsIterator et = skips.end(); for (int index = 0; index < nerrors; ++index) { int wstart; int wlen = 0; @@ -3539,15 +3602,15 @@ void Paragraph::Private::markMisspelledWords( /// should not happen if speller supports range checks if (!wlen) continue; docstring const misspelled = word.substr(wstart, wlen); - wstart += first + numbreaks; + wstart += first + numskipped; if (snext < wstart) { /// mark the range of correct spelling - numbreaks += countSoftbreaks(it, et, wstart); + numskipped += countSkips(it, et, wstart); setMisspelled(snext, wstart - 1, SpellChecker::WORD_OK); } snext = wstart + wlen; - numbreaks += countSoftbreaks(it, et, snext); + numskipped += countSkips(it, et, snext); /// mark the range of misspelling setMisspelled(wstart, snext, result); LYXERR(Debug::GUI, "misspelled word: \"" << @@ -3574,16 +3637,16 @@ void Paragraph::spellCheck() const // loop until we leave the range for (pos_type first = start; first < endpos; ) { pos_type last = endpos; - Private::Positions softbreaks; - Language * lang = d->locateSpellRange(first, last, softbreaks); + Private::SkipPositions skips; + Language * lang = d->locateSpellRange(first, last, skips); if (first >= endpos) break; // start the spell checker on the unit of meaning - docstring word = asString(first, last, AS_STR_INSETS); + docstring word = asString(first, last, AS_STR_INSETS + AS_STR_SKIPDELETE); WordLangTuple wl = WordLangTuple(word, lang); SpellChecker::Result result = word.size() ? speller->check(wl) : SpellChecker::WORD_OK; - d->markMisspelledWords(first, last, result, word, softbreaks); + d->markMisspelledWords(first, last, result, word, skips); first = ++last; } } else {