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 4ffd914f3e7943d8599a7727ccf8f55acefb5735..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"
@@ -109,12 +110,20 @@ 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() + 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,7 +156,7 @@ void Paragraph::Pimpl::setChange(pos_type pos, Change::Type type)
 }
 
 
-void Paragraph::Pimpl::setChangeFull(pos_type pos, Change change)
+void Paragraph::Pimpl::setChange(pos_type pos, Change change)
 {
        if (!tracking())
                return;
@@ -155,21 +164,13 @@ void Paragraph::Pimpl::setChangeFull(pos_type pos, Change change)
        changes_->set(change, pos);
 }
 
-Change::Type Paragraph::Pimpl::lookupChange(pos_type pos) const
-{
-       if (!tracking())
-               return Change::UNCHANGED;
-
-       return changes_->lookup(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);
 }
 
 
@@ -203,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;
 
@@ -212,7 +213,7 @@ void Paragraph::Pimpl::acceptChange(pos_type start, pos_type end)
                                break;
 
                        case Change::DELETED:
-                               // Suppress access to nonexistent 
+                               // Suppress access to nonexistent
                                // "end-of-paragraph char":
                                if (i < size()) {
                                        eraseIntern(i);
@@ -242,7 +243,7 @@ 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;
 
@@ -369,7 +370,7 @@ bool Paragraph::Pimpl::erase(pos_type pos)
        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
@@ -531,7 +532,7 @@ 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");
@@ -602,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