X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_dotsinset.C;h=8ab3afe6feec3c4f4b2d737091087297c96cef60;hb=3e93baac3cd18e27db3eb2a1fcaf90b25e0918a6;hp=04478bd0edb83e487534c7e20461a5bf33e607a5;hpb=d6f2a2313ab2e58a0c9dcf5de88e8ad89732560e;p=lyx.git diff --git a/src/mathed/math_dotsinset.C b/src/mathed/math_dotsinset.C index 04478bd0ed..8ab3afe6fe 100644 --- a/src/mathed/math_dotsinset.C +++ b/src/mathed/math_dotsinset.C @@ -1,13 +1,24 @@ -#ifdef __GNUG__ -#pragma implementation -#endif +/** + * \file math_dotsinset.C + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. + * + * \author Alejandro Aguilar Sierra + * \author André Pönitz + * + * Full author contact details are available in file CREDITS. + */ + +#include #include "math_dotsinset.h" -#include "mathed/support.h" -#include "mathed/math_parser.h" -#include "support/LOstream.h" +#include "math_mathmlstream.h" +#include "math_support.h" +#include "math_parser.h" + -using std::ostream; +using std::string; +using std::auto_ptr; MathDotsInset::MathDotsInset(latexkeys const * key) @@ -15,43 +26,46 @@ MathDotsInset::MathDotsInset(latexkeys const * key) {} -MathInset * MathDotsInset::clone() const -{ - return new MathDotsInset(*this); -} - - -void MathDotsInset::draw(Painter & pain, int x, int y) const +auto_ptr MathDotsInset::clone() const { - mathed_draw_deco(pain, x + 2, y - dh_, width_ - 2, ascent_, key_); - if (key_->id == LM_vdots || key_->id == LM_ddots) - ++x; - if (key_->id != LM_vdots) - --y; - mathed_draw_deco(pain, x + 2, y - dh_, width_ - 2, ascent_, key_); + return auto_ptr(new MathDotsInset(*this)); } -void MathDotsInset::metrics(MathStyles st) const +void MathDotsInset::metrics(MetricsInfo & mi, Dimension & dim) const { - size(st); - mathed_char_dim(LM_TC_VAR, size(), 'M', ascent_, descent_, width_); - switch (key_->id) { - case LM_ldots: dh_ = 0; break; - case LM_cdots: dh_ = ascent_ / 2; break; - case LM_vdots: width_ /= 2; - case LM_ddots: dh_ = ascent_; break; + mathed_char_dim(mi.base.font, 'M', dim); + dh_ = 0; + if (key_->name == "cdots" || key_->name == "dotsb" + || key_->name == "dotsm" || key_->name == "dotsi") + dh_ = dim.asc / 2; + else if (key_->name == "dotsc") + dh_ = dim.asc / 4; + else if (key_->name == "vdots") { + dim.wid = (dim.wid / 2) + 1; + dh_ = dim.asc; } -} + else if (key_->name == "ddots") + dh_ = dim.asc; + dim_ = dim; +} -void MathDotsInset::write(ostream & os, bool /* fragile */) const +void MathDotsInset::draw(PainterInfo & pain, int x, int y) const { - os << '\\' << key_->name << ' '; + mathed_draw_deco(pain, x + 2, y - dh_, dim_.width() - 2, dim_.ascent(), + key_->name); + if (key_->name == "vdots" || key_->name == "ddots") + ++x; + if (key_->name != "vdots") + --y; + mathed_draw_deco(pain, x + 2, y - dh_, dim_.width() - 2, dim_.ascent(), + key_->name); + setPosCache(pain, x, y); } -void MathDotsInset::writeNormal(ostream & os) const +string MathDotsInset::name() const { - os << "[" << key_->name << "] "; + return key_->name; }