X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfont.C;h=22594630d3f3b1bac6c4b568ead5e4be5b6b4bd8;hb=69cf3b62043861ccad5f8ad7ffb4981fe50b078d;hp=52bfa989a5188d90ede85eca555a70a3a09e1561;hpb=03d1c984a0b22ec123cb86ba9004d9172a4190fb;p=lyx.git

diff --git a/src/lyxfont.C b/src/lyxfont.C
index 52bfa989a5..22594630d3 100644
--- a/src/lyxfont.C
+++ b/src/lyxfont.C
@@ -1,10 +1,10 @@
 /* This file is part of
- * ====================================================== 
- * 
+ * ======================================================
+ *
  *           LyX, The Document Processor
- * 	 
+ *
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
@@ -12,97 +12,90 @@
 #include <clocale>
 #include <cctype>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-
 #include "gettext.h"
 #include "lyxfont.h"
 #include "debug.h"
 #include "lyxrc.h"
 #include "lyxlex.h"
-#include "FontLoader.h"
+#include "language.h"
 #include "support/lstrings.h"
 #include "bufferparams.h" // stateText
 
+#include "BoostFormat.h"
+
 using std::ostream;
 using std::endl;
 
+#ifndef CXX_GLOBAL_CSTD
+using std::strlen;
+#endif
+
 //
 // Names for the GUI
 //
 
-static
-char const * GUIFamilyNames[6] = 
-{ N_("Roman"), N_("Sans serif"), N_("Typewriter"), N_("Symbol"), N_("Inherit"),
-  N_("Ignore") };
+namespace {
+
+char const * GUIFamilyNames[LyXFont::NUM_FAMILIES + 2 /* default & error */] =
+{ N_("Roman"), N_("Sans Serif"), N_("Typewriter"), N_("Symbol"),
+  "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "wasy",
+  N_("Inherit"), N_("Ignore") };
 
-static
-char const * GUISeriesNames[4] = 
+char const * GUISeriesNames[4] =
 { N_("Medium"), N_("Bold"), N_("Inherit"), N_("Ignore") };
 
-static
-char const * GUIShapeNames[6] = 
+char const * GUIShapeNames[6] =
 { N_("Upright"), N_("Italic"), N_("Slanted"), N_("Smallcaps"), N_("Inherit"),
   N_("Ignore") };
 
-static
-char const * GUISizeNames[14] = 
+char const * GUISizeNames[14] =
 { N_("Tiny"), N_("Smallest"), N_("Smaller"), N_("Small"), N_("Normal"), N_("Large"),
-  N_("Larger"), N_("Largest"), N_("Huge"), N_("Huger"), N_("Increase"), N_("Decrease"), 
+  N_("Larger"), N_("Largest"), N_("Huge"), N_("Huger"), N_("Increase"), N_("Decrease"),
   N_("Inherit"), N_("Ignore") };
- 
-static
-char const * GUIMiscNames[5] = 
+
+char const * GUIMiscNames[5] =
 { N_("Off"), N_("On"), N_("Toggle"), N_("Inherit"), N_("Ignore") };
 
 
 //
 // Strings used to read and write .lyx format files
 //
-static
-char const * LyXFamilyNames[6] = 
-{ "roman", "sans", "typewriter", "symbol", "default", "error" };
+char const * LyXFamilyNames[LyXFont::NUM_FAMILIES + 2 /* default & error */] =
+{ "roman", "sans", "typewriter", "symbol",
+  "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "wasy",
+  "default", "error" };
 
-static
-char const * LyXSeriesNames[4] = 
+char const * LyXSeriesNames[4] =
 { "medium", "bold", "default", "error" };
 
-static
-char const * LyXShapeNames[6] = 
+char const * LyXShapeNames[6] =
 { "up", "italic", "slanted", "smallcaps", "default", "error" };
 
-static
-char const * LyXSizeNames[14] = 
+char const * LyXSizeNames[14] =
 { "tiny", "scriptsize", "footnotesize", "small", "normal", "large",
-  "larger", "largest", "huge", "giant", 
-  "increase-error", "decrease-error", "default", "error" };
+  "larger", "largest", "huge", "giant",
+  "increase", "decrease", "default", "error" };
 
-static
-char const * LyXMiscNames[5] = 
+char const * LyXMiscNames[5] =
 { "off", "on", "toggle", "default", "error" };
 
 //
 // Strings used to write LaTeX files
 //
