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 33829502e0a7e17d236408ecf9ca70019e4a70b7..32693a56672bf09be942f1301767cb4b23a8aa33 100644 (file)
--- a/src/mathed/math_decorationinset.C
+++ b/src/mathed/math_decorationinset.C
@@ -1,11 +1,15 @@
+#include <config.h>
+
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
 #include "math_decorationinset.h"
-#include "support.h"
+#include "math_support.h"
 #include "math_parser.h"
 #include "math_mathmlstream.h"
+#include "math_streamstr.h"
+#include "support/LOstream.h"
 
 
 MathDecorationInset::MathDecorationInset(string const & name)
@@ -14,14 +18,14 @@ MathDecorationInset::MathDecorationInset(string const & name)
 
 
 MathInset * MathDecorationInset::clone() const
-{   
+{
        return new MathDecorationInset(*this);
 }
 
 
 bool MathDecorationInset::upper() const
 {
-       return name_ != "underline" && name_ != "underbrace";
+       return name_.substr(0, 5) != "under";
 }
 
 
@@ -31,7 +35,11 @@ bool MathDecorationInset::isScriptable() const
                        name_ == "overbrace" ||
                        name_ == "underbrace" ||
                        name_ == "overleftarrow" ||
-                       name_ == "overrightarrow";
+                       name_ == "overrightarrow" ||
+                       name_ == "overleftrightarrow" ||
+                       name_ == "underleftarrow" ||
+                       name_ == "underrightarrow" ||
+                       name_ == "underleftrightarrow";
 }
 
 
@@ -41,7 +49,11 @@ bool MathDecorationInset::protect() const
                        name_ == "overbrace" ||
                        name_ == "underbrace" ||
                        name_ == "overleftarrow" ||
-                       name_ == "overrightarrow";
+                       name_ == "overrightarrow" ||
+                       name_ == "overleftrightarrow" ||
+                       name_ == "underleftarrow" ||
+                       name_ == "underrightarrow" ||
+                       name_ == "underleftrightarrow";
 }
 
 
@@ -54,20 +66,24 @@ bool MathDecorationInset::wide() const
                        name_ == "underbrace" ||
                        name_ == "overleftarrow" ||
                        name_ == "overrightarrow" ||
+                       name_ == "overleftrightarrow" ||
                        name_ == "widehat" ||
-                       name_ == "widetilde";
+                       name_ == "widetilde" ||
+                       name_ == "underleftarrow" ||
+                       name_ == "underrightarrow" ||
+                       name_ == "underleftrightarrow";
 }
 
 
-void MathDecorationInset::metrics(MathMetricsInfo const & st) const
+void MathDecorationInset::metrics(MathMetricsInfo & mi) const
 {
-       xcell(0).metrics(st);
-       size_    = st;
+       xcell(0).metrics(mi);
        width_   = xcell(0).width();
        ascent_  = xcell(0).ascent();
        descent_ = xcell(0).descent();
 
-       dh_ = 5; //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()) {
                dy_ = -ascent_ - dh_;
@@ -76,30 +92,39 @@ void MathDecorationInset::metrics(MathMetricsInfo const & st) const
                dy_ = descent_ + 1;
                descent_ += dh_ + 2;
        }
+
+       // for the angular markers
+       descent_ += 2;
+       width_   += 2;
 }
 
 
-void MathDecorationInset::draw(Painter & pain, int x, int y) const
-{ 
-       xcell(0).draw(pain, x, y);
-       if (wide()) 
-               mathed_draw_deco(pain, x, y + dy_, width_, dh_, name_);
-       else {
-               int w = 2 + mathed_char_width(LM_TC_VAR, size_, 'x'); 
-               mathed_draw_deco(pain, x + (width_ - w) / 2, y + dy_, w, dh_, name_);
-       }
+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(MathWriteInfo & os) const
+void MathDecorationInset::write(WriteStream & os) const
 {
-       if (os.fragile && protect())
+       if (os.fragile() && protect())
                os << "\\protect";
-       os << '\\' << name_.c_str() << '{' << cell(0) << '}';
+       os << '\\' << name_ << '{' << cell(0) << '}';
+}
+
+
+void MathDecorationInset::normalize(NormalStream & os) const
+{
+       os << "[deco " << name_ << ' ' <<  cell(0) << ']';
 }
 
 
-void MathDecorationInset::writeNormal(NormalStream & os) const
+void MathDecorationInset::infoize(std::ostream & os) const
 {
-       os << "[deco " << name_.c_str() << ' ' <<  cell(0) << ']';
+       os << "Deco: " << name_;
 }