Seems boost also includes all std headers. Not including boost therefore produces...

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

diff --git a/src/mathed/InsetMathScript.cpp b/src/mathed/InsetMathScript.cpp
index 74420279cb8d5ee23abe7fe3b55ad29129e7f12b..0b6a4d86cb39d43059503b34d467ab8b91e306b0 100644 (file)
--- a/src/mathed/InsetMathScript.cpp
+++ b/src/mathed/InsetMathScript.cpp
@@ -17,8 +17,8 @@
 #include "InsetMathFont.h"
 #include "InsetMathScript.h"
 #include "InsetMathSymbol.h"
+#include "LaTeXFeatures.h"
 #include "MathData.h"
-#include "MathExtern.h"
 #include "MathStream.h"
 #include "MathSupport.h"
 
@@ -617,7 +617,7 @@ void InsetMathScript::mathematica(MathematicaStream & os) const
 // It may be worth trying to output munder, mover, and munderover
 // in certain cases, e.g., for display formulas. But then we would
 // need to know if we're in a display formula.
-docstring InsetMathScript::mathmlize(MathStream & os) const
+void InsetMathScript::mathmlize(MathStream & os) const
 {
        bool d = hasDown() && down().size();
        bool u = hasUp() && up().size();
@@ -629,12 +629,9 @@ docstring InsetMathScript::mathmlize(MathStream & os) const
        else if (d)
                os << MTag("msub");
 
-       docstring rv;
-       if (nuc().size()) {
-               os << MTag("mrow");
-               rv = lyx::mathmlize(nuc(), os);
-               os << ETag("mrow");
-       } else
+       if (nuc().size())
+               os << MTag("mrow") << nuc() << ETag("mrow");
+       else
                os << "<mrow />";
 
        if (u && d)
@@ -645,7 +642,26 @@ docstring InsetMathScript::mathmlize(MathStream & os) const
                os << MTag("mrow") << up() << ETag("mrow") << ETag("msup");
        else if (d)
                os << MTag("mrow") << down() << ETag("mrow") << ETag("msub");
-       return rv;
+}
+
+
+void InsetMathScript::htmlize(HtmlStream & os) const
+{
+       bool d = hasDown() && down().size();
+       bool u = hasUp() && up().size();
+
+       if (nuc().size())
+               os << nuc();
+
+       if (u && d)
+               os << MTag("span", "class='scripts'")
+                        << MTag("span") << up() << ETag("span")
+                        << MTag("span") << down() << ETag("span")
+                        << ETag("span");
+       else if (u)
+               os << MTag("sup", "class='math'") << up() << ETag("sup");
+       else if (d)
+               os << MTag("sub", "class='math'") << down() << ETag("sub");
 }
 
 
@@ -688,13 +704,13 @@ bool InsetMathScript::notifyCursorLeaves(Cursor const & old, Cursor & cur)
                        // must be a subscript...
                        old.recordUndoInset();
                        removeScript(false);
-                       cur.updateFlags(cur.disp_.update() | Update::SinglePar);
+                       cur.updateFlags(cur.result().update() | Update::SinglePar);
                        return true;
                } else if (cell(1).empty()) {
                        // must be a superscript...
                        old.recordUndoInset();
                        removeScript(true);
-                       cur.updateFlags(cur.disp_.update() | Update::SinglePar);
+                       cur.updateFlags(cur.result().update() | Update::SinglePar);
                        return true;
                }
        }
@@ -724,7 +740,7 @@ bool InsetMathScript::notifyCursorLeaves(Cursor const & old, Cursor & cur)
                insetCur.cell().insert(insetCur.pos(), ar);
 
                // redraw
-               cur.updateFlags(cur.disp_.update() | Update::SinglePar);
+               cur.updateFlags(cur.result().update() | Update::SinglePar);
                return true;
        }
 
@@ -737,7 +753,7 @@ void InsetMathScript::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
        //LYXERR("InsetMathScript: request: " << cmd);
 
-       if (cmd.action == LFUN_MATH_LIMITS) {
+       if (cmd.action() == LFUN_MATH_LIMITS) {
                if (!cmd.argument().empty()) {
                        if (cmd.argument() == "limits")
                                limits_ = 1;
@@ -756,4 +772,17 @@ void InsetMathScript::doDispatch(Cursor & cur, FuncRequest & cmd)
 }
 
 
+// the idea for dual scripts came from the eLyXer code
+void InsetMathScript::validate(LaTeXFeatures & features) const
+{
+       if (features.runparams().math_flavor == OutputParams::MathAsHTML)
+               features.addPreambleSnippet("<style type=\"text/css\">\n"
+                       "span.scripts{display: inline-block; vertical-align: middle; text-align:center; font-size: 75%;}\n"
+                       "span.scripts span {display: block;}\n"
+                       "sub.math{font-size: 75%;}\n"
+                       "sup.math{font-size: 75%;}\n"
+                       "</style>");
+       InsetMathNest::validate(features);
+}
+
 } // namespace lyx