Changes to the within-inset row rendering caching code.

[lyx.git] / src / paragraph_pimpl.C

diff --git a/src/paragraph_pimpl.C b/src/paragraph_pimpl.C
index 13fd94dbdd82986e65dd4c0b78109d95085269ea..4ffd914f3e7943d8599a7727ccf8f55acefb5735 100644 (file)
--- a/src/paragraph_pimpl.C
+++ b/src/paragraph_pimpl.C
@@ -99,7 +99,7 @@ void Paragraph::Pimpl::trackChanges(Change::Type type)
        lyxerr[Debug::CHANGES] << "track changes for par "
                << id_ << " type " << type << endl;
        changes_.reset(new Changes(type));
-       changes_->set(type, 0, size());
+       changes_->set(type, 0, size() + 1);
 }
 
 
@@ -116,7 +116,7 @@ void Paragraph::Pimpl::cleanChanges()
                return;
 
        changes_.reset(new Changes(Change::INSERTED));
-       changes_->set(Change::INSERTED, 0, size());
+       changes_->set(Change::INSERTED, 0, size() + 1);
 }
 
 
@@ -147,6 +147,14 @@ void Paragraph::Pimpl::setChange(pos_type pos, Change::Type type)
 }
 
 
+void Paragraph::Pimpl::setChangeFull(pos_type pos, Change change)
+{
+       if (!tracking())
+               return;
+
+       changes_->set(change, pos);
+}
+
 Change::Type Paragraph::Pimpl::lookupChange(pos_type pos) const
 {
        if (!tracking())
@@ -165,15 +173,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);
+               }
+       }
 }
 
 
@@ -187,7 +199,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) {
@@ -200,15 +212,19 @@ void Paragraph::Pimpl::acceptChange(pos_type start, pos_type end)
                                break;
 
                        case Change::DELETED:
-                               eraseIntern(i);
-                               changes_->erase(i);
-                               --end;
-                               --i;
+                               // Suppress access to nonexistent 
+                               // "end-of-paragraph char":
+                               if (i < size()) {
+                                       eraseIntern(i);
+                                       changes_->erase(i);
+                                       --end;
+                                       --i;
+                               }
                                break;
                }
        }
 
-       lyxerr << "endacceptchange" << endl;
+       lyxerr[Debug::CHANGES] << "endacceptchange" << endl;
        changes_->reset(Change::UNCHANGED);
 }
 
@@ -231,14 +247,19 @@ void Paragraph::Pimpl::rejectChange(pos_type start, pos_type end)
                                break;
 
                        case Change::INSERTED:
-                               eraseIntern(i);
-                               changes_->erase(i);
-                               --end;
-                               --i;
+                               if (i < size()) {
+                                       eraseIntern(i);
+                                       changes_->erase(i);
+                                       --end;
+                                       --i;
+                               }
                                break;
 
                        case Change::DELETED:
                                changes_->set(Change::UNCHANGED, i);
+                               // No real char at position size():
+                               if (i < size() && owner_->isInset(i))
+                                       owner_->getInset(i)->markErased(false);
                                break;
                }
        }
@@ -345,7 +366,7 @@ void Paragraph::Pimpl::eraseIntern(pos_type pos)
 
 bool Paragraph::Pimpl::erase(pos_type pos)
 {
-       BOOST_ASSERT(pos < size());
+       BOOST_ASSERT(pos <= size());
 
        if (tracking()) {
                Change::Type changetype(changes_->lookup(pos));
@@ -353,15 +374,19 @@ 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 (pos < size() && owner_->isInset(pos))
+                               owner_->getInset(pos)->markErased(true);
                        return false;
                }
        }
 
-       eraseIntern(pos);
-       return true;
+       // Don't physically access nonexistent end-of-paragraph char
+       if (pos < size()) {
+               eraseIntern(pos);
+               return true;
+       }
+
+       return false;
 }
 
 
@@ -503,9 +528,17 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const & buf,
                        break;
                }
 
-               if (inset->isTextInset()) {
+               // 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->canTrackChanges()) {
                        column += Changes::latexMarkChange(os, running_change,
-                               Change::UNCHANGED);
+                               Change::UNCHANGED, output);
                        running_change = Change::UNCHANGED;
                }