X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=gfx%2Ffont.h;h=d3b241e2913b57af918b9d2366dcc65b00aab332;hb=df31700cf7f48edd4a4d55f1d10bb9da91cfd233;hp=1701b1fc94acd9c15780b8c7e8e61e861305ceb4;hpb=22ea75fdc24002bc8b2a6fea2be1080cc3b39b1c;p=bertos.git

diff --git a/gfx/font.h b/gfx/font.h
index 1701b1fc..d3b241e2 100755
--- a/gfx/font.h
+++ b/gfx/font.h
@@ -14,6 +14,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.4  2006/02/15 09:10:15  bernie
+ *#* Implement prop fonts; Fix algo styles.
+ *#*
  *#* Revision 1.3  2006/02/10 12:29:05  bernie
  *#* Add multiple font support in bitmaps.
  *#*
@@ -62,14 +65,22 @@ typedef struct Font
 	 * Data is an array of at most 256 glyphs packed together.
 	 * Raster format must be the same of the bitmap.
 	 */
-	const PROGMEM uint8_t * const glyph;
+	const PROGMEM uint8_t *glyph;
+
+	uint8_t width;     /**< Pixel width of character cell. */
+	uint8_t height;    /**< Pixel height of character cell. */
+
+	uint8_t first;     /**< First encoded character in glyph array. */
+	uint8_t last;      /**< Last encoded character in glyph array (inclusive). */
 
-	uint8_t width;    /**< Pixel width of character cell. */
-	uint8_t height;   /**< Pixel height of character cell. */
+	/** Array of glyph offsets in bytes. NULL for fixed-width fonts. */
+	const PROGMEM uint16_t *offset;
+	const PROGMEM uint8_t *widths;
 
 } Font;
 
-/**< The default font. */
-extern struct Font default_font;
+/** The default font. */
+#define default_font font_ncenB18
+extern const struct Font default_font;
 
 #endif /* GFX_FONT_H */