X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathDecoration.cpp;h=47792498915e4737d09c02d77a391e2d57703417;hb=6c13af3f298a96c5564684b83c52989473b020ce;hp=629a440abf32cafbab88c5fb5bc9d8b4aa74d4f3;hpb=904129cba6b0bece503b9915b365d80971ad4c5b;p=lyx.git diff --git a/src/mathed/InsetMathDecoration.cpp b/src/mathed/InsetMathDecoration.cpp index 629a440abf..4779249891 100644 --- a/src/mathed/InsetMathDecoration.cpp +++ b/src/mathed/InsetMathDecoration.cpp @@ -22,17 +22,22 @@ #include "LaTeXFeatures.h" #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; } @@ -46,7 +51,7 @@ Inset * InsetMathDecoration::clone() const bool InsetMathDecoration::upper() const { - return key_->name.substr(0, 5) != "under"; + return key_->name.substr(0, 5) != "under" && key_->name != "utilde"; } @@ -54,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"; } @@ -92,12 +91,22 @@ bool InsetMathDecoration::wide() const key_->name == "widetilde" || key_->name == "underleftarrow" || key_->name == "underrightarrow" || - key_->name == "underleftrightarrow"; + key_->name == "underleftrightarrow" || + key_->name == "undertilde" || + key_->name == "utilde"; +} + + +InsetMath::mode_type InsetMathDecoration::currentMode() const +{ + return key_->name == "underbar" ? TEXT_MODE : MATH_MODE; } void InsetMathDecoration::metrics(MetricsInfo & mi, Dimension & dim) const { + Changer dummy = mi.base.changeEnsureMath(currentMode()); + cell(0).metrics(mi, dim); dh_ = 6; //mathed_char_height(LM_TC_VAR, mi, 'I', ascent_, descent_); @@ -110,22 +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 { - cell(0).draw(pi, x + 1, y); + Changer dummy = pi.base.changeEnsureMath(currentMode()); + + 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); } @@ -134,7 +141,9 @@ void InsetMathDecoration::write(WriteStream & os) const MathEnsurer ensurer(os); if (os.fragile() && protect()) os << "\\protect"; - os << '\\' << key_->name << '{' << cell(0) << '}'; + os << '\\' << key_->name << '{'; + ModeSpecifier specifier(os, currentMode()); + os << cell(0) << '}'; } @@ -146,29 +155,22 @@ void InsetMathDecoration::normalize(NormalStream & os) const void InsetMathDecoration::infoize(odocstream & os) const { - os << "Deco: " << key_->name; + os << bformat(_("Decoration: %1$s"), key_->name); } -void InsetMathDecoration::validate(LaTeXFeatures & features) const -{ - if (!key_->requires.empty()) - features.require(to_utf8(key_->requires)); - InsetMathNest::validate(features); -} - namespace { struct Attributes { - Attributes() {} + Attributes() : over(false) {} Attributes(bool o, string t) : over(o), tag(t) {} bool over; string tag; }; - typedef map Translator; + typedef map TranslationMap; - void buildTranslator(Translator & t) { + void buildTranslationMap(TranslationMap & t) { // the decorations we need to support are listed in lib/symbols t["acute"] = Attributes(true, "´"); t["bar"] = Attributes(true, "‾"); @@ -184,31 +186,35 @@ namespace { t["overbrace"] = Attributes(true, "⏞"); t["overleftarrow"] = Attributes(true, "⟵"); t["overleftrightarrow"] = Attributes(true, "⟷"); + t["overline"] = Attributes(true, "¯"); t["overrightarrow"] = Attributes(true, "⟶"); t["tilde"] = Attributes(true, "˜"); t["underbar"] = Attributes(false, "_"); t["underbrace"] = Attributes(false, "⏟"); t["underleftarrow"] = Attributes(false, "⟵"); t["underleftrightarrow"] = Attributes(false, "⟷"); - t["underline"] = Attributes(false, "&;"); + // 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, "^"); t["widetilde"] = Attributes(true, "∼"); } - Translator const & translator() { - static Translator t; + TranslationMap const & translationMap() { + static TranslationMap t; if (t.empty()) - buildTranslator(t); + buildTranslationMap(t); return t; } } void InsetMathDecoration::mathmlize(MathStream & os) const { - Translator const & t = translator(); - Translator::const_iterator cur = t.find(to_utf8(key_->name)); + TranslationMap const & t = translationMap(); + TranslationMap::const_iterator cur = t.find(to_utf8(key_->name)); LASSERT(cur != t.end(), return); char const * const outag = cur->second.over ? "mover" : "munder"; os << MTag(outag) @@ -218,4 +224,63 @@ void InsetMathDecoration::mathmlize(MathStream & os) const } +void InsetMathDecoration::htmlize(HtmlStream & os) const +{ + string const name = to_utf8(key_->name); + if (name == "bar") { + 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; + } + + 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 + os << MTag("span", "class='base'") << cell(0); + os << ETag("span") << '\n'; + if (symontop) + os << MTag("span", "class='base'") << cell(0); + else + os << MTag("span", "class='symbol'") << from_ascii(cur->second.tag); + os << ETag("span") << '\n' << ETag("span") << '\n'; +} + + +// ideas borrowed from the eLyXer code +void InsetMathDecoration::validate(LaTeXFeatures & features) const +{ + if (features.runparams().math_flavor == OutputParams::MathAsHTML) { + string const name = to_utf8(key_->name); + if (name == "bar") { + features.addCSSSnippet("span.overbar{border-top: thin black solid;}"); + } else if (name == "underbar" || name == "underline") { + features.addCSSSnippet("span.underbar{border-bottom: thin black solid;}"); + } else { + features.addCSSSnippet( + "span.symbolpair{display: inline-block; text-align:center;}\n" + "span.symontop{vertical-align: top;}\n" + "span.symonbot{vertical-align: bottom;}\n" + "span.symbolpair span{display: block;}\n" + "span.symbol{height: 0.5ex;}"); + } + } else { + if (!key_->requires.empty()) + features.require(key_->requires); + } + InsetMathNest::validate(features); +} + } // namespace lyx