X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFontInfo.h;h=3feefca662b562661ca8d626a3ddc737148e7735;hb=e4b80698be91708ce1b9fd86d6032245ef4f3dc7;hp=3e0ac5d4a7a566d28f2c765124c0307d4f19c224;hpb=cfb8b214d182052ee0ac2475de936273c51f2d99;p=lyx.git

diff --git a/src/FontInfo.h b/src/FontInfo.h
index 3e0ac5d4a7..3feefca662 100644
--- a/src/FontInfo.h
+++ b/src/FontInfo.h
@@ -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);