enable direct input of #1...#9; some whitespace changes

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

diff --git a/src/mathed/math_charinset.C b/src/mathed/math_charinset.C
index bee9ec01bd57d9dcffe17a6200205a6ca4424fed..329b68caa0653b4adfbb360f8ed75b18b16017e6 100644 (file)
--- a/src/mathed/math_charinset.C
+++ b/src/mathed/math_charinset.C
@@ -1,3 +1,5 @@
+#include <config.h>
+
 #ifdef __GNUG__
 #pragma implementation
 #endif
@@ -8,29 +10,32 @@
 #include "LColor.h"
 #include "Painter.h"
 #include "support/LOstream.h"
-#include "mathed/support.h"
+#include "math_support.h"
 #include "math_parser.h"
 #include "debug.h"
+#include "math_mathmlstream.h"
 
 
 MathCharInset::MathCharInset(char c)
        : char_(c), code_(nativeCode(c))
 {
-       if (isalpha(c))
-               code_ = LM_TC_VAR;
+//lyxerr << "creating char '" << char_ << "' with code " << int(code_) << endl;
 }
 
 
 MathCharInset::MathCharInset(char c, MathTextCodes t)
        : char_(c), code_((t == LM_TC_MIN) ? nativeCode(c) : t)
-{}
+{
+//lyxerr << "creating char '" << char_ << "' with code " << int(code_) << endl;
+}
 
 
-MathTextCodes MathCharInset::nativeCode(char c) const
+MathTextCodes MathCharInset::nativeCode(char c)
 {
        if (isalpha(c))
                return LM_TC_VAR;
-       return LM_TC_MIN;
+       //if (strchr("0123456789;:!|[]().,?+/-*<>=", c)
+       return LM_TC_CONST;
 }
 
 
@@ -42,57 +47,69 @@ MathInset * MathCharInset::clone() const
 
 int MathCharInset::ascent() const
 {
-       return mathed_char_ascent(code_, size(), char_);
+       return mathed_char_ascent(code_, mi_, char_);
 }
 
 
 int MathCharInset::descent() const
 {
-       return mathed_char_descent(code_, size(), char_);
+       return mathed_char_descent(code_, mi_, char_);
 }
 
 
 int MathCharInset::width() const
 {
-       return mathed_char_width(code_, size(), char_);
+       return mathed_char_width(code_, mi_, char_);
 }
 
 
-void MathCharInset::metrics(MathStyles st) const
+void MathCharInset::metrics(MathMetricsInfo const & mi) const
 {
-       size_ = st;
+       mi_ = mi;
 }
 
 
 void MathCharInset::draw(Painter & pain, int x, int y) const
 { 
-       xo(x);
-       yo(y);
-       drawChar(pain, code_, size_, x, y, char_);
+       //lyxerr << "drawing '" << char_ << "' code: " << code_ << endl;
+       drawChar(pain, code_, mi_, x, y, char_);
 }
 
 
-void MathCharInset::write(std::ostream & os, bool) const
+void MathCharInset::writeHeader(std::ostream & os) const
 {
-       if (code_ >= LM_TC_RM && code_ <= LM_TC_TEXTRM) 
-               os << '\\' << math_font_name[code_ - LM_TC_RM] << '{';
-
-       if (code_ == LM_TC_TEX || code_ == LM_TC_SPECIAL)
-               os << '\\';
+       if (math_font_name(code_))
+               os << '\\' << math_font_name(code_) << '{';
+}
 
-       os << char_;
 
-       if (code_ >= LM_TC_RM && code_ <= LM_TC_TEXTRM)
+void MathCharInset::writeTrailer(std::ostream & os) const
+{
+       if (math_font_name(code_))
                os << '}';
 }
 
 
-void MathCharInset::writeNormal(std::ostream & os) const
+void MathCharInset::writeRaw(std::ostream & os) const
 {
        os << char_;
 }
 
 
+void MathCharInset::write(WriteStream & os) const
+{
+       writeHeader(os.os());
+       writeRaw(os.os());
+       writeTrailer(os.os());
+}
+
+
+void MathCharInset::normalize(NormalStream & os) const
+{
+       os << "[char " << char_ << " " << "mathalpha" << "]";
+}
+
+
 bool MathCharInset::isRelOp() const
 {
        return char_ == '=' || char_ == '<' || char_ == '>';
@@ -103,3 +120,10 @@ void MathCharInset::handleFont(MathTextCodes t)
 {
        code_ = (code_ == t) ? LM_TC_VAR : t;
 }
+
+
+bool MathCharInset::match(MathInset * p) const
+{
+       MathCharInset const * q = p->asCharInset();
+       return q && char_ == q->char_ && code_ == q->code_;
+}