From: Martin Vermeer <martin.vermeer@hut.fi>
Date: Sat, 28 Jan 2006 12:39:22 +0000 (+0000)
Subject: Fix 2019: take inset's own font settings into account when defining font to
X-Git-Tag: 1.6.10~13661
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=429c5d71600fcd6bcc23a773509c1dd724ab4604;p=features.git

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
---

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  <martin.vermeer@hut.fi>
+
+	* 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  <j.spitzmueller@gmx.de>
 
 	* 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