Kornel's gcc compile fix.

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 6b0f27543a5c14b4447530c7c5028accc71cf9bc..6ad82dce590f2d5c1dfb654a121debdb2c24c3f6 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -36,7 +36,6 @@
 #include "OutputParams.h"
 #include "output_latex.h"
 #include "output_xhtml.h"
-#include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
 #include "SpellChecker.h"
 #include "sgml.h"
@@ -173,6 +172,12 @@ public:
 
        /// match a string against a particular point in the paragraph
        bool isTextAt(string const & str, pos_type pos) const;
+
+
+       InsetCode ownerCode() const
+       {
+               return inset_owner_ ? inset_owner_->lyxCode() : NO_CODE;
+       }
        
        /// Which Paragraph owns us?
        Paragraph * owner_;
@@ -288,12 +293,12 @@ void Paragraph::addChangesToToc(DocIterator const & cdit,
 }
 
 
-bool Paragraph::isFullyDeleted(pos_type start, pos_type end) const
+bool Paragraph::isDeleted(pos_type start, pos_type end) const
 {
        LASSERT(start >= 0 && start <= size(), /**/);
        LASSERT(end > start && end <= size() + 1, /**/);
 
-       return d->changes_.isFullyDeleted(start, end);
+       return d->changes_.isDeleted(start, end);
 }
 
 
@@ -313,7 +318,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 +339,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 +354,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 +496,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;
        }
 
@@ -588,8 +593,8 @@ bool Paragraph::Private::simpleTeXBlanks(OutputParams const & runparams,
                }
        }
 
-       if (lyxrc.plaintext_linelen > 0
-           && column > lyxrc.plaintext_linelen
+       if (runparams.linelen > 0
+           && column > runparams.linelen
            && i
            && text_[i - 1] != ' '
            && (i + 1 < int(text_.size()))
@@ -759,7 +764,7 @@ void Paragraph::Private::latexInset(
                column = 0;
        }
 
-       if (owner_->lookupChange(i).type == Change::DELETED) {
+       if (owner_->isDeleted(i)) {
                if( ++runparams.inDeletedInset == 1)
                        runparams.changeOfDeletedInset = owner_->lookupChange(i);
        }
@@ -848,7 +853,7 @@ void Paragraph::Private::latexInset(
                column += os.tellp() - len;
        }
 
-       if (owner_->lookupChange(i).type == Change::DELETED)
+       if (owner_->isDeleted(i))
                --runparams.inDeletedInset;
 }
 
@@ -1695,12 +1700,6 @@ void Paragraph::setBeginOfBody()
 }
 
 
-bool Paragraph::forcePlainLayout() const
-{
-       return inInset().forcePlainLayout();
-}
-
-
 bool Paragraph::allowParagraphCustomization() const
 {
        return inInset().allowParagraphCustomization();
@@ -1807,7 +1806,7 @@ int Paragraph::Private::startTeXParParams(BufferParams const & bparams,
        }
 
        string const begin_tag = "\\begin";
-       InsetCode code = owner_->ownerCode();
+       InsetCode code = ownerCode();
        bool const lastpar = runparams.isLastPar;
 
        switch (curAlign) {
@@ -1875,7 +1874,7 @@ int Paragraph::Private::endTeXParParams(BufferParams const & bparams,
        }
 
        string const end_tag = "\n\\par\\end";
-       InsetCode code = owner_->ownerCode();
+       InsetCode code = ownerCode();
        bool const lastpar = runparams.isLastPar;
 
        switch (curAlign) {
@@ -1930,7 +1929,7 @@ bool Paragraph::latex(BufferParams const & bparams,
 
        // FIXME This check should not be needed. Perhaps issue an
        // error if it triggers.
-       Layout const & style = forcePlainLayout() ?
+       Layout const & style = inInset().forcePlainLayout() ?
                bparams.documentClass().plainLayout() : *d->layout_;
 
        // Current base font for all inherited font changes, without any
@@ -2024,7 +2023,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;
                }
 
@@ -2188,8 +2187,12 @@ bool Paragraph::latex(BufferParams const & bparams,
                return_value = false;
        }
 
-       if (allowcust && d->endTeXParParams(bparams, os, texrow,runparams))
+       if (allowcust && d->endTeXParParams(bparams, os, texrow, runparams)
+           && runparams.encoding != prev_encoding) {
                runparams.encoding = prev_encoding;
+               if (!bparams.useXetex)
+                       os << setEncoding(prev_encoding->iconvName());
+       }
 
        LYXERR(Debug::LATEX, "Paragraph::latex... done " << this);
        return return_value;
@@ -2641,12 +2644,6 @@ Inset const & Paragraph::inInset() const
 }
 
 
-InsetCode Paragraph::ownerCode() const
-{
-       return d->inset_owner_ ? d->inset_owner_->lyxCode() : NO_CODE;
-}
-
-
 ParagraphParameters & Paragraph::params()
 {
        return d->params_;
@@ -2791,21 +2788,21 @@ void Paragraph::checkAuthors(AuthorList const & authorList)
 }
 
 
-bool Paragraph::isUnchanged(pos_type pos) const
+bool Paragraph::isChanged(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();
 }
 
 
@@ -3022,8 +3019,6 @@ void Paragraph::locateWord(pos_type & from, pos_type & to,
 void Paragraph::collectWords()
 {
        pos_type n = size();
-       WordLangTuple wl;
-       docstring_list suggestions;
        for (pos_type pos = 0; pos < n; ++pos) {
                if (isWordSeparator(pos))
                        continue;
@@ -3033,11 +3028,6 @@ void Paragraph::collectWords()
                        docstring word = asString(from, pos, AS_STR_NONE);
                        d->words_.insert(word);
                }
-               if (lyxrc.spellcheck_continuously
-                   && spellCheck(from, pos, wl, suggestions)) {
-                       for (size_t i = 0; i != suggestions.size(); ++i)
-                               d->words_.insert(suggestions[i]);
-               }
        }
 }