zlib stuff

[lyx.git] / src / lyxfont.C

diff --git a/src/lyxfont.C b/src/lyxfont.C
index 517eb897d8580f2dca527fc8f6af4684eb4920c9..8708fb831947c10e04464f56607ba469341fe795 100644 (file)
--- a/src/lyxfont.C
+++ b/src/lyxfont.C
@@ -22,6 +22,8 @@
 #include "support/lstrings.h"
 #include "bufferparams.h" // stateText
 
+using namespace lyx::support;
+
 using std::ostream;
 using std::endl;
 
@@ -542,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;
@@ -826,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) {