[LyX/2.3.x] Fix display of emphasize in slanted text
Jean-Marc Lasgouttes
lasgouttes at lyx.org
Sat Mar 27 18:33:30 UTC 2021
commit 4b2bb08884be6b8317ea0bc3cca76ce223c477bd
Author: Jean-Marc Lasgouttes <lasgouttes at lyx.org>
Date: Sun Mar 7 13:29:21 2021 +0100
Fix display of emphasize in slanted text
Fixes bug #12175.
(cherry picked from commit 610ea7f4f503d690287c75fc5e8b003e1d7b5c96)
---
src/FontInfo.h | 3 ++-
status.23x | 3 +++
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/FontInfo.h b/src/FontInfo.h
index 9f38000..d090c8f 100644
--- 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 2e3615d..8a52f53 100644
--- 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
More information about the lyx-cvs
mailing list