fix two crashes related to dEPM. Some crashes remain

[lyx.git] / src / paragraph_pimpl.C

diff --git a/src/paragraph_pimpl.C b/src/paragraph_pimpl.C
index 91d67776610bbff0ca207c5353890633543ae561..9547fc9838bf2883a664d2d1137a77585e9d4850 100644 (file)
--- a/src/paragraph_pimpl.C
+++ b/src/paragraph_pimpl.C
@@ -26,6 +26,7 @@
 #include "outputparams.h"
 #include "texrow.h"
 
+#include <boost/next_prior.hpp>
 
 using lyx::pos_type;
 
@@ -36,8 +37,6 @@ using std::string;
 using std::ostream;
 
 
-// Initialize static member.
-ShareContainer<LyXFont> Paragraph::Pimpl::FontTable::container;
 // Initialization of the counter for the paragraph id's,
 unsigned int Paragraph::Pimpl::paragraph_id = 0;
 
@@ -166,15 +165,19 @@ Change const Paragraph::Pimpl::lookupChangeFull(pos_type pos) const
 }
 
 
-void Paragraph::Pimpl::markErased()
+void Paragraph::Pimpl::markErased(bool erased)
 {
        BOOST_ASSERT(tracking());
 
-       // FIXME: we should actually remove INSERTED chars.
-       // difficult because owning insettexts/tabulars need
-       // to update themselves when rows etc. change
-       changes_->set(Change::DELETED, 0, size());
-       changes_->reset(Change::DELETED);
+       if (erased) {
+               erase(0, size());
+       } else {
+               for (pos_type i = 0; i < size(); ++i) {
+                       changes_->set(Change::UNCHANGED, i);
+                       if (owner_->isInset(i))
+                               owner_->getInset(i)->markErased(false);
+               }
+       }
 }
 
 
@@ -188,7 +191,7 @@ void Paragraph::Pimpl::acceptChange(pos_type start, pos_type end)
                return;
        }
 
-       lyxerr << "acceptchange" << endl;
+       lyxerr[Debug::CHANGES] << "acceptchange" << endl;
        pos_type i = start;
 
        for (; i < end; ++i) {
@@ -209,7 +212,7 @@ void Paragraph::Pimpl::acceptChange(pos_type start, pos_type end)
                }
        }
 
-       lyxerr << "endacceptchange" << endl;
+       lyxerr[Debug::CHANGES] << "endacceptchange" << endl;
        changes_->reset(Change::UNCHANGED);
 }
 
@@ -240,6 +243,8 @@ void Paragraph::Pimpl::rejectChange(pos_type start, pos_type end)
 
                        case Change::DELETED:
                                changes_->set(Change::UNCHANGED, i);
+                               if (owner_->isInset(i))
+                                       owner_->getInset(i)->markErased(false);
                                break;
                }
        }
@@ -253,8 +258,7 @@ Paragraph::value_type Paragraph::Pimpl::getChar(pos_type pos) const
 }
 
 
-void Paragraph::Pimpl::insertChar(pos_type pos, value_type c,
-                                 LyXFont const & font, Change change)
+void Paragraph::Pimpl::insertChar(pos_type pos, value_type c, Change change)
 {
        BOOST_ASSERT(pos <= size());
 
@@ -267,7 +271,6 @@ void Paragraph::Pimpl::insertChar(pos_type pos, value_type c,
        if (pos == size()) {
                // when appending characters, no need to update tables
                owner_->text_.push_back(c);
-               owner_->setFont(pos, font);
                return;
        }
 
@@ -285,25 +288,20 @@ void Paragraph::Pimpl::insertChar(pos_type pos, value_type c,
 
        // Update the insets
        owner_->insetlist.increasePosAfterPos(pos);
-
-       owner_->setFont(pos, font);
 }
 
 
 void Paragraph::Pimpl::insertInset(pos_type pos,
-                                  InsetOld * inset, LyXFont const & font, Change change)
+                                  InsetBase * inset, Change change)
 {
        BOOST_ASSERT(inset);
        BOOST_ASSERT(pos <= size());
 
-       insertChar(pos, META_INSET, font, change);
+       insertChar(pos, META_INSET, change);
        BOOST_ASSERT(owner_->text_[pos] == META_INSET);
 
        // Add a new entry in the insetlist.
        owner_->insetlist.insert(inset, pos);
-
-       if (inset_owner)
-               inset->setOwner(inset_owner);
 }
 
 
@@ -361,9 +359,8 @@ bool Paragraph::Pimpl::erase(pos_type pos)
 
                // only allow the actual removal if it was /new/ text
                if (changetype != Change::INSERTED) {
-                       if (owner_->text_[pos] == Paragraph::META_INSET) {
-                               owner_->getInset(pos)->markErased();
-                       }
+                       if (owner_->isInset(pos))
+                               owner_->getInset(pos)->markErased(true);
                        return false;
                }
        }
