Fix display of emphasize in slanted text

Fixes bug #12175.

(cherry picked from commit 610ea7f4f503d690287c75fc5e8b003e1d7b5c96)

diff --git a/src/FontInfo.h b/src/FontInfo.h
index 9f38000e666e371215ab9725000774aacddd6323..d090c8f56f82602e5da1a2c57db80591192d32d5 100644 (file)
--- a/src/FontInfo.h
+++ b/src/FontInfo.h
@@ -125,7 +125,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_;
        }
 

diff --git a/status.23x b/status.23x
index 2e3615dd2ff2d78322f900e8d1970a6d460a9611..8a52f53d217a96a06d26c8d5e04d1d966fe5d44f 100644 (file)
--- a/status.23x
+++ b/status.23x
@@ -106,6 +106,9 @@ What's new
 - Avoid pointless 'undefined flex inset' errors when changing document
   settings (bug 12163).
 
+- Fix display of emphasize in slanted text (bug 12175).
+
+
 
 * INTERNALS