#include "LaTeXFeatures.h"
#include "support/debug.h"
+#include "support/docstring.h"
#include "support/lassert.h"
#include <ostream>
bool InsetMathDecoration::upper() const
{
- return key_->name.substr(0, 5) != "under";
+ return key_->name.substr(0, 5) != "under" && key_->name != "utilde";
}
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
{
+ bool really_change_font = currentMode() == TEXT_MODE
+ && isMathFont(from_ascii(mi.base.fontname));
+ FontSetChanger dummy(mi.base, "textnormal", really_change_font);
+
cell(0).metrics(mi, dim);
dh_ = 6; //mathed_char_height(LM_TC_VAR, mi, 'I', ascent_, descent_);
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);
+
cell(0).draw(pi, x + 1, y);
Dimension const & dim0 = cell(0).dimension(*pi.base.bv);
if (wide())
MathEnsurer ensurer(os);
if (os.fragile() && protect())
os << "\\protect";
- os << '\\' << key_->name << '{' << cell(0) << '}';
+ os << '\\' << key_->name << '{';
+ ModeSpecifier specifier(os, currentMode());
+ os << cell(0) << '}';
}
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)
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;
// ideas borrowed from the eLyXer code
void InsetMathDecoration::validate(LaTeXFeatures & features) const
{
- if (features.runparams().flavor == OutputParams::HTML) {
+ 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.symbol{height: 0.5ex;}");
}
} else {
if (!key_->requires.empty())