-static
-char const * LaTeXFamilyNames[6] = 
+char const * LaTeXFamilyNames[6] =
 { "textrm", "textsf", "texttt", "error1", "error2", "error3" };
 
-static
-char const * LaTeXSeriesNames[4] = 
+char const * LaTeXSeriesNames[4] =
 { "textmd", "textbf", "error4", "error5" };
 
-static
-char const * LaTeXShapeNames[6] = 
+char const * LaTeXShapeNames[6] =
 { "textup", "textit", "textsl", "textsc", "error6", "error7" };
 
-static
-char const * LaTeXSizeNames[14] = 
+char const * LaTeXSizeNames[14] =
 { "tiny", "scriptsize", "footnotesize", "small", "normalsize", "large",
   "Large", "LARGE", "huge", "Huge", "error8", "error9", "error10", "error11" };
 
+} // namespace anon
 
 
 // Initialize static member
@@ -115,7 +108,6 @@ LyXFont::FontBits LyXFont::sane = {
 	OFF,
 	OFF,
 	OFF,
-	OFF,
 	OFF };
 
 // Initialize static member
@@ -128,7 +120,6 @@ LyXFont::FontBits LyXFont::inherit = {
 	INHERIT,
 	INHERIT,
 	INHERIT,
-	INHERIT,
 	OFF };
 
 // Initialize static member
@@ -141,108 +132,57 @@ LyXFont::FontBits LyXFont::ignore = {
 	IGNORE,
 	IGNORE,
 	IGNORE,
-	IGNORE,
 	IGNORE };
 
 
-bool LyXFont::FontBits::operator==(LyXFont::FontBits const & fb1) const
+bool operator==(LyXFont::FontBits const & lhs,
+		LyXFont::FontBits const & rhs)
 {
-	return fb1.family == family &&
-		fb1.series == series &&
-		fb1.shape == shape &&
-		fb1.size == size &&
-		fb1.color == color &&
-		fb1.emph == emph &&
-		fb1.underbar == underbar &&
-		fb1.noun == noun &&
-		fb1.latex == latex &&
-		fb1.number == number;
-}
-
-
-bool LyXFont::FontBits::operator!=(LyXFont::FontBits const & fb1) const
-{
-	return !(fb1 == *this);
+	return lhs.family == rhs.family &&
+		lhs.series == rhs.series &&
+		lhs.shape == rhs.shape &&
+		lhs.size == rhs.size &&
+		lhs.color == rhs.color &&
+		lhs.emph == rhs.emph &&
+		lhs.underbar == rhs.underbar &&
+		lhs.noun == rhs.noun &&
+		lhs.number == rhs.number;
 }
 
 
 LyXFont::LyXFont()
-{
-	bits = sane;
-	lang = default_language;
-}
+	: bits(sane), lang(default_language)
+{}
 
 
 LyXFont::LyXFont(LyXFont::FONT_INIT1)
-{
-	bits = inherit;
-	lang = default_language;
-}
+	: bits(inherit), lang(default_language)
+{}
 
 
 LyXFont::LyXFont(LyXFont::FONT_INIT2)
-{
-	bits = ignore;
-	lang = ignore_language;
-}
+	: bits(ignore), lang(ignore_language)
+{}
 
 
 LyXFont::LyXFont(LyXFont::FONT_INIT3)
-{
-	bits = sane;
-	lang = default_language;
-}
+	: bits(sane), lang(default_language)
+{}
 
 
 LyXFont::LyXFont(LyXFont::FONT_INIT1, Language const * l)
-{
-	bits = inherit;
-	lang = l;
-}
+	: bits(inherit), lang(l)
+{}
 
 
 LyXFont::LyXFont(LyXFont::FONT_INIT2, Language const * l)
-{
-	bits = ignore;
-	lang = l;
-}
+	: bits(ignore), lang(l)
+{}
 
 
 LyXFont::LyXFont(LyXFont::FONT_INIT3, Language const * l)
-{
-	bits = sane;
-	lang = l;
-}
-
-
-LyXFont::FONT_FAMILY LyXFont::family() const 
-{
-	return bits.family;
-}
-
-
-LyXFont::FONT_SERIES LyXFont::series() const
-{
-	return bits.series;
-}
-
-
-LyXFont::FONT_SHAPE LyXFont::shape() const
-{
-	return bits.shape;
-}
-
-
-LyXFont::FONT_SIZE LyXFont::size() const
-{
-	return bits.size;
-}
-
-
-LyXFont::FONT_MISC_STATE LyXFont::emph() const
-{
-	return bits.emph;
-}
+	: bits(sane), lang(l)
+{}
 
 
 LyXFont::FONT_MISC_STATE LyXFont::underbar() const
