#include "support/docstream.h"
#include "support/textutils.h"
+#include <boost/scoped_ptr.hpp>
+
namespace lyx {
// << "' drawn as: '" << sym_->draw
// << "'" << endl;
+ bool const italic_upcase_greek = sym_->inset == "cmr" &&
+ sym_->extra == "mathalpha" &&
+ mi.base.fontname == "mathit";
+ docstring const font = italic_upcase_greek ? from_ascii("cmm") : sym_->inset;
int const em = mathed_char_width(mi.base.font, 'M');
- FontSetChanger dummy(mi.base, sym_->inset);
+ FontSetChanger dummy(mi.base, font);
mathed_string_dim(mi.base.font, sym_->draw, dim);
docstring::const_reverse_iterator rit = sym_->draw.rbegin();
kerning_ = mathed_char_kerning(mi.base.font, *rit);
// << "' in font: '" << sym_->inset
// << "' drawn as: '" << sym_->draw
// << "'" << endl;
+
+ bool const italic_upcase_greek = sym_->inset == "cmr" &&
+ sym_->extra == "mathalpha" &&
+ pi.base.fontname == "mathit";
+ docstring const font = italic_upcase_greek ? from_ascii("cmm") : sym_->inset;
int const em = mathed_char_width(pi.base.font, 'M');
if (isRelOp())
x += static_cast<int>(0.25*em+0.5);
else
x += static_cast<int>(0.0833*em+0.5);
- FontSetChanger dummy(pi.base, sym_->inset.c_str());
+ FontSetChanger dummy(pi.base, font);
pi.draw(x, y - h_, sym_->draw);
}
+InsetMath::mode_type InsetMathSymbol::currentMode() const
+{
+ return sym_->extra == "textmode" ? TEXT_MODE : MATH_MODE;
+}
+
+
bool InsetMathSymbol::isRelOp() const
{
return sym_->extra == "mathrel";
void InsetMathSymbol::write(WriteStream & os) const
{
- MathEnsurer ensurer(os);
+ boost::scoped_ptr<MathEnsurer> ensurer;
+ if (currentMode() != TEXT_MODE)
+ ensurer.reset(new MathEnsurer(os));
os << '\\' << name();
// $,#, etc. In theory the restriction based on catcodes, but then
// validate in InsetMathExInt.
if (features.runparams().math_flavor == OutputParams::MathAsHTML
&& sym_->name == from_ascii("int")) {
- features.addPreambleSnippet("<style type=\"text/css\">\n"
+ features.addCSSSnippet(
"span.limits{display: inline-block; vertical-align: middle; text-align:center; font-size: 75%;}\n"
"span.limits span{display: block;}\n"
"span.intsym{font-size: 150%;}\n"
"sub.limit{font-size: 75%;}\n"
- "sup.limit{font-size: 75%;}\n"
- "</style>");
+ "sup.limit{font-size: 75%;}");
} else {
if (!sym_->requires.empty())
features.require(to_utf8(sym_->requires));