Hide some internals of Changes:

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index b7f7d49c3ab826f2a9ccbe7a2b14d3cd14de0bd6..4be0f9e130a514502a065c2bd55fd71dd22dfed0 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -313,7 +313,7 @@ bool Paragraph::isMergedOnEndOfParDeletion(bool trackChanges) const
                return true;
 
        Change const change = d->changes_.lookup(size());
-       return change.type == Change::INSERTED && change.author == 0;
+       return change.inserted() && change.currentAuthor();
 }
 
 
@@ -334,7 +334,7 @@ void Paragraph::setChange(Change const & change)
         * Conclusion: An inset's content should remain untouched if you delete it
         */
 
-       if (change.type != Change::DELETED) {
+       if (!change.deleted()) {
                for (pos_type pos = 0; pos < size(); ++pos) {
                        if (Inset * inset = getInset(pos))
                                inset->setChange(change);
@@ -349,7 +349,7 @@ void Paragraph::setChange(pos_type pos, Change const & change)
        d->changes_.set(change, pos);
 
        // see comment in setChange(Change const &) above
-       if (change.type != Change::DELETED && pos < size())
+       if (!change.deleted() && pos < size())
                        if (Inset * inset = getInset(pos))
                                inset->setChange(change);
 }
@@ -491,13 +491,13 @@ bool Paragraph::eraseChar(pos_type pos, bool trackChanges)
                //  a) it was previously unchanged or
                //  b) it was inserted by a co-author
 
-               if (change.type == Change::UNCHANGED ||
-                   (change.type == Change::INSERTED && change.author != 0)) {
+               if (!change.changed() ||
+                     (change.inserted() && !change.currentAuthor())) {
                        setChange(pos, Change(Change::DELETED));
                        return false;
                }
 
-               if (change.type == Change::DELETED)
+               if (change.deleted())
                        return false;
        }
 
@@ -759,7 +759,7 @@ void Paragraph::Private::latexInset(
                column = 0;
        }
 
-       if (owner_->lookupChange(i).type == Change::DELETED) {
+       if (owner_->lookupChange(i).deleted()) {
                if( ++runparams.inDeletedInset == 1)
                        runparams.changeOfDeletedInset = owner_->lookupChange(i);
        }
@@ -848,7 +848,7 @@ void Paragraph::Private::latexInset(
                column += os.tellp() - len;
        }
 
-       if (owner_->lookupChange(i).type == Change::DELETED)
+       if (owner_->lookupChange(i).deleted())
                --runparams.inDeletedInset;
 }
 
@@ -1194,7 +1194,7 @@ void Paragraph::write(ostream & os, BufferParams const & bparams,
        for (pos_type i = 0; i <= size(); ++i) {
 
                Change const change = lookupChange(i);
-               Changes::lyxMarkChange(os, column, running_change, change);
+               Changes::lyxMarkChange(os, bparams, column, running_change, change);
                running_change = change;
 
                if (i == size())
@@ -1960,6 +1960,8 @@ bool Paragraph::latex(BufferParams const & bparams,
 
        Change runningChange = Change(Change::UNCHANGED);
 
+       Encoding const * const prev_encoding = runparams.encoding;
+
        texrow.start(id(), 0);
 
        // if the paragraph is empty, the loop will not be entered at all
@@ -2022,7 +2024,7 @@ bool Paragraph::latex(BufferParams const & bparams,
 
                // do not output text which is marked deleted
                // if change tracking output is disabled
-               if (!bparams.outputChanges && change.type == Change::DELETED) {
+               if (!bparams.outputChanges && change.deleted()) {
                        continue;
                }
 
@@ -2081,9 +2083,14 @@ bool Paragraph::latex(BufferParams const & bparams,
                        running_font = font;
                        open_font = true;
                        docstring fontchange = ods.str();
+                       // check whether the fontchange ends with a \\textcolor
+                       // modifier and the text starts with a space (bug 4473)
+                       docstring const last_modifier = rsplit(fontchange, '\\');
+                       if (prefixIs(last_modifier, from_ascii("textcolor")) && c == ' ')
+                               os << fontchange << from_ascii("{}");
                        // check if the fontchange ends with a trailing blank
                        // (like "\small " (see bug 3382)
-                       if (suffixIs(fontchange, ' ') && c == ' ')
+                       else if (suffixIs(fontchange, ' ') && c == ' ')
                                os << fontchange.substr(0, fontchange.size() - 1) 
                                   << from_ascii("{}");
                        else
@@ -2181,10 +2188,8 @@ bool Paragraph::latex(BufferParams const & bparams,
                return_value = false;
        }
 
-       if (allowcust) {
-               column += d->endTeXParParams(bparams, os, texrow,
-                                         runparams);
-       }
+       if (allowcust && d->endTeXParParams(bparams, os, texrow, runparams))
+               runparams.encoding = prev_encoding;
 
        LYXERR(Debug::LATEX, "Paragraph::latex... done " << this);
        return return_value;
@@ -2547,10 +2552,13 @@ docstring Paragraph::asString(pos_type beg, pos_type end, int options) const
        for (pos_type i = beg; i < end; ++i) {
                char_type const c = d->text_[i];
                if (isPrintable(c) || c == '\t'
-                   || (c == '\n' && options & AS_STR_NEWLINES))
+                   || (c == '\n' && (options & AS_STR_NEWLINES)))
                        os.put(c);
-               else if (c == META_INSET && options & AS_STR_INSETS)
+               else if (c == META_INSET && (options & AS_STR_INSETS)) {
                        getInset(i)->tocString(os);
+                       if (getInset(i)->asInsetMath())
+                               os << " ";
+               }
        }
 
        return os.str();
@@ -2569,9 +2577,9 @@ docstring Paragraph::stringify(pos_type beg, pos_type end, int options, OutputPa
        for (pos_type i = beg; i < end; ++i) {
                char_type const c = d->text_[i];
                if (isPrintable(c) || c == '\t'
-                   || (c == '\n' && options & AS_STR_NEWLINES))
+                   || (c == '\n' && (options & AS_STR_NEWLINES)))
                        os.put(c);
-               else if (c == META_INSET && options & AS_STR_INSETS) {
+               else if (c == META_INSET && (options & AS_STR_INSETS)) {
                        getInset(i)->plaintext(os, runparams);
                }
        }
@@ -2785,19 +2793,19 @@ void Paragraph::checkAuthors(AuthorList const & authorList)
 
 bool Paragraph::isUnchanged(pos_type pos) const
 {
-       return lookupChange(pos).type == Change::UNCHANGED;
+       return !lookupChange(pos).changed();
 }
 
 
 bool Paragraph::isInserted(pos_type pos) const
 {
-       return lookupChange(pos).type == Change::INSERTED;
+       return lookupChange(pos).inserted();
 }
 
 
 bool Paragraph::isDeleted(pos_type pos) const
 {
-       return lookupChange(pos).type == Change::DELETED;
+       return lookupChange(pos).deleted();
 }
 
 
@@ -3052,7 +3060,7 @@ void Paragraph::updateWords()
 
 
 bool Paragraph::spellCheck(pos_type & from, pos_type & to, WordLangTuple & wl,
-       docstring_list & suggestions) const
+       docstring_list & suggestions, bool do_suggestion) const
 {
        SpellChecker * speller = theSpellChecker();
        if (!speller)
@@ -3080,10 +3088,11 @@ bool Paragraph::spellCheck(pos_type & from, pos_type & to, WordLangTuple & wl,
        if (lyxrc.spellcheck_continuously)
                d->fontlist_.setMisspelled(from, to, misspelled);
 
-       if (misspelled) {
-               while (!(word = speller->nextMiss()).empty())
-                       suggestions.push_back(word);
-       }
+       if (misspelled && do_suggestion)
+               speller->suggest(wl, suggestions);
+       else
+               suggestions.clear();
+
        return misspelled;
 }
 
@@ -3094,7 +3103,7 @@ bool Paragraph::isMisspelled(pos_type pos) const
        pos_type to = pos;
        WordLangTuple wl;
        docstring_list suggestions;
-       return spellCheck(from, to, wl, suggestions);
+       return spellCheck(from, to, wl, suggestions, false);
 }