#include "support/FileInfo.h"
#include "support/filetools.h"
#include "support/lyxfunctional.h" //equal_1st_in_pair
+#include "support/types.h"
#include <fstream>
#include <algorithm>
extern BufferList bufferlist;
+using lyx::pos_type;
+
using std::pair;
using std::endl;
using std::ifstream;
bool BufferView::removeAutoInsets()
{
LyXCursor tmpcursor = text->cursor;
- LyXCursor 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();
+
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 ((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) {
+ // '.' = cur_par
+ // a -> a.
+ // .
+ cur_par = cur_par_prev;
+ cur_pos = cur_par->size();
+ } else {
+ // . -> .a
+ // a
+ cur_par = cur_par_next;
+ cur_pos = 0;
+ }
+ cur_par_prev = cur_par->previous();
+ cur_par_next = cur_par->next();
+ }
+
+ 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)
+ && cur_par == par_prev) {
+ // The previous setCursor line was deleted and that
+ // was the cur_par line. This can only happen if an
+ // error box was the sole item on cur_par.
+ if (cur_par_prev) {
+ // '|' = par, '.' = cur_par, 'E' = error box
+ // First step below may occur before while{}
+ // a |a a a a.
+ // E -> .E -> |.E -> . -> |b
+ // . b b |b
+ // b
+ cur_par = cur_par_prev;
+ cur_pos = cur_par_prev->size();
+ cur_par_prev = cur_par->previous();
+ // cur_par_next remains the same
+ } else if (cur_par_next) {
+ // First step below may occur before while{}
+ // .
+ // E -> |.E -> |. -> . -> .|a
+ // a a a |a
+ cur_par = cur_par_next;
+ cur_pos = 0;
+ // cur_par_prev remains unset
+ cur_par_next = cur_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";
}
}
- }
- // avoid forbidden cursor positions caused by error removing
- if (tmpcursor.pos() > tmpcursor.par()->size())
- tmpcursor.pos(tmpcursor.par()->size());
+ 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);
+ if (cur_par == par) {
+ if (cur_pos > pos)
+ --cur_pos;
+ }
+ } else {
+ ++pit;
+ }
+ }
+ if (removed) {
+ found = true;
+ text->redoParagraph(this);
+ }
+ }
- text->setCursorIntern(this, tmpcursor.par(), tmpcursor.pos());
+ text->setCursorIntern(this, cur_par, cur_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;
}
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();
{
// Check if the label 'from' appears more than once
vector<string> labels = buffer()->getLabelList();
- if (count(labels.begin(), labels.end(), from) > 1)
+ // count is broken on some systems, so use the HP version
+ int res;
+ count(labels.begin(), labels.end(), from, res);
+ if (res > 1)
return false;
return ChangeInsets(Inset::REF_CODE, from, to);
projects / lyx.git / blobdiff