X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfont.C;h=2ffce829c8ea4c1039ad2fec9badbef58beb7f56;hb=10ba1b8918e7da14334bb5573ce2a707671c8b51;hp=9c4f2f529718af18db127d741cf4abaaaaf463f4;hpb=a6ccea4f21c3da972fb3577ab07404da83f0a223;p=lyx.git

diff --git a/src/lyxfont.C b/src/lyxfont.C
index 9c4f2f5297..2ffce829c8 100644
--- 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.
  *
@@ -20,12 +20,13 @@
 #include "debug.h"
 #include "gettext.h"
 #include "language.h"
+#include "LColor.h"
 #include "lyxlex.h"
 #include "lyxrc.h"
 
 #include "support/lstrings.h"
 
-#include "support/std_sstream.h"
+#include <sstream>
 
 using lyx::support::ascii_lowercase;
 using lyx::support::bformat;
@@ -33,7 +34,7 @@ using lyx::support::rtrim;
 using lyx::support::subst;
 
 using std::endl;
-
+using std::string;
 using std::ostream;
 using std::ostringstream;
 
@@ -202,9 +203,9 @@ LyXFont::FONT_MISC_STATE LyXFont::underbar() const
 }
 
 
-EnumLColor LyXFont::color() const
+LColor_color LyXFont::color() const
 {
-	return bits.color;
+	return LColor::color(bits.color);
 }
 
 
@@ -233,73 +234,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(EnumLColor 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;
 }
 
 
@@ -709,33 +700,33 @@ void LyXFont::lyxWriteChanges(LyXFont const & orgfont,
 {
 	os << "\n";
 	if (orgfont.family() != family()) {
-		os << "\\family " << LyXFamilyNames[family()] << " \n";
+		os << "\\family " << LyXFamilyNames[family()] << "\n";
 	}
 	if (orgfont.series() != series()) {
-		os << "\\series " << LyXSeriesNames[series()] << " \n";
+		os << "\\series " << LyXSeriesNames[series()] << "\n";
 	}
 	if (orgfont.shape() != shape()) {
-		os << "\\shape " << LyXShapeNames[shape()] << " \n";
+		os << "\\shape " << LyXShapeNames[shape()] << "\n";
 	}
 	if (orgfont.size() != size()) {
-		os << "\\size " << LyXSizeNames[size()] << " \n";
+		os << "\\size " << LyXSizeNames[size()] << "\n";
 	}
 	if (orgfont.emph() != emph()) {
-		os << "\\emph " << LyXMiscNames[emph()] << " \n";
+		os << "\\emph " << LyXMiscNames[emph()] << "\n";
 	}
 	if (orgfont.number() != number()) {
-		os << "\\numeric " << LyXMiscNames[number()] << " \n";
+		os << "\\numeric " << LyXMiscNames[number()] << "\n";
 	}
 	if (orgfont.underbar() != underbar()) {
 		// This is only for backwards compatibility
 		switch (underbar()) {
-		case OFF:	os << "\\bar no \n"; break;
-		case ON:        os << "\\bar under \n"; break;
+		case OFF:	os << "\\bar no\n"; break;
+		case ON:        os << "\\bar under\n"; break;
 		case TOGGLE:	lyxerr << "LyXFont::lyxWriteFontChanges: "
 					"TOGGLE should not appear here!"
 				       << endl;
 		break;
-		case INHERIT:   os << "\\bar default \n"; break;
+		case INHERIT:   os << "\\bar default\n"; break;
 		case IGNORE:    lyxerr << "LyXFont::lyxWriteFontChanges: "
 					"IGNORE should not appear here!"
 				       << endl;
@@ -743,7 +734,7 @@ void LyXFont::lyxWriteChanges(LyXFont const & orgfont,
 		}
 	}
 	if (orgfont.noun() != noun()) {
-		os << "\\noun " << LyXMiscNames[noun()] << " \n";
+		os << "\\noun " << LyXMiscNames[noun()] << "\n";
 	}
 	if (orgfont.color() != color()) {
 		// To make us file compatible with older
@@ -930,7 +921,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;
@@ -955,7 +946,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);
 }