Remove undisclosed imports (from xxx import *)

[lyx.git] / src / FontInfo.h

diff --git a/src/FontInfo.h b/src/FontInfo.h
index 3e0ac5d4a7a566d28f2c765124c0307d4f19c224..bd0f125a7a594eb3285b2392b258fdfbc5fe05b3 100644 (file)
--- a/src/FontInfo.h
+++ b/src/FontInfo.h
@@ -25,7 +25,7 @@
 
 namespace lyx {
 
-class Lexer;
+namespace support { class Lexer; }
 
 ///
 class FontInfo
@@ -129,7 +129,8 @@ public:
                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_;
        }
 
@@ -161,6 +162,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);
 
@@ -253,7 +257,7 @@ void setLyXColor(std::string const &, FontInfo &);
 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);