more cursor dispatch

[lyx.git] / src / lyxfont.C

diff --git a/src/lyxfont.C b/src/lyxfont.C
index ed2ff8516b9e923d256dc0984f611e17aef7fc27..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.
  *
@@ -13,23 +13,29 @@
  */
 
 #include <config.h>
-#include <clocale>
-#include <cctype>
 
-#include "gettext.h"
 #include "lyxfont.h"
+
+#include "bufferparams.h" // stateText
 #include "debug.h"
-#include "lyxrc.h"
-#include "lyxlex.h"
+#include "gettext.h"
 #include "language.h"
-#include "Lsstream.h"
+#include "LColor.h"
+#include "lyxlex.h"
+#include "lyxrc.h"
+
 #include "support/lstrings.h"
-#include "bufferparams.h" // stateText
+#include "support/std_sstream.h"
 
-using namespace lyx::support;
+using lyx::support::ascii_lowercase;
+using lyx::support::bformat;
+using lyx::support::rtrim;
+using lyx::support::subst;
 
-using std::ostream;
 using std::endl;
+using std::string;
+using std::ostream;
+using std::ostringstream;
 
 #ifndef CXX_GLOBAL_CSTD
 using std::strlen;
@@ -196,9 +202,9 @@ LyXFont::FONT_MISC_STATE LyXFont::underbar() const
 }
 
 
-LColor::color LyXFont::color() const
+LColor_color LyXFont::color() const
 {
-       return bits.color;
+       return LColor::color(bits.color);
 }
 
 
@@ -227,73 +233,63 @@ bool LyXFont::isVisibleRightToLeft() const
 }
 
 
-LyXFont & LyXFont::setFamily(LyXFont::FONT_FAMILY f)
+void LyXFont::setFamily(LyXFont::FONT_FAMILY f)
 {
        bits.family = f;
-       return *this;
 }
 
 
-LyXFont & LyXFont::setSeries(LyXFont::FONT_SERIES s)
+void LyXFont::setSeries(LyXFont::FONT_SERIES s)
 {
        bits.series = s;
-       return *this;
 }
 
 
-LyXFont & LyXFont::setShape(LyXFont::FONT_SHAPE s)
+void LyXFont::setShape(LyXFont::FONT_SHAPE s)
 {
        bits.shape = s;
-       return *this;
 }
 
 
-LyXFont & LyXFont::setSize(LyXFont::FONT_SIZE s)
+void LyXFont::setSize(LyXFont::FONT_SIZE s)
 {
        bits.size = s;
-       return *this;
 }
 
 
-LyXFont & LyXFont::setEmph(LyXFont::FONT_MISC_STATE e)
+void LyXFont::setEmph(LyXFont::FONT_MISC_STATE e)
 {
        bits.emph = e;
-       return *this;
 }
 
 
-LyXFont & LyXFont::setUnderbar(LyXFont::FONT_MISC_STATE u)
+void LyXFont::setUnderbar(LyXFont::FONT_MISC_STATE u)
 {
        bits.underbar = u;
-       return *this;
 }
 
 
-LyXFont & LyXFont::setNoun(LyXFont::FONT_MISC_STATE n)
+void LyXFont::setNoun(LyXFont::FONT_MISC_STATE n)
 {
        bits.noun = n;
-       return *this;
 }
 
 
-LyXFont & LyXFont::setColor(LColor::color c)
+void LyXFont::setColor(LColor_color c)
 {
-       bits.color = c;
-       return *this;
+       bits.color = int(c);
 }
 
 
-LyXFont & LyXFont::setLanguage(Language const * l)
+void LyXFont::setLanguage(Language const * l)
 {
        lang = l;
-       return *this;
 }
 
 
-LyXFont & LyXFont::setNumber(LyXFont::FONT_MISC_STATE n)
+void LyXFont::setNumber(LyXFont::FONT_MISC_STATE n)
 {
        bits.number = n;
-       return *this;
 }
 
 
@@ -538,7 +534,7 @@ string const LyXFont::stateText(BufferParams * params) const
                os << bformat(_("Language: %1$s, "), _(language()->display()));
        if (number() != OFF)
                os << bformat(_("  Number %1$s"), _(GUIMiscNames[number()]));
-       return rtrim(STRCONV(os.str()), ", ");
+       return rtrim(os.str(), ", ");
 }
 
 
@@ -924,7 +920,7 @@ int LyXFont::latexWriteEndChanges(ostream & os, LyXFont const & base,
 }
 
 
-LColor::color LyXFont::realColor() const
+LColor_color LyXFont::realColor() const
 {
        if (color() == LColor::none)
                return LColor::foreground;
@@ -949,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);
 }