rework of MathDelimInset almost finished... did that break anything?

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

diff --git a/src/mathed/math_deliminset.C b/src/mathed/math_deliminset.C
index 421b6588fd9ed646db42a758d31a7ddc2a16db86..f5cbc7b2f495c03a3b46f33d70b70e00d6dbb681 100644 (file)
--- a/src/mathed/math_deliminset.C
+++ b/src/mathed/math_deliminset.C
@@ -1,60 +1,56 @@
-#include <config.h>
-
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
 #include "math_deliminset.h"
 #include "math_parser.h"
-#include "LColor.h"
 #include "Painter.h"
 #include "mathed/support.h"
 #include "support/LOstream.h"
 
 
-MathDelimInset::MathDelimInset(int l, int r)
-       : MathInset("", LM_OT_DELIM, 1), left_(l), right_(r)
+MathDelimInset::MathDelimInset(latexkeys const * l, latexkeys const * r)
+       : MathNestInset(1), left_(l), right_(r)
 {}
 
 
-MathInset * MathDelimInset::Clone() const
+MathInset * MathDelimInset::clone() const
 {   
        return new MathDelimInset(*this);
 }
 
 
-void MathDelimInset::Write(std::ostream & os, bool fragile) const
+string MathDelimInset::latexName(latexkeys const * l)
+{
+       //static const string vdelim("(){}[]./|");
+       string name = l->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 + " ";
+}
+
+
+void MathDelimInset::write(std::ostream & os, bool fragile) const
 {
-       latexkeys const * l = (left_ != '|') ?
-               lm_get_key_by_id(left_, LM_TK_SYM) : 0;
-       latexkeys const * r = (right_ != '|') ?
-               lm_get_key_by_id(right_, LM_TK_SYM) : 0;
-
-       os << "\\left";
-       if (l)
-               os << '\\' << l->name << ' ';
-       else {
-               if (left_ == '{' || left_ == '}')
-                       os << '\\' << char(left_) << ' ';
-               else
-                       os << char(left_) << ' ';
-       }
-
-       cell(0).Write(os, fragile);
-
-       os << "\\right";
-       if (r)
-               os << '\\' << r->name << ' ';
-       else {
-               if (right_ == '{' || right_ == '}')
-                       os << '\\' << char(right_) << ' ';
-               else
-                       os << char(right_) << ' ';
-       }
+       os << "\\left" << latexName(left_);
+       cell(0).write(os, fragile);
+       os << "\\right" << latexName(right_);
 }
 
 
-void MathDelimInset::draw(Painter & pain, int x, int y)
+void MathDelimInset::draw(Painter & pain, int x, int y) const
 { 
        xo(x);
        yo(y); 
@@ -62,7 +58,7 @@ void MathDelimInset::draw(Painter & pain, int x, int y)
        int w = dw();
        xcell(0).draw(pain, x + w, y);
        
-       if (left_ == '.') {
+       if (latexName(left_) == ".") {
                pain.line(x + 4, yo() - ascent_, x + 4, yo() + descent_,
                          LColor::mathcursor, Painter::line_onoffdash);
        } else
@@ -70,7 +66,7 @@ void MathDelimInset::draw(Painter & pain, int x, int y)
 
        x += width() - w - 2;
 
-       if (right_ == '.') {
+       if (latexName(right_) == ".") {
                pain.line(x + 4, yo() - ascent_, x + 4, yo() + descent_,
                          LColor::mathcursor, Painter::line_onoffdash);
        } else
@@ -89,9 +85,9 @@ int MathDelimInset::dw() const
 }
 
 
-void MathDelimInset::Metrics(MathStyles st)
+void MathDelimInset::metrics(MathStyles st) const
 {
-       xcell(0).Metrics(st);
+       xcell(0).metrics(st);
        size_    = st;
        ascent_  = xcell(0).ascent() + 2;
        descent_ = xcell(0).descent() + 2;