couple more fixes

[lyx.git] / src / paragraph_pimpl.C

diff --git a/src/paragraph_pimpl.C b/src/paragraph_pimpl.C
index c375f8105035b36cf549be8403b9c02e4ac9b32e..42ec28da89bfc29a2794968895aa9ea4b034bfda 100644 (file)
--- a/src/paragraph_pimpl.C
+++ b/src/paragraph_pimpl.C
@@ -139,15 +139,9 @@ void Paragraph::Pimpl::insertChar(pos_type pos, value_type c,
                it->pos(it->pos() + 1);
        }
 
-       // Update the inset table.
-       InsetTable search_inset(pos, 0);
-       for (InsetList::iterator it = lower_bound(owner_->insetlist.begin(),
-                                                      owner_->insetlist.end(),
-                                                      search_inset, matchIT());
-            it != owner_->insetlist.end(); ++it)
-       {
-               ++it->pos;
-       }
+       // Update the insets
+       owner_->insetlist.increasePosAfterPos(pos);
+
        owner_->setFont(pos, font);
 }
 
@@ -161,18 +155,9 @@ void Paragraph::Pimpl::insertInset(pos_type pos,
        insertChar(pos, META_INSET, font);
        lyx::Assert(text[pos] == META_INSET);
 
-       // Add a new entry in the inset table.
-       InsetTable search_inset(pos, 0);
-       InsetList::iterator it = lower_bound(owner_->insetlist.begin(),
-                                                 owner_->insetlist.end(),
-                                                 search_inset, matchIT());
-       if (it != owner_->insetlist.end() && it->pos == pos) {
-               lyxerr << "ERROR (Paragraph::InsertInset): "
-                       "there is an inset in position: " << pos << endl;
-       } else {
-               owner_->insetlist.insert(it, InsetTable(pos, inset));
-               inset->parOwner(owner_);
-       }
+       // Add a new entry in the insetlist.
+       owner_->insetlist.insert(inset, pos);
+       inset->parOwner(owner_);
 
        if (inset_owner)
                inset->setOwner(inset_owner);
@@ -184,16 +169,7 @@ void Paragraph::Pimpl::erase(pos_type pos)
        lyx::Assert(pos < size());
        // if it is an inset, delete the inset entry
        if (text[pos] == Paragraph::META_INSET) {
-               // find the entry
-               InsetTable search_inset(pos, 0);
-               InsetList::iterator it =
-                       lower_bound(owner_->insetlist.begin(),
-                                        owner_->insetlist.end(),
-                                        search_inset, matchIT());
-               if (it != owner_->insetlist.end() && it->pos == pos) {
-                       delete it->inset;
-                       owner_->insetlist.erase(it);
-               }
+               owner_->insetlist.erase(pos);
        }
 
        text.erase(text.begin() + pos);
@@ -228,15 +204,8 @@ void Paragraph::Pimpl::erase(pos_type pos)
        for (; it != fend; ++it)
                it->pos(it->pos() - 1);
 
-       // Update the inset table.
-       InsetTable search_inset(pos, 0);
-       InsetList::iterator lend = owner_->insetlist.end();
-       for (InsetList::iterator it =
-                    upper_bound(owner_->insetlist.begin(),
-                                     lend,
-                                     search_inset, matchIT());
-            it != lend; ++it)
-               --it->pos;
+       // Update the insetlist.
+       owner_->insetlist.decreasePosAfterPos(pos);
 }
 
 
@@ -622,9 +591,6 @@ void Paragraph::Pimpl::validate(LaTeXFeatures & features,
                Language const * language = fcit->font().language();
                if (language->babel() != doc_language->babel() &&
                    language != ignore_language &&
-#ifdef INHERIT_LANGUAGE
-                   language != inherit_language &&
-#endif
                    language != latex_language)
                {
                        features.useLanguage(language);
@@ -637,13 +603,13 @@ void Paragraph::Pimpl::validate(LaTeXFeatures & features,
                features.require("ParagraphLeftIndent");
 
        // then the insets
-       InsetList::const_iterator icit = owner_->insetlist.begin();
-       InsetList::const_iterator iend = owner_->insetlist.end();
+       InsetList::iterator icit = owner_->insetlist.begin();
+       InsetList::iterator iend = owner_->insetlist.end();
        for (; icit != iend; ++icit) {
-               if (icit->inset) {
-                       icit->inset->validate(features);
+               if (icit.getInset()) {
+                       icit.getInset()->validate(features);
                        if (layout.needprotect &&
-                           icit->inset->lyxCode() == Inset::FOOT_CODE)
+                           icit.getInset()->lyxCode() == Inset::FOOT_CODE)
                                features.require("NeedLyXFootnoteCode");
                }
        }
@@ -663,11 +629,11 @@ void Paragraph::Pimpl::validate(LaTeXFeatures & features,
 
 Paragraph * Paragraph::Pimpl::getParFromID(int id) const
 {
-       InsetList::const_iterator cit = owner_->insetlist.begin();
-       InsetList::const_iterator lend = owner_->insetlist.end();
+       InsetList::iterator cit = owner_->insetlist.begin();
+       InsetList::iterator lend = owner_->insetlist.end();
        Paragraph * result;
        for (; cit != lend; ++cit) {
-               if ((result = cit->inset->getParFromID(id)))
+               if ((result = cit.getInset()->getParFromID(id)))
                        return result;
        }
        return 0;
@@ -687,19 +653,11 @@ LyXFont const Paragraph::Pimpl::realizeFont(LyXFont const & font,
        while (par && par->getDepth() && !tmpfont.resolved()) {
                par = par->outerHook();
                if (par) {
-                       tmpfont.realize(par->layout()->font
-#ifdef INHERIT_LANGUAGE
-                                       , bparams.language
-#endif
-                                       );
+                       tmpfont.realize(par->layout()->font);
                        par_depth = par->getDepth();
                }
        }
 
-       tmpfont.realize(tclass.defaultfont()
-#ifdef INHERIT_LANGUAGE
-               , bparams.language
-#endif
-               );
+       tmpfont.realize(tclass.defaultfont());
        return tmpfont;
 }