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

diff --git a/src/lyxfont.C b/src/lyxfont.C
index 2ffce829c8..d7559ca084 100644
--- a/src/lyxfont.C
+++ b/src/lyxfont.C
@@ -197,11 +197,6 @@ LyXFont::LyXFont(LyXFont::FONT_INIT3, Language const * l)
 {}
 
 
-LyXFont::FONT_MISC_STATE LyXFont::underbar() const
-{
-	return bits.underbar;
-}
-
 
 LColor_color LyXFont::color() const
 {
@@ -209,18 +204,6 @@ LColor_color LyXFont::color() const
 }
 
 
-Language const * LyXFont::language() const
-{
-	return lang;
-}
-
-
-LyXFont::FONT_MISC_STATE LyXFont::number() const
-{
-	return bits.number;
-}
-
-
 bool LyXFont::isRightToLeft() const
 {
 	return lang->RightToLeft();
@@ -470,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;
 }
 
@@ -545,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));
@@ -562,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
@@ -578,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;
@@ -593,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
@@ -608,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 `"
@@ -699,24 +687,18 @@ void LyXFont::lyxWriteChanges(LyXFont const & orgfont,
 			      ostream & os) const
 {
 	os << "\n";
-	if (orgfont.family() != family()) {
+	if (orgfont.family() != family())
 		os << "\\family " << LyXFamilyNames[family()] << "\n";
-	}
-	if (orgfont.series() != series()) {
+	if (orgfont.series() != series())
 		os << "\\series " << LyXSeriesNames[series()] << "\n";
-	}
-	if (orgfont.shape() != shape()) {
+	if (orgfont.shape() != shape())
 		os << "\\shape " << LyXShapeNames[shape()] << "\n";
-	}
-	if (orgfont.size() != size()) {
+	if (orgfont.size() != size())
 		os << "\\size " << LyXSizeNames[size()] << "\n";
-	}
-	if (orgfont.emph() != emph()) {
+	if (orgfont.emph() != emph())
 		os << "\\emph " << LyXMiscNames[emph()] << "\n";
-	}
-	if (orgfont.number() != number()) {
+	if (orgfont.number() != number())
 		os << "\\numeric " << LyXMiscNames[number()] << "\n";
-	}
 	if (orgfont.underbar() != underbar()) {
 		// This is only for backwards compatibility
 		switch (underbar()) {
@@ -929,23 +911,6 @@ LColor_color LyXFont::realColor() const
 }
 
 
-// Convert logical attributes to concrete shape attribute
-LyXFont::FONT_SHAPE LyXFont::realShape() const
-{
-	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;
-}
-
-
 ostream & operator<<(ostream & os, LyXFont::FONT_MISC_STATE fms)
 {
 	return os << int(fms);