anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix #924

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6317 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2003-03-03 12:02:28 +00:00
parent b15159f000
commit 534ad2bfc3
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/mathed/math_frameboxinset.C
View File

@ -10,7 +10,7 @@
MathFrameboxInset::MathFrameboxInset()
: MathNestInset(2)
: MathNestInset(3)
{}
@ -27,7 +27,8 @@ void MathFrameboxInset::metrics(MathMetricsInfo & mi) const
MathNestInset::metrics(mi);
dim_ = cell(0).dim();
dim_ += cell(1).dim();
dim_.w += 2 * w_ + 4;
dim_ += cell(2).dim();
dim_.w += 4 * w_ + 4;
metricsMarkers2(5); // 5 pixels margin
}
@ -38,26 +39,36 @@ void MathFrameboxInset::draw(MathPainterInfo & pi, int x, int y) const
pi.pain.rectangle(x + 1, y - ascent() + 1, width() - 2, height() - 2,
LColor::black);
x += 5;
drawStrBlack(pi, x, y, "[");
x += w_;
cell(0).draw(pi, x, y);
x += cell(0).width();
drawStrBlack(pi, x, y, "]");
x += w_ + 4;
drawStrBlack(pi, x, y, "[");
x += w_;
cell(1).draw(pi, x, y);
x += cell(1).width();
drawStrBlack(pi, x, y, "]");
x += w_ + 4;
cell(2).draw(pi, x, y);
}
void MathFrameboxInset::write(WriteStream & os) const
{
os << "\\framebox";
if (cell(0).size())
os << '[' << cell(0) << ']';
os << '{' << cell(1) << '}';
os << '[' << cell(0) << ']';
if (cell(1).size())
os << '[' << cell(1) << ']';
os << '{' << cell(2) << '}';
}
void MathFrameboxInset::normalize(NormalStream & os) const
{
os << "[framebox " << cell(0) << ' ' << cell(1) << ']';
os << "[framebox " << cell(0) << ' ' << cell(1) << ' ' << cell(2) << ']';
}

3
src/mathed/math_parser.C
View File

@ -1124,7 +1124,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, MathInset::TEXT_MODE);
parse(cell->back().nucleus()->cell(1), FLAG_ITEM, MathInset::TEXT_MODE);
parse(cell->back().nucleus()->cell(1), FLAG_OPTION, MathInset::TEXT_MODE);
parse(cell->back().nucleus()->cell(2), FLAG_ITEM, MathInset::TEXT_MODE);
}
#if 0