X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathDecoration.cpp;h=37ae239d108479d057a042b9a4bfafb2cbb2fed4;hb=8cd80803220e02f7a9148f11b99f4f3aeb0d3f38;hp=b9202f5d6394bbf5cc0e1d7623916d60f023c65b;hpb=38b9a4530e8eb870e60cf8a15c208010fb292054;p=lyx.git diff --git a/src/mathed/InsetMathDecoration.cpp b/src/mathed/InsetMathDecoration.cpp index b9202f5d63..37ae239d10 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"; } @@ -165,7 +163,7 @@ void InsetMathDecoration::normalize(NormalStream & os) const void InsetMathDecoration::infoize(odocstream & os) const { - os << "Deco: " << key_->name; + os << bformat(_("Decoration: %1$s"), key_->name); } @@ -241,7 +239,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; @@ -250,12 +248,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 @@ -283,12 +281,12 @@ void InsetMathDecoration::validate(LaTeXFeatures & features) const "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.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); }