Fix regression of 18779013 for \smash

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

diff --git a/src/mathed/InsetMathScript.cpp b/src/mathed/InsetMathScript.cpp
index a9f4b38bd19c55ab384a2986378bb6c7255e93e6..7e501bc5a75884e9e984010276774b8d8b3d989f 100644 (file)
--- a/src/mathed/InsetMathScript.cpp
+++ b/src/mathed/InsetMathScript.cpp
@@ -15,7 +15,7 @@
 #include "DispatchResult.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "InsetMathFont.h"
+#include "InsetMathBrace.h"
 #include "InsetMathScript.h"
 #include "InsetMathSymbol.h"
 #include "LaTeXFeatures.h"
@@ -24,10 +24,10 @@
 #include "MathSupport.h"
 
 #include "support/debug.h"
+#include "support/gettext.h"
 
 #include "support/lassert.h"
 
-#include <ostream>
 
 using namespace std;
 
@@ -47,7 +47,7 @@ InsetMathScript::InsetMathScript(Buffer * buf, bool up)
 InsetMathScript::InsetMathScript(Buffer * buf, MathAtom const & at, bool up)
        : InsetMathNest(buf, 2), cell_1_is_up_(up), limits_(0)
 {
-       LASSERT(nargs() >= 1, /**/);
+       LATTEST(nargs() >= 1);
        cell(0).push_back(at);
 }
 
@@ -90,7 +90,7 @@ MathData const & InsetMathScript::down() const
 {
        if (nargs() == 3)
                return cell(2);
-       LASSERT(nargs() > 1, /**/);
+       LBUFERR(nargs() > 1);
        return cell(1);
 }
 
@@ -99,21 +99,21 @@ MathData & InsetMathScript::down()
 {
        if (nargs() == 3)
                return cell(2);
-       LASSERT(nargs() > 1, /**/);
+       LBUFERR(nargs() > 1);
        return cell(1);
 }
 
 
 MathData const & InsetMathScript::up() const
 {
-       LASSERT(nargs() > 1, /**/);
+       LBUFERR(nargs() > 1);
        return cell(1);
 }
 
 
 MathData & InsetMathScript::up()
 {
-       LASSERT(nargs() > 1, /**/);
+       LBUFERR(nargs() > 1);
        return cell(1);
 }
 
@@ -147,36 +147,11 @@ MathData & InsetMathScript::nuc()
 }
 
 
