Add \makeat switches to babel settings if necessary.

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

diff --git a/src/mathed/InsetMathBox.cpp b/src/mathed/InsetMathBox.cpp
index c6f98ca98718dbb7077e496529544eeab3f0dc9e..60983bca804807efa2b9948913a37fdd14407912 100644 (file)
--- a/src/mathed/InsetMathBox.cpp
+++ b/src/mathed/InsetMathBox.cpp
@@ -54,6 +54,10 @@ void InsetMathBox::normalize(NormalStream & os) const
 
 void InsetMathBox::mathmlize(MathStream & ms) const
 {
+       // FIXME XHTML
+       // Need to do something special for tags here.
+       // Probably will have to involve deferring them, which
+       // means returning something from this routine.
        SetMode textmode(ms, true);
        ms << MTag("mstyle", "class='mathbox'")
           << cell(0)
@@ -98,13 +102,9 @@ void InsetMathBox::validate(LaTeXFeatures & features) const
        // It'd be better to be able to get this from an InsetLayout, but at present
        // InsetLayouts do not seem really to work for things that aren't InsetTexts.
        if (features.runparams().math_flavor == OutputParams::MathAsMathML)
-               features.addPreambleSnippet("<style type=\"text/css\">\n"
-                       "mstyle.mathbox { font-style: normal; }\n"
-                       "</style>");
+               features.addCSSSnippet("mstyle.mathbox { font-style: normal; }");
        else if (features.runparams().math_flavor == OutputParams::MathAsHTML)
-               features.addPreambleSnippet("<style type=\"text/css\">\n"
-                       "span.mathbox { font-style: normal; }\n"
-                       "</style>");
+               features.addCSSSnippet("span.mathbox { font-style: normal; }");
 
        if (name_ == "tag" || name_ == "tag*")
                features.require("amsmath");
@@ -188,13 +188,11 @@ void InsetMathFBox::validate(LaTeXFeatures & features) const
        // It'd be better to be able to get this from an InsetLayout, but at present
        // InsetLayouts do not seem really to work for things that aren't InsetTexts.
        if (features.runparams().math_flavor == OutputParams::MathAsMathML)
-               features.addPreambleSnippet("<style type=\"text/css\">\n"
-                       "mstyle.fbox { border: 1px solid black; font-style: normal; padding: 0.5ex; }\n"
-                       "</style>");
+               features.addCSSSnippet(
+                       "mstyle.fbox { border: 1px solid black; font-style: normal; padding: 0.5ex; }");
        else if (features.runparams().math_flavor == OutputParams::MathAsHTML)
-               features.addPreambleSnippet("<style type=\"text/css\">\n"
-                       "span.fbox { border: 1px solid black; font-style: normal; padding: 0.5ex; }\n"
-                       "</style>");
+               features.addCSSSnippet(
+                       "span.fbox { border: 1px solid black; font-style: normal; padding: 0.5ex; }");
 
        cell(0).validate(features);
        InsetMathNest::validate(features);
@@ -220,7 +218,7 @@ void InsetMathMakebox::metrics(MetricsInfo & mi, Dimension & dim) const
        
        Dimension wdim;
        static docstring bracket = from_ascii("[");
-       mathed_string_dim(mi.base.font, bracket, wdim);
+       metricsStrRedBlack(mi, wdim, bracket);
        int w = wdim.wid;
        
        Dimension dim0;
@@ -336,13 +334,9 @@ void InsetMathMakebox::validate(LaTeXFeatures & features) const
        // It'd be better to be able to get this from an InsetLayout, but at present
        // InsetLayouts do not seem really to work for things that aren't InsetTexts.
        if (features.runparams().math_flavor == OutputParams::MathAsMathML)
-               features.addPreambleSnippet("<style type=\"text/css\">\n"
-                       "mstyle.framebox { border: 1px solid black; }\n"
-                       "</style>");
+               features.addCSSSnippet("mstyle.framebox { border: 1px solid black; }");
        else if (features.runparams().math_flavor == OutputParams::MathAsHTML)
-               features.addPreambleSnippet("<style type=\"text/css\">\n"
-                       "span.framebox { border: 1px solid black; }\n"
-                       "</style>");
+               features.addCSSSnippet("span.framebox { border: 1px solid black; }");
        InsetMathNest::validate(features);
 }
 
@@ -418,13 +412,9 @@ void InsetMathBoxed::validate(LaTeXFeatures & features) const
        // It'd be better to be able to get this from an InsetLayout, but at present
        // InsetLayouts do not seem really to work for things that aren't InsetTexts.
        if (features.runparams().math_flavor == OutputParams::MathAsMathML)
-               features.addPreambleSnippet("<style type=\"text/css\">\n"
-                       "mstyle.boxed { border: 1px solid black; }\n"
-                       "</style>");
+               features.addCSSSnippet("mstyle.boxed { border: 1px solid black; }");
        else if (features.runparams().math_flavor == OutputParams::MathAsHTML)
-               features.addPreambleSnippet("<style type=\"text/css\">\n"
-                       "span.boxed { border: 1px solid black; }\n"
-                       "</style>");
+               features.addCSSSnippet("span.boxed { border: 1px solid black; }");
        
        InsetMathNest::validate(features);
 }