When selecting math with the mouse, selection happens in the middle (#9748)

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

diff --git a/src/mathed/InsetMathSize.cpp b/src/mathed/InsetMathSize.cpp
index 898a39513957b899bcbc1228810e9836dec5e579..18d0aaf95a9c4ab5167b672b63e821d67e937df0 100644 (file)
--- a/src/mathed/InsetMathSize.cpp
+++ b/src/mathed/InsetMathSize.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.
  */
@@ -12,19 +12,27 @@
 
 #include "InsetMathSize.h"
 
+#include "LaTeXFeatures.h"
 #include "MathData.h"
 #include "MathParser.h"
 #include "MathStream.h"
+#include "output_xhtml.h"
 
 #include "support/convert.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
 
+#include <string>
 #include <ostream>
 
+using namespace lyx::support;
+using namespace std;
 
 namespace lyx {
 
-InsetMathSize::InsetMathSize(latexkeys const * l)
-       : InsetMathNest(1), key_(l), style_(Styles(convert<int>(l->extra)))
+InsetMathSize::InsetMathSize(Buffer * buf, latexkeys const * l)
+       : InsetMathNest(buf, 1), key_(l),
+         style_(MathStyle(convert<int>(l->extra)))
 {}
 
 
@@ -36,31 +44,55 @@ Inset * InsetMathSize::clone() const
 
 void InsetMathSize::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       StyleChanger dummy(mi.base, style_);
+       Changer dummy2 = mi.base.changeEnsureMath();
+       Changer dummy = mi.base.font.changeStyle(style_);
        cell(0).metrics(mi, dim);
-       metricsMarkers(dim);
 }
 
 
 void InsetMathSize::draw(PainterInfo & pi, int x, int y) const
 {
-       StyleChanger dummy(pi.base, style_);
-       cell(0).draw(pi, x + 1, y);
-       drawMarkers(pi, x, y);
+       Changer dummy2 = pi.base.changeEnsureMath();
+       Changer dummy = pi.base.font.changeStyle(style_);
+       cell(0).draw(pi, x, y);
 }
 
 
 void InsetMathSize::write(WriteStream & os) const
 {
-       bool brace = os.pendingBrace();
-       os.pendingBrace(false);
-       if (os.latex() && os.textMode()) {
-               os << "\\ensuremath{";
-               os.textMode(false);
-               brace = true;
-       }
+       MathEnsurer ensurer(os);
        os << "{\\" << key_->name << ' ' << cell(0) << '}';
-       os.pendingBrace(brace);
+}
+
+
+// From the MathML documentation:
+//     MathML uses two attributes, displaystyle and scriptlevel, to control 
+//     orthogonal presentation features that TeX encodes into one "style" 
+//     attribute with values \displaystyle, \textstyle, \scriptstyle, and 
+//     \scriptscriptstyle. The corresponding values of displaystyle and scriptlevel 
+//     for those TeX styles would be "true" and "0", "false" and "0", "false" and "1", 
+//     and "false" and "2", respectively. 
+void InsetMathSize::mathmlize(MathStream & ms) const
+{
+       string const & name = to_utf8(key_->name);
+       bool dispstyle = (name == "displaystyle");
+       int scriptlevel = 0;
+       if (name == "scriptstyle")
+               scriptlevel = 1;
+       else if (name == "scriptscriptstyle")
+               scriptlevel = 2;
+       stringstream attrs;
+       attrs << "displaystyle='" << (dispstyle ? "true" : "false")
+               << "' scriptlevel='" << scriptlevel << "'";
+       ms << MTag("mstyle", attrs.str()) << cell(0) << ETag("mstyle");
+}
+
+
+void InsetMathSize::htmlize(HtmlStream & os) const
+{
+       string const & name = to_utf8(key_->name);
+       os <<   MTag("span", "class='" + name + "'")
+                       << cell(0) << ETag("span");
 }
 
 
@@ -72,8 +104,18 @@ void InsetMathSize::normalize(NormalStream & os) const
 
 void InsetMathSize::infoize(odocstream & os) const
 {
-       os << "Size: " << key_->name;
+       os << bformat(_("Size: %1$s"), key_->name);
 }
 
 
+void InsetMathSize::validate(LaTeXFeatures & features) const
+{
+       if (features.runparams().math_flavor == OutputParams::MathAsHTML)
+               features.addCSSSnippet(
+                       "span.displaystyle, span.textstyle{font-size: normal;}\n"
+                       "span.scriptstyle {font-size: small;}\n"
+                       "span.scriptscriptstyle {font-size: x-small;}");
+       InsetMathNest::validate(features);
+}
+
 } // namespace lyx