redraw fix 1.

[lyx.git] / src / lyxfont.C

diff --git a/src/lyxfont.C b/src/lyxfont.C
index 447ce9873112c8f825e9f243bcecf9ef11c8eeec..8cd660eed0561da8b487b1240abdbf760913f4e4 100644 (file)
--- a/src/lyxfont.C
+++ b/src/lyxfont.C
@@ -41,7 +41,7 @@ namespace {
 
 char const * GUIFamilyNames[LyXFont::NUM_FAMILIES + 2 /* default & error */] =
 { N_("Roman"), N_("Sans serif"), N_("Typewriter"), N_("Symbol"),
-  "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak",
+  "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "wasy",
   N_("Inherit"), N_("Ignore") };
 
 char const * GUISeriesNames[4] =
@@ -65,7 +65,7 @@ char const * GUIMiscNames[5] =
 //
 char const * LyXFamilyNames[LyXFont::NUM_FAMILIES + 2 /* default & error */] =
 { "roman", "sans", "typewriter", "symbol",
-  "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak",
+  "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "wasy",
   "default", "error" };
 
 char const * LyXSeriesNames[4] =
@@ -138,23 +138,18 @@ LyXFont::FontBits LyXFont::ignore = {
        IGNORE };
 
 
-bool LyXFont::FontBits::operator==(LyXFont::FontBits const & fb1) const
+bool operator==(LyXFont::FontBits const & lhs,
+               LyXFont::FontBits const & rhs)
 {
-       return fb1.family == family &&
-               fb1.series == series &&
-               fb1.shape == shape &&
-               fb1.size == size &&
-               fb1.color == color &&
-               fb1.emph == emph &&
-               fb1.underbar == underbar &&
-               fb1.noun == noun &&
-               fb1.number == number;
-}
-
-
-bool LyXFont::FontBits::operator!=(LyXFont::FontBits const & fb1) const
-{
-       return !(fb1 == *this);
+       return lhs.family == rhs.family &&
+               lhs.series == rhs.series &&
+               lhs.shape == rhs.shape &&
+               lhs.size == rhs.size &&
+               lhs.color == rhs.color &&
+               lhs.emph == rhs.emph &&
+               lhs.underbar == rhs.underbar &&
+               lhs.noun == rhs.noun &&
+               lhs.number == rhs.number;
 }