bv->owner()->getMiniBuffer()
->Set(_("Inserting Footnote..."));
bv->hideCursor();
- bv->update(-2);
- bv->text->InsertFootnoteEnvironment(LyXParagraph::FOOTNOTE);
- bv->update(1);
+ bv->update(BufferView::SELECT|BufferView::FITCUR);
+ bv->text->InsertFootnoteEnvironment(bv, LyXParagraph::FOOTNOTE);
+ bv->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
}
if (bv->available()) {
bv->owner()->getMiniBuffer()->Set(_("Inserting margin note..."));
bv->hideCursor();
- bv->update(-2);
- bv->text->InsertFootnoteEnvironment(LyXParagraph::MARGIN);
- bv->update(1);
+ bv->update(BufferView::SELECT|BufferView::FITCUR);
+ bv->text->InsertFootnoteEnvironment(bv, LyXParagraph::MARGIN);
+ bv->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
}
}
bv->owner()->getMiniBuffer()->Set(_("Melt"));
bv->hideCursor();
bv->beforeChange();
- bv->update(-2);
- bv->text->MeltFootnoteEnvironment();
- bv->update(1);
+ bv->update(BufferView::SELECT|BufferView::FITCUR);
+ bv->text->MeltFootnoteEnvironment(bv);
+ bv->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
}
if (!bv->available()) return;
bv->hideCursor();
- bv->update(-2);
+ bv->update(BufferView::SELECT|BufferView::FITCUR);
if (decInc >= 0)
- bv->text->IncDepth();
+ bv->text->IncDepth(bv);
else
- bv->text->DecDepth();
- bv->update(1);
+ bv->text->DecDepth(bv);
+ bv->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
bv->owner()->getMiniBuffer()
->Set(_("Changed environment depth"
" (in possible range, maybe not)"));
void Free(BufferView * bv)
{
- ToggleAndShow(bv, UserFreeFont());
+ ToggleAndShow(bv, UserFreeFont(bv->buffer()->params));
}
.TextClass(buffer->params.textclass)
.defaultfont();
font.reduce(defaultfont);
- state = _("Font: ") + font.stateText();
+ state = _("Font: ") + font.stateText(&buffer->params);
// The paragraph depth
int depth = bv->text->GetDepth();
if (depth > 0)
state += string(_(", Depth: ")) + tostr(depth);
// The paragraph spacing, but only if different from
// buffer spacing.
- if (!bv->text->cursor.par->spacing.isDefault()) {
+ if (!bv->text->cursor.par()->spacing.isDefault()) {
Spacing::Space cur_space =
- bv->text->cursor.par->spacing.getSpace();
+ bv->text->cursor.par()->spacing.getSpace();
state += _(", Spacing: ");
switch (cur_space) {
case Spacing::Single:
break;
case Spacing::Other:
state += _("Other (");
- state += tostr(bv->text->cursor.par->spacing.getValue());
+ state += tostr(bv->text->cursor.par()->spacing.getValue());
state += ")";
break;
case Spacing::Default:
{
if (bv->available()) {
bv->hideCursor();
- bv->update(-2);
+ bv->update(BufferView::SELECT|BufferView::FITCUR);
if (bv->the_locking_inset)
bv->the_locking_inset->SetFont(bv, font, toggleall);
else
- bv->text->ToggleFree(font, toggleall);
- bv->update(1);
+ bv->text->ToggleFree(bv, font, toggleall);
+ bv->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+
+ if (font.language() != ignore_language ||
+ font.latex() != LyXFont::IGNORE) {
+ LyXText * text = bv->text;
+ LyXCursor & cursor = text->cursor;
+ text->ComputeBidiTables(bv->buffer(), cursor.row());
+ if (cursor.boundary() !=
+ text->IsBoundary(bv->buffer(), cursor.par(), cursor.pos(),
+ text->real_current_font) )
+ text->SetCursor(bv, cursor.par(), cursor.pos(),
+ false, !cursor.boundary());
+ }
}
}