#include "InsetMathDots.h"
+#include "Dimension.h"
#include "LaTeXFeatures.h"
#include "MathStream.h"
#include "MathSupport.h"
namespace lyx {
InsetMathDots::InsetMathDots(latexkeys const * key)
- : key_(key)
+ : dh_(0), key_(key)
{}
void InsetMathDots::metrics(MetricsInfo & mi, Dimension & dim) const
{
- dim = theFontMetrics(mi.base.font).dimension('M');
+ dim = theFontMetrics(mi.base.font).dimension('X');
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" || key_->name == "adots" || key_->name == "iddots")
+ else if (key_->name == "ddots" || key_->name == "adots"
+ || key_->name == "iddots" || key_->name == "vdots")
dh_ = dim.asc;
}
-void InsetMathDots::draw(PainterInfo & pain, int x, int y) const
+void InsetMathDots::draw(PainterInfo & pi, int x, int y) const
{
- Dimension const dim = dimension(*pain.base.bv);
+ Dimension const dim = dimension(*pi.base.bv);
if (key_->name == "adots" || key_->name == "iddots")
--y;
- mathed_draw_deco(pain, x + 2, y - dh_, dim.width() - 2, dim.ascent(),
+ else if (key_->name == "vdots")
+ x += (dim.width() - 2) / 2;
+ mathed_draw_deco(pi, x + 1, y - dh_, dim.width() - 2, dim.ascent(),
key_->name);
- if (key_->name == "vdots" || key_->name == "ddots" || key_->name == "adots" || key_->name == "iddots")
- ++x;
- if (key_->name == "adots" || key_->name == "iddots")
- ++y;
- else 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 InsetMathDots::validate(LaTeXFeatures & features) const
{
- if (!key_->requires.empty())
- features.require(to_utf8(key_->requires));
+ if (!key_->required.empty())
+ features.require(key_->required);
+}
+
+
+void InsetMathDots::mathmlize(MathMLStream & ms) const
+{
+ // which symbols we support is decided by what is listed in
+ // lib/symbols as generating a dots inset
+ docstring const & n = key_->name;
+ std::string ent;
+ if (ms.xmlMode()) {
+ if (n == "dots" || n == "dotsc" || n == "dotso" || n == "ldots")
+ ent = "…";
+ else if (n == "adots" || n == "iddots")
+ ent = "⋰";
+ else if (n == "cdots" || n == "dotsb" || n == "dotsi" || n == "dotsm")
+ ent = "⋯";
+ else if (n == "ddots")
+ ent = "⋱";
+ else if (n == "vdots")
+ ent = "⋮";
+ else LASSERT(false, ent = "…");
+ } else {
+ if (n == "dots" || n == "dotsc" || n == "dotso" || n == "ldots")
+ ent = "…";
+ else if (n == "adots" || n == "iddots")
+ ent = "⋰";
+ else if (n == "cdots" || n == "dotsb" || n == "dotsi" || n == "dotsm")
+ ent = "⋯";
+ else if (n == "ddots")
+ ent = "⋱";
+ else if (n == "vdots")
+ ent = "⋮";
+ else LASSERT(false, ent = "…");
+ }
+ ms << MTagInline("mi") << from_ascii(ent) << ETagInline("mi");
}
-void InsetMathDots::mathmlize(MathStream & os) const
+void InsetMathDots::htmlize(HtmlStream & os) const
{
// which symbols we support is decided by what is listed in
// lib/symbols as generating a dots inset
docstring const & n = key_->name;
std::string ent;
if (n == "dots" || n == "dotsc" || n == "dotso" || n == "ldots")
- ent = "…";
- else if (n == "adots")
- ent = "⋰";
+ ent = "…";
+ else if (n == "adots" || n == "iddots")
+ ent = "⋰";
else if (n == "cdots" || n == "dotsb" || n == "dotsi" || n == "dotsm")
- ent = "⋯";
+ ent = "⋯";
else if (n == "ddots")
- ent = "⋱";
- else if (n == "iddots")
- ent = "⋰";
+ ent = "⋱";
else if (n == "vdots")
- ent = "⋮";
+ ent = "⋮";
else
- LASSERT(false, ent = "…");
- os << MTag("mi") << from_ascii(ent) << ETag("mi");
+ LASSERT(false, ent = "#x02026;");
+ os << from_ascii(ent);
}
} // namespace lyx