Update my email and status.

[lyx.git] / src / mathed / InsetMathSymbol.cpp

diff --git a/src/mathed/InsetMathSymbol.cpp b/src/mathed/InsetMathSymbol.cpp
index 52d6eee85855ccb41e155d7f252fc1b69071660c..ed6c155784b6471fcc5fe69665fd50bda11dd467 100644 (file)
--- a/src/mathed/InsetMathSymbol.cpp
+++ b/src/mathed/InsetMathSymbol.cpp
@@ -3,7 +3,7 @@
  * 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.
  */
@@ -60,8 +60,12 @@ void InsetMathSymbol::metrics(MetricsInfo & mi, Dimension & dim) const
        //      << "' 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);
@@ -91,13 +95,18 @@ void InsetMathSymbol::draw(PainterInfo & pi, int x, int y) const
        //      << "' 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);
 }
 
@@ -130,13 +139,6 @@ bool InsetMathSymbol::takesLimits() const
 }
 
 
-void InsetMathSymbol::validate(LaTeXFeatures & features) const
-{
-       if (!sym_->requires.empty())
-               features.require(to_utf8(sym_->requires));
-}
-
-
 void InsetMathSymbol::normalize(NormalStream & os) const
 {
        os << "[symbol " << name() << ']';
@@ -175,19 +177,23 @@ void InsetMathSymbol::mathematica(MathematicaStream & os) const
 }
 
 
+// FIXME This will likely need some work.
 char const * MathMLtype(docstring const & s)
 {
-       if (s == "mathop")
-               return "mo";
-       return "mi";
+       if (s == "mathord")
+               return "mi";
+       return "mo";
 }
 
 
 void InsetMathSymbol::mathmlize(MathStream & os) const
 {
+       // FIXME We may need to do more interesting things 
+       // with MathMLtype.
        char const * type = MathMLtype(sym_->extra);
        os << '<' << type << "> ";
-       if (sym_->xmlname == "x") // unknown so far
+       if (sym_->xmlname == "x") 
+               // unknown so far
                os << name();
        else
                os << sym_->xmlname;
@@ -195,6 +201,29 @@ void InsetMathSymbol::mathmlize(MathStream & os) const
 }
 
 
+void InsetMathSymbol::htmlize(HtmlStream & os, bool spacing) const
+{
+       // FIXME We may need to do more interesting things 
+       // with MathMLtype.
+       char const * type = MathMLtype(sym_->extra);
+       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")
@@ -206,6 +235,7 @@ void InsetMathSymbol::octave(OctaveStream & os) const
 
 void InsetMathSymbol::write(WriteStream & os) const
 {
+       MathEnsurer ensurer(os);
        os << '\\' << name();
 
        // $,#, etc. In theory the restriction based on catcodes, but then
@@ -224,4 +254,22 @@ void InsetMathSymbol::infoize2(odocstream & os) const
 }
 
 
+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(to_utf8(sym_->requires));
+       }
+}
+
 } // namespace lyx