typedef pair<pit_type, int> PitPosPair;
-typedef limited_stack<pair<ParagraphList, TextClassPtr> > CutStack;
+typedef limited_stack<pair<ParagraphList, TextClassIndex> > CutStack;
CutStack theCuts(10);
// persistent selection, cleared until the next selection
pair<PitPosPair, pit_type>
pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
- TextClassPtr textclass, ErrorList & errorlist)
+ TextClassIndex const & textclass, ErrorList & errorlist)
{
Buffer const & buffer = cur.buffer();
pit_type pit = cur.pit();
// Make a copy of the CaP paragraphs.
ParagraphList insertion = parlist;
- TextClassPtr const tc = buffer.params().getTextClassPtr();
+ TextClassIndex tcindex = buffer.params().textClassIndex();
// 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() == ERT_CODE ||
- pars[pit].inInset()->lyxCode() == LISTINGS_CODE)) {
- for (ParagraphList::size_type i = 0; i < insertion.size(); ++i) {
- for (pos_type j = 0; j < insertion[i].size(); ++j) {
+ Inset * inset = pars[pit].inInset();
+ if (inset && (inset->lyxCode() == ERT_CODE ||
+ inset->lyxCode() == LISTINGS_CODE)) {
+ for (size_t i = 0; i != insertion.size(); ++i) {
+ for (pos_type j = 0; j != insertion[i].size(); ++j) {
if (insertion[i].isNewline(j)) {
// do not track deletion of newline
insertion[i].eraseChar(j, false);
}
}
- // If we are in an inset which returns forceDefaultParagraphs,
- // set the paragraphs to default
- if (cur.inset().forceDefaultParagraphs(cur.idx())) {
+ // set the paragraphs to empty layout if necessary
+ // note that we are doing this if the empty layout is
+ // supposed to be the default, not just if it is forced
+ if (cur.inset().useEmptyLayout()) {
LayoutPtr const layout =
- buffer.params().getTextClass().defaultLayout();
+ buffer.params().textClass().emptyLayout();
ParagraphList::iterator const end = insertion.end();
for (ParagraphList::iterator par = insertion.begin();
par != end; ++par)
- par->layout(layout);
+ par->setLayout(layout);
}
// Make sure there is no class difference.
// since we store pointers to insets at some places and we don't
// want to invalidate them.
insertion.swap(in.paragraphs());
- cap::switchBetweenClasses(textclass, tc, in, errorlist);
+ cap::switchBetweenClasses(textclass, tcindex, in, errorlist);
insertion.swap(in.paragraphs());
ParagraphList::iterator tmpbuf = insertion.begin();
// Set the inset owner of this paragraph.
tmpbuf->setInsetOwner(pars[pit].inInset());
for (pos_type i = 0; i < tmpbuf->size(); ++i) {
- if (tmpbuf->isInset(i) &&
- !pars[pit].insetAllowed(tmpbuf->getInset(i)->lyxCode()))
- // do not track deletion of invalid insets
- tmpbuf->eraseChar(i--, false);
+ // do not track deletion of invalid insets
+ if (Inset * inset = tmpbuf->getInset(i))
+ if (!pars[pit].insetAllowed(inset->lyxCode()))
+ tmpbuf->eraseChar(i--, false);
}
tmpbuf->setChange(Change(buffer.params().trackChanges ?
// Separate handling of paragraph break:
if (merge && pit != endpit &&
- (pit + 1 != endpit || pars[pit].hasSameLayout(pars[endpit]))) {
+ (pit + 1 != endpit
+ || pars[pit].hasSameLayout(pars[endpit])
+ || pars[endpit].size() == endpos)) {
if (pit + 1 == endpit)
endpos += pars[pit].size();
mergeParagraph(params, pars, pit);
}
-void putClipboard(ParagraphList const & paragraphs, TextClassPtr textclass,
+void putClipboard(ParagraphList const & paragraphs, TextClassIndex textclass,
docstring const & plaintext)
{
// For some strange reason gcc 3.2 and 3.3 do not accept
void copySelectionHelper(Buffer const & buf, ParagraphList & pars,
pit_type startpit, pit_type endpit,
- int start, int end, TextClassPtr tc, CutStack & cutstack)
+ int start, int end, TextClassIndex tc, CutStack & cutstack)
{
BOOST_ASSERT(0 <= start && start <= pars[startpit].size());
BOOST_ASSERT(0 <= end && end <= pars[endpit].size());
}
-void switchBetweenClasses(TextClassPtr const & c1,
- TextClassPtr const & c2, InsetText & in, ErrorList & errorlist)
+void switchBetweenClasses(TextClassIndex const & oldtcindex,
+ TextClassIndex const & newtcindex, InsetText & in, ErrorList & errorlist)
{
errorlist.clear();
BOOST_ASSERT(!in.paragraphs().empty());
- if (c1 == c2)
+ if (oldtcindex == newtcindex)
return;
- TextClass const & tclass1 = *c1;
- TextClass const & tclass2 = *c2;
-
// layouts
ParIterator end = par_iterator_end(in);
+ TextClass const & oldtc = textclasslist[oldtcindex];
+ TextClass const & newtc = textclasslist[newtcindex];
for (ParIterator it = par_iterator_begin(in); it != end; ++it) {
docstring const name = it->layout()->name();
- bool hasLayout = tclass2.hasLayout(name);
+ bool hasLayout = newtc.hasLayout(name);
if (hasLayout)
- it->layout(tclass2[name]);
+ it->setLayout(newtc[name]);
else
- it->layout(tclass2.defaultLayout());
+ it->setLayout(newtc.defaultLayout());
- if (!hasLayout && name != tclass1.defaultLayoutName()) {
+ if (!hasLayout && name != oldtc.defaultLayoutName()) {
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"),
name, it->layout()->name(),
- from_utf8(tclass1.name()), from_utf8(tclass2.name()));
+ from_utf8(oldtc.name()), from_utf8(newtc.name()));
// To warn the user that something had to be done.
errorlist.push_back(ErrorItem(_("Changed Layout"), s,
it->id(), 0,
if (inset->lyxCode() != FLEX_CODE)
// FIXME: Should we verify all InsetCollapsable?
continue;
- docstring const name = inset->name();
- InsetLayout const & il = tclass2.insetlayout(name);
- inset->setLayout(il);
- if (il.labelstring != from_utf8("UNDEFINED"))
+ inset->setLayout(newtcindex);
+ if (!inset->undefined())
continue;
- // The flex inset is undefined in tclass2
+ // The flex inset is undefined in newtc
docstring const s = bformat(_(
"Flex inset %1$s is "
"undefined because of class "
"conversion from\n%2$s to %3$s"),
- name, from_utf8(tclass1.name()),
- from_utf8(tclass2.name()));
+ inset->name(), from_utf8(oldtc.name()),
+ from_utf8(newtc.name()));
// To warn the user that something had to be done.
errorlist.push_back(ErrorItem(
_("Undefined flex inset"),
text->paragraphs(),
begpit, endpit,
cur.selBegin().pos(), endpos,
- bp.getTextClassPtr(), theCuts);
+ bp.textClassIndex(), theCuts);
// Stuff what we got on the clipboard.
// Even if there is no selection.
putClipboard(theCuts[0].first, theCuts[0].second,
copySelectionHelper(cur.buffer(), pars, par, cur.selEnd().pit(),
pos, cur.selEnd().pos(),
- cur.buffer().params().getTextClassPtr(), cutstack);
+ cur.buffer().params().textClassIndex(), cutstack);
dirtyTabularStack(false);
}
ParagraphList pars;
Paragraph par;
BufferParams const & bp = cur.buffer().params();
- par.layout(bp.getTextClass().defaultLayout());
+ par.setLayout(bp.textClass().defaultLayout());
par.insert(0, grabSelection(cur), Font(), Change(Change::UNCHANGED));
pars.push_back(par);
- cutstack.push(make_pair(pars, bp.getTextClassPtr()));
+ cutstack.push(make_pair(pars, bp.textClassIndex()));
}
}
ParagraphList pars;
Paragraph par;
BufferParams const & bp = cur.buffer().params();
- par.layout(bp.getTextClass().defaultLayout());
+ par.setLayout(bp.textClass().defaultLayout());
par.insert(0, plaintext, Font(), Change(Change::UNCHANGED));
pars.push_back(par);
- theCuts.push(make_pair(pars, bp.getTextClassPtr()));
+ theCuts.push(make_pair(pars, bp.textClassIndex()));
} else {
copySelectionToStack(cur, theCuts);
}
void pasteParagraphList(Cursor & cur, ParagraphList const & parlist,
- TextClassPtr textclass, ErrorList & errorList)
+ TextClassIndex const & textclass, ErrorList & errorList)
{
if (cur.inTexted()) {
Text * text = cur.text();
PitPosPair ppp;
boost::tie(ppp, endpit) =
- pasteSelectionHelper(cur, parlist,
- textclass, errorList);
+ pasteSelectionHelper(cur, parlist, textclass, errorList);
updateLabels(cur.buffer());
cur.clearSelection();
text->setCursor(cur, ppp.first, ppp.second);
if (buffer.readString(lyx)) {
cur.recordUndo();
pasteParagraphList(cur, buffer.paragraphs(),
- buffer.params().getTextClassPtr(), errorList);
+ buffer.params().textClassIndex(), errorList);
cur.setSelection();
return;
}
}
-void pasteClipboardGraphics(Cursor & cur, ErrorList & errorList,
+void pasteClipboardGraphics(Cursor & cur, ErrorList & /*errorList*/,
Clipboard::GraphicsType preferedType)
{
BOOST_ASSERT(theClipboard().hasGraphicsContents(preferedType));
projects / lyx.git / blobdiff