layout as string

[lyx.git] / src / bufferview_funcs.C

diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C
index 7239dbd0e268ba547154d8a0289a0b2a22445b62..308c4dc796e7bf18b840c71cc4ae1d0aec7014b7 100644 (file)
--- a/src/bufferview_funcs.C
+++ b/src/bufferview_funcs.C
@@ -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);
 }
 
 
@@ -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);
 }
 
@@ -153,9 +159,7 @@ string const currentState(BufferView * bv)
                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:") << ' '
@@ -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() != 
                            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());
                }