@@ -251,45 +191,34 @@ LyXFont::FONT_MISC_STATE LyXFont::underbar() const
 }
 
 
-LyXFont::FONT_MISC_STATE LyXFont::noun() const
-{
-	return bits.noun;
-}
-
-
-LyXFont::FONT_MISC_STATE LyXFont::latex() const 
-{
-	return bits.latex;
-}
-
-
-LColor::color LyXFont::color() const 
+LColor::color LyXFont::color() const
 {
 	return bits.color;
 }
 
 
-Language const * LyXFont::language() const 
+Language const * LyXFont::language() const
 {
 	return lang;
 }
 
 
-LyXFont::FONT_MISC_STATE LyXFont::number() const 
+LyXFont::FONT_MISC_STATE LyXFont::number() const
 {
 	return bits.number;
 }
 
 
-bool LyXFont::isRightToLeft() const 
+bool LyXFont::isRightToLeft() const
 {
 	return lang->RightToLeft();
 }
 
 
-bool LyXFont::isVisibleRightToLeft() const 
+bool LyXFont::isVisibleRightToLeft() const
 {
-	return (lang->RightToLeft() && latex() != ON && number() != ON);
+	return (lang->RightToLeft() &&
+		number() != ON);
 }
 
 
@@ -342,13 +271,6 @@ LyXFont & LyXFont::setNoun(LyXFont::FONT_MISC_STATE n)
 }
 
 
