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

Make Angus' compiler happy

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3794 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2002-03-21 06:57:13 +00:00
parent 6cb48573c0
commit 277e305082
22 changed files with 85 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mathed/formula.C
View File

@ -297,9 +297,9 @@ int InsetFormula::ascii(Buffer const *, ostream & os, int) const
{ {
#if 1 #if 1
TextMetricsInfo mi; TextMetricsInfo mi;
par()->metrics(mi); par()->metricsT(mi);
TextPainter tpain(par()->width(), par()->height()); TextPainter tpain(par()->width(), par()->height());
par()->draw(tpain, 0, par()->ascent()); par()->drawT(tpain, 0, par()->ascent());
tpain.show(os); tpain.show(os);
// reset metrics cache to "real" values // reset metrics cache to "real" values
metrics(); metrics();

4
src/mathed/math_charinset.C
View File

@ -80,7 +80,7 @@ void MathCharInset::draw(Painter & pain, int x, int y) const
} }
void MathCharInset::metrics(TextMetricsInfo const &) const void MathCharInset::metricsT(TextMetricsInfo const &) const
{ {
width_ = 1; width_ = 1;
ascent_ = 1; ascent_ = 1;
@ -88,7 +88,7 @@ void MathCharInset::metrics(TextMetricsInfo const &) const
} }
void MathCharInset::draw(TextPainter & pain, int x, int y) const void MathCharInset::drawT(TextPainter & pain, int x, int y) const
{ {
//lyxerr << "drawing text '" << char_ << "' code: " << code_ << endl; //lyxerr << "drawing text '" << char_ << "' code: " << code_ << endl;
pain.draw(x, y, char_); pain.draw(x, y, char_);

4
src/mathed/math_charinset.h
View File

@ -27,9 +27,9 @@ public:
/// ///
void draw(Painter &, int x, int y) const; void draw(Painter &, int x, int y) const;
/// ///
void metrics(TextMetricsInfo const & st) const; void metricsT(TextMetricsInfo const & st) const;
/// ///
void draw(TextPainter &, int x, int y) const; void drawT(TextPainter &, int x, int y) const;
/// ///
void write(WriteStream & os) const; void write(WriteStream & os) const;
/// ///

4
src/mathed/math_diminset.C
View File

@ -4,7 +4,7 @@
#include "textpainter.h" #include "textpainter.h"
void MathDimInset::metrics(TextMetricsInfo const &) const void MathDimInset::metricsT(TextMetricsInfo const &) const
{ {
std::ostringstream os; std::ostringstream os;
os << *this; os << *this;
@ -14,7 +14,7 @@ void MathDimInset::metrics(TextMetricsInfo const &) const
} }
void MathDimInset::draw(TextPainter & pain, int x, int y) const void MathDimInset::drawT(TextPainter & pain, int x, int y) const
{ {
std::ostringstream os; std::ostringstream os;
os << *this; os << *this;

4
src/mathed/math_diminset.h
View File

@ -17,9 +17,9 @@ public:
/// read width /// read width
int width() const { return width_; } int width() const { return width_; }
/// ///
void metrics(TextMetricsInfo const &) const; void metricsT(TextMetricsInfo const &) const;
/// ///
void draw(TextPainter & pain, int x, int y) const; void drawT(TextPainter & pain, int x, int y) const;
protected: protected:
/// ///

12
src/mathed/math_fracinset.C
View File

@ -51,21 +51,21 @@ void MathFracInset::draw(Painter & pain, int x, int y) const
} }
void MathFracInset::metrics(TextMetricsInfo const & mi) const void MathFracInset::metricsT(TextMetricsInfo const & mi) const
{ {
xcell(0).metrics(mi); xcell(0).metricsT(mi);
xcell(1).metrics(mi); xcell(1).metricsT(mi);
width_ = max(xcell(0).width(), xcell(1).width()); width_ = max(xcell(0).width(), xcell(1).width());
ascent_ = xcell(0).height() + 1; ascent_ = xcell(0).height() + 1;
descent_ = xcell(1).height(); descent_ = xcell(1).height();
} }
void MathFracInset::draw(TextPainter & pain, int x, int y) const void MathFracInset::drawT(TextPainter & pain, int x, int y) const
{ {
int m = x + width() / 2; int m = x + width() / 2;
xcell(0).draw(pain, m - xcell(0).width() / 2, y - xcell(0).descent() - 1); xcell(0).drawT(pain, m - xcell(0).width() / 2, y - xcell(0).descent() - 1);
xcell(1).draw(pain, m - xcell(1).width() / 2, y + xcell(1).ascent()); xcell(1).drawT(pain, m - xcell(1).width() / 2, y + xcell(1).ascent());
if (!atop_) if (!atop_)
pain.horizontalLine(x, y, width()); pain.horizontalLine(x, y, width());
} }

4
src/mathed/math_fracinset.h
View File

@ -22,9 +22,9 @@ public:
/// ///
void draw(Painter &, int x, int y) const; void draw(Painter &, int x, int y) const;
/// ///
void metrics(TextMetricsInfo const & mi) const; void metricsT(TextMetricsInfo const & mi) const;
/// ///
void draw(TextPainter &, int x, int y) const; void drawT(TextPainter &, int x, int y) const;
/// ///
MathFracInset * asFracInset(); MathFracInset * asFracInset();

8
src/mathed/math_gridinset.C
View File

@ -376,12 +376,12 @@ void MathGridInset::draw(Painter & pain, int x, int y) const
} }
void MathGridInset::metrics(TextMetricsInfo const & mi) const void MathGridInset::metricsT(TextMetricsInfo const & mi) const
{ {
// let the cells adjust themselves // let the cells adjust themselves
//MathNestInset::metrics(mi); //MathNestInset::metrics(mi);
for (idx_type i = 0; i < nargs(); ++i) for (idx_type i = 0; i < nargs(); ++i)
xcell(i).metrics(mi); xcell(i).metricsT(mi);
// compute absolute sizes of vertical structure // compute absolute sizes of vertical structure
for (row_type row = 0; row < nrows(); ++row) { for (row_type row = 0; row < nrows(); ++row) {
@ -466,10 +466,10 @@ void MathGridInset::metrics(TextMetricsInfo const & mi) const
} }
void MathGridInset::draw(TextPainter & pain, int x, int y) const void MathGridInset::drawT(TextPainter & pain, int x, int y) const
{ {
for (idx_type idx = 0; idx < nargs(); ++idx) for (idx_type idx = 0; idx < nargs(); ++idx)
xcell(idx).draw(pain, x + cellXOffset(idx), y + cellYOffset(idx)); xcell(idx).drawT(pain, x + cellXOffset(idx), y + cellYOffset(idx));
} }

4
src/mathed/math_gridinset.h
View File

@ -74,9 +74,9 @@ public:
/// ///
void draw(Painter &, int x, int y) const; void draw(Painter &, int x, int y) const;
/// ///
void metrics(TextMetricsInfo const & st) const; void metricsT(TextMetricsInfo const & st) const;
/// ///
void draw(TextPainter &, int x, int y) const; void drawT(TextPainter &, int x, int y) const;
/// ///
void halign(string const &); void halign(string const &);
/// ///

4
src/mathed/math_hullinset.C
View File

@ -200,7 +200,7 @@ void MathHullInset::draw(Painter & pain, int x, int y) const
} }
/* /*
void MathHullInset::metrics(TextMetricsInfo const & mi) const void MathHullInset::metricsT(TextMetricsInfo const & mi) const
{ {
ascent_ = 1; ascent_ = 1;
descent_ = 0; descent_ = 0;
@ -208,7 +208,7 @@ void MathHullInset::metrics(TextMetricsInfo const & mi) const
} }
void MathHullInset::draw(TextPainter & pain, int x, int y) const void MathHullInset::drawT(TextPainter & pain, int x, int y) const
{ {
pain.draw(x, y, normalName(objtype_).c_str()); pain.draw(x, y, normalName(objtype_).c_str());
MathGridInset::draw(pain, x, y); MathGridInset::draw(pain, x, y);

4
src/mathed/math_hullinset.h
View File

@ -31,9 +31,9 @@ public:
/// ///
void draw(Painter &, int x, int y) const; void draw(Painter &, int x, int y) const;
/// ///
//void metrics(TextMetricsInfo const & st) const; //void metricsT(TextMetricsInfo const & st) const;
/// ///
//void draw(TextPainter &, int x, int y) const; //void drawT(TextPainter &, int x, int y) const;
/// ///
string label(row_type row) const; string label(row_type row) const;
/// ///

8
src/mathed/math_inset.C
View File

@ -206,15 +206,15 @@ void MathInset::draw(Painter &, int, int) const
} }
void MathInset::metrics(TextMetricsInfo const &) const void MathInset::metricsT(TextMetricsInfo const &) const
{ {
lyxerr << "MathInset::metrics(Text) called directly!\n"; lyxerr << "MathInset::metricsT(Text) called directly!\n";
} }
void MathInset::draw(TextPainter &, int, int) const void MathInset::drawT(TextPainter &, int, int) const
{ {
lyxerr << "MathInset::draw(Text) called directly!\n"; lyxerr << "MathInset::drawT(Text) called directly!\n";
} }

4
src/mathed/math_inset.h
View File

@ -110,9 +110,9 @@ public:
virtual void draw(Painter &, int x, int y) const; virtual void draw(Painter &, int x, int y) const;
/// the ascent of the inset above the baseline /// the ascent of the inset above the baseline
/// compute the size of the object for text based drawing /// compute the size of the object for text based drawing
virtual void metrics(TextMetricsInfo const & st) const; virtual void metricsT(TextMetricsInfo const & st) const;
/// draw the object as text /// draw the object as text
virtual void draw(TextPainter &, int x, int y) const; virtual void drawT(TextPainter &, int x, int y) const;
/// the ascent of the inset above the baseline /// the ascent of the inset above the baseline
virtual int ascent() const { return 1; } virtual int ascent() const { return 1; }
/// the descent of the inset below the baseline /// the descent of the inset below the baseline

4
src/mathed/math_metricsinfo.h
View File

@ -53,10 +53,6 @@ struct TextMetricsInfo {
/// ///
TextMetricsInfo() TextMetricsInfo()
{} {}
/// used to pass some info down
MathNestInset const * inset;
///
int idx;
}; };
#endif #endif

54
src/mathed/math_scriptinset.C
View File

@ -198,27 +198,6 @@ void MathScriptInset::metrics(MathInset const * nuc,
} }
void MathScriptInset::metrics(TextMetricsInfo const & mi) const
{
metrics(0, mi);
}
void MathScriptInset::metrics(MathInset const * nuc,
TextMetricsInfo const & mi) const
{
if (hasUp())
up().metrics(mi);
if (hasDown())
down().metrics(mi);
if (nuc)
nuc->metrics(mi);
//ascent_ = ascent2(nuc);
//descent_ = descent2(nuc);
//width_ = width2(nuc);
}
void MathScriptInset::draw(Painter & pain, int x, int y) const void MathScriptInset::draw(Painter & pain, int x, int y) const
{ {
//lyxerr << "unexpected call to MathScriptInset::draw()\n"; //lyxerr << "unexpected call to MathScriptInset::draw()\n";
@ -226,6 +205,27 @@ void MathScriptInset::draw(Painter & pain, int x, int y) const
} }
void MathScriptInset::metricsT(TextMetricsInfo const & mi) const
{
metricsT(0, mi);
}
void MathScriptInset::metricsT(MathInset const * nuc,
TextMetricsInfo const & mi) const
{
if (hasUp())
up().metricsT(mi);
if (hasDown())
down().metricsT(mi);
if (nuc)
nuc->metricsT(mi);
//ascent_ = ascent2(nuc);
//descent_ = descent2(nuc);
//width_ = width2(nuc);
}
void MathScriptInset::draw(MathInset const * nuc, Painter & pain, void MathScriptInset::draw(MathInset const * nuc, Painter & pain,
int x, int y) const int x, int y) const
{ {
@ -241,22 +241,22 @@ void MathScriptInset::draw(MathInset const * nuc, Painter & pain,
down().draw(pain, x + dx0(nuc), y + dy0(nuc)); down().draw(pain, x + dx0(nuc), y + dy0(nuc));
} }
void MathScriptInset::draw(TextPainter & pain, int x, int y) const void MathScriptInset::drawT(TextPainter & pain, int x, int y) const
{ {
//lyxerr << "unexpected call to MathScriptInset::draw()\n"; //lyxerr << "unexpected call to MathScriptInset::draw()\n";
draw(0, pain, x, y); drawT(0, pain, x, y);
} }
void MathScriptInset::draw(MathInset const * nuc, TextPainter & pain, void MathScriptInset::drawT(MathInset const * nuc, TextPainter & pain,
int x, int y) const int x, int y) const
{ {
if (nuc) if (nuc)
nuc->draw(pain, x + dxx(nuc), y); nuc->drawT(pain, x + dxx(nuc), y);
if (hasUp()) if (hasUp())
up().draw(pain, x + dx1(nuc), y - dy1(nuc)); up().drawT(pain, x + dx1(nuc), y - dy1(nuc));
if (hasDown()) if (hasDown())
down().draw(pain, x + dx0(nuc), y + dy0(nuc)); down().drawT(pain, x + dx0(nuc), y + dy0(nuc));
} }

8
src/mathed/math_scriptinset.h
View File

@ -29,18 +29,18 @@ public:
/// ///
void draw(Painter &, int x, int y) const; void draw(Painter &, int x, int y) const;
/// ///
void metrics(TextMetricsInfo const & st) const; void metricsT(TextMetricsInfo const & st) const;
/// ///
void draw(TextPainter &, int x, int y) const; void drawT(TextPainter &, int x, int y) const;
/// ///
void metrics(MathInset const * nuc, MathMetricsInfo const & st) const; void metrics(MathInset const * nuc, MathMetricsInfo const & st) const;
/// ///
void draw(MathInset const * nuc, Painter &, int x, int y) const; void draw(MathInset const * nuc, Painter &, int x, int y) const;
/// ///
void metrics(MathInset const * nuc, TextMetricsInfo const & st) const; void metricsT(MathInset const * nuc, TextMetricsInfo const & st) const;
/// ///
void draw(MathInset const * nuc, TextPainter &, int x, int y) const; void drawT(MathInset const * nuc, TextPainter &, int x, int y) const;
/// ///
int ascent2(MathInset const * nuc) const; int ascent2(MathInset const * nuc) const;
/// ///

8
src/mathed/math_sqrtinset.C
View File

@ -44,18 +44,18 @@ void MathSqrtInset::draw(Painter & pain, int x, int y) const
} }
void MathSqrtInset::metrics(TextMetricsInfo const & mi) const void MathSqrtInset::metricsT(TextMetricsInfo const & mi) const
{ {
xcell(0).metrics(mi); xcell(0).metricsT(mi);
ascent_ = xcell(0).ascent() + 1; ascent_ = xcell(0).ascent() + 1;
descent_ = xcell(0).descent(); descent_ = xcell(0).descent();
width_ = xcell(0).width() + 2; width_ = xcell(0).width() + 2;
} }
void MathSqrtInset::draw(TextPainter & pain, int x, int y) const void MathSqrtInset::drawT(TextPainter & pain, int x, int y) const
{ {
xcell(0).draw(pain, x + 2, y); xcell(0).drawT(pain, x + 2, y);
pain.horizontalLine(x + 2, y - xcell(0).ascent(), xcell(0).width(), '_'); pain.horizontalLine(x + 2, y - xcell(0).ascent(), xcell(0).width(), '_');
pain.verticalLine (x + 1, y - xcell(0).ascent() + 1, xcell(0).height()); pain.verticalLine (x + 1, y - xcell(0).ascent() + 1, xcell(0).height());
pain.draw(x, y + xcell(0).descent(), '\\'); pain.draw(x, y + xcell(0).descent(), '\\');

4
src/mathed/math_sqrtinset.h
View File

@ -22,9 +22,9 @@ public:
/// ///
void metrics(MathMetricsInfo const & mi) const; void metrics(MathMetricsInfo const & mi) const;
/// ///
void draw(TextPainter &, int x, int y) const; void drawT(TextPainter &, int x, int y) const;
/// ///
void metrics(TextMetricsInfo const & mi) const; void metricsT(TextMetricsInfo const & mi) const;
/// ///
void write(WriteStream & os) const; void write(WriteStream & os) const;

8
src/mathed/math_symbolinset.C
View File

@ -77,7 +77,7 @@ void MathSymbolInset::metrics(MathMetricsInfo const & mi) const
MathTextCodes c = code(); MathTextCodes c = code();
if (sym_->latex_font_id > 0 && math_font_available(c)) { if (sym_->latex_font_id > 0 && math_font_available(c)) {
whichFont(font, c, mi_); whichFont(font, c, mi_);
mathed_char_dim(font, sym_->latex_font_id, ascent_, descent_, width_); mathed_char_dim(font, char(sym_->latex_font_id), ascent_, descent_, width_);
if (c == LM_TC_CMEX) { if (c == LM_TC_CMEX) {
h_ = 4 * descent_ / 5; h_ = 4 * descent_ / 5;
ascent_ += h_; ascent_ += h_;
@ -86,7 +86,7 @@ void MathSymbolInset::metrics(MathMetricsInfo const & mi) const
} else { } else {
if (sym_->id > 0 && sym_->id < 255 && math_font_available(LM_TC_SYMB)) { if (sym_->id > 0 && sym_->id < 255 && math_font_available(LM_TC_SYMB)) {
whichFont(font, code2(), mi_); whichFont(font, code2(), mi_);
mathed_char_dim(font, sym_->id, ascent_, descent_, width_); mathed_char_dim(font, char(sym_->id), ascent_, descent_, width_);
} else { } else {
whichFont(font, LM_TC_TEX, mi_); whichFont(font, LM_TC_TEX, mi_);
mathed_string_dim(font, sym_->name, ascent_, descent_, width_); mathed_string_dim(font, sym_->name, ascent_, descent_, width_);
@ -105,10 +105,10 @@ void MathSymbolInset::draw(Painter & pain, int x, int y) const
LyXFont font; LyXFont font;
if (sym_->latex_font_id > 0 && math_font_available(Code)) { if (sym_->latex_font_id > 0 && math_font_available(Code)) {
whichFont(font, Code, mi_); whichFont(font, Code, mi_);
drawChar(pain, font, x, y - h_, sym_->latex_font_id); drawChar(pain, font, x, y - h_, char(sym_->latex_font_id));
} else if (sym_->id > 0 && sym_->id < 255 && math_font_available(LM_TC_SYMB)){ } else if (sym_->id > 0 && sym_->id < 255 && math_font_available(LM_TC_SYMB)){
whichFont(font, code2(), mi_); whichFont(font, code2(), mi_);
drawChar(pain, font, x, y, sym_->id); drawChar(pain, font, x, y, char(sym_->id));
} else { } else {
whichFont(font, LM_TC_TEX, mi_); whichFont(font, LM_TC_TEX, mi_);
drawStr(pain, font, x, y, sym_->name); drawStr(pain, font, x, y, sym_->name);

12
src/mathed/math_xdata.C
View File

@ -114,7 +114,7 @@ void MathXArray::draw(Painter & pain, int x, int y) const
} }
void MathXArray::metrics(TextMetricsInfo const & mi) const void MathXArray::metricsT(TextMetricsInfo const & mi) const
{ {
//if (clean_) //if (clean_)
// return; // return;
@ -127,13 +127,13 @@ void MathXArray::metrics(TextMetricsInfo const & mi) const
MathInset const * p = it->nucleus(); MathInset const * p = it->nucleus();
MathScriptInset const * q = (it + 1 == end()) ? 0 : asScript(it); MathScriptInset const * q = (it + 1 == end()) ? 0 : asScript(it);
if (q) { if (q) {
q->metrics(p, mi); q->metricsT(p, mi);
ascent_ = max(ascent_, q->ascent2(p)); ascent_ = max(ascent_, q->ascent2(p));
descent_ = max(descent_, q->descent2(p)); descent_ = max(descent_, q->descent2(p));
width_ += q->width2(p); width_ += q->width2(p);
++it; ++it;
} else { } else {
p->metrics(mi); p->metricsT(mi);
ascent_ = max(ascent_, p->ascent()); ascent_ = max(ascent_, p->ascent());
descent_ = max(descent_, p->descent()); descent_ = max(descent_, p->descent());
width_ += p->width(); width_ += p->width();
@ -142,7 +142,7 @@ void MathXArray::metrics(TextMetricsInfo const & mi) const
} }
void MathXArray::draw(TextPainter & pain, int x, int y) const void MathXArray::drawT(TextPainter & pain, int x, int y) const
{ {
//if (drawn_ && x == xo_ && y == yo_) //if (drawn_ && x == xo_ && y == yo_)
// return; // return;
@ -159,11 +159,11 @@ void MathXArray::draw(TextPainter & pain, int x, int y) const
MathInset const * p = it->nucleus(); MathInset const * p = it->nucleus();
MathScriptInset const * q = (it + 1 == et) ? 0 : asScript(it); MathScriptInset const * q = (it + 1 == et) ? 0 : asScript(it);
if (q) { if (q) {
q->draw(p, pain, x, y); q->drawT(p, pain, x, y);
x += q->width2(p); x += q->width2(p);
++it; ++it;
} else { } else {
p->draw(pain, x, y); p->drawT(pain, x, y);
x += p->width(); x += p->width();
} }
} }

4
src/mathed/math_xdata.h
View File

@ -34,9 +34,9 @@ public:
/// redraw cell using cache metrics information /// redraw cell using cache metrics information
void draw(Painter & pain, int x, int y) const; void draw(Painter & pain, int x, int y) const;
/// rebuild cached metrics information /// rebuild cached metrics information
void metrics(TextMetricsInfo const & st) const; void metricsT(TextMetricsInfo const & st) const;
/// redraw cell using cache metrics information /// redraw cell using cache metrics information
void draw(TextPainter & pain, int x, int y) const; void drawT(TextPainter & pain, int x, int y) const;
/// mark cell for re-drawing /// mark cell for re-drawing
void touch() const; void touch() const;

4
src/mathed/math_xyarrowinset.C
View File

@ -48,8 +48,8 @@ MathXArray const & MathXYArrowInset::targetCell() const
} }
} }
//lyxerr << "target: x: " << x << " y: " << y << "\n"; //lyxerr << "target: x: " << x << " y: " << y << "\n";
int n = mi_.idx + p->ncols() * y + x; MathInset::idx_type n = mi_.idx + p->ncols() * y + x;
if (n < 0 || n >= int(p->nargs())) { if (n >= p->nargs()) {
lyxerr << "source: n: " << mi_.idx << "\n"; lyxerr << "source: n: " << mi_.idx << "\n";
lyxerr << "target: n: " << n << " out of range\n"; lyxerr << "target: n: " << n << " out of range\n";
n = 0; n = 0;