@@ -467,8 +464,7 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const & buf,
                        if (c != '\0')
                                os << c;
                } else {
-                       InsetOld const * inset = owner_->getInset(i);
-                       inset->plaintext(buf, os, runparams);
+                       owner_->getInset(i)->plaintext(buf, os, runparams);
                }
                return;
        }
@@ -478,14 +474,14 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const & buf,
        // and then split to handle the two modes separately.
        switch (c) {
        case Paragraph::META_INSET: {
-               InsetOld * inset = owner_->getInset(i);
+               InsetBase * inset = owner_->getInset(i);
 
                // FIXME: remove this check
                if (!inset)
                        break;
 
                // FIXME: move this to InsetNewline::latex
-               if (inset->lyxCode() == InsetOld::NEWLINE_CODE) {
+               if (inset->lyxCode() == InsetBase::NEWLINE_CODE) {
                        // newlines are handled differently here than
                        // the default in simpleTeXSpecialChars().
                        if (!style.newline_allowed) {
@@ -512,18 +508,26 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const & buf,
                        break;
                }
 
+               // output change tracking marks only if desired,
+               // if dvipost is installed,
+               // and with dvi/ps (other formats don't work)
+               LaTeXFeatures features(buf, bparams, runparams.nice);
+               bool const output = bparams.output_changes
+                       && runparams.flavor == OutputParams::LATEX
+                       && features.isAvailable("dvipost");
+
                if (inset->isTextInset()) {
                        column += Changes::latexMarkChange(os, running_change,
-                               Change::UNCHANGED);
+                               Change::UNCHANGED, output);
                        running_change = Change::UNCHANGED;
                }
 
                bool close = false;
                ostream::pos_type const len = os.tellp();
 
-               if ((inset->lyxCode() == InsetOld::GRAPHICS_CODE
-                    || inset->lyxCode() == InsetOld::MATH_CODE
-                    || inset->lyxCode() == InsetOld::URL_CODE)
+               if ((inset->lyxCode() == InsetBase::GRAPHICS_CODE
+                    || inset->lyxCode() == InsetBase::MATH_CODE
+                    || inset->lyxCode() == InsetBase::URL_CODE)
                    && running_font.isRightToLeft()) {
                        os << "\\L{";
                        close = true;
@@ -674,7 +678,7 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const & buf,
                        column += 17;
                        break;
 
-               case '*': case '[': case ']':
+               case '*': case '[':
                        // avoid being mistaken for optional arguments
                        os << '{' << c << '}';
                        column += 2;
@@ -784,13 +788,13 @@ void Paragraph::Pimpl::validate(LaTeXFeatures & features,
                features.require("ParagraphLeftIndent");
 
        // then the insets
-       InsetList::iterator icit = owner_->insetlist.begin();
-       InsetList::iterator iend = owner_->insetlist.end();
+       InsetList::const_iterator icit = owner_->insetlist.begin();
+       InsetList::const_iterator iend = owner_->insetlist.end();
        for (; icit != iend; ++icit) {
                if (icit->inset) {
                        icit->inset->validate(features);
                        if (layout.needprotect &&
-                           icit->inset->lyxCode() == InsetOld::FOOT_CODE)
+                           icit->inset->lyxCode() == InsetBase::FOOT_CODE)
                                features.require("NeedLyXFootnoteCode");
                }
        }