whichFont down to 5.3%

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

diff --git a/src/mathed/math_deliminset.C b/src/mathed/math_deliminset.C
index f74f8086a304523e86fa47b084eb408968563a54..b4cd2bc507f2cb4e83024eccc9117beea261275a 100644 (file)
--- a/src/mathed/math_deliminset.C
+++ b/src/mathed/math_deliminset.C
@@ -8,6 +8,7 @@
 #include "math_parser.h"
 #include "math_support.h"
 #include "math_mathmlstream.h"
+#include "math_streamstr.h"
 #include "math_extern.h"
 
 
@@ -22,45 +23,25 @@ MathInset * MathDelimInset::clone() const
 }
 
 
-string MathDelimInset::latexName(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;
-       return "\\" + name + " ";
-}
-
-
 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 > 15)
-               w = 15;
+       if (w > 8)
+               w = 8;
        if (w < 4)
                w = 4;
        return w;
@@ -77,7 +58,7 @@ void MathDelimInset::metrics(MathMetricsInfo const & mi) const
        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;
+       width_   = xcell(0).width() + 2 * dw() + 8;
 }
 
 
@@ -85,9 +66,9 @@ void MathDelimInset::draw(Painter & pain, 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(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_);
 }
 
 
@@ -121,14 +102,14 @@ void MathDelimInset::maplize(MapleStream & os) const
                        os << "abs(" << cell(0) << ")";
        }
        else
-               os << left_.c_str() << cell(0) << right_.c_str();
+               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 +118,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_;
 }