namespace lyx {
-class Lexer;
+namespace support { class Lexer; }
///
class FontInfo
FontSeries series,
FontShape shape,
FontSize size,
+ MathStyle style,
ColorCode color,
ColorCode background,
FontState emph,
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)
{}
if (noun_ == FONT_ON)
return SMALLCAPS_SHAPE;
if (emph_ == FONT_ON)
- return (shape_ == ITALIC_SHAPE) ? UP_SHAPE : ITALIC_SHAPE;
+ return (shape_ == ITALIC_SHAPE || shape_ == SLANTED_SHAPE)
+ ? UP_SHAPE : ITALIC_SHAPE;
return shape_;
}
/// \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);
&& 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_
FontState setLyXMisc(std::string const &);
/// Read a font specification from Lexer. Used for layout files.
-FontInfo lyxRead(Lexer &, FontInfo const & fi = sane_font);
+FontInfo lyxRead(support::Lexer &, FontInfo const & fi = sane_font);
/// Write a font specification. Used for layout files.
void lyxWrite(std::ostream &, FontInfo const &, std::string const &, int);