fix the <...> delimiters

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

diff --git a/src/mathed/math_decorationinset.C b/src/mathed/math_decorationinset.C
index c8c799c796c0c4095f1239dd7d1f93619564a2cc..32693a56672bf09be942f1301767cb4b23a8aa33 100644 (file)
--- a/src/mathed/math_decorationinset.C
+++ b/src/mathed/math_decorationinset.C
@@ -5,66 +5,126 @@
 #endif
 
 #include "math_decorationinset.h"
-#include "mathed/support.h"
+#include "math_support.h"
 #include "math_parser.h"
+#include "math_mathmlstream.h"
+#include "math_streamstr.h"
 #include "support/LOstream.h"
-#include "support/lstrings.h"
 
 
-using std::ostream;
+MathDecorationInset::MathDecorationInset(string const & name)
+       : MathNestInset(1), name_(name)
+{}
 
 
-MathDecorationInset::MathDecorationInset(int d)
-       : MathInset(1), deco_(d)
+MathInset * MathDecorationInset::clone() const
 {
-       upper_ = deco_ != LM_underline && deco_ != LM_underbrace;
+       return new MathDecorationInset(*this);
 }
 
 
-MathInset * MathDecorationInset::clone() const
-{   
-       return new MathDecorationInset(*this);
+bool MathDecorationInset::upper() const
+{
+       return name_.substr(0, 5) != "under";
+}
+
+
+bool MathDecorationInset::isScriptable() const
+{
+       return
+                       name_ == "overbrace" ||
+                       name_ == "underbrace" ||
+                       name_ == "overleftarrow" ||
+                       name_ == "overrightarrow" ||
+                       name_ == "overleftrightarrow" ||
+                       name_ == "underleftarrow" ||
+                       name_ == "underrightarrow" ||
+                       name_ == "underleftrightarrow";
 }
 
 
+bool MathDecorationInset::protect() const
+{
+       return
+                       name_ == "overbrace" ||
+                       name_ == "underbrace" ||
+                       name_ == "overleftarrow" ||
+                       name_ == "overrightarrow" ||
+                       name_ == "overleftrightarrow" ||
+                       name_ == "underleftarrow" ||
+                       name_ == "underrightarrow" ||
+                       name_ == "underleftrightarrow";
+}
 
-void MathDecorationInset::Metrics(MathStyles st)
+
+bool MathDecorationInset::wide() const
 {
-       xcell(0).Metrics(st);
+       return
+                       name_ == "overline" ||
+                       name_ == "underline" ||
+                       name_ == "overbrace" ||
+                       name_ == "underbrace" ||
+                       name_ == "overleftarrow" ||
+                       name_ == "overrightarrow" ||
+                       name_ == "overleftrightarrow" ||
+                       name_ == "widehat" ||
+                       name_ == "widetilde" ||
+                       name_ == "underleftarrow" ||
+                       name_ == "underrightarrow" ||
+                       name_ == "underleftrightarrow";
+}
+
+
+void MathDecorationInset::metrics(MathMetricsInfo & mi) const
+{
+       xcell(0).metrics(mi);
        width_   = xcell(0).width();
        ascent_  = xcell(0).ascent();
        descent_ = xcell(0).descent();
 
-       dh_ = mathed_char_height(LM_TC_VAR, size(), 'I', ascent_, descent_);  
+       dh_ = 6; //mathed_char_height(LM_TC_VAR, mi, 'I', ascent_, descent_);
+       dw_ = 6; //mathed_char_width(LM_TC_VAR, mi, 'x');
 
-       if (upper_) {
+       if (upper()) {
+               dy_ = -ascent_ - dh_;
                ascent_ += dh_ + 1;
-               dy_ = -ascent_;
        } else {
                dy_ = descent_ + 1;
                descent_ += dh_ + 2;
        }
+
+       // for the angular markers
+       descent_ += 2;
+       width_   += 2;
 }
 
-void MathDecorationInset::draw(Painter & pain, int x, int y)
-{ 
-       xo(x);
-       yo(x);
-       xcell(0).draw(pain, x, y);
-       mathed_draw_deco(pain, x, y + dy_, width_, dh_, deco_);
+
+void MathDecorationInset::draw(MathPainterInfo & pi, int x, int y) const
+{
+       xcell(0).draw(pi, x + 1, y);
+       if (wide())
+               mathed_draw_deco(pi, x + 1, y + dy_, width_, dh_, name_);
+       else
+               mathed_draw_deco(pi, x + 1 + (width_ - dw_) / 2, y + dy_, dw_, dh_, name_);
+       drawMarkers(pi, x, y);
 }
 
 
-void MathDecorationInset::Write(ostream & os, bool fragile) const
+void MathDecorationInset::write(WriteStream & os) const
 {
-       latexkeys const * l = lm_get_key_by_id(deco_, LM_TK_WIDE);
-       if (fragile &&
-           (compare(l->name, "overbrace") == 0 ||
-            compare(l->name, "underbrace") == 0 ||
-            compare(l->name, "overleftarrow") == 0 ||
-            compare(l->name, "overrightarrow") == 0))
+       if (os.fragile() && protect())
                os << "\\protect";
-       os << '\\' << l->name << '{';
-       cell(0).Write(os, fragile);  
-       os << '}';
+       os << '\\' << name_ << '{' << cell(0) << '}';
+}
+
+
+void MathDecorationInset::normalize(NormalStream & os) const
+{
+       os << "[deco " << name_ << ' ' <<  cell(0) << ']';
+}
+
+
+void MathDecorationInset::infoize(std::ostream & os) const
+{
+       os << "Deco: " << name_;
 }