#include "Buffer.h"
#include "buffer_funcs.h"
#include "BufferParams.h"
-#include "LCursor.h"
+#include "BufferView.h"
+#include "Cursor.h"
#include "debug.h"
#include "ErrorList.h"
#include "FuncRequest.h"
#include "lfuns.h"
#include "LyXFunc.h"
#include "LyXRC.h"
-#include "LyXText.h"
-#include "LyXTextClassList.h"
+#include "Text.h"
+#include "TextClassList.h"
#include "Paragraph.h"
#include "paragraph_funcs.h"
#include "ParagraphParameters.h"
#include "insets/InsetCharStyle.h"
#include "insets/InsetTabular.h"
-#include "mathed/MathArray.h"
+#include "mathed/MathData.h"
#include "mathed/InsetMath.h"
#include "mathed/MathSupport.h"
void region(CursorSlice const & i1, CursorSlice const & i2,
- InsetBase::row_type & r1, InsetBase::row_type & r2,
- InsetBase::col_type & c1, InsetBase::col_type & c2)
+ Inset::row_type & r1, Inset::row_type & r2,
+ Inset::col_type & c1, Inset::col_type & c2)
{
- InsetBase & p = i1.inset();
+ Inset & p = i1.inset();
c1 = p.col(i1.idx());
c2 = p.col(i2.idx());
if (c1 > c2)
pair<PitPosPair, pit_type>
-pasteSelectionHelper(LCursor & cur, ParagraphList const & parlist,
+pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
textclass_type textclass, ErrorList & errorlist)
{
Buffer const & buffer = cur.buffer();
// Convert newline to paragraph break in ERT inset.
// This should not be here!
if (pars[pit].inInset() &&
- pars[pit].inInset()->lyxCode() == InsetBase::ERT_CODE) {
+ (pars[pit].inInset()->lyxCode() == Inset::ERT_CODE ||
+ pars[pit].inInset()->lyxCode() == Inset::LISTINGS_CODE)) {
for (ParagraphList::size_type i = 0; i < insertion.size(); ++i) {
for (pos_type j = 0; j < insertion[i].size(); ++j) {
if (insertion[i].isNewline(j)) {
// If we are in an inset which returns forceDefaultParagraphs,
// set the paragraphs to default
if (cur.inset().forceDefaultParagraphs(cur.idx())) {
- LyXLayout_ptr const layout =
- buffer.params().getLyXTextClass().defaultLayout();
+ Layout_ptr const layout =
+ buffer.params().getTextClass().defaultLayout();
ParagraphList::iterator const end = insertion.end();
- for (ParagraphList::iterator par = insertion.begin();
+ for (ParagraphList::iterator par = insertion.begin();
par != end; ++par)
par->layout(layout);
}
}
tmpbuf->setChange(Change(buffer.params().trackChanges ?
- Change::INSERTED : Change::UNCHANGED));
+ Change::INSERTED : Change::UNCHANGED));
}
bool const empty = pars[pit].empty();
for (; lit != eit; ++lit) {
switch (lit->inset->lyxCode()) {
- case InsetBase::TABULAR_CODE: {
+ case Inset::TABULAR_CODE: {
InsetTabular * it = static_cast<InsetTabular*>(lit->inset);
it->buffer(&buffer);
break;
for (pit_type pit = startpit; pit != endpit + 1;) {
pos_type const left = (pit == startpit ? startpos : 0);
- pos_type const right = (pit == endpit ? endpos : pars[pit].size() + 1);
+ pos_type right = (pit == endpit ? endpos : pars[pit].size() + 1);
+ // FIXME: this is a quick fix for bug 3600. It stops a crash but the problem
+ // still remains unsolved (e.g. the second example in the bug report).
+ // c.f. http://bugzilla.lyx.org/show_bug.cgi?id=3600
+ if (right > pars[pit].size() + 1)
+ right = pars[pit].size() + 1;
bool const merge = pars[pit].isMergedOnEndOfParDeletion(params.trackChanges);
void putClipboard(ParagraphList const & paragraphs, textclass_type textclass,
- docstring const & plaintext)
+ docstring const & plaintext)
{
// For some strange reason gcc 3.2 and 3.3 do not accept
// Buffer buffer(string(), false);
ParagraphList copy_pars(boost::next(pars.begin(), startpit),
boost::next(pars.begin(), endpit + 1));
- // Remove the end of the last paragraph; afterwards, remove the beginning
- // of the first paragraph. Keep this order - there may only be one paragraph!
- // Do not track deletions here; this is an internal action not visible to the user
+ // Remove the end of the last paragraph; afterwards, remove the
+ // beginning of the first paragraph. Keep this order - there may only
+ // be one paragraph! Do not track deletions here; this is an internal
+ // action not visible to the user
+
Paragraph & back = copy_pars.back();
back.eraseChars(end, back.size(), false);
Paragraph & front = copy_pars.front();
// ERT paragraphs have the Language latex_language.
// This is invalid outside of ERT, so we need to change it
// to the buffer language.
- if (it->ownerCode() == InsetBase::ERT_CODE) {
+ if (it->ownerCode() == Inset::ERT_CODE || it->ownerCode() == Inset::LISTINGS_CODE) {
it->changeLanguage(buf.params(), latex_language,
- buf.getLanguage());
+ buf.getLanguage());
}
it->setInsetOwner(0);
}
// do not copy text (also nested in insets) which is marked as deleted
- // acceptChanges() is defined for LyXText rather than ParagraphList
- // Thus we must wrap copy_pars into a LyXText object and cross our fingers
- LyXText lt;
- copy_pars.swap(lt.paragraphs());
- lt.acceptChanges(buf.params());
- copy_pars.swap(lt.paragraphs());
+ acceptChanges(copy_pars, buf.params());
cutstack.push(make_pair(copy_pars, tc));
}
namespace cap {
-docstring grabAndEraseSelection(LCursor & cur)
+docstring grabAndEraseSelection(Cursor & cur)
{
if (!cur.selection())
return docstring();
void switchBetweenClasses(textclass_type c1, textclass_type c2,
InsetText & in, ErrorList & errorlist)
{
+ errorlist.clear();
+
BOOST_ASSERT(!in.paragraphs().empty());
if (c1 == c2)
return;
- LyXTextClass const & tclass1 = textclasslist[c1];
- LyXTextClass const & tclass2 = textclasslist[c2];
+ TextClass const & tclass1 = textclasslist[c1];
+ TextClass const & tclass2 = textclasslist[c2];
// layouts
ParIterator end = par_iterator_end(in);
for (ParIterator it = par_iterator_begin(in); it != end; ++it) {
- string const name = it->layout()->name();
+ docstring const name = it->layout()->name();
bool hasLayout = tclass2.hasLayout(name);
if (hasLayout)
docstring const s = bformat(
_("Layout had to be changed from\n%1$s to %2$s\n"
"because of class conversion from\n%3$s to %4$s"),
- from_utf8(name), from_utf8(it->layout()->name()),
+ name, it->layout()->name(),
from_utf8(tclass1.name()), from_utf8(tclass2.name()));
// To warn the user that something had to be done.
errorlist.push_back(ErrorItem(_("Changed Layout"), s,
// character styles
InsetIterator const i_end = inset_iterator_end(in);
for (InsetIterator it = inset_iterator_begin(in); it != i_end; ++it) {
- if (it->lyxCode() == InsetBase::CHARSTYLE_CODE) {
+ if (it->lyxCode() == Inset::CHARSTYLE_CODE) {
InsetCharStyle & inset =
static_cast<InsetCharStyle &>(*it);
string const name = inset.params().type;
asciiSel += pit->asString(buffer, false);
if (asciiSel.size() > 25) {
asciiSel.replace(22, docstring::npos,
- from_ascii("..."));
+ from_ascii("..."));
break;
}
}
}
-void cutSelection(LCursor & cur, bool doclear, bool realcut)
+void cutSelection(Cursor & cur, bool doclear, bool realcut)
{
// This doesn't make sense, if there is no selection
if (!cur.selection())
// and cur.selEnd()
if (cur.inTexted()) {
- LyXText * text = cur.text();
+ Text * text = cur.text();
BOOST_ASSERT(text);
+ saveSelection(cur);
+
// make sure that the depth behind the selection are restored, too
recordUndoSelection(cur);
pit_type begpit = cur.selBegin().pit();
cur.pit() = endpit;
// sometimes necessary
- if (doclear
+ if (doclear
&& text->paragraphs()[begpit].stripLeadingSpaces(bp.trackChanges))
cur.fixIfBroken();
// need a valid cursor. (Lgb)
cur.clearSelection();
updateLabels(cur.buffer());
- theSelection().haveSelection(false);
// tell tabular that a recent copy happened
dirtyTabularStack(false);
}
-void copySelection(LCursor & cur)
+void copySelection(Cursor & cur)
{
copySelection(cur, cur.selectionAsString(true));
}
namespace {
-void copySelectionToStack(LCursor & cur, CutStack & cutstack)
+void copySelectionToStack(Cursor & cur, CutStack & cutstack)
{
// this doesn't make sense, if there is no selection
if (!cur.selection())
return;
+ // copySelection can not yet handle the case of cross idx selection
+ if (cur.selBegin().idx() != cur.selEnd().idx())
+ return;
+
if (cur.inTexted()) {
- LyXText * text = cur.text();
+ Text * text = cur.text();
BOOST_ASSERT(text);
// ok we have a selection. This is always between cur.selBegin()
// and sel_end cursor
copySelectionHelper(cur.buffer(), pars, par, cur.selEnd().pit(),
pos, cur.selEnd().pos(), cur.buffer().params().textclass, cutstack);
+ dirtyTabularStack(false);
}
if (cur.inMathed()) {
ParagraphList pars;
Paragraph par;
BufferParams const & bp = cur.buffer().params();
- par.layout(bp.getLyXTextClass().defaultLayout());
- par.insert(0, grabSelection(cur), LyXFont(), Change(Change::UNCHANGED));
+ par.layout(bp.getTextClass().defaultLayout());
+ par.insert(0, grabSelection(cur), Font(), Change(Change::UNCHANGED));
pars.push_back(par);
cutstack.push(make_pair(pars, bp.textclass));
}
}
-void copySelection(LCursor & cur, docstring const & plaintext)
+void copySelection(Cursor & cur, docstring const & plaintext)
{
// In tablemode, because copy and paste actually use special table stack
- // we do not attemp to get selected paragraphs under cursor. Instead, a
+ // we do not attemp to get selected paragraphs under cursor. Instead, a
// paragraph with the plain text version is generated so that table cells
// can be pasted as pure text somewhere else.
if (cur.selBegin().idx() != cur.selEnd().idx()) {
ParagraphList pars;
Paragraph par;
BufferParams const & bp = cur.buffer().params();
- par.layout(bp.getLyXTextClass().defaultLayout());
- par.insert(0, plaintext, LyXFont(), Change(Change::UNCHANGED));
+ par.layout(bp.getTextClass().defaultLayout());
+ par.insert(0, plaintext, Font(), Change(Change::UNCHANGED));
pars.push_back(par);
theCuts.push(make_pair(pars, bp.textclass));
} else
}
-void saveSelection(LCursor & cur)
+void saveSelection(Cursor & cur)
{
- LYXERR(Debug::ACTION) << BOOST_CURRENT_FUNCTION << ": `"
- << to_utf8(cur.selectionAsString(true)) << "'."
- << endl;
-
- if (cur.selection())
+ // This function is called, not when a selection is formed, but when
+ // a selection is cleared. Therefore, multiple keyboard selection
+ // will not repeatively trigger this function (bug 3877).
+ if (cur.selection()
+ && cur.selBegin() == cur.bv().cursor().selBegin()
+ && cur.selEnd() == cur.bv().cursor().selEnd()) {
+ LYXERR(Debug::ACTION) << BOOST_CURRENT_FUNCTION << ": `"
+ << to_utf8(cur.selectionAsString(true)) << "'."
+ << endl;
copySelectionToStack(cur, selectionBuffer);
- // tell X whether we now have a valid selection
- theSelection().haveSelection(cur.selection());
+ }
}
}
-void pasteParagraphList(LCursor & cur, ParagraphList const & parlist,
+void pasteParagraphList(Cursor & cur, ParagraphList const & parlist,
textclass_type textclass, ErrorList & errorList)
{
if (cur.inTexted()) {
- LyXText * text = cur.text();
+ Text * text = cur.text();
BOOST_ASSERT(text);
pit_type endpit;
textclass, errorList);
updateLabels(cur.buffer());
cur.clearSelection();
- text->setCursor(cur.top(), ppp.first, ppp.second);
+ text->setCursor(cur, ppp.first, ppp.second);
}
// mathed is handled in InsetMathNest/InsetMathGrid
}
-void pasteFromStack(LCursor & cur, ErrorList & errorList, size_t sel_index)
+void pasteFromStack(Cursor & cur, ErrorList & errorList, size_t sel_index)
{
// this does not make sense, if there is nothing to paste
if (!checkPastePossible(sel_index))
pasteParagraphList(cur, theCuts[sel_index].first,
theCuts[sel_index].second, errorList);
cur.setSelection();
- saveSelection(cur);
}
-void pasteClipboard(LCursor & cur, ErrorList & errorList, bool asParagraphs)
+void pasteClipboard(Cursor & cur, ErrorList & errorList, bool asParagraphs)
{
// Use internal clipboard if it is the most recent one
if (theClipboard().isInternal()) {
}
-void pasteSelection(LCursor & cur, ErrorList & errorList)
+void pasteSelection(Cursor & cur, ErrorList & errorList)
{
if (selectionBuffer.empty())
return;
recordUndo(cur);
pasteParagraphList(cur, selectionBuffer[0].first,
- selectionBuffer[0].second, errorList);
- cur.setSelection();
+ selectionBuffer[0].second, errorList);
}
-void replaceSelectionWithString(LCursor & cur, docstring const & str, bool backwards)
+void replaceSelectionWithString(Cursor & cur, docstring const & str, bool backwards)
{
recordUndo(cur);
DocIterator selbeg = cur.selectionBegin();
// Get font setting before we cut
- LyXFont const font =
+ Font const font =
selbeg.paragraph().getFontSettings(cur.buffer().params(), selbeg.pos());
// Insert the new string
cur.setSelection(selbeg, -int(str.length()));
} else
cur.setSelection(selbeg, str.length());
- saveSelection(cur);
}
-void replaceSelection(LCursor & cur)
+void replaceSelection(Cursor & cur)
{
if (cur.selection())
cutSelection(cur, true, false);
}
-void eraseSelection(LCursor & cur)
+void eraseSelection(Cursor & cur)
{
//lyxerr << "cap::eraseSelection begin: " << cur << endl;
CursorSlice const & i1 = cur.selBegin();
CursorSlice const & i2 = cur.selEnd();
if (i1.inset().asInsetMath()) {
+ saveSelection(cur);
cur.top() = i1;
if (i1.idx() == i2.idx()) {
i1.cell().erase(i1.pos(), i2.pos());
cur.pos() = cur.lastpos();
} else {
InsetMath * p = i1.asInsetMath();
- InsetBase::row_type r1, r2;
- InsetBase::col_type c1, c2;
+ Inset::row_type r1, r2;
+ Inset::col_type c1, c2;
region(i1, i2, r1, r2, c1, c2);
- for (InsetBase::row_type row = r1; row <= r2; ++row)
- for (InsetBase::col_type col = c1; col <= c2; ++col)
+ for (Inset::row_type row = r1; row <= r2; ++row)
+ for (Inset::col_type col = c1; col <= c2; ++col)
p->cell(p->index(row, col)).clear();
// We've deleted the whole cell. Only pos 0 is valid.
cur.pos() = 0;
}
// need a valid cursor. (Lgb)
cur.clearSelection();
- theSelection().haveSelection(false);
} else {
lyxerr << "can't erase this selection 1" << endl;
}
}
-void selDel(LCursor & cur)
+void selDel(Cursor & cur)
{
//lyxerr << "cap::selDel" << endl;
if (cur.selection())
}
-void selClearOrDel(LCursor & cur)
+void selClearOrDel(Cursor & cur)
{
//lyxerr << "cap::selClearOrDel" << endl;
if (lyxrc.auto_region_delete)
}
-docstring grabSelection(LCursor const & cur)
+docstring grabSelection(Cursor const & cur)
{
if (!cur.selection())
return docstring();
if (i1.idx() == i2.idx()) {
if (i1.inset().asInsetMath()) {
- MathArray::const_iterator it = i1.cell().begin();
- return asString(MathArray(it + i1.pos(), it + i2.pos()));
+ MathData::const_iterator it = i1.cell().begin();
+ return asString(MathData(it + i1.pos(), it + i2.pos()));
} else {
return from_ascii("unknown selection 1");
}
}
- InsetBase::row_type r1, r2;
- InsetBase::col_type c1, c2;
+ Inset::row_type r1, r2;
+ Inset::col_type c1, c2;
region(i1, i2, r1, r2, c1, c2);
docstring data;
if (i1.inset().asInsetMath()) {
- for (InsetBase::row_type row = r1; row <= r2; ++row) {
+ for (Inset::row_type row = r1; row <= r2; ++row) {
if (row > r1)
data += "\\\\";
- for (InsetBase::col_type col = c1; col <= c2; ++col) {
+ for (Inset::col_type col = c1; col <= c2; ++col) {
if (col > c1)
data += '&';
data += asString(i1.asInsetMath()->
projects / lyx.git / blobdiff