X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathDecoration.cpp;h=908a887eebb5bbea01d8a944d3885293b42a2acc;hb=9296344b9a26191a2092d175a51e357ecc35145d;hp=71973296eacc1ad7c6aea350f3a43e17c1ec42ce;hpb=32f6c066ccad00e1580f1f2a5c1d989153e4a83b;p=lyx.git diff --git a/src/mathed/InsetMathDecoration.cpp b/src/mathed/InsetMathDecoration.cpp index 71973296ea..908a887eeb 100644 --- a/src/mathed/InsetMathDecoration.cpp +++ b/src/mathed/InsetMathDecoration.cpp @@ -23,17 +23,21 @@ #include "support/debug.h" #include "support/docstring.h" +#include "support/gettext.h" #include "support/lassert.h" +#include "support/lstrings.h" #include +using namespace lyx::support; + using namespace std; namespace lyx { InsetMathDecoration::InsetMathDecoration(Buffer * buf, latexkeys const * key) - : InsetMathNest(buf, 1), key_(key) + : InsetMathNest(buf, 1), key_(key), dh_(0), dy_(0), dw_(0) { // lyxerr << " creating deco " << key->name << endl; } @@ -55,13 +59,7 @@ bool InsetMathDecoration::isScriptable() const { return key_->name == "overbrace" || - key_->name == "underbrace" || - key_->name == "overleftarrow" || - key_->name == "overrightarrow" || - key_->name == "overleftrightarrow" || - key_->name == "underleftarrow" || - key_->name == "underrightarrow" || - key_->name == "underleftrightarrow"; + key_->name == "underbrace"; } @@ -94,6 +92,7 @@ bool InsetMathDecoration::wide() const key_->name == "underleftarrow" || key_->name == "underrightarrow" || key_->name == "underleftrightarrow" || + key_->name == "undertilde" || key_->name == "utilde"; } @@ -106,9 +105,7 @@ InsetMath::mode_type InsetMathDecoration::currentMode() const void InsetMathDecoration::metrics(MetricsInfo & mi, Dimension & dim) const { - bool really_change_font = currentMode() == TEXT_MODE - && isMathFont(from_ascii(mi.base.fontname)); - FontSetChanger dummy(mi.base, "textnormal", really_change_font); + Changer dummy = mi.base.changeEnsureMath(currentMode()); cell(0).metrics(mi, dim); @@ -122,26 +119,20 @@ void InsetMathDecoration::metrics(MetricsInfo & mi, Dimension & dim) const dy_ = dim.des + 1; dim.des += dh_ + 2; } - - metricsMarkers(dim); } void InsetMathDecoration::draw(PainterInfo & pi, int x, int y) const { - bool really_change_font = currentMode() == TEXT_MODE - && isMathFont(from_ascii(pi.base.fontname)); - FontSetChanger dummy(pi.base, "textnormal", really_change_font); + Changer dummy = pi.base.changeEnsureMath(currentMode()); - cell(0).draw(pi, x + 1, y); + cell(0).draw(pi, x, y); Dimension const & dim0 = cell(0).dimension(*pi.base.bv); if (wide()) mathed_draw_deco(pi, x + 1, y + dy_, dim0.wid, dh_, key_->name); else mathed_draw_deco(pi, x + 1 + (dim0.wid - dw_) / 2, y + dy_, dw_, dh_, key_->name); - drawMarkers(pi, x, y); - setPosCache(pi, x, y); } @@ -164,13 +155,13 @@ void InsetMathDecoration::normalize(NormalStream & os) const void InsetMathDecoration::infoize(odocstream & os) const { - os << "Deco: " << key_->name; + os << bformat(_("Decoration: %1$s"), key_->name); } namespace { struct Attributes { - Attributes() {} + Attributes() : over(false) {} Attributes(bool o, string t) : over(o), tag(t) {} bool over; @@ -205,6 +196,7 @@ namespace { // this is the macron, again, but it works t["underline"] = Attributes(false, "¯"); t["underrightarrow"] = Attributes(false, "⟶"); + t["undertilde"] = Attributes(false, "∼"); t["utilde"] = Attributes(false, "∼"); t["vec"] = Attributes(true, "→"); t["widehat"] = Attributes(true, "^"); @@ -217,7 +209,7 @@ namespace { buildTranslationMap(t); return t; } -} +} // namespace void InsetMathDecoration::mathmlize(MathStream & os) const { @@ -239,7 +231,7 @@ void InsetMathDecoration::htmlize(HtmlStream & os) const os << MTag("span", "class='overbar'") << cell(0) << ETag("span"); return; } - + if (name == "underbar" || name == "underline") { os << MTag("span", "class='underbar'") << cell(0) << ETag("span"); return; @@ -248,12 +240,12 @@ void InsetMathDecoration::htmlize(HtmlStream & os) const TranslationMap const & t = translationMap(); TranslationMap::const_iterator cur = t.find(name); LASSERT(cur != t.end(), return); - + bool symontop = cur->second.over; string const symclass = symontop ? "symontop" : "symonbot"; os << MTag("span", "class='symbolpair " + symclass + "'") << '\n'; - + if (symontop) os << MTag("span", "class='symbol'") << from_ascii(cur->second.tag); else @@ -273,25 +265,20 @@ void InsetMathDecoration::validate(LaTeXFeatures & features) const if (features.runparams().math_flavor == OutputParams::MathAsHTML) { string const name = to_utf8(key_->name); if (name == "bar") { - features.addPreambleSnippet(""); + features.addCSSSnippet("span.overbar{border-top: thin black solid;}"); } else if (name == "underbar" || name == "underline") { - features.addPreambleSnippet(""); + features.addCSSSnippet("span.underbar{border-bottom: thin black solid;}"); } else { - features.addPreambleSnippet(""); + "span.symbolpair span{display: block;}\n" + "span.symbol{height: 0.5ex;}"); } } else { if (!key_->requires.empty()) - features.require(to_utf8(key_->requires)); + features.require(key_->requires); } InsetMathNest::validate(features); }