#include "errorlist.h"
#include "funcrequest.h"
#include "gettext.h"
+#include "insetiterator.h"
#include "lfuns.h"
#include "lyxrc.h"
#include "lyxtext.h"
#include "pariterator.h"
#include "undo.h"
+#include "insets/insetcharstyle.h"
#include "insets/insettabular.h"
#include "mathed/math_data.h"
CutStack theCuts(10);
-struct resetOwnerAndChanges : public std::unary_function<Paragraph, void> {
+// store whether the tabular stack is newer than the normal copy stack
+// FIXME: this is a workaround for bug 1919. Should be removed for 1.5,
+// when we (hopefully) have a one-for-all paste mechanism.
+bool dirty_tabular_stack_;
+
+class resetOwnerAndChanges : public std::unary_function<Paragraph, void> {
+public:
void operator()(Paragraph & p) const {
p.cleanChanges();
p.setInsetOwner(0);
pair<PitPosPair, pit_type>
-pasteSelectionHelper(Buffer const & buffer, ParagraphList & pars,
- pit_type pit, int pos,
- textclass_type tc, size_t cut_index, ErrorList & errorlist)
+pasteSelectionHelper(Buffer const & buffer,
+ ParagraphList & pars, pit_type pit, int pos,
+ ParagraphList const & parlist, textclass_type textclass,
+ ErrorList & errorlist)
{
- if (!checkPastePossible(cut_index))
+ if (parlist.empty())
return make_pair(PitPosPair(pit, pos), pit);
BOOST_ASSERT (pos <= pars[pit].size());
// Make a copy of the CaP paragraphs.
- ParagraphList insertion = theCuts[cut_index].first;
- textclass_type const textclass = theCuts[cut_index].second;
+ ParagraphList insertion = parlist;
+ textclass_type const tc = buffer.params().textclass;
// Now remove all out of the pars which is NOT allowed in the
// new environment and set also another font if that is required.
+ // Convert newline to paragraph break in ERT inset.
+ // This should not be here!
+ if (pars[pit].inInset() &&
+ pars[pit].inInset()->lyxCode() == InsetBase::ERT_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)) {
+ insertion[i].erase(j);
+ breakParagraphConservative(
+ buffer.params(),
+ insertion, i, j);
+ }
+ }
+ }
+ }
+
// Make sure there is no class difference.
- lyx::cap::SwitchLayoutsBetweenClasses(textclass, tc, insertion,
- errorlist);
+ lyx::cap::SwitchBetweenClasses(textclass, tc, insertion, errorlist);
ParagraphList::iterator tmpbuf = insertion.begin();
int depth_delta = pars[pit].params().depth() - tmpbuf->params().depth();
// Set the inset owner of this paragraph.
tmpbuf->setInsetOwner(pars[pit].inInset());
for (pos_type i = 0; i < tmpbuf->size(); ++i) {
- if (tmpbuf->getChar(i) == Paragraph::META_INSET) {
- if (!pars[pit].insetAllowed(tmpbuf->getInset(i)->lyxCode()))
- tmpbuf->erase(i--);
- }
+ if (tmpbuf->getChar(i) == Paragraph::META_INSET &&
+ !pars[pit].insetAllowed(tmpbuf->getInset(i)->lyxCode()))
+ tmpbuf->erase(i--);
}
}
- // Make the buf exactly the same layout as the cursor paragraph.
- insertion.begin()->makeSameLayout(pars[pit]);
+ bool const empty = pars[pit].empty();
+ if (!empty) {
+ // Make the buf exactly the same layout as the cursor
+ // paragraph.
+ insertion.begin()->makeSameLayout(pars[pit]);
+ }
// Prepare the paragraphs and insets for insertion.
// A couple of insets store buffer references so need updating.
std::swap(in.paragraphs(), insertion);
// Split the paragraph for inserting the buf if necessary.
- bool did_split = false;
- if (pars[pit].size() || pit + 1 == pit_type(pars.size())) {
+ if (!empty)
breakParagraphConservative(buffer.params(), pars, pit, pos);
- did_split = true;
- }
// Paste it!
- pars.insert(pars.begin() + pit + 1, insertion.begin(), insertion.end());
- mergeParagraph(buffer.params(), pars, pit);
+ if (empty) {
+ pars.insert(pars.begin() + pit, insertion.begin(),
+ insertion.end());
+
+ // merge the empty par with the last par of the insertion
+ mergeParagraph(buffer.params(), pars,
+ pit + insertion.size() - 1);
+ } else {
+ pars.insert(pars.begin() + pit + 1, insertion.begin(),
+ insertion.end());
+
+ // merge the first par of the insertion with the current par
+ mergeParagraph(buffer.params(), pars, pit);
+ }
pit_type last_paste = pit + insertion.size() - 1;
pit = last_paste;
pos = pars[last_paste].size();
- // Maybe some pasting.
- if (did_split && last_paste + 1 != pit_type(pars.size())) {
+ // Join (conditionally) last pasted paragraph with next one, i.e.,
+ // the tail of the spliced document paragraph
+ if (!empty && last_paste + 1 != pit_type(pars.size())) {
if (pars[last_paste + 1].hasSameLayout(pars[last_paste])) {
mergeParagraph(buffer.params(), pars, last_paste);
} else if (pars[last_paste + 1].empty()) {
pit_type startpit, pit_type endpit,
int startpos, int endpos, bool doclear)
{
+ // Start of selection is really invalid.
if (startpit == pit_type(pars.size()) ||
(startpos > pars[startpit].size()))
return PitPosPair(endpit, endpos);
+ // Start and end is inside same paragraph
if (endpit == pit_type(pars.size()) ||
startpit == endpit) {
endpos -= pars[startpit].erase(startpos, endpos);
return PitPosPair(endpit, endpos);
}
- // clear end/begin fragments of the first/last par in selection
- bool all_erased = true;
-
- pars[startpit].erase(startpos, pars[startpit].size());
- if (pars[startpit].size() != startpos)
- all_erased = false;
-
- endpos -= pars[endpit].erase(0, endpos);
- if (endpos != 0)
- all_erased = false;
-
- // Loop through the deleted pars if any, erasing as needed
- for (pit_type pit = startpit + 1; pit != endpit;) {
- // "erase" the contents of the par
- pars[pit].erase(0, pars[pit].size());
- if (!pars[pit].size()) {
- // remove the par if it's now empty
- pars.erase(pars.begin() + pit);
+ // A paragraph break has to be physically removed by merging, but
+ // only if either (1) change tracking is off, or (2) the para break
+ // is "blue"
+ for (pit_type pit = startpit; pit != endpit + 1;) {
+ bool const merge = !params.tracking_changes ||
+ pars[pit].lookupChange(pars[pit].size()) ==
+ Change::INSERTED;
+ pos_type const left = ( pit == startpit ? startpos : 0 );
+ pos_type const right = ( pit == endpit ? endpos :
+ pars[pit].size() + 1 );
+ // Logical erase only:
+ pars[pit].erase(left, right);
+ // Separate handling of para break:
+ if (merge && pit != endpit &&
+ pars[pit].hasSameLayout(pars[pit + 1])) {
+ pos_type const thissize = pars[pit].size();
+ if (doclear)
+ pars[pit + 1].stripLeadingSpaces();
+ mergeParagraph(params, pars, pit);
--endpit;
- } else {
+ if (pit == endpit)
+ endpos += thissize;
+ } else
++pit;
- all_erased = false;
- }
- }
-
-#if 0 // FIXME: why for cut but not copy ?
- // the cut selection should begin with standard layout
- if (realcut) {
- buf->params().clear();
- buf->bibkey = 0;
- buf->layout(textclasslist[buffer->params.textclass].defaultLayoutName());
- }
-#endif
-
- if (startpit + 1 == pit_type(pars.size()))
- return PitPosPair(endpit, endpos);
-
- if (doclear) {
- pars[startpit + 1].stripLeadingSpaces();
- }
-
- // paste the paragraphs again, if possible
- if (all_erased &&
- (pars[startpit].hasSameLayout(pars[startpit + 1]) ||
- pars[startpit + 1].empty())) {
- mergeParagraph(params, pars, startpit);
- // this because endpar gets deleted here!
- endpit = startpit;
- endpos = startpos;
}
+ // Ensure legal cursor pos:
+ endpit = startpit;
+ endpos = startpos;
return PitPosPair(endpit, endpos);
-
}
// Clone the paragraphs within the selection.
ParagraphList paragraphs(pars.begin() + startpit, pars.begin() + endpit + 1);
+
for_each(paragraphs.begin(), paragraphs.end(), resetOwnerAndChanges());
// Cut out the end of the last paragraph.
theCuts.push(make_pair(paragraphs, tc));
}
-
-
-PitPosPair cutSelectionHelper(BufferParams const & params,
- ParagraphList & pars, pit_type startpit, pit_type endpit,
- int startpos, int endpos, textclass_type tc, bool doclear)
-{
- copySelectionHelper(pars, startpit, endpit, startpos, endpos, tc);
- return eraseSelectionHelper(params, pars, startpit, endpit,
- startpos, endpos, doclear);
-}
-
-
} // namespace anon
return string();
string res = grabSelection(cur);
eraseSelection(cur);
- cur.selection() = false;
return res;
}
-int SwitchLayoutsBetweenClasses(textclass_type c1, textclass_type c2,
+void SwitchBetweenClasses(textclass_type c1, textclass_type c2,
ParagraphList & pars, ErrorList & errorlist)
{
BOOST_ASSERT(!pars.empty());
- int ret = 0;
if (c1 == c2)
- return ret;
+ return;
LyXTextClass const & tclass1 = textclasslist[c1];
LyXTextClass const & tclass2 = textclasslist[c2];
InsetText in;
std::swap(in.paragraphs(), pars);
+ // layouts
ParIterator end = par_iterator_end(in);
for (ParIterator it = par_iterator_begin(in); it != end; ++it) {
string const name = it->layout()->name();
it->layout(tclass2.defaultLayout());
if (!hasLayout && name != tclass1.defaultLayoutName()) {
- ++ret;
string 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"),
name, it->layout()->name(), tclass1.name(), tclass2.name());
// To warn the user that something had to be done.
- errorlist.push_back(ErrorItem("Changed Layout", s,
+ errorlist.push_back(ErrorItem(_("Changed Layout"), s,
it->id(), 0,
it->size()));
}
}
+
+ // 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) {
+ InsetCharStyle & inset =
+ static_cast<InsetCharStyle &>(*it);
+ string const name = inset.params().type;
+ CharStyles::iterator const found_cs =
+ tclass2.charstyle(name);
+ if (found_cs == tclass2.charstyles().end()) {
+ // The character style is undefined in tclass2
+ inset.setUndefined();
+ string const s = bformat(_(
+ "Character style %1$s is "
+ "undefined because of class "
+ "conversion from\n%2$s to %3$s"),
+ name, tclass1.name(), tclass2.name());
+ // To warn the user that something had to be done.
+ errorlist.push_back(ErrorItem(
+ _("Undefined character style"),
+ s, it.paragraph().id(),
+ it.pos(), it.pos() + 1));
+ } else if (inset.undefined()) {
+ // The character style is undefined in
+ // tclass1 and is defined in tclass2
+ inset.setDefined(found_cs);
+ }
+ }
+ }
+
std::swap(in.paragraphs(), pars);
- return ret;
}
}
-int nrOfParagraphs()
+lyx::size_type numberOfSelections()
{
- return theCuts.empty() ? 0 : theCuts[0].first.size();
+ return theCuts.size();
}
void cutSelection(LCursor & cur, bool doclear, bool realcut)
{
+ // This doesn't make sense, if there is no selection
+ if (!cur.selection())
+ return;
+
+ // OK, we have a selection. This is always between cur.selBegin()
+ // and cur.selEnd()
+
if (cur.inTexted()) {
LyXText * text = cur.text();
BOOST_ASSERT(text);
// finished. The solution used currently just works, to make it
// faster we need to be more clever and probably also have more
// calls to stuffClipboard. (Lgb)
- cur.bv().stuffClipboard(cur.selectionAsString(true));
-
- // This doesn't make sense, if there is no selection
- if (!cur.selection())
- return;
-
- // OK, we have a selection. This is always between cur.selBegin()
- // and cur.selEnd()
+// cur.bv().stuffClipboard(cur.selectionAsString(true));
// make sure that the depth behind the selection are restored, too
recordUndoSelection(cur);
if (doclear)
text->paragraphs()[begpit].stripLeadingSpaces();
- text->redoParagraphs(begpit, begpit + 1);
// cutSelection can invalidate the cursor so we need to set
// it anew. (Lgb)
// we prefer the end for when tracking changes
// need a valid cursor. (Lgb)
cur.clearSelection();
- text->updateCounters();
+ updateCounters(cur.buffer());
+
+ // tell tabular that a recent copy happened
+ dirtyTabularStack(false);
}
if (cur.inMathed()) {
- lyxerr << "cutSelection in mathed" << endl;
- LCursor tmp = cur;
- copySelection(cur);
- cur.selection() = false;
- eraseSelection(tmp);
+ if (cur.selBegin().idx() != cur.selEnd().idx()) {
+ // The current selection spans more than one cell.
+ // Record all cells
+ recordUndoInset(cur);
+ } else {
+ // Record only the current cell to avoid a jumping
+ // cursor after undo
+ recordUndo(cur);
+ }
+ if (realcut)
+ copySelection(cur);
+ eraseSelection(cur);
}
}
pars.back().insert(0, grabSelection(cur), LyXFont());
theCuts.push(make_pair(pars, bp.textclass));
}
+ // tell tabular that a recent copy happened
+ dirtyTabularStack(false);
}
}
-void pasteSelection(LCursor & cur, size_t sel_index)
+void pasteParagraphList(LCursor & cur, ParagraphList const & parlist,
+ textclass_type textclass)
{
- // this does not make sense, if there is nothing to paste
- lyxerr << "#### pasteSelection " << sel_index << endl;
- if (!checkPastePossible(sel_index))
- return;
-
if (cur.inTexted()) {
LyXText * text = cur.text();
BOOST_ASSERT(text);
pit_type endpit;
PitPosPair ppp;
-
ErrorList el;
boost::tie(ppp, endpit) =
pasteSelectionHelper(cur.buffer(),
- text->paragraphs(),
- cur.pit(), cur.pos(),
- cur.buffer().params().textclass,
- sel_index, el);
+ text->paragraphs(),
+ cur.pit(), cur.pos(),
+ parlist, textclass,
+ el);
bufferErrors(cur.buffer(), el);
- cur.bv().showErrorList(_("Paste"));
-
- text->redoParagraphs(cur.pit(), endpit);
-
+ updateCounters(cur.buffer());
cur.clearSelection();
- cur.resetAnchor();
text->setCursor(cur, ppp.first, ppp.second);
- cur.setSelection();
- text->updateCounters();
}
- if (cur.inMathed()) {
- lyxerr << "### should be handled in MathNest/GridInset" << endl;
- }
+ // mathed is handled in MathNestInset/MathGridInset
+ BOOST_ASSERT(!cur.inMathed());
+}
+
+
+void pasteSelection(LCursor & cur, size_t sel_index)
+{
+ // this does not make sense, if there is nothing to paste
+ if (!checkPastePossible(sel_index))
+ return;
+
+ pasteParagraphList(cur, theCuts[sel_index].first,
+ theCuts[sel_index].second);
+ cur.bv().showErrorList(_("Paste"));
+ cur.setSelection();
}
CursorSlice const & i1 = cur.selBegin();
CursorSlice const & i2 = cur.selEnd();
if (i1.inset().asMathInset()) {
+ cur.top() = i1;
if (i1.idx() == i2.idx()) {
i1.cell().erase(i1.pos(), i2.pos());
+ // We may have deleted i1.cell(cur.pos()).
+ // Make sure that pos is valid.
+ if (cur.pos() > cur.lastpos())
+ cur.pos() = cur.lastpos();
} else {
MathInset * p = i1.asMathInset();
InsetBase::row_type r1, r2;
for (InsetBase::row_type row = r1; row <= r2; ++row)
for (InsetBase::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;
}
- cur.back() = i1;
- cur.pos() = 0; // We've deleted the whole cell. Only pos 0 is valid.
- cur.resetAnchor();
+ // need a valid cursor. (Lgb)
+ cur.clearSelection();
} else {
lyxerr << "can't erase this selection 1" << endl;
}
void selDel(LCursor & cur)
{
//lyxerr << "LCursor::selDel" << endl;
- if (cur.selection()) {
+ if (cur.selection())
eraseSelection(cur);
- cur.selection() = false;
- }
}
}
-string grabSelection(LCursor & cur)
+string grabSelection(LCursor const & cur)
{
if (!cur.selection())
return string();
+ // FIXME: What is wrong with the following?
+#if 0
+ std::ostringstream os;
+ for (DocIterator dit = cur.selectionBegin();
+ dit != cur.selectionEnd(); dit.forwardPos())
+ os << asString(dit.cell());
+ return os.str();
+#endif
+
CursorSlice i1 = cur.selBegin();
CursorSlice i2 = cur.selEnd();
}
+void dirtyTabularStack(bool b)
+{
+ dirty_tabular_stack_ = b;
+}
+
+
+bool tabularStackDirty()
+{
+ return dirty_tabular_stack_;
+}
+
+
} // namespace cap
} // namespace lyx
projects / lyx.git / blobdiff