X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.C;h=8a7bee84b17775a0551cb9843ed534cf10371ba5;hb=5eb1059f506d5db92d85e93057e752422e014ec2;hp=e126352f4a934cad20f33d7c18cfb13341c76f62;hpb=6449d5b3d825b60edc269c185c28439d4690141c;p=lyx.git diff --git a/src/BufferView.C b/src/BufferView.C index e126352f4a..8a7bee84b1 100644 --- a/src/BufferView.C +++ b/src/BufferView.C @@ -3,7 +3,7 @@ * Copyright 1995-2002 the LyX Team * Read the file COPYING * - * \author unknown + * \author Lars Gullik Bjønnes * \author John Levon */ @@ -12,7 +12,6 @@ #include "BufferView.h" #include "BufferView_pimpl.h" -#include "BufferView_pimpl.h" #include "LaTeX.h" #include "ParagraphParameters.h" #include "WordLangTuple.h" @@ -20,6 +19,7 @@ #include "bufferlist.h" #include "debug.h" #include "gettext.h" +#include "errorlist.h" #include "iterators.h" #include "language.h" #include "lyxcursor.h" @@ -36,12 +36,10 @@ #include "frontends/screen.h" #include "insets/insetcommand.h" // ChangeRefs -#include "insets/inseterror.h" #include "insets/updatableinset.h" #include "support/FileInfo.h" #include "support/filetools.h" -#include "support/lyxfunctional.h" // equal_1st_in_pair #include "support/types.h" #include "support/lyxalgo.h" // lyx_count @@ -50,6 +48,7 @@ extern BufferList bufferlist; using lyx::pos_type; +using namespace lyx::support; using std::pair; using std::endl; @@ -104,19 +103,30 @@ void BufferView::buffer(Buffer * b) } +bool BufferView::newFile(string const & fn, string const & tn, bool named) +{ + return pimpl_->newFile(fn, tn, named); +} + + +bool BufferView::loadLyXFile(string const & fn, bool tl) +{ + return pimpl_->loadLyXFile(fn, tl); +} + + void BufferView::reload() { string const fn = buffer()->fileName(); if (bufferlist.close(buffer(), false)) - buffer(bufferlist.loadLyXFile(fn)); + loadLyXFile(fn); } void BufferView::resize() { - if (pimpl_->buffer_) { + if (pimpl_->buffer_) pimpl_->resizeCurrentBuffer(); - } } @@ -228,12 +238,6 @@ void BufferView::toggleSelection(bool b) } -void BufferView::toggleToggle() -{ - pimpl_->toggleToggle(); -} - - void BufferView::center() { pimpl_->center(); @@ -316,6 +320,8 @@ bool BufferView::insertLyXFile(string const & filen) bool res = true; + text->breakParagraph(buffer()->paragraphs); + if (c == '#') { // FIXME: huh ? No we won't ! lyxerr[Debug::INFO] << "Will insert file with header" << endl; @@ -331,145 +337,20 @@ bool BufferView::insertLyXFile(string const & filen) } -bool BufferView::removeAutoInsets() -{ - // keep track of which pos and par the cursor was on - Paragraph * cursor_par = &*text->cursor.par(); - Paragraph * cursor_par_prev = cursor_par ? cursor_par->previous() : 0; - Paragraph * cursor_par_next = cursor_par ? cursor_par->next() : 0; - pos_type cursor_pos = text->cursor.pos(); - - bool found = false; - - // Trap the deletion of the paragraph the cursor is in. - // Iterate until we find a paragraph that won't be immediately deleted. - // In reality this should mean we only execute the body of the while - // loop once at most. However for safety we iterate rather than just - // make this an if () conditional. - while ((cursor_par_prev || cursor_par_next) - && text->setCursor( - cursor_par_prev ? cursor_par_prev : cursor_par_next, - 0)) { - // We just removed cursor_par so have to fix the "cursor" - if (cursor_par_prev) { - // '.' = cursor_par - // a -> a. - // . - cursor_par = cursor_par_prev; - cursor_pos = cursor_par->size(); - } else { - // . -> .a - // a - cursor_par = cursor_par_next; - cursor_pos = 0; - } - cursor_par_prev = cursor_par->previous(); - cursor_par_next = cursor_par->next(); - } - - // Iterate through the paragraphs removing autoDelete insets as we go. - // If the paragraph ends up empty after all the autoDelete insets are - // removed that paragraph will be removed by the next setCursor() call. - ParIterator it = buffer()->par_iterator_begin(); - ParIterator end = buffer()->par_iterator_end(); - for (; it != end; ++it) { - Paragraph * par = *it; - Paragraph * par_prev = par ? par->previous() : 0; - bool removed = false; - - if (text->setCursor(par, 0) - && cursor_par == par_prev) { - // The previous setCursor line was deleted and that - // was the cursor_par line. This can only happen if an - // error box was the sole item on cursor_par. - // It is possible for cursor_par_prev to be stray if - // the line it pointed to only had a error box on it - // so we have to set it to a known correct value. - // This is often the same value it already had. - cursor_par_prev = par->previous(); - if (cursor_par_prev) { - // '|' = par, '.' = cursor_par, 'E' = error box - // First step below may occur before while{} - // a |a a a a. - // E -> .E -> |.E -> . -> |b - // . b b |b - // b - cursor_par = cursor_par_prev; - cursor_pos = cursor_par_prev->size(); - cursor_par_prev = cursor_par->previous(); - // cursor_par_next remains the same - } else if (cursor_par_next) { - // First step below may occur before while{} - // . - // E -> |.E -> |. -> . -> .|a - // a a a |a - cursor_par = cursor_par_next; - cursor_pos = 0; - // cursor_par_prev remains unset - cursor_par_next = cursor_par->next(); - } else { - // I can't find a way to trigger this - // so it should be unreachable code - // unless the buffer is corrupted. - lyxerr << "BufferView::removeAutoInsets() is bad\n"; - } - } - - InsetList::iterator pit = par->insetlist.begin(); - InsetList::iterator pend = par->insetlist.end(); - - while (pit != pend) { - if (pit.getInset()->autoDelete()) { - removed = true; - pos_type const pos = pit.getPos(); - - par->erase(pos); - // We just invalidated par's inset iterators so - // we get the next valid iterator position - pit = par->insetlist.insetIterator(pos); - // and ensure we have a valid end iterator. - pend = par->insetlist.end(); - - if (cursor_par == par) { - // update the saved cursor position - if (cursor_pos > pos) - --cursor_pos; - } - } else { - ++pit; - } - } - if (removed) { - found = true; - text->redoParagraph(); - } - } - - // It is possible that the last line is empty if it was cursor_par - // and/or only had an error inset on it. So we set the cursor to the - // start of the doc to force its removal and ensure a valid saved cursor - if (text->setCursor(&*text->ownerParagraphs().begin(), 0) - && 0 == cursor_par_next) { - cursor_par = cursor_par_prev; - cursor_pos = cursor_par->size(); - } else if (cursor_pos > cursor_par->size()) { - // Some C-Enter lines were removed by the setCursor call which - // then invalidated cursor_pos. It could still be "wrong" because - // the cursor may appear to have jumped but since we collapsed - // some C-Enter lines this should be a reasonable compromise. - cursor_pos = cursor_par->size(); +void BufferView::showErrorList(string const & action) const +{ + if (getErrorList().size()) { + string const title = bformat(_("LyX: %1$s errors (%2$s)"), action, buffer()->fileName()); + owner()->getDialogs().show("errorlist", title); + pimpl_->errorlist_.clear(); } - - // restore the original cursor in its corrected location. - text->setCursorIntern(cursor_par, cursor_pos); - - return found; } -void BufferView::showErrorList() +ErrorList const & +BufferView::getErrorList() const { - owner()->getDialogs().show("errorlist"); + return pimpl_->errorlist_; } @@ -480,19 +361,19 @@ void BufferView::setCursorFromRow(int row) buffer()->texrow.getIdFromRow(row, tmpid, tmppos); - Paragraph * texrowpar; + ParagraphList::iterator texrowpar; if (tmpid == -1) { - texrowpar = &*text->ownerParagraphs().begin(); + texrowpar = text->ownerParagraphs().begin(); tmppos = 0; } else { - texrowpar = &*buffer()->getParFromID(tmpid); + texrowpar = buffer()->getParFromID(tmpid).pit(); } text->setCursor(texrowpar, tmppos); } -bool BufferView::insertInset(Inset * inset, string const & lout) +bool BufferView::insertInset(InsetOld * inset, string const & lout) { return pimpl_->insertInset(inset, lout); } @@ -502,7 +383,8 @@ void BufferView::gotoLabel(string const & label) { for (Buffer::inset_iterator it = buffer()->inset_iterator_begin(); it != buffer()->inset_iterator_end(); ++it) { - vector labels = it->getLabelList(); + vector labels; + it->getLabelList(labels); if (find(labels.begin(),labels.end(),label) != labels.end()) { beforeChange(text); @@ -628,7 +510,7 @@ bool BufferView::lockInset(UpdatableInset * inset) if (text->cursor.pos() < text->cursor.par()->size() && text->cursor.par()->getChar(text->cursor.pos()) == Paragraph::META_INSET) { - Inset * in = text->cursor.par()->getInset(text->cursor.pos()); + InsetOld * in = text->cursor.par()->getInset(text->cursor.pos()); if (inset == in) { theLockingInset(inset); return true; @@ -642,14 +524,15 @@ bool BufferView::lockInset(UpdatableInset * inset) InsetList::iterator it = pit->insetlist.begin(); InsetList::iterator end = pit->insetlist.end(); for (; it != end; ++it) { - if (it.getInset() == inset) { - text->setCursorIntern(pit, it.getPos()); + if (it->inset == inset) { + text->setCursorIntern(pit, it->pos); theLockingInset(inset); return true; } - if (it.getInset()->getInsetFromID(id)) { - text->setCursorIntern(pit, it.getPos()); - it.getInset()->edit(this); + if (it->inset->getInsetFromID(id)) { + text->setCursorIntern(pit, it->pos); + FuncRequest cmd(this, LFUN_INSET_EDIT, "left"); + it->inset->localDispatch(cmd); return theLockingInset()->lockInsetInInset(this, inset); } } @@ -704,25 +587,13 @@ int BufferView::unlockInset(UpdatableInset * inset) } -void BufferView::lockedInsetStoreUndo(Undo::undo_kind kind) -{ - if (!theLockingInset()) - return; // shouldn't happen - if (kind == Undo::EDIT) // in this case insets would not be stored! - kind = Undo::FINISH; - setUndo(this, kind, - text->cursor.par(), - boost::next(text->cursor.par())); -} - - -void BufferView::updateInset(Inset * inset) +void BufferView::updateInset(InsetOld * inset) { pimpl_->updateInset(inset); } -bool BufferView::ChangeInsets(Inset::Code code, +bool BufferView::ChangeInsets(InsetOld::Code code, string const & from, string const & to) { bool need_update = false; @@ -734,12 +605,11 @@ bool BufferView::ChangeInsets(Inset::Code code, ParIterator end = buffer()->par_iterator_end(); for (ParIterator it = buffer()->par_iterator_begin(); it != end; ++it) { - Paragraph * par = *it; bool changed_inset = false; - for (InsetList::iterator it2 = par->insetlist.begin(); - it2 != par->insetlist.end(); ++it2) { - if (it2.getInset()->lyxCode() == code) { - InsetCommand * inset = static_cast(it2.getInset()); + for (InsetList::iterator it2 = it->insetlist.begin(); + it2 != it->insetlist.end(); ++it2) { + if (it2->inset->lyxCode() == code) { + InsetCommand * inset = static_cast(it2->inset); if (inset->getContents() == from) { inset->setContents(to); changed_inset = true; @@ -754,10 +624,9 @@ bool BufferView::ChangeInsets(Inset::Code code, // The test it.size()==1 was needed to prevent crashes. // How to set the cursor corretly when it.size()>1 ?? if (it.size() == 1) { - text->setCursorIntern(par, 0); - text->redoParagraphs(text->cursor, - boost::next(text->cursor.par())); - text->fullRebreak(); + text->setCursorIntern(it.pit(), 0); + text->redoParagraph(text->cursor.par()); + text->partialRebreak(); } } } @@ -769,27 +638,13 @@ bool BufferView::ChangeInsets(Inset::Code code, bool BufferView::ChangeRefsIfUnique(string const & from, string const & to) { // Check if the label 'from' appears more than once - vector labels = buffer()->getLabelList(); + vector labels; + buffer()->getLabelList(labels); if (lyx::count(labels.begin(), labels.end(), from) > 1) return false; - return ChangeInsets(Inset::REF_CODE, from, to); -} - - -bool BufferView::ChangeCitationsIfUnique(string const & from, string const & to) -{ - typedef pair StringPair; - - vector keys; - buffer()->fillWithBibKeys(keys); - if (count_if(keys.begin(), keys.end(), - lyx::equal_1st_in_pair(from)) - > 1) - return false; - - return ChangeInsets(Inset::CITE_CODE, from, to); + return ChangeInsets(InsetOld::REF_CODE, from, to); } @@ -819,7 +674,7 @@ LyXText * BufferView::getLyXText() const } -LyXText * BufferView::getParentText(Inset * inset) const +LyXText * BufferView::getParentText(InsetOld * inset) const { if (inset->owner()) { LyXText * txt = inset->getLyXText(this); @@ -833,7 +688,7 @@ LyXText * BufferView::getParentText(Inset * inset) const } -Language const * BufferView::getParentLanguage(Inset * inset) const +Language const * BufferView::getParentLanguage(InsetOld * inset) const { LyXText * text = getParentText(inset); return text->cursor.par()->getFontSettings(buffer()->params,