static bool doInsertInset(Cursor & cur, Text * text,
FuncRequest const & cmd, bool edit, bool pastesel)
{
- Inset * inset = createInset(cur.bv().buffer(), cmd);
+ Buffer & buffer = cur.bv().buffer();
+ BufferParams const & bparams = buffer.params();
+ Inset * inset = createInset(buffer, cmd);
if (!inset)
return false;
if (InsetCollapsable * ci = inset->asInsetCollapsable())
- ci->setLayout(cur.bv().buffer().params());
+ ci->setLayout(bparams);
cur.recordUndo();
if (cmd.action == LFUN_INDEX_INSERT) {
lyx::dispatch(FuncRequest(LFUN_PASTE, "0"));
InsetText * insetText = dynamic_cast<InsetText *>(inset);
if (insetText && !insetText->allowMultiPar() || cur.lastpit() == 0) {
- // reset first par to default
- LayoutPtr const layout =
- cur.buffer().params().getTextClass().defaultLayout();
- cur.text()->paragraphs().begin()->layout(layout);
- cur.pos() = 0;
- cur.pit() = 0;
- // Merge multiple paragraphs -- hack
- while (cur.lastpit() > 0) {
- mergeParagraph(cur.buffer().params(),
- cur.text()->paragraphs(), 0);
- }
+ // reset first par to default
+ cur.text()->paragraphs().begin()
+ ->setEmptyOrDefaultLayout(bparams.getTextClass());
+ cur.pos() = 0;
+ cur.pit() = 0;
+ // Merge multiple paragraphs -- hack
+ while (cur.lastpit() > 0)
+ mergeParagraph(bparams, cur.text()->paragraphs(), 0);
} else {
// reset surrounding par to default
- docstring const layoutname =
- cur.buffer().params().getTextClass().defaultLayoutName();
+ docstring const layoutname = insetText->useEmptyLayout()
+ ? bparams.getTextClass().emptyLayoutName()
+ : bparams.getTextClass().defaultLayoutName();
cur.leaveInset(*inset);
text->setLayout(cur, layoutname);
}
ParagraphList::iterator finish = start;
ParagraphList::iterator end = pars.end();
- TextClass::const_iterator lit =
- buf.params().getTextClass().begin();
- TextClass::const_iterator const lend =
- buf.params().getTextClass().end();
+ TextClass const & tc = buf.params().getTextClass();
int const thistoclevel = start->layout()->toclevel;
int toclevel;
}
case OutlineIn:
buf.undo().recordUndo(cur);
- for (; lit != lend; ++lit) {
- if ((*lit)->toclevel == thistoclevel + 1 &&
- start->layout()->labeltype == (*lit)->labeltype) {
- start->layout((*lit));
+ for (size_t i = 0; i != tc.layoutCount(); ++i) {
+ LayoutPtr const & lt = tc.layout(i);
+ if (lt->toclevel == thistoclevel + 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));
+ for (size_t i = 0; i != tc.layoutCount(); ++i) {
+ LayoutPtr const & lt = tc.layout(i);
+ if (lt->toclevel == thistoclevel - 1 &&
+ start->layout()->labeltype == lt->labeltype) {
+ start->setLayout(lt);
break;
}
}
{
FontInfo font = ignore_font;
font.setNumber(FONT_TOGGLE);
- toggleAndShow(cur, this, Font(font));
+ toggleAndShow(cur, this, Font(font, ignore_language));
}
{
LYXERR(Debug::ACTION, "Text::dispatch: cmd: " << cmd);
+ BufferView * bv = &cur.bv();
+ TextMetrics & tm = bv->textMetrics(this);
+ if (!tm.has(cur.pit()))
+ lyx::dispatch(FuncRequest(LFUN_SCREEN_RECENTER));
+
// FIXME: We use the update flag to indicates wether a singlePar or a
// full screen update is needed. We reset it here but shall we restore it
// at the end?
cur.noUpdate();
BOOST_ASSERT(cur.text() == this);
- BufferView * bv = &cur.bv();
- TextMetrics & tm = cur.bv().textMetrics(this);
CursorSlice oldTopSlice = cur.top();
bool oldBoundary = cur.boundary();
bool sel = cur.selection();
// Signals that a full-screen update is required
bool needsUpdate = !(lyxaction.funcHasFlag(cmd.action,
LyXAction::NoUpdate) || singleParUpdate);
- // Remember the old paragraph metric (_outer_ paragraph!)
- ParagraphMetrics const & pm = cur.bv().parMetrics(
- cur.bottom().text(), cur.bottom().pit());
- Dimension olddim = pm.dim();
switch (cmd.action) {
case LFUN_CHAR_LEFT:
case LFUN_CHAR_LEFT_SELECT:
- //FIXME: for visual cursor, really move left
- if (reverseDirectionNeeded(cur)) {
- cmd.action = cmd.action == LFUN_CHAR_LEFT_SELECT ?
- LFUN_CHAR_FORWARD_SELECT : LFUN_CHAR_FORWARD;
+ if (lyxrc.visual_cursor) {
+ needsUpdate |= cur.selHandle(cmd.action == LFUN_CHAR_LEFT_SELECT);
+ needsUpdate |= cursorVisLeft(cur);
+ if (!needsUpdate && oldTopSlice == cur.top()
+ && cur.boundary() == oldBoundary) {
+ cur.undispatched();
+ cmd = FuncRequest(LFUN_FINISHED_LEFT);
+ }
} else {
- cmd.action = cmd.action == LFUN_CHAR_LEFT_SELECT ?
+ if (reverseDirectionNeeded(cur)) {
+ cmd.action = cmd.action == LFUN_CHAR_LEFT_SELECT ?
+ LFUN_CHAR_FORWARD_SELECT : LFUN_CHAR_FORWARD;
+ } else {
+ cmd.action = cmd.action == LFUN_CHAR_LEFT_SELECT ?
LFUN_CHAR_BACKWARD_SELECT : LFUN_CHAR_BACKWARD;
+ }
+ dispatch(cur, cmd);
+ return;
}
- dispatch(cur, cmd);
- return;
+ break;
case LFUN_CHAR_RIGHT:
case LFUN_CHAR_RIGHT_SELECT:
- //FIXME: for visual cursor, really move right
- if (reverseDirectionNeeded(cur)) {
- cmd.action = cmd.action == LFUN_CHAR_RIGHT_SELECT ?
- LFUN_CHAR_BACKWARD_SELECT : LFUN_CHAR_BACKWARD;
+ if (lyxrc.visual_cursor) {
+ needsUpdate |= cur.selHandle(cmd.action == LFUN_CHAR_RIGHT_SELECT);
+ needsUpdate |= cursorVisRight(cur);
+ if (!needsUpdate && oldTopSlice == cur.top()
+ && cur.boundary() == oldBoundary) {
+ cur.undispatched();
+ cmd = FuncRequest(LFUN_FINISHED_RIGHT);
+ }
} else {
- cmd.action = cmd.action == LFUN_CHAR_RIGHT_SELECT ?
+ if (reverseDirectionNeeded(cur)) {
+ cmd.action = cmd.action == LFUN_CHAR_RIGHT_SELECT ?
+ LFUN_CHAR_BACKWARD_SELECT : LFUN_CHAR_BACKWARD;
+ } else {
+ cmd.action = cmd.action == LFUN_CHAR_RIGHT_SELECT ?
LFUN_CHAR_FORWARD_SELECT : LFUN_CHAR_FORWARD;
+ }
+ dispatch(cur, cmd);
+ return;
}
- dispatch(cur, cmd);
- return;
+ break;
+
case LFUN_UP_SELECT:
case LFUN_DOWN_SELECT:
bool up = cmd.action == LFUN_UP_SELECT || cmd.action == LFUN_UP;
bool const successful = cur.upDownInText(up, needsUpdate);
if (successful) {
- // notify insets which were left and get their update flags
- notifyCursorLeaves(cur.beforeDispatchCursor(), cur);
- cur.fixIfBroken();
-
// redraw if you leave mathed (for the decorations)
needsUpdate |= cur.beforeDispatchCursor().inMathed();
} else
docstring layout = cmd.argument();
LYXERR(Debug::INFO, "LFUN_LAYOUT: (arg) " << to_utf8(layout));
- docstring const old_layout = cur.paragraph().layout()->name();
-
- // Derive layout number from given argument (string)
- // and current buffer's textclass (number)
+ Paragraph const & para = cur.paragraph();
+ docstring const old_layout = para.layout()->name();
TextClass const & tclass = bv->buffer().params().getTextClass();
+
if (layout.empty())
layout = tclass.defaultLayoutName();
+
+ if (para.forceEmptyLayout())
+ // in this case only the empty layout is allowed
+ layout = tclass.emptyLayoutName();
+ else if (para.useEmptyLayout()) {
+ // in this case, default layout maps to empty layout
+ if (layout == tclass.defaultLayoutName())
+ layout = tclass.emptyLayoutName();
+ } else {
+ // otherwise, the empty layout maps to the default
+ if (layout == tclass.emptyLayoutName())
+ layout = tclass.defaultLayoutName();
+ }
+
bool hasLayout = tclass.hasLayout(layout);
// If the entry is obsolete, use the new one instead.
#endif
case LFUN_CAPTION_INSERT:
case LFUN_FOOTNOTE_INSERT:
- // Open the inset, and move the current selection
- // inside it.
- doInsertInset(cur, this, cmd, true, true);
- cur.posForward();
- // These insets are numbered.
- updateLabels(bv->buffer());
- break;
case LFUN_NOTE_INSERT:
case LFUN_FLEX_INSERT:
case LFUN_BOX_INSERT:
case LFUN_MARGINALNOTE_INSERT:
case LFUN_OPTIONAL_INSERT:
case LFUN_ENVIRONMENT_INSERT:
+ case LFUN_INDEX_INSERT:
// Open the inset, and move the current selection
// inside it.
doInsertInset(cur, this, cmd, true, true);
cur.posForward();
+ // Some insets are numbered, others are shown in the outline pane so
+ // let's update the labels and the toc backend.
+ updateLabels(bv->buffer());
break;
case LFUN_TABULAR_INSERT:
// add a separate paragraph for the caption inset
pars.push_back(Paragraph());
pars.back().setInsetOwner(pars[0].inInset());
- 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());
- pars.back().layout(tclass.defaultLayout());
-
+ pars.back().setEmptyOrDefaultLayout(tclass);
}
// reposition the cursor to the caption
break;
}
- case LFUN_INDEX_INSERT:
- doInsertInset(cur, this, cmd, true, true);
- cur.posForward();
- break;
-
case LFUN_NOMENCL_INSERT: {
FuncRequest cmd1 = cmd;
if (cmd.argument().empty())
case LFUN_FINISHED_LEFT:
LYXERR(Debug::DEBUG, "handle LFUN_FINISHED_LEFT:\n" << cur);
- if (reverseDirectionNeeded(cur)) {
- ++cur.pos();
- cur.setCurrentFont();
- }
+ // We're leaving an inset, going left. If the inset is LTR, we're
+ // leaving from the front, so we should not move (remain at --- but
+ // not in --- the inset). If the inset is RTL, move left, without
+ // entering the inset itself; i.e., move to after the inset.
+ if (cur.paragraph().getFontSettings(
+ cur.bv().buffer().params(), cur.pos()).isRightToLeft())
+ cursorVisLeft(cur, true);
break;
case LFUN_FINISHED_RIGHT:
LYXERR(Debug::DEBUG, "handle LFUN_FINISHED_RIGHT:\n" << cur);
- if (!reverseDirectionNeeded(cur)) {
- ++cur.pos();
- cur.setCurrentFont();
- }
+ // We're leaving an inset, going right. If the inset is RTL, we're
+ // leaving from the front, so we should not move (remain at --- but
+ // not in --- the inset). If the inset is LTR, move right, without
+ // entering the inset itself; i.e., move to after the inset.
+ if (!cur.paragraph().getFontSettings(
+ cur.bv().buffer().params(), cur.pos()).isRightToLeft())
+ cursorVisRight(cur, true);
break;
case LFUN_FINISHED_BACKWARD:
params2string(cur.paragraph(), data);
// Will the paragraph accept changes from the dialog?
- bool const accept = !cur.inset().forceDefaultParagraphs(cur.idx());
+ bool const accept =
+ cur.inset().allowParagraphCustomization(cur.idx());
data = "update " + convert<string>(accept) + '\n' + data;
bv->updateDialog("paragraph", data);
breakParagraph(cur);
}
+ //FIXME Check if this should be emptyLayout()
setLayout(cur, tclass.defaultLayoutName());
ParagraphParameters p;
setParagraphs(cur, p);
// FIXME: the following code should go in favor of fine grained
// update flag treatment.
if (singleParUpdate) {
- // Inserting characters does not change par height
- ParagraphMetrics const & pms
- = cur.bv().parMetrics(cur.bottom().text(), cur.bottom().pit());
- if (pms.dim().height() == olddim.height()) {
- // if so, update _only_ this paragraph
- cur.updateFlags(Update::SinglePar |
- Update::FitCursor);
- return;
- }
- needsUpdate = true;
+ // Inserting characters does not change par height in general. So, try
+ // to update _only_ this paragraph. BufferView will detect if a full
+ // metrics update is needed anyway.
+ cur.updateFlags(Update::SinglePar | Update::FitCursor);
+ return;
}
if (!needsUpdate
case LFUN_FLEX_INSERT: {
code = FLEX_CODE;
string s = cmd.getArg(0);
- InsetLayout il = cur.buffer().params().getTextClass().insetlayout(from_utf8(s));
- if (il.lyxtype != "charstyle" &&
- il.lyxtype != "custom" &&
- il.lyxtype != "element" &&
- il.lyxtype != "standard")
+ InsetLayout il = cur.buffer().params().getTextClass().insetLayout(from_utf8(s));
+ if (il.lyxtype() != "charstyle" &&
+ il.lyxtype() != "custom" &&
+ il.lyxtype() != "element" &&
+ il.lyxtype ()!= "standard")
enable = false;
break;
}
if (!cmd.argument().empty()) {
InsetLayout il = cur.inset().getLayout(cur.buffer().params());
enable = cur.inset().lyxCode() == FLEX_CODE
- && il.lyxtype == to_utf8(cmd.argument());
+ && il.lyxtype() == to_utf8(cmd.argument());
} else {
enable = !isMainText(cur.bv().buffer())
&& cur.inset().nargs() == 1;
projects / lyx.git / blobdiff