better latin3&4 support

[lyx.git] / src / bufferview_funcs.C

diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C
index f32ba3254ab17d0588e5f88e3730af6f6a89b8e4..b8f1b5eff9abbaad253efd262fd823c656548d03 100644 (file)
--- a/src/bufferview_funcs.C
+++ b/src/bufferview_funcs.C
@@ -72,16 +72,6 @@ void lang(BufferView * bv, string const & l)
 }
 
 
-#ifndef NO_LATEX
-void tex(BufferView * bv)
-{
-       LyXFont font(LyXFont::ALL_IGNORE);
-       font.setLatex (LyXFont::TOGGLE);
-       toggleAndShow(bv, font);
-}
-#endif
-
-
 // Change environment depth.
 // if decInc >= 0, increment depth
 // if decInc <  0, decrement depth
@@ -130,7 +120,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);
 }
 
@@ -204,6 +198,9 @@ string const currentState(BufferView * bv)
                                break;
                        }
                }
+#if 1
+               state << _(", Paragraph: ") << text->cursor.par()->id();
+#endif
        }
        return state.str().c_str();
 }
@@ -229,9 +226,6 @@ void toggleAndShow(BufferView * bv, LyXFont const & font, bool toggleall)
                bv->update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 
                if (font.language() != ignore_language ||
-#ifndef NO_LATEX
-                   font.latex() != LyXFont::IGNORE ||
-#endif
                    font.number() != LyXFont::IGNORE)
                {
                        LyXCursor & cursor = text->cursor;