/*#*
*#* $Log$
+ *#* Revision 1.6 2006/05/27 22:31:34 bernie
+ *#* Switch to a smaller default fount.
+ *#*
+ *#* Revision 1.5 2006/03/13 02:06:04 bernie
+ *#* FONT_HAS_GLYPH(): New macro.
+ *#*
+ *#* 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.
+ *#*
*#* Revision 1.2 2005/11/04 18:17:45 bernie
*#* Fix header guards and includes for new location of gfx module.
*#*
#include <cfg/compiler.h> /* uint8_t */
#include <mware/pgm.h> /* PROGMEM */
-/*!
- * \name Font size (in pixel)
- * \{
- */
-#define FONT_WIDTH 6
-#define FONT_HEIGHT 8
-/* \} */
+typedef struct Font
+{
+ /**
+ * Pointer to glyph data.
+ *
+ * Data is an array of at most 256 glyphs packed together.
+ * Raster format must be the same of the bitmap.
+ */
+ 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). */
+
+ /** Array of glyph offsets in bytes. NULL for fixed-width fonts. */
+ const PROGMEM uint16_t *offset;
+ const PROGMEM uint8_t *widths;
+
+} Font;
+
+
+/** Return true if glyph \a c is available in \a font. */
+#define FONT_HAS_GLYPH(font, c) ((c) >= (font)->first && (c) <= (font)->last)
+
-/*! Font table. */
-extern const PROGMEM uint8_t font[256 * FONT_WIDTH];
+/** The default font. */
+#define default_font font_luBS14
+extern const struct Font default_font;
#endif /* GFX_FONT_H */