listerrors.lyx : Update a link.

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 539c1ed1f18b303f93ae02bbbcb9e9eb109ec32e..df8de4c39f09ced1bece8559b5f0405d4eb102b3 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,6 +2733,8 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
 
        Layout const & style = *d->layout_;
 
+       xs.startParagraph(allowEmpty());
+
        if (!runparams.for_toc && runparams.html_make_pars) {
                // generate a magic label for this paragraph
                string const attr = "id='" + magicLabel() + "'";
@@ -2813,6 +2814,7 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
        }
 
        xs.closeFontTags();
+       xs.endParagraph();
        return retval;
 }
 
@@ -2844,22 +2846,40 @@ bool Paragraph::isLineSeparator(pos_type pos) const
 
 bool Paragraph::isWordSeparator(pos_type pos) const
 {
-       if (Inset const * inset = getInset(pos))
-               return !inset->isLetter();
        if (pos == size())
                return true;
-       char_type const c = d->text_[pos];
-       // if we have a hard hyphen (no en- or emdash),
+       if (Inset const * inset = getInset(pos))
+               return !inset->isLetter();
+       // if we have a hard hyphen (no en- or emdash) or apostrophe
        // we pass this to the spell checker
-       if (c == '-') {
-               int j = pos + 1;
-               if ((j == size() || d->text_[j] != '-')
-                   && (pos == 0 || d->text_[pos - 1] != '-'))
-                       return false;
-       }
-       // We want to pass the ' and escape chars to the spellchecker
-       static docstring const quote = from_utf8(lyxrc.spellchecker_esc_chars + '\'');
-       return (!isLetterChar(c) && !isDigitASCII(c) && !contains(quote, c));
+       // FIXME: this method is subject to change, visit
+       // https://bugzilla.mozilla.org/show_bug.cgi?id=355178
+       // to get an impression how complex this is.
+       if (isHardHyphenOrApostrophe(pos))
+               return false;
+       char_type const c = d->text_[pos];
+       // We want to pass the escape chars to the spellchecker
+       docstring const escape_chars = from_utf8(lyxrc.spellchecker_esc_chars);
+       return !isLetterChar(c) && !isDigitASCII(c) && !contains(escape_chars, c);
+}
+
+
+bool Paragraph::isHardHyphenOrApostrophe(pos_type pos) const
+{
+       pos_type const psize = size();
+       if (pos >= psize)
+               return false;
+       char_type const c = d->text_[pos];
+       if (c != '-' && c != '\'')
+               return false;
+       int nextpos = pos + 1;
+       int prevpos = pos > 0 ? pos - 1 : 0;
+       if ((nextpos == psize || isSpace(nextpos))
+               && (pos == 0 || isSpace(prevpos)))
+               return false;
+       return c == '\''
+               || ((nextpos == psize || d->text_[nextpos] != '-')
+               && (pos == 0 || d->text_[prevpos] != '-'));
 }
 
 
@@ -2915,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());
 }
 
 
@@ -3594,7 +3614,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);
 }