* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
- * \author André Pönitz
+ * \author André Pönitz
*
* Full author contact details are available in file CREDITS.
*/
#include <config.h>
#include "InsetMathSymbol.h"
-#include "dimension.h"
-#include "MathStream.h"
+
+#include "MathAtom.h"
+#include "MathParser.h"
#include "MathStream.h"
#include "MathSupport.h"
-#include "MathParser.h"
-#include "MathAtom.h"
+
+#include "Dimension.h"
#include "LaTeXFeatures.h"
-#include "debug.h"
+#include "MetricsInfo.h"
+#include "support/debug.h"
+#include "support/docstream.h"
+#include "support/lyxlib.h"
#include "support/textutils.h"
+#include "support/unique_ptr.h"
-namespace lyx {
-
-using std::string;
-using std::auto_ptr;
+namespace lyx {
InsetMathSymbol::InsetMathSymbol(latexkeys const * l)
- : sym_(l), h_(0), scriptable_(false), font_cache_(LyXFont::ALL_IGNORE)
+ : sym_(l), h_(0), kerning_(0), scriptable_(false)
{}
InsetMathSymbol::InsetMathSymbol(char const * name)
- : sym_(in_word_set(from_ascii(name))), h_(0), scriptable_(false),
- font_cache_(LyXFont::ALL_IGNORE)
+ : sym_(in_word_set(from_ascii(name))), h_(0),
+ kerning_(0), scriptable_(false)
{}
InsetMathSymbol::InsetMathSymbol(docstring const & name)
- : sym_(in_word_set(name)), h_(0), scriptable_(false), font_cache_(LyXFont::ALL_IGNORE)
+ : sym_(in_word_set(name)), h_(0), kerning_(0), scriptable_(false)
{}
-auto_ptr<InsetBase> InsetMathSymbol::doClone() const
+Inset * InsetMathSymbol::clone() const
{
- return auto_ptr<InsetBase>(new InsetMathSymbol(*this));
+ return new InsetMathSymbol(*this);
}
}
-bool InsetMathSymbol::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathSymbol::metrics(MetricsInfo & mi, Dimension & dim) const
{
//lyxerr << "metrics: symbol: '" << sym_->name
// << "' in font: '" << sym_->inset
// << "' drawn as: '" << sym_->draw
- // << "'" << std::endl;
-
- bool dim_unchanged = (mi.base.font == font_cache_);
- if (dim_unchanged)
- dim = dim_;
- else {
- font_cache_ = mi.base.font;
- int const em = mathed_char_width(mi.base.font, 'M');
- FontSetChanger dummy(mi.base, sym_->inset);
- 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);
- // correct height for broken cmex and wasy font
- if (sym_->inset == "cmex" || sym_->inset == "wasy") {
- h_ = 4 * dim.des / 5;
- dim.asc += h_;
- dim.des -= h_;
- }
- // seperate things a bit
- if (isRelOp())
- dim.wid += static_cast<int>(0.5 * em + 0.5);
- else
- dim.wid += static_cast<int>(0.1667 * em + 0.5);
-
- dim_ = dim;
+ // << "'" << endl;
+
+ bool const italic_upcase_greek = sym_->inset == "cmr" &&
+ sym_->extra == "mathalpha" &&
+ mi.base.fontname == "mathit";
+ std::string const font = italic_upcase_greek ? "cmm" : sym_->inset;
+ Changer dummy = mi.base.changeFontSet(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);
+ // correct height for broken cmex and wasy font
+ if (sym_->inset == "cmex" || sym_->inset == "wasy") {
+ h_ = 4 * dim.des / 5;
+ dim.asc += h_;
+ dim.des -= h_;
}
+ // seperate things a bit
+ if (isMathBin())
+ dim.wid += 2 * mathed_medmuskip(mi.base.font);
+ else if (isMathRel())
+ dim.wid += 2 * mathed_thickmuskip(mi.base.font);
+ else if (isMathPunct())
+ dim.wid += mathed_thinmuskip(mi.base.font);
+ // FIXME: I see no reason for this
+ //else
+ // dim.wid += support::iround(0.1667 * em);
scriptable_ = false;
if (mi.base.style == LM_ST_DISPLAY)
if (sym_->inset == "cmex" || sym_->inset == "esint" ||
- sym_->extra == "funclim")
+ sym_->extra == "funclim" ||
+ (sym_->inset == "stmry" && sym_->extra == "mathop"))
scriptable_ = true;
-
- return dim_unchanged;
}
//lyxerr << "metrics: symbol: '" << sym_->name
// << "' in font: '" << sym_->inset
// << "' drawn as: '" << sym_->draw
- // << "'" << std::endl;
- 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());
+ // << "'" << endl;
+
+ bool const italic_upcase_greek = sym_->inset == "cmr" &&
+ sym_->extra == "mathalpha" &&
+ pi.base.fontname == "mathit";
+ std::string const font = italic_upcase_greek ? "cmm" : sym_->inset;
+ if (isMathBin())
+ x += mathed_medmuskip(pi.base.font);
+ else if (isMathRel())
+ x += mathed_thickmuskip(pi.base.font);
+ // FIXME: I see no reason for this
+ //else
+ // x += support::iround(0.0833 * em);
+
+ Changer dummy = pi.base.changeFontSet(font);
pi.draw(x, y - h_, sym_->draw);
}
-bool InsetMathSymbol::isRelOp() const
+InsetMath::mode_type InsetMathSymbol::currentMode() const
+{
+ return sym_->extra == "textmode" ? TEXT_MODE : MATH_MODE;
+}
+
+
+bool InsetMathSymbol::isMathBin() const
+{
+ return sym_->extra == "mathbin";
+}
+
+
+bool InsetMathSymbol::isMathRel() const
{
return sym_->extra == "mathrel";
}
+bool InsetMathSymbol::isMathPunct() const
+{
+ return sym_->extra == "mathpunct";
+}
+
+
bool InsetMathSymbol::isOrdAlpha() const
{
return sym_->extra == "mathord" || sym_->extra == "mathalpha";
sym_->inset == "cmex" ||
sym_->inset == "lyxboldsymb" ||
sym_->inset == "esint" ||
- sym_->extra == "funclim";
-}
-
-
-void InsetMathSymbol::validate(LaTeXFeatures & features) const
-{
- if (!sym_->requires.empty())
- features.require(to_utf8(sym_->requires));
+ sym_->extra == "funclim" ||
+ (sym_->inset == "stmry" && sym_->extra == "mathop");
}
}
-char const * MathMLtype(docstring const & s)
-{
- if (s == "mathop")
- return "mo";
- return "mi";
-}
-
-
void InsetMathSymbol::mathmlize(MathStream & os) const
{
- char const * type = MathMLtype(sym_->extra);
+ // FIXME We may need to do more interesting things
+ // with MathMLtype.
+ char const * type = sym_->MathMLtype();
os << '<' << type << "> ";
- if (sym_->xmlname == "x") // unknown so far
+ if (sym_->xmlname == "x")
+ // unknown so far
os << name();
else
os << sym_->xmlname;
}
+void InsetMathSymbol::htmlize(HtmlStream & os, bool spacing) const
+{
+ // FIXME We may need to do more interesting things
+ // with MathMLtype.
+ char const * type = sym_->MathMLtype();
+ bool op = (std::string(type) == "mo");
+
+ if (sym_->xmlname == "x")
+ // unknown so far
+ os << ' ' << name() << ' ';
+ else if (op && spacing)
+ os << ' ' << sym_->xmlname << ' ';
+ else
+ os << sym_->xmlname;
+}
+
+
+void InsetMathSymbol::htmlize(HtmlStream & os) const
+{
+ htmlize(os, true);
+}
+
+
void InsetMathSymbol::octave(OctaveStream & os) const
{
if (name() == "cdot")
void InsetMathSymbol::write(WriteStream & os) const
{
+ unique_ptr<MathEnsurer> ensurer;
+ if (currentMode() != TEXT_MODE)
+ ensurer = make_unique<MathEnsurer>(os);
os << '\\' << name();
// $,#, etc. In theory the restriction based on catcodes, but then
void InsetMathSymbol::infoize2(odocstream & os) const
{
- os << "Symbol: " << name();
+ os << from_ascii("Symbol: ") << name();
}
+void InsetMathSymbol::validate(LaTeXFeatures & features) const
+{
+ // this is not really the ideal place to do this, but we can't
+ // validate in InsetMathExInt.
+ if (features.runparams().math_flavor == OutputParams::MathAsHTML
+ && sym_->name == from_ascii("int")) {
+ 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%;}");
+ } else {
+ if (!sym_->requires.empty())
+ features.require(sym_->requires);
+ }
+}
+
} // namespace lyx
projects / lyx.git / blobdiff