gettext support, fast_start option, scons all, mingw bug fix and some cleanup for...

[lyx.git] / src / paragraph_pimpl.C

diff --git a/src/paragraph_pimpl.C b/src/paragraph_pimpl.C
index 9547fc9838bf2883a664d2d1137a77585e9d4850..6e3c63cb5538af80d8be44c7e7ab40cbe96428db 100644 (file)
--- a/src/paragraph_pimpl.C
+++ b/src/paragraph_pimpl.C
@@ -14,6 +14,7 @@
 #include <config.h>
 
 #include "paragraph_pimpl.h"
+#include "paragraph.h"
 
 #include "bufferparams.h"
 #include "debug.h"
@@ -99,7 +100,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);
 }
 
 
@@ -109,14 +110,22 @@ void Paragraph::Pimpl::untrackChanges()
 }
 
 
-void Paragraph::Pimpl::cleanChanges()
+void Paragraph::Pimpl::cleanChanges(Paragraph::ChangeTracking ct)
 {
-       // if we're not tracking, we don't want to reset...
-       if (!tracking())
+       // if the paragraph was not tracked and we don't know the buffer's
+       // change tracking state, we do nothing
+       if ((ct == Paragraph::trackingUnknown) && !tracking())
                return;
 
+       // untrack everything if we are in a buffer where ct is disabled
+       else if (ct == Paragraph::trackingOff) {
+               untrackChanges();
+               return;
+       }
+       
+       // in a buffer where ct is enabled, set everything to INSERTED
        changes_.reset(new Changes(Change::INSERTED));
-       changes_->set(Change::INSERTED, 0, size());
+       changes_->set(Change::INSERTED, 0, size() + 1);
 }
 
 
@@ -138,7 +147,7 @@ bool Paragraph::Pimpl::isChangeEdited(pos_type start, pos_type end) const
 }
 
 
-void Paragraph::Pimpl::setChange(pos_type pos, Change::Type type)
+void Paragraph::Pimpl::setChangeType(pos_type pos, Change::Type type)
 {
        if (!tracking())
                return;
@@ -147,21 +156,21 @@ void Paragraph::Pimpl::setChange(pos_type pos, Change::Type type)
 }
 
 
-Change::Type Paragraph::Pimpl::lookupChange(pos_type pos) const
+void Paragraph::Pimpl::setChange(pos_type pos, Change change)
 {
        if (!tracking())
-               return Change::UNCHANGED;
+               return;
 
-       return changes_->lookup(pos);
+       changes_->set(change, pos);
 }
 
 
-Change const Paragraph::Pimpl::lookupChangeFull(pos_type pos) const
+Change const Paragraph::Pimpl::lookupChange(pos_type pos) const
 {
        if (!tracking())
                return Change(Change::UNCHANGED);
 
-       return changes_->lookupFull(pos);
+       return changes_->lookup(pos);
 }
 
 
@@ -195,7 +204,7 @@ void Paragraph::Pimpl::acceptChange(pos_type start, pos_type end)
        pos_type i = start;
 
        for (; i < end; ++i) {
-               switch (lookupChange(i)) {
+               switch (lookupChange(i).type) {
                        case Change::UNCHANGED:
                                break;
 
@@ -204,10 +213,14 @@ 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;
                }
        }
@@ -230,20 +243,23 @@ void Paragraph::Pimpl::rejectChange(pos_type start, pos_type end)
        pos_type i = start;
 
        for (; i < end; ++i) {
-               switch (lookupChange(i)) {
+               switch (lookupChange(i).type) {
                        case Change::UNCHANGED:
                                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);
-                               if (owner_->isInset(i))
+                               // No real char at position size():
+                               if (i < size() && owner_->isInset(i))
                                        owner_->getInset(i)->markErased(false);
                                break;
                }
@@ -351,22 +367,27 @@ 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));
+               Change::Type changetype(changes_->lookup(pos).type);
                changes_->record(Change(Change::DELETED), pos);
 
                // only allow the actual removal if it was /new/ text
                if (changetype != Change::INSERTED) {
-                       if (owner_->isInset(pos))
+                       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;
 }
 
 
@@ -511,12 +532,12 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const & buf,
                // 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);
+               LaTeXFeatures features(buf, bparams, runparams);
                bool const output = bparams.output_changes
                        && runparams.flavor == OutputParams::LATEX
                        && features.isAvailable("dvipost");
 
-               if (inset->isTextInset()) {
+               if (inset->canTrackChanges()) {
                        column += Changes::latexMarkChange(os, running_change,
                                Change::UNCHANGED, output);
                        running_change = Change::UNCHANGED;
@@ -582,9 +603,9 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const & buf,
                        if ((bparams.inputenc == "latin1" ||
                             bparams.inputenc == "latin9") ||
                            (bparams.inputenc == "auto" &&
-                            (font.language()->encoding()->LatexName()
+                            (font.language()->encoding()->latexName()
                              == "latin1" ||
-                             font.language()->encoding()->LatexName()
+                             font.language()->encoding()->latexName()
                              == "latin9"))) {
                                os << "\\ensuremath{"
                                   << c