From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Fri, 17 Jul 2015 10:07:52 +0000 (+0200)
Subject: Fix logic error in on-screen font shape
X-Git-Tag: 2.2.0alpha1~425
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=4cdd9732d3f29f212d6abda019e3cf88623272df;p=features.git

Fix logic error in on-screen font shape

This made text in smallcaps+emph display as upright instead of plain
emph. There is no latex font for smallcaps + emph, but it is not a
reason for displaying it wrong.
---

diff --git a/src/FontInfo.h b/src/FontInfo.h
index 2b639a926c..c31c7fac77 100644
--- a/src/FontInfo.h
+++ b/src/FontInfo.h
@@ -114,7 +114,7 @@ public:
 		if (noun_ == FONT_ON)
 			return SMALLCAPS_SHAPE;
 		if (emph_ == FONT_ON)
-			return (shape_ == UP_SHAPE) ? ITALIC_SHAPE : UP_SHAPE;
+			return (shape_ == ITALIC_SHAPE) ? UP_SHAPE : ITALIC_SHAPE;
 		return shape_;
 	}