Replace LString.h with support/std_string.h,

[features.git] / src / lyxfont.C

diff --git a/src/lyxfont.C b/src/lyxfont.C
index 2b0ffbd34df535b8bd304cd0d3240e2cd2c07f53..9a66df7b21334dc72fecaa55f5ea3c6a20fc9387 100644 (file)
--- a/src/lyxfont.C
+++ b/src/lyxfont.C
@@ -1,27 +1,31 @@
-/* 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>
-#include <cctype>
 
-#include "gettext.h"
 #include "lyxfont.h"
+#include "gettext.h"
 #include "debug.h"
 #include "lyxrc.h"
 #include "lyxlex.h"
 #include "language.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include "support/lstrings.h"
 #include "bufferparams.h" // stateText
 
+using namespace lyx::support;
+
 using std::ostream;
 using std::endl;
 
@@ -827,7 +831,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) {