From 429c5d71600fcd6bcc23a773509c1dd724ab4604 Mon Sep 17 00:00:00 2001 From: Martin Vermeer Date: Sat, 28 Jan 2006 12:39:22 +0000 Subject: [PATCH] Fix 2019: take inset's own font settings into account when defining font to reduce to git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10784 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 5 +++++ src/text2.C | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 83dd478997..8226045f6c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2006-01-28 Martin Vermeer + + * text2.C (setCharFont): take inset's own font settings into account + when defining the font to reduce to, fixes 2019 + 2006-01-28 Jürgen Spitzmüller * bufferview_funcs.C (coordOffset): remove the check for diff --git a/src/text2.C b/src/text2.C index f1aeeca687..15a25fd3d6 100644 --- a/src/text2.C +++ b/src/text2.C @@ -283,6 +283,11 @@ void LyXText::setCharFont(pit_type pit, pos_type pos, LyXFont const & fnt) } } + // Inside inset, apply the inset's font attributes if any + // (charstyle!) + if (!isMainText()) + layoutfont.realize(font_); + layoutfont.realize(defaultfont_); // Now, reduce font against full layout font -- 2.39.2