fix drawing glitch

[lyx.git] / src / mathed / math_deliminset.C

diff --git a/src/mathed/math_deliminset.C b/src/mathed/math_deliminset.C
index dd4f3ef08bf6bd48ee8af4c7d54c2718ba7c3391..57ba6a220ff4cdd9accf04f55b4e926dd922006e 100644 (file)
--- a/src/mathed/math_deliminset.C
+++ b/src/mathed/math_deliminset.C
@@ -6,9 +6,9 @@
 
 #include "math_deliminset.h"
 #include "math_parser.h"
-#include "support.h"
-#include "support/LOstream.h"
+#include "math_support.h"
 #include "math_mathmlstream.h"
+#include "math_extern.h"
 
 
 MathDelimInset::MathDelimInset(string const & l, string const & r)
@@ -42,14 +42,14 @@ string MathDelimInset::latexName(string const & name)
 }
 
 
-void MathDelimInset::write(MathWriteInfo & os) const
+void MathDelimInset::write(WriteStream & os) const
 {
        os << "\\left" << latexName(left_).c_str() << cell(0)
           << "\\right" << latexName(right_).c_str();
 }
 
 
-void MathDelimInset::writeNormal(NormalStream & os) const
+void MathDelimInset::normalize(NormalStream & os) const
 {
        os << "[delim " << latexName(left_).c_str() << ' '
                << latexName(right_).c_str() << ' ' << cell(0) << ']';
@@ -59,8 +59,8 @@ void MathDelimInset::writeNormal(NormalStream & os) const
 int MathDelimInset::dw() const
 {
        int w = height() / 5;
-       if (w > 15)
-               w = 15;
+       if (w > 12)
+               w = 12;
        if (w < 4)
                w = 4;
        return w;
@@ -91,17 +91,31 @@ void MathDelimInset::draw(Painter & pain, int x, int y) const
 }
 
 
-bool MathDelimInset::isMatrix() const
+bool MathDelimInset::isParanthesis() const
 {
-       return left_ == "(" && right_ == ")" && cell(0).size() == 1 && 
-               cell(0).begin()->nucleus() && cell(0).begin()->nucleus()->asArrayInset();
+       return left_ == "(" && right_ == ")";
+}
+
+
+bool MathDelimInset::isBrackets() const
+{
+       return left_ == "[" && right_ == "]";
+}
+
+
+bool MathDelimInset::isAbs() const
+{
+       return left_ == "|" && right_ == "|";
 }
 
 
 void MathDelimInset::maplize(MapleStream & os) const
 {
-       if (left_ == "|" && right_ == "|") {
-               if (cell(0).isMatrix()) 
+       if (isAbs()) {
+               bool mat =
+                       cell(0).size() == 1 && cell(0).begin()->nucleus()
+                                       && cell(0).begin()->nucleus()->asMatrixInset();
+               if (mat)        
                        os << "linalg[det](" << cell(0) << ")";
                else
                        os << "abs(" << cell(0) << ")";
@@ -120,7 +134,7 @@ void MathDelimInset::mathmlize(MathMLStream & os) const
 
 void MathDelimInset::octavize(OctaveStream & os) const
 {
-       if (left_ == "|" && right_ == "|")
+       if (isAbs())
                os << "det(" << cell(0) << ")";
        else
                os << left_.c_str() << cell(0) << right_.c_str();