more changes, read the Changelog

[lyx.git] / src / bufferview_funcs.C

diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C
index bc99b1eca528e4cc5f564b8d312054a67b633596..74fb3de3878875ead3a59d46d8b28ca4ccdc04c0 100644 (file)
--- a/src/bufferview_funcs.C
+++ b/src/bufferview_funcs.C
@@ -25,9 +25,9 @@ void Foot(BufferView * bv)
        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);
 }
 
 
@@ -60,9 +60,9 @@ void Margin(BufferView * bv)
        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);
        }
 }
 
@@ -86,9 +86,9 @@ void Melt(BufferView * bv)
        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);
 }
 
 
@@ -108,12 +108,12 @@ void changeDepth(BufferView * bv, int decInc)
        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)"));
@@ -122,7 +122,7 @@ void changeDepth(BufferView * bv, int decInc)
 
 void Free(BufferView * bv)
 {
-       ToggleAndShow(bv, UserFreeFont());
+       ToggleAndShow(bv, UserFreeFont(bv->buffer()->params));
 }
 
 
@@ -251,9 +251,9 @@ string CurrentState(BufferView * bv)
                        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:
@@ -267,7 +267,7 @@ string CurrentState(BufferView * bv)
                                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:
@@ -287,11 +287,23 @@ void ToggleAndShow(BufferView * bv, LyXFont const & font)
 {
        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());
+               }
        }
 }