-LyXFont & LyXFont::setLatex(LyXFont::FONT_MISC_STATE l)
-{
-	bits.latex = l;
-	return *this;
-}
-
-
 LyXFont & LyXFont::setColor(LColor::color c)
 {
 	bits.color = c;
@@ -371,7 +293,7 @@ LyXFont & LyXFont::setNumber(LyXFont::FONT_MISC_STATE n)
 
 
 /// Decreases font size by one
-LyXFont & LyXFont::decSize() 
+LyXFont & LyXFont::decSize()
 {
 	switch (size()) {
 	case SIZE_HUGER:        setSize(SIZE_HUGE);     break;
@@ -402,7 +324,7 @@ LyXFont & LyXFont::decSize()
 
 
 /// Increases font size by one
-LyXFont & LyXFont::incSize() 
+LyXFont & LyXFont::incSize()
 {
 	switch (size()) {
 	case SIZE_HUGER:	break;
@@ -433,7 +355,7 @@ LyXFont & LyXFont::incSize()
 
 
 /// Updates a misc setting according to request
-LyXFont::FONT_MISC_STATE LyXFont::setMisc(FONT_MISC_STATE newfont, 
+LyXFont::FONT_MISC_STATE LyXFont::setMisc(FONT_MISC_STATE newfont,
 					  FONT_MISC_STATE org)
 {
 	if (newfont == TOGGLE) {
@@ -448,14 +370,15 @@ LyXFont::FONT_MISC_STATE LyXFont::setMisc(FONT_MISC_STATE newfont,
 		}
 	} else if (newfont == IGNORE)
 		return org;
-	else 
+	else
 		return newfont;
 }
 
 
 /// Updates font settings according to request
 void LyXFont::update(LyXFont const & newfont,
-		     Language const * document_language, bool toggleall)
+		     Language const * document_language,
+		     bool toggleall)
 {
 	if (newfont.family() == family() && toggleall)
 		setFamily(INHERIT_FAMILY); // toggle 'back'
@@ -476,7 +399,7 @@ void LyXFont::update(LyXFont const & newfont,
 	case INHERIT_SERIES:
 		setSeries(newfont.series());
 		break;
-	case IGNORE_SERIES: 
+	case IGNORE_SERIES:
 		break;
 	}
 
@@ -491,8 +414,6 @@ void LyXFont::update(LyXFont const & newfont,
 			incSize();
 		else if (newfont.size() == DECREASE_SIZE)
 			decSize();
-		else if (newfont.size() == size() && toggleall)
-			setSize(INHERIT_SIZE); // toggle 'back'
 		else
 			setSize(newfont.size());
 	}
@@ -500,7 +421,6 @@ void LyXFont::update(LyXFont const & newfont,
 	setEmph(setMisc(newfont.emph(), emph()));
 	setUnderbar(setMisc(newfont.underbar(), underbar()));
 	setNoun(setMisc(newfont.noun(), noun()));
-	setLatex(setMisc(newfont.latex(), latex()));
 
 	setNumber(setMisc(newfont.number(), number()));
 	if (newfont.language() == language() && toggleall)
@@ -535,8 +455,6 @@ void LyXFont::reduce(LyXFont const & tmplt)
 		setUnderbar(INHERIT);
 	if (noun() == tmplt.noun())
 		setNoun(INHERIT);
-	if (latex() == tmplt.latex())
-		setLatex(INHERIT);
 	if (color() == tmplt.color())
 		setColor(LColor::inherit);
 }
@@ -549,7 +467,7 @@ LyXFont & LyXFont::realize(LyXFont const & tmplt)
 		bits = tmplt.bits;
 		return *this;
 	}
-	
+
 	if (bits.family == INHERIT_FAMILY) {
 		bits.family = tmplt.bits.family;
 	}
@@ -571,9 +489,6 @@ LyXFont & LyXFont::realize(LyXFont const & tmplt)
 	if (bits.noun == INHERIT) {
 		bits.noun = tmplt.bits.noun;
 	}
-	if (bits.latex == INHERIT) {
-		bits.latex = tmplt.bits.latex;
-	}
 	if (bits.color == LColor::inherit) {
 		bits.color = tmplt.bits.color;
 	}
@@ -586,8 +501,8 @@ bool LyXFont::resolved() const
 {
 	return (family() != INHERIT_FAMILY && series() != INHERIT_SERIES &&
 		shape() != INHERIT_SHAPE && size() != INHERIT_SIZE &&
-		emph() != INHERIT && underbar() != INHERIT && 
-		noun() != INHERIT && latex() != INHERIT && 
+		emph() != INHERIT && underbar() != INHERIT &&
+		noun() != INHERIT &&
 		color() != LColor::inherit);
 }
 
@@ -595,7 +510,7 @@ bool LyXFont::resolved() const
 /// Build GUI description of font state
 string const LyXFont::stateText(BufferParams * params) const
 {
-	std::ostringstream ost;
+	ostringstream ost;
 	if (family() != INHERIT_FAMILY)
 		ost << _(GUIFamilyNames[family()]) << ", ";
 	if (series() != INHERIT_SERIES)
@@ -606,26 +521,50 @@ string const LyXFont::stateText(BufferParams * params) const
 		ost << _(GUISizeNames[size()]) << ", ";
 	if (color() != LColor::inherit)
 		ost << lcolor.getGUIName(color()) << ", ";
-	if (emph() != INHERIT)
-		ost << _("Emphasis ")
-		    << _(GUIMiscNames[emph()]) << ", ";
-	if (underbar() != INHERIT)
-		ost << _("Underline ")
-		    << _(GUIMiscNames[underbar()]) << ", ";
-	if (noun() != INHERIT)
+	if (emph() != INHERIT) {
+#if USE_BOOST_FORMAT
+		ost << boost::format(_("Emphasis %1$s, "))
+			% _(GUIMiscNames[emph()]);
+#else
+		ost << _("Emphasis ") << _(GUIMiscNames[emph()]) << ", ";
+#endif
+	}
+	if (underbar() != INHERIT) {
+#if USE_BOOST_FORMAT
+		ost << boost::format(_("Underline %1$s, "))
+			% _(GUIMiscNames[underbar()]);
+#else
+		ost << _("Underline ") << _(GUIMiscNames[underbar()]) << ", ";
+#endif
+	}
+	if (noun() != INHERIT) {
+#if USE_BOOST_FORMAT
+		ost << boost::format(_("Noun %1$s, "))
+			% _(GUIMiscNames[noun()]);
+#else
 		ost << _("Noun ") << _(GUIMiscNames[noun()]) << ", ";
-	if (latex() != INHERIT)
-		ost << _("Latex ") << _(GUIMiscNames[latex()]) << ", ";
+#endif
+	}
 	if (bits == inherit)
 		ost << _("Default") << ", ";
-	if (!params || (language() != params->language))
+	if (!params || (language() != params->language)) {
+#if USE_BOOST_FORMAT
+		ost << boost::format(_("Language: %1$s, "))
+			% _(language()->display());
+#else
 		ost << _("Language: ") << _(language()->display()) << ", ";
-	if (number() != OFF)
+#endif
+	}
+	if (number() != OFF) {
+#if USE_BOOST_FORMAT
+		ost << boost::format(_("  Number %1$s"))
+			% _(GUIMiscNames[number()]);
+#else
 		ost << _("  Number ") << _(GUIMiscNames[number()]);
+#endif
+	}
 
-	string buf(ost.str().c_str());
-	buf = strip(buf, ' ');
-	buf = strip(buf, ',');
+	string const buf = rtrim(STRCONV(ost.str()), ", ");
 	return buf;
 }
 
@@ -633,7 +572,7 @@ string const LyXFont::stateText(BufferParams * params) const
 // Set family according to lyx format string
 LyXFont & LyXFont::setLyXFamily(string const & fam)
 {
-	string const s = lowercase(fam);
+	string const s = ascii_lowercase(fam);
 
 	int i = 0;
 	while (s != LyXFamilyNames[i] && LyXFamilyNames[i] != "error") ++i;
@@ -649,7 +588,7 @@ LyXFont & LyXFont::setLyXFamily(string const & fam)
 // Set series according to lyx format string
 LyXFont & LyXFont::setLyXSeries(string const & ser)
 {
-	string const s = lowercase(ser);
+	string const s = ascii_lowercase(ser);
 
 	int i = 0;
 	while (s != LyXSeriesNames[i] && LyXSeriesNames[i] != "error") ++i;
@@ -665,7 +604,7 @@ LyXFont & LyXFont::setLyXSeries(string const & ser)
 // Set shape according to lyx format string
 LyXFont & LyXFont::setLyXShape(string const & sha)
 {
-	string const s = lowercase(sha);
+	string const s = ascii_lowercase(sha);
 
 	int i = 0;
 	while (s != LyXShapeNames[i] && LyXShapeNames[i] != "error") ++i;
@@ -681,7 +620,7 @@ LyXFont & LyXFont::setLyXShape(string const & sha)
 // Set size according to lyx format string
 LyXFont & LyXFont::setLyXSize(string const & siz)
 {
-	string const s = lowercase(siz);
+	string const s = ascii_lowercase(siz);
 	int i = 0;
 	while (s != LyXSizeNames[i] && LyXSizeNames[i] != "error") ++i;
 	if (s == LyXSizeNames[i]) {
@@ -696,7 +635,7 @@ LyXFont & LyXFont::setLyXSize(string const & siz)
 // Set size according to lyx format string
 LyXFont::FONT_MISC_STATE LyXFont::setLyXMisc(string const & siz)
 {
-	string const s = lowercase(siz);
+	string const s = ascii_lowercase(siz);
 	int i = 0;
 	while (s != LyXMiscNames[i] && LyXMiscNames[i] != "error") ++i;
 	if (s == LyXMiscNames[i])
@@ -728,9 +667,9 @@ LyXFont & LyXFont::lyxRead(LyXLex & lex)
 {
 	bool error = false;
 	bool finished = false;
-	while (!finished && lex.IsOK() && !error) {
+	while (!finished && lex.isOK() && !error) {
 		lex.next();
-		string const tok = lowercase(lex.GetString());
+		string const tok = ascii_lowercase(lex.getString());
 
 		if (tok.empty()) {
 			continue;
@@ -738,34 +677,23 @@ LyXFont & LyXFont::lyxRead(LyXLex & lex)
 			finished = true;
 		} else if (tok == "family") {
 			lex.next();
-			string const ttok = lex.GetString();
+			string const ttok = lex.getString();
 			setLyXFamily(ttok);
 		} else if (tok == "series") {
 			lex.next();
-			string const ttok = lex.GetString();
+			string const ttok = lex.getString();
 			setLyXSeries(ttok);
 		} else if (tok == "shape") {
 			lex.next();
-			string const ttok = lex.GetString();
+			string const ttok = lex.getString();
 			setLyXShape(ttok);
 		} else if (tok == "size") {
 			lex.next();
-			string const ttok = lex.GetString();
+			string const ttok = lex.getString();
 			setLyXSize(ttok);
-		} else if (tok == "latex") {
-			lex.next();
-			string const ttok = lowercase(lex.GetString());
-
-			if (ttok == "no_latex") {
-				setLatex(OFF);
-			} else if (ttok == "latex") {
-				setLatex(ON);
-			} else {
-				lex.printError("Illegal LaTeX type`$$Token'");
-			}
 		} else if (tok == "misc") {
 			lex.next();
-			string const ttok = lowercase(lex.GetString());
+			string const ttok = ascii_lowercase(lex.getString());
 
 			if (ttok == "no_bar") {
 				setUnderbar(OFF);
@@ -784,7 +712,7 @@ LyXFont & LyXFont::lyxRead(LyXLex & lex)
 			}
 		} else if (tok == "color") {
 			lex.next();
-			string const ttok = lex.GetString();
+			string const ttok = lex.getString();
 			setLyXColor(ttok);
 		} else {
 			lex.printError("Unknown tag `$$Token'");
@@ -796,7 +724,8 @@ LyXFont & LyXFont::lyxRead(LyXLex & lex)
 
 
 /// Writes the changes from this font to orgfont in .lyx format in file
-void LyXFont::lyxWriteChanges(LyXFont const & orgfont, ostream & os) const
+void LyXFont::lyxWriteChanges(LyXFont const & orgfont,
+			      ostream & os) const
 {
 	os << "\n";
 	if (orgfont.family() != family()) {
@@ -836,22 +765,6 @@ void LyXFont::lyxWriteChanges(LyXFont const & orgfont, ostream & os) const
 	if (orgfont.noun() != noun()) {
 		os << "\\noun " << LyXMiscNames[noun()] << " \n";
 	}
-	if (orgfont.latex() != latex()) {
-		// This is only for backwards compatibility
-		switch (latex()) {
-		case OFF:	os << "\\latex no_latex \n"; break;
-		case ON:        os << "\\latex latex \n"; break;
-		case TOGGLE:	lyxerr << "LyXFont::lyxWriteFontChanges: "
-					"TOGGLE should not appear here!"
-				       << endl;
-		break;
-		case INHERIT:   os << "\\latex default \n"; break;
-		case IGNORE:    lyxerr << "LyXFont::lyxWriteFontChanges: "
-					"IGNORE should not appear here!"
-				       << endl;
-		break;
-		}
-	}
 	if (orgfont.color() != color()) {
 		// To make us file compatible with older
 		// lyx versions we emit "default" instead
@@ -878,7 +791,7 @@ int LyXFont::latexWriteStartChanges(ostream & os, LyXFont const & base,
 	bool env = false;
 
 	if (language()->babel() != base.language()->babel() &&
-	    language()->babel() != prev.language()->babel()) {
+	    language() != prev.language()) {
 		if (isRightToLeft() != prev.isRightToLeft()) {
 			if (isRightToLeft()) {
 				os << "\\R{";
@@ -904,7 +817,7 @@ int LyXFont::latexWriteStartChanges(ostream & os, LyXFont const & base,
 
 	LyXFont f = *this;
 	f.reduce(base);
-	
+
 	if (f.family() != INHERIT_FAMILY) {
 		os << '\\'
 		   << LaTeXFamilyNames[f.family()]
@@ -973,12 +886,11 @@ int LyXFont::latexWriteEndChanges(ostream & os, LyXFont const & base,
 	int count = 0;
 	bool env = false;
 
-	LyXFont f = *this; // why do you need this?
-	f.reduce(base); // why isn't this just "reduce(base);" (Lgb)
-	// Because this function is const. Everything breaks if this
-	// method changes the font it represents. There is no speed penalty
-	// by using the temporary. (Asger)
-
+	// reduce the current font to changes against the base
+	// font (of the layout). We use a temporary for this to
+	// avoid changing this font instance, as that would break
+	LyXFont f = *this;
+	f.reduce(base);
 
 	if (f.family() != INHERIT_FAMILY) {
 		os << '}';
@@ -1030,7 +942,7 @@ int LyXFont::latexWriteEndChanges(ostream & os, LyXFont const & base,
 	}
 
 	if (language() != base.language() && language() != next.language()) {
-		os << "}";
+		os << '}';
 		++count;
 	}
 
@@ -1040,8 +952,6 @@ int LyXFont::latexWriteEndChanges(ostream & os, LyXFont const & base,
 
 LColor::color LyXFont::realColor() const
 {
-	if (latex() == ON)
-		return LColor::latex;
 	if (color() == LColor::none)
 		return LColor::foreground;
 	return color();
@@ -1065,14 +975,6 @@ LyXFont::FONT_SHAPE LyXFont::realShape() const
 }
 
 
-bool LyXFont::equalExceptLatex(LyXFont const & f) const 
-{
-	LyXFont f1 = *this;
-	f1.setLatex(f.latex());
-	return f1 == f;
-}
-
-
 ostream & operator<<(ostream & o, LyXFont::FONT_MISC_STATE fms)
 {
 	return o << int(fms);