bring red color back

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

diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index 0e5460fc52f87030d9d9c4d30a5e358035a9596a..3fb6a4fe47ae93b891d779cc0389e77a325ff7b1 100644 (file)
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -11,6 +11,8 @@
 
        * formulabase.[Ch]: remove unneeded convertFont()
 
+       * math_funcinset.[Ch]: bring red color back
+
 2001-08-01  André Pönitz  <poenitz@gmx.net>
 
        * math_cursor.C:

diff --git a/src/mathed/math_funcinset.C b/src/mathed/math_funcinset.C
index 9c61edc158045762ef3c46972095363c85284e8b..26f95fc3efd513a64ac7237fcd54ba53f6361d19 100644 (file)
--- a/src/mathed/math_funcinset.C
+++ b/src/mathed/math_funcinset.C
@@ -42,9 +42,9 @@ void MathFuncInset::metrics(MathStyles st) const
 {
        size_ = st;
        if (name_.empty()) 
-               mathed_char_dim(LM_TC_TEXTRM, size_, 'I', ascent_, descent_, width_);
+               mathed_char_dim(LM_TC_TEX, size_, 'I', ascent_, descent_, width_);
        else 
-               mathed_string_dim(LM_TC_TEXTRM, size_, name_, ascent_, descent_, width_);
+               mathed_string_dim(LM_TC_TEX, size_, name_, ascent_, descent_, width_);
 }
 
 
@@ -53,7 +53,7 @@ void MathFuncInset::draw(Painter & pain, int x, int y) const
        xo(x);
        yo(y);
        if (name_.empty()) 
-               drawChar(pain, LM_TC_TEXTRM, size_, x, y, ' ');
+               drawChar(pain, LM_TC_TEX, size_, x, y, ' ');
        else
-               drawStr(pain, LM_TC_TEXTRM, size_, x, y, name_);
+               drawStr(pain, LM_TC_TEX, size_, x, y, name_);
 }

diff --git a/src/mathed/math_macroarg.C b/src/mathed/math_macroarg.C
index 8e003ecf0d06d10cbff8e96f0a60667300ae04ab..df4be793fec25c3f8488f0597095dc07aa254865 100644 (file)
--- a/src/mathed/math_macroarg.C
+++ b/src/mathed/math_macroarg.C
@@ -59,6 +59,12 @@ void MathMacroArgument::write(std::ostream & os, bool /*fragile*/) const
 }
 
 
+void MathMacroArgument::metrics(MathStyles st) const
+{
+       size_ = st;
+}
+
+
 void MathMacroArgument::writeNormal(std::ostream & os) const
 {
        os << "[macroarg " << number_ << "] ";

diff --git a/src/mathed/math_macroarg.h b/src/mathed/math_macroarg.h
index 9d5f221fe49698f948cc27c582dda221025f2287..26fad2dad06d05e58bb1c3ece7641bd5977380a8 100644 (file)
--- a/src/mathed/math_macroarg.h
+++ b/src/mathed/math_macroarg.h
@@ -18,7 +18,7 @@ public:
        ///
        MathInset * clone() const;
        ///
-       //void metrics(MathStyles st) const;
+       void metrics(MathStyles st) const;
        ///
        void draw(Painter &, int x, int y) const;
        ///