Remove special code for CJK that is no longer required (amends e665715fc4).

[lyx.git] / src / FontInfo.h

diff --git a/src/FontInfo.h b/src/FontInfo.h
index c093474c459f378a230f7211d77ed4a73d7e4f73..696e64db47b2ce69af842ee3b0c0019bdbc818da 100644 (file)
--- a/src/FontInfo.h
+++ b/src/FontInfo.h
@@ -44,14 +44,16 @@ public:
                FontState  emph,
                FontState  underbar,
                FontState  strikeout,
+               FontState  xout,
                FontState  uuline,
                FontState  uwave,
                FontState  noun,
-               FontState  number)
+               FontState  number,
+               FontState  nospellcheck)
                : family_(family), series_(series), shape_(shape), size_(size),
                style_(LM_ST_TEXT), color_(color), background_(background), emph_(emph),
-               underbar_(underbar), strikeout_(strikeout), uuline_(uuline),
-               uwave_(uwave), noun_(noun), number_(number)
+               underbar_(underbar), strikeout_(strikeout), xout_(xout), uuline_(uuline),
+               uwave_(uwave), noun_(noun), number_(number), nospellcheck_(nospellcheck)
        {}
 
        /// Decreases font size by one
@@ -77,6 +79,8 @@ public:
        void setUnderbar(FontState u) { underbar_ = u; }
        FontState strikeout() const { return strikeout_; }
        void setStrikeout(FontState s) { strikeout_ = s; }
+       FontState xout() const { return xout_; }
+       void setXout(FontState s) { xout_ = s; }
        FontState uuline() const { return uuline_; }
        void setUuline(FontState s) { uuline_ = s; }
        FontState uwave() const { return uwave_; }
@@ -89,6 +93,8 @@ public:
        void setColor(ColorCode c) { color_ = c; }
        ColorCode background() const { return background_; }
        void setBackground(ColorCode b) { background_ = b; }
+       FontState nospellcheck() const { return nospellcheck_; }
+       void setNoSpellcheck(FontState n) { nospellcheck_ = n; }
        //@}
 
        ///
@@ -103,7 +109,7 @@ public:
        /// Is a given font fully resolved?
        bool resolved() const;
 
-       /// The real color of the font. This can be the color that is 
+       /// The real color of the font. This can be the color that is
        /// set for painting, the color of the font or a default color.
        Color realColor() const;
        /// Sets the color which is used during painting
@@ -180,6 +186,8 @@ private:
        ///
        FontState strikeout_;
        ///
+       FontState xout_;
+       ///
        FontState uuline_;
        ///
        FontState uwave_;
@@ -187,6 +195,8 @@ private:
        FontState noun_;
        ///
        FontState number_;
+       ///
+       FontState nospellcheck_;
 };
 
 
@@ -201,10 +211,12 @@ inline bool operator==(FontInfo const & lhs, FontInfo const & rhs)
                && lhs.emph_ == rhs.emph_
                && lhs.underbar_ == rhs.underbar_
                && lhs.strikeout_ == rhs.strikeout_
+               && lhs.xout_ == rhs.xout_
                && lhs.uuline_ == rhs.uuline_
                && lhs.uwave_ == rhs.uwave_
                && lhs.noun_ == rhs.noun_
-               && lhs.number_ == rhs.number_;
+               && lhs.number_ == rhs.number_
+               && lhs.nospellcheck_ == rhs.nospellcheck_;
 }