* src/LyXRC.{cpp,h}:

[lyx.git] / src / Font.cpp

diff --git a/src/Font.cpp b/src/Font.cpp
index 2c575add4b79248dd9df66ad4e531fdeebdb7145..c854a363262372b449254d0fe772f2da176b4a31 100644 (file)
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -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'