anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-25 05:55:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix display of emphasize in slanted text

Browse Source 
Fixes bug #12175.

(cherry picked from commit 610ea7f4f5)
This commit is contained in:
Jean-Marc Lasgouttes 2021-03-07 13:29:21 +01:00
parent 0f17c6a98f
commit 4b2bb08884
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/FontInfo.h
View File

@ -125,7 +125,8 @@ public:
if (noun_ == FONT_ON) if (noun_ == FONT_ON)
return SMALLCAPS_SHAPE; return SMALLCAPS_SHAPE;
if (emph_ == FONT_ON) 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_; return shape_;
} }

3
status.23x
View File

@ -106,6 +106,9 @@ What's new
- Avoid pointless 'undefined flex inset' errors when changing document - Avoid pointless 'undefined flex inset' errors when changing document
settings (bug 12163). settings (bug 12163).
- Fix display of emphasize in slanted text (bug 12175).
* INTERNALS * INTERNALS