- moderncv.layout: add missing separator style

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 39f2df0b7f56ccc13498ef61247e359c229ee959..5cfce9bec536679dfa09775526a317805aec291b 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -43,7 +43,6 @@
 #include "TextClass.h"
 #include "TexRow.h"
 #include "Text.h"
-#include "VSpace.h"
 #include "WordLangTuple.h"
 #include "WordList.h"
 
@@ -1638,6 +1637,7 @@ void Paragraph::appendChar(char_type c, Font const & font,
        // when appending characters, no need to update tables
        d->text_.push_back(c);
        setFont(d->text_.size() - 1, font);
+       d->requestSpellCheck(d->text_.size() - 1);
 }
 
 
@@ -1658,6 +1658,7 @@ void Paragraph::appendString(docstring const & s, Font const & font,
        for (size_t i = oldsize; i != newsize; ++i) {
                // track change
                d->changes_.insert(change, i);
+               d->requestSpellCheck(i);
        }
        d->fontlist_.set(oldsize, font);
        d->fontlist_.set(newsize - 1, font);
@@ -2310,6 +2311,10 @@ void Paragraph::latex(BufferParams const & bparams,
        if (body_pos > 0) {
                // the optional argument is kept in curly brackets in
                // case it contains a ']'
+               // This is not strictly needed, but if this is changed it
+               // would be a file format change, and tex2lyx would need
+               // to be adjusted, since it unconditionally removes the
+               // braces when it parses \item.
                os << "[{";
                column += 2;
                basefont = getLabelFont(bparams, outerfont);
@@ -2930,9 +2935,9 @@ void Paragraph::changeLanguage(BufferParams const & bparams,
                if (font.language() == from) {
                        font.setLanguage(to);
                        setFont(i, font);
+                       d->requestSpellCheck(i);
                }
        }
-       d->requestSpellCheck(size());
 }
 
 
@@ -3484,16 +3489,13 @@ void Paragraph::locateWord(pos_type & from, pos_type & to,
 
 void Paragraph::collectWords()
 {
-       // This is the value that needs to be exposed in the preferences
-       // to resolve bug #6760.
-       static int minlength = 6;
        pos_type n = size();
        for (pos_type pos = 0; pos < n; ++pos) {
                if (isWordSeparator(pos))
                        continue;
                pos_type from = pos;
                locateWord(from, pos, WHOLE_WORD);
-               if (pos - from >= minlength) {
+               if ((pos - from) >= (int)lyxrc.completion_minlength) {
                        docstring word = asString(from, pos, AS_STR_NONE);
                        FontList::const_iterator cit = d->fontlist_.fontIterator(pos);
                        if (cit == d->fontlist_.end())