read ChangeLog, a lot of whitespace changes. experimental use of libtool

[lyx.git] / src / lyxfont.h

diff --git a/src/lyxfont.h b/src/lyxfont.h
index 8390b6f084e101dd6612514bceb510404e58120f..68015ae34b611dbbbcea3674650ee7e250b9cd33 100644 (file)
--- a/src/lyxfont.h
+++ b/src/lyxfont.h
@@ -6,7 +6,7 @@
  *      
  *         Copyright (C) 1995 Matthias Ettrich
  *
- *======================================================*/
+ * ====================================================== */
 
 #ifndef LYXFONT_H
 #define LYXFONT_H
@@ -17,6 +17,7 @@
 
 #include FORMS_H_LOCATION
 #include "LString.h"
+#include "debug.h"
 
 // It might happen that locale.h defines ON and OFF. This is not good
 // for us, since we use these names below. But of course this is due
@@ -190,7 +191,7 @@ public:
        /// Shortcut initialization
        LyXFont(LyXFont::FONT_INIT3);
 
-       /// LyXFont x,y; x=y;
+       /// LyXFont x, y; x = y;
        LyXFont& operator=(LyXFont const & x);
  
        /// Decreases font size by one
@@ -272,14 +273,14 @@ public:
        /** Updates font settings according to request. If an
          attribute is IGNORE, the attribute is left as it is. */
        /* 
-        * When toggleall=true, all properties that matches the font in use
+        * When toggleall = true, all properties that matches the font in use
         * will have the effect that the properties is reset to the
         * default.  If we have a text that is TYPEWRITER_FAMILY, and is
         * update()'ed with TYPEWRITER_FAMILY, the operation will be as if
         * a INHERIT_FAMILY was asked for.  This is necessary for the
         * toggle-user-defined-style button on the toolbar.
         */
-       void update(LyXFont const & newfont, bool toggleall=false);
+       void update(LyXFont const & newfont, bool toggleall = false);
  
        /** Reduce font to fall back to template where possible.
          Equal fields are reduced to INHERIT */
@@ -471,6 +472,7 @@ private:
        XFontStruct* getXFontstruct() const;
 };
 
+ostream & operator<<(ostream &, LyXFont::FONT_MISC_STATE);
 
 inline LyXFont::LyXFont()
 {