A little cleanup of the layout files.

[lyx.git] / src / FontInfo.h

diff --git a/src/FontInfo.h b/src/FontInfo.h
index 8e05cee007da1f6ef6a094a5aa6137cf8ad0f5cc..3833b7c87b29077aba23d133b1a8bd2faafa8ac1 100644 (file)
--- a/src/FontInfo.h
+++ b/src/FontInfo.h
@@ -41,11 +41,15 @@ public:
                ColorCode background,
                FontState emph,
                FontState underbar,
+               FontState strikeout,
+               FontState uuline,
+               FontState uwave,
                FontState noun,
-               FontState number
-               ): family_(family), series_(series), shape_(shape), size_(size), 
+               FontState number)
+               : family_(family), series_(series), shape_(shape), size_(size), 
                color_(color), background_(background), paint_color_(), emph_(emph),
-               underbar_(underbar), noun_(noun), number_(number)
+               underbar_(underbar), strikeout_(strikeout), uuline_(uuline),
+               uwave_(uwave), noun_(noun), number_(number)
        {}
 
        /// Decreases font size by one
@@ -67,6 +71,12 @@ public:
        void setEmph(FontState e) { emph_ = e; }
        FontState underbar() const { return underbar_; }
        void setUnderbar(FontState u) { underbar_ = u; }
+       FontState strikeout() const { return strikeout_; }
+       void setStrikeout(FontState s) { strikeout_ = s; }
+       FontState uuline() const { return uuline_; }
+       void setUuline(FontState s) { uuline_ = s; }
+       FontState uwave() const { return uwave_; }
+       void setUwave(FontState s) { uwave_ = s; }
        FontState noun() const { return noun_; }
        void setNoun(FontState n) { noun_ = n; }
        FontState number() const { return number_; }
@@ -126,9 +136,6 @@ public:
 private:
        friend bool operator==(FontInfo const & lhs, FontInfo const & rhs);
 
-       /// The color used for painting
-       Color paint_color_;
-
        ///
        FontFamily family_;
        ///
@@ -141,11 +148,19 @@ private:
        ColorCode color_;
        ///
        ColorCode background_;
+       /// The color used for painting
+       Color paint_color_;
        ///
        FontState emph_;
        ///
        FontState underbar_;
        ///
+       FontState strikeout_;
+       ///
+       FontState uuline_;
+       ///
+       FontState uwave_;
+       ///
        FontState noun_;
        ///
        FontState number_;
@@ -162,6 +177,9 @@ inline bool operator==(FontInfo const & lhs, FontInfo const & rhs)
                && lhs.background_ == rhs.background_
                && lhs.emph_ == rhs.emph_
                && lhs.underbar_ == rhs.underbar_
+               && lhs.strikeout_ == rhs.strikeout_
+               && lhs.uuline_ == rhs.uuline_
+               && lhs.uwave_ == rhs.uwave_
                && lhs.noun_ == rhs.noun_
                && lhs.number_ == rhs.number_;
 }