namespace lyx {
-class Lexer;
+namespace support { class Lexer; }
///
class FontInfo
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_;
}
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);