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 89c3378a783825e587fcec70345a392fb9037a62..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,9 +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"
+#include "math_mathmlstream.h"
 
 
 MathCharInset::MathCharInset(char c)
@@ -27,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;
@@ -93,15 +96,15 @@ void MathCharInset::writeRaw(std::ostream & os) const
 }
 
 
-void MathCharInset::write(MathWriteInfo & os) const
+void MathCharInset::write(WriteStream & os) const
 {
-       writeHeader(os.os);
-       writeRaw(os.os);
-       writeTrailer(os.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 " << char_ << " " << "mathalpha" << "]";
 }
@@ -117,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_;
+}