rename commandtags.h to lfuns.h and renumber/cleanup. Rebuild the tree !

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

diff --git a/src/mathed/math_deliminset.C b/src/mathed/math_deliminset.C
index ad5697e3a307785e729fb2d6739cfaf3e54b8af8..bb7dbce5e994a1ed044588e52ceb93f50eddd44b 100644 (file)
--- a/src/mathed/math_deliminset.C
+++ b/src/mathed/math_deliminset.C
@@ -1,8 +1,5 @@
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "math_deliminset.h"
 #include "math_parser.h"
@@ -14,14 +11,50 @@
 
 using std::max;
 
+namespace {
+
+string convertDelimToLatexName(string const & name)
+{
+       if (name == "<")
+               return name;
+       if (name == "(")
+               return name;
+       if (name == "[")
+               return name;
+       if (name == ".")
+               return name;
+       if (name == ">")
+               return name;
+       if (name == ")")
+               return name;
+       if (name == "]")
+               return name;
+       if (name == "/")
+               return name;
+       if (name == "|")
+               return name;
+       return '\\' + name + ' ';
+}
+
+}
+
+
 
 MathDelimInset::MathDelimInset(string const & l, string const & r)
        : MathNestInset(1), left_(l), right_(r)
 {}
 
 
+MathDelimInset::MathDelimInset
+               (string const & l, string const & r, MathArray const & ar)
+       : MathNestInset(1), left_(l), right_(r)
+{
+       cell(0) = ar;
+}
+
+
 MathInset * MathDelimInset::clone() const
-{   
+{
        return new MathDelimInset(*this);
 }
 
@@ -51,27 +84,27 @@ int MathDelimInset::dw() const
 }
 
 
-void MathDelimInset::metrics(MathMetricsInfo const & mi) const
+void MathDelimInset::metrics(MathMetricsInfo & mi) const
 {
-       xcell(0).metrics(mi);
-       int a, d, w;
-       mathed_char_dim(LM_TC_VAR, mi, 'I', a, d, w);
-       int h0   = (a + d) / 2;
-       int a0   = max(xcell(0).ascent(), a)   - h0;
-       int d0   = max(xcell(0).descent(), d)  + h0;
-       ascent_  = max(a0, d0) + h0;
-       descent_ = max(a0, d0) - h0;
-       width_   = xcell(0).width() + 2 * dw() + 8;
+       cell(0).metrics(mi);
+       Dimension t;
+       mathed_char_dim(mi.base.font, 'I', t);
+       int h0 = (t.a + t.d) / 2;
+       int a0 = max(cell(0).ascent(), t.a)   - h0;
+       int d0 = max(cell(0).descent(), t.d)  + h0;
+       dim_.a = max(a0, d0) + h0;
+       dim_.d = max(a0, d0) - h0;
+       dim_.w = cell(0).width() + 2 * dw() + 8;
 }
 
 
-void MathDelimInset::draw(Painter & pain, int x, int y) const
-{ 
+void MathDelimInset::draw(MathPainterInfo & pi, int x, int y) const
+{
        int const w = dw();
-       int const b = y - ascent_;
-       xcell(0).draw(pain, x + w + 4, y);
-       mathed_draw_deco(pain, x + 4, b, w, height(), left_);
-       mathed_draw_deco(pain, x + width() - w - 4, b, w, height(), right_);
+       int const b = y - ascent();
+       cell(0).draw(pi, x + w + 4, y);
+       mathed_draw_deco(pi, x + 4, b, w, height(), left_);
+       mathed_draw_deco(pi, x + width() - w - 4, b, w, height(), right_);
 }
 
 
@@ -93,16 +126,38 @@ bool MathDelimInset::isAbs() const
 }
 
 
-void MathDelimInset::maplize(MapleStream & os) const
+void MathDelimInset::maple(MapleStream & os) const
+{
+       if (isAbs()) {
+               if (cell(0).size() == 1 && cell(0).front()->asMatrixInset())
+                       os << "linalg[det](" << cell(0) << ')';
+               else
+                       os << "abs(" << cell(0) << ')';
+       }
+       else
+               os << left_ << cell(0) << right_;
+}
+
+void MathDelimInset::maxima(MaximaStream & os) const
+{
+       if (isAbs()) {
+               if (cell(0).size() == 1 && cell(0).front()->asMatrixInset())
+                       os << "determinant(" << cell(0) << ')';
+               else
+                       os << "abs(" << cell(0) << ')';
+       }
+       else
+               os << left_ << cell(0) << right_;
+}
+
+
+void MathDelimInset::mathematica(MathematicaStream & 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) << ")";
+               if (cell(0).size() == 1 && cell(0).front()->asMatrixInset())
+                       os << "Det" << cell(0) << ']';
                else
-                       os << "abs(" << cell(0) << ")";
+                       os << "Abs[" << cell(0) << ']';
        }
        else
                os << left_ << cell(0) << right_;
@@ -116,10 +171,10 @@ void MathDelimInset::mathmlize(MathMLStream & os) const
 }
 
 
-void MathDelimInset::octavize(OctaveStream & os) const
+void MathDelimInset::octave(OctaveStream & os) const
 {
        if (isAbs())
-               os << "det(" << cell(0) << ")";
+               os << "det(" << cell(0) << ')';
        else
                os << left_ << cell(0) << right_;
 }