istringstream is(to_utf8(sel));
Lexer lex(0, 0);
lex.setStream(is);
- formula->read(cur.buffer(), lex);
+ formula->read(lex);
if (formula->getType() == hullNone)
// Don't create pseudo formulas if
// delimiters are left out
InsetText * insetText = dynamic_cast<InsetText *>(inset);
if (insetText && !insetText->allowMultiPar() || cur.lastpit() == 0) {
// reset first par to default
- LayoutPtr const layout = insetText->useEmptyLayout()
- ? bparams.textClass().emptyLayout()
- : bparams.textClass().defaultLayout();
- cur.text()->paragraphs().begin()->layout(layout);
+ cur.text()->paragraphs().begin()
+ ->setEmptyOrDefaultLayout(bparams.documentClass());
cur.pos() = 0;
cur.pit() = 0;
// Merge multiple paragraphs -- hack
} else {
// reset surrounding par to default
docstring const layoutname = insetText->useEmptyLayout()
- ? bparams.textClass().emptyLayoutName()
- : bparams.textClass().defaultLayoutName();
+ ? bparams.documentClass().emptyLayoutName()
+ : bparams.documentClass().defaultLayoutName();
cur.leaveInset(*inset);
text->setLayout(cur, layoutname);
}
ParagraphList::iterator finish = start;
ParagraphList::iterator end = pars.end();
- TextClass::const_iterator lit = buf.params().textClass().begin();
- TextClass::const_iterator const lend = buf.params().textClass().end();
+ DocumentClass const & tc = buf.params().documentClass();
int const thistoclevel = start->layout()->toclevel;
int toclevel;
+
+ // Move out (down) from this section header
+ if (finish != end)
+ ++finish;
+ // Seek the one (on same level) below
+ for (; finish != end; ++finish) {
+ toclevel = finish->layout()->toclevel;
+ if (toclevel != Layout::NOT_IN_TOC && toclevel <= thistoclevel) {
+ break;
+ }
+ }
+
switch (mode) {
case OutlineUp: {
- // Move out (down) from this section header
- if (finish != end)
- ++finish;
- // Seek the one (on same level) below
- for (; finish != end; ++finish) {
- toclevel = finish->layout()->toclevel;
- if (toclevel != Layout::NOT_IN_TOC
- && toclevel <= thistoclevel) {
- break;
- }
- }
ParagraphList::iterator dest = start;
// Move out (up) from this header
if (dest == bgn)
- break;
+ return;
// Search previous same-level header above
do {
--dest;
|| toclevel > thistoclevel));
// Not found; do nothing
if (toclevel == Layout::NOT_IN_TOC || toclevel > thistoclevel)
- break;
+ return;
pit_type const newpit = distance(bgn, dest);
pit_type const len = distance(start, finish);
pit_type const deletepit = pit + len;
start = boost::next(pars.begin(), deletepit);
pit = newpit;
pars.erase(start, finish);
- break;
+ return;
}
case OutlineDown: {
- // Go down out of current header:
- if (finish != end)
- ++finish;
- // Find next same-level header:
- for (; finish != end; ++finish) {
- toclevel = finish->layout()->toclevel;
- if (toclevel != Layout::NOT_IN_TOC && toclevel <= thistoclevel)
- break;
- }
ParagraphList::iterator dest = finish;
- // Go one down from *this* header:
- if (dest != end)
- ++dest;
- else
- break;
- // Go further down to find header to insert in front of:
- for (; dest != end; ++dest) {
- toclevel = dest->layout()->toclevel;
- if (toclevel != Layout::NOT_IN_TOC && toclevel <= thistoclevel)
- break;
- }
// One such was found:
pit_type newpit = distance(bgn, dest);
pit_type const len = distance(start, finish);
start = boost::next(bgn, pit);
pit = newpit - len;
pars.erase(start, finish);
- break;
+ return;
}
- case OutlineIn:
- buf.undo().recordUndo(cur);
- for (; lit != lend; ++lit) {
- if ((*lit)->toclevel == thistoclevel + 1 &&
- start->layout()->labeltype == (*lit)->labeltype) {
- start->layout((*lit));
- break;
+ case OutlineIn: {
+ pit_type const len = distance(start, finish);
+ buf.undo().recordUndo(cur, ATOMIC_UNDO, pit, pit + len - 1);
+ for (; start != finish; ++start) {
+ toclevel = start->layout()->toclevel;
+ if (toclevel == Layout::NOT_IN_TOC)
+ continue;
+ for (size_t i = 0; i != tc.layoutCount(); ++i) {
+ LayoutPtr const & lt = tc.layout(i);
+ if (lt->toclevel == toclevel + 1 &&
+ start->layout()->labeltype == lt->labeltype) {
+ start->setLayout(lt);
+ break;
+ }
}
}
- break;
- case OutlineOut:
- buf.undo().recordUndo(cur);
- for (; lit != lend; ++lit) {
- if ((*lit)->toclevel == thistoclevel - 1 &&
- start->layout()->labeltype == (*lit)->labeltype) {
- start->layout((*lit));
- break;
+ return;
+ }
+ case OutlineOut: {
+ pit_type const len = distance(start, finish);
+ buf.undo().recordUndo(cur, ATOMIC_UNDO, pit, pit + len - 1);
+ for (; start != finish; ++start) {
+ toclevel = start->layout()->toclevel;
+ if (toclevel == Layout::NOT_IN_TOC)
+ continue;
+ for (size_t i = 0; i != tc.layoutCount(); ++i) {
+ LayoutPtr const & lt = tc.layout(i);
+ if (lt->toclevel == toclevel - 1 &&
+ start->layout()->labeltype == lt->labeltype) {
+ start->setLayout(lt);
+ break;
+ }
}
}
- break;
- default:
- break;
+ return;
+ }
}
}
BufferView * bv = &cur.bv();
TextMetrics & tm = bv->textMetrics(this);
- if (!tm.has(cur.pit()))
+ if (!tm.contains(cur.pit()))
lyx::dispatch(FuncRequest(LFUN_SCREEN_RECENTER));
// FIXME: We use the update flag to indicates wether a singlePar or a
*/
if (cur.selection())
cutSelection(cur, true, false);
- insertInset(cur, inset);
+ cur.insert(inset);
cur.posForward();
}
break;
Paragraph const & para = cur.paragraph();
docstring const old_layout = para.layout()->name();
- TextClass const & tclass = bv->buffer().params().textClass();
+ DocumentClass const & tclass = bv->buffer().params().documentClass();
if (layout.empty())
layout = tclass.defaultLayoutName();
docstring ds = cur.selectionAsString(false);
cutSelection(cur, true, false);
static_cast<InsetInfo *>(inset)->setInfo(to_utf8(ds));
- static_cast<InsetInfo *>(inset)->updateInfo(cur.bv().buffer());
+ static_cast<InsetInfo *>(inset)->updateInfo();
}
insertInset(cur, inset);
cur.posForward();
cur.posForward();
ParagraphList & pars = cur.text()->paragraphs();
- TextClass const & tclass = bv->buffer().params().textClass();
+ DocumentClass const & tclass = bv->buffer().params().documentClass();
// add a separate paragraph for the caption inset
pars.push_back(Paragraph());
pars.back().setInsetOwner(pars[0].inInset());
- if (pars.back().useEmptyLayout())
- pars.back().layout(tclass.emptyLayout());
- else
- pars.back().layout(tclass.defaultLayout());
-
+ pars.back().setEmptyOrDefaultLayout(tclass);
int cap_pit = pars.size() - 1;
// if an empty inset was created, we create an additional empty
if (!content) {
pars.push_back(Paragraph());
pars.back().setInsetOwner(pars[0].inInset());
- if (pars.back().useEmptyLayout())
- pars.back().layout(tclass.emptyLayout());
- else
- pars.back().layout(tclass.defaultLayout());
+ pars.back().setEmptyOrDefaultLayout(tclass);
}
// reposition the cursor to the caption
break;
case LFUN_FLOAT_LIST: {
- TextClass const & tclass = bv->buffer().params().textClass();
+ DocumentClass const & tclass = bv->buffer().params().documentClass();
if (tclass.floats().typeExist(to_utf8(cmd.argument()))) {
cur.recordUndo();
if (cur.selection())
case LFUN_FLEX_INSERT: {
code = FLEX_CODE;
string s = cmd.getArg(0);
- InsetLayout il = cur.buffer().params().textClass().insetlayout(from_utf8(s));
+ InsetLayout il =
+ cur.buffer().params().documentClass().insetLayout(from_utf8(s));
if (il.lyxtype() != "charstyle" &&
il.lyxtype() != "custom" &&
il.lyxtype() != "element" &&
projects / lyx.git / blobdiff