Jean-Marc,
please consider to apply this to 1.3.1cvs.
Andre'
--
Those who desire to give up Freedom in order to gain Security,
will not have, nor do they deserve, either one. (T. Jefferson)
? tmp.diff
? 1.diff
? cut.diff
? crash.diff
? haveit
? script.diff
? all
? rmcopyright.sh
? .math_decorationinset.C.swp
? shared_ptr.diff
Index: math_frameboxinset.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_frameboxinset.C,v
retrieving revision 1.2
diff -u -p -r1.2 math_frameboxinset.C
--- math_frameboxinset.C 13 Feb 2003 16:53:09 -0000 1.2
+++ math_frameboxinset.C 3 Mar 2003 11:55:05 -0000
@@ -22,6 +22,7 @@ MathInset * MathFrameboxInset::clone() c
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(MathMetr
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;
Index: math_frameboxinset.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_frameboxinset.h,v
retrieving revision 1.3
diff -u -p -r1.3 math_frameboxinset.h
--- math_frameboxinset.h 13 Feb 2003 16:53:09 -0000 1.3
+++ math_frameboxinset.h 3 Mar 2003 11:55:05 -0000
@@ -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_;
Index: math_parser.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_parser.C,v
retrieving revision 1.263
diff -u -p -r1.263 math_parser.C
--- math_parser.C 25 Feb 2003 15:48:47 -0000 1.263
+++ math_parser.C 3 Mar 2003 11:55:05 -0000
@@ -1123,8 +1123,8 @@ void Parser::parse1(MathGridInset & grid
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
