--- a/font/font.h
+++ b/font/font.h
@@ -7,12 +7,12 @@
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
+ *	notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
+ *	notice, this list of conditions and the following disclaimer in the
+ *	documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
+ *	derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -33,81 +33,85 @@
 #  include "config.h"
 #endif
 
-#include<vector>
+#include <vector>
 
 class TextHorizLayout;
 class TextStream;
 class TextGlyphStream;
 
 namespace XKFont {
-class Font;
-class Face;
-class Peer;
-class Glyph;
-class Cache;
+	class Font;
+	class Face;
+	class Peer;
+	class Glyph;
+	class Cache;
 
-struct Font {
-public:
-	Font(const char* fontname, int size);
-	~Font();
-	Face* FaceLoad(double scale);
-	int vsize;
-private:
-	class FontImpl* pimpl;
-};
+	struct Font {
+		public:
+			Font(const char* fontname, int size);
+			~Font();
+			Face* FaceLoad(double scale);
+			int vsize;
+		private:
+			class FontImpl* pimpl;
+	};
 
-struct Face {
-public:
-	Face(const char *name, int index, int hsize, int vsize);
-	~Face();
-	Glyph* GlyphLoad(unsigned int code);
+	struct Face {
+		public:
+			Face(const char *name, int index, int hsize, int vsize);
+			~Face();
+			Glyph* GlyphLoad(unsigned int code);
 
-private:
-	Cache* cache;
-	typedef std::vector<Peer*>::iterator iterator;
-	std::vector<Peer*> peer;
-};
+		private:
+			Cache* cache;
+			typedef std::vector<Peer*>::iterator iterator;
+			std::vector<Peer*> peer;
+	};
 
-struct Peer {
-	Peer(void) {}
-	virtual ~Peer() {};
-	virtual bool GlyphCreate(unsigned int code, Glyph* glyph) = 0;
-};
+	struct Peer {
+		public:
+			Peer(void) {}
+			virtual ~Peer() {};
+			virtual bool GlyphCreate(unsigned int code, Glyph* glyph) = 0;
+	};
 
-struct Glyph {
-  int bitmap_left;
-  int bitmap_top;
-  struct _bitmap {
-    int width;
-    int rows;
-    unsigned char *buffer;
-    _bitmap() : buffer(0) {}
-    ~_bitmap() { delete[] buffer;}
-  } bitmap;
+	struct Glyph {
+		public:
+			struct _bitmap {
+				int width;
+				int rows;
+				unsigned char *buffer;
+				_bitmap() : buffer(0) {}
+				~_bitmap() { delete[] buffer;}
+			} bitmap;
 #if 0
-  struct _metrics {
-    int ascender;
-    int descender;
-  } metrics;
+			struct _metrics {
+				int ascender;
+				int descender;
+			} metrics;
 #endif
-  struct _advance {
-    int x;
-    int y;
-  } advance;
-  Glyph() : bitmap() {}
-  ~Glyph() {}
-};
+			struct _advance {
+				int x;
+				int y;
+			} advance;
+
+			Glyph() : bitmap() {}
+			~Glyph() {}
+			int bitmap_left;
+			int bitmap_top;
+	};
 
-struct HorizLayout {
-	HorizLayout(const char* fontname, int size);
-	~HorizLayout();
-	void Layout(::TextStream& stream, ::TextGlyphStream& glyph, std::vector<int>& lineheights, int width);
-	::TextGlyphStream Layout(const char* str, int width, int r=0xff, int g=0xff, int b=0xff);
-private:
-	Font* font;
-	class ::TextHorizLayout* pimpl;
-};
+	struct HorizLayout {
+		public:
+			HorizLayout(const char* fontname, int size);
+			~HorizLayout();
+			void Layout(::TextStream& stream, ::TextGlyphStream& glyph, std::vector<int>& lineheights, int width);
+			::TextGlyphStream Layout(const char* str, int width, int r=0xff, int g=0xff, int b=0xff);
+		private:
+			Font* font;
+			class ::TextHorizLayout* pimpl;
+	};
 
-}; /* end of namespace XKFont */
+} /* end of namespace XKFont */
 
 #endif