fix delimiter handling for \, |, and /

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

diff --git a/src/mathed/math_deliminset.C b/src/mathed/math_deliminset.C
index d42bbf79d393d86fe7ff3cd1a197873fbba46039..6bb3abb1a7eeac307bfe139aece557d358f76cdc 100644 (file)
--- a/src/mathed/math_deliminset.C
+++ b/src/mathed/math_deliminset.C
@@ -11,7 +11,7 @@
 
 using std::max;
 
-MathDelimInset::MathDelimInset(latexkeys const * l, latexkeys const * r)
+MathDelimInset::MathDelimInset(string const & l, string const & r)
        : MathNestInset(1), left_(l), right_(r)
 {}
 
@@ -22,10 +22,8 @@ MathInset * MathDelimInset::clone() const
 }
 
 
-string MathDelimInset::latexName(latexkeys const * l)
+string MathDelimInset::latexName(string const & name)
 {
-       //static const string vdelim("(){}[]./|");
-       string name = l->name;
        if (name == "(")
                return name;
        if (name == "[")
@@ -46,7 +44,7 @@ string MathDelimInset::latexName(latexkeys const * l)
 
 void MathDelimInset::write(std::ostream & os, bool fragile) const
 {
-       os << "\\left" << latexName(left_);
+       os << "\\left"  << latexName(left_);
        cell(0).write(os, fragile);
        os << "\\right" << latexName(right_);
 }
@@ -86,6 +84,6 @@ void MathDelimInset::draw(Painter & pain, int x, int y) const
        int const w = dw();
        int const b = y - ascent_ - 2;
        xcell(0).draw(pain, x + w + 2, y);
-       mathed_draw_deco(pain, x + 1, b, w, height() + 4, left_->name);
-       mathed_draw_deco(pain, x + width() - w - 1, b, w, height() + 4, right_->name);
+       mathed_draw_deco(pain, x + 1, b, w, height() + 4, left_);
+       mathed_draw_deco(pain, x + width() - w - 1, b, w, height() + 4, right_);
 }