write \mathrm{x}\mathrm{y} as \mathrm{xy} again

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

diff --git a/src/mathed/math_charinset.C b/src/mathed/math_charinset.C
index a5eca98288fcf9419c8d49b3d6ccec017440a118..89c3378a783825e587fcec70345a392fb9037a62 100644 (file)
--- a/src/mathed/math_charinset.C
+++ b/src/mathed/math_charinset.C
@@ -2,6 +2,8 @@
 #pragma implementation
 #endif
 
+#include <cctype>
+
 #include "math_charinset.h"
 #include "LColor.h"
 #include "Painter.h"
@@ -11,10 +13,26 @@
 #include "debug.h"
 
 
+MathCharInset::MathCharInset(char c)
+       : char_(c), code_(nativeCode(c))
+{
+//lyxerr << "creating char '" << char_ << "' with code " << int(code_) << endl;
+}
+
+
 MathCharInset::MathCharInset(char c, MathTextCodes t)
-       : char_(c)
+       : char_(c), code_((t == LM_TC_MIN) ? nativeCode(c) : t)
 {
-       code(t);
+//lyxerr << "creating char '" << char_ << "' with code " << int(code_) << endl;
+}
+
+
+MathTextCodes MathCharInset::nativeCode(char c) const
+{
+       if (isalpha(c))
+               return LM_TC_VAR;
+       //if (strchr("0123456789;:!|[]().,?+/-*<>=", c)
+       return LM_TC_CONST;
 }
 
 
@@ -26,80 +44,76 @@ 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
 {
-       int brace = 0;
-
-       if (MathIsSymbol(code_)) {
-               latexkeys const * l = lm_get_key_by_id(char_, LM_TK_SYM);
-
-               if (l == 0) 
-                       l = lm_get_key_by_id(char_, LM_TK_BIGSYM);
-
-               if (l) {
-                       os << '\\' << l->name << ' ';
-               } else {
-                       lyxerr << "Could not find the LaTeX name for  " 
-                               << char_ << " and code_ " << code_ << "!" << std::endl;
-               }
-       } else {
-               if (code_ >= LM_TC_RM && code_ <= LM_TC_TEXTRM) 
-                       os << '\\' << math_font_name[code_ - LM_TC_RM] << '{';
-
-               // Is there a standard logical XOR?
-               if ((code_ == LM_TC_TEX && char_ != '{' && char_ != '}') ||
-                               (code_ == LM_TC_SPECIAL))
-                       os << '\\';
-               else {
-                       if (char_ == '{')
-                               ++brace;
-                       if (char_ == '}')
-                               --brace;
-               }
-               if (char_ == '}' && code_ == LM_TC_TEX && brace < 0) 
-                       lyxerr <<"Math warning: Unexpected closing brace.\n";
-               else           
-                       os << char_;
-       }
-
-       if (code_ >= LM_TC_RM && code_ <= LM_TC_TEXTRM)
+       if (math_font_name(code_))
+               os << '\\' << math_font_name(code_) << '{';
+}
+
+
+void MathCharInset::writeTrailer(std::ostream & os) const
+{
+       if (math_font_name(code_))
                os << '}';
 }
 
 
+void MathCharInset::writeRaw(std::ostream & os) const
+{
+       os << char_;
+}
+
+
+void MathCharInset::write(MathWriteInfo & os) const
+{
+       writeHeader(os.os);
+       writeRaw(os.os);
+       writeTrailer(os.os);
+}
+
+
 void MathCharInset::writeNormal(std::ostream & os) const
 {
-       os << "[sqrt ";
-       cell(0).writeNormal(os); 
-       os << "] ";
+       os << "[char " << char_ << " " << "mathalpha" << "]";
+}
+
+
+bool MathCharInset::isRelOp() const
+{
+       return char_ == '=' || char_ == '<' || char_ == '>';
+}
+
+
+void MathCharInset::handleFont(MathTextCodes t)
+{
+       code_ = (code_ == t) ? LM_TC_VAR : t;
 }