#include "LaTeXFeatures.h"
#include "support/debug.h"
+#include "support/docstring.h"
+#include "support/gettext.h"
#include "support/lassert.h"
+#include "support/lstrings.h"
#include <ostream>
+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;
}
bool InsetMathDecoration::upper() const
{
- return key_->name.substr(0, 5) != "under";
+ return key_->name.substr(0, 5) != "under" && key_->name != "utilde";
}
{
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";
}
key_->name == "widetilde" ||
key_->name == "underleftarrow" ||
key_->name == "underrightarrow" ||
- key_->name == "underleftrightarrow";
+ key_->name == "underleftrightarrow" ||
+ key_->name == "undertilde" ||
+ key_->name == "utilde";
}
void InsetMathDecoration::metrics(MetricsInfo & mi, Dimension & dim) const
{
- FontSetChanger dummy(mi.base, currentMode() == TEXT_MODE ?
- "textnormal" : "mathnormal");
+ bool really_change_font = currentMode() == TEXT_MODE
+ && isMathFont(mi.base.fontname);
+ Changer dummy = mi.base.changeFontSet("textnormal", really_change_font);
cell(0).metrics(mi, dim);
void InsetMathDecoration::draw(PainterInfo & pi, int x, int y) const
{
- FontSetChanger dummy(pi.base, currentMode() == TEXT_MODE ?
- "textnormal" : "mathnormal");
+ bool really_change_font = currentMode() == TEXT_MODE
+ && isMathFont(pi.base.fontname);
+ Changer dummy = pi.base.changeFontSet("textnormal", really_change_font);
cell(0).draw(pi, x + 1, y);
Dimension const & dim0 = cell(0).dimension(*pi.base.bv);
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;
string tag;
};
- typedef map<string, Attributes> Translator;
+ typedef map<string, Attributes> 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, "‾");
// 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)
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;
}
- Translator const & t = translator();
- Translator::const_iterator cur = t.find(name);
+ 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
if (features.runparams().math_flavor == OutputParams::MathAsHTML) {
string const name = to_utf8(key_->name);
if (name == "bar") {
- features.addPreambleSnippet("<style type=\"text/css\">\n"
- "span.overbar{border-top: thin black solid;}\n"
- "</style>");
+ features.addCSSSnippet("span.overbar{border-top: thin black solid;}");
} else if (name == "underbar" || name == "underline") {
- features.addPreambleSnippet("<style type=\"text/css\">\n"
- "span.underbar{border-bottom: thin black solid;}\n"
- "</style>");
+ features.addCSSSnippet("span.underbar{border-bottom: thin black solid;}");
} else {
- features.addPreambleSnippet("<style type=\"text/css\">\n"
+ 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;}\n"
- "</style>");
+ "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);
}