fix typo that put too many include paths for most people

[lyx.git] / src / bufferview_funcs.C

diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C
index 7239dbd0e268ba547154d8a0289a0b2a22445b62..768f700a9b7b180354850dd424126f8e7044d9f9 100644 (file)
--- a/src/bufferview_funcs.C
+++ b/src/bufferview_funcs.C
@@ -1,8 +1,8 @@
 /* This file is part of
- * ====================================================== 
- * 
+ * ======================================================
+ *
  *           LyX, The Document Processor
- *        
+ *
  *           Copyright 1995 Matthias Ettrich
  *           Copyright 1995-2001 The LyX Team.
  *
@@ -19,15 +19,17 @@
 #include "BufferView.h"
 #include "paragraph.h"
 #include "lyxfont.h"
-#include "lyx_gui_misc.h"
 #include "lyxtext.h"
 #include "buffer.h"
-#include "support/lstrings.h"
 #include "lyx_cb.h"
 #include "language.h"
 #include "gettext.h"
 #include "ParagraphParameters.h"
+#include "lyxtextclasslist.h"
 
+#include "frontends/Alert.h"
+
+#include "support/lstrings.h"
 
 void emph(BufferView * bv)
 {
@@ -68,7 +70,7 @@ void lang(BufferView * bv, string const & l)
                font.setLanguage(lang);
                toggleAndShow(bv, font);
        } else
-               WriteAlert(_("Error! unknown language"),l);
+               Alert::alert(_("Error! unknown language"),l);
 }
 
 
@@ -79,7 +81,7 @@ void changeDepth(BufferView * bv, LyXText * text, int decInc)
 {
        if (!bv->available() || !text)
            return;
-       
+
        bv->hideCursor();
        bv->update(bv->text, BufferView::SELECT|BufferView::FITCUR);
        if (decInc >= 0)
@@ -120,7 +122,11 @@ 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);
 }
 
@@ -141,31 +147,29 @@ void fontSize(BufferView * bv, string const & size)
 }
 
 
-// Returns the current font and depth as a message. 
+// Returns the current font and depth as a message.
 string const currentState(BufferView * bv)
 {
        ostringstream state;
 
-       if (bv->available()) { 
+       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 =
-                       textclasslist
-                       .TextClass(buffer->params.textclass)
-                       .defaultfont();
+                       textclasslist[buffer->params.textclass].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()) {
@@ -176,7 +180,7 @@ string const currentState(BufferView * bv)
                        switch (cur_space) {
                        case Spacing::Single:
                                state << _("Single");
-                               
+
                                break;
                        case Spacing::Onehalf:
                                state << _("Onehalf");
@@ -194,7 +198,7 @@ string const currentState(BufferView * bv)
                                break;
                        }
                }
-#if 1
+#ifdef DEVEL_VERSION
                state << _(", Paragraph: ") << text->cursor.par()->id();
 #endif
        }
@@ -207,7 +211,7 @@ string const currentState(BufferView * bv)
  */
 void toggleAndShow(BufferView * bv, LyXFont const & font, bool toggleall)
 {
-       if (bv->available()) { 
+       if (bv->available()) {
                if (bv->theLockingInset()) {
                        bv->theLockingInset()->setFont(bv, font, toggleall);
                        return;
@@ -222,13 +226,12 @@ void toggleAndShow(BufferView * bv, LyXFont const & font, bool toggleall)
                bv->update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 
                if (font.language() != ignore_language ||
-                   font.number() != LyXFont::IGNORE)
-               {
+                   font.number() != LyXFont::IGNORE) {
                        LyXCursor & cursor = text->cursor;
                        text->computeBidiTables(bv->buffer(), cursor.row());
-                       if (cursor.boundary() != 
+                       if (cursor.boundary() !=
                            text->isBoundary(bv->buffer(), cursor.par(), cursor.pos(),
-                                            text->real_current_font) )
+                                            text->real_current_font))
                                text->setCursor(bv, cursor.par(), cursor.pos(),
                                                false, !cursor.boundary());
                }