-namespace {
-
-bool isAlphaSymbol(MathAtom const & at)
-{
-       if (at->asCharInset() ||
-                       (at->asSymbolInset() &&
-                        at->asSymbolInset()->isOrdAlpha()))
-               return true;
-
-       if (at->asFontInset()) {
-               MathData const & ar = at->asFontInset()->cell(0);
-               for (size_t i = 0; i < ar.size(); ++i) {
-                       if (!(ar[i]->asCharInset() ||
-                                       (ar[i]->asSymbolInset() &&
-                                        ar[i]->asSymbolInset()->isOrdAlpha())))
-                               return false;
-               }
-               return true;
-       }
-       return false;
-}
-
-} // namespace anon
-
-
 int InsetMathScript::dy01(BufferView const & bv, int asc, int des, int what) const
 {
        int dasc = 0;
        int slevel = 0;
-       bool isCharBox = nuc().size() ? isAlphaSymbol(nuc().back()) : false;
+       bool isCharBox = !nuc().empty() ? isAlphaSymbol(nuc().back()) : false;
        if (hasDown()) {
                Dimension const & dimdown = down().dimension(bv);
                dasc = dimdown.ascent();
@@ -247,7 +222,7 @@ int InsetMathScript::dy1(BufferView const & bv) const
 
 int InsetMathScript::dx0(BufferView const & bv) const
 {
-       LASSERT(hasDown(), /**/);
+       LASSERT(hasDown(), return 0);
        Dimension const dim = dimension(bv);
        return hasLimits() ? (dim.wid - down().dimension(bv).width()) / 2 : nwid(bv);
 }
@@ -255,7 +230,7 @@ int InsetMathScript::dx0(BufferView const & bv) const
 
 int InsetMathScript::dx1(BufferView const & bv) const
 {
-       LASSERT(hasUp(), /**/);
+       LASSERT(hasUp(), return 0);
        Dimension const dim = dimension(bv);
        return hasLimits() ? (dim.wid - up().dimension(bv).width()) / 2 : nwid(bv) + nker(&bv);
 }
@@ -270,25 +245,25 @@ int InsetMathScript::dxx(BufferView const & bv) const
 
 int InsetMathScript::nwid(BufferView const & bv) const
 {
-       return nuc().size() ? nuc().dimension(bv).width() : 2;
+       return !nuc().empty() ? nuc().dimension(bv).width() : 2;
 }
 
 
 int InsetMathScript::nasc(BufferView const & bv) const
 {
-       return nuc().size() ? nuc().dimension(bv).ascent() : 5;
+       return !nuc().empty() ? nuc().dimension(bv).ascent() : 5;
 }
 
 
 int InsetMathScript::ndes(BufferView const & bv) const
 {
-       return nuc().size() ? nuc().dimension(bv).descent() : 0;
+       return !nuc().empty() ? nuc().dimension(bv).descent() : 0;
 }
 
 
 int InsetMathScript::nker(BufferView const * bv) const
 {
-       if (nuc().size()) {
+       if (!nuc().empty()) {
                int kerning = nuc().kerning(bv);
                return kerning > 0 ? kerning : 0;
        }
@@ -350,7 +325,7 @@ void InsetMathScript::metrics(MetricsInfo & mi, Dimension & dim) const
 void InsetMathScript::draw(PainterInfo & pi, int x, int y) const
 {
        BufferView & bv = *pi.base.bv;
-       if (nuc().size())
+       if (!nuc().empty())
                nuc().draw(pi, x + dxx(bv), y);
        else {
                nuc().setXY(bv, x + dxx(bv), y);
@@ -379,7 +354,7 @@ void InsetMathScript::metricsT(TextMetricsInfo const & mi, Dimension & dim) cons
 void InsetMathScript::drawT(TextPainter & pain, int x, int y) const
 {
        // FIXME: BROKEN
-       if (nuc().size())
+       if (!nuc().empty())
                nuc().drawT(pain, x + 1, y);
        if (hasUp())
                up().drawT(pain, x + 1, y - 1 /*dy1()*/);
@@ -398,7 +373,7 @@ bool InsetMathScript::hasLimits() const
                return false;
 
        // we can only display limits if the nucleus wants some
-       if (!nuc().size())
+       if (nuc().empty())
                return false;
        if (!nuc().back()->isScriptable())
                return false;
@@ -464,9 +439,7 @@ Inset::idx_type InsetMathScript::idxOfScript(bool up) const
                return (cell_1_is_up_ == up) ? 1 : 0;
        if (nargs() == 3)
                return up ? 1 : 2;
-       LASSERT(false, /**/);
-       // Silence compiler
-       return 0;
+       LASSERT(false, return 0);
 }
 
 
@@ -529,7 +502,7 @@ void InsetMathScript::write(WriteStream & os) const
 {
        MathEnsurer ensurer(os);
 
-       if (nuc().size()) {
+       if (!nuc().empty()) {
                os << nuc();
                //if (nuc().back()->takesLimits()) {
                        if (limits_ == -1)
@@ -544,11 +517,19 @@ void InsetMathScript::write(WriteStream & os) const
                        os << "{}";
        }
 
-       if (hasDown() /*&& down().size()*/)
+       if (hasDown() /*&& !down().empty()*/)
                os << "_{" << down() << '}';
 
-       if (hasUp() /*&& up().size()*/)
-               os << "^{" << up() << '}';
+       if (hasUp() /*&& !up().empty()*/) {
+               // insert space if up() is empty or an empty brace inset
+               // (see bug 8305)
+               if (os.latex() && (up().empty() ||
+                   (up().size() == 1 && up().back()->asBraceInset() &&
+                    up().back()->asBraceInset()->cell(0).empty())))
+                       os << "^ {}";
+               else
+                       os << "^{" << up() << '}';
+       }
 
        if (lock_ && !os.latex())
                os << "\\lyxlock ";
@@ -557,8 +538,8 @@ void InsetMathScript::write(WriteStream & os) const
 
 void InsetMathScript::normalize(NormalStream & os) const
 {
-       bool d = hasDown() && down().size();
-       bool u = hasUp() && up().size();
+       bool d = hasDown() && !down().empty();
+       bool u = hasUp() && !up().empty();
 
        if (u && d)
                os << "[subsup ";
@@ -567,7 +548,7 @@ void InsetMathScript::normalize(NormalStream & os) const
        else if (d)
                os << "[sub ";
 
-       if (nuc().size())
+       if (!nuc().empty())
                os << nuc() << ' ';
        else
                os << "[par]";
@@ -583,21 +564,21 @@ void InsetMathScript::normalize(NormalStream & os) const
 
 void InsetMathScript::maple(MapleStream & os) const
 {
-       if (nuc().size())
+       if (!nuc().empty())
                os << nuc();
-       if (hasDown() && down().size())
+       if (hasDown() && !down().empty())
                os << '[' << down() << ']';
-       if (hasUp() && up().size())
+       if (hasUp() && !up().empty())
                os << "^(" << up() << ')';
 }
 
 
 void InsetMathScript::mathematica(MathematicaStream & os) const
 {
-       bool d = hasDown() && down().size();
-       bool u = hasUp() && up().size();
+       bool d = hasDown() && !down().empty();
+       bool u = hasUp() && !up().empty();
 
-       if (nuc().size()) {
+       if (!nuc().empty()) {
                if (d)
                        os << "Subscript[" << nuc();
                else
@@ -607,7 +588,7 @@ void InsetMathScript::mathematica(MathematicaStream & os) const
        if (u)
                os << "^(" << up() << ')';
 
-       if (nuc().size()) {
+       if (!nuc().empty()) {
                if (d)
                        os << ',' << down() << ']';
        }
@@ -620,8 +601,8 @@ void InsetMathScript::mathematica(MathematicaStream & os) const
 // need to know if we're in a display formula.
 void InsetMathScript::mathmlize(MathStream & os) const
 {
-       bool d = hasDown() && down().size();
-       bool u = hasUp() && up().size();
+       bool d = hasDown() && !down().empty();
+       bool u = hasUp() && !up().empty();
 
        if (u && d)
                os << MTag("msubsup");
@@ -630,7 +611,7 @@ void InsetMathScript::mathmlize(MathStream & os) const
        else if (d)
                os << MTag("msub");
 
-       if (nuc().size())
+       if (!nuc().empty())
                os << MTag("mrow") << nuc() << ETag("mrow");
        else
                os << "<mrow />";
@@ -648,10 +629,10 @@ void InsetMathScript::mathmlize(MathStream & os) const
 
 void InsetMathScript::htmlize(HtmlStream & os) const
 {
-       bool d = hasDown() && down().size();
-       bool u = hasUp() && up().size();
+       bool d = hasDown() && !down().empty();
+       bool u = hasUp() && !up().empty();
 
-       if (nuc().size())
+       if (!nuc().empty())
                os << nuc();
 
        if (u && d)
@@ -668,11 +649,11 @@ void InsetMathScript::htmlize(HtmlStream & os) const
 
 void InsetMathScript::octave(OctaveStream & os) const
 {
-       if (nuc().size())
+       if (!nuc().empty())
                os << nuc();
-       if (hasDown() && down().size())
+       if (hasDown() && !down().empty())
                os << '[' << down() << ']';
-       if (hasUp() && up().size())
+       if (hasUp() && !up().empty())
                os << "^(" << up() << ')';
 }