Geof Piroux's patch for Mathematica support

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

diff --git a/src/mathed/math_deliminset.C b/src/mathed/math_deliminset.C
index 57ba6a220ff4cdd9accf04f55b4e926dd922006e..2a318c31798d85e8d10f3ced3eded08034ab30d9 100644 (file)
--- a/src/mathed/math_deliminset.C
+++ b/src/mathed/math_deliminset.C
@@ -8,28 +8,26 @@
 #include "math_parser.h"
 #include "math_support.h"
 #include "math_mathmlstream.h"
+#include "math_streamstr.h"
 #include "math_extern.h"
 
 
-MathDelimInset::MathDelimInset(string const & l, string const & r)
-       : MathNestInset(1), left_(l), right_(r)
-{}
+using std::max;
 
+namespace {
 
-MathInset * MathDelimInset::clone() const
-{   
-       return new MathDelimInset(*this);
-}
-
-
-string MathDelimInset::latexName(string const & name)
+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 == "]")
@@ -41,53 +39,75 @@ string MathDelimInset::latexName(string const & 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);
+}
+
 
 void MathDelimInset::write(WriteStream & os) const
 {
-       os << "\\left" << latexName(left_).c_str() << cell(0)
-          << "\\right" << latexName(right_).c_str();
+       os << "\\left" << convertDelimToLatexName(left_) << cell(0)
+          << "\\right" << convertDelimToLatexName(right_);
 }
 
 
 void MathDelimInset::normalize(NormalStream & os) const
 {
-       os << "[delim " << latexName(left_).c_str() << ' '
-               << latexName(right_).c_str() << ' ' << cell(0) << ']';
+       os << "[delim " << convertDelimToLatexName(left_) << ' '
+          << convertDelimToLatexName(right_) << ' ' << cell(0) << ']';
 }
 
 
 int MathDelimInset::dw() const
 {
        int w = height() / 5;
-       if (w > 12)
-               w = 12;
+       if (w > 8)
+               w = 8;
        if (w < 4)
                w = 4;
        return w;
 }
 
 
-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);
+       mathed_char_dim(mi.base.font, '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_  = std::max(a0, d0) + h0;
-       descent_ = std::max(a0, d0) - h0;
-       width_   = xcell(0).width() + 2 * dw() + 4;
+       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;
 }
 
 
-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 + 2, y);
-       mathed_draw_deco(pain, x + 1, b, w, height(), left_);
-       mathed_draw_deco(pain, x + width() - w - 1, b, w, height(), right_);
+       xcell(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_);
 }
 
 
@@ -115,20 +135,36 @@ void MathDelimInset::maplize(MapleStream & os) const
                bool mat =
                        cell(0).size() == 1 && cell(0).begin()->nucleus()
                                        && cell(0).begin()->nucleus()->asMatrixInset();
-               if (mat)        
+               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::mathematicize(MathematicaStream & os) const
+{
+       if (isAbs()) {
+               bool mat =
+                       cell(0).size() == 1 && cell(0).begin()->nucleus()
+                                       && cell(0).begin()->nucleus()->asMatrixInset();
+               if (mat)
+                       os << "Det" << cell(0) << ']';
+               else
+                       os << "Abs[" << cell(0) << ']';
+       }
+       else
+               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>";
 }
 
 
@@ -137,5 +173,5 @@ void MathDelimInset::octavize(OctaveStream & os) const
        if (isAbs())
                os << "det(" << cell(0) << ")";
        else
-               os << left_.c_str() << cell(0) << right_.c_str();
+               os << left_ << cell(0) << right_;
 }