whichFont down to 5.3%

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

diff --git a/src/mathed/math_charinset.C b/src/mathed/math_charinset.C
index 417078bd6d738a268ac5eff17ffe0344f566fdd7..e0ba2e9e8191dacfc9d969bee0178dc1998d45ea 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
@@ -12,6 +14,7 @@
 #include "math_parser.h"
 #include "debug.h"
 #include "math_mathmlstream.h"
+#include "LaTeXFeatures.h"
 
 
 MathCharInset::MathCharInset(char c)
@@ -28,7 +31,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;
@@ -43,27 +46,10 @@ MathInset * MathCharInset::clone() const
 }
 
 
-int MathCharInset::ascent() const
-{
-       return mathed_char_ascent(code_, mi_, char_);
-}
-
-
-int MathCharInset::descent() const
-{
-       return mathed_char_descent(code_, mi_, char_);
-}
-
-
-int MathCharInset::width() const
-{
-       return mathed_char_width(code_, mi_, char_);
-}
-
-
 void MathCharInset::metrics(MathMetricsInfo const & mi) const
 {
        mi_ = mi;
+       mathed_char_dim(code_, mi_, char_, ascent_, descent_, width_);
 }
 
 
@@ -96,9 +82,9 @@ void MathCharInset::writeRaw(std::ostream & 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());
 }
 
 
@@ -120,6 +106,15 @@ void MathCharInset::handleFont(MathTextCodes t)
 }
 
 
+void MathCharInset::validate(LaTeXFeatures & features) const
+{
+       // Make sure amssymb is put in preamble if Blackboard Bold or
+       // Fraktur used:
+       if ( (code_ == LM_TC_BB) || (code_ == LM_TC_EUFRAK) )
+               features.require("amssymb");
+}
+
+
 bool MathCharInset::match(MathInset * p) const
 {
        MathCharInset const * q = p->asCharInset();