X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFontInfo.h;h=42eea31e9209f05ceb3a8ada7402c71eecc52ad2;hb=dab71087cf2954b77d3d2c0e67b868f9be82fba9;hp=9f38000e666e371215ab9725000774aacddd6323;hpb=51aebc9327345f6ea065035f489dbfec1568279f;p=lyx.git

diff --git a/src/FontInfo.h b/src/FontInfo.h
index 9f38000e66..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,
@@ -48,11 +49,12 @@ public:
 		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),
+		style_(style), color_(color), background_(background), emph_(emph),
 		underbar_(underbar), strikeout_(strikeout), xout_(xout), uuline_(uuline),
-		uwave_(uwave), noun_(noun), number_(number)
+		uwave_(uwave), noun_(noun), number_(number), nospellcheck_(nospellcheck)
 	{}
 
 	/// Decreases font size by one
@@ -92,6 +94,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; }
 	//@}
 
 	///
@@ -157,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);
 
@@ -192,6 +199,8 @@ private:
 	FontState noun_;
 	///
 	FontState number_;
+	///
+	FontState nospellcheck_;
 };
 
 
@@ -201,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_
@@ -210,7 +220,8 @@ inline bool operator==(FontInfo const & lhs, FontInfo const & rhs)
 		&& lhs.uuline_ == rhs.uuline_
 		&& lhs.uwave_ == rhs.uwave_
 		&& lhs.noun_ == rhs.noun_
-		&& lhs.number_ == rhs.number_;
+		&& lhs.number_ == rhs.number_
+		&& lhs.nospellcheck_ == rhs.nospellcheck_;
 }