bv->owner()->getMiniBuffer()
->Set(_("Inserting Footnote..."));
bv->hideCursor();
- bv->update(BufferView::SELECT|BufferView::FITCUR);
+ bv->update(bv->text, BufferView::SELECT|BufferView::FITCUR);
bv->text->InsertFootnoteEnvironment(bv, LyXParagraph::FOOTNOTE);
- bv->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+ bv->update(bv->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
}
#endif
if (bv->available()) {
bv->owner()->getMiniBuffer()->Set(_("Inserting margin note..."));
bv->hideCursor();
- bv->update(BufferView::SELECT|BufferView::FITCUR);
+ bv->update(bv->text, BufferView::SELECT|BufferView::FITCUR);
bv->text->InsertFootnoteEnvironment(bv, LyXParagraph::MARGIN);
- bv->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+ bv->update(bv->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
}
}
#endif
+void Number(BufferView * bv)
+{
+ LyXFont font(LyXFont::ALL_IGNORE);
+ font.setNumber(LyXFont::TOGGLE);
+ ToggleAndShow(bv, font);
+}
void Lang(BufferView * bv, string const & l)
{
LyXFont font(LyXFont::ALL_IGNORE);
- Languages::iterator lit = languages.find(l);
- if (lit != languages.end()) {
- font.setLanguage(&(*lit).second);
+ Language const * lang = languages.getLanguage(l);
+ if (lang) {
+ font.setLanguage(lang);
ToggleAndShow(bv, font);
} else
WriteAlert(_("Error! unknown language"),l);
bv->owner()->getMiniBuffer()->Set(_("Melt"));
bv->hideCursor();
- bv->beforeChange();
- bv->update(BufferView::SELECT|BufferView::FITCUR);
+ bv->beforeChange(bv->text);
+ bv->update(bv->text, BufferView::SELECT|BufferView::FITCUR);
bv->text->MeltFootnoteEnvironment(bv);
- bv->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+ bv->update(bv->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
}
#endif
// Change environment depth.
// if decInc >= 0, increment depth
// if decInc < 0, decrement depth
-void changeDepth(BufferView * bv, int decInc)
+void changeDepth(BufferView * bv, LyXText * text, int decInc)
{
- if (!bv->available()) return;
+ if (!bv->available() || !text)
+ return;
bv->hideCursor();
- bv->update(BufferView::SELECT|BufferView::FITCUR);
+ bv->update(bv->text, BufferView::SELECT|BufferView::FITCUR);
if (decInc >= 0)
- bv->text->IncDepth(bv);
+ text->IncDepth(bv);
else
- bv->text->DecDepth(bv);
- bv->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+ text->DecDepth(bv);
+ if (text->inset_owner)
+ bv->updateInset((Inset *)text->inset_owner, true);
+ bv->update(bv->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
bv->owner()->getMiniBuffer()
->Set(_("Changed environment depth"
" (in possible range, maybe not)"));
static bool cursor_undefined = true;
if (cursor_undefined){
- cursor = XCreateFontCursor(fl_display, XC_watch);
- XFlush(fl_display);
+ cursor = XCreateFontCursor(fl_get_display(), XC_watch);
+ XFlush(fl_get_display());
cursor_undefined = false;
}
/* set the cursor to the watch for all forms and the canvas */
- XDefineCursor(fl_display, bv->owner()->getForm()->window,
+ XDefineCursor(fl_get_display(), bv->owner()->getForm()->window,
cursor);
if (fd_form_character->form_character->visible)
- XDefineCursor(fl_display,
+ XDefineCursor(fl_get_display(),
fd_form_character->form_character->window,
cursor);
- XFlush(fl_display);
+ XFlush(fl_get_display());
fl_deactivate_all_forms();
}
{
/* reset the cursor from the watch for all forms and the canvas */
- XUndefineCursor(fl_display, bv->owner()->getForm()->window);
+ XUndefineCursor(fl_get_display(), bv->owner()->getForm()->window);
if (fd_form_character->form_character->visible)
- XUndefineCursor(fl_display,
+ XUndefineCursor(fl_get_display(),
fd_form_character->form_character->window);
- XFlush(fl_display);
+ XFlush(fl_get_display());
fl_activate_all_forms();
}
void FontSize(BufferView * bv, string const & size)
{
LyXFont font(LyXFont::ALL_IGNORE);
- font.setGUISize(size);
+ font.setLyXSize(size);
ToggleAndShow(bv, font);
}
if (bv->available()) {
// I think we should only show changes from the default
// font. (Asger)
- LyXText *text = 0;
-
- if (bv->the_locking_inset)
- text = bv->the_locking_inset->getLyXText(bv);
- if (!text)
- text = bv->text;
-
+ LyXText * text = bv->getLyXText();
Buffer * buffer = bv->buffer();
LyXFont font = text->real_current_font;
LyXFont const & defaultfont =
void ToggleAndShow(BufferView * bv, LyXFont const & font)
{
if (bv->available()) {
+ LyXText * text = bv->getLyXText();
+
bv->hideCursor();
- bv->update(BufferView::SELECT|BufferView::FITCUR);
- if (bv->the_locking_inset)
- bv->the_locking_inset->SetFont(bv, font, toggleall);
- else
- bv->text->ToggleFree(bv, font, toggleall);
- bv->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+ bv->update(text, BufferView::SELECT|BufferView::FITCUR);
+ text->ToggleFree(bv, font, toggleall);
+ bv->update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
if (font.language() != ignore_language ||
- font.latex() != LyXFont::IGNORE) {
- LyXText * text = bv->text;
+ font.latex() != LyXFont::IGNORE ||
+ font.number() != LyXFont::IGNORE) {
LyXCursor & cursor = text->cursor;
text->ComputeBidiTables(bv->buffer(), cursor.row());
if (cursor.boundary() !=