Unbreak citing from bibliography environment

[lyx.git] / src / FontInfo.h

diff --git a/src/FontInfo.h b/src/FontInfo.h
index b9d8cedd0da92ae3add6920ed43024fe9a260cf1..9f38000e666e371215ab9725000774aacddd6323 100644 (file)
--- a/src/FontInfo.h
+++ b/src/FontInfo.h
@@ -44,13 +44,14 @@ public:
                FontState  emph,
                FontState  underbar,
                FontState  strikeout,
+               FontState  xout,
                FontState  uuline,
                FontState  uwave,
                FontState  noun,
                FontState  number)
                : family_(family), series_(series), shape_(shape), size_(size),
                style_(LM_ST_TEXT), color_(color), background_(background), emph_(emph),
-               underbar_(underbar), strikeout_(strikeout), uuline_(uuline),
+               underbar_(underbar), strikeout_(strikeout), xout_(xout), uuline_(uuline),
                uwave_(uwave), noun_(noun), number_(number)
        {}
 
@@ -77,6 +78,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_; }
@@ -103,7 +106,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
@@ -145,14 +148,14 @@ public:
        }
 
        /// Temporarily replace the color with \param color.
-       Changer changeColor(ColorCode const color, bool cond = true);
+       Changer changeColor(ColorCode const color);
        /// Temporarily replace the shape with \param shape.
-       Changer changeShape(FontShape const shape, bool cond = true);
+       Changer changeShape(FontShape const shape);
        /// Temporarily replace the style
-       Changer changeStyle(MathStyle style, bool cond = true);
+       Changer changeStyle(MathStyle style);
        /// Temporarily replace the FontInfo with \param font, and optionally
        /// \param realize the \param font against the current FontInfo.
-       Changer change(FontInfo font, bool realize = false, bool cond = true);
+       Changer change(FontInfo font, bool realize = false);
 
 private:
        friend bool operator==(FontInfo const & lhs, FontInfo const & rhs);
@@ -180,6 +183,8 @@ private:
        ///
        FontState strikeout_;
        ///
+       FontState xout_;
+       ///
        FontState uuline_;
        ///
        FontState uwave_;
@@ -201,6 +206,7 @@ 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_