redraw fix 1.

[lyx.git] / src / lyxfont.C

diff --git a/src/lyxfont.C b/src/lyxfont.C
index 3a3b3f845bdefded459e4defed53862e6a48347d..8cd660eed0561da8b487b1240abdbf760913f4e4 100644 (file)
--- a/src/lyxfont.C
+++ b/src/lyxfont.C
@@ -23,7 +23,6 @@
 #include "lyxrc.h"
 #include "lyxlex.h"
 #include "language.h"
-#include "FontLoader.h"
 #include "support/lstrings.h"
 #include "bufferparams.h" // stateText
 
@@ -42,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] =
@@ -66,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] =
@@ -139,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;
 }
 
 
@@ -814,7 +808,7 @@ int LyXFont::latexWriteStartChanges(ostream & os, LyXFont const & base,
        bool env = false;
 
        if (language()->babel() != base.language()->babel() &&
-           language()->babel() != prev.language()->babel()) {
+           language() != prev.language()) {
                if (isRightToLeft() != prev.isRightToLeft()) {
                        if (isRightToLeft()) {
                                os << "\\R{";