several smallish changes/bugfixes/left overs from Porto

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

diff --git a/src/mathed/math_deliminset.C b/src/mathed/math_deliminset.C
index f5cbc7b2f495c03a3b46f33d70b70e00d6dbb681..5882a0cd0528f135211911a929115ce9a5db1ae9 100644 (file)
--- a/src/mathed/math_deliminset.C
+++ b/src/mathed/math_deliminset.C
@@ -1,29 +1,23 @@
+#include <config.h>
+
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
 #include "math_deliminset.h"
 #include "math_parser.h"
-#include "Painter.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"
 
-MathDelimInset::MathDelimInset(latexkeys const * l, latexkeys const * r)
-       : MathNestInset(1), left_(l), right_(r)
-{}
 
+using std::max;
 
-MathInset * MathDelimInset::clone() const
-{   
-       return new MathDelimInset(*this);
-}
+namespace {
 
-
-string MathDelimInset::latexName(latexkeys const * l)
+string convertDelimToLatexName(string const & name)
 {
-       //static const string vdelim("(){}[]./|");
-       string name = l->name;
        if (name == "(")
                return name;
        if (name == "[")
@@ -41,55 +35,123 @@ string MathDelimInset::latexName(latexkeys const * l)
        return "\\" + name + " ";
 }
 
+}
+
+
+
+MathDelimInset::MathDelimInset(string const & l, string const & r)
+       : MathNestInset(1), left_(l), right_(r)
+{}
+
 
-void MathDelimInset::write(std::ostream & os, bool fragile) const
+MathDelimInset::MathDelimInset
+               (string const & l, string const & r, MathArray const & ar)
+       : MathNestInset(1), left_(l), right_(r)
 {
-       os << "\\left" << latexName(left_);
-       cell(0).write(os, fragile);
-       os << "\\right" << latexName(right_);
+       cell(0) = ar;
 }
 
 
-void MathDelimInset::draw(Painter & pain, int x, int y) const
-{ 
-       xo(x);
-       yo(y); 
+MathInset * MathDelimInset::clone() const
+{
+       return new MathDelimInset(*this);
+}
 
-       int w = dw();
-       xcell(0).draw(pain, x + w, y);
-       
-       if (latexName(left_) == ".") {
-               pain.line(x + 4, yo() - ascent_, x + 4, yo() + descent_,
-                         LColor::mathcursor, Painter::line_onoffdash);
-       } else
-               mathed_draw_deco(pain, x, y - ascent_, w, height(), left_);
 
-       x += width() - w - 2;
+void MathDelimInset::write(WriteStream & os) const
+{
+       os << "\\left" << convertDelimToLatexName(left_) << cell(0)
+          << "\\right" << convertDelimToLatexName(right_);
+}
+
 
-       if (latexName(right_) == ".") {
-               pain.line(x + 4, yo() - ascent_, x + 4, yo() + descent_,
-                         LColor::mathcursor, Painter::line_onoffdash);
-       } else
-               mathed_draw_deco(pain, x, y - ascent_, w, height(), right_);
+void MathDelimInset::normalize(NormalStream & os) const
+{
+       os << "[delim " << convertDelimToLatexName(left_) << ' '
+          << convertDelimToLatexName(right_) << ' ' << cell(0) << ']';
 }
 
 
 int MathDelimInset::dw() const
 {
-       int w = height()/5;
-       if (w > 15)
-               w = 15;
-       if (w < 6)
-               w = 6;
+       int w = height() / 5;
+       if (w > 8)
+               w = 8;
+       if (w < 4)
+               w = 4;
        return w;
 }
 
 
-void MathDelimInset::metrics(MathStyles st) const
+void MathDelimInset::metrics(MathMetricsInfo & mi) const
+{
+       xcell(0).metrics(mi);
+       int a, d, w;
+       mathed_char_dim(mi.base.font, '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;
+}
+
+
+void MathDelimInset::draw(MathPainterInfo & pi, int x, int y) const
+{
+       int const w = dw();
+       int const b = y - ascent_;
+       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_);
+}
+
+
+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
 {
-       xcell(0).metrics(st);
-       size_    = st;
-       ascent_  = xcell(0).ascent() + 2;
-       descent_ = xcell(0).descent() + 2;
-       width_   = xcell(0).width() + 2 * dw() + 4;
+       if (isAbs())
+               os << "det(" << cell(0) << ")";
+       else
+               os << left_ << cell(0) << right_;
 }