X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfont.C;h=d7559ca0842c92ddcfae15c05d5d1a790f16c0c7;hb=65ca7003ba47b7348610393a9a0d2d309b4e9702;hp=cb7dfc930a0bbf3ae69acc2b34123134d3d1b361;hpb=91de22ef340abbf1e9ba7d422bcd9024fa90d63f;p=lyx.git

diff --git a/src/lyxfont.C b/src/lyxfont.C
index cb7dfc930a..d7559ca084 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.
  *
@@ -15,19 +15,28 @@
 #include <config.h>
 
 #include "lyxfont.h"
-#include "gettext.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
 
-using namespace lyx::support;
+#include <sstream>
+
+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;
@@ -188,27 +197,10 @@ LyXFont::LyXFont(LyXFont::FONT_INIT3, Language const * l)
 {}
 
 
-LyXFont::FONT_MISC_STATE LyXFont::underbar() const
-{
-	return bits.underbar;
-}
-
 
-LColor::color LyXFont::color() const
+LColor_color LyXFont::color() const
 {
-	return bits.color;
-}
-
-
-Language const * LyXFont::language() const
-{
-	return lang;
-}
-
-
-LyXFont::FONT_MISC_STATE LyXFont::number() const
-{
-	return bits.number;
+	return LColor::color(bits.color);
 }
 
 
@@ -225,73 +217,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;
 }
 
 
@@ -471,30 +453,30 @@ LyXFont & LyXFont::realize(LyXFont const & tmplt)
 		return *this;
 	}
 
-	if (bits.family == INHERIT_FAMILY) {
+	if (bits.family == INHERIT_FAMILY)
 		bits.family = tmplt.bits.family;
-	}
-	if (bits.series == INHERIT_SERIES) {
+
+	if (bits.series == INHERIT_SERIES)
 		bits.series = tmplt.bits.series;
-	}
-	if (bits.shape == INHERIT_SHAPE) {
+
+	if (bits.shape == INHERIT_SHAPE)
 		bits.shape = tmplt.bits.shape;
-	}
-	if (bits.size == INHERIT_SIZE) {
+
+	if (bits.size == INHERIT_SIZE)
 		bits.size = tmplt.bits.size;
-	}
-	if (bits.emph == INHERIT) {
+
+	if (bits.emph == INHERIT)
 		bits.emph = tmplt.bits.emph;
-	}
-	if (bits.underbar == INHERIT) {
+
+	if (bits.underbar == INHERIT)
 		bits.underbar = tmplt.bits.underbar;
-	}
-	if (bits.noun == INHERIT) {
+
+	if (bits.noun == INHERIT)
 		bits.noun = tmplt.bits.noun;
-	}
-	if (bits.color == LColor::inherit) {
+
+	if (bits.color == LColor::inherit)
 		bits.color = tmplt.bits.color;
-	}
+
 	return *this;
 }
 
@@ -536,7 +518,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(), ", ");
 }
 
 
@@ -546,7 +528,8 @@ LyXFont & LyXFont::setLyXFamily(string const & fam)
 	string const s = ascii_lowercase(fam);
 
 	int i = 0;
-	while (s != LyXFamilyNames[i] && LyXFamilyNames[i] != "error")
+	while (LyXFamilyNames[i] != s &&
+	       LyXFamilyNames[i] != string("error"))
 		++i;
 	if (s == LyXFamilyNames[i])
 		setFamily(LyXFont::FONT_FAMILY(i));
@@ -563,7 +546,8 @@ LyXFont & LyXFont::setLyXSeries(string const & ser)
 	string const s = ascii_lowercase(ser);
 
 	int i = 0;
-	while (s != LyXSeriesNames[i] && LyXSeriesNames[i] != "error") ++i;
+	while (LyXSeriesNames[i] != s &&
+	       LyXSeriesNames[i] != string("error")) ++i;
 	if (s == LyXSeriesNames[i]) {
 		setSeries(LyXFont::FONT_SERIES(i));
 	} else
@@ -579,10 +563,11 @@ LyXFont & LyXFont::setLyXShape(string const & sha)
 	string const s = ascii_lowercase(sha);
 
 	int i = 0;
