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 a4f7efafd1c8598ea2b68c13ca6024965322f01a..882f8cb16576602ac0dbe6fb9d9c2fc704e52c31 100644 (file)
--- a/src/mathed/math_deliminset.C
+++ b/src/mathed/math_deliminset.C
@@ -6,10 +6,11 @@
 
 #include "math_deliminset.h"
 #include "math_parser.h"
-#include "mathed/support.h"
-#include "support/LOstream.h"
+#include "math_support.h"
+#include "math_mathmlstream.h"
+#include "math_streamstr.h"
+#include "math_extern.h"
 
-using std::max;
 
 MathDelimInset::MathDelimInset(string const & l, string const & r)
        : MathNestInset(1), left_(l), right_(r)
@@ -42,48 +43,100 @@ string MathDelimInset::latexName(string const & name)
 }
 
 
-void MathDelimInset::write(std::ostream & os, bool fragile) const
+void MathDelimInset::write(WriteStream & os) const
 {
-       os << "\\left"  << latexName(left_);
-       cell(0).write(os, fragile);
-       os << "\\right" << latexName(right_);
+       os << "\\left" << latexName(left_) << cell(0)
+          << "\\right" << latexName(right_);
+}
+
+
+void MathDelimInset::normalize(NormalStream & os) const
+{
+       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;
 }
 
 
-void MathDelimInset::metrics(MathStyles st) const
+void MathDelimInset::metrics(MathMetricsInfo const & mi) const
 {
-       xcell(0).metrics(st);
-       size_    = st;
+       xcell(0).metrics(mi);
        int a, d, w;
-       mathed_char_dim(LM_TC_VAR, st,'I', a, d, w);
+       mathed_char_dim(LM_TC_VAR, mi, 'I', a, d, w);
        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;
 }
 
 
 void MathDelimInset::draw(Painter & pain, int x, int y) const
 { 
-       xo(x);
-       yo(y); 
-
        int const w = dw();
        int const b = y - ascent_;
        xcell(0).draw(pain, x + w + 2, y);
        mathed_draw_deco(pain, x + 1, b, w, height(), left_);
        mathed_draw_deco(pain, x + width() - w - 1, b, w, height(), right_);
 }
+
+
+bool MathDelimInset::isParanthesis() const
+{
+       return left_ == "(" && right_ == ")";
+}
+
+
+bool MathDelimInset::isBrackets() const
+{
+       return left_ == "[" && right_ == "]";
+}
+
+
+bool MathDelimInset::isAbs() const
+{
+       return left_ == "|" && right_ == "|";
+}
+
+
+void MathDelimInset::maplize(MapleStream & os) const
+{
+       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_ << cell(0) << right_;
+}
+
+
+void MathDelimInset::mathmlize(MathMLStream & os) const
+{
+       os << "<fenced open=\"" << left_ << "\" close=\""
+               << right_ << "\">" << cell(0) << "</fenced>";
+}
+
+
+void MathDelimInset::octavize(OctaveStream & os) const
+{
+       if (isAbs())
+               os << "det(" << cell(0) << ")";
+       else
+               os << left_ << cell(0) << right_;
+}