- moderncv.layout: add missing separator style

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 9dda69e063063ccb1727c1df4daed8a82dbc1c9e..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"
 
@@ -312,8 +311,8 @@ public:
                              OutputParams const &) const;
 
        /// This could go to ParagraphParameters if we want to.
-       int endTeXParParams(BufferParams const &, otexstream &,
-                           OutputParams const &) const;
+       bool endTeXParParams(BufferParams const &, otexstream &,
+                            OutputParams const &) const;
 
        ///
        void latexInset(BufferParams const &,
@@ -400,7 +399,10 @@ public:
        }
 
        void requestSpellCheck(pos_type pos) {
-               speller_state_.needsRefresh(pos);
+               if (pos == -1)
+                       speller_state_.needsCompleteRefresh(speller_state_.currentChangeNumber());
+               else
+                       speller_state_.needsRefresh(pos);
        }
 
        void readySpellCheck() {
@@ -1635,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);
 }
 
 
@@ -1655,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);
@@ -2213,15 +2217,13 @@ int Paragraph::Private::startTeXParParams(BufferParams const & bparams,
 }
 
 
-int Paragraph::Private::endTeXParParams(BufferParams const & bparams,
+bool Paragraph::Private::endTeXParParams(BufferParams const & bparams,
                        otexstream & os, OutputParams const & runparams) const
 {
-       int column = 0;
-
        LyXAlignment const curAlign = params_.align();
 
        if (curAlign == layout_->align)
-               return column;
+               return false;
 
        switch (curAlign) {
        case LYX_ALIGN_NONE:
@@ -2233,13 +2235,12 @@ int Paragraph::Private::endTeXParParams(BufferParams const & bparams,
        case LYX_ALIGN_LEFT:
        case LYX_ALIGN_RIGHT:
        case LYX_ALIGN_CENTER:
-               if (runparams.moving_arg) {
+               if (runparams.moving_arg)
                        os << "\\protect";
-                       column = 8;
-               }
                break;
        }
 
+       string output;
        string const end_tag = "\n\\par\\end";
        InsetCode code = ownerCode();
        bool const lastpar = runparams.isLastPar;
@@ -2252,33 +2253,27 @@ int Paragraph::Private::endTeXParParams(BufferParams const & bparams,
        case LYX_ALIGN_DECIMAL:
                break;
        case LYX_ALIGN_LEFT: {
-               string output;
                if (owner_->getParLanguage(bparams)->babel() != "hebrew")
                        output = corrected_env(end_tag, "flushleft", code, lastpar);
                else
                        output = corrected_env(end_tag, "flushright", code, lastpar);
                os << from_ascii(output);
-               adjust_column(output, column);
                break;
        } case LYX_ALIGN_RIGHT: {
-               string output;
                if (owner_->getParLanguage(bparams)->babel() != "hebrew")
                        output = corrected_env(end_tag, "flushright", code, lastpar);
                else
                        output = corrected_env(end_tag, "flushleft", code, lastpar);
                os << from_ascii(output);
-               adjust_column(output, column);
                break;
        } case LYX_ALIGN_CENTER: {
-               string output;
                output = corrected_env(end_tag, "center", code, lastpar);
                os << from_ascii(output);
-               adjust_column(output, column);
                break;
        }
        }
 
-       return column;
+       return !output.empty() || lastpar;
 }
 
 
@@ -2316,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);
@@ -2734,7 +2733,7 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
 
        Layout const & style = *d->layout_;
 
-       xs.startParagraph();
+       xs.startParagraph(allowEmpty());
 
        if (!runparams.for_toc && runparams.html_make_pars) {
                // generate a magic label for this paragraph
@@ -2936,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());
 }
 
 
@@ -3490,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())
@@ -3615,7 +3611,7 @@ Language * Paragraph::Private::getSpellLanguage(pos_type const from) const
 
 void Paragraph::requestSpellCheck(pos_type pos)
 {
-       d->requestSpellCheck(pos == -1 ? size() : pos);
+       d->requestSpellCheck(pos);
 }