I'll find a solution for the 'dirList problem', Abdel.

[lyx.git] / src / Font.cpp

diff --git a/src/Font.cpp b/src/Font.cpp
index 2c575add4b79248dd9df66ad4e531fdeebdb7145..ce59fd231b54af77fd375cd7defcae6cad2978c9 100644 (file)
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -18,9 +18,7 @@
 
 #include "BufferParams.h" // stateText
 #include "Color.h"
-#include "debug.h"
 #include "Encoding.h"
-#include "gettext.h"
 #include "Language.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
@@ -29,6 +27,8 @@
 #include "OutputParams.h"
 
 #include "support/convert.h"
+#include "support/debug.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 
 using std::endl;
@@ -303,9 +303,9 @@ string const Font::latexSize() const
 
 // Read a font definition from given file in lyx format
 // Used for layouts
-FontInfo lyxRead(Lexer & lex)
+FontInfo lyxRead(Lexer & lex, FontInfo const & fi)
 {
-       FontInfo f;
+       FontInfo f = fi;
        bool error = false;
        bool finished = false;
        while (!finished && lex.isOK() && !error) {
@@ -660,8 +660,7 @@ std::string Font::toString(bool const toggle) const
                lang = language()->lang();
 
        ostringstream os;
-       os << "font: " << '\n'
-          << "family " << bits_.family() << '\n'
+       os << "family " << bits_.family() << '\n'
           << "series " << bits_.series() << '\n'
           << "shape " << bits_.shape() << '\n'
           << "size " << bits_.size() << '\n'
@@ -759,13 +758,9 @@ void Font::validate(LaTeXFeatures & features) const
        Language const * doc_language = bparams.language;
 
        if (bits_.noun() == FONT_ON) {
-               LYXERR(Debug::LATEX) << "font.noun: "
-                       << bits_.noun()
-                       << endl;
+               LYXERR(Debug::LATEX, "font.noun: " << bits_.noun());
                features.require("noun");
-               LYXERR(Debug::LATEX) << "Noun enabled. Font: "
-                       << to_utf8(stateText(0))
-                       << endl;
+               LYXERR(Debug::LATEX, "Noun enabled. Font: " << to_utf8(stateText(0)));
        }
        switch (bits_.color()) {
                case Color_none:
@@ -778,9 +773,7 @@ void Font::validate(LaTeXFeatures & features) const
                        break;
                default:
                        features.require("color");
-                       LYXERR(Debug::LATEX) << "Color enabled. Font: "
-                               << to_utf8(stateText(0))
-                               << endl;
+                       LYXERR(Debug::LATEX, "Color enabled. Font: " << to_utf8(stateText(0)));
        }
 
        // FIXME: Do something for background and soul package?
@@ -790,8 +783,7 @@ void Font::validate(LaTeXFeatures & features) const
                lang_ != latex_language)
        {
                features.useLanguage(lang_);
-               LYXERR(Debug::LATEX) << "Found language "
-                       << lang_->lang() << endl;
+               LYXERR(Debug::LATEX, "Found language " << lang_->lang());
        }
 }