#include <config.h>
#include "CutAndPaste.h"
+#include "BufferView.h"
+#include "buffer.h"
#include "lyxparagraph.h"
#include "insets/inseterror.h"
#include "lyx_gui_misc.h"
+#include "lyxcursor.h"
#ifdef __GNUG__
#pragma implementation
using std::pair;
+extern BufferView * current_view;
+
// Jürgen, note that this means that you cannot currently have a list
// of selections cut/copied. So IMHO later we should have a
// list/vector/deque that we could store
// in and some method of choosing beween them (based on the first few chars
// in the selection probably.) This would be a nice feature and quite
// easy to implement. (Lgb)
+//
+// Sure but I just cleaned up this code for now with the same functionality
+// as before. I also want to add a XClipboard function so that we can copy
+// text from LyX to some other X-application in the form of ASCII or in the
+// form of LaTeX (or Docbook depending on the document-class!). Think how nice
+// it could be to select a math-inset do a "Copy to X-Clipboard as LaTeX" and
+// then do a middle mouse button click in the application you want and have
+// the whole formula there in LaTeX-Code. (Jug)
static LyXParagraph * buf = 0;
-static LyXTextClassList::size_type textclass;
+static LyXTextClassList::size_type textclass = 0;
// for now here this should be in another Cut&Paste Class!
// Jürgen, I moved this out of CutAndPaste since it does not operate on any
static
void DeleteBuffer()
{
- if (!buf) return;
+ if (!buf)
+ return;
- LyXParagraph * tmppar;
+ LyXParagraph * tmppar;
- while (buf) {
- tmppar = buf;
- buf = buf->next;
- delete tmppar;
- }
- buf = 0;
+ while (buf) {
+ tmppar = buf;
+ buf = buf->next;
+ delete tmppar;
+ }
+ buf = 0;
}
if (end > startpar->Last())
end = startpar->Last();
for (; i < end; ++i) {
- startpar->CopyIntoMinibuffer(start);
+ 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
buf->InsertFromMinibuffer(buf->Last());
}
} else {
// more than one paragraph
- (*endpar)->BreakParagraphConservative(end);
+ (*endpar)->BreakParagraphConservative(current_view->buffer()->params,
+ end);
*endpar = (*endpar)->Next();
end = 0;
- startpar->BreakParagraphConservative(start);
+ startpar->BreakParagraphConservative(current_view->buffer()->params,
+ start);
// store the selection
buf = startpar->ParFromPos(start)->next;
// paste the paragraphs again, if possible
if (doclear)
- startpar->Next()->ClearParagraph();
+ startpar->Next()->StripLeadingSpaces(textclass);
if (startpar->FirstPhysicalPar()->HasSameLayout(startpar->Next()) ||
- !startpar->Next()->Last())
- startpar->ParFromPos(start)->PasteParagraph();
+ !startpar->Next()->Last()) {
+ startpar->ParFromPos(start)->PasteParagraph(current_view->buffer()->params);
+ (*endpar) = startpar; // this because endpar gets deleted here!
+ }
}
return true;
}
if (end > startpar->Last())
end = startpar->Last();
for (; i < end; ++i) {
- startpar->CopyIntoMinibuffer(i);
+ startpar->CopyIntoMinibuffer(current_view->buffer()->params, i);
buf->InsertFromMinibuffer(buf->Last());
}
} else {
if (!buf->next) {
// only within a paragraph
tmpbuf = buf->Clone();
+#ifndef NEW_TABULAR
/* table stuff -- begin */
bool table_too_small = false;
if ((*par)->table) {
if (!tmppos && buf->IsLineSeparator(0)) {
buf->Erase(0);
} else {
- buf->CutIntoMinibuffer(0);
+ 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
if (!tmppos && buf->IsLineSeparator(0)) {
buf->Erase(0);
} else {
- buf->CutIntoMinibuffer(0);
+ 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();
// open the paragraph for inserting the buf
// if necessary
if (((*par)->Last() > pos) || !(*par)->Next()) {
- (*par)->BreakParagraphConservative(pos);
+ (*par)->BreakParagraphConservative(current_view->buffer()->params,
+ pos);
paste_the_end = true;
}
if ((*par)->ParFromPos(pos)->Next() == lastbuffer)
lastbuffer = *par;
- (*par)->ParFromPos(pos)->PasteParagraph();
+ (*par)->ParFromPos(pos)->PasteParagraph(current_view->buffer()->params);
// store the new cursor position
- tmppar = lastbuffer;
- tmppos = lastbuffer->Last();
+ *par = lastbuffer;
+ pos = lastbuffer->Last();
// maybe some pasting
if (lastbuffer->Next() && paste_the_end) {
if (lastbuffer->Next()->HasSameLayout(lastbuffer)) {
- lastbuffer->ParFromPos(lastbuffer->Last())->PasteParagraph();
+ lastbuffer->ParFromPos(lastbuffer->Last())->PasteParagraph(current_view->buffer()->params);
} else if (!lastbuffer->Next()->Last()) {
lastbuffer->Next()->MakeSameLayout(lastbuffer);
- lastbuffer->ParFromPos(lastbuffer->Last())->PasteParagraph();
+ lastbuffer->ParFromPos(lastbuffer->Last())->PasteParagraph(current_view->buffer()->params);
} else if (!lastbuffer->Last()) {
lastbuffer->MakeSameLayout(lastbuffer->next);
- lastbuffer->ParFromPos(lastbuffer->Last())->PasteParagraph();
+ lastbuffer->ParFromPos(lastbuffer->Last())->PasteParagraph(current_view->buffer()->params);
} else
- lastbuffer->Next()->ClearParagraph();
+ lastbuffer->Next()->StripLeadingSpaces(tc);
}
// restore the simple cut buffer
buf = simple_cut_clone;
- pos = tmppos;
}
return true;
if (name != textclasslist.NameOfLayout(c2, par->layout)) {
++ret;
- string s = "Layout had to be changed from\n"
- + name + " to "
- + textclasslist.NameOfLayout(c2, par->layout)
- + "\nbecause of class conversion from\n"
- + textclasslist.NameOfClass(c1) + " to "
- + textclasslist.NameOfClass(c2);
+ string s = _("Layout had to be changed from\n")
+ + name + _(" to ")
+ + textclasslist.NameOfLayout(c2, par->layout)
+ + _("\nbecause of class conversion from\n")
+ + textclasslist.NameOfClass(c1) + _(" to ")
+ + textclasslist.NameOfClass(c2);
InsetError * new_inset = new InsetError(s);
+#ifdef NEW_WAY
+ par->InsertInset(0, new_inset);
+#else
par->InsertChar(0, LyXParagraph::META_INSET);
par->InsertInset(0, new_inset);
+#endif
}
par = par->next;
return false;
}
}
+#ifndef NEW_TABULAR
/* table stuff -- begin */
if (par->table) {
if (buf->next) {
}
}
/* table stuff -- end */
+#endif
return true;
}
projects / features.git / blobdiff