textclass = tc;
- if (!(*endpar) || (startpar->ParFromPos(start) ==
- (*endpar)->ParFromPos(end))) {
+ if (!(*endpar) ||
+#ifndef NEW_INSETS
+ (startpar->ParFromPos(start) ==
+ (*endpar)->ParFromPos(end))
+#else
+ (startpar == (*endpar))
+#endif
+ ) {
// only within one paragraph
buf = new LyXParagraph;
LyXParagraph::size_type i = start;
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
- }
-#endif
+ startpar->CopyIntoMinibuffer(*current_view->buffer(), start);
+ startpar->Erase(start);
+
buf->InsertFromMinibuffer(buf->Last());
}
+ end = start-1;
} else {
// more than one paragraph
(*endpar)->BreakParagraphConservative(current_view->buffer()->params,
start);
// store the selection
+#ifndef NEW_INSETS
buf = startpar->ParFromPos(start)->next;
+#else
+ buf = startpar->next;
+#endif
buf->previous = 0;
(*endpar)->previous->next = 0;
// cut the selection
+#ifndef NEW_INSETS
startpar->ParFromPos(start)->next = (*endpar);
(*endpar)->previous = startpar->ParFromPos(start);
+#else
+ startpar->next = (*endpar);
+
+ (*endpar)->previous = startpar;
+#endif
+#ifndef NEW_INSETS
// care about footnotes
if (buf->footnoteflag) {
LyXParagraph * tmppar = buf;
tmppar = tmppar->next;
}
}
+#endif
// the cut selection should begin with standard layout
buf->Clear();
// paste the paragraphs again, if possible
if (doclear)
startpar->Next()->StripLeadingSpaces(textclass);
- if (startpar->FirstPhysicalPar()->HasSameLayout(startpar->Next()) ||
+#ifndef NEW_INSETS
+ if (startpar->FirstPhysicalPar()->HasSameLayout(startpar->Next()) ||
+#else
+ if (startpar->HasSameLayout(startpar->Next()) ||
+#endif
!startpar->Next()->Last()) {
+#ifndef NEW_INSETS
startpar->ParFromPos(start)->PasteParagraph(current_view->buffer()->params);
+#else
+ startpar->PasteParagraph(current_view->buffer()->params);
+#endif
(*endpar) = startpar; // this because endpar gets deleted here!
}
}
textclass = tc;
- if (!(endpar) || (startpar->ParFromPos(start) ==
- (endpar)->ParFromPos(end))) {
+ if (!(endpar) ||
+#ifndef NEW_INSETS
+ (startpar->ParFromPos(start) ==
+ (endpar)->ParFromPos(end))
+#else
+ (startpar == endpar)
+#endif
+ ) {
// only within one paragraph
buf = new LyXParagraph;
LyXParagraph::size_type i = start;
if (end > startpar->Last())
end = startpar->Last();
for (; i < end; ++i) {
- startpar->CopyIntoMinibuffer(current_view->buffer()->params, i);
+ startpar->CopyIntoMinibuffer(*current_view->buffer(), i);
buf->InsertFromMinibuffer(buf->Last());
}
} else {
// copy more than one paragraph
// clone the paragraphs within the selection
- LyXParagraph *tmppar = startpar->ParFromPos(start);
+#ifndef NEW_INSETS
+ LyXParagraph * tmppar = startpar->ParFromPos(start);
+#else
+ LyXParagraph * tmppar = startpar;
+#endif
buf = tmppar->Clone();
- LyXParagraph *tmppar2 = buf;
+ LyXParagraph * tmppar2 = buf;
- while (tmppar != endpar->ParFromPos(end)
+ while (
+#ifndef NEW_INSETS
+ tmppar != endpar->ParFromPos(end)
+#else
+ tmppar != endpar
+#endif
&& tmppar->next) {
tmppar = tmppar->next;
tmppar2->next = tmppar->Clone();
}
tmppar2->next = 0;
+#ifndef NEW_INSETS
// care about footnotes
if (buf->footnoteflag) {
tmppar = buf;
tmppar = tmppar->next;
}
}
+#endif
// the buf paragraph is too big
+#ifndef NEW_INSETS
LyXParagraph::size_type tmpi2 = startpar->PositionInParFromPos(start);
+#else
+ LyXParagraph::size_type tmpi2 = start;
+#endif
for (; tmpi2; --tmpi2)
buf->Erase(0);
// now tmppar 2 is too big, delete all after end
-
+#ifndef NEW_INSETS
tmpi2 = endpar->PositionInParFromPos(end);
+#else
+ tmpi2 = end;
+#endif
while (tmppar2->size() > tmpi2) {
tmppar2->Erase(tmppar2->size() - 1);
}
if (!buf->next) {
// 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();
tmpbuf = buf;
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){
tmpbuf->footnoteflag = (*par)->footnoteflag;
tmpbuf->footnotekind = (*par)->footnotekind;
}
+#endif
}
// make sure there is no class difference
}
// set the end for redoing later
+#ifndef NEW_INSETS
*endpar = (*par)->ParFromPos(pos)->next->Next();
// paste it!
lastbuffer = *par;
(*par)->ParFromPos(pos)->PasteParagraph(current_view->buffer()->params);
+#else
+ *endpar = (*par)->next->Next();
+
+ // paste it!
+ lastbuffer->next = (*par)->next;
+ (*par)->next->previous = lastbuffer;
+
+ (*par)->next = buf;
+ buf->previous = (*par);
+
+ if ((*par)->Next() == lastbuffer)
+ lastbuffer = *par;
+ (*par)->PasteParagraph(current_view->buffer()->params);
+#endif
// store the new cursor position
*par = lastbuffer;
pos = lastbuffer->Last();
// 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()) {
} else if (!lastbuffer->Last()) {
lastbuffer->MakeSameLayout(lastbuffer->next);
lastbuffer->ParFromPos(lastbuffer->Last())->PasteParagraph(current_view->buffer()->params);
+#else
+ if (lastbuffer->Next()->HasSameLayout(lastbuffer)) {
+ lastbuffer->PasteParagraph(current_view->buffer()->params);
+ } else if (!lastbuffer->Next()->Last()) {
+ lastbuffer->Next()->MakeSameLayout(lastbuffer);
+ lastbuffer->PasteParagraph(current_view->buffer()->params);
+ } else if (!lastbuffer->Last()) {
+ lastbuffer->MakeSameLayout(lastbuffer->next);
+ lastbuffer->PasteParagraph(current_view->buffer()->params);
+#endif
} else
lastbuffer->Next()->StripLeadingSpaces(tc);
}
}
-int CutAndPaste::nrOfParagraphs() const
+int CutAndPaste::nrOfParagraphs()
{
if (!buf) return 0;
int ret = 0;
if (!par || c1 == c2)
return ret;
+#ifndef NEW_INSETS
par = par->FirstPhysicalPar();
+#endif
while (par) {
string name = textclasslist.NameOfLayout(c1, par->layout);
int lay = 0;
}
-bool CutAndPaste::checkPastePossible(LyXParagraph * par, int) const
+bool CutAndPaste::checkPastePossible(LyXParagraph * par, int)
{
if (!buf) return false;
- LyXParagraph * tmppar;
-
+#ifndef NEW_INSETS
// be carefull with footnotes in footnotes
if (par->footnoteflag != LyXParagraph::NO_FOOTNOTE) {
// check whether the cut_buffer includes a footnote
- tmppar = buf;
+ LyXParagraph * tmppar = buf;
while (tmppar && tmppar->footnoteflag == LyXParagraph::NO_FOOTNOTE)
tmppar = tmppar->next;
return false;
}
}
-#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