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 83dd478997f0634aafce216dd7ad120a581e52c7..8226045f6cce97c44c5cc13ea74417fede518cbe 100644 (file)
--- 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 f1aeeca68751137a2d8b2a3ae70d35e7cba25eeb..15a25fd3d6c223a65d76937cf0f8324761d01c0c 100644 (file)
--- 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