More 'standard conformant blurb' nonsense.

[lyx.git] / src / lyxfont.C

diff --git a/src/lyxfont.C b/src/lyxfont.C
index e834421a8981a859eefd4edfabde706598c52ebc..8708fb831947c10e04464f56607ba469341fe795 100644 (file)
--- a/src/lyxfont.C
+++ b/src/lyxfont.C
@@ -12,21 +12,17 @@
 #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
 
-#include "BoostFormat.h"
+using namespace lyx::support;
 
 using std::ostream;
 using std::endl;
@@ -42,7 +38,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") };
 
@@ -515,37 +511,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 << boost::format(_("Emphasis %1$s, "))
-                       % _(GUIMiscNames[emph()]);
+               os << bformat(_("Emphasis %1$s, "), _(GUIMiscNames[emph()]));
        if (underbar() != INHERIT)
-               ost << boost::format(_("Underline %1$s, "))
-                       % _(GUIMiscNames[underbar()]);
+               os << bformat(_("Underline %1$s, "), _(GUIMiscNames[underbar()]));
        if (noun() != INHERIT)
-               ost << boost::format(_("Noun %1$s, "))
-                       % _(GUIMiscNames[noun()]);
+               os << bformat(_("Noun %1$s, "), _(GUIMiscNames[noun()]));
        if (bits == inherit)
-               ost << _("Default") << ", ";
+               os << _("Default") << ", ";
        if (!params || (language() != params->language))
-               ost << boost::format(_("Language: %1$s, "))
-                       % _(language()->display());
+               os << bformat(_("Language: %1$s, "), _(language()->display()));
        if (number() != OFF)
-               ost << boost::format(_("  Number %1$s"))
-                       % _(GUIMiscNames[number()]);
-
-       string const buf = rtrim(STRCONV(ost.str()), ", ");
-       return buf;
+               os << bformat(_("  Number %1$s"), _(GUIMiscNames[number()]));
+       return rtrim(STRCONV(os.str()), ", ");
 }
 
 
@@ -555,10 +544,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;
@@ -839,7 +829,7 @@ int LyXFont::latexWriteStartChanges(ostream & os, LyXFont const & base,
        // \noun{} is a LyX special macro
        if (f.noun() == ON) {
                os << "\\noun{";
-               count += 8;
+               count += 6;
                env = true; //We have opened a new environment
        }
        if (f.size() != INHERIT_SIZE) {
@@ -922,7 +912,7 @@ int LyXFont::latexWriteEndChanges(ostream & os, LyXFont const & base,
        }
 
        if (language() != base.language() && language() != next.language()) {
-               os << "}";
+               os << '}';
                ++count;
        }