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 8c1ca673b471622479b59a6d132ad8aaa4c5c7e6..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,25 +10,10 @@
 #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"
-
-
-namespace {
-
-char const * math_font_name[] = {
-       "mathrm",
-       "mathcal",
-       "mathbf",
-       "mathbb",
-       "mathsf",
-       "mathtt",
-       "mathit",
-       "textrm"
-};
-
-}
+#include "math_mathmlstream.h"
 
 
 MathCharInset::MathCharInset(char c)
@@ -43,7 +30,7 @@ MathCharInset::MathCharInset(char c, MathTextCodes t)
 }
 
 
-MathTextCodes MathCharInset::nativeCode(char c) const
+MathTextCodes MathCharInset::nativeCode(char c)
 {
        if (isalpha(c))
                return LM_TC_VAR;
@@ -60,47 +47,45 @@ 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);
        //lyxerr << "drawing '" << char_ << "' code: " << code_ << endl;
-       drawChar(pain, code_, size_, x, y, char_);
+       drawChar(pain, code_, mi_, x, y, char_);
 }
 
 
 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 (math_font_name(code_))
+               os << '\\' << math_font_name(code_) << '{';
 }
 
 
 void MathCharInset::writeTrailer(std::ostream & os) const
 {
-       if (code_ >= LM_TC_RM && code_ <= LM_TC_TEXTRM)
+       if (math_font_name(code_))
                os << '}';
 }
 
@@ -111,17 +96,17 @@ void MathCharInset::writeRaw(std::ostream & os) const
 }
 
 
-void MathCharInset::write(std::ostream & os, bool) const
+void MathCharInset::write(WriteStream & os) const
 {
-       writeHeader(os);
-       writeRaw(os);
-       writeTrailer(os);
+       writeHeader(os.os());
+       writeRaw(os.os());
+       writeTrailer(os.os());
 }
 
 
-void MathCharInset::writeNormal(std::ostream & os) const
+void MathCharInset::normalize(NormalStream & os) const
 {
-       os << char_;
+       os << "[char " << char_ << " " << "mathalpha" << "]";
 }
 
 
@@ -135,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_;
+}