*** empty log message ***

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

diff --git a/src/mathed/math_frameboxinset.C b/src/mathed/math_frameboxinset.C
index 3104f06ae9bdd927c6f4a05bba1c7d6c010e2288..d4266e8bdbadcacb0a7e61e9c4302f46c4469072 100644 (file)
--- a/src/mathed/math_frameboxinset.C
+++ b/src/mathed/math_frameboxinset.C
@@ -22,6 +22,7 @@ MathInset * MathFrameboxInset::clone() const
 
 void MathFrameboxInset::metrics(MathMetricsInfo & mi) const
 {
+       MathFontSetChanger dummy(mi.base, "textnormal");
        w_ = mathed_char_width(mi.base.font, '[');
        MathNestInset::metrics(mi);
        dim_    = cell(0).dim();
@@ -33,6 +34,7 @@ void MathFrameboxInset::metrics(MathMetricsInfo & mi) const
 
 void MathFrameboxInset::draw(MathPainterInfo & pi, int x, int y) const
 {
+       MathFontSetChanger dummy(pi.base, "textnormal");
        pi.pain.rectangle(x + 1, y - ascent() + 1, width() - 2, height() - 2,
                        LColor::black);
        x += 5;

diff --git a/src/mathed/math_frameboxinset.h b/src/mathed/math_frameboxinset.h
index c028e202e64c3db50e30b737457ac1ee97575e6d..c93cdb9cbe24bddc3e485833916dfcd28b5adc55 100644 (file)
--- a/src/mathed/math_frameboxinset.h
+++ b/src/mathed/math_frameboxinset.h
@@ -25,6 +25,8 @@ public:
        void write(WriteStream & os) const;
        /// write normalized content
        void normalize(NormalStream & ns) const;
+       ///
+       mode_type currentMode() const { return TEXT_MODE; }
 private:
        /// width of '[' in current font
        mutable int w_;

diff --git a/src/mathed/math_parser.C b/src/mathed/math_parser.C
index 76b78dccb8cbd876851b9ab9a3da00e4302312b1..91d2f6228fb3ad8b08ce148130cb9d10dac73f1c 100644 (file)
--- a/src/mathed/math_parser.C
+++ b/src/mathed/math_parser.C
@@ -1123,8 +1123,8 @@ void Parser::parse1(MathGridInset & grid, unsigned flags,
 
                else if (t.cs() == "framebox") {
                        cell->push_back(createMathInset(t.cs()));
-                       parse(cell->back().nucleus()->cell(0), FLAG_OPTION, mode);
-                       parse(cell->back().nucleus()->cell(1), FLAG_ITEM, mode);
+                       parse(cell->back().nucleus()->cell(0), FLAG_OPTION, MathInset::TEXT_MODE);
+                       parse(cell->back().nucleus()->cell(1), FLAG_ITEM, MathInset::TEXT_MODE);
                }
 
 #if 0