X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathDelim.cpp;h=1989d48dc2d9c6d840f810ba0a4123b80834ddb6;hb=59fa0b25928b43c8d32d19a6193dc3bd07716947;hp=68e4430514775eb8e8f832e4d3a04d92e635e8ad;hpb=04b8f5cdc4b26105ea855fb9ec5b23227dfd55cb;p=lyx.git
diff --git a/src/mathed/InsetMathDelim.cpp b/src/mathed/InsetMathDelim.cpp
index 68e4430514..1989d48dc2 100644
--- a/src/mathed/InsetMathDelim.cpp
+++ b/src/mathed/InsetMathDelim.cpp
@@ -69,21 +69,8 @@ void InsetMathDelim::validate(LaTeXFeatures & features) const
// The delimiters may be used without \left or \right as well.
// Therefore they are listed in lib/symbols, and if they have
// requirements, we need to add them here.
- MathWordList const & words = mathedWordList();
- MathWordList::const_iterator it = words.find(left_);
- if (it != words.end())
- {
- string const req = it->second.requires;
- if (!req.empty())
- features.require(req);
- }
- it = words.find(right_);
- if (it != words.end())
- {
- string const req = it->second.requires;
- if (!req.empty())
- features.require(req);
- }
+ validate_math_word(features, left_);
+ validate_math_word(features, right_);
}
@@ -104,8 +91,9 @@ void InsetMathDelim::normalize(NormalStream & os) const
void InsetMathDelim::metrics(MetricsInfo & mi, Dimension & dim) const
{
+ Changer dummy = mi.base.changeEnsureMath();
Dimension dim0;
- cell(0).metrics(mi, dim0);
+ cell(0).metrics(mi, dim0, false);
Dimension t = theFontMetrics(mi.base.font).dimension('I');
int h0 = (t.asc + t.des) / 2;
int a0 = max(dim0.asc, t.asc) - h0;
@@ -123,14 +111,14 @@ void InsetMathDelim::metrics(MetricsInfo & mi, Dimension & dim) const
void InsetMathDelim::draw(PainterInfo & pi, int x, int y) const
{
+ Changer dummy = pi.base.changeEnsureMath();
Dimension const dim = dimension(*pi.base.bv);
int const b = y - dim.asc;
int const skip = mathed_thinmuskip(pi.base.font);
cell(0).draw(pi, x + dw_ + skip, y);
- mathed_draw_deco(pi, x + skip, b, dw_, dim.height(), left_);
- mathed_draw_deco(pi, x + dim.width() - dw_ - skip,
+ mathed_draw_deco(pi, x + skip / 2, b, dw_, dim.height(), left_);
+ mathed_draw_deco(pi, x + dim.width() - dw_ - skip / 2,
b, dw_, dim.height(), right_);
- setPosCache(pi, x, y);
}
@@ -194,19 +182,23 @@ void InsetMathDelim::mathematica(MathematicaStream & os) const
void InsetMathDelim::mathmlize(MathStream & os) const
{
os << ""
- << convertDelimToXMLEscape(left_)
+ << ""
+ << convertDelimToXMLEscape(left_)
+ << ""
<< "\n"
- << cell(0)
- << "\n"
- << convertDelimToXMLEscape(right_)
+ << cell(0)
+ << "\n"
+ << ""
+ << convertDelimToXMLEscape(right_)
+ << ""
<< "\n";
}
void InsetMathDelim::htmlize(HtmlStream & os) const
{
- os << convertDelimToXMLEscape(left_)
- << cell(0)
+ os << convertDelimToXMLEscape(left_)
+ << cell(0)
<< convertDelimToXMLEscape(right_);
}