#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 std::ifstream;
using std::vector;
using std::find;
-using std::count;
using std::count_if;
bool BufferView::removeAutoInsets()
{
- LyXCursor tmpcursor = text->cursor;
- Paragraph * cur_par = tmpcursor.par();
- Paragraph * cur_par_prev = cur_par ? cur_par->previous() : 0;
- Paragraph * cur_par_next = cur_par ? cur_par->next() : 0;
- pos_type cur_pos = tmpcursor.pos();
+ // 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.
- // It should be almost impossible for the new cursor par to be
- // deleted later on in this function.
- // This is the way to segfault this now. Although you may have to do this
- // multiple times: Have an InsetERT with an unknown command in it.
- // View->DVI, move cursor between Error box and InsetERT and hit <Enter>,
- // <down-arrow>, <Enter> again, View->DVI, BANG!
- //
- while ((cur_par_prev || cur_par_next)
+ // 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,
- cur_par_prev ? cur_par_prev : cur_par_next,
+ cursor_par_prev ? cursor_par_prev : cursor_par_next,
0)) {
- // we just removed cur_par so have to fix the "cursor"
- if (cur_par_prev) {
- cur_par = cur_par_prev;
- cur_pos = cur_par->size();
+ // 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 {
- cur_par = cur_par_next;
- cur_pos = 0;
+ // . -> .a
+ // a
+ cursor_par = cursor_par_next;
+ cursor_pos = 0;
}
- cur_par_prev = cur_par->previous();
- cur_par_next = cur_par->next();
+ 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_prev = par ? par->previous() : 0;
bool removed = false;
- bool dead = text->setCursor(this, par, 0);
+ 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();
if (pit->autoDelete()) {
removed = true;
pos_type const pos = pit.getPos();
-
+
par->erase(pos);
- if (cur_par == par) {
- if (cur_pos > pos)
- --cur_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;
found = true;
text->redoParagraph(this);
}
- if (dead) {
- // Error box paragraphs appear to have a bad next_ pointer
- // especially when that's all that's in the paragraph..
- // Then if you are in an empty paragraph after an error box
- // which is in its own paragraph this will fail because
- // cur_prev_par was the one just deleted (I think).
- // That's the main reason why this clause makes almost no difference.
- // Feel free to delete this whole clause as my brain is asleep now.
- while ((cur_par_prev || cur_par_next)
- && text->setCursor(this,
- cur_par_prev ? cur_par_prev : cur_par_next,
- 0)) {
- // we just removed cur_par so have to fix the "cursor"
- if (cur_par_prev == par) {
- // attempting to solve the "prev par was deleted
- // because it had only an error inset in it" problem
- if (par_prev) {
- cur_par = par_prev;
- cur_pos = cur_par->size();
- } else {
- cur_par = cur_par_next;
- cur_pos = 0;
- }
- } else if (cur_par_prev) {
- cur_par = cur_par_prev;
- cur_pos = cur_par->size();
- } else {
- cur_par = cur_par_next;
- cur_pos = 0;
- }
- cur_par_prev = cur_par->previous();
- cur_par_next = cur_par->next();
- }
- }
}
- text->setCursorIntern(this, cur_par, cur_pos);
+ // 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();
+ }
+
+ // restore the original cursor in its corrected location.
+ text->setCursorIntern(this, cursor_par, cursor_pos);
return found;
}
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);
}
if ((*it)->getInsetFromID(id)) {
text->setCursorIntern(this, par, it.getPos());
- theLockingInset(static_cast<UpdatableInset *>(*it));
+ (*it)->edit(this);
return theLockingInset()->lockInsetInInset(this, inset);
}
}
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();
- // count is broken on some systems, so use the HP version
- int res;
- count(labels.begin(), labels.end(), from, res);
- if (res > 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