X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph_pimpl.C;h=6e3c63cb5538af80d8be44c7e7ab40cbe96428db;hb=e94889a041628203c50b66b9a4add63210de6928;hp=84c269d04b8845b0fb352a714f104bde55f00c6d;hpb=0786aa3247b1b063a54364ede636d75b45f683a3;p=lyx.git diff --git a/src/paragraph_pimpl.C b/src/paragraph_pimpl.C index 84c269d04b..6e3c63cb55 100644 --- a/src/paragraph_pimpl.C +++ b/src/paragraph_pimpl.C @@ -14,6 +14,7 @@ #include #include "paragraph_pimpl.h" +#include "paragraph.h" #include "bufferparams.h" #include "debug.h" @@ -26,6 +27,7 @@ #include "outputparams.h" #include "texrow.h" +#include using lyx::pos_type; @@ -36,8 +38,6 @@ using std::string; using std::ostream; -// Initialize static member. -ShareContainer Paragraph::Pimpl::FontTable::container; // Initialization of the counter for the paragraph id's, unsigned int Paragraph::Pimpl::paragraph_id = 0; @@ -100,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); } @@ -110,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); } @@ -139,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; @@ -148,33 +156,37 @@ 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); } -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,11 +200,11 @@ 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) { - switch (lookupChange(i)) { + switch (lookupChange(i).type) { case Change::UNCHANGED: break; @@ -201,15 +213,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); } @@ -227,19 +243,24 @@ 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); + // No real char at position size(): + if (i < size() && owner_->isInset(i)) + owner_->getInset(i)->markErased(false); break; } } @@ -346,23 +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_->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; } @@ -504,9 +529,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); + 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; } @@ -570,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 @@ -666,7 +699,7 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const & buf, column += 17; break; - case '*': case '[': + case '*': case '[': // avoid being mistaken for optional arguments os << '{' << c << '}'; column += 2;