while (buf) {
tmppar = buf;
- buf = buf->next;
+#ifndef NEW_INSETS
+ buf = buf->next_;
+#else
+ buf = buf->next();
+#endif
delete tmppar;
}
buf = 0;
bool CutAndPaste::cutSelection(LyXParagraph * startpar, LyXParagraph ** endpar,
int start, int & end, char tc, bool doclear)
{
+#ifndef NEW_INSETS
if (!startpar || (start > startpar->Last()))
return false;
+#else
+ if (!startpar || (start > startpar->size()))
+ return false;
+#endif
DeleteBuffer();
#else
(startpar == (*endpar))
#endif
- ) {
+ ) {
// only within one paragraph
buf = new LyXParagraph;
LyXParagraph::size_type i = start;
+#ifndef NEW_INSETS
if (end > startpar->Last())
end = startpar->Last();
- for (; i < end; ++i) {
- startpar->CopyIntoMinibuffer(current_view->buffer()->params,
- start);
-#ifndef NEW_TABULAR
- /* table stuff -- begin */
- if (startpar->table && startpar->IsNewline(start)) {
- ++start;
- } else {
- /* table stuff -- end */
-#endif
- startpar->Erase(start);
-#ifndef NEW_TABULAR
- }
+#else
+ if (end > startpar->size())
+ end = startpar->size();
#endif
+ for (; i < end; ++i) {
+ startpar->CopyIntoMinibuffer(*current_view->buffer(), start);
+ startpar->Erase(start);
+
+#ifndef NEW_INSETS
buf->InsertFromMinibuffer(buf->Last());
+#else
+ buf->InsertFromMinibuffer(buf->size());
+#endif
}
+ end = start-1;
} else {
// more than one paragraph
(*endpar)->BreakParagraphConservative(current_view->buffer()->params,
end);
- *endpar = (*endpar)->Next();
+ *endpar = (*endpar)->next();
end = 0;
startpar->BreakParagraphConservative(current_view->buffer()->params,
// store the selection
#ifndef NEW_INSETS
- buf = startpar->ParFromPos(start)->next;
+ buf = startpar->ParFromPos(start)->next_;
#else
- buf = startpar->next;
+ buf = startpar->next();
#endif
- buf->previous = 0;
- (*endpar)->previous->next = 0;
+ buf->previous(0);
+ (*endpar)->previous()->next(0);
// cut the selection
#ifndef NEW_INSETS
- startpar->ParFromPos(start)->next = (*endpar);
+ startpar->ParFromPos(start)->next(*endpar);
- (*endpar)->previous = startpar->ParFromPos(start);
+ (*endpar)->previous(startpar->ParFromPos(start));
#else
- startpar->next = (*endpar);
+ startpar->next(*endpar);
- (*endpar)->previous = startpar;
+ (*endpar)->previous(startpar);
#endif
#ifndef NEW_INSETS
LyXParagraph * tmppar = buf;
while (tmppar){
tmppar->footnoteflag = LyXParagraph::NO_FOOTNOTE;
- tmppar = tmppar->next;
+ tmppar = tmppar->next_;
}
}
#endif
// paste the paragraphs again, if possible
if (doclear)
- startpar->Next()->StripLeadingSpaces(textclass);
+ startpar->next()->StripLeadingSpaces(textclass);
#ifndef NEW_INSETS
- if (startpar->FirstPhysicalPar()->HasSameLayout(startpar->Next()) ||
+ if (startpar->FirstPhysicalPar()->HasSameLayout(startpar->next()) ||
+ !startpar->next()->Last()) {
#else
- if (startpar->HasSameLayout(startpar->Next()) ||
+ if (startpar->HasSameLayout(startpar->next()) ||
+ !startpar->next()->size()) {
#endif
- !startpar->Next()->Last()) {
#ifndef NEW_INSETS
startpar->ParFromPos(start)->PasteParagraph(current_view->buffer()->params);
#else
bool CutAndPaste::copySelection(LyXParagraph * startpar, LyXParagraph * endpar,
int start, int end, char tc)
{
+#ifndef NEW_INSETS
if (!startpar || (start > startpar->Last()))
return false;
+#else
+ if (!startpar || (start > startpar->size()))
+ return false;
+#endif
DeleteBuffer();
#else
(startpar == endpar)
#endif
- ) {
+ ) {
// only within one paragraph
buf = new LyXParagraph;
LyXParagraph::size_type i = start;
+#ifndef NEW_INSETS
if (end > startpar->Last())
end = startpar->Last();
+#else
+ if (end > startpar->size())
+ end = startpar->size();
+#endif
for (; i < end; ++i) {
- startpar->CopyIntoMinibuffer(current_view->buffer()->params, i);
+ startpar->CopyIntoMinibuffer(*current_view->buffer(), i);
+#ifndef NEW_INSETS
buf->InsertFromMinibuffer(buf->Last());
+#else
+ buf->InsertFromMinibuffer(buf->size());
+#endif
}
} else {
// copy more than one paragraph
buf = tmppar->Clone();
LyXParagraph * tmppar2 = buf;
- while (
#ifndef NEW_INSETS
- tmppar != endpar->ParFromPos(end)
+ while (tmppar != endpar->ParFromPos(end)
+ && tmppar->next_) {
+ tmppar = tmppar->next_;
+ tmppar2->next(tmppar->Clone());
+ tmppar2->next_->previous(tmppar2);
+ tmppar2 = tmppar2->next_;
+ }
+ tmppar2->next(0);
#else
- tmppar != endpar
-#endif
- && tmppar->next) {
- tmppar = tmppar->next;
- tmppar2->next = tmppar->Clone();
- tmppar2->next->previous = tmppar2;
- tmppar2 = tmppar2->next;
+ while (tmppar != endpar
+ && tmppar->next()) {
+ tmppar = tmppar->next();
+ tmppar2->next(tmppar->Clone());
+ tmppar2->next()->previous(tmppar2);
+ tmppar2 = tmppar2->next();
}
- tmppar2->next = 0;
+ tmppar2->next(0);
+#endif
#ifndef NEW_INSETS
// care about footnotes
tmppar = buf;
while (tmppar) {
tmppar->footnoteflag = LyXParagraph::NO_FOOTNOTE;
- tmppar = tmppar->next;
+ tmppar = tmppar->next_;
}
}
#endif
bool CutAndPaste::pasteSelection(LyXParagraph ** par, LyXParagraph ** endpar,
int & pos, char tc)
{
- if (!checkPastePossible(*par, pos))
+ if (!checkPastePossible(*par))
return false;
+#ifndef NEW_INSETS
if (pos > (*par)->Last())
pos = (*par)->Last();
-
+#else
+ if (pos > (*par)->size())
+ pos = (*par)->size();
+#endif
+
LyXParagraph * tmpbuf;
LyXParagraph * tmppar = *par;
int tmppos = pos;
// There are two cases: cutbuffer only one paragraph or many
- if (!buf->next) {
+#ifndef NEW_INSETS
+ if (!buf->next_) {
+#else
+ if (!buf->next()) {
+#endif
// only within a paragraph
tmpbuf = buf->Clone();
-#ifndef NEW_TABULAR
- /* table stuff -- begin */
- bool table_too_small = false;
- if ((*par)->table) {
- while (buf->size() && !table_too_small) {
- if (buf->IsNewline(0)){
- while((tmppos < tmppar->Last()) &&
- !tmppar->IsNewline(tmppos))
- ++tmppos;
- buf->Erase(0);
- if (tmppos < tmppar->Last())
- ++tmppos;
- else
- table_too_small = true;
- } else {
- // This is an attempt to fix the
- // "never insert a space at the
- // beginning of a paragraph" problem.
- if (!tmppos && buf->IsLineSeparator(0)) {
- buf->Erase(0);
- } else {
- buf->CutIntoMinibuffer(current_view->buffer()->params, 0);
- buf->Erase(0);
- if (tmppar->InsertFromMinibuffer(tmppos))
- ++tmppos;
- }
- }
- }
- } else {
- /* table stuff -- end */
-#endif
- // Some provisions should be done here for checking
- // if we are inserting at the beginning of a
- // paragraph. If there are a space at the beginning
- // of the text to insert and we are inserting at
- // the beginning of the paragraph the space should
- // be removed.
- while (buf->size()) {
+ // Some provisions should be done here for checking
+ // if we are inserting at the beginning of a
+ // paragraph. If there are a space at the beginning
+ // of the text to insert and we are inserting at
+ // the beginning of the paragraph the space should
+ // be removed.
+ while (buf->size()) {
// This is an attempt to fix the
// "never insert a space at the
// beginning of a paragraph" problem.
if (!tmppos && buf->IsLineSeparator(0)) {
- buf->Erase(0);
+ buf->Erase(0);
} else {
- buf->CutIntoMinibuffer(current_view->buffer()->params, 0);
- buf->Erase(0);
- if (tmppar->InsertFromMinibuffer(tmppos))
- ++tmppos;
+ buf->CutIntoMinibuffer(current_view->buffer()->params, 0);
+ buf->Erase(0);
+ if (tmppar->InsertFromMinibuffer(tmppos))
+ ++tmppos;
}
- }
-#ifndef NEW_TABULAR
}
-#endif
delete buf;
buf = tmpbuf;
- *endpar = tmppar->Next();
+ *endpar = tmppar->next();
pos = tmppos;
} else {
// many paragraphs
LyXParagraph * simple_cut_clone = tmpbuf->Clone();
LyXParagraph * tmpbuf2 = simple_cut_clone;
#ifndef NEW_INSETS
- if ((*par)->footnoteflag){
- tmpbuf->footnoteflag = (*par)->footnoteflag;
- tmpbuf->footnotekind = (*par)->footnotekind;
- }
-#endif
- while (tmpbuf->next) {
- tmpbuf = tmpbuf->next;
- tmpbuf2->next = tmpbuf->Clone();
- tmpbuf2->next->previous = tmpbuf2;
- tmpbuf2 = tmpbuf2->next;
-#ifndef NEW_INSETS
- if ((*par)->footnoteflag){
+ if ((*par)->footnoteflag) {
tmpbuf->footnoteflag = (*par)->footnoteflag;
tmpbuf->footnotekind = (*par)->footnotekind;
- }
-#endif
}
+ while (tmpbuf->next_) {
+ tmpbuf = tmpbuf->next_;
+ tmpbuf2->next(tmpbuf->Clone());
+ tmpbuf2->next_->previous(tmpbuf2);
+ tmpbuf2 = tmpbuf2->next_;
+ if ((*par)->footnoteflag){
+ tmpbuf->footnoteflag = (*par)->footnoteflag;
+ tmpbuf->footnotekind = (*par)->footnotekind;
+ }
+ }
+#else
+ while (tmpbuf->next()) {
+ tmpbuf = tmpbuf->next();
+ tmpbuf2->next(tmpbuf->Clone());
+ tmpbuf2->next()->previous(tmpbuf2);
+ tmpbuf2 = tmpbuf2->next();
+ }
+#endif
// make sure there is no class difference
SwitchLayoutsBetweenClasses(textclass, tc, buf);
// find the end of the buffer
LyXParagraph * lastbuffer = buf;
- while (lastbuffer->Next())
- lastbuffer = lastbuffer->Next();
+ while (lastbuffer->next())
+ lastbuffer = lastbuffer->next();
bool paste_the_end = false;
+#ifndef NEW_INSETS
// open the paragraph for inserting the buf
// if necessary
- if (((*par)->Last() > pos) || !(*par)->Next()) {
+ if (((*par)->Last() > pos) || !(*par)->next()) {
(*par)->BreakParagraphConservative(current_view->buffer()->params,
pos);
paste_the_end = true;
}
-
// set the end for redoing later
-#ifndef NEW_INSETS
- *endpar = (*par)->ParFromPos(pos)->next->Next();
+ *endpar = (*par)->ParFromPos(pos)->next_->next();
// paste it!
- lastbuffer->ParFromPos(lastbuffer->Last())->next =
- (*par)->ParFromPos(pos)->next;
- (*par)->ParFromPos(pos)->next->previous =
- lastbuffer->ParFromPos(lastbuffer->Last());
+ lastbuffer->ParFromPos(lastbuffer->Last())->next(
+ (*par)->ParFromPos(pos)->next_);
+ (*par)->ParFromPos(pos)->next()->previous(
+ lastbuffer->ParFromPos(lastbuffer->Last()));
- (*par)->ParFromPos(pos)->next = buf;
- buf->previous = (*par)->ParFromPos(pos);
+ (*par)->ParFromPos(pos)->next(buf);
+ buf->previous((*par)->ParFromPos(pos));
- if ((*par)->ParFromPos(pos)->Next() == lastbuffer)
+ if ((*par)->ParFromPos(pos)->next() == lastbuffer)
lastbuffer = *par;
(*par)->ParFromPos(pos)->PasteParagraph(current_view->buffer()->params);
+ // store the new cursor position
+ *par = lastbuffer;
+ pos = lastbuffer->Last();
+ // maybe some pasting
+ if (lastbuffer->next() && paste_the_end) {
+ if (lastbuffer->next()->HasSameLayout(lastbuffer)) {
+ lastbuffer->ParFromPos(lastbuffer->Last())->PasteParagraph(current_view->buffer()->params);
+ } else if (!lastbuffer->next()->Last()) {
+ lastbuffer->next()->MakeSameLayout(lastbuffer);
+ lastbuffer->ParFromPos(lastbuffer->Last())->PasteParagraph(current_view->buffer()->params);
+ } else if (!lastbuffer->Last()) {
+ lastbuffer->MakeSameLayout(lastbuffer->next_);
+ lastbuffer->ParFromPos(lastbuffer->Last())->PasteParagraph(current_view->buffer()->params);
+ } else
+ lastbuffer->next()->StripLeadingSpaces(tc);
+ }
+ // restore the simple cut buffer
+ buf = simple_cut_clone;
+ }
#else
- *endpar = (*par)->next->Next();
+ // open the paragraph for inserting the buf
+ // if necessary
+ if (((*par)->size() > pos) || !(*par)->next()) {
+ (*par)->BreakParagraphConservative(current_view->buffer()->params,
+ pos);
+ paste_the_end = true;
+ }
+ // set the end for redoing later
+ *endpar = (*par)->next()->next();
// paste it!
- lastbuffer->next = (*par)->next;
- (*par)->next->previous = lastbuffer;
+ lastbuffer->next((*par)->next());
+ (*par)->next()->previous(lastbuffer);
- (*par)->next = buf;
- buf->previous = (*par);
+ (*par)->next(buf);
+ buf->previous(*par);
- if ((*par)->Next() == lastbuffer)
+ if ((*par)->next() == lastbuffer)
lastbuffer = *par;
(*par)->PasteParagraph(current_view->buffer()->params);
-#endif
// store the new cursor position
*par = lastbuffer;
- pos = lastbuffer->Last();
-
+ pos = lastbuffer->size();
// maybe some pasting
- if (lastbuffer->Next() && paste_the_end) {
-#ifndef NEW_INSETS
- if (lastbuffer->Next()->HasSameLayout(lastbuffer)) {
- lastbuffer->ParFromPos(lastbuffer->Last())->PasteParagraph(current_view->buffer()->params);
- } else if (!lastbuffer->Next()->Last()) {
- lastbuffer->Next()->MakeSameLayout(lastbuffer);
- lastbuffer->ParFromPos(lastbuffer->Last())->PasteParagraph(current_view->buffer()->params);
- } else if (!lastbuffer->Last()) {
- lastbuffer->MakeSameLayout(lastbuffer->next);
- lastbuffer->ParFromPos(lastbuffer->Last())->PasteParagraph(current_view->buffer()->params);
-#else
- if (lastbuffer->Next()->HasSameLayout(lastbuffer)) {
+ if (lastbuffer->next() && paste_the_end) {
+ if (lastbuffer->next()->HasSameLayout(lastbuffer)) {
lastbuffer->PasteParagraph(current_view->buffer()->params);
- } else if (!lastbuffer->Next()->Last()) {
- lastbuffer->Next()->MakeSameLayout(lastbuffer);
+ } else if (!lastbuffer->next()->size()) {
+ lastbuffer->next()->MakeSameLayout(lastbuffer);
lastbuffer->PasteParagraph(current_view->buffer()->params);
- } else if (!lastbuffer->Last()) {
- lastbuffer->MakeSameLayout(lastbuffer->next);
+ } else if (!lastbuffer->size()) {
+ lastbuffer->MakeSameLayout(lastbuffer->next());
lastbuffer->PasteParagraph(current_view->buffer()->params);
-#endif
} else
- lastbuffer->Next()->StripLeadingSpaces(tc);
+ lastbuffer->next()->StripLeadingSpaces(tc);
}
// restore the simple cut buffer
buf = simple_cut_clone;
}
+#endif
return true;
}
int n = 1;
LyXParagraph * tmppar = buf;
- while(tmppar->next) {
+#ifndef NEW_INSETS
+ while(tmppar->next_) {
++n;
- tmppar = tmppar->next;
+ tmppar = tmppar->next_;
}
+#else
+ while(tmppar->next()) {
+ ++n;
+ tmppar = tmppar->next();
+ }
+#endif
return n;
}
InsetError * new_inset = new InsetError(s);
par->InsertInset(0, new_inset);
}
-
- par = par->next;
+#ifndef NEW_INSETS
+ par = par->next_;
+#else
+ par = par->next();
+#endif
}
return ret;
}
-bool CutAndPaste::checkPastePossible(LyXParagraph * par, int)
+bool CutAndPaste::checkPastePossible(LyXParagraph * par)
{
if (!buf) return false;
// check whether the cut_buffer includes a footnote
LyXParagraph * tmppar = buf;
while (tmppar && tmppar->footnoteflag == LyXParagraph::NO_FOOTNOTE)
- tmppar = tmppar->next;
+ tmppar = tmppar->next_;
if (tmppar) {
WriteAlert(_("Impossible operation"),
return false;
}
}
-#endif
-#ifndef NEW_TABULAR
- /* table stuff -- begin */
- if (par->table) {
- if (buf->next) {
- WriteAlert(_("Impossible operation"),
- _("Table cell cannot include more than one paragraph!"),
- _("Sorry."));
- return false;
- }
- }
- /* table stuff -- end */
#endif
return true;
}
projects / lyx.git / blobdiff