Point fix, earlier forgotten

[lyx.git] / src / lyxfont.C

diff --git a/src/lyxfont.C b/src/lyxfont.C
index 517eb897d8580f2dca527fc8f6af4684eb4920c9..ed2ff8516b9e923d256dc0984f611e17aef7fc27 100644 (file)
--- a/src/lyxfont.C
+++ b/src/lyxfont.C
@@ -1,12 +1,16 @@
-/* This file is part of
- * ======================================================
+/**
+ * \file lyxfont.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author Angus Leeming
+ * \author André Pönitz
+ * \author Dekel Tsur
  *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS.
+ */
 
 #include <config.h>
 #include <clocale>
@@ -22,6 +26,8 @@
 #include "support/lstrings.h"
 #include "bufferparams.h" // stateText
 
+using namespace lyx::support;
+
 using std::ostream;
 using std::endl;
 
@@ -542,10 +548,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 +833,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) {