use stream-like syntax for LaTeX output

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

diff --git a/src/mathed/math_deliminset.C b/src/mathed/math_deliminset.C
index 84a1001f9900108405fc1660beaf5160a3151455..dfa88844698cbeb6042ff9e44fc23251be673bac 100644 (file)
--- a/src/mathed/math_deliminset.C
+++ b/src/mathed/math_deliminset.C
@@ -1,3 +1,5 @@
+#include <config.h>
+
 #ifdef __GNUG__
 #pragma implementation
 #endif
@@ -7,8 +9,9 @@
 #include "mathed/support.h"
 #include "support/LOstream.h"
 
+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)
 {}
 
@@ -19,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 == "[")
@@ -41,11 +42,10 @@ string MathDelimInset::latexName(latexkeys const * l)
 }
 
 
-void MathDelimInset::write(std::ostream & os, bool fragile) const
+void MathDelimInset::write(MathWriteInfo & os) const
 {
-       os << "\\left" << latexName(left_);
-       cell(0).write(os, fragile);
-       os << "\\right" << latexName(right_);
+       os << "\\left" << latexName(left_) << cell(0)
+          << "\\right" << latexName(right_);
 }
 
 
@@ -60,12 +60,12 @@ int MathDelimInset::dw() const
 }
 
 
-void MathDelimInset::metrics(MathStyles st) const
+void MathDelimInset::metrics(MathMetricsInfo const & st) const
 {
        xcell(0).metrics(st);
        size_    = st;
        int a, d, w;
-       mathed_char_dim(LM_TC_VAR, st,'I', a, d, w);
+       mathed_char_dim(LM_TC_VAR, size_.size,'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;
@@ -81,8 +81,8 @@ void MathDelimInset::draw(Painter & pain, int x, int y) const
        yo(y); 
 
        int const w = dw();
-       int const b = y - ascent_ - 2;
+       int const b = y - ascent_;
        xcell(0).draw(pain, x + w + 2, y);
-       mathed_draw_deco(pain, x + 1, b, w, height() + 4, left_);
-       mathed_draw_deco(pain, x + width() - w - 1, b, w, height() + 4, right_);
+       mathed_draw_deco(pain, x + 1, b, w, height(), left_);
+       mathed_draw_deco(pain, x + width() - w - 1, b, w, height(), right_);
 }