whichFont down to 9%...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3550 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/mathed/math_charinset.C b/src/mathed/math_charinset.C
index ea37bf58d588cb4ee966a610dd083ecbf245b8ac..1773fa89a2dde034386c8d9bf10d222b8c77a42a 100644 (file)
--- a/src/mathed/math_charinset.C
+++ b/src/mathed/math_charinset.C
@@ -46,27 +46,12 @@ 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;
+       ascent_  = mathed_char_ascent(code_, mi_, char_);
+       descent_ = mathed_char_descent(code_, mi_, char_);
+       width_   = mathed_char_width(code_, mi_, char_);
 }
 
 

diff --git a/src/mathed/math_charinset.h b/src/mathed/math_charinset.h
index fcfa806466ab7455ef8ba251371386ea6c110d79..325990280aa516142a41091246e1a6d124d434f4 100644 (file)
--- a/src/mathed/math_charinset.h
+++ b/src/mathed/math_charinset.h
@@ -2,7 +2,7 @@
 #ifndef MATH_CHARINSET_H
 #define MATH_CHARINSET_H
 
-#include "math_inset.h"
+#include "math_diminset.h"
 
 #ifdef __GNUG__
 #pragma interface
@@ -12,7 +12,7 @@
     \author André Pönitz
  */
 
-class MathCharInset : public MathInset {
+class MathCharInset : public MathDimInset {
 public:
        ///
        explicit MathCharInset(char c);
@@ -36,12 +36,6 @@ public:
        void writeRaw(std::ostream &) const;
        ///
        void normalize(NormalStream &) const;
-       /// 
-       int ascent() const;
-       ///
-       int descent() const;
-       ///
-       int width() const;
        /// identifies Charinsets
        MathCharInset const * asCharInset() const { return this; }
        ///