The "I want this in now" patch.

[lyx.git] / src / lyxfont.C

diff --git a/src/lyxfont.C b/src/lyxfont.C
index 7a04c7177e54783cf96254fbec3d987a10963fc9..2b0ffbd34df535b8bd304cd0d3240e2cd2c07f53 100644 (file)
--- a/src/lyxfont.C
+++ b/src/lyxfont.C
@@ -12,17 +12,13 @@
 #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 "language.h"
+#include "Lsstream.h"
 #include "support/lstrings.h"
 #include "bufferparams.h" // stateText
 
@@ -40,7 +36,7 @@ using std::strlen;
 namespace {
 
 char const * GUIFamilyNames[LyXFont::NUM_FAMILIES + 2 /* default & error */] =
-{ N_("Roman"), N_("Sans serif"), N_("Typewriter"), N_("Symbol"),
+{ N_("Roman"), N_("Sans Serif"), N_("Typewriter"), N_("Symbol"),
   "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "wasy",
   N_("Inherit"), N_("Ignore") };
 
@@ -513,35 +509,30 @@ bool LyXFont::resolved() const
 /// Build GUI description of font state
 string const LyXFont::stateText(BufferParams * params) const
 {
-       ostringstream ost;
+       ostringstream os;
        if (family() != INHERIT_FAMILY)
-               ost << _(GUIFamilyNames[family()]) << ", ";
+               os << _(GUIFamilyNames[family()]) << ", ";
        if (series() != INHERIT_SERIES)
-               ost << _(GUISeriesNames[series()]) << ", ";
+               os << _(GUISeriesNames[series()]) << ", ";
        if (shape() != INHERIT_SHAPE)
-               ost << _(GUIShapeNames[shape()]) << ", ";
+               os << _(GUIShapeNames[shape()]) << ", ";
        if (size() != INHERIT_SIZE)
-               ost << _(GUISizeNames[size()]) << ", ";
+               os << _(GUISizeNames[size()]) << ", ";
        if (color() != LColor::inherit)
-               ost << lcolor.getGUIName(color()) << ", ";
+               os << lcolor.getGUIName(color()) << ", ";
        if (emph() != INHERIT)
-               ost << _("Emphasis ")
-                   << _(GUIMiscNames[emph()]) << ", ";
+               os << bformat(_("Emphasis %1$s, "), _(GUIMiscNames[emph()]));
        if (underbar() != INHERIT)
-               ost << _("Underline ")
-                   << _(GUIMiscNames[underbar()]) << ", ";
+               os << bformat(_("Underline %1$s, "), _(GUIMiscNames[underbar()]));
        if (noun() != INHERIT)
-               ost << _("Noun ") << _(GUIMiscNames[noun()]) << ", ";
+               os << bformat(_("Noun %1$s, "), _(GUIMiscNames[noun()]));
        if (bits == inherit)
-               ost << _("Default") << ", ";
+               os << _("Default") << ", ";
        if (!params || (language() != params->language))
-               ost << _("Language: ") << _(language()->display()) << ", ";
+               os << bformat(_("Language: %1$s, "), _(language()->display()));
        if (number() != OFF)
-               ost << _("  Number ") << _(GUIMiscNames[number()]);
-
-       string buf(ost.str().c_str());
-       buf = rtrim(buf, ", ");
-       return buf;
+               os << bformat(_("  Number %1$s"), _(GUIMiscNames[number()]));
+       return rtrim(STRCONV(os.str()), ", ");
 }
 
 
@@ -551,10 +542,11 @@ LyXFont & LyXFont::setLyXFamily(string const & fam)
        string const s = ascii_lowercase(fam);
 
        int i = 0;
-       while (s != LyXFamilyNames[i] && LyXFamilyNames[i] != "error") ++i;
-       if (s == LyXFamilyNames[i]) {
+       while (s != LyXFamilyNames[i] && LyXFamilyNames[i] != "error")
+               ++i;
+       if (s == LyXFamilyNames[i])
                setFamily(LyXFont::FONT_FAMILY(i));
-       } else
+       else
                lyxerr << "LyXFont::setLyXFamily: Unknown family `"
                       << s << '\'' << endl;
        return *this;
@@ -918,7 +910,7 @@ int LyXFont::latexWriteEndChanges(ostream & os, LyXFont const & base,
        }
 
        if (language() != base.language() && language() != next.language()) {
-               os << "}";
+               os << '}';
                ++count;
        }