From: Dov Feldstern <dov@lyx.org>
Date: Thu, 5 Jul 2007 17:47:25 +0000 (+0000)
Subject: Set a newly created inset's font/language to the current font/language.
X-Git-Tag: 1.6.10~9201
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=a4c5f67f5e04d9658c6066a0e7ede334b4c587d2;p=features.git

Set a newly created inset's font/language to the current font/language.

Fixes http://bugzilla.lyx.org/show_bug.cgi?id=3959


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18993 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 8a744a7d35..8054bb9daa 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -1254,7 +1254,19 @@ void Paragraph::insertInset(pos_type pos, Inset * inset,
 			    Font const & font, Change const & change)
 {
 	pimpl_->insertInset(pos, inset, change);
+	// Set the font/language of the inset...
 	setFont(pos, font);
+	// ... as well as the font/language of the text inside the inset
+	// FIXME: This is far from perfect. It basically overrides work being done
+	// in the InsetText constructor. Also, it doesn't work for Tables 
+	// (precisely because each cell's font/language is set in the Table's 
+	// constructor, so by now it's too late). The long-term solution should
+	// be moving current_font into Cursor, and getting rid of all this...
+	// (see http://thread.gmane.org/gmane.editors.lyx.devel/88869/focus=88944)
+	if (inset->asTextInset()) {
+		inset->asTextInset()->text_.current_font = font;
+		inset->asTextInset()->text_.real_current_font = font;
+	}
 }