make \newcommand{\bb}[1]{\mathbf{#1}} work for read/write/display.

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

diff --git a/src/mathed/math_deliminset.C b/src/mathed/math_deliminset.C
index d0191cc87bbcde8e724d42ccfd9f2694ade5933e..882f8cb16576602ac0dbe6fb9d9c2fc704e52c31 100644 (file)
--- a/src/mathed/math_deliminset.C
+++ b/src/mathed/math_deliminset.C
@@ -6,10 +6,10 @@
 
 #include "math_deliminset.h"
 #include "math_parser.h"
-#include "mathed/support.h"
-#include "support/LOstream.h"
-
-using std::max;
+#include "math_support.h"
+#include "math_mathmlstream.h"
+#include "math_streamstr.h"
+#include "math_extern.h"
 
 
 MathDelimInset::MathDelimInset(string const & l, string const & r)
@@ -43,26 +43,25 @@ string MathDelimInset::latexName(string const & name)
 }
 
 
-void MathDelimInset::write(MathWriteInfo & os) const
+void MathDelimInset::write(WriteStream & os) const
 {
        os << "\\left" << latexName(left_) << cell(0)
           << "\\right" << latexName(right_);
 }
 
 
-void MathDelimInset::writeNormal(std::ostream & os) const
+void MathDelimInset::normalize(NormalStream & os) const
 {
-       os << "[delim " << latexName(left_) << ' ' << latexName(right_) << ' ';
-       cell(0).writeNormal(os);
-       os << "]";
+       os << "[delim " << latexName(left_) << ' '
+          << latexName(right_) << ' ' << cell(0) << ']';
 }
 
 
 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;
@@ -77,8 +76,8 @@ void MathDelimInset::metrics(MathMetricsInfo const & mi) const
        int h0   = (a + d) / 2;
        int a0   = std::max(xcell(0).ascent(), a)   - h0;
        int d0   = std::max(xcell(0).descent(), d)  + h0;
-       ascent_  = max(a0, d0) + h0;
-       descent_ = max(a0, d0) - h0;
+       ascent_  = std::max(a0, d0) + h0;
+       descent_ = std::max(a0, d0) - h0;
        width_   = xcell(0).width() + 2 * dw() + 4;
 }
 
@@ -93,37 +92,51 @@ void MathDelimInset::draw(Painter & pain, int x, int y) const
 }
 
 
-bool MathDelimInset::isMatrix() const
+bool MathDelimInset::isParanthesis() const
+{
+       return left_ == "(" && right_ == ")";
+}
+
+
+bool MathDelimInset::isBrackets() const
+{
+       return left_ == "[" && right_ == "]";
+}
+
+
+bool MathDelimInset::isAbs() const
 {
-       return left_ == "(" && right_ == ")" && cell(0).size() == 1 && 
-               cell(0).begin()->nucleus() && cell(0).begin()->nucleus()->asArrayInset();
+       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) << ")";
        }
        else
-               os << left_.c_str() << cell(0) << right_.c_str();
+               os << left_ << cell(0) << right_;
 }
 
 
 void MathDelimInset::mathmlize(MathMLStream & os) const
 {
-       os << "<fenced open=\"" << left_.c_str() << "\" close=\""
-               << right_.c_str() << "\">" << cell(0) << "</fenced>";
+       os << "<fenced open=\"" << left_ << "\" close=\""
+               << right_ << "\">" << cell(0) << "</fenced>";
 }
 
 
 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();
+               os << left_ << cell(0) << right_;
 }