Revert "DocBook: make openParTag/closeTag use paragraphs instead of layouts."

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

diff --git a/src/mathed/InsetMathOverset.cpp b/src/mathed/InsetMathOverset.cpp
index bd56bff79fa457820c43bbbec306b239e0c249f0..2db26cf4c00983248fcaef9fdfdbf3b03b3bcc0b 100644 (file)
--- a/src/mathed/InsetMathOverset.cpp
+++ b/src/mathed/InsetMathOverset.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.
  */
@@ -11,11 +11,15 @@
 #include <config.h>
 
 #include "InsetMathOverset.h"
+
 #include "MathData.h"
 #include "MathStream.h"
 
 #include "Cursor.h"
 #include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
+
+#include "support/lassert.h"
 
 using namespace std;
 
@@ -29,37 +33,47 @@ Inset * InsetMathOverset::clone() const
 
 void InsetMathOverset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       Dimension dim1;
-       cell(1).metrics(mi, dim1);
-       FracChanger dummy(mi.base);
+       Changer dummy2 = mi.base.changeEnsureMath();
        Dimension dim0;
        cell(0).metrics(mi, dim0);
-       dim.wid = max(dim0.width(), dim1.wid) + 4;
-       dim.asc = dim1.asc + dim0.height() + 4;
-       dim.des = dim1.des;
-       metricsMarkers(dim);
-       // Cache the inset dimension. 
-       setDimCache(mi, dim);
+       Changer dummy = mi.base.changeScript();
+       Dimension dim1;
+       cell(1).metrics(mi, dim1);
+       dim.wid = max(dim1.width(), dim0.wid) + 4;
+       dim.asc = dim0.asc + dim1.height() + 4;
+       dim.des = dim0.des;
 }
 
 
 void InsetMathOverset::draw(PainterInfo & pi, int x, int y) const
 {
+       Changer dummy2 = pi.base.changeEnsureMath();
        Dimension const dim = dimension(*pi.base.bv);
-       Dimension const & dim0 = cell(0).dimension(*pi.base.bv);
        Dimension const & dim1 = cell(1).dimension(*pi.base.bv);
+       Dimension const & dim0 = cell(0).dimension(*pi.base.bv);
        int m  = x + dim.wid / 2;
-       int yo = y - dim1.asc - dim0.des - 1;
-       cell(1).draw(pi, m - dim1.wid / 2, y);
-       FracChanger dummy(pi.base);
-       cell(0).draw(pi, m - dim0.width() / 2, yo);
-       drawMarkers(pi, x, y);
+       int yo = y - dim0.asc - dim1.des - 1;
+       cell(0).draw(pi, m - dim0.wid / 2, y);
+       Changer dummy = pi.base.changeScript();
+       cell(1).draw(pi, m - dim1.width() / 2, yo);
+}
+
+
+bool InsetMathOverset::idxUpDown(Cursor & cur, bool up) const
+{
+       idx_type target = up; // up ? 1 : 0, since upper cell has idx 1
+       if (cur.idx() == target)
+               return false;
+       cur.idx() = target;
+       cur.pos() = cur.cell().x2pos(&cur.bv(), cur.x_target());
+       return true;
 }
 
 
 bool InsetMathOverset::idxFirst(Cursor & cur) const
 {
-       cur.idx() = 1;
+       LASSERT(&cur.inset() == this, return false);
+       cur.idx() = 0;
        cur.pos() = 0;
        return true;
 }
@@ -67,7 +81,8 @@ bool InsetMathOverset::idxFirst(Cursor & cur) const
 
 bool InsetMathOverset::idxLast(Cursor & cur) const
 {
-       cur.idx() = 1;
+       LASSERT(&cur.inset() == this, return false);
+       cur.idx() = 0;
        cur.pos() = cur.lastpos();
        return true;
 }
@@ -75,19 +90,46 @@ bool InsetMathOverset::idxLast(Cursor & cur) const
 
 void InsetMathOverset::write(WriteStream & os) const
 {
-       os << "\\overset{" << cell(0) << "}{" << cell(1) << '}';
+       MathEnsurer ensurer(os);
+       if (os.fragile())
+               os << "\\protect";
+       os << "\\overset{" << cell(1) << "}{" << cell(0) << '}';
 }
 
 
 void InsetMathOverset::normalize(NormalStream & os) const
 {
-       os << "[overset " << cell(0) << ' ' << cell(1) << ']';
+       os << "[overset " << cell(1) << ' ' << cell(0) << ']';
+}
+
+
+void InsetMathOverset::mathmlize(MathStream & ms) const
+{
+       ms << "<" << from_ascii(ms.namespacedTag("mover")) << " accent='false'>"
+          << cell(0) << cell(1)
+          << "</" << from_ascii(ms.namespacedTag("mover")) << ">";
+}
+
+
+void InsetMathOverset::htmlize(HtmlStream & os) const
+{
+       os << MTag("span", "class='overset'")
+          << MTag("span", "class='top'") << cell(1) << ETag("span")
+          << MTag("span") << cell(0) << ETag("span")
+          << ETag("span");
 }
 
 
 void InsetMathOverset::validate(LaTeXFeatures & features) const
 {
-       features.require("amsmath");
+       if (features.runparams().isLaTeX())
+               features.require("amsmath");
+       else if (features.runparams().math_flavor == OutputParams::MathAsHTML)
+               features.addCSSSnippet(
+                       "span.overset{display: inline-block; vertical-align: bottom; text-align:center;}\n"
+                       "span.overset span {display: block;}\n"
+                       "span.top{font-size: 66%;}");
+
        InsetMathNest::validate(features);
 }