}
-void MathDecorationInset::metrics(MathStyles st) const
+bool MathDecorationInset::wide() const
+{
+ return
+ name_ == "overline" ||
+ name_ == "underline" ||
+ name_ == "overbrace" ||
+ name_ == "underbrace" ||
+ name_ == "overleftarrow" ||
+ name_ == "overrightarrow" ||
+ name_ == "widehat" ||
+ name_ == "widetilde";
+}
+
+
+void MathDecorationInset::metrics(MathMetricsInfo const & st) const
{
xcell(0).metrics(st);
size_ = st;
xo(x);
yo(x);
xcell(0).draw(pain, x, y);
- mathed_draw_deco(pain, x, y + dy_, width_, dh_, name_);
+ if (wide())
+ mathed_draw_deco(pain, x, y + dy_, width_, dh_, name_);
+ else {
+ int w = 2 + mathed_char_width(LM_TC_VAR, size(), 'x');
+ mathed_draw_deco(pain, x + (width_ - w) / 2, y + dy_, w, dh_, name_);
+ }
}
-void MathDecorationInset::write(ostream & os, bool fragile) const
+void MathDecorationInset::write(MathWriteInfo & os) const
{
- if (fragile && protect())
+ if (os.fragile && protect())
os << "\\protect";
- os << '\\' << name_ << '{';
- cell(0).write(os, fragile);
- os << '}';
+ os << '\\' << name_ << '{' << cell(0) << '}';
}