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 0baf32eb78ffd3b19342a92f287683dcd7a6f103..dfa88844698cbeb6042ff9e44fc23251be673bac 100644 (file)
--- a/src/mathed/math_deliminset.C
+++ b/src/mathed/math_deliminset.C
@@ -1,94 +1,88 @@
 #include <config.h>
 
+#ifdef __GNUG__
+#pragma implementation
+#endif
+
 #include "math_deliminset.h"
-#include "math_iter.h"
 #include "math_parser.h"
-#include "LColor.h"
-#include "Painter.h"
 #include "mathed/support.h"
 #include "support/LOstream.h"
 
-using std::ostream;
-
+using std::max;
 
-MathDelimInset::MathDelimInset(int l, int r, short st)
-       : MathParInset(st, "", LM_OT_DELIM), left(l), right(r) {}
+MathDelimInset::MathDelimInset(string const & l, string const & r)
+       : MathNestInset(1), left_(l), right_(r)
+{}
 
 
-MathedInset * MathDelimInset::Clone()
+MathInset * MathDelimInset::clone() const
 {   
-       MathDelimInset * p = new MathDelimInset(left, right, GetStyle());
-       MathedIter it(array);
-       p->SetData(it.Copy());
-       return p;
+       return new MathDelimInset(*this);
 }
 
 
+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(ostream & os, bool fragile)
+void MathDelimInset::write(MathWriteInfo & os) const
 {
-       latexkeys * l = (left != '|') ? lm_get_key_by_id(left, LM_TK_SYM): 0;
-       latexkeys * 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) << ' ';
-               }
-       }
-       MathParInset::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)
+          << "\\right" << latexName(right_);
 }
 
 
+int MathDelimInset::dw() const
+{
+       int w = height() / 5;
+       if (w > 15)
+               w = 15;
+       if (w < 4)
+               w = 4;
+       return w;
+}
+
 
-void
-MathDelimInset::draw(Painter & pain, int x, int y)
+void MathDelimInset::metrics(MathMetricsInfo const & st) const
+{
+       xcell(0).metrics(st);
+       size_    = st;
+       int 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;
+       ascent_  = max(a0, d0) + h0;
+       descent_ = max(a0, d0) - h0;
+       width_   = xcell(0).width() + 2 * dw() + 4;
+}
+
+
+void MathDelimInset::draw(Painter & pain, int x, int y) const
 { 
        xo(x);
        yo(y); 
-       MathParInset::draw(pain, x + dw + 2, y - dh); 
-       
-       if (left == '.') {
-               pain.line(x + 4, yo() - ascent,
-                         x + 4, yo() + descent,
-                         LColor::mathcursor, Painter::line_onoffdash);
-       } else
-               mathed_draw_deco(pain, x, y - ascent, dw, Height(), left);
-       x += Width() - dw - 2;
-       if (right == '.') {
-               pain.line(x + 4, yo() - ascent,
-                         x + 4, yo() + descent,
-                         LColor::mathcursor, Painter::line_onoffdash);
-       } else
-               mathed_draw_deco(pain, x, y - ascent, dw, Height(), right);
-}
-
 
-void
-MathDelimInset::Metrics()
-{
-       MathParInset::Metrics();
-       int d;
-       
-       mathed_char_height(LM_TC_CONST, size(), 'I', d, dh);
-       dh /= 2;
-       ascent += 2 + dh;
-       descent += 2 - dh;
-       dw = Height()/5;
-       if (dw > 15) dw = 15;
-       if (dw < 6) dw = 6;
-       width += 2 * dw + 4;
+       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_);
 }