another fix

[lyx.git] / src / bufferview_funcs.C

diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C
index ee43bd9e11f6a9569c3bef3fc1130882e906a5f2..448f17788487fadfa6776aac73556d73592a5e9d 100644 (file)
--- a/src/bufferview_funcs.C
+++ b/src/bufferview_funcs.C
@@ -88,10 +88,8 @@ void changeDepth(BufferView * bv, LyXText * text, int decInc)
        else
                text->decDepth(bv);
        if (text->inset_owner)
-           bv->updateInset((Inset *)text->inset_owner, true);
+               bv->updateInset((Inset *)text->inset_owner, true);
        bv->update(bv->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-       bv->owner()->message(_("Changed environment depth "
-                              "(in possible range, maybe not)"));
 }
 
 
@@ -121,11 +119,7 @@ void roman(BufferView * bv)
 
 void styleReset(BufferView * bv)
 {
-#ifndef INHERIT_LANG
        LyXFont font(LyXFont::ALL_INHERIT, ignore_language);
-#else
-       LyXFont font(LyXFont::ALL_INHERIT);
-#endif
        toggleAndShow(bv, font);
 }
 
@@ -151,56 +145,55 @@ string const currentState(BufferView * bv)
 {
        ostringstream state;
 
-       if (bv->available()) {
-               // I think we should only show changes from the default
-               // font. (Asger)
-               LyXText * text = bv->getLyXText();
-               Buffer * buffer = bv->buffer();
-               LyXFont font = text->real_current_font;
-               LyXFont const & defaultfont =
-                       buffer->params.getLyXTextClass().defaultfont();
-               font.reduce(defaultfont);
-
-               state << _("Font:") << ' '
-                     << font.stateText(&buffer->params);
-
-               // The paragraph depth
-               int depth = text->getDepth();
-               if (depth > 0)
-                       state << _(", Depth: ") << depth;
-
-               // The paragraph spacing, but only if different from
-               // buffer spacing.
-               if (!text->cursor.par()->params().spacing().isDefault()) {
-                       Spacing::Space cur_space =
-                               text->cursor.par()->params().spacing().getSpace();
-                       state << _(", Spacing: ");
-
-                       switch (cur_space) {
-                       case Spacing::Single:
-                               state << _("Single");
-
-                               break;
-                       case Spacing::Onehalf:
-                               state << _("Onehalf");
-                               break;
-                       case Spacing::Double:
-                               state << _("Double");
-                               break;
-                       case Spacing::Other:
-                               state << _("Other (")
-                                     << text->cursor.par()->params().spacing().getValue()
-                                     << ")";
-                               break;
-                       case Spacing::Default:
-                               // should never happen, do nothing
-                               break;
-                       }
+       if (!bv->available())
+               return "";
+
+       // I think we should only show changes from the default
+       // font. (Asger)
+       LyXText * text = bv->getLyXText();
+       Buffer * buffer = bv->buffer();
+       LyXFont font = text->real_current_font;
+       LyXFont const & defaultfont =
+               buffer->params.getLyXTextClass().defaultfont();
+       font.reduce(defaultfont);
+
+       state << _("Font:") << ' ' << font.stateText(&buffer->params);
+
+       // The paragraph depth
+       int depth = text->getDepth();
+       if (depth > 0)
+               state << _(", Depth: ") << depth;
+
+       // The paragraph spacing, but only if different from
+       // buffer spacing.
+       if (!text->cursor.par()->params().spacing().isDefault()) {
+               Spacing::Space cur_space =
+                       text->cursor.par()->params().spacing().getSpace();
+               state << _(", Spacing: ");
+
+               switch (cur_space) {
+               case Spacing::Single:
+                       state << _("Single");
+                       break;
+               case Spacing::Onehalf:
+                       state << _("Onehalf");
+                       break;
+               case Spacing::Double:
+                       state << _("Double");
+                       break;
+               case Spacing::Other:
+                       state << _("Other (")
+                             << text->cursor.par()->params().spacing().getValue()
+                             << ")";
+                       break;
+               case Spacing::Default:
+                       // should never happen, do nothing
+                       break;
                }
+       }
 #ifdef DEVEL_VERSION
-               state << _(", Paragraph: ") << text->cursor.par()->id();
+       state << _(", Paragraph: ") << text->cursor.par()->id();
 #endif
-       }
        return state.str().c_str();
 }
 
@@ -210,29 +203,32 @@ string const currentState(BufferView * bv)
  */
 void toggleAndShow(BufferView * bv, LyXFont const & font, bool toggleall)
 {
-       if (bv->available()) {
-               if (bv->theLockingInset()) {
-                       bv->theLockingInset()->setFont(bv, font, toggleall);
-                       return;
-               }
-               LyXText * text = bv->getLyXText();
-               if (!text)
-                       return;
-
-               bv->hideCursor();
-               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.number() != LyXFont::IGNORE) {
-                       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());
-               }
+       if (!bv->available())
+               return;
+
+       if (bv->theLockingInset()) {
+               bv->theLockingInset()->setFont(bv, font, toggleall);
+               return;
+       }
+
+       LyXText * text = bv->getLyXText();
+       // FIXME: can this happen ??
+       if (!text)
+               return;
+
+       bv->hideCursor();
+       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.number() != LyXFont::IGNORE) {
+               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());
        }
 }