X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFontInfo.h;h=42eea31e9209f05ceb3a8ada7402c71eecc52ad2;hb=0885098bd3c07ca71024c4fe1bc7d6a1879918f6;hp=696e64db47b2ce69af842ee3b0c0019bdbc818da;hpb=57dc817581faf54babaf3db0c602bac205dc6855;p=lyx.git diff --git a/src/FontInfo.h b/src/FontInfo.h index 696e64db47..42eea31e92 100644 --- a/src/FontInfo.h +++ b/src/FontInfo.h @@ -39,6 +39,7 @@ public: FontSeries series, FontShape shape, FontSize size, + MathStyle style, ColorCode color, ColorCode background, FontState emph, @@ -51,7 +52,7 @@ public: FontState number, FontState nospellcheck) : family_(family), series_(series), shape_(shape), size_(size), - style_(LM_ST_TEXT), color_(color), background_(background), emph_(emph), + style_(style), color_(color), background_(background), emph_(emph), underbar_(underbar), strikeout_(strikeout), xout_(xout), uuline_(uuline), uwave_(uwave), noun_(noun), number_(number), nospellcheck_(nospellcheck) {} @@ -160,6 +161,9 @@ public: /// \param realize the \param font against the current FontInfo. Changer change(FontInfo font, bool realize = false); + /// Build GUI description of font state + docstring const stateText(bool const terse = false) const; + private: friend bool operator==(FontInfo const & lhs, FontInfo const & rhs); @@ -206,6 +210,7 @@ inline bool operator==(FontInfo const & lhs, FontInfo const & rhs) && lhs.series_ == rhs.series_ && lhs.shape_ == rhs.shape_ && lhs.size_ == rhs.size_ + && lhs.style_ == rhs.style_ && lhs.color_ == rhs.color_ && lhs.background_ == rhs.background_ && lhs.emph_ == rhs.emph_