X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFontInfo.h;h=3feefca662b562661ca8d626a3ddc737148e7735;hb=124e0fc2be2446f7182cba0e5b54961dc1cfab91;hp=42eea31e9209f05ceb3a8ada7402c71eecc52ad2;hpb=c3f10df95d33dd5157e703d08dfc2a3c69c6949f;p=lyx.git

diff --git a/src/FontInfo.h b/src/FontInfo.h
index 42eea31e92..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_;
 	}