]> git.lyx.org Git - features.git/commitdiff
Fix logic error in on-screen font shape
authorJean-Marc Lasgouttes <lasgouttes@lyx.org>
Fri, 17 Jul 2015 10:07:52 +0000 (12:07 +0200)
committerJean-Marc Lasgouttes <lasgouttes@lyx.org>
Fri, 17 Jul 2015 10:07:52 +0000 (12:07 +0200)
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.

src/FontInfo.h

index 2b639a926ca4fa8d7b6eb561824e35f1de870133..c31c7fac779f7173b512d7672d23924277332fee 100644 (file)
@@ -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_;
        }