-	while (s != LyXShapeNames[i] && LyXShapeNames[i] != "error") ++i;
-	if (s == LyXShapeNames[i]) {
+	while (LyXShapeNames[i] != s && LyXShapeNames[i] != string("error"))
+			++i;
+	if (s == LyXShapeNames[i])
 		setShape(LyXFont::FONT_SHAPE(i));
-	} else
+	else
 		lyxerr << "LyXFont::setLyXShape: Unknown shape `"
 		       << s << '\'' << endl;
 	return *this;
@@ -594,7 +579,8 @@ LyXFont & LyXFont::setLyXSize(string const & siz)
 {
 	string const s = ascii_lowercase(siz);
 	int i = 0;
-	while (s != LyXSizeNames[i] && LyXSizeNames[i] != "error") ++i;
+	while (LyXSizeNames[i] != s && LyXSizeNames[i] != string("error"))
+		++i;
 	if (s == LyXSizeNames[i]) {
 		setSize(LyXFont::FONT_SIZE(i));
 	} else
@@ -609,7 +595,8 @@ LyXFont::FONT_MISC_STATE LyXFont::setLyXMisc(string const & siz)
 {
 	string const s = ascii_lowercase(siz);
 	int i = 0;
-	while (s != LyXMiscNames[i] && LyXMiscNames[i] != "error") ++i;
+	while (LyXMiscNames[i] != s &&
+	       LyXMiscNames[i] != string("error")) ++i;
 	if (s == LyXMiscNames[i])
 		return FONT_MISC_STATE(i);
 	lyxerr << "LyXFont::setLyXMisc: Unknown misc flag `"
@@ -700,34 +687,28 @@ void LyXFont::lyxWriteChanges(LyXFont const & orgfont,
 			      ostream & os) const
 {
 	os << "\n";
-	if (orgfont.family() != family()) {
-		os << "\\family " << LyXFamilyNames[family()] << " \n";
-	}
-	if (orgfont.series() != series()) {
-		os << "\\series " << LyXSeriesNames[series()] << " \n";
-	}
-	if (orgfont.shape() != shape()) {
-		os << "\\shape " << LyXShapeNames[shape()] << " \n";
-	}
-	if (orgfont.size() != size()) {
-		os << "\\size " << LyXSizeNames[size()] << " \n";
-	}
-	if (orgfont.emph() != emph()) {
-		os << "\\emph " << LyXMiscNames[emph()] << " \n";
-	}
-	if (orgfont.number() != number()) {
-		os << "\\numeric " << LyXMiscNames[number()] << " \n";
-	}
+	if (orgfont.family() != family())
+		os << "\\family " << LyXFamilyNames[family()] << "\n";
+	if (orgfont.series() != series())
+		os << "\\series " << LyXSeriesNames[series()] << "\n";
+	if (orgfont.shape() != shape())
+		os << "\\shape " << LyXShapeNames[shape()] << "\n";
+	if (orgfont.size() != size())
+		os << "\\size " << LyXSizeNames[size()] << "\n";
+	if (orgfont.emph() != emph())
+		os << "\\emph " << LyXMiscNames[emph()] << "\n";
+	if (orgfont.number() != number())
+		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;
@@ -735,7 +716,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
@@ -922,7 +903,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;
@@ -930,24 +911,23 @@ LColor::color LyXFont::realColor() const
 }
 
 
-// Convert logical attributes to concrete shape attribute
-LyXFont::FONT_SHAPE LyXFont::realShape() const
+ostream & operator<<(ostream & os, LyXFont::FONT_MISC_STATE fms)
 {
-	register FONT_SHAPE s = shape();
-
-	if (emph() == ON) {
-		if (s == UP_SHAPE)
-			s = ITALIC_SHAPE;
-		else
-			s = UP_SHAPE;
-	}
-	if (noun() == ON)
-		s = SMALLCAPS_SHAPE;
-	return s;
+	return os << int(fms);
 }
 
 
-ostream & operator<<(ostream & o, LyXFont::FONT_MISC_STATE 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);
 }