#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
#include <fstream>
-#include <algorithm>
extern BufferList bufferlist;
+using lyx::pos_type;
+
using std::pair;
using std::endl;
using std::ifstream;
using std::vector;
using std::find;
-using std::count;
using std::count_if;
bool BufferView::removeAutoInsets()
{
- LyXCursor tmpcursor = text->cursor;
- LyXCursor cursor;
+ // 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(this,
+ 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 (ParIterator it = buffer()->par_iterator_begin();
- it != end; ++it) {
+ for (; it != end; ++it) {
Paragraph * par = *it;
- // this has to be done before the delete
- if (par->autoDeleteInsets()) {
- found = true;
-#ifdef WITH_WARNINGS
-#warning FIXME
-#endif
- // The test it.size()==1 was needed to prevent crashes.
- if (it.size() == 1) {
- text->setCursor(this, cursor, par, 0);
- text->redoParagraphs(this, cursor,
- cursor.par()->next());
- text->fullRebreak(this);
+ Paragraph * par_prev = par ? par->previous() : 0;
+ bool removed = false;
+
+ if (text->setCursor(this, 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";
}
}
+
+ Paragraph::inset_iterator pit = par->inset_iterator_begin();
+ Paragraph::inset_iterator pend = par->inset_iterator_end();
+ while (pit != pend) {
+ if (pit->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->InsetIterator(pos);
+ // and ensure we have a valid end iterator.
+ pend = par->inset_iterator_end();
+
+ if (cursor_par == par) {
+ // update the saved cursor position
+ if (cursor_pos > pos)
+ --cursor_pos;
+ }
+ } else {
+ ++pit;
+ }
+ }
+ if (removed) {
+ found = true;
+ text->redoParagraph(this);
+ }
}
- // avoid forbidden cursor positions caused by error removing
- if (tmpcursor.pos() > tmpcursor.par()->size())
- tmpcursor.pos(tmpcursor.par()->size());
+ // 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(this, text->ownerParagraph(), 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();
+ }
- text->setCursorIntern(this, tmpcursor.par(), tmpcursor.pos());
+ // restore the original cursor in its corrected location.
+ text->setCursorIntern(this, cursor_par, cursor_pos);
return found;
}
// Save the cursor position
LyXCursor cursor = text->cursor;
- for (TeXErrors::Errors::const_iterator cit = terr.begin();
- cit != terr.end();
- ++cit) {
+ TeXErrors::Errors::const_iterator cit = terr.begin();
+ TeXErrors::Errors::const_iterator end = terr.end();
+ for (; cit != end; ++cit) {
string const desctext(cit->error_desc);
string const errortext(cit->error_text);
string const msgtxt = desctext + '\n' + errortext;
Paragraph * texrowpar = 0;
if (tmpid == -1) {
- texrowpar = text->firstParagraph();
+ texrowpar = text->ownerParagraph();
tmppos = 0;
} else {
texrowpar = buffer()->getParFromID(tmpid);
Paragraph * texrowpar;
if (tmpid == -1) {
- texrowpar = text->firstParagraph();
+ texrowpar = text->ownerParagraph();
tmppos = 0;
} else {
texrowpar = buffer()->getParFromID(tmpid);
par->inset_iterator_end();
for (; it != end; ++it) {
if ((*it) == inset) {
+ text->setCursorIntern(this, par, it.getPos());
theLockingInset(inset);
return true;
}
if ((*it)->getInsetFromID(id)) {
text->setCursorIntern(this, par, it.getPos());
- theLockingInset(static_cast<UpdatableInset *>(*it));
+ (*it)->edit(this);
return theLockingInset()->lockInsetInInset(this, inset);
}
}
void BufferView::showLockedInsetCursor(int x, int y, int asc, int desc)
{
- if (available() && theLockingInset()) {
+ if (available() && theLockingInset() && !theLockingInset()->nodraw()) {
LyXCursor cursor = text->cursor;
Inset * locking_inset = theLockingInset()->getLockingInset();
inset->insetUnlock(this);
theLockingInset(0);
// make sure we update the combo !
- owner()->setLayout(getLyXText()->cursor.par()->getLayout());
+ owner()->setLayout(getLyXText()->cursor.par()->layout());
finishUndo();
return 0;
} else if (inset && theLockingInset() &&
{
// Check if the label 'from' appears more than once
vector<string> labels = buffer()->getLabelList();
- if (count(labels.begin(), labels.end(), from) > 1)
+
+ 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)
+bool BufferView::ChangeCitationsIfUnique(string const & from,
+ string const & to)
{
-
- vector<pair<string,string> > keys = buffer()->getBibkeyList();
+ typedef pair<string, string> StringPair;
+
+ vector<StringPair> keys = buffer()->getBibkeyList();
if (count_if(keys.begin(), keys.end(),
- lyx::equal_1st_in_pair<string,string>(from))
+ lyx::equal_1st_in_pair<StringPair>(from))
> 1)
return false;
projects / lyx.git / blobdiff