Fix bug 2015: on screen fonts in nested environments can be wrong

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

diff --git a/src/ChangeLog b/src/ChangeLog
index df4234e1bb497bf505d0829e5f79c0f48d098454..d3904554567fa99f6366ecaf829b2a43239b3538 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-23  Martin Vermeer  <martin.vermeer@hut.fi>
+
+       * text2.C: fix bug 2015: on screen fonts in nested environments 
+       can be wrong
+
 2006-01-11  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 
        * converter.C (convert): handle unknown formats

diff --git a/src/text2.C b/src/text2.C
index 27c17921a23f79069954d75d81757cf41f333ba6..f1aeeca68751137a2d8b2a3ae70d35e7cba25eeb 100644 (file)
--- a/src/text2.C
+++ b/src/text2.C
@@ -191,6 +191,20 @@ LyXFont LyXText::getFont(Paragraph const & par, pos_type const pos) const
        if (!isMainText())
                applyOuterFont(font);
 
+       // Find the pit value belonging to paragraph. This will not break 
+       // even if pars_ would not be a vector anymore.
+       // Performance appears acceptable.
+
+       pit_type pit = pars_.size();
+       for (pit_type it = 0; it < pit; ++it)
+               if (&pars_[it] == &par) {
+                       pit = it;
+                       break;
+               }
+       // Realize against environment font information
+       if (pit < pars_.size())
+               font.realize(outerFont(pit, pars_));
+
        // Realize with the fonts of lesser depth.
        font.realize(defaultfont_);