Angus insetindex patch + protect patch from Dekel

[lyx.git] / src / lyxfont.h

diff --git a/src/lyxfont.h b/src/lyxfont.h
index a626288bfe770ed5743bc5cf9db683bd4f6ddd0b..62e5da13f22ad8c3c589acdfa23533cc17cd60f0 100644 (file)
--- a/src/lyxfont.h
+++ b/src/lyxfont.h
@@ -36,6 +36,7 @@
 #endif
 
 class LyXLex;
+class BufferParams;
 
 ///
 class LyXFont {
@@ -309,7 +310,7 @@ public:
                                 LyXFont const & next) const;
 
        /// Build GUI description of font state
-       string stateText() const;
+       string stateText(BufferParams * params) const;
 
        ///
        LColor::color realColor() const;
@@ -324,8 +325,7 @@ public:
        ///
        friend 
        bool operator!=(LyXFont const & font1, LyXFont const & font2) {
-               return font1.bits != font2.bits ||
-                       font1.lang != font2.lang;
+               return !(font1 == font2);
        }
 
        /// compares two fonts, ignoring the setting of the Latex part.
@@ -526,14 +526,14 @@ Language const * LyXFont::language() const
 inline
 bool LyXFont::isRightToLeft() const 
 {
-       return lang->RightToLeft;
+       return lang->RightToLeft();
 }
 
 
 inline
 bool LyXFont::isVisibleRightToLeft() const 
 {
-       return (lang->RightToLeft && latex() != ON);
+       return (lang->RightToLeft() && latex() != ON);
 }