more cursor dispatch

[lyx.git] / src / lyxfont.C

diff --git a/src/lyxfont.C b/src/lyxfont.C
index 4dfe32f3208e48927d0f7fd7cb6488794d884ba3..8ddc66ad54080466f2492fc8822ff531945c3619 100644 (file)
--- a/src/lyxfont.C
+++ b/src/lyxfont.C
@@ -1,5 +1,5 @@
 /**
- * \file lyxfont.C
+ * \file src/lyxfont.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -25,7 +25,6 @@
 #include "lyxrc.h"
 
 #include "support/lstrings.h"
-
 #include "support/std_sstream.h"
 
 using lyx::support::ascii_lowercase;
@@ -34,7 +33,7 @@ using lyx::support::rtrim;
 using lyx::support::subst;
 
 using std::endl;
-
+using std::string;
 using std::ostream;
 using std::ostringstream;
 
@@ -203,7 +202,7 @@ LyXFont::FONT_MISC_STATE LyXFont::underbar() const
 }
 
 
-EnumLColor LyXFont::color() const
+LColor_color LyXFont::color() const
 {
        return LColor::color(bits.color);
 }
@@ -276,7 +275,7 @@ void LyXFont::setNoun(LyXFont::FONT_MISC_STATE n)
 }
 
 
-void LyXFont::setColor(EnumLColor c)
+void LyXFont::setColor(LColor_color c)
 {
        bits.color = int(c);
 }
@@ -921,7 +920,7 @@ int LyXFont::latexWriteEndChanges(ostream & os, LyXFont const & base,
 }
 
 
-EnumLColor LyXFont::realColor() const
+LColor_color LyXFont::realColor() const
 {
        if (color() == LColor::none)
                return LColor::foreground;
@@ -946,7 +945,23 @@ LyXFont::FONT_SHAPE LyXFont::realShape() const
 }
 
 
-ostream & operator<<(ostream & o, LyXFont::FONT_MISC_STATE fms)
+ostream & operator<<(ostream & os, LyXFont::FONT_MISC_STATE fms)
+{
+       return os << int(fms);
+}
+
+
+std::ostream & operator<<(std::ostream & os, LyXFont const & font)
 {
-       return o << int(fms);
+       return os << "font:"
+               << " family " << font.bits.family
+               << " series " << font.bits.series
+               << " shape " << font.bits.shape
+               << " size " << font.bits.size
+               << " color " << font.bits.color
+               << " emph " << font.bits.emph
+               << " underbar " << font.bits.underbar
+               << " noun " << font.bits.noun
+               << " number " << font.bits.number
+               << " lang: " << (font.lang ? font.lang->lang() : 0);
 }