Dekel's patch -- I didn't fix the xforms-0.88 keysyms stuff so it still doesn't finis...

[lyx.git] / src / FontLoader.C

diff --git a/src/FontLoader.C b/src/FontLoader.C
index d01905d61db5d52d1af3220f6ba78d405d5c26cb..6938348f6e9b9b1d5a34b7b22461cc7842c515a2 100644 (file)
--- a/src/FontLoader.C
+++ b/src/FontLoader.C
@@ -26,8 +26,15 @@
 #include "LyXView.h"
 #include "minibuffer.h"
 
+using std::endl;
+
 extern BufferView * current_view;
 
+
+// The global fontloader
+FontLoader fontloader;
+
+
 // Initialize font loader
 FontLoader::FontLoader()
 {
@@ -211,7 +218,7 @@ XFontStruct * FontLoader::doLoad(LyXFont::FONT_FAMILY family,
        if (!lyxrc.use_gui) {
                if (!dummyXFontStructisGood) {
                        // no character specific info
-                       dummyXFontStruct.per_char=0; 
+                       dummyXFontStruct.per_char = 0; 
                        // unit ascent on character displays
                        dummyXFontStruct.ascent = 1; 
                        // no descent on character displays
@@ -260,7 +267,7 @@ XFontStruct * FontLoader::doLoad(LyXFont::FONT_FAMILY family,
                f.setNoun(LyXFont::INHERIT);
                f.setLatex(LyXFont::INHERIT);
                f.setColor(LColor::inherit);
-               lyxerr << "Font '" << f.stateText() 
+               lyxerr << "Font '" << f.stateText(0) 
                       << "' matched by\n" << font << endl;
        }