g-brief loads babel internally. So don't load it ourselves.

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

diff --git a/src/mathed/InsetMathSize.cpp b/src/mathed/InsetMathSize.cpp
index 0403ffbc3f1ba5b953ce17a2758ffd82ccb429b1..5055f2d73e6c2612d7e9b5402ce4a8deb7f2a775 100644 (file)
--- a/src/mathed/InsetMathSize.cpp
+++ b/src/mathed/InsetMathSize.cpp
@@ -16,19 +16,24 @@
 #include "MathData.h"
 #include "MathParser.h"
 #include "MathStream.h"
+#include "MetricsInfo.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(Buffer * buf, latexkeys const * l)
-       : InsetMathNest(buf, 1), key_(l), style_(Styles(convert<int>(l->extra)))
+       : InsetMathNest(buf, 1), key_(l),
+         style_(MathStyle(convert<int>(l->extra)))
 {}
 
 
@@ -40,21 +45,21 @@ 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
+void InsetMathSize::write(TeXMathStream & os) const
 {
        MathEnsurer ensurer(os);
        os << "{\\" << key_->name << ' ' << cell(0) << '}';
@@ -62,13 +67,13 @@ void InsetMathSize::write(WriteStream & os) const
 
 
 // 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
+//     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(MathMLStream & ms) const
 {
        string const & name = to_utf8(key_->name);
        bool dispstyle = (name == "displaystyle");
@@ -80,8 +85,7 @@ void InsetMathSize::mathmlize(MathStream & ms) const
        stringstream attrs;
        attrs << "displaystyle='" << (dispstyle ? "true" : "false")
                << "' scriptlevel='" << scriptlevel << "'";
-       ms << MTag("mstyle", attrs.str()) << ">"
-          << cell(0) << ETag("mstyle");
+       ms << MTag("mstyle", attrs.str()) << cell(0) << ETag("mstyle");
 }
 
 
@@ -101,18 +105,17 @@ 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.addPreambleSnippet("<style type=\"text/css\">\n"
+               features.addCSSSnippet(
                        "span.displaystyle, span.textstyle{font-size: normal;}\n"
                        "span.scriptstyle {font-size: small;}\n"
-                       "span.scriptscriptstyle {font-size: x-small;}\n"
-                       "</style>");
+                       "span.scriptscriptstyle {font-size: x-small;}");
        InsetMathNest::validate(features);
 }