Reduce horizontal spacing for simple inline equations

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

diff --git a/src/mathed/InsetMathUnderset.cpp b/src/mathed/InsetMathUnderset.cpp
index 577d49e3bb5714ba9e5e969fcc0c0cfe20b85fb0..b8c5d14625dd81f097ac06196867f49c66b6efe7 100644 (file)
--- a/src/mathed/InsetMathUnderset.cpp
+++ b/src/mathed/InsetMathUnderset.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,54 +11,54 @@
 #include <config.h>
 
 #include "InsetMathUnderset.h"
+
 #include "MathData.h"
 #include "MathStream.h"
 
-#include "cursor.h"
+#include "Cursor.h"
 #include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
 
 
-namespace lyx {
-
-using std::max;
-using std::auto_ptr;
-
+using namespace std;
 
+namespace lyx {
 
-auto_ptr<InsetBase> InsetMathUnderset::doClone() const
+Inset * InsetMathUnderset::clone() const
 {
-       return auto_ptr<InsetBase>(new InsetMathUnderset(*this));
+       return new InsetMathUnderset(*this);
 }
 
 
-bool InsetMathUnderset::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathUnderset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       cell(1).metrics(mi);
-       FracChanger dummy(mi.base);
-       cell(0).metrics(mi);
-       dim.wid = max(cell(0).width(), cell(1).width()) + 4;
-       dim.asc = cell(1).ascent();
-       dim.des = cell(1).descent() + cell(0).height() + 4;
-       metricsMarkers(dim);
-       if (dim_ == dim)
-               return false;
-       dim_ = dim;
-       return true;
+       Changer dummy2 = mi.base.changeEnsureMath();
+       Dimension dim1;
+       cell(1).metrics(mi, dim1);
+       Changer dummy = mi.base.changeFrac();
+       Dimension dim0;
+       cell(0).metrics(mi, dim0);
+       dim.wid = max(dim0.width(), dim1.width()) + 4;
+       dim.asc = dim1.ascent();
+       dim.des = dim1.descent() + dim0.height() + 4;
 }
 
 
 void InsetMathUnderset::draw(PainterInfo & pi, int x, int y) const
 {
-       int m  = x + width() / 2;
-       int yo = y + cell(1).descent() + cell(0).ascent() + 1;
-       cell(1).draw(pi, m - cell(1).width() / 2, y);
-       FracChanger dummy(pi.base);
-       cell(0).draw(pi, m - cell(0).width() / 2, yo);
-       drawMarkers(pi, x, y);
+       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);
+       int m  = x + dim.wid / 2;
+       int yo = y + dim1.descent() + dim0.ascent() + 1;
+       cell(1).draw(pi, m - dim1.width() / 2, y);
+       Changer dummy = pi.base.changeFrac();
+       cell(0).draw(pi, m - dim0.width() / 2, yo);
 }
 
 
-bool InsetMathUnderset::idxFirst(LCursor & cur) const
+bool InsetMathUnderset::idxFirst(Cursor & cur) const
 {
        cur.idx() = 1;
        cur.pos() = 0;
@@ -66,7 +66,7 @@ bool InsetMathUnderset::idxFirst(LCursor & cur) const
 }
 
 
-bool InsetMathUnderset::idxLast(LCursor & cur) const
+bool InsetMathUnderset::idxLast(Cursor & cur) const
 {
        cur.idx() = 1;
        cur.pos() = cur.lastpos();
@@ -74,19 +74,22 @@ bool InsetMathUnderset::idxLast(LCursor & cur) const
 }
 
 
-bool InsetMathUnderset::idxUpDown(LCursor & cur, bool up) const
+bool InsetMathUnderset::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.x_target());
+       cur.pos() = cur.cell().x2pos(&cur.bv(), cur.x_target());
        return true;
 }
 
 
 void InsetMathUnderset::write(WriteStream & os) const
 {
+       MathEnsurer ensurer(os);
+       if (os.fragile())
+               os << "\\protect";
        os << "\\underset{" << cell(0) << "}{" << cell(1) << '}';
 }
 
@@ -97,9 +100,31 @@ void InsetMathUnderset::normalize(NormalStream & os) const
 }
 
 
+void InsetMathUnderset::mathmlize(MathStream & ms) const
+{
+       ms << "<munder accent='false'>" << cell(1) << cell(0) << "</munder>";
+}
+
+
+void InsetMathUnderset::htmlize(HtmlStream & os) const
+{
+       os << MTag("span", "class='underset'")
+                << MTag("span") << cell(0) << ETag("span")
+                << MTag("span", "class='bottom'") << cell(1) << ETag("span")
+                << ETag("span");
+}
+
+
 void InsetMathUnderset::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.underset{display: inline-block; vertical-align: top; text-align:center;}\n"
+                       "span.underset span {display: block;}\n"
+                       "span.bottom{font-size: 66%;}");
+
        InsetMathNest::validate(features);
 }