anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-14 06:57:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tiny bugfix; remove unnerded code

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3017 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2001-11-13 12:51:43 +00:00
parent 7f7275c914
commit 1e3e8aaac9
3 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/mathed/math_cursor.C
View File

@ -1176,19 +1176,6 @@ int MathCursor::cellYOffset() const
} }
int MathCursor::xpos() const
{
return cellXOffset() + xarray().pos2x(pos());
}
int MathCursor::ypos() const
{
return cellYOffset();
}
void MathCursor::gotoX(int x) void MathCursor::gotoX(int x)
{ {
pos() = xarray().x2pos(x - cellXOffset()); pos() = xarray().x2pos(x - cellXOffset());
@ -1286,7 +1273,7 @@ bool MathCursor::interpret(string const & s)
if (s.size() >= 5 && s.substr(0, 5) == "cases") { if (s.size() >= 5 && s.substr(0, 5) == "cases") {
unsigned int n = 1; unsigned int n = 1;
istringstream is(s.substr(6).c_str()); istringstream is(s.substr(5).c_str());
is >> n; is >> n;
n = std::max(1u, n); n = std::max(1u, n);
niceInsert(MathAtom(new MathCasesInset(n))); niceInsert(MathAtom(new MathCasesInset(n)));
@ -1298,7 +1285,7 @@ bool MathCursor::interpret(string const & s)
unsigned int n = 1; unsigned int n = 1;
string v_align; string v_align;
string h_align; string h_align;
istringstream is(s.substr(7).c_str()); istringstream is(s.substr(6).c_str());
is >> m >> n >> v_align >> h_align; is >> m >> n >> v_align >> h_align;
m = std::max(1u, m); m = std::max(1u, m);
n = std::max(1u, n); n = std::max(1u, n);

4
src/mathed/math_cursor.h
View File

@ -289,10 +289,6 @@ private:
int cellXOffset() const; int cellXOffset() const;
/// y-offset of current cell relative to par yo /// y-offset of current cell relative to par yo
int cellYOffset() const; int cellYOffset() const;
/// current x position relative to par xo
int xpos() const;
/// current y position relative to par yo
int ypos() const;
/// adjust position in current cell according to x. idx is not changed. /// adjust position in current cell according to x. idx is not changed.
void gotoX(int x); void gotoX(int x);

12
src/mathed/math_xdata.C
View File

@ -18,15 +18,15 @@ MathXArray::MathXArray()
{} {}
void MathXArray::metrics(MathMetricsInfo const & st) const void MathXArray::metrics(MathMetricsInfo const & mi) const
{ {
size_ = st; size_ = mi;
mathed_char_dim(LM_TC_VAR, st, 'I', ascent_, descent_, width_); mathed_char_dim(LM_TC_VAR, mi, 'I', ascent_, descent_, width_);
if (data_.empty()) if (data_.empty())
return; return;
math_font_max_dim(LM_TC_TEXTRM, st, ascent_, descent_); math_font_max_dim(LM_TC_TEXTRM, mi, ascent_, descent_);
width_ = 0; width_ = 0;
//lyxerr << "MathXArray::metrics(): '" << data_ << "'\n"; //lyxerr << "MathXArray::metrics(): '" << data_ << "'\n";
@ -35,13 +35,13 @@ void MathXArray::metrics(MathMetricsInfo const & st) 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, st); q->metrics(p, mi);
ascent_ = std::max(ascent_, q->ascent(p)); ascent_ = std::max(ascent_, q->ascent(p));
descent_ = std::max(descent_, q->descent(p)); descent_ = std::max(descent_, q->descent(p));
width_ += q->width(p); width_ += q->width(p);
++it; ++it;
} else { } else {
p->metrics(st); p->metrics(mi);
ascent_ = std::max(ascent_, p->ascent()); ascent_ = std::max(ascent_, p->ascent());
descent_ = std::max(descent_, p->descent()); descent_ = std::max(descent_, p->descent());
width_ += p->width(); width_